diff --git a/.changelog/epilogue.md b/.changelog/epilogue.md
index ac475d976..3df319cee 100644
--- a/.changelog/epilogue.md
+++ b/.changelog/epilogue.md
@@ -193,7 +193,7 @@
 
 - Delete packet commitment instead of acknowledgement in acknowledgePacket
   [#1573](https://github.com/informalsystems/ibc-rs/issues/1573)
-- Set the `counterparty_channel_id` correctly to fix ICS04 [`chanOpenAck` handler verification](https://github.com/cosmos/ibc-rs/blob/main/crates/ibc/src/core/ics04_channel/handler/chan_open_ack.rs)
+- Set the `counterparty_channel_id` correctly to fix ICS04 [`chanOpenAck` handler verification](https://github.com/cosmos/ibc-rs/blob/v0.10.0/modules/src/core/ics04_channel/handler/chan_open_ack.rs)
   ([#1649](https://github.com/informalsystems/ibc-rs/issues/1649))
 - Add missing assertion for non-zero trust-level in Tendermint client initialization.
   ([#1697](https://github.com/informalsystems/ibc-rs/issues/1697))
@@ -220,7 +220,7 @@
 - Set the connection counterparty in the ICS 003 [`connOpenAck` handler][conn-open-ack-handler]
   ([#1532](https://github.com/informalsystems/ibc-rs/issues/1532))
 
-[conn-open-ack-handler]: https://github.com/cosmos/ibc-rs/blob/main/crates/ibc/src/core/ics03_connection/handler/conn_open_ack.rs
+[conn-open-ack-handler]: https://github.com/cosmos/ibc-rs/blob/v0.9.0/modules/src/core/ics03_connection/handler/conn_open_ack.rs
 
 ### IMPROVEMENTS
 
diff --git a/.changelog/unreleased/breaking-changes/1229-auto-derive-ser-commitment-prefix.md b/.changelog/unreleased/breaking-changes/1229-auto-derive-ser-commitment-prefix.md
new file mode 100644
index 000000000..4b022abf2
--- /dev/null
+++ b/.changelog/unreleased/breaking-changes/1229-auto-derive-ser-commitment-prefix.md
@@ -0,0 +1,2 @@
+- [ics23] Auto-derive `serde::Serialize` for `CommitmentPrefix`.
+  ([\#1229](https://github.com/cosmos/ibc-rs/issues/1229))
diff --git a/.changelog/v0.20.0/feature/161-add-getter-function-of-prefixeddenom.md b/.changelog/v0.20.0/feature/161-add-getter-function-of-prefixeddenom.md
index 428eaf8ce..3f6376122 100644
--- a/.changelog/v0.20.0/feature/161-add-getter-function-of-prefixeddenom.md
+++ b/.changelog/v0.20.0/feature/161-add-getter-function-of-prefixeddenom.md
@@ -1,2 +1,2 @@
-- Public PrefixedDenom inner type and add as_str func for BaseDenom ([#161](https://github.com/cosmos/ibc-
-  rs/issues/161))
\ No newline at end of file
+- Public PrefixedDenom inner type and add as_str func for BaseDenom
+  ([#161](https://github.com/cosmos/ibc-rs/issues/161))
diff --git a/.changelog/v0.22.0/breaking-changes/166-channel-proof-verification.md b/.changelog/v0.22.0/breaking-changes/166-channel-proof-verification.md
index 77f5ef3a8..da9fa2779 100644
--- a/.changelog/v0.22.0/breaking-changes/166-channel-proof-verification.md
+++ b/.changelog/v0.22.0/breaking-changes/166-channel-proof-verification.md
@@ -1,3 +1,3 @@
 - Refactor channel handlers. Proof calls were inlined, and our handshake
-  variable naming convention was applied ([#166](https://github.com/cosmos/ibc-
-  rs/issues/166))
\ No newline at end of file
+  variable naming convention was applied
+  ([#166](https://github.com/cosmos/ibc-rs/issues/166))
diff --git a/.changelog/v0.28.0/feature/393-finish-validation-execution-context.md b/.changelog/v0.28.0/feature/393-finish-validation-execution-context.md
index a9981e46b..464a9df92 100644
--- a/.changelog/v0.28.0/feature/393-finish-validation-execution-context.md
+++ b/.changelog/v0.28.0/feature/393-finish-validation-execution-context.md
@@ -1,3 +1,3 @@
 - Finish implementing ValidationContext::validate() and
-  ExecutionContext::execute() ([#393](https://github.com/cosmos/ibc-
-  rs/issues/393))
\ No newline at end of file
+  ExecutionContext::execute()
+  ([#393](https://github.com/cosmos/ibc-rs/issues/393))
diff --git a/.changelog/v0.29.0/breaking-changes/279-remove-legacy-api.md b/.changelog/v0.29.0/breaking-changes/279-remove-legacy-api.md
index 74e43597b..5fe71954e 100644
--- a/.changelog/v0.29.0/breaking-changes/279-remove-legacy-api.md
+++ b/.changelog/v0.29.0/breaking-changes/279-remove-legacy-api.md
@@ -1,2 +1,2 @@
-- Remove Reader and Keeper API ([#279](https://github.com/cosmos/ibc-
-  rs/issues/279))
\ No newline at end of file
+- Remove Reader and Keeper API
+  ([#279](https://github.com/cosmos/ibc-rs/issues/279))
diff --git a/.changelog/v0.33.0/improvement/547-error-strings.md b/.changelog/v0.33.0/improvement/547-error-strings.md
index d019bc189..661201f75 100644
--- a/.changelog/v0.33.0/improvement/547-error-strings.md
+++ b/.changelog/v0.33.0/improvement/547-error-strings.md
@@ -1,2 +1,2 @@
-- Fix ContextError Display output ([#547](https://github.com/cosmos/ibc-
-  rs/issues/547))
\ No newline at end of file
+- Fix ContextError Display output
+  ([#547](https://github.com/cosmos/ibc-rs/issues/547))
diff --git a/.changelog/v0.34.0/bug/550-fix-conn-proof-verify.md b/.changelog/v0.34.0/bug/550-fix-conn-proof-verify.md
index a92bc24fb..0368dd262 100644
--- a/.changelog/v0.34.0/bug/550-fix-conn-proof-verify.md
+++ b/.changelog/v0.34.0/bug/550-fix-conn-proof-verify.md
@@ -1,2 +1,2 @@
-- Fix client IDs for the proof verifications in `ConnectionOpenTry` and `ConnectionOpenAck` ([#550](https://github.com/cosmos/ibc-
-  rs/issues/550))
+- Fix client IDs for the proof verifications in `ConnectionOpenTry` and
+  `ConnectionOpenAck` ([#550](https://github.com/cosmos/ibc-rs/issues/550))
diff --git a/.changelog/unreleased/breaking-changes/717-organize-ack-types-under-ics04.md b/.changelog/v0.43.0/breaking-changes/717-organize-ack-types-under-ics04.md
similarity index 100%
rename from .changelog/unreleased/breaking-changes/717-organize-ack-types-under-ics04.md
rename to .changelog/v0.43.0/breaking-changes/717-organize-ack-types-under-ics04.md
diff --git a/.changelog/unreleased/breaking-changes/750-sync-ics04-events-namings-with-convention.md b/.changelog/v0.43.0/breaking-changes/750-sync-ics04-events-namings-with-convention.md
similarity index 100%
rename from .changelog/unreleased/breaking-changes/750-sync-ics04-events-namings-with-convention.md
rename to .changelog/v0.43.0/breaking-changes/750-sync-ics04-events-namings-with-convention.md
diff --git a/.changelog/unreleased/breaking-changes/754-fix-issue-747.md b/.changelog/v0.43.0/breaking-changes/754-fix-issue-747.md
similarity index 100%
rename from .changelog/unreleased/breaking-changes/754-fix-issue-747.md
rename to .changelog/v0.43.0/breaking-changes/754-fix-issue-747.md
diff --git a/.changelog/v0.43.0/breaking-changes/761-chain-id-enhancements-and-fixes.md b/.changelog/v0.43.0/breaking-changes/761-chain-id-enhancements-and-fixes.md
new file mode 100644
index 000000000..0cb98cbb2
--- /dev/null
+++ b/.changelog/v0.43.0/breaking-changes/761-chain-id-enhancements-and-fixes.md
@@ -0,0 +1,3 @@
+- Enhancements and fixes to `ChainId` impls and validation.
+  ([#761](https://github.com/cosmos/ibc-rs/issues/761))
+
diff --git a/.changelog/v0.43.0/breaking-changes/764-use-vec-for-header-attribute.md b/.changelog/v0.43.0/breaking-changes/764-use-vec-for-header-attribute.md
new file mode 100644
index 000000000..dcedb279d
--- /dev/null
+++ b/.changelog/v0.43.0/breaking-changes/764-use-vec-for-header-attribute.md
@@ -0,0 +1,2 @@
+- Use Vec<u8> for HeaderAttribute instead of Any
+  ([#764](https://github.com/cosmos/ibc-rs/issues/764))
diff --git a/.changelog/v0.43.0/breaking-changes/772-json-schema-for-channels-and-coin.md b/.changelog/v0.43.0/breaking-changes/772-json-schema-for-channels-and-coin.md
new file mode 100644
index 000000000..e7603beb7
--- /dev/null
+++ b/.changelog/v0.43.0/breaking-changes/772-json-schema-for-channels-and-coin.md
@@ -0,0 +1,2 @@
+- Serde: Schema for Coin/Transfer, Amount is string 
+  ([#772](https://github.com/cosmos/ibc-rs/issues/772))
\ No newline at end of file
diff --git a/.changelog/unreleased/bug/747-fix-747-Protobuf-out-of-memory.md b/.changelog/v0.43.0/bug/747-fix-747-Protobuf-out-of-memory.md
similarity index 100%
rename from .changelog/unreleased/bug/747-fix-747-Protobuf-out-of-memory.md
rename to .changelog/v0.43.0/bug/747-fix-747-Protobuf-out-of-memory.md
diff --git a/.changelog/unreleased/bug/752-fix-752.md b/.changelog/v0.43.0/bug/752-fix-752.md
similarity index 100%
rename from .changelog/unreleased/bug/752-fix-752.md
rename to .changelog/v0.43.0/bug/752-fix-752.md
diff --git a/.changelog/v0.43.0/bug/794-add-ser-der-for-packet-receipt.md b/.changelog/v0.43.0/bug/794-add-ser-der-for-packet-receipt.md
new file mode 100644
index 000000000..615c392eb
--- /dev/null
+++ b/.changelog/v0.43.0/bug/794-add-ser-der-for-packet-receipt.md
@@ -0,0 +1,2 @@
+- Add serde serialization and deserialization to Packet Receipt
+  ([#794](https://github.com/cosmos/ibc-rs/pull/794))
\ No newline at end of file
diff --git a/.changelog/unreleased/improvement/745-scale-encoding-for-transfer-packet.md b/.changelog/v0.43.0/improvements/745-scale-encoding-for-transfer-packet.md
similarity index 100%
rename from .changelog/unreleased/improvement/745-scale-encoding-for-transfer-packet.md
rename to .changelog/v0.43.0/improvements/745-scale-encoding-for-transfer-packet.md
diff --git a/.changelog/v0.43.0/improvements/763-include-PacketData-JSON-encoding-test.md b/.changelog/v0.43.0/improvements/763-include-PacketData-JSON-encoding-test.md
new file mode 100644
index 000000000..1088b2467
--- /dev/null
+++ b/.changelog/v0.43.0/improvements/763-include-PacketData-JSON-encoding-test.md
@@ -0,0 +1,2 @@
+- Add test to ensure `PacketData`` keeps proper JSON encoding
+  ([#763](https://github.com/cosmos/ibc-rs/issues/763))
diff --git a/.changelog/v0.43.0/summary.md b/.changelog/v0.43.0/summary.md
new file mode 100644
index 000000000..836724110
--- /dev/null
+++ b/.changelog/v0.43.0/summary.md
@@ -0,0 +1,7 @@
+This release bumps ibc-proto to v0.32.1, resolving issue with token transfer
+deserialization for cases with no memo field provided. It also includes various
+enhancements and bug fixes, such as reorganized acknowledgement types, enhanced
+`ChainId` validation, improved `from_str` height creation, synchronized channel
+event namings for consistency.
+
+There are consensus-breaking changes.
diff --git a/.changelog/v0.44.0/breaking-changes/536-clientstate-status.md b/.changelog/v0.44.0/breaking-changes/536-clientstate-status.md
new file mode 100644
index 000000000..dc414758f
--- /dev/null
+++ b/.changelog/v0.44.0/breaking-changes/536-clientstate-status.md
@@ -0,0 +1,2 @@
+- [ibc-derive] Replace `ClientState::{confirm_not_frozen, expired}()` with `ClientState::status()`
+  ([#536](https://github.com/cosmos/ibc-rs/issues/536))
diff --git a/.changelog/v0.44.0/breaking-changes/786-decouple-token-sendpacket.md b/.changelog/v0.44.0/breaking-changes/786-decouple-token-sendpacket.md
new file mode 100644
index 000000000..9441d8582
--- /dev/null
+++ b/.changelog/v0.44.0/breaking-changes/786-decouple-token-sendpacket.md
@@ -0,0 +1,2 @@
+- Decouple TokenTransfer{Validation,Execution} from SendPacket{Validation,Execution}
+  ([#786](https://github.com/cosmos/ibc-rs/issues/786))
diff --git a/.changelog/v0.44.0/breaking-changes/788-decouple-router.md b/.changelog/v0.44.0/breaking-changes/788-decouple-router.md
new file mode 100644
index 000000000..15e21c2e5
--- /dev/null
+++ b/.changelog/v0.44.0/breaking-changes/788-decouple-router.md
@@ -0,0 +1,2 @@
+- Decouple `Router` from `ValidationContext`
+  ([#788](https://github.com/cosmos/ibc-rs/pull/788))
diff --git a/.changelog/v0.44.0/breaking-changes/802-simplify-module-lookup.md b/.changelog/v0.44.0/breaking-changes/802-simplify-module-lookup.md
new file mode 100644
index 000000000..68dc850cc
--- /dev/null
+++ b/.changelog/v0.44.0/breaking-changes/802-simplify-module-lookup.md
@@ -0,0 +1,2 @@
+- Simplify Module lookup in the `Router` trait
+ ([#802](https://github.com/cosmos/ibc-rs/issues/802))
diff --git a/.changelog/v0.44.0/summary.md b/.changelog/v0.44.0/summary.md
new file mode 100644
index 000000000..87b8f04ba
--- /dev/null
+++ b/.changelog/v0.44.0/summary.md
@@ -0,0 +1,3 @@
+The goal with this release was to replace `ClientState::{confirm_not_frozen, expired}()` with `ClientState::status()` ([#536](https://github.com/cosmos/ibc-rs/issues/536)). Updating basecoin-rs with the new changes exposed the shortcomings of having `SendPacket*Context` be supertraits of `TokenTransfer*Context`, which in turned exposed the shortcomings of having `Router` be a supertrait of `ValidationContext`. Hence, we decoupled everything!
+
+There are consensus-breaking changes.
diff --git a/.changelog/v0.44.1/bug-fixes/819-remove-mocks-no-std-traces.md b/.changelog/v0.44.1/bug-fixes/819-remove-mocks-no-std-traces.md
new file mode 100644
index 000000000..4aadca5b1
--- /dev/null
+++ b/.changelog/v0.44.1/bug-fixes/819-remove-mocks-no-std-traces.md
@@ -0,0 +1,2 @@
+- Remove traces of deprecated `mocks-no-std` feature
+  ([#819](https://github.com/cosmos/ibc-rs/issues/821))
diff --git a/.changelog/v0.44.1/bug-fixes/821-fix-header-decoding-from-update-client-event.md b/.changelog/v0.44.1/bug-fixes/821-fix-header-decoding-from-update-client-event.md
new file mode 100644
index 000000000..e54aa1ea9
--- /dev/null
+++ b/.changelog/v0.44.1/bug-fixes/821-fix-header-decoding-from-update-client-event.md
@@ -0,0 +1,3 @@
+- Utilize encoded bytes from `Any` for the `header` field of `UpdateClient`
+  event
+  ([#821](https://github.com/cosmos/ibc-rs/issues/821))
diff --git a/.changelog/v0.44.1/summary.md b/.changelog/v0.44.1/summary.md
new file mode 100644
index 000000000..51b5400fe
--- /dev/null
+++ b/.changelog/v0.44.1/summary.md
@@ -0,0 +1,3 @@
+This release fixes a bug with the `UpdateClient` event where the `header` field was not properly encoded.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.44.2/bug-fixes/911-fix-header-validation-during-tmclient-update.md b/.changelog/v0.44.2/bug-fixes/911-fix-header-validation-during-tmclient-update.md
new file mode 100644
index 000000000..ba6cdb634
--- /dev/null
+++ b/.changelog/v0.44.2/bug-fixes/911-fix-header-validation-during-tmclient-update.md
@@ -0,0 +1,2 @@
+- Remove an incorrect validation during tendermint client update
+  ([\#911](https://github.com/cosmos/ibc-rs/issues/911))
diff --git a/.changelog/v0.44.2/summary.md b/.changelog/v0.44.2/summary.md
new file mode 100644
index 000000000..c80a7d4f3
--- /dev/null
+++ b/.changelog/v0.44.2/summary.md
@@ -0,0 +1,4 @@
+This release is a critical patch release that introduces a vital fix by removing
+an incorrect validation during a Tendermint client update.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.45.0/breaking-changes/785-bump-tendermint-to-v0.33.0.md b/.changelog/v0.45.0/breaking-changes/785-bump-tendermint-to-v0.33.0.md
new file mode 100644
index 000000000..09e838b68
--- /dev/null
+++ b/.changelog/v0.45.0/breaking-changes/785-bump-tendermint-to-v0.33.0.md
@@ -0,0 +1,2 @@
+- Bump tendermint-rs to v0.33.0 
+  ([#785](https://github.com/cosmos/ibc-rs/issues/785))
diff --git a/.changelog/v0.45.0/breaking-changes/790-bump-ibc-proto-rs-to-v0.34.0.md b/.changelog/v0.45.0/breaking-changes/790-bump-ibc-proto-rs-to-v0.34.0.md
new file mode 100644
index 000000000..5f41eb65a
--- /dev/null
+++ b/.changelog/v0.45.0/breaking-changes/790-bump-ibc-proto-rs-to-v0.34.0.md
@@ -0,0 +1,2 @@
+- Bump ibc-proto-rs to v0.34.0 
+  ([#790](https://github.com/cosmos/ibc-rs/issues/790))
diff --git a/.changelog/v0.45.0/breaking-changes/857-use-result-for-safe-counters-increment.md b/.changelog/v0.45.0/breaking-changes/857-use-result-for-safe-counters-increment.md
new file mode 100644
index 000000000..f0f87285e
--- /dev/null
+++ b/.changelog/v0.45.0/breaking-changes/857-use-result-for-safe-counters-increment.md
@@ -0,0 +1,3 @@
+- Allow hosts to handle overflow cases in `increase_*_counter` methods by
+  returning `Result<(),ContextError>` type.
+  ([#857](https://github.com/cosmos/ibc-rs/issues/857))
diff --git a/.changelog/v0.45.0/breaking-changes/859-return-result-in-logger-event-emitter-methods.md b/.changelog/v0.45.0/breaking-changes/859-return-result-in-logger-event-emitter-methods.md
new file mode 100644
index 000000000..9c25b1ba3
--- /dev/null
+++ b/.changelog/v0.45.0/breaking-changes/859-return-result-in-logger-event-emitter-methods.md
@@ -0,0 +1,2 @@
+- logger and event emitter methods return `Result<(), ContextError>` type.
+  ([#859](https://github.com/cosmos/ibc-rs/issues/859))
diff --git a/.changelog/v0.45.0/breaking-changes/873-bump-ibc-proto-rs.md b/.changelog/v0.45.0/breaking-changes/873-bump-ibc-proto-rs.md
new file mode 100644
index 000000000..f421724c4
--- /dev/null
+++ b/.changelog/v0.45.0/breaking-changes/873-bump-ibc-proto-rs.md
@@ -0,0 +1,2 @@
+- Bump `ibc-proto-rs` to v0.35.0 along with some other minor dependency updates
+  ([#873](https://github.com/cosmos/ibc-rs/issues/873))
diff --git a/.changelog/v0.45.0/bug-fixes/741-restore-no-std-support.md b/.changelog/v0.45.0/bug-fixes/741-restore-no-std-support.md
new file mode 100644
index 000000000..41cfaa7ff
--- /dev/null
+++ b/.changelog/v0.45.0/bug-fixes/741-restore-no-std-support.md
@@ -0,0 +1,2 @@
+- Fix compilation error of v0.41.0 by restoring no_std support for serde
+  feature ([#741](https://github.com/cosmos/ibc-rs/issues/741))
diff --git a/.changelog/v0.45.0/bug-fixes/863-immut-ref-in-validate.md b/.changelog/v0.45.0/bug-fixes/863-immut-ref-in-validate.md
new file mode 100644
index 000000000..91cbda02b
--- /dev/null
+++ b/.changelog/v0.45.0/bug-fixes/863-immut-ref-in-validate.md
@@ -0,0 +1,2 @@
+- Replace mutable ref with immutable ref in validate handler
+  ([\#863](https://github.com/cosmos/ibc-rs/issues/863))
\ No newline at end of file
diff --git a/.changelog/v0.45.0/features/842-impl-grpc-services.md b/.changelog/v0.45.0/features/842-impl-grpc-services.md
new file mode 100644
index 000000000..081992300
--- /dev/null
+++ b/.changelog/v0.45.0/features/842-impl-grpc-services.md
@@ -0,0 +1,2 @@
+- Blanket implementation of core gRPC services
+  ([\#686](https://github.com/cosmos/ibc-rs/issues/686))
\ No newline at end of file
diff --git a/.changelog/v0.45.0/improvements/838-switch-to-tm-event-for-upgrade-client-proposal-handler.md b/.changelog/v0.45.0/improvements/838-switch-to-tm-event-for-upgrade-client-proposal-handler.md
new file mode 100644
index 000000000..69247e866
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/838-switch-to-tm-event-for-upgrade-client-proposal-handler.md
@@ -0,0 +1,3 @@
+- Switch to domain Tendermint event type instead of proto for the
+  `upgrade_client_proposal_handler` return
+  ([#838](https://github.com/cosmos/ibc-rs/issues/838))
diff --git a/.changelog/v0.45.0/improvements/844-bump-borsh.md b/.changelog/v0.45.0/improvements/844-bump-borsh.md
new file mode 100644
index 000000000..de58be506
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/844-bump-borsh.md
@@ -0,0 +1,2 @@
+- Bump ibc-proto to v0.34.1 and borsh to v0.10
+  ([#844](https://github.com/cosmos/ibc-rs/issues/844))
diff --git a/.changelog/v0.45.0/improvements/845-borsh-derive-msgtransfer.md b/.changelog/v0.45.0/improvements/845-borsh-derive-msgtransfer.md
new file mode 100644
index 000000000..1bbcc3ed8
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/845-borsh-derive-msgtransfer.md
@@ -0,0 +1,2 @@
+- Add borsh derive for `MsgTransfer`
+  ([#845](https://github.com/cosmos/ibc-rs/pull/845))
diff --git a/.changelog/v0.45.0/improvements/846-borsh-derive-msgenvelope.md b/.changelog/v0.45.0/improvements/846-borsh-derive-msgenvelope.md
new file mode 100644
index 000000000..cc5ccad7d
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/846-borsh-derive-msgenvelope.md
@@ -0,0 +1,2 @@
+- Add borsh derive for `MsgEnvelope`
+  ([#846](https://github.com/cosmos/ibc-rs/pull/846))
diff --git a/.changelog/v0.45.0/improvements/847-derive-msgenvelope-eq.md b/.changelog/v0.45.0/improvements/847-derive-msgenvelope-eq.md
new file mode 100644
index 000000000..e7580e0a7
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/847-derive-msgenvelope-eq.md
@@ -0,0 +1,2 @@
+- Derive `PartialEq`, `Eq` for `MsgEnvelope`
+  ([#847](https://github.com/cosmos/ibc-rs/pull/847))
diff --git a/.changelog/v0.45.0/improvements/848-configure-cargo-fmt.md b/.changelog/v0.45.0/improvements/848-configure-cargo-fmt.md
new file mode 100644
index 000000000..51ad15851
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/848-configure-cargo-fmt.md
@@ -0,0 +1,2 @@
+- Organize imports grouping and granularity using `rustfmt.toml`
+  ([#848](https://github.com/cosmos/ibc-rs/issues/848))
diff --git a/.changelog/v0.45.0/improvements/856-jsonschema-derive-msgenvelope.md b/.changelog/v0.45.0/improvements/856-jsonschema-derive-msgenvelope.md
new file mode 100644
index 000000000..5eac84360
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/856-jsonschema-derive-msgenvelope.md
@@ -0,0 +1,2 @@
+- Add `JsonSchema` derive for `MsgEnvelope`
+  ([#856](https://github.com/cosmos/ibc-rs/pull/856))
diff --git a/.changelog/v0.45.0/improvements/869-codebase-cleanup.md b/.changelog/v0.45.0/improvements/869-codebase-cleanup.md
new file mode 100644
index 000000000..55d9edca9
--- /dev/null
+++ b/.changelog/v0.45.0/improvements/869-codebase-cleanup.md
@@ -0,0 +1,2 @@
+- Remove unused code snippets and move serializer roundtrip test to `serializers.rs`
+  ([#869](https://github.com/cosmos/ibc-rs/issues/869))
diff --git a/.changelog/v0.45.0/summary.md b/.changelog/v0.45.0/summary.md
new file mode 100644
index 000000000..43ecf0d8e
--- /dev/null
+++ b/.changelog/v0.45.0/summary.md
@@ -0,0 +1 @@
+This release introduces a new API under the `grpc` feature flag, which has ibc-rs expose grpc endpoints that the hermes relayer needs. There are other miscellaneous changes.
diff --git a/.changelog/v0.46.0/breaking-changes/914-replace-host-update-time-and-height-under-client-contexts.md b/.changelog/v0.46.0/breaking-changes/914-replace-host-update-time-and-height-under-client-contexts.md
new file mode 100644
index 000000000..9df36a1e6
--- /dev/null
+++ b/.changelog/v0.46.0/breaking-changes/914-replace-host-update-time-and-height-under-client-contexts.md
@@ -0,0 +1,3 @@
+- Relocate `*_update_time` and `*_update_height` to the client contexts' traits
+  for improved access by light clients
+  ([#914](https://github.com/cosmos/ibc-rs/issues/914))
diff --git a/.changelog/v0.46.0/bug-fixes/911-fix-header-validation-during-tmclient-update.md b/.changelog/v0.46.0/bug-fixes/911-fix-header-validation-during-tmclient-update.md
new file mode 100644
index 000000000..ba6cdb634
--- /dev/null
+++ b/.changelog/v0.46.0/bug-fixes/911-fix-header-validation-during-tmclient-update.md
@@ -0,0 +1,2 @@
+- Remove an incorrect validation during tendermint client update
+  ([\#911](https://github.com/cosmos/ibc-rs/issues/911))
diff --git a/.changelog/v0.46.0/bug-fixes/913-add-update-cons-metadata-on-client-upgrade.md b/.changelog/v0.46.0/bug-fixes/913-add-update-cons-metadata-on-client-upgrade.md
new file mode 100644
index 000000000..80ae700a4
--- /dev/null
+++ b/.changelog/v0.46.0/bug-fixes/913-add-update-cons-metadata-on-client-upgrade.md
@@ -0,0 +1,3 @@
+- Add missing update in the state, which should include the host's height and
+   timestamp when a successful client upgrade take place.
+   ([\#913](https://github.com/cosmos/ibc-rs/issues/913))
diff --git a/.changelog/v0.46.0/improvements/875-remove-regex-dep.md b/.changelog/v0.46.0/improvements/875-remove-regex-dep.md
new file mode 100644
index 000000000..4bb26a232
--- /dev/null
+++ b/.changelog/v0.46.0/improvements/875-remove-regex-dep.md
@@ -0,0 +1,2 @@
+- Remove `safe-regex` dependency
+  ([\#875](https://github.com/cosmos/ibc-rs/issues/875))
diff --git a/.changelog/v0.46.0/improvements/896-enhance-ibc-query-methods-usability.md b/.changelog/v0.46.0/improvements/896-enhance-ibc-query-methods-usability.md
new file mode 100644
index 000000000..0f785755d
--- /dev/null
+++ b/.changelog/v0.46.0/improvements/896-enhance-ibc-query-methods-usability.md
@@ -0,0 +1,4 @@
+- Enhance IBC query methods usability and code organization
+  - The implementation of query methods is now publicly accessible as standalone functions.
+  - `grpc` feature now lives as a separate crate called as `ibc-query`
+  ([#896](https://github.com/cosmos/ibc-rs/issues/896))
diff --git a/.changelog/v0.46.0/improvements/898-re-export-ibc-proto-types.md b/.changelog/v0.46.0/improvements/898-re-export-ibc-proto-types.md
new file mode 100644
index 000000000..bbe181575
--- /dev/null
+++ b/.changelog/v0.46.0/improvements/898-re-export-ibc-proto-types.md
@@ -0,0 +1,2 @@
+- Re-export ibc proto types from `ibc-proto-rs`` for dependency convenience
+  ([/#898](https://github.com/cosmos/ibc-rs/issues/898))
diff --git a/.changelog/v0.46.0/summary.md b/.changelog/v0.46.0/summary.md
new file mode 100644
index 000000000..2a00c61cb
--- /dev/null
+++ b/.changelog/v0.46.0/summary.md
@@ -0,0 +1,10 @@
+This release introduces vital bug fixes, including removal of an incorrect
+validation during a Tendermint client update and the addition of a missing state
+update during a successful client upgrade ensuring the inclusion of the host's
+height and timestamp in the store.
+
+Additionally, it eliminates the `safe-regex` dependency, and restructures IBC
+query implementations under the previous `grpc` feature flag and moves it to a
+separate crate called as `ibc-query`.
+
+There are consensus-breaking changes.
diff --git a/.changelog/v0.47.0/features/600-tendermint-pruning.md b/.changelog/v0.47.0/features/600-tendermint-pruning.md
new file mode 100644
index 000000000..58ced3ddb
--- /dev/null
+++ b/.changelog/v0.47.0/features/600-tendermint-pruning.md
@@ -0,0 +1 @@
+- Implement consensus state pruning for Tendermint light clients ([#600](https://github.com/cosmos/ibc-rs/issues/600))
diff --git a/.changelog/v0.47.0/improvements/538-test-for-client-expiry.md b/.changelog/v0.47.0/improvements/538-test-for-client-expiry.md
new file mode 100644
index 000000000..701905ada
--- /dev/null
+++ b/.changelog/v0.47.0/improvements/538-test-for-client-expiry.md
@@ -0,0 +1,2 @@
+- Add test for expired client status.
+  ([\#538](https://github.com/cosmos/ibc-rs/issues/538))
diff --git a/.changelog/v0.47.0/improvements/850-fix-wasm-compilation-error-with-floats.md b/.changelog/v0.47.0/improvements/850-fix-wasm-compilation-error-with-floats.md
new file mode 100644
index 000000000..bb17a129e
--- /dev/null
+++ b/.changelog/v0.47.0/improvements/850-fix-wasm-compilation-error-with-floats.md
@@ -0,0 +1,4 @@
+- Fix compilation issue with Wasm envs because of floats
+  - Use `serde-json-wasm` dependency instead of `serde-json` for no-floats support
+  - Add CI test to include CosmWasm compilation check
+([\#850](https://github.com/cosmos/ibc-rs/issues/850))
diff --git a/.changelog/v0.47.0/improvements/926_mocks_implies_std.md b/.changelog/v0.47.0/improvements/926_mocks_implies_std.md
new file mode 100644
index 000000000..b7d46ac6f
--- /dev/null
+++ b/.changelog/v0.47.0/improvements/926_mocks_implies_std.md
@@ -0,0 +1,3 @@
+- Change `mocks` feature to imply `std` since it requires
+  Timestamp::now to work.
+  ([\#926](https://github.com/cosmos/ibc-rs/pull/926))
diff --git a/.changelog/v0.47.0/improvements/927-refactor-packet-commitments-and-packet-acknowledgements.md b/.changelog/v0.47.0/improvements/927-refactor-packet-commitments-and-packet-acknowledgements.md
new file mode 100644
index 000000000..ad3827615
--- /dev/null
+++ b/.changelog/v0.47.0/improvements/927-refactor-packet-commitments-and-packet-acknowledgements.md
@@ -0,0 +1,2 @@
+- Return PacketStates instead of paths from packet_commitments and
+  packet_acknowledgements ([\#927](https://github.com/cosmos/ibc-rs/issues/927))
diff --git a/.changelog/v0.47.0/improvements/929-remove-anyschema.md b/.changelog/v0.47.0/improvements/929-remove-anyschema.md
new file mode 100644
index 000000000..5e3e904d2
--- /dev/null
+++ b/.changelog/v0.47.0/improvements/929-remove-anyschema.md
@@ -0,0 +1,2 @@
+- Remove `AnySchema` as `JsonSchema` derive on `Any` now accessible through
+  `ibc-proto-rs` ([#929](https://github.com/cosmos/ibc-rs/issues/929))
diff --git a/.changelog/v0.47.0/summary.md b/.changelog/v0.47.0/summary.md
new file mode 100644
index 000000000..2a621c86a
--- /dev/null
+++ b/.changelog/v0.47.0/summary.md
@@ -0,0 +1,8 @@
+This release adds necessary APIs for featuring consensus state pruning and
+implements pertaining logic for Tendermint light clients. This prevents
+unlimited store growth. Additionally, we've enhanced ibc-rs compatibility with
+no-float environments making Wasm compilation smoother and updated main
+dependencies including `prost` to v0.12, `ibc-proto-rs` to v0.37, and
+`tendermint-rs` to v0.34, ensuring the latest advancements.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.48.0/breaking-changes/716-move-transfer-app-and-tendermint-client-to-separate-crate.md b/.changelog/v0.48.0/breaking-changes/716-move-transfer-app-and-tendermint-client-to-separate-crate.md
new file mode 100644
index 000000000..600725b77
--- /dev/null
+++ b/.changelog/v0.48.0/breaking-changes/716-move-transfer-app-and-tendermint-client-to-separate-crate.md
@@ -0,0 +1,3 @@
+- Move ICS-20 and ICS-27 implementations to the respective part of `ibc-apps`
+  and `ibc-clients` crates, as part of the `ibc` crate restructuring effort.
+  ([\#716](https://github.com/cosmos/ibc-rs/issues/716))
diff --git a/.changelog/v0.48.0/breaking-changes/949-bump-ibc-proto-rs-to-v0380.md b/.changelog/v0.48.0/breaking-changes/949-bump-ibc-proto-rs-to-v0380.md
new file mode 100644
index 000000000..de2d127b7
--- /dev/null
+++ b/.changelog/v0.48.0/breaking-changes/949-bump-ibc-proto-rs-to-v0380.md
@@ -0,0 +1,2 @@
+- Bump `ibc-proto-rs` to v0.38.0
+  ([\#949](https://github.com/cosmos/ibc-rs/issues/949))
diff --git a/.changelog/v0.48.0/breaking-changes/956-bump-MSRV-to-1-64.md b/.changelog/v0.48.0/breaking-changes/956-bump-MSRV-to-1-64.md
new file mode 100644
index 000000000..37056378e
--- /dev/null
+++ b/.changelog/v0.48.0/breaking-changes/956-bump-MSRV-to-1-64.md
@@ -0,0 +1,2 @@
+- Bump minimum supported Rust version to 1.64
+  ([\#956](https://github.com/cosmos/ibc-rs/issues/956))
diff --git a/.changelog/v0.48.0/breaking-changes/965-restructure-ibc.md b/.changelog/v0.48.0/breaking-changes/965-restructure-ibc.md
new file mode 100644
index 000000000..46df0936a
--- /dev/null
+++ b/.changelog/v0.48.0/breaking-changes/965-restructure-ibc.md
@@ -0,0 +1,5 @@
+- Restructure `ibc-rs` codebase by organizing it into smaller self-contained,
+  modular libraries, enabling the selective import of specific domain types or
+  module implementations, either individually or in combination, providing
+  enhanced flexibility and ease of use.
+  ([\#965](https://github.com/cosmos/ibc-rs/issues/965))
diff --git a/.changelog/v0.48.0/features/954-restructure-mock-module-into-crate.md b/.changelog/v0.48.0/features/954-restructure-mock-module-into-crate.md
new file mode 100644
index 000000000..266600f91
--- /dev/null
+++ b/.changelog/v0.48.0/features/954-restructure-mock-module-into-crate.md
@@ -0,0 +1,3 @@
+- Restructure the mock module implementation and separate its codebase into a
+  new crate named `ibc-testkit`
+  ([\#954](https://github.com/cosmos/ibc-rs/issues/953))
diff --git a/.changelog/v0.48.0/features/974-id-into-string.md b/.changelog/v0.48.0/features/974-id-into-string.md
new file mode 100644
index 000000000..fb2d5bb3a
--- /dev/null
+++ b/.changelog/v0.48.0/features/974-id-into-string.md
@@ -0,0 +1,2 @@
+- Provide `Into<String>` for all identifiers types.
+  ([\#974](https://github.com/cosmos/ibc-rs/pull/974))
diff --git a/.changelog/v0.48.0/improvements/697-re-export-essential-proto-types.md b/.changelog/v0.48.0/improvements/697-re-export-essential-proto-types.md
new file mode 100644
index 000000000..0ff69eb56
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/697-re-export-essential-proto-types.md
@@ -0,0 +1,3 @@
+- Re-export essential proto types from the underlying `ibc-*-*-types` crates,
+  removing the necessity for a direct dependency on `ibc-proto` in projects
+  integrating `ibc-rs` ([\#697](https://github.com/cosmos/ibc-rs/issues/697))
diff --git a/.changelog/v0.48.0/improvements/771-use-mod-rs-places-having-submodules.md b/.changelog/v0.48.0/improvements/771-use-mod-rs-places-having-submodules.md
new file mode 100644
index 000000000..3f605655b
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/771-use-mod-rs-places-having-submodules.md
@@ -0,0 +1,2 @@
+- Rename `{submodule}.rs` with corresponding `{submodule}` directory to
+  `{submodule}/mod.rs` ([\#771](https://github.com/cosmos/ibc-rs/issues/771))
diff --git a/.changelog/v0.48.0/improvements/938-add-from.md b/.changelog/v0.48.0/improvements/938-add-from.md
new file mode 100644
index 000000000..6c8b48a9c
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/938-add-from.md
@@ -0,0 +1,2 @@
+- Add From implementation for ICS26 enum types to make it simpler to construct
+  the types. ([\#938](https://github.com/cosmos/ibc-rs/pull/938))
diff --git a/.changelog/v0.48.0/improvements/939-less-alloc.md b/.changelog/v0.48.0/improvements/939-less-alloc.md
new file mode 100644
index 000000000..f468106a7
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/939-less-alloc.md
@@ -0,0 +1,2 @@
+- Reduce vector allocations in Commitment computation.
+  ([\#939](https://github.com/cosmos/ibc-rs/pull/939))
diff --git a/.changelog/v0.48.0/improvements/940-chain-identifiers-without-revision-number-pattern.md b/.changelog/v0.48.0/improvements/940-chain-identifiers-without-revision-number-pattern.md
new file mode 100644
index 000000000..c127a0c66
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/940-chain-identifiers-without-revision-number-pattern.md
@@ -0,0 +1,2 @@
+- Support chain identifiers without the `{chain_name}-{revision_number}` pattern
+  of Tendermint chains. ([\#940](https://github.com/cosmos/ibc-rs/issues/940)).
diff --git a/.changelog/v0.48.0/improvements/943-optimize-validate-prefix-length.md b/.changelog/v0.48.0/improvements/943-optimize-validate-prefix-length.md
new file mode 100644
index 000000000..0e2c11c19
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/943-optimize-validate-prefix-length.md
@@ -0,0 +1,2 @@
+- Remove redundant `String` creation in `validate_prefix_length`
+  ([\#943](https://github.com/cosmos/ibc-rs/issues/943)).
diff --git a/.changelog/v0.48.0/improvements/948-remove-redundant-test-log-deps.md b/.changelog/v0.48.0/improvements/948-remove-redundant-test-log-deps.md
new file mode 100644
index 000000000..704cf5c48
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/948-remove-redundant-test-log-deps.md
@@ -0,0 +1,2 @@
+- Remove redundant `#[test_log::test]` attributes in test modules
+  ([\#948](https://github.com/cosmos/ibc-rs/issues/948))
diff --git a/.changelog/v0.48.0/improvements/951-remove-default-portid.md b/.changelog/v0.48.0/improvements/951-remove-default-portid.md
new file mode 100644
index 000000000..f9f586add
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/951-remove-default-portid.md
@@ -0,0 +1,2 @@
+- Remove the default value and implementation for `PortId`
+  ([\#951](https://github.com/cosmos/ibc-rs/issues/951))
diff --git a/.changelog/v0.48.0/improvements/952-expose-channel-message-types.md b/.changelog/v0.48.0/improvements/952-expose-channel-message-types.md
new file mode 100644
index 000000000..e0a0ccbf2
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/952-expose-channel-message-types.md
@@ -0,0 +1,2 @@
+- Expose domain message types under the `ics04_channel` as public
+  ([\#952](https://github.com/cosmos/ibc-rs/issues/952))
diff --git a/.changelog/v0.48.0/improvements/955-use-workspace-dependencies.md b/.changelog/v0.48.0/improvements/955-use-workspace-dependencies.md
new file mode 100644
index 000000000..51846aba0
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/955-use-workspace-dependencies.md
@@ -0,0 +1,2 @@
+- Enhance dependency management with workspace inheritance
+  ([\#955](https://github.com/cosmos/ibc-rs/issues/955))
diff --git a/.changelog/v0.48.0/improvements/961-refactor-identifier-validation.md b/.changelog/v0.48.0/improvements/961-refactor-identifier-validation.md
new file mode 100644
index 000000000..ca8ca1d0e
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/961-refactor-identifier-validation.md
@@ -0,0 +1,2 @@
+- Simplify and refactor ICS-24 identifier validation logic.
+  ([\#961](https://github.com/cosmos/ibc-rs/issues/961))
diff --git a/.changelog/v0.48.0/improvements/970-reduce-heap-allocation.md b/.changelog/v0.48.0/improvements/970-reduce-heap-allocation.md
new file mode 100644
index 000000000..9854416b2
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/970-reduce-heap-allocation.md
@@ -0,0 +1,3 @@
+- Reduce heap allocation by using `str` instead of `String` places we convert
+  domain event attributes to the ABCI event attributes
+  ([\#970](https://github.com/cosmos/ibc-rs/issues/970))
diff --git a/.changelog/v0.48.0/improvements/976-expose-different-types-for-public-access.md b/.changelog/v0.48.0/improvements/976-expose-different-types-for-public-access.md
new file mode 100644
index 000000000..e329e6744
--- /dev/null
+++ b/.changelog/v0.48.0/improvements/976-expose-different-types-for-public-access.md
@@ -0,0 +1,6 @@
+- Expose various fields, types and functions in `ibc-rs` as public including:
+  - `validate` and `execute` handler functions for all the IBC message types.
+  - `TYPE_URL` constants.
+  - Any private fields within the domain message types.
+  - Any private fields within the Tendermint `ClientState` and `ConsensusState`
+  ([\#976](https://github.com/cosmos/ibc-rs/issues/976))
diff --git a/.changelog/v0.48.0/summary.md b/.changelog/v0.48.0/summary.md
new file mode 100644
index 000000000..86454e131
--- /dev/null
+++ b/.changelog/v0.48.0/summary.md
@@ -0,0 +1,20 @@
+In this release, we've undertaken a comprehensive overhaul of the **`ibc-rs`**
+repository, resulting in a strategic reorganization of the codebase. This
+restructuring dissects the implementation of each IBC specification,
+categorizing and situating them within relevant libraries. The primary objective
+is to elevate `ibc-rs` practicality and enhance user flexibility by providing a
+more modular and composable experience.
+
+Users now have the flexibility to choose from a spectrum of dependencies. They
+can opt to utilize the entire suite of meta-crates, such as `ibc`, `ibc-core`,
+`ibc-clients`, or `ibc-apps`. Alternatively, they can exercise fine-grained
+control by selectively importing specific crates. This can involve bringing in
+an entire implemented IBC sub-module, like the `ibc-core-client` crate, or
+importing only the associated data structures of a module, such as the
+`ibc-core-client-types` crate.
+
+Furthermore, this release introduces optimizations centered around construction
+and validation of ICS-24 host identifiers, aiming to curtail some heap
+allocations, beneficial for resource-constrained hosts.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.48.1/bug-fixes/770-fix-cargo-test-no-default-features.md b/.changelog/v0.48.1/bug-fixes/770-fix-cargo-test-no-default-features.md
new file mode 100644
index 000000000..ab687989d
--- /dev/null
+++ b/.changelog/v0.48.1/bug-fixes/770-fix-cargo-test-no-default-features.md
@@ -0,0 +1,2 @@
+- Fix Cargo test failure with `--no-default-features` flag.
+  ([\#770](https://github.com/cosmos/ibc-rs/issues/770))
diff --git a/.changelog/v0.48.1/bug-fixes/987-serde-json-feature.md b/.changelog/v0.48.1/bug-fixes/987-serde-json-feature.md
new file mode 100644
index 000000000..03b70b888
--- /dev/null
+++ b/.changelog/v0.48.1/bug-fixes/987-serde-json-feature.md
@@ -0,0 +1,3 @@
+- Fix dependency resolution by removing the `dep:` syntax in `serde` feature of
+  `ibc-app-transfer` crate.
+  ([\#987](https://github.com/cosmos/ibc-rs/issues/987))
diff --git a/.changelog/v0.48.1/summary.md b/.changelog/v0.48.1/summary.md
new file mode 100644
index 000000000..72df2fc53
--- /dev/null
+++ b/.changelog/v0.48.1/summary.md
@@ -0,0 +1,4 @@
+This patch release eliminates the `dep:` syntax from the `serde` feature,
+addressing potential dependency resolution issue stemming from Rust v1.70.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.48.2/bug-fixes/1004-fix-packet-sequence-encoding.md b/.changelog/v0.48.2/bug-fixes/1004-fix-packet-sequence-encoding.md
new file mode 100644
index 000000000..cc43e371d
--- /dev/null
+++ b/.changelog/v0.48.2/bug-fixes/1004-fix-packet-sequence-encoding.md
@@ -0,0 +1,2 @@
+- `[ibc-core-host-types]` Encode packet sequence into a big endian bytes.
+  ([\#1004](https://github.com/cosmos/ibc-rs/pull/1004))
diff --git a/.changelog/v0.48.2/bug-fixes/1010-fix-recursive-call-in-conn-state-converstion-to-i32.md b/.changelog/v0.48.2/bug-fixes/1010-fix-recursive-call-in-conn-state-converstion-to-i32.md
new file mode 100644
index 000000000..c1c9209e5
--- /dev/null
+++ b/.changelog/v0.48.2/bug-fixes/1010-fix-recursive-call-in-conn-state-converstion-to-i32.md
@@ -0,0 +1,2 @@
+- `[ibc-core-connection-types]` Fix recursive call in connection `State`
+  conversion to `i32` ([\#1010](https://github.com/cosmos/ibc-rs/issues/1010))
diff --git a/.changelog/v0.48.2/summary.md b/.changelog/v0.48.2/summary.md
new file mode 100644
index 000000000..119af0fdf
--- /dev/null
+++ b/.changelog/v0.48.2/summary.md
@@ -0,0 +1,6 @@
+This patch release resolves two issues. It corrects the packet sequence number
+encoding within Timeout message handlers to align with the big-endian format and
+addresses a recursive call error during the conversion from connection `State`
+to `i32`.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.49.1/breaking-changes/1014-better-client-id-new.md b/.changelog/v0.49.1/breaking-changes/1014-better-client-id-new.md
new file mode 100644
index 000000000..2c7ad406e
--- /dev/null
+++ b/.changelog/v0.49.1/breaking-changes/1014-better-client-id-new.md
@@ -0,0 +1,4 @@
+- `[ibc-core-host-types]` Introduce `ClientType::build_client_id` which avoids unnecessary validaiton.
+  ([#1014](https://github.com/cosmos/ibc-rs/issues/1014))
+- `[ibc-core-host-types]` Optimise `ClientId::new` to avoid unnecessary validaiton and temporary
+  string allocation. ([#1014](https://github.com/cosmos/ibc-rs/issues/1014))
diff --git a/.changelog/v0.49.1/breaking-changes/837-split-sent-coins-method copy.md b/.changelog/v0.49.1/breaking-changes/837-split-sent-coins-method copy.md
new file mode 100644
index 000000000..f3877cdbb
--- /dev/null
+++ b/.changelog/v0.49.1/breaking-changes/837-split-sent-coins-method copy.md	
@@ -0,0 +1,5 @@
+- `[ibc-app-transfer]` Refactor `send-coins-*()` methods by breaking them down
+  into distinct escrow and unescrow methods, enhancing both clarity and
+  specificity in functionality.
+  ([\#837](https://github.com/cosmos/ibc-rs/issues/837))
+  
\ No newline at end of file
diff --git a/.changelog/v0.49.1/breaking-changes/839-add-memo-field-for-token-escrow.md b/.changelog/v0.49.1/breaking-changes/839-add-memo-field-for-token-escrow.md
new file mode 100644
index 000000000..f506d8809
--- /dev/null
+++ b/.changelog/v0.49.1/breaking-changes/839-add-memo-field-for-token-escrow.md
@@ -0,0 +1,5 @@
+- `[ibc-app-transfer]` Add `memo` field to `escrow-coins-*()` and
+  `burn-coins-*()` methods, allowing implementors to pass in arbitrary data
+  necessary for their use case.
+  ([\#839](https://github.com/cosmos/ibc-rs/issues/837))
+  
\ No newline at end of file
diff --git a/.changelog/v0.49.1/breaking-changes/978-identifier-error.md b/.changelog/v0.49.1/breaking-changes/978-identifier-error.md
new file mode 100644
index 000000000..51bc5be68
--- /dev/null
+++ b/.changelog/v0.49.1/breaking-changes/978-identifier-error.md
@@ -0,0 +1,2 @@
+- `[ibc-core-host-type]` Optimize `IdentifierError` variants and make them
+  mutually exclusive. ([\#978](https://github.com/cosmos/ibc-rs/issues/978))
diff --git a/.changelog/v0.49.1/breaking-changes/993-bump-ibc-proto-rs.md b/.changelog/v0.49.1/breaking-changes/993-bump-ibc-proto-rs.md
new file mode 100644
index 000000000..07c4e5024
--- /dev/null
+++ b/.changelog/v0.49.1/breaking-changes/993-bump-ibc-proto-rs.md
@@ -0,0 +1,2 @@
+- `[ibc-data-types]` Bump ibc-proto-rs dependency to v0.39.1.
+  ([\#993](https://github.com/cosmos/ibc-rs/issues/993))
diff --git a/.changelog/v0.49.1/breaking-changes/997-minimize-prost-dependency.md b/.changelog/v0.49.1/breaking-changes/997-minimize-prost-dependency.md
new file mode 100644
index 000000000..558b56b31
--- /dev/null
+++ b/.changelog/v0.49.1/breaking-changes/997-minimize-prost-dependency.md
@@ -0,0 +1,5 @@
+- `[ibc]` Minimize `prost` dependency by introducing `ToVec` trait
+  - Now `prost` is only imported in `ibc-primitives` crate
+  - Remove error variants originating from `prost` (Breaking change)
+  - Eliminate the need for the `bytes` dependency
+ ([\#997](https://github.com/cosmos/ibc-rs/issues/997))
diff --git a/.changelog/v0.49.1/features/1008-commitment-proof-bytes-as-ref.md b/.changelog/v0.49.1/features/1008-commitment-proof-bytes-as-ref.md
new file mode 100644
index 000000000..aaedebef0
--- /dev/null
+++ b/.changelog/v0.49.1/features/1008-commitment-proof-bytes-as-ref.md
@@ -0,0 +1,4 @@
+- `[ibc-core-commitment-types`] implement `AsRef<Vec<u8>>` and
+  `AsRef<[u8]>` for `CommitmentProofBytes` so it’s possible to gain
+  access to the proof byte slice without having to own the object.
+  ([#1008](https://github.com/cosmos/ibc-rs/pull/1008))
diff --git a/.changelog/v0.49.1/improvements/1005-status-verify-active.md b/.changelog/v0.49.1/improvements/1005-status-verify-active.md
new file mode 100644
index 000000000..8aef96bb5
--- /dev/null
+++ b/.changelog/v0.49.1/improvements/1005-status-verify-active.md
@@ -0,0 +1,2 @@
+- `[ibc-core-client-types]` Add a convenient `Status::verify_is_active` method.
+  ([#1005](https://github.com/cosmos/ibc-rs/pull/1005))
diff --git a/.changelog/v0.49.1/improvements/1011-status-verify-active.md b/.changelog/v0.49.1/improvements/1011-status-verify-active.md
new file mode 100644
index 000000000..65b3e911a
--- /dev/null
+++ b/.changelog/v0.49.1/improvements/1011-status-verify-active.md
@@ -0,0 +1,2 @@
+- `[ibc-primitives]` Derive `Hash` on `Timestamp` instead of explicit
+  implementation ([#1011](https://github.com/cosmos/ibc-rs/pull/1005))
diff --git a/.changelog/v0.49.1/improvements/1017-use-global-paths-in-generated-code.md b/.changelog/v0.49.1/improvements/1017-use-global-paths-in-generated-code.md
new file mode 100644
index 000000000..89282ec02
--- /dev/null
+++ b/.changelog/v0.49.1/improvements/1017-use-global-paths-in-generated-code.md
@@ -0,0 +1,3 @@
+- `[ibc-derive]` Use global paths in generated code by macros to prevent
+  namespace conflicts with local modules
+  ([#1017](https://github.com/cosmos/ibc-rs/pull/1017))
diff --git a/.changelog/v0.49.1/improvements/992-more-rigorous-cosmwasm-check.md b/.changelog/v0.49.1/improvements/992-more-rigorous-cosmwasm-check.md
new file mode 100644
index 000000000..a4c91b322
--- /dev/null
+++ b/.changelog/v0.49.1/improvements/992-more-rigorous-cosmwasm-check.md
@@ -0,0 +1,3 @@
+- `[cw-check]` More rigorous CosmWasm check by upgrading dependencies and
+  including `std` and `schema` features for `ibc-core`.
+  ([\#992](https://github.com/cosmos/ibc-rs/pull/992))
diff --git a/.changelog/v0.49.1/improvements/993-streamline-msg-trait.md b/.changelog/v0.49.1/improvements/993-streamline-msg-trait.md
new file mode 100644
index 000000000..439644449
--- /dev/null
+++ b/.changelog/v0.49.1/improvements/993-streamline-msg-trait.md
@@ -0,0 +1,2 @@
+- `[ibc-primitives]` streamline `Msg` trait and rename to `ToProto`
+ ([#993](https://github.com/cosmos/ibc-rs/issues/993))
diff --git a/.changelog/v0.49.1/improvements/996-custom-chain-id-deserialization.md b/.changelog/v0.49.1/improvements/996-custom-chain-id-deserialization.md
new file mode 100644
index 000000000..c77fda22d
--- /dev/null
+++ b/.changelog/v0.49.1/improvements/996-custom-chain-id-deserialization.md
@@ -0,0 +1 @@
+- `[ibc-core-host-types]` Implement custom JSON and Borsh deserialization for `ChainId` ([#996](https://github.com/cosmos/ibc-rs/pull/1013))
\ No newline at end of file
diff --git a/.changelog/v0.49.1/summary.md b/.changelog/v0.49.1/summary.md
new file mode 100644
index 000000000..672de2863
--- /dev/null
+++ b/.changelog/v0.49.1/summary.md
@@ -0,0 +1,13 @@
+This release continues the trend of further decoupling dependencies between the different `ibc-rs`
+sub-crates and modules. 
+
+In particular, the `prost` dependency is now only imported in the `ibc-primitives`
+crate; note that error variants originating from `prost` have largely been removed, which is a breaking
+change. The `bytes` dependency was also removed. Additionally, `CommitmentProofBytes` can now be 
+accessed without explicit ownership of the object which the proof is being queried for. 
+
+Some other notable improvements include making the CosmWasm check more rigorous, streamlining the 
+`Msg` trait and renaming it to `ToProto`, as well as implementing custom JSON and Borsh `ChainId`
+deserialization. 
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.50.0/breaking-changes/1036-bump-ibc-proto-to-v0-41-0.md b/.changelog/v0.50.0/breaking-changes/1036-bump-ibc-proto-to-v0-41-0.md
new file mode 100644
index 000000000..30572655f
--- /dev/null
+++ b/.changelog/v0.50.0/breaking-changes/1036-bump-ibc-proto-to-v0-41-0.md
@@ -0,0 +1,2 @@
+- [ibc] Bump `ibc-proto-rs` to v0.41.0
+  ([\#1036](https://github.com/cosmos/ibc-rs/pull/1036)).
diff --git a/.changelog/v0.50.0/bug-fixes/910-refactor-client-state-derive-to-handle-context-with-generics.md b/.changelog/v0.50.0/bug-fixes/910-refactor-client-state-derive-to-handle-context-with-generics.md
new file mode 100644
index 000000000..90abb1fe1
--- /dev/null
+++ b/.changelog/v0.50.0/bug-fixes/910-refactor-client-state-derive-to-handle-context-with-generics.md
@@ -0,0 +1,2 @@
+- [ibc-derive] Refactor `ClientState` macro derivation to handle contexts with
+  generic types. ([\#910](https://github.com/cosmos/ibc-rs/issues/910))
diff --git a/.changelog/v0.50.0/bug-fixes/999-make-ibc-derive-work-with-ibc-core.md b/.changelog/v0.50.0/bug-fixes/999-make-ibc-derive-work-with-ibc-core.md
new file mode 100644
index 000000000..587f8b3da
--- /dev/null
+++ b/.changelog/v0.50.0/bug-fixes/999-make-ibc-derive-work-with-ibc-core.md
@@ -0,0 +1,2 @@
+- [ibc-derive] Adapt macro derivations to integrate with projects dependent on
+  `ibc-core` ([\#999](https://github.com/cosmos/ibc-rs/issues/999)).
diff --git a/.changelog/v0.50.0/features/1030-implement-08-wasm-client-types.md b/.changelog/v0.50.0/features/1030-implement-08-wasm-client-types.md
new file mode 100644
index 000000000..ed229a895
--- /dev/null
+++ b/.changelog/v0.50.0/features/1030-implement-08-wasm-client-types.md
@@ -0,0 +1,2 @@
+- [ibc-client-wasm-types] Implement ICS-08 Wasm light client domain types
+  ([\#1030](https://github.com/cosmos/ibc-rs/issues/1030)).
diff --git a/.changelog/v0.50.0/features/1128-derive-schemars-on-some-ibc-core-structs.md b/.changelog/v0.50.0/features/1128-derive-schemars-on-some-ibc-core-structs.md
new file mode 100644
index 000000000..9c1693c4e
--- /dev/null
+++ b/.changelog/v0.50.0/features/1128-derive-schemars-on-some-ibc-core-structs.md
@@ -0,0 +1,3 @@
+- [ibc-core] Add `schemars` derivation on some more IBC core structs like
+  `Status`, `ConnectionEnd` and `ChannelEnd`
+  ([\#1129](https://github.com/cosmos/ibc-rs/pull/1129))
diff --git a/.changelog/v0.50.0/features/1128-domain-request-response-query-types.md b/.changelog/v0.50.0/features/1128-domain-request-response-query-types.md
new file mode 100644
index 000000000..ca903f850
--- /dev/null
+++ b/.changelog/v0.50.0/features/1128-domain-request-response-query-types.md
@@ -0,0 +1,3 @@
+- [ibc-query] Add domain definitions for request/response query types and their
+  corresponding conversions to/from protos
+  ([\#1128](https://github.com/cosmos/ibc-rs/issues/1128))
diff --git a/.changelog/v0.50.0/features/346-implement-ics721-nft-transfer.md b/.changelog/v0.50.0/features/346-implement-ics721-nft-transfer.md
new file mode 100644
index 000000000..0a68909ff
--- /dev/null
+++ b/.changelog/v0.50.0/features/346-implement-ics721-nft-transfer.md
@@ -0,0 +1,2 @@
+- [ibc-app-nft-transfer] Implement ICS-721 NFT transfer application
+  ([\#346](https://github.com/cosmos/ibc-rs/issues/346))
diff --git a/.changelog/v0.50.0/improvements/1041-re-export-missing-types.md b/.changelog/v0.50.0/improvements/1041-re-export-missing-types.md
new file mode 100644
index 000000000..eff7dec39
--- /dev/null
+++ b/.changelog/v0.50.0/improvements/1041-re-export-missing-types.md
@@ -0,0 +1,2 @@
+- [ibc-data-types] Re-export clients' domain type from `ibc-data-types`
+  ([\#1041](https://github.com/cosmos/ibc-rs/pull/1041)).
diff --git a/.changelog/v0.50.0/improvements/1042-deprecate-mockcontext-new-methods.md b/.changelog/v0.50.0/improvements/1042-deprecate-mockcontext-new-methods.md
new file mode 100644
index 000000000..7acac9522
--- /dev/null
+++ b/.changelog/v0.50.0/improvements/1042-deprecate-mockcontext-new-methods.md
@@ -0,0 +1,2 @@
+- [ibc-testkit] Deprecate `MockContext::new*` in favor of `MockContextConfig`.
+  ([\#1042](https://github.com/cosmos/ibc-rs/issues/1042))
diff --git a/.changelog/v0.50.0/improvements/1043-remove-field-access-of-mockcontext.md b/.changelog/v0.50.0/improvements/1043-remove-field-access-of-mockcontext.md
new file mode 100644
index 000000000..8b0470932
--- /dev/null
+++ b/.changelog/v0.50.0/improvements/1043-remove-field-access-of-mockcontext.md
@@ -0,0 +1,2 @@
+- [ibc-testkit] Remove field access of `MockContext`.
+  ([\#1043](https://github.com/cosmos/ibc-rs/issues/1043))
diff --git a/.changelog/v0.50.0/improvements/1049-deprecate-mockcontext-withclient-methods.md b/.changelog/v0.50.0/improvements/1049-deprecate-mockcontext-withclient-methods.md
new file mode 100644
index 000000000..900bc46eb
--- /dev/null
+++ b/.changelog/v0.50.0/improvements/1049-deprecate-mockcontext-withclient-methods.md
@@ -0,0 +1,3 @@
+- [ibc-testkit] Deprecate `MockContext::with_client*` in favor of
+  `MockContext::with_client_config`.
+  ([\#1049](https://github.com/cosmos/ibc-rs/issues/1049))
diff --git a/.changelog/v0.50.0/improvements/1054-re-export-all-google-proto-types.md b/.changelog/v0.50.0/improvements/1054-re-export-all-google-proto-types.md
new file mode 100644
index 000000000..ba220b316
--- /dev/null
+++ b/.changelog/v0.50.0/improvements/1054-re-export-all-google-proto-types.md
@@ -0,0 +1,3 @@
+- [ibc-primitives] Re-export additional google proto types, like `Timestamp`
+  and `Duration` for added convenience when developing IBC light clients or
+  applications. ([\#1054](https://github.com/cosmos/ibc-rs/pull/1054))
diff --git a/.changelog/v0.50.0/improvements/1055-move-serializers-into-ibc-primitives.md b/.changelog/v0.50.0/improvements/1055-move-serializers-into-ibc-primitives.md
new file mode 100644
index 000000000..495624bc2
--- /dev/null
+++ b/.changelog/v0.50.0/improvements/1055-move-serializers-into-ibc-primitives.md
@@ -0,0 +1,3 @@
+- [ibc-primitives] Relocate `serializers.rs` module to reside within the
+  `ibc-primitives` crate extending its utility for a broader range of IBC
+  applications. ([\#1055](https://github.com/cosmos/ibc-rs/issues/1055))
diff --git a/.changelog/v0.50.0/summary.md b/.changelog/v0.50.0/summary.md
new file mode 100644
index 000000000..0e8fd1cee
--- /dev/null
+++ b/.changelog/v0.50.0/summary.md
@@ -0,0 +1,15 @@
+This release introduces several noteworthy libraries. A standout addition is the
+implementation of the ICS-721 NFT transfer application, enabling the transfer of
+NFT packets across chains that support this capability.
+
+In addition, It incorporates the ICS-08 Wasm light client data structure and
+types. This empowers light client developers to create CosmWasm contracts for
+deployment on Cosmos chains compatible with the version of `ibc-go` supporting
+ICS-08 Wasm client.
+
+Moreover, it exposes additional convenient types and serializers through
+`ibc-primitives` and includes a more flexible constructor for `MockContext`
+types within the `ibc-testkit` crate, allows for testing with diverse parameter
+combinations.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.51.0/breaking-changes/1114-refactor-client-relevant-apis.md b/.changelog/v0.51.0/breaking-changes/1114-refactor-client-relevant-apis.md
new file mode 100644
index 000000000..42bf3fa7e
--- /dev/null
+++ b/.changelog/v0.51.0/breaking-changes/1114-refactor-client-relevant-apis.md
@@ -0,0 +1,3 @@
+- [ibc] Refactor client relevant APIs for improved modularity and allow
+  standalone ICS-02 integration
+  ([\#1114](https://github.com/cosmos/ibc-rs/issues/1114))
diff --git a/.changelog/v0.51.0/breaking-changes/1118-bump-msrv.md b/.changelog/v0.51.0/breaking-changes/1118-bump-msrv.md
new file mode 100644
index 000000000..631b644d3
--- /dev/null
+++ b/.changelog/v0.51.0/breaking-changes/1118-bump-msrv.md
@@ -0,0 +1,2 @@
+- [ibc] Increase minimum supported Rust version to 1.71.1
+  ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
diff --git a/.changelog/v0.51.0/breaking-changes/1125-upgrade-ibc-proto-to-v042.md b/.changelog/v0.51.0/breaking-changes/1125-upgrade-ibc-proto-to-v042.md
new file mode 100644
index 000000000..8df9dec51
--- /dev/null
+++ b/.changelog/v0.51.0/breaking-changes/1125-upgrade-ibc-proto-to-v042.md
@@ -0,0 +1,2 @@
+- [ibc] Upgrade `ibc-proto-rs` to `v0.42.2`
+  ([\#1125](https://github.com/cosmos/ibc-rs/pull/1125))
diff --git a/.changelog/v0.51.0/breaking-changes/835-msg-update-client-handler-accept-misbehaviour.md b/.changelog/v0.51.0/breaking-changes/835-msg-update-client-handler-accept-misbehaviour.md
new file mode 100644
index 000000000..6e6b8488e
--- /dev/null
+++ b/.changelog/v0.51.0/breaking-changes/835-msg-update-client-handler-accept-misbehaviour.md
@@ -0,0 +1,3 @@
+- [ibc-core] Update `MsgUpdateClient` handler to accept misbehaviour reports via
+  its `client_message` field
+  ([\#835](https://github.com/cosmos/ibc-rs/issues/835))
diff --git a/.changelog/v0.51.0/breaking-changes/973-update-meta.md b/.changelog/v0.51.0/breaking-changes/973-update-meta.md
new file mode 100644
index 000000000..97702e220
--- /dev/null
+++ b/.changelog/v0.51.0/breaking-changes/973-update-meta.md
@@ -0,0 +1,6 @@
+- [ibc-core-client] Merge client update time and height modification method
+  pairs into one, that is replace
+  a) client_update_{time,height} by update_meta,
+  b) store_update_{time,height} by store_update_meta and
+  c) delete_update_{time,height} by delete_update_meta.
+  ([\#973](https://github.com/cosmos/ibc-rs/issues/973))
diff --git a/.changelog/v0.51.0/bug-fixes/1059-add-missing-deps-for-feature-flags.md b/.changelog/v0.51.0/bug-fixes/1059-add-missing-deps-for-feature-flags.md
new file mode 100644
index 000000000..42592cb58
--- /dev/null
+++ b/.changelog/v0.51.0/bug-fixes/1059-add-missing-deps-for-feature-flags.md
@@ -0,0 +1,2 @@
+- [ibc] Add missing dependencies for some feature flags across multiple crates
+  ([\#1059](https://github.com/cosmos/ibc-rs/issues/1059))
diff --git a/.changelog/v0.51.0/bug-fixes/1061-ease-frozen-height-check-ics07-try-from.md b/.changelog/v0.51.0/bug-fixes/1061-ease-frozen-height-check-ics07-try-from.md
new file mode 100644
index 000000000..d3aa5cacc
--- /dev/null
+++ b/.changelog/v0.51.0/bug-fixes/1061-ease-frozen-height-check-ics07-try-from.md
@@ -0,0 +1,5 @@
+- [ibc-client-tendermint-types] Ease frozen Height check in the tendermint
+  `ClientState` protobuf deserialization, and consequently include frozen client
+  check for client creation path.
+  ([\#1061](https://github.com/cosmos/ibc-rs/issues/1061)),
+  ([\#1063](https://github.com/cosmos/ibc-rs/pull/1063))
diff --git a/.changelog/v0.51.0/bug-fixes/1080-use-header-height-for-tm-consensus-state-storage.md b/.changelog/v0.51.0/bug-fixes/1080-use-header-height-for-tm-consensus-state-storage.md
new file mode 100644
index 000000000..a9a3124ac
--- /dev/null
+++ b/.changelog/v0.51.0/bug-fixes/1080-use-header-height-for-tm-consensus-state-storage.md
@@ -0,0 +1,2 @@
+- [ibc-client-tendermint] Use header height for Tendermint consensus state storage
+  ([\#1080](https://github.com/cosmos/ibc-rs/issues/1080))
diff --git a/.changelog/v0.51.0/bug-fixes/1083-bump-serde-json.md b/.changelog/v0.51.0/bug-fixes/1083-bump-serde-json.md
new file mode 100644
index 000000000..e3ffff7b4
--- /dev/null
+++ b/.changelog/v0.51.0/bug-fixes/1083-bump-serde-json.md
@@ -0,0 +1,3 @@
+- [ibc] Upgrade `serde_json` to "1.0.1" to address an stack overflow issue
+  within the `serde-json-wasm` crate
+  ([\#1083](https://github.com/cosmos/ibc-rs/pull/1083))
diff --git a/.changelog/v0.51.0/bug-fixes/1084-fix-potential-base64-resolution-issue.md b/.changelog/v0.51.0/bug-fixes/1084-fix-potential-base64-resolution-issue.md
new file mode 100644
index 000000000..17ab5aca2
--- /dev/null
+++ b/.changelog/v0.51.0/bug-fixes/1084-fix-potential-base64-resolution-issue.md
@@ -0,0 +1,3 @@
+- [ibc] Resolve potential `base64` dependency resolution issue by bringing it to
+  the workspace `Cargo.toml`
+  ([\#1084](https://github.com/cosmos/ibc-rs/issues/1084))
diff --git a/.changelog/v0.51.0/bug-fixes/1100-fix-tendermint-empty-proof-specs-check.md b/.changelog/v0.51.0/bug-fixes/1100-fix-tendermint-empty-proof-specs-check.md
new file mode 100644
index 000000000..b4a3aa542
--- /dev/null
+++ b/.changelog/v0.51.0/bug-fixes/1100-fix-tendermint-empty-proof-specs-check.md
@@ -0,0 +1,2 @@
+- [ibc-client-tendermint-types] Check ics23 proof specs for empty depth range.
+  ([\#1100](https://github.com/cosmos/ibc-rs/issues/1100))
diff --git a/.changelog/v0.51.0/feature/1065-add-new-storage-paths.md b/.changelog/v0.51.0/feature/1065-add-new-storage-paths.md
new file mode 100644
index 000000000..8efd486b7
--- /dev/null
+++ b/.changelog/v0.51.0/feature/1065-add-new-storage-paths.md
@@ -0,0 +1,2 @@
+- [ibc-core-host] Add remaining storage paths.
+  ([\#1065](https://github.com/cosmos/ibc-rs/issues/1065))
diff --git a/.changelog/v0.51.0/feature/1090-add-iterate-consensus-states-key.md b/.changelog/v0.51.0/feature/1090-add-iterate-consensus-states-key.md
new file mode 100644
index 000000000..9fef7afd9
--- /dev/null
+++ b/.changelog/v0.51.0/feature/1090-add-iterate-consensus-states-key.md
@@ -0,0 +1,3 @@
+- [ibc-core-host] Add iteration key for cross-compatibility with `ibc-go` used
+  for iterating over consensus states
+  ([\#1090](https://github.com/cosmos/ibc-rs/issues/1090))
diff --git a/.changelog/v0.51.0/feature/1147-allow-custom-HostFunctionsProvider.md b/.changelog/v0.51.0/feature/1147-allow-custom-HostFunctionsProvider.md
new file mode 100644
index 000000000..dd792f66b
--- /dev/null
+++ b/.changelog/v0.51.0/feature/1147-allow-custom-HostFunctionsProvider.md
@@ -0,0 +1,4 @@
+- [ibc] Enable the use of custom hashing functions by making `MerkleProof`
+  validation methods generic over `HostFunctionsProvider` and using
+  `hash_with<H>()` instead of `hash()` wherever validators' hash is computed.
+  ([\#1147](https://github.com/cosmos/ibc-rs/issues/1147))
diff --git a/.changelog/v0.51.0/improvements/1060-ease-serde-derive-on-ics20-721-types.md b/.changelog/v0.51.0/improvements/1060-ease-serde-derive-on-ics20-721-types.md
new file mode 100644
index 000000000..7d6fd9306
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1060-ease-serde-derive-on-ics20-721-types.md
@@ -0,0 +1,2 @@
+- [ibc-apps] Ease `serde` derive on `ICS-20` and `ICS-721` types
+  ([\#1060](https://github.com/cosmos/ibc-rs/pull/1060))
diff --git a/.changelog/v0.51.0/improvements/1074-refactor-default-implemetation.md b/.changelog/v0.51.0/improvements/1074-refactor-default-implemetation.md
new file mode 100644
index 000000000..908463b41
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1074-refactor-default-implemetation.md
@@ -0,0 +1,2 @@
+- [ibc-data-types] Refactor `Default` implementations with concrete names
+  ([\#1074](https://github.com/cosmos/ibc-rs/issues/1074))
diff --git a/.changelog/v0.51.0/improvements/1077-deprecate-msgsubmitmisbehaviour.md b/.changelog/v0.51.0/improvements/1077-deprecate-msgsubmitmisbehaviour.md
new file mode 100644
index 000000000..e92dc29d2
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1077-deprecate-msgsubmitmisbehaviour.md
@@ -0,0 +1,3 @@
+- [ibc-core] Deprecate `MsgSubmitMisbehaviour` in favor of `MsgUpdateClient` for
+  submitting misbehaviour reports
+  ([\#1077](https://github.com/cosmos/ibc-rs/issues/1077))
diff --git a/.changelog/v0.51.0/improvements/1089-implement-convenient-path-methods.md b/.changelog/v0.51.0/improvements/1089-implement-convenient-path-methods.md
new file mode 100644
index 000000000..b93a64caf
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1089-implement-convenient-path-methods.md
@@ -0,0 +1,3 @@
+- [ibc-core-host] Improve path segment access by exposing path prefixes and
+  implementing some convenient parent/leaf methods
+  ([\#1089](https://github.com/cosmos/ibc-rs/issues/1089))
diff --git a/.changelog/v0.51.0/improvements/1097-detach-client-state-verifier.md b/.changelog/v0.51.0/improvements/1097-detach-client-state-verifier.md
new file mode 100644
index 000000000..35203b08c
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1097-detach-client-state-verifier.md
@@ -0,0 +1,3 @@
+- [ibc-client-tendermint] Detach client state verifier such that users have a
+  way to utilize custom verifiers
+  ([\#1097](https://github.com/cosmos/ibc-rs/pull/1097))
diff --git a/.changelog/v0.51.0/improvements/1101-use-let-else-over-downcast.md b/.changelog/v0.51.0/improvements/1101-use-let-else-over-downcast.md
new file mode 100644
index 000000000..876e19c91
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1101-use-let-else-over-downcast.md
@@ -0,0 +1,2 @@
+- [ibc-primitives] Use `let-else` over `downcast!()` and remove `utils/macros`
+  module as a result ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
diff --git a/.changelog/v0.51.0/improvements/1120-rm-redundant-shadowing.md b/.changelog/v0.51.0/improvements/1120-rm-redundant-shadowing.md
new file mode 100644
index 000000000..80eb17307
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1120-rm-redundant-shadowing.md
@@ -0,0 +1,2 @@
+- [ibc-core] Remove unnecessary shadowing with same value
+  ([\#1120](https://github.com/cosmos/ibc-rs/issues/1120))
diff --git a/.changelog/v0.51.0/improvements/1123-remove-check-for-unitialized-connection-end-state.md b/.changelog/v0.51.0/improvements/1123-remove-check-for-unitialized-connection-end-state.md
new file mode 100644
index 000000000..cf37686ec
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/1123-remove-check-for-unitialized-connection-end-state.md
@@ -0,0 +1,3 @@
+- [ibc-core-connection] Remove `State::Uninitialized` check while parsing
+  `ConnectionEnd` from Protobuf
+  ([\#1123](https://github.com/cosmos/ibc-rs/issues/1123))
diff --git a/.changelog/v0.51.0/improvements/394-remove-order-match.md b/.changelog/v0.51.0/improvements/394-remove-order-match.md
new file mode 100644
index 000000000..1997e6026
--- /dev/null
+++ b/.changelog/v0.51.0/improvements/394-remove-order-match.md
@@ -0,0 +1,2 @@
+- [ibc-core] Deprecate `ChannelEnd::order_matches` method
+  ([\#394](https://github.com/cosmos/ibc-rs/issues/394))
diff --git a/.changelog/v0.51.0/summary.md b/.changelog/v0.51.0/summary.md
new file mode 100644
index 000000000..98bae05bc
--- /dev/null
+++ b/.changelog/v0.51.0/summary.md
@@ -0,0 +1,11 @@
+This release introduces a few changes for better customizability. The main one is modularizing ICS-24, ICS-02, and ICS-07 trait implementations. This change empowers developers to write Rust light clients succinctly in a smart-contract context like CosmWasm. Also, the default Tendermint client state verifier is now detached to support custom verifiers, if required.
+
+In addition, this version fixes a bug where the consensus state is incorrectly stored when a header with an older height is submitted.
+
+Furthermore, a set of new host keys is added. This makes `ibc-rs` more consistent with the storage access of `ibc-go`. Also, access to client update information is merged into a single method; instead of individual details.
+
+This release updates the `ibc-proto-rs` dependency to `v0.42.2`. This takes account of the updated `MsgUpdateClient` and deprecates `MsgSubmitMisbehaviour`. Also, `ibc-derive` dependency is updated to `v0.6.1`.
+
+Finally, the minimum supported Rust version is corrected and updated to `1.71.1`.
+
+There are no consensus-breaking changes.
diff --git a/.changelog/v0.52.0/breaking-changes/1163-make-ics07-custom-context-traits-portable.md b/.changelog/v0.52.0/breaking-changes/1163-make-ics07-custom-context-traits-portable.md
new file mode 100644
index 000000000..726da305b
--- /dev/null
+++ b/.changelog/v0.52.0/breaking-changes/1163-make-ics07-custom-context-traits-portable.md
@@ -0,0 +1,5 @@
+- [ibc] Enhance portability of custom `Validation/ExecutionContext` traits under
+  ICS-07. They are relocated, along with the rest of the
+  client-relevant context APIs, under ICS-02, with the traits renamed to
+  `ExtClientValidationContext` and `ExtClientExecutionContext` for improved
+  self-description ([\#1163](https://github.com/cosmos/ibc-rs/issues/1163))
diff --git a/.changelog/v0.52.0/breaking-changes/1168-discard-TmVerifier.md b/.changelog/v0.52.0/breaking-changes/1168-discard-TmVerifier.md
new file mode 100644
index 000000000..3c84200a6
--- /dev/null
+++ b/.changelog/v0.52.0/breaking-changes/1168-discard-TmVerifier.md
@@ -0,0 +1,4 @@
+- [ibc-client-tendermint] Simplify custom verifiers usage for Tendermint
+  clients by directly binding with `tendermint_light_client_verifier::Verifier`
+  and removing the unused `TmVerifier` trait.
+  ([\#1168](https://github.com/cosmos/ibc-rs/pull/1168))
diff --git a/.changelog/v0.52.0/breaking-changes/1193-bump-msrv.md b/.changelog/v0.52.0/breaking-changes/1193-bump-msrv.md
new file mode 100644
index 000000000..11e82593f
--- /dev/null
+++ b/.changelog/v0.52.0/breaking-changes/1193-bump-msrv.md
@@ -0,0 +1,2 @@
+- [ibc] Update minimum supported Rust version to 1.72.
+  ([\#1193](https://github.com/cosmos/ibc-rs/issues/1193))
diff --git a/.changelog/v0.52.0/bug-fixes/1154-use-query-height-in-query-helper-functions.md b/.changelog/v0.52.0/bug-fixes/1154-use-query-height-in-query-helper-functions.md
new file mode 100644
index 000000000..cf1e2bde2
--- /dev/null
+++ b/.changelog/v0.52.0/bug-fixes/1154-use-query-height-in-query-helper-functions.md
@@ -0,0 +1,2 @@
+- [ibc-query] Update standalone query functions to use the specified query
+  height ([\#1154](https://github.com/cosmos/ibc-rs/issues/1154))
diff --git a/.changelog/v0.52.0/bug-fixes/1177-fix-prefixed-denom-parsing.md b/.changelog/v0.52.0/bug-fixes/1177-fix-prefixed-denom-parsing.md
new file mode 100644
index 000000000..cf89e9a52
--- /dev/null
+++ b/.changelog/v0.52.0/bug-fixes/1177-fix-prefixed-denom-parsing.md
@@ -0,0 +1,5 @@
+- [ibc-app-transfer] Bring `PrefixedDenom` parsing up to parity with `ibc-go`.
+  ([\#1177](https://github.com/cosmos/ibc-rs/issues/1177))
+- [ibc-app-nft-transfer] Reuse `TracePrefix` and `TracePath` from
+  `ibc-app-transfer-types` when parsing `PrefixedClassId`.
+  ([\#1178](https://github.com/cosmos/ibc-rs/pull/1178))
diff --git a/.changelog/v0.52.0/bug-fixes/1179-fix-packet-attribute-name.md b/.changelog/v0.52.0/bug-fixes/1179-fix-packet-attribute-name.md
new file mode 100644
index 000000000..3040ade5d
--- /dev/null
+++ b/.changelog/v0.52.0/bug-fixes/1179-fix-packet-attribute-name.md
@@ -0,0 +1,2 @@
+- [ibc-core-channel-types] Make receive packet event type identifier consistent
+  with `ibc-go`. ([\#1180](https://github.com/cosmos/ibc-rs/issues/1180))
diff --git a/.changelog/v0.52.0/features/1164-implement-cosmwasm-integrator-library.md b/.changelog/v0.52.0/features/1164-implement-cosmwasm-integrator-library.md
new file mode 100644
index 000000000..3effca115
--- /dev/null
+++ b/.changelog/v0.52.0/features/1164-implement-cosmwasm-integrator-library.md
@@ -0,0 +1,3 @@
+- [ibc-clients] Introduce CosmWasm context library as `ibc-client-cw` crate to
+  facilitate CosmWasm contract creation for light clients built using `ibc-rs`
+  ([\#1164](https://github.com/cosmos/ibc-rs/issues/1164))
diff --git a/.changelog/v0.52.0/features/1165-implement-cosmwasm-contract-for-tendermint-clients.md b/.changelog/v0.52.0/features/1165-implement-cosmwasm-contract-for-tendermint-clients.md
new file mode 100644
index 000000000..6f3d68acb
--- /dev/null
+++ b/.changelog/v0.52.0/features/1165-implement-cosmwasm-contract-for-tendermint-clients.md
@@ -0,0 +1,3 @@
+- [ibc-client-tendermint] Introduce `ibc-client-tendermint-cw` crate
+  implementing CosmWasm contract for ICS-07 Tendermint light client.
+  ([\#1165](https://github.com/cosmos/ibc-rs/issues/1165))
diff --git a/.changelog/v0.52.0/features/738-client-recovery.md b/.changelog/v0.52.0/features/738-client-recovery.md
new file mode 100644
index 000000000..a1d7c717f
--- /dev/null
+++ b/.changelog/v0.52.0/features/738-client-recovery.md
@@ -0,0 +1,4 @@
+- [ibc-core-client] Implement [client recovery][client-recovery] feature.
+([\#738](https://github.com/cosmos/ibc-rs/issues/738))
+
+[client-recovery]: https://github.com/cosmos/ibc-go/blob/main/docs/architecture/adr-026-ibc-client-recovery-mechanisms.md
diff --git a/.changelog/v0.52.0/improvements/1108-fallible-conversion-of-ics23-types.md b/.changelog/v0.52.0/improvements/1108-fallible-conversion-of-ics23-types.md
new file mode 100644
index 000000000..3c9b5762a
--- /dev/null
+++ b/.changelog/v0.52.0/improvements/1108-fallible-conversion-of-ics23-types.md
@@ -0,0 +1,2 @@
+- [ibc-core-commitment-types] Fallible conversion for `ProofSpec`, `LeafOp` and
+  `InnerSpec`. ([\#1108](https://github.com/cosmos/ibc-rs/issues/1108))
diff --git a/.changelog/v0.52.0/improvements/1145-tendermint-boxed-header.md b/.changelog/v0.52.0/improvements/1145-tendermint-boxed-header.md
new file mode 100644
index 000000000..65f090962
--- /dev/null
+++ b/.changelog/v0.52.0/improvements/1145-tendermint-boxed-header.md
@@ -0,0 +1,4 @@
+- [ibc-client-tendermint-types] Box header fields inside of Misbehaviour type so
+  that the type is smaller (i.e. trade size of the type for heap memory).  This
+  prevents stack overflows on systems with small stack (e.g. Solana).
+  ([\#1145](https://github.com/cosmos/ibc-rs/pull/1145))
diff --git a/.changelog/v0.52.0/improvements/1149-flatten-client-message-verification-methods.md b/.changelog/v0.52.0/improvements/1149-flatten-client-message-verification-methods.md
new file mode 100644
index 000000000..75bb28043
--- /dev/null
+++ b/.changelog/v0.52.0/improvements/1149-flatten-client-message-verification-methods.md
@@ -0,0 +1,4 @@
+- [ibc-client-tendermint] Decouple the arguments of ICS07 Header/Misbehavior
+  verification functions from the Tendermint client type by flattening and
+  passing only the required fields.
+  ([\#1149](https://github.com/cosmos/ibc-rs/issues/1149))
diff --git a/.changelog/v0.52.0/improvements/1152-add-query-height-and-proof-for-client-upgrade-queries.md b/.changelog/v0.52.0/improvements/1152-add-query-height-and-proof-for-client-upgrade-queries.md
new file mode 100644
index 000000000..4b7bee3d2
--- /dev/null
+++ b/.changelog/v0.52.0/improvements/1152-add-query-height-and-proof-for-client-upgrade-queries.md
@@ -0,0 +1,3 @@
+- [ibc-query] Add support for querying `upgraded_client/consensus_state` at a
+  given height along with returning their proof of existence in the response.
+ ([\#1152](https://github.com/cosmos/ibc-rs/issues/1152))
diff --git a/.changelog/v0.52.0/improvements/1156-add-into-inner-for-ics07-consensus-state.md b/.changelog/v0.52.0/improvements/1156-add-into-inner-for-ics07-consensus-state.md
new file mode 100644
index 000000000..08c42925b
--- /dev/null
+++ b/.changelog/v0.52.0/improvements/1156-add-into-inner-for-ics07-consensus-state.md
@@ -0,0 +1,2 @@
+- [ibc-client-tendermint] Add `into_inner()` method to ICS07 `ConsensusState`
+  ([\#1156](https://github.com/cosmos/ibc-rs/pull/1156))
diff --git a/.changelog/v0.52.0/improvements/1171-update-ibc-proto-and-tendermint-deps.md b/.changelog/v0.52.0/improvements/1171-update-ibc-proto-and-tendermint-deps.md
new file mode 100644
index 000000000..0b48c06b4
--- /dev/null
+++ b/.changelog/v0.52.0/improvements/1171-update-ibc-proto-and-tendermint-deps.md
@@ -0,0 +1,2 @@
+- Update `ibc-proto` to v0.43.0 and `tendermint` dependencies to v0.35.0.
+  ([\#1171](https://github.com/cosmos/ibc-rs/issues/1171))
diff --git a/.changelog/v0.52.0/summary.md b/.changelog/v0.52.0/summary.md
new file mode 100644
index 000000000..eeb7f51bb
--- /dev/null
+++ b/.changelog/v0.52.0/summary.md
@@ -0,0 +1,18 @@
+This release adds some exciting changes, improvements, and new features to ibc-rs.
+First and foremost, support for the IBC protocol's [client recovery][client-recovery]
+mechanism has been implemented, which provides a route for frozen and expired IBC clients
+to be re-instated following a successful governance vote. In addition, a new crate,
+`ibc-client-cw`, facilitates CosmWasm contract creation for light clients built using
+`ibc-rs`. Lastly, the ics07 tendermint light client has also been packaged and included
+as a CosmWasm contract.
+
+This release also includes a myriad of other bug-fixes and improvements,
+such as enhancing the portability of ibc-rs's Validation and Execution Context traits,
+as well as fixing an incompatibility with how ibc-rs parses `PrefixDenom`s compared
+to ibc-go, among many others.
+
+The minimum-supported Rust version has been updated to `1.72`. `ibc-proto` has been
+bumped to `0.43`. `tendermint` has been bumped to `0.35`. `ibc-derive` has been
+bumped to `0.7`.
+
+There are no consensus-breaking changes as part of this release.
diff --git a/.changelog/v0.53.0/bug-fixes/1198-reject-packets-without-timeouts.md b/.changelog/v0.53.0/bug-fixes/1198-reject-packets-without-timeouts.md
new file mode 100644
index 000000000..969081559
--- /dev/null
+++ b/.changelog/v0.53.0/bug-fixes/1198-reject-packets-without-timeouts.md
@@ -0,0 +1,2 @@
+- [ibc-core] Reject IBC packets without height and timestamp timeout.
+  ([\#1198](https://github.com/cosmos/ibc-rs/issues/1198))
diff --git a/.changelog/v0.53.0/bug-fixes/1217-fix-packet-timeout-on-closed-channel.md b/.changelog/v0.53.0/bug-fixes/1217-fix-packet-timeout-on-closed-channel.md
new file mode 100644
index 000000000..e98541b39
--- /dev/null
+++ b/.changelog/v0.53.0/bug-fixes/1217-fix-packet-timeout-on-closed-channel.md
@@ -0,0 +1,2 @@
+- [ibc-core] Fix proof verification for `PacketTimeout` on a closed channel.
+  ([\#1217](https://github.com/cosmos/ibc-rs/issues/1217))
diff --git a/.changelog/v0.53.0/improvements/1044-introduce-host-trait.md b/.changelog/v0.53.0/improvements/1044-introduce-host-trait.md
new file mode 100644
index 000000000..d8b95983e
--- /dev/null
+++ b/.changelog/v0.53.0/improvements/1044-introduce-host-trait.md
@@ -0,0 +1,3 @@
+- [ibc-testkit] Replace `HostBlock` and `HostType` enums with a `Host` trait to
+  eliminate manual delegations by utilizing monomorphization.
+  ([\#1044](https://github.com/cosmos/ibc-rs/issues/1044))
diff --git a/.changelog/v0.53.0/improvements/1109-revamp-ibc-testkit.md b/.changelog/v0.53.0/improvements/1109-revamp-ibc-testkit.md
new file mode 100644
index 000000000..58dd859e8
--- /dev/null
+++ b/.changelog/v0.53.0/improvements/1109-revamp-ibc-testkit.md
@@ -0,0 +1,3 @@
+- [ibc-testkit] Major refactor of the `ibc-testkit` via
+  [ADR-09](https://github.com/cosmos/ibc-rs/blob/main/docs/architecture/adr-009-revamp-testkit.md).
+  ([\#1109](https://github.com/cosmos/ibc-rs/issues/1109))
diff --git a/.changelog/v0.53.0/improvements/1203-rm-error-type-restriction.md b/.changelog/v0.53.0/improvements/1203-rm-error-type-restriction.md
new file mode 100644
index 000000000..1e95230f6
--- /dev/null
+++ b/.changelog/v0.53.0/improvements/1203-rm-error-type-restriction.md
@@ -0,0 +1,3 @@
+- [ibc-core] Replace fixed `ClientError` associated type restriction with an
+  `Into<ClientError>` trait bound.
+  ([\#1203](https://github.com/cosmos/ibc-rs/issues/1203))
diff --git a/.changelog/v0.53.0/improvements/1212-update-ibc-proto-and-tendermint-deps.md b/.changelog/v0.53.0/improvements/1212-update-ibc-proto-and-tendermint-deps.md
new file mode 100644
index 000000000..849ca0ac6
--- /dev/null
+++ b/.changelog/v0.53.0/improvements/1212-update-ibc-proto-and-tendermint-deps.md
@@ -0,0 +1,4 @@
+- Update `ibc-proto` to v0.44.0 and `tendermint` dependencies to v0.36.0.
+  ([\#1212](https://github.com/cosmos/ibc-rs/issues/1212))
+- Revert Rust minimum supported version to `1.71.1`.
+  ([\#1206](https://github.com/cosmos/ibc-rs/pull/1206))
diff --git a/.changelog/v0.53.0/summary.md b/.changelog/v0.53.0/summary.md
new file mode 100644
index 000000000..03a7d24eb
--- /dev/null
+++ b/.changelog/v0.53.0/summary.md
@@ -0,0 +1,22 @@
+This release overhauls the `ibc-testkit` crate such that it is now able to:
+
+- simulate more realistic IBC workflows by utilizing real IBC and relayer
+  interfaces (as opposed to mocked versions)
+- validate code paths that were not easily testable beforehand, such as Merkle
+  proof generation
+- compose tests in a much more succinct and readable fashion
+
+Note that the drastic changes made to `ibc-testkit`'s structs and types are
+breaking changes.
+
+For more information and background context on the changes to `ibc-testkit` and
+the rationale behind the overhaul, please refer to [ADR 009][adr-009].
+
+This release also includes two fixes. One is to reject packets without height
+and timestamp timeout. The other is to correct the proof verification logic for
+a `PacketTimeout` due to a closed channel, which was verifying an incorrect
+field. It also bumps the minimum-supported version of `ibc-proto` to 0.44, and
+the version of `tendermint` to 0.36. Note that the minimum-supported Rust
+version was reverted back to 1.71.1.
+
+[adr-009]: https://github.com/cosmos/ibc-rs/blob/main/docs/architecture/adr-009-revamp-testkit.md
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index f825fd0f1..33b15fa70 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,13 +1,13 @@
 ---
-name: Bug Report 
+name: Bug Report
 about: Create a report to help us squash bugs!
 
 ---
 
-<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
-v               ✰  Thanks for opening an issue! ✰    
+<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
+v               ✰  Thanks for opening an issue! ✰
 v    Before smashing the submit button please review the template.
-v    Please also ensure that this is not a duplicate issue :)  
+v    Please also ensure that this is not a duplicate issue :)
 ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
 
 ## Bug Summary
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index 8bd708247..7b50c781b 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -4,11 +4,11 @@ about: Create a proposal to request a feature!
 
 ---
 
-<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺ 
-v                ✰  Thanks for opening an issue! ✰    
+<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
+v                ✰  Thanks for opening an issue! ✰
 v    Before smashing the submit button please review the template.
-v    Word of caution: poorly thought-out proposals may be rejected 
-v                     without deliberation 
+v    Word of caution: poorly thought-out proposals may be rejected
+v                     without deliberation
 ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
 
 ## Feature Summary
diff --git a/.github/ISSUE_TEMPLATE/process-improvement.md b/.github/ISSUE_TEMPLATE/process-improvement.md
index 05a7073cf..1cf320562 100644
--- a/.github/ISSUE_TEMPLATE/process-improvement.md
+++ b/.github/ISSUE_TEMPLATE/process-improvement.md
@@ -5,17 +5,17 @@ about: Create a proposal to suggest an improvement for `ibc-rs` operations!
 ---
 
 <!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
-v                ✰  Thanks for opening an issue! ✰    
+v                ✰  Thanks for opening an issue! ✰
 v    Before smashing the submit button please review the template.
 v    Please also ensure that this is not a duplicate issue :)
 ☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
 
 ## Improvement Summary
 
-<!-- Short description of the proposed improvement about the projects' processes -->
+<!-- Short description of the proposed improvement of the projects' processes -->
 
 ## Proposal
 
-<!-- Describe your proposal for how some process of `ibc-rs` should be improved -->
+<!-- Describe your proposal for how some processes of `ibc-rs` should be improved -->
 <!-- What would be the benefits if we adopted the proposal?
      Are there any disadvantages? -->
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fb75b4861..0e2e3b557 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,11 +4,33 @@
 version: 2
 updates:
   - package-ecosystem: "cargo"
-    directory: "crates/ibc"
+    directory: "/"
     schedule:
       interval: "weekly"
-
+    ignore:
+      - dependency-name: "tendermint*"
+      - dependency-name: "ibc*"
+      - dependency-name: "cosmwasm*"
+      - dependency-name: "cw*"
   - package-ecosystem: "cargo"
     directory: "ci/no-std-check"
     schedule:
       interval: "weekly"
+    ignore:
+      - dependency-name: "tendermint*"
+      - dependency-name: "ibc*"
+      - dependency-name: "cosmwasm*"
+      - dependency-name: "cw*"
+  - package-ecosystem: "cargo"
+    directory: "ci/cw-check"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "tendermint*"
+      - dependency-name: "ibc*"
+      - dependency-name: "cosmwasm*"
+      - dependency-name: "cw*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/typos.toml b/.github/typos.toml
new file mode 100644
index 000000000..800f45933
--- /dev/null
+++ b/.github/typos.toml
@@ -0,0 +1,7 @@
+[default.extend-words]
+# for serde serialization
+ser = "ser"
+
+[default]
+# random string
+extend-ignore-re = [ "[0-9A-Za-z+/]{20,}" ]
diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml
index 4ca65ae9f..b4f1f3118 100644
--- a/.github/workflows/audit.yaml
+++ b/.github/workflows/audit.yaml
@@ -1,16 +1,16 @@
 name: Security Audit
 on:
   schedule:
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 jobs:
   security_audit:
     name: Security Audit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Cache cargo bin
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/bin
           key: ${{ runner.os }}-cargo-audit-v0.11.2
diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
new file mode 100644
index 000000000..0254773d2
--- /dev/null
+++ b/.github/workflows/code-quality.yaml
@@ -0,0 +1,27 @@
+name: Code Quality Checks
+on:
+  pull_request:
+
+jobs:
+  code-quality:
+    runs-on: ubuntu-latest
+    env:
+      RIPGREP_VERSION: 14.1.0
+      FD_VERSION: 9.0.0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Whitestapace lints
+        run: bash ci/code-quality/whitespace-lints.sh
+
+      - name: Spell Check with Typos
+        uses: crate-ci/typos@v1.21.0
+        with:
+          config: ./.github/typos.toml
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - uses: baptiste0928/cargo-install@v3
+        with:
+          crate: taplo-cli
+      - run: taplo fmt --check
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yaml
similarity index 67%
rename from .github/workflows/coverage.yml
rename to .github/workflows/coverage.yaml
index 1f9c332ba..60346fe1f 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yaml
@@ -2,12 +2,20 @@ name: Coverage
 on:
   pull_request:
     paths:
-      - .codecov.yml
-      - .github/workflows/rust.yml
-      - .github/workflows/coverage.yml
+      - .codecov.yaml
+      - .github/workflows/rust.yaml
+      - .github/workflows/coverage.yaml
       - Cargo.toml
       - ci/**
-      - crates/**
+      - ibc/**
+      - ibc-core/**
+      - ibc-apps/**
+      - ibc-data-types/**
+      - ibc-clients/**
+      - ibc-primitives/**
+      - ibc-query/**
+      - ibc-testkit/**
+      - ibc-derive/**
   push:
     branches:
       - main
@@ -16,7 +24,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: rust-ci-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
@@ -33,12 +41,11 @@ jobs:
     name: Code Coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-          override: true
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: Install cargo-nextest
@@ -46,7 +53,7 @@ jobs:
       - name: Generate code coverage
         run: cargo llvm-cov nextest --all-features --lcov --output-path lcov.info
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/cw-check.yaml b/.github/workflows/cw-check.yaml
new file mode 100644
index 000000000..b0a66d4e4
--- /dev/null
+++ b/.github/workflows/cw-check.yaml
@@ -0,0 +1,62 @@
+name: CosmWasm Compilation Check
+on:
+  pull_request:
+    paths:
+      - .github/workflows/cw-check.yaml
+      - Cargo.toml
+      - Cargo.lock
+      - ci/cw-check/**
+      - ci/**
+      - ibc/**
+      - ibc-core/**
+      - ibc-apps/**
+      - ibc-data-types/**
+      - ibc-clients/**
+      - ibc-primitives/**
+      - ibc-derive/**
+  push:
+    tags:
+      - v[0-9]+.*
+    branches:
+      - "release/*"
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
+
+jobs:
+  cw-check:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+
+      # only for caching cargo build artifacts from `cosmwasm/optimizer`
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      - name: Create mount directories
+        run: mkdir -p "${HOME}/.cargo/registry" "$(pwd)"/target
+
+      - name: Compile `cw-check`
+        run: |
+          docker run \
+          -v "$(pwd)":/code \
+          -v "$(pwd)"/target:/target \
+          -v "${HOME}/.cargo/registry":/usr/local/cargo/registry \
+          cosmwasm/optimizer:0.15.1 ./ci/cw-check
+
+      - name: Fix permissions
+        run: |
+          sudo chown -R $(id -u):$(id -g) "$(pwd)"/target
+          sudo chown -R $(id -u):$(id -g) "${HOME}/.cargo/registry"
+
+      - name: Install `cosmwasm-check` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cosmwasm-check
+
+      - name: Check compiled CosmWasm contract
+        working-directory: artifacts
+        run: |
+          sha256sum -c checksums.txt
+          cosmwasm-check cw_check.wasm
diff --git a/.github/workflows/markdown-link-check.yaml b/.github/workflows/markdown-link-check.yaml
new file mode 100644
index 000000000..b95f1c746
--- /dev/null
+++ b/.github/workflows/markdown-link-check.yaml
@@ -0,0 +1,18 @@
+name: Check Markdown links
+
+on:
+  schedule:
+    - cron: "0 0 * * *" # At 00:00
+  pull_request:
+
+jobs:
+  md-link-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: markdown-link-check
+        uses: gaurav-nelson/github-action-markdown-link-check@1.0.15
+        with:
+          config-file: ".github/markdown-link-check.json"
+          use-quiet-mode: "yes"
+          folder-path: ${{ github.event_name == 'pull_request' && 'docs' || '.' }}
diff --git a/.github/workflows/markdown-link-check.yml b/.github/workflows/markdown-link-check.yml
deleted file mode 100644
index c699a8551..000000000
--- a/.github/workflows/markdown-link-check.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Check Markdown links
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-  workflow_dispatch:
-
-jobs:
-  md-link-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: markdown-link-check
-        uses: gaurav-nelson/github-action-markdown-link-check@1.0.13
-        with:
-          config-file: '.github/markdown-link-check.json'
-          use-quiet-mode: 'yes'
-          use-verbose-mode: 'yes'
diff --git a/.github/workflows/no-std.yaml b/.github/workflows/no-std.yaml
index f2e0c3407..03919ddda 100644
--- a/.github/workflows/no-std.yaml
+++ b/.github/workflows/no-std.yaml
@@ -2,44 +2,51 @@ name: no_std check
 on:
   pull_request:
     paths:
-      - .github/workflows/no-std.yml
+      - .github/workflows/no-std.yaml
       - Cargo.toml
       - Cargo.lock
+      - ci/no-std-check/**
       - ci/**
-      - crates/**
+      - ibc/**
+      - ibc-core/**
+      - ibc-apps/**
+      - ibc-data-types/**
+      - ibc-clients/**
+      - ibc-primitives/**
+      - ibc-derive/**
   push:
-    branches: main
-    paths:
-      - .github/workflows/no-std.yml
-      - Cargo.toml
-      - Cargo.lock
-      - ci/**
-      - crates/**
+    tags:
+      - v[0-9]+.*
+    branches:
+      - "release/*"
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
 
 jobs:
   check-no-std-panic-conflict:
     name: Check no_std panic conflict
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-          override: true
       - run: |
           cd ci/no-std-check
-          make check-panic-conflict
+          make check-no-std
 
   check-substrate:
     name: Check no_std substrate support
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-02-24
           target: wasm32-unknown-unknown
-          override: true
       - run: |
           cd ci/no-std-check
           make check-substrate
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
new file mode 100644
index 000000000..786d1c68f
--- /dev/null
+++ b/.github/workflows/release.yaml
@@ -0,0 +1,72 @@
+# Attempts to perform a release when a particular tag is pushed. This job uses
+# the `cargo release` command and assumes that the `CRATES_TOKEN`secret has
+# been set and contains an API token with which we can publish our crates to
+# crates.io.
+#
+# The `ibc-derive` publishing process is managed manually since it's not
+# consistently published with every release.
+#
+# If release operation fails partway through due to a temporary error (e.g. the
+# crate being published depends on the crate published just prior, but the prior
+# crate isn't yet available via crates.io), one can simply rerun this workflow.
+name: Release
+
+on:
+  push:
+    branches:
+      - "release/*"
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"             # Push events to matching v*, i.e. v0.26.0, v1.0.0
+      - "v[0-9]+.[0-9]+.[0-9]+-pre.[0-9]+"  # e.g. v0.26.0-pre.1
+
+jobs:
+  publish-check:
+    if: github.ref_type != 'tag'
+    name: Check publish to crates.io (dry run)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install `cargo-release` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cargo-release
+      - name: Publish crates (dry run)
+        run: make check-release
+
+  publish:
+    if: github.ref_type == 'tag'
+    name: Publish to crates.io
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install `cargo-release` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cargo-release
+      - name: Publish crates
+        run: yes | make release
+        env:
+          # https://doc.rust-lang.org/cargo/commands/cargo-publish.html#options
+          # argument for `--token` is specified with this environment variable
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+
+  gh-release:
+    if: github.ref_type == 'tag'
+    needs: publish
+    name: Create GitHub release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: taiki-e/create-gh-release-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml
new file mode 100644
index 000000000..e1053e897
--- /dev/null
+++ b/.github/workflows/rust.yaml
@@ -0,0 +1,176 @@
+name: Rust
+on:
+  pull_request:
+    paths:
+      - .github/workflows/rust.yaml
+      - Cargo.toml
+      - ci/**
+      - ibc/**
+      - ibc-core/**
+      - ibc-apps/**
+      - ibc-data-types/**
+      - ibc-clients/**
+      - ibc-primitives/**
+      - ibc-query/**
+      - ibc-testkit/**
+      - ibc-derive/**
+  push:
+    tags:
+      - v[0-9]+.*
+    branches:
+      - "release/*"
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_PROFILE_DEV_DEBUG: 1
+  CARGO_PROFILE_RELEASE_DEBUG: 1
+  RUST_BACKTRACE: short
+  CARGO_NET_RETRY: 10
+  RUSTUP_MAX_RETRIES: 10
+
+jobs:
+  check-features:
+    name: Check features
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install cargo-hack
+        uses: taiki-e/install-action@cargo-hack
+      - name: Run cargo hack
+        run: make check-features
+
+  nightly_fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: nightly # Since fmt uses unstable features for organizing imports
+          components: rustfmt
+      - uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy_all_features:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features --all-targets
+
+  clippy_no_default_features:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --no-default-features --lib
+
+  doc_all_features:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --all-features --release
+
+  doc_no_default_features:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - uses: actions-rs/cargo@v1
+        with:
+          command: doc
+          args: --no-default-features --release
+
+  test-stable:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: stable
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features --no-fail-fast --no-run
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features --no-fail-fast --workspace -- --nocapture
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --no-default-features --no-fail-fast --no-run
+
+  test-msrv:
+    timeout-minutes: 30
+    env:
+      CARGO_MSRV_VERSION: 0.16.0-beta.20
+      MSRV: 1.71.1
+    strategy:
+      matrix:
+        param:
+          [
+            { os: ubuntu-latest, system: unknown-linux-gnu },
+            { os: macos-latest, system: apple-darwin },
+          ]
+    runs-on: ${{ matrix.param.os }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Download cargo-msrv
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: foresterre/cargo-msrv
+          version: "tags/v${{ env.CARGO_MSRV_VERSION }}"
+          file: "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ env.MSRV }}
+
+      - name: Install cargo-msrv
+        run: |
+          tar -xzf "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}.tgz"
+          mv "cargo-msrv-x86_64-${{ matrix.param.system }}-v${{ env.CARGO_MSRV_VERSION }}/cargo-msrv" ~/.cargo/bin
+          cargo msrv --version
+
+      - name: Calculate MSRV
+        run: cargo msrv --output-format minimal --min 1.64.0
+
+      - name: Build with MSRV
+        uses: actions-rs/cargo@v1
+        with:
+          toolchain: ${{ env.MSRV }}
+          command: build
+          args: --all-features
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
deleted file mode 100644
index 740d384c1..000000000
--- a/.github/workflows/rust.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-name: Rust
-on:
-  pull_request:
-    paths:
-      - .github/workflows/rust.yml
-      - Cargo.toml
-      - ci/**
-      - crates/**
-  push:
-    branches: main
-    paths:
-      - .github/workflows/rust.yml
-      - Cargo.toml
-      - ci/**
-      - crates/**
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_PROFILE_DEV_DEBUG: 1
-  CARGO_PROFILE_RELEASE_DEBUG: 1
-  RUST_BACKTRACE: short
-  CARGO_NET_RETRY: 10
-  RUSTUP_MAX_RETRIES: 10
-
-jobs:
-  cleanup-runs:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: rokroskar/workflow-run-cleanup-action@master
-      env:
-        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
-
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-  
-  doc_all_features:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --all-features --release
-    
-  doc_no_default_features:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --no-default-features --release
-
-  clippy_all_features:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: clippy
-          override: true
-      - uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features --all-targets
-
-  clippy_no_default_features:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          components: clippy
-          override: true
-      - uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --no-default-features --lib
-
-  test-stable:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: Swatinem/rust-cache@v1
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features --no-fail-fast --no-run
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features --no-fail-fast --workspace -- --nocapture
diff --git a/.github/workflows/upload-cw-clients.yaml b/.github/workflows/upload-cw-clients.yaml
new file mode 100644
index 000000000..6ee12e7e4
--- /dev/null
+++ b/.github/workflows/upload-cw-clients.yaml
@@ -0,0 +1,94 @@
+name: Upload precompiled CosmWasm clients
+on:
+  pull_request:
+    paths:
+      - .github/workflows/upload-cw-clients.yaml
+      - Cargo.toml
+      - ci/**
+      - ibc/**
+      - ibc-core/**
+      - ibc-apps/**
+      - ibc-data-types/**
+      - ibc-clients/**
+      - ibc-primitives/**
+      - ibc-query/**
+      - ibc-testkit/**
+      - ibc-derive/**
+  push:
+    branches: main
+    paths:
+      - .github/workflows/upload-cw-clients.yaml
+      - Cargo.toml
+      - ci/**
+      - ibc/**
+      - ibc-core/**
+      - ibc-apps/**
+      - ibc-data-types/**
+      - ibc-clients/**
+      - ibc-primitives/**
+      - ibc-query/**
+      - ibc-testkit/**
+      - ibc-derive/**
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  upload-tendermint-cw-client:
+    name: Upload precompiled Tendermint CosmWasm client
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+
+      # `cosmwasm/optimizer` requires `Cargo.lock`. but currently,
+      # `Cargo.lock` is not committed, because `ibc-rs` is treated as library.
+      - name: Produce `Cargo.lock` file
+        run: cargo update -p ibc-client-tendermint-cw
+
+      - name: Create mount directories
+        run: mkdir -p "${HOME}/.cargo/registry" "$(pwd)"/target
+
+      - name: Compile cosmwasm blob for tendermint light client
+        run: |
+          docker run \
+          -v "$(pwd)":/code \
+          -v "$(pwd)"/target:/target \
+          -v "${HOME}/.cargo/registry":/usr/local/cargo/registry \
+          cosmwasm/optimizer:0.15.1 ./ibc-clients/ics07-tendermint/cw-contract
+
+      - name: Fix permissions
+        run: |
+          sudo chown -R $(id -u):$(id -g) "$(pwd)"/target
+          sudo chown -R $(id -u):$(id -g) "${HOME}/.cargo/registry"
+
+      - name: Install `cosmwasm-check` from crates.io
+        uses: baptiste0928/cargo-install@v3
+        with:
+          crate: cosmwasm-check
+
+      - name: Check compiled CosmWasm contract
+        working-directory: artifacts
+        run: |
+          sha256sum -c checksums.txt
+          cosmwasm-check ibc_client_tendermint_cw.wasm
+
+      - name: Upload compiled CosmWasm contract
+        uses: actions/upload-artifact@v4
+        with:
+          name: tendermint-cw-client
+          path: artifacts/ibc_client_tendermint_cw.wasm
+          # Retain the artifact for 1 week for PRs and 3 months for `main` branch
+          retention-days: ${{ github.event_name == 'pull_request' && 7 || 90 }}
+          overwrite: true
+
+      # # An example workflow to download the artifact:
+      # - uses: actions/download-artifact@v4
+      #   with:
+      #     name: tendermint-cw-client
+      #     repository: cosmos/ibc-rs
+      #     run-id: ${{ env.UPLOAD_WASM_RUN_ID }}
+      #     github-token: ${{ secrets.GITHUB_TOKEN }}
+      # - run: ls ibc_client_tendermint_cw.wasm
diff --git a/.gitignore b/.gitignore
index fad389dbc..42f1212d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,6 @@ target/
 # Ignore VisualStudio
 .vscode
 
-# Ignore chain's data
-data
-
 # Ignore Python artifacts
 .mypy_cache/
 __pycache__/
@@ -32,5 +29,8 @@ mc.log
 # Specifically, we want the ci/no-std-check/Cargo.lock to be committed
 # to ensure a reproducible CI build for that crate.
 # This will make it easier to spot bugs such as [this one](https://github.com/cosmos/ibc-rs/pull/560)
-# caused by a dependency updated to a faulty version. 
+# caused by a dependency updated to a faulty version.
 /Cargo.lock
+
+# Ignore CosmWasm artifacts
+/cw-contracts
diff --git a/.markdownlint.jsonc b/.markdownlint.jsonc
new file mode 100644
index 000000000..b8be2d434
--- /dev/null
+++ b/.markdownlint.jsonc
@@ -0,0 +1,8 @@
+{
+  "default": true,
+  "MD013": false, // https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md013---line-length
+  "MD024": false, // https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md024---multiple-headings-with-the-same-content
+  "MD033": false, // https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md033---inline-html
+  "MD036": false, // https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md036---emphasis-used-instead-of-a-heading
+  "MD041": false // https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md041---first-line-in-a-file-should-be-a-top-level-heading
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33ab163dd..2d5326ac7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,680 @@
 # CHANGELOG
 
+## v0.53.0
+
+*May 13, 2024*
+
+This release overhauls the `ibc-testkit` crate such that it is now able to:
+
+- simulate more realistic IBC workflows by utilizing real IBC and relayer
+  interfaces (as opposed to mocked versions)
+- validate code paths that were not easily testable beforehand, such as Merkle
+  proof generation
+- compose tests in a much more succinct and readable fashion
+
+Note that the drastic changes made to `ibc-testkit`'s structs and types are
+breaking changes.
+
+For more information and background context on the changes to `ibc-testkit` and
+the rationale behind the overhaul, please refer to [ADR 009][adr-009].
+
+This release also includes two fixes. One is to reject packets without height
+and timestamp timeout. The other is to correct the proof verification logic for
+a `PacketTimeout` due to a closed channel, which was verifying an incorrect
+field. It also bumps the minimum-supported version of `ibc-proto` to 0.44, and
+the version of `tendermint` to 0.36. Note that the minimum-supported Rust
+version was reverted back to 1.71.1.
+
+[adr-009]: https://github.com/cosmos/ibc-rs/blob/main/docs/architecture/adr-009-revamp-testkit.md
+
+### BUG FIXES
+
+- [ibc-core] Reject IBC packets without height and timestamp timeout.
+  ([\#1198](https://github.com/cosmos/ibc-rs/issues/1198))
+- [ibc-core] Fix proof verification for `PacketTimeout` on a closed channel.
+  ([\#1217](https://github.com/cosmos/ibc-rs/issues/1217))
+
+### IMPROVEMENTS
+
+- [ibc-testkit] Replace `HostBlock` and `HostType` enums with a `Host` trait to
+  eliminate manual delegations by utilizing monomorphization.
+  ([\#1044](https://github.com/cosmos/ibc-rs/issues/1044))
+- [ibc-testkit] Major refactor of the `ibc-testkit` via
+  [ADR-09](https://github.com/cosmos/ibc-rs/blob/main/docs/architecture/adr-009-revamp-testkit.md).
+  ([\#1109](https://github.com/cosmos/ibc-rs/issues/1109))
+- [ibc-core] Replace fixed `ClientError` associated type restriction with an
+  `Into<ClientError>` trait bound.
+  ([\#1203](https://github.com/cosmos/ibc-rs/issues/1203))
+- Update `ibc-proto` to v0.44.0 and `tendermint` dependencies to v0.36.0.
+  ([\#1212](https://github.com/cosmos/ibc-rs/issues/1212))
+- Revert Rust minimum supported version to `1.71.1`.
+  ([\#1206](https://github.com/cosmos/ibc-rs/pull/1206))
+
+## v0.52.0
+
+*April 26, 2024*
+
+This release adds some exciting changes, improvements, and new features to ibc-rs.
+First and foremost, support for the IBC protocol's [client recovery][client-recovery]
+mechanism has been implemented, which provides a route for frozen and expired IBC clients
+to be re-instated following a successful governance vote. In addition, a new crate,
+`ibc-client-cw`, facilitates CosmWasm contract creation for light clients built using
+`ibc-rs`. Lastly, the ics07 tendermint light client has also been packaged and included
+as a CosmWasm contract.
+
+This release also includes a myriad of other bug-fixes and improvements,
+such as enhancing the portability of ibc-rs's Validation and Execution Context traits,
+as well as fixing an incompatibility with how ibc-rs parses `PrefixDenom`s compared
+to ibc-go, among many others.
+
+The minimum-supported Rust version has been updated to `1.72`. `ibc-proto` has been
+bumped to `0.43`. `tendermint` has been bumped to `0.35`. `ibc-derive` has been
+bumped to `0.7`.
+
+There are no consensus-breaking changes as part of this release.
+
+### BREAKING CHANGES
+
+- [ibc] Enhance portability of custom `Validation/ExecutionContext` traits under
+  ICS-07. They are relocated, along with the rest of the
+  client-relevant context APIs, under ICS-02, with the traits renamed to
+  `ExtClientValidationContext` and `ExtClientExecutionContext` for improved
+  self-description ([\#1163](https://github.com/cosmos/ibc-rs/issues/1163))
+- [ibc-client-tendermint] Simplify custom verifiers usage for Tendermint
+  clients by directly binding with `tendermint_light_client_verifier::Verifier`
+  and removing the unused `TmVerifier` trait.
+  ([\#1168](https://github.com/cosmos/ibc-rs/pull/1168))
+- [ibc] Update minimum supported Rust version to 1.72.
+  ([\#1193](https://github.com/cosmos/ibc-rs/issues/1193))
+
+### BUG FIXES
+
+- [ibc-query] Update standalone query functions to use the specified query
+  height ([\#1154](https://github.com/cosmos/ibc-rs/issues/1154))
+- [ibc-app-transfer] Bring `PrefixedDenom` parsing up to parity with `ibc-go`.
+  ([\#1177](https://github.com/cosmos/ibc-rs/issues/1177))
+- [ibc-app-nft-transfer] Reuse `TracePrefix` and `TracePath` from
+  `ibc-app-transfer-types` when parsing `PrefixedClassId`.
+  ([\#1178](https://github.com/cosmos/ibc-rs/pull/1178))
+- [ibc-core-channel-types] Make receive packet event type identifier consistent
+  with `ibc-go`. ([\#1180](https://github.com/cosmos/ibc-rs/issues/1180))
+
+### FEATURES
+
+- [ibc-core-client] Implement [client recovery][client-recovery] feature.
+  ([\#738](https://github.com/cosmos/ibc-rs/issues/738))
+- [ibc-clients] Introduce CosmWasm context library as `ibc-client-cw` crate to
+  facilitate CosmWasm contract creation for light clients built using `ibc-rs`
+  ([\#1164](https://github.com/cosmos/ibc-rs/issues/1164))
+- [ibc-client-tendermint] Introduce `ibc-client-tendermint-cw` crate
+  implementing CosmWasm contract for ICS-07 Tendermint light client.
+  ([\#1165](https://github.com/cosmos/ibc-rs/issues/1165))
+
+[client-recovery]: https://github.com/cosmos/ibc-go/blob/main/docs/architecture/adr-026-ibc-client-recovery-mechanisms.md
+
+### IMPROVEMENTS
+
+- [ibc-core-commitment-types] Fallible conversion for `ProofSpec`, `LeafOp` and
+  `InnerSpec`. ([\#1108](https://github.com/cosmos/ibc-rs/issues/1108))
+- [ibc-client-tendermint-types] Box header fields inside of Misbehaviour type so
+  that the type is smaller (i.e. trade size of the type for heap memory). This
+  prevents stack overflows on systems with small stack (e.g. Solana).
+  ([\#1145](https://github.com/cosmos/ibc-rs/pull/1145))
+- [ibc-client-tendermint] Decouple the arguments of ICS07 Header/Misbehavior
+  verification functions from the Tendermint client type by flattening and
+  passing only the required fields.
+  ([\#1149](https://github.com/cosmos/ibc-rs/issues/1149))
+- [ibc-query] Add support for querying `upgraded_client/consensus_state` at a
+  given height along with returning their proof of existence in the response.
+  ([\#1152](https://github.com/cosmos/ibc-rs/issues/1152))
+- [ibc-client-tendermint] Add `into_inner()` method to ICS07 `ConsensusState`
+  ([\#1156](https://github.com/cosmos/ibc-rs/pull/1156))
+- Update `ibc-proto` to v0.43.0 and `tendermint` dependencies to v0.35.0.
+  ([\#1171](https://github.com/cosmos/ibc-rs/issues/1171))
+
+## v0.51.0
+
+*March 26, 2024*
+
+This release introduces a few changes for better customizability. The main one is modularizing ICS-24, ICS-02, and ICS-07 trait implementations. This change empowers developers to write Rust light clients succinctly in a smart-contract context like CosmWasm. Also, the default Tendermint client state verifier is now detached to support custom verifiers, if required.
+
+In addition, this version fixes a bug where the consensus state is incorrectly stored when a header with an older height is submitted.
+
+Furthermore, a set of new host keys is added. This makes `ibc-rs` more consistent with the storage access of `ibc-go`. Also, access to client update information is merged into a single method; instead of individual details.
+
+This release updates the `ibc-proto-rs` dependency to `v0.42.2`. This takes account of the updated `MsgUpdateClient` and deprecates `MsgSubmitMisbehaviour`. Also, `ibc-derive` dependency is updated to `v0.6.1`.
+Finally, the minimum supported Rust version is corrected and updated to `1.71.1`.
+
+There are no consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- [ibc-core] Update `MsgUpdateClient` handler to accept misbehaviour reports via
+  its `client_message` field
+  ([\#835](https://github.com/cosmos/ibc-rs/issues/835))
+- [ibc-core-client] Merge client update time and height modification method
+  pairs into one, that is replace
+  a) client_update_{time,height} by update_meta,
+  b) store_update_{time,height} by store_update_meta and
+  c) delete_update_{time,height} by delete_update_meta.
+  ([\#973](https://github.com/cosmos/ibc-rs/issues/973))
+- [ibc] Refactor client relevant APIs for improved modularity and allow
+  standalone ICS-02 integration
+  ([\#1114](https://github.com/cosmos/ibc-rs/issues/1114))
+- [ibc] Increase minimum supported Rust version to 1.71.1
+  ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
+- [ibc] Upgrade `ibc-proto-rs` to `v0.42.2`
+  ([\#1125](https://github.com/cosmos/ibc-rs/pull/1125))
+
+### BUG FIXES
+
+- [ibc] Add missing dependencies for some feature flags across multiple crates
+  ([\#1059](https://github.com/cosmos/ibc-rs/issues/1059))
+- [ibc-client-tendermint-types] Ease frozen Height check in the tendermint
+  `ClientState` protobuf deserialization, and consequently include frozen client
+  check for client creation path.
+  ([\#1061](https://github.com/cosmos/ibc-rs/issues/1061)),
+  ([\#1063](https://github.com/cosmos/ibc-rs/pull/1063))
+- [ibc-client-tendermint] Use header height for Tendermint consensus state storage
+  ([\#1080](https://github.com/cosmos/ibc-rs/issues/1080))
+- [ibc] Upgrade `serde_json` to "1.0.1" to address an stack overflow issue
+  within the `serde-json-wasm` crate
+  ([\#1083](https://github.com/cosmos/ibc-rs/pull/1083))
+- [ibc] Resolve potential `base64` dependency resolution issue by bringing it to
+  the workspace `Cargo.toml`
+  ([\#1084](https://github.com/cosmos/ibc-rs/issues/1084))
+- [ibc-client-tendermint-types] Check ics23 proof specs for empty depth range.
+  ([\#1100](https://github.com/cosmos/ibc-rs/issues/1100))
+
+### FEATURE
+
+- [ibc-core-host] Add remaining storage paths.
+  ([\#1065](https://github.com/cosmos/ibc-rs/issues/1065))
+- [ibc-core-host] Add iteration key for cross-compatibility with `ibc-go` used
+  for iterating over consensus states
+  ([\#1090](https://github.com/cosmos/ibc-rs/issues/1090))
+
+### IMPROVEMENTS
+
+- [ibc-core] Deprecate `ChannelEnd::order_matches` method
+  ([\#394](https://github.com/cosmos/ibc-rs/issues/394))
+- [ibc-apps] Ease `serde` derive on `ICS-20` and `ICS-721` types
+  ([\#1060](https://github.com/cosmos/ibc-rs/pull/1060))
+- [ibc-data-types] Refactor `Default` implementations with concrete names
+  ([\#1074](https://github.com/cosmos/ibc-rs/issues/1074))
+- [ibc-core] Deprecate `MsgSubmitMisbehaviour` in favor of `MsgUpdateClient` for
+  submitting misbehaviour reports
+  ([\#1077](https://github.com/cosmos/ibc-rs/issues/1077))
+- [ibc-core-host] Improve path segment access by exposing path prefixes and
+  implementing some convenient parent/leaf methods
+  ([\#1089](https://github.com/cosmos/ibc-rs/issues/1089))
+- [ibc-client-tendermint] Detach client state verifier such that users have a
+  way to utilize custom verifiers
+  ([\#1097](https://github.com/cosmos/ibc-rs/pull/1097))
+- [ibc-primitives] Use `let-else` over `downcast!()` and remove `utils/macros`
+  module as a result ([\#1118](https://github.com/cosmos/ibc-rs/issues/1118))
+- [ibc-core] Remove unnecessary shadowing with same value
+  ([\#1120](https://github.com/cosmos/ibc-rs/issues/1120))
+- [ibc-core-connection] Remove `State::Uninitialized` check while parsing
+  `ConnectionEnd` from Protobuf
+  ([\#1123](https://github.com/cosmos/ibc-rs/issues/1123))
+
+## v0.50.0
+
+*January 24, 2024*
+
+This release introduces several noteworthy libraries. A standout addition is the
+implementation of the ICS-721 NFT transfer application, enabling the transfer of
+NFT packets across chains that support this capability.
+
+In addition, It incorporates the ICS-08 Wasm light client data structure and
+types. This empowers light client developers to create CosmWasm contracts for
+deployment on Cosmos chains compatible with the version of `ibc-go` supporting
+ICS-08 Wasm client.
+
+Furthermore, this release addresses the issue with the macro derivation of the
+`ClientState` when contexts include generic types, exposes additional convenient
+types and serializers through `ibc-primitives` and includes a more flexible
+constructor for `MockContext` types within the `ibc-testkit` crate, allowing to
+write tests with diverse parameter combinations.
+
+There are no consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- [ibc] Bump `ibc-proto-rs` to v0.41.0
+  ([\#1036](https://github.com/cosmos/ibc-rs/pull/1036)).
+
+### BUG FIXES
+
+- [ibc-derive] Refactor `ClientState` macro derivation to handle contexts with
+  generic types. ([\#910](https://github.com/cosmos/ibc-rs/issues/910))
+- [ibc-derive] Adapt macro derivations to integrate with projects dependent on
+  `ibc-core` ([\#999](https://github.com/cosmos/ibc-rs/issues/999)).
+
+### FEATURES
+
+- [ibc-app-nft-transfer] Implement ICS-721 NFT transfer application
+  ([\#346](https://github.com/cosmos/ibc-rs/issues/346))
+- [ibc-client-wasm-types] Implement ICS-08 Wasm light client domain types
+  ([\#1030](https://github.com/cosmos/ibc-rs/issues/1030)).
+
+### IMPROVEMENTS
+
+- [ibc-data-types] Re-export clients' domain type from `ibc-data-types`
+  ([\#1041](https://github.com/cosmos/ibc-rs/pull/1041)).
+- [ibc-testkit] Deprecate `MockContext::new*` in favor of `MockContextConfig`.
+  ([\#1042](https://github.com/cosmos/ibc-rs/issues/1042))
+- [ibc-testkit] Remove field access of `MockContext`.
+  ([\#1043](https://github.com/cosmos/ibc-rs/issues/1043))
+- [ibc-testkit] Deprecate `MockContext::with_client*` in favor of
+  `MockContext::with_client_config`.
+  ([\#1049](https://github.com/cosmos/ibc-rs/issues/1049))
+- [ibc-primitives] Re-export additional google proto types, like `Timestamp`
+  and `Duration` for added convenience when developing IBC light clients or
+  applications. ([\#1054](https://github.com/cosmos/ibc-rs/pull/1054))
+- [ibc-primitives] Relocate `serializers.rs` module to reside within the
+  `ibc-primitives` crate extending its utility for a broader range of IBC
+  applications. ([\#1055](https://github.com/cosmos/ibc-rs/issues/1055))
+
+## v0.49.1
+
+*January 3, 2024*
+
+This release continues the trend of further decoupling dependencies between the
+different ibc-rs sub-crates and modules.
+
+In particular, the `prost` dependency is now only imported in the
+`ibc-primitives` crate; note that error variants originating from `prost` have
+largely been removed, which is a breaking change. The `bytes` dependency was
+also removed. Additionally, `CommitmentProofBytes` can now be accessed without
+explicit ownership of the object for which the proof is being queried for.
+
+Some other improvements of note include making the CosmWasm check more rigorous,
+streamlining the `Msg` trait and renaming it to `ToProto`, as well as
+implementing custom JSON and Borsh `ChainId` deserialization.
+
+There are no consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- `[ibc-app-transfer]` Refactor `send-coins-*()` methods by breaking them down
+  into distinct escrow and unescrow methods, enhancing both clarity and
+  specificity in functionality.
+  ([\#837](https://github.com/cosmos/ibc-rs/issues/837))
+- `[ibc-app-transfer]` Add `memo` field to `escrow-coins-*()` and
+  `burn-coins-*()` methods, allowing implementors to pass in arbitrary data
+  necessary for their use case.
+  ([\#839](https://github.com/cosmos/ibc-rs/issues/837))
+- `[ibc-core-host-type]` Optimize `IdentifierError` variants and make them
+  mutually exclusive. ([\#978](https://github.com/cosmos/ibc-rs/issues/978))
+- `[ibc-data-types]` Bump ibc-proto-rs dependency to v0.39.1.
+  ([\#993](https://github.com/cosmos/ibc-rs/issues/993))
+- `[ibc]` Minimize `prost` dependency by introducing `ToVec` trait
+  - Now `prost` is only imported in `ibc-primitives` crate
+  - Remove error variants originating from `prost` (Breaking change)
+  - Eliminate the need for the `bytes` dependency
+ ([\#997](https://github.com/cosmos/ibc-rs/issues/997))
+- `[ibc-core-host-types]` Introduce `ClientType::build_client_id` which avoids unnecessary validation.
+  ([#1014](https://github.com/cosmos/ibc-rs/issues/1014))
+- `[ibc-core-host-types]` Optimise `ClientId::new` to avoid unnecessary validation and temporary
+  string allocation. ([#1014](https://github.com/cosmos/ibc-rs/issues/1014))
+
+### FEATURES
+
+- `[ibc-core-commitment-types]` implement `AsRef<Vec<u8>>` and
+  `AsRef<[u8]>` for `CommitmentProofBytes` so it’s possible to gain
+  access to the proof byte slice without having to own the object.
+  ([#1008](https://github.com/cosmos/ibc-rs/pull/1008))
+
+### IMPROVEMENTS
+
+- `[cw-check]` More rigorous CosmWasm check by upgrading dependencies and
+  including `std` and `schema` features for `ibc-core`.
+  ([\#992](https://github.com/cosmos/ibc-rs/pull/992))
+- `[ibc-primitives]` streamline `Msg` trait and rename to `ToProto`
+ ([#993](https://github.com/cosmos/ibc-rs/issues/993))
+- `[ibc-core-host-types]` Implement custom JSON and Borsh deserialization for `ChainId` ([#996](https://github.com/cosmos/ibc-rs/pull/1013))
+- `[ibc-core-client-types]` Add a convenient `Status::verify_is_active` method.
+  ([#1005](https://github.com/cosmos/ibc-rs/pull/1005))
+- `[ibc-primitives]` Derive `Hash` on `Timestamp` instead of explicit
+  implementation ([#1011](https://github.com/cosmos/ibc-rs/pull/1005))
+- `[ibc-derive]` Use global paths in generated code by macros to prevent
+  namespace conflicts with local modules
+  ([#1017](https://github.com/cosmos/ibc-rs/pull/1017))
+
+## v0.48.2
+
+*December 22, 2023*
+
+This patch release resolves two issues. It corrects the packet sequence number
+encoding within Timeout message handlers to align with the big-endian format and
+addresses a recursive call error during the conversion from connection `State`
+to `i32`.
+
+There are no consensus-breaking changes.
+
+### BUG FIXES
+
+- `[ibc-core-host-types]` Encode packet sequence into a big endian bytes.
+  ([\#1004](https://github.com/cosmos/ibc-rs/pull/1004))
+- `[ibc-core-connection-types]` Fix recursive call in connection `State`
+  conversion to `i32` ([\#1010](https://github.com/cosmos/ibc-rs/issues/1010))
+
+## v0.48.1
+
+*November 27, 2023*
+
+This patch release eliminates the `dep:` syntax from the `serde` feature,
+addressing potential dependency resolution issue stemming from Rust v1.70.
+
+There are no consensus-breaking changes.
+
+### BUG FIXES
+
+- Fix Cargo test failure with `--no-default-features` flag.
+  ([\#770](https://github.com/cosmos/ibc-rs/issues/770))
+- Fix dependency resolution by removing the `dep:` syntax in `serde` feature of
+  `ibc-app-transfer` crate.
+  ([\#987](https://github.com/cosmos/ibc-rs/issues/987))
+
+## v0.48.0
+
+*November 22, 2023*
+
+In this release, we've undertaken a comprehensive overhaul of the **`ibc-rs`**
+repository, resulting in a strategic reorganization of the codebase. This
+restructuring dissects the implementation of each IBC specification,
+categorizing and situating them within relevant libraries. The primary objective
+is to elevate `ibc-rs` practicality and enhance user flexibility by providing a
+more modular and composable experience.
+
+Users now have the flexibility to choose from a spectrum of dependencies. They
+can opt to utilize the entire suite of meta-crates, such as `ibc`, `ibc-core`,
+`ibc-clients`, or `ibc-apps`. Alternatively, they can exercise fine-grained
+control by selectively importing specific crates. This can involve bringing in
+an entire implemented IBC sub-module, like the `ibc-core-client` crate, or
+importing only the associated data structures of a module, such as the
+`ibc-core-client-types` crate.
+
+Furthermore, this release introduces optimizations centered around construction
+and validation of ICS-24 host identifiers, aiming to curtail some heap
+allocations, beneficial for resource-constrained hosts.
+
+There are no consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- Move ICS-20 and ICS-27 implementations to the respective part of `ibc-apps`
+  and `ibc-clients` crates, as part of the `ibc` crate restructuring effort.
+  ([\#716](https://github.com/cosmos/ibc-rs/issues/716))
+- Bump `ibc-proto-rs` to v0.38.0
+  ([\#949](https://github.com/cosmos/ibc-rs/issues/949))
+- Bump minimum supported Rust version to 1.64
+  ([\#956](https://github.com/cosmos/ibc-rs/issues/956))
+- Restructure `ibc-rs` codebase by organizing it into smaller self-contained,
+  modular libraries, enabling the selective import of specific domain types or
+  module implementations, either individually or in combination, providing
+  enhanced flexibility and ease of use.
+  ([\#965](https://github.com/cosmos/ibc-rs/issues/965))
+
+### FEATURES
+
+- Restructure the mock module implementation and separate its codebase into a
+  new crate named `ibc-testkit`
+  ([\#954](https://github.com/cosmos/ibc-rs/issues/953))
+- Provide `Into<String>` for all identifiers types.
+  ([\#974](https://github.com/cosmos/ibc-rs/pull/974))
+
+### IMPROVEMENTS
+
+- Re-export essential proto types from the underlying `ibc-*-*-types` crates,
+  removing the necessity for a direct dependency on `ibc-proto` in projects
+  integrating `ibc-rs` ([\#697](https://github.com/cosmos/ibc-rs/issues/697))
+- Rename `{submodule}.rs` with corresponding `{submodule}` directory to
+  `{submodule}/mod.rs` ([\#771](https://github.com/cosmos/ibc-rs/issues/771))
+- Add From implementation for ICS26 enum types to make it simpler to construct
+  the types. ([\#938](https://github.com/cosmos/ibc-rs/pull/938))
+- Reduce vector allocations in Commitment computation.
+  ([\#939](https://github.com/cosmos/ibc-rs/pull/939))
+- Support chain identifiers without the `{chain_name}-{revision_number}` pattern
+  of Tendermint chains. ([\#940](https://github.com/cosmos/ibc-rs/issues/940)).
+- Remove redundant `String` creation in `validate_prefix_length`
+  ([\#943](https://github.com/cosmos/ibc-rs/issues/943)).
+- Remove redundant `#[test_log::test]` attributes in test modules
+  ([\#948](https://github.com/cosmos/ibc-rs/issues/948))
+- Remove the default value and implementation for `PortId`
+  ([\#951](https://github.com/cosmos/ibc-rs/issues/951))
+- Expose domain message types under the `ics04_channel` as public
+  ([\#952](https://github.com/cosmos/ibc-rs/issues/952))
+- Enhance dependency management with workspace inheritance
+  ([\#955](https://github.com/cosmos/ibc-rs/issues/955))
+- Simplify and refactor ICS-24 identifier validation logic.
+  ([\#961](https://github.com/cosmos/ibc-rs/issues/961))
+- Reduce heap allocation by using `str` instead of `String` places we convert
+  domain event attributes to the ABCI event attributes
+  ([\#970](https://github.com/cosmos/ibc-rs/issues/970))
+- Expose various fields, types and functions in `ibc-rs` as public including:
+  - `validate` and `execute` handler functions for all the IBC message types.
+  - `TYPE_URL` constants.
+  - Any private fields within the domain message types.
+  - Any private fields within the Tendermint `ClientState` and `ConsensusState`
+  ([\#976](https://github.com/cosmos/ibc-rs/issues/976))
+
+## v0.47.0
+
+*October 19, 2023*
+
+This release adds necessary APIs for featuring consensus state pruning and
+implements pertaining logic for Tendermint light clients. This prevents
+unlimited store growth. Additionally, we've enhanced ibc-rs compatibility with
+no-float environments making Wasm compilation smoother and updated main
+dependencies including `prost` to v0.12, `ibc-proto-rs` to v0.37, and
+`tendermint-rs` to v0.34, ensuring the latest advancements.
+
+There are no consensus-breaking changes.
+
+### FEATURES
+
+- Implement consensus state pruning for Tendermint light clients. ([\#600](https://github.com/cosmos/ibc-rs/issues/600))
+
+### IMPROVEMENTS
+
+- Add test for expired client status.
+  ([\#538](https://github.com/cosmos/ibc-rs/issues/538))
+
+- Fix compilation issue with Wasm envs because of floats. ([\#850](https://github.com/cosmos/ibc-rs/issues/850))
+  - Use `serde-json-wasm` dependency instead of `serde-json` for no-floats support
+  - Add CI test to include CosmWasm compilation check
+
+- Change `mocks` feature to imply `std` since it requires
+  Timestamp::now to work.
+  ([\#926](https://github.com/cosmos/ibc-rs/pull/926))
+- Return PacketStates instead of paths from packet_commitments and
+  packet_acknowledgements. ([\#927](https://github.com/cosmos/ibc-rs/issues/927))
+- Remove `AnySchema` as `JsonSchema` derive on `Any` now accessible through
+  `ibc-proto-rs`. ([#929](https://github.com/cosmos/ibc-rs/issues/929))
+
+## v0.46.0
+
+*October 12, 2023*
+
+This release introduces vital bug fixes, including removal of an incorrect
+validation during a Tendermint client update and the addition of a missing state
+update during a successful client upgrade ensuring the inclusion of the host's
+height and timestamp in the store.
+
+Additionally, it eliminates the `safe-regex` dependency, and restructures IBC
+query implementations under the previous `grpc` feature flag and moves it to a
+separate crate called as `ibc-query`.
+
+There are consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- Relocate `*_update_time` and `*_update_height` to the client contexts' traits
+  for improved access by light clients
+  ([#914](https://github.com/cosmos/ibc-rs/issues/914))
+
+### BUG FIXES
+
+- Remove an incorrect validation during tendermint client update
+  ([\#911](https://github.com/cosmos/ibc-rs/issues/911))
+- Add missing update in the state, which should include the host's height and
+   timestamp when a successful client upgrade take place.
+   ([\#913](https://github.com/cosmos/ibc-rs/issues/913))
+
+### IMPROVEMENTS
+
+- Remove `safe-regex` dependency
+  ([\#875](https://github.com/cosmos/ibc-rs/issues/875))
+- Enhance IBC query methods usability and code organization
+  - The implementation of query methods is now publicly accessible as standalone functions.
+  - `grpc` feature now lives as a separate crate called as `ibc-query`
+  ([#896](https://github.com/cosmos/ibc-rs/issues/896))
+- Re-export ibc proto types from `ibc-proto-rs`` for dep
+
+## v0.45.0
+
+*September 20, 2023*
+
+This release introduces a new API under the `grpc` feature flag, which has ibc-rs expose grpc endpoints that the hermes relayer needs. Furthermore, `no_std` support for the `serde` feature has been restored, accompanied by other miscellaneous changes.
+There are no consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- Bump tendermint-rs to v0.33.0
+  ([#785](https://github.com/cosmos/ibc-rs/issues/785))
+- Bump ibc-proto-rs to v0.34.0
+  ([#790](https://github.com/cosmos/ibc-rs/issues/790))
+- Allow hosts to handle overflow cases in `increase_*_counter` methods by
+  returning `Result<(),ContextError>` type.
+  ([#857](https://github.com/cosmos/ibc-rs/issues/857))
+- logger and event emitter methods return `Result<(), ContextError>` type.
+  ([#859](https://github.com/cosmos/ibc-rs/issues/859))
+- Bump `ibc-proto-rs` to v0.35.0 along with some other minor dependency updates
+  ([#873](https://github.com/cosmos/ibc-rs/issues/873))
+
+### BUG FIXES
+
+- Fix compilation error of v0.41.0 by restoring no_std support for serde
+  feature ([#741](https://github.com/cosmos/ibc-rs/issues/741))
+- Replace mutable ref with immutable ref in validate handler
+  ([\#863](https://github.com/cosmos/ibc-rs/issues/863))
+
+### FEATURES
+
+- Blanket implementation of core gRPC services
+  ([\#686](https://github.com/cosmos/ibc-rs/issues/686))
+
+### IMPROVEMENTS
+
+- Switch to domain Tendermint event type instead of proto for the
+  `upgrade_client_proposal_handler` return
+  ([#838](https://github.com/cosmos/ibc-rs/issues/838))
+- Bump ibc-proto to v0.34.1 and borsh to v0.10
+  ([#844](https://github.com/cosmos/ibc-rs/issues/844))
+- Add borsh derive for `MsgTransfer`
+  ([#845](https://github.com/cosmos/ibc-rs/pull/845))
+- Add borsh derive for `MsgEnvelope`
+  ([#846](https://github.com/cosmos/ibc-rs/pull/846))
+- Derive `PartialEq`, `Eq` for `MsgEnvelope`
+  ([#847](https://github.com/cosmos/ibc-rs/pull/847))
+- Organize imports grouping and granularity using `rustfmt.toml`
+  ([#848](https://github.com/cosmos/ibc-rs/issues/848))
+- Add `JsonSchema` derive for `MsgEnvelope`
+  ([#856](https://github.com/cosmos/ibc-rs/pull/856))
+- Remove unused code snippets and move serializer roundtrip test to `serializers.rs`
+  ([#869](https://github.com/cosmos/ibc-rs/issues/869))
+
+## v0.44.2
+
+*October 12, 2023*
+
+This release is a critical patch release that introduces a vital fix by removing
+an incorrect validation during a Tendermint client update.
+
+There are no consensus-breaking changes.
+
+## v0.44.1
+
+*August 4, 2023*
+
+This release fixes a bug with the `UpdateClient` event where the `header` field was not properly encoded.
+
+There are no consensus-breaking changes.
+
+### BUG FIXES
+
+- Remove traces of deprecated `mocks-no-std` feature
+  ([#819](https://github.com/cosmos/ibc-rs/issues/821))
+- Utilize encoded bytes from `Any` for the `header` field of `UpdateClient`
+  event
+  ([#821](https://github.com/cosmos/ibc-rs/issues/821))
+
+## v0.44.0
+
+*August 4, 2023*
+
+The goal with this release was to replace `ClientState::{confirm_not_frozen, expired}()` with `ClientState::status()` ([#536](https://github.com/cosmos/ibc-rs/issues/536)). Updating basecoin-rs with the new changes exposed the shortcomings of having `SendPacket*Context` be supertraits of `TokenTransfer*Context`, which in turned exposed the shortcomings of having `Router` be a supertrait of `ValidationContext`. Hence, we decoupled everything!
+
+There are consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- [ibc-derive] Replace `ClientState::{confirm_not_frozen, expired}()` with `ClientState::status()`
+  ([#536](https://github.com/cosmos/ibc-rs/issues/536))
+- Decouple `TokenTransfer{Validation,Execution}` from `SendPacket{Validation,Execution}`
+  ([#786](https://github.com/cosmos/ibc-rs/issues/786))
+- Decouple `Router` from `ValidationContext`
+  ([#788](https://github.com/cosmos/ibc-rs/pull/788))
+- Simplify Module lookup in the `Router` trait
+ ([#802](https://github.com/cosmos/ibc-rs/issues/802))
+
+## v0.43.1
+
+*July 31, 2023*
+
+This release bumps ibc-proto to v0.32.1, resolving issue with token transfer
+deserialization for cases with no memo field provided. It also includes various
+enhancements and bug fixes, such as reorganized acknowledgement types, enhanced
+`ChainId` validation, improved `from_str` height creation, synchronized channel
+event namings for consistency.
+
+There are consensus-breaking changes.
+
+### BREAKING CHANGES
+
+- Organize acknowledgement types under the `ics04_channel` module to get
+  accessible by any applications.
+  ([#717](https://github.com/cosmos/ibc-rs/issues/717))
+- Sync field and method namings of ics04 events with the convention
+  ([#750](https://github.com/cosmos/ibc-rs/issues/750))
+- use ibc_proto::protobuf::Protobuf to replace tendermint_proto::Protobuf
+  ([#754](https://github.com/cosmos/ibc-rs/pull/754))
+- Enhancements and fixes to `ChainId` impls and validation.
+  ([#761](https://github.com/cosmos/ibc-rs/issues/761))
+- Use `Vec<u8>` for HeaderAttribute instead of `Any`
+  ([#764](https://github.com/cosmos/ibc-rs/issues/764))
+- Serde: Schema for Coin/Transfer, Amount is string
+  ([#772](https://github.com/cosmos/ibc-rs/issues/772))
+
+### BUG-FIXES
+
+- Tendermint ConsensusState -> Any can crash if out of memory
+  ([#747](https://github.com/cosmos/ibc-rs/issues/747))
+- `Height::from_str` accepts invalid heights
+  ([#752](https://github.com/cosmos/ibc-rs/issues/752))
+- Add serde serialization and deserialization to Packet Receipt
+  ([#794](https://github.com/cosmos/ibc-rs/pull/794))
+
+### IMPROVEMENTS
+
+- Scale encoding for ICS-20 transfer message
+  ([#745](https://github.com/cosmos/ibc-rs/issues/745))
+- Add test to ensure `PacketData` keeps proper JSON encoding
+  ([#763](https://github.com/cosmos/ibc-rs/issues/763))
+
 ## v0.42.0
 
 *July 5, 2023*
@@ -10,7 +685,7 @@ There are no consensus-breaking changes.
 
 ### BREAKING CHANGES
 
--  Implement ADR 7, where `ClientState` objects are now statically dispatched instead
+- Implement ADR 7, where `ClientState` objects are now statically dispatched instead
    of dynamically dispatched.
 ([#296](https://github.com/cosmos/ibc-rs/issues/296))
 - Revise the `verify_upgrade_client` method to utilize the domain-specific
@@ -884,7 +1559,7 @@ This is a major release, which implemented [ADR 4](https://github.com/cosmos/ibc
 
 - Delete packet commitment instead of acknowledgement in acknowledgePacket
   [#1573](https://github.com/informalsystems/ibc-rs/issues/1573)
-- Set the `counterparty_channel_id` correctly to fix ICS04 [`chanOpenAck` handler verification](https://github.com/informalsystems/ibc-rs/blob/master/modules/src/core/ics04_channel/handler/chan_open_ack.rs)
+- Set the `counterparty_channel_id` correctly to fix ICS04 [`chanOpenAck` handler verification](https://github.com/informalsystems/ibc-rs/blob/v0.10.0/modules/src/core/ics04_channel/handler/chan_open_ack.rs)
   ([#1649](https://github.com/informalsystems/ibc-rs/issues/1649))
 - Add missing assertion for non-zero trust-level in Tendermint client initialization.
   ([#1697](https://github.com/informalsystems/ibc-rs/issues/1697))
@@ -911,7 +1586,7 @@ This is a major release, which implemented [ADR 4](https://github.com/cosmos/ibc
 - Set the connection counterparty in the ICS 003 [`connOpenAck` handler][conn-open-ack-handler]
   ([#1532](https://github.com/informalsystems/ibc-rs/issues/1532))
 
-[conn-open-ack-handler]: https://github.com/informalsystems/ibc-rs/blob/master/modules/src/core/ics03_connection/handler/conn_open_ack.rs
+[conn-open-ack-handler]: https://github.com/informalsystems/ibc-rs/blob/v0.9.0/modules/src/core/ics03_connection/handler/conn_open_ack.rs
 
 ### IMPROVEMENTS
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 33afc0de7..5b15898ef 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,6 @@
 # Contributing
 
-Thank you for your interest in contributing! The goal
-of ibc-rs is to provide a high quality, formally verified implementation of
-the IBC protocol.
-
-All work on the code base should be motivated by a Github
-issue. Before opening a new issue, first do a search of open and closed issues
-to make sure that yours will not be a duplicate.
-If you would like to work on an issue which already exists, please indicate so
-by leaving a comment. If what you'd like to work on hasn't already been covered
-by an issue, then open a new one to get the process going.
+Thank you for your interest in contributing to ibc-rs!🎉
 
 The rest of this document outlines the best practices for contributing to this
 repository:
@@ -19,38 +10,37 @@ repository:
 - [Pull Requests](#pull-requests) - what makes a good pull request
 - [Forking](#forking) - fork the repo to make pull requests
 - [Changelog](#changelog) - changes must be recorded in the changelog
-- [Releases](#releases) - how to release new version of the crates
 
 ## Decision Making
 
-When contributing to the project, the following process leads to the best chance of
-landing the changes in `main`.
+The following process leads to the best chance of landing the changes in `main`.
 
-All new contributions should start with a Github issue which captures the
+All new contributions should **start with a GitHub issue** which captures the
 problem you're trying to solve. Starting off with an issue allows for early
-feedback. Once the issue is created, maintainers may request that more detailed
+feedback. See the [Issues](#issues) section for more details.
+
+Once the issue is created, maintainers may request that more detailed
 documentation be written in the form of a Request for Comment (RFC) or an
 Architectural Decision Record
 ([ADR](https://github.com/cosmos/ibc-rs/blob/main/docs/architecture/README.md)).
 
-Discussion at the RFC stage will build collective understanding of the dimensions
-of the problem and help structure conversations around trade-offs.
-
-When the problem is well understood but the solution leads to large
-structural changes to the code base, these changes should be proposed in
-the form of an [Architectural Decision Record
-(ADR)](./docs/architecture/). The ADR will help build consensus on an
-overall strategy to ensure that the code base maintains coherence
-in the larger context. If you are not comfortable with writing an ADR,
-you can open a regular issue and the maintainers will help you
-turn it into an ADR.
-
-When the problem and the proposed solution are well understood,
-changes should start with a [draft
-pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
-against `main`. The draft status signals that work is underway. When the work
-is ready for feedback, hitting "Ready for Review" will signal to the
-maintainers to take a look.
+Discussion at the RFC stage will build collective understanding of the
+dimensions of the problem and help structure conversations around trade-offs.
+
+When the problem is well understood but the solution leads to large structural
+changes to the code base, these changes should be proposed in the form of an
+[Architectural Decision Record (ADR)](./docs/architecture/). The ADR will help
+build consensus on an overall strategy to ensure that the code base maintains
+coherence in the larger context. If you are not comfortable with writing an ADR,
+you can open a regular issue and the maintainers will help you turn it into an
+ADR.
+
+When the problem and the proposed solution are well understood, changes should
+start with a [draft pull
+request](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
+against `main`. The draft status signals that work is underway. When the work is
+ready for feedback, hitting "Ready for Review" will signal to the maintainers to
+take a look.
 
 Implementation trajectories should aim to proceed where possible as a series
 of smaller incremental changes, in the form of small PRs that can be merged
@@ -59,68 +49,93 @@ that PRs will sit open for long periods of time.
 
 ![Contributing flow](https://github.com/tendermint/tendermint/blob/v0.33.6/docs/imgs/contributing.png?raw=true)
 
-Each stage of the process is aimed at creating feedback cycles which align
-contributors and maintainers in order to ensure that:
+## Issues
 
-- Contributors don’t waste their time implementing/proposing features which won’t land in `main`
-- Maintainers have the necessary context in order to support and review contributions
+We appreciate bug reports, feature requests, and contributions to our project.
+If you're new to contributing, a great starting point is to explore [A:
+good-first-issues](https://github.com/cosmos/ibc-rs/labels/A%3A%20good-first-issue)
+on our GitHub repository. These are well-defined tasks ideal for developers who
+are new to ibc-rs. When opening an issue, kindly adhere to the following
+guidelines:
 
-## Issues
+1. **Search existing issues**: Before opening a new issue, please search
+   existing issues to ensure that is not a duplicates. If you would like to work
+   on an issue which already exists please indicate so by leaving a comment. If
+   what you'd like to work on hasn't already been covered by an issue, then open
+   a new one to get the process going.
 
-We welcome bug reports, feature requests, and other contributions to our project. To open an issue, please follow these guidelines:
+2. **Provide a clear and descriptive title**: This helps others understand the
+   nature of the issue at a glance.
 
-1. **Search existing issues**: Before opening a new issue, please search existing issues to ensure that is not a duplicates.
+3. **Provide detailed information**: In the issue description, clearly state the
+   purpose of the issue and follow the guidelines of the issue template
 
-2. **Provide a clear and descriptive title**: This helps others understand the nature of the issue at a glance.
+Note: A maintainer will take care of assigning the appropriate labels to your
+issue with the following convention:
 
-3. **Provide detailed information**: In the issue description, clearly state the purpose of the issue and follow the guidelines of the issue template
+- Objective-level (WHY): conveys the overarching purpose or objective of the
+  issue by labels starting with "O" like `O: security`, `O: new-feature`, etc.
 
-4. A maintainer will take care of assigning the appropriate labels to your issue.
+- Scope-level (WHICH): specifies the part of the system that the issue pertains
+  to and labels starting with "S" like `S: non-cosmos`, `S: no-std`, etc.
 
-We use the following convention for issue label names:
-    - (WHY) The purpose or objective of this issue with Objective-level "O" labels like `O: security`, `O: new-feature`, etc.
-    - (WHICH) The part of the system this issue relates to using:
-      - External-level "E" labels if the issue fall outside the current scope of the system and is related to external dependencies or projects like `E: non-cosmos`, `E: no-std` etc.
-      - or "Internal-level "I" labels for anything related to the current scope of the product like `I: errors`, `I: documentation`, etc.
-    - (HOW) If any administrative considerations should be taken into account use Administrative-level "A" labels like `A: help-wanted`, `A: critical`, etc.
+- Admin-level (HOW) includes relevant administrative considerations on how best
+  handling the issue and labels starting with "A" like `A: help-wanted`, `A:
+  critical`, etc.
+
+If the issue was tagged `A: low-priority`, we'll do our best to review it in a
+timely manner, but please expect longer wait times for a review in general. If a
+low priority issue is important to you, please leave a comment explaining why,
+and we will re-prioritize it!
 
 ## Pull Requests
 
-If you have write access to the ibc-rs repo, you can directly branch off of `main`.
-This makes it easier for project maintainers to directly make changes to your
-branch should the need arise. Otherwise, check [Forking](#forking) section for instructions.
+Before making any changes, please create a new issue or refer to an existing one
+to initiate a discussion with us. This allows for collaborative discussions on
+the design and proposed implementation of your changes. This way, we ensure that
+your efforts align with our objectives and increase the likelihood of your
+contribution being accepted.
 
-Branch names should be prefixed with the author's name followed by a short description
-of the feature, eg. `name/feature-x`.
+Pull requests should aim to be small and self-contained to facilitate quick
+review and merging. Larger change sets should be broken up across multiple PRs.
+Commits should be concise but informative, and moderately clean. Please follow
+these guidelines when opening a pull request:
 
-Pull requests are made against `main` and are squash-merged into main.
+- If you have write access to the ibc-rs repo,  directly branch off from `HEAD`
+  of `main`. Otherwise, check [Forking](#forking) section for instructions.
 
-**PRs must:**
+- Branch names should be prefixed with the convention
+  `{moniker}/{issue#}-branch-name`.
 
-- make reference to an issue outlining the context
-- update any relevant documentation and include tests
-- add a corresponding entry in the `.changelog` directory using `unclog`,
-  see the [Changelog](#changelog) section for more details.
+- Ensure PR titles adhere to the format of `{type}: {description}`. The {type}
+  should be selected from the following list:
+  - feat: for feature work.
+  - fix: for bug fixes.
+  - imp: for refactors and improvements.
+  - docs: for documentation changes.
+  - test: for addition or improvements of unit, integration and e2e tests.
+  - deps: for changes to dependencies.
+  - chore: for any miscellaneous changes that don't fit into another category.
+  - If any change is breaking, follow the format below: type + (api)! for api
+    breaking changes, e.g. fix(api)!: api breaking fix type + (statemachine)!
+    for state machine breaking changes, e.g. fix(statemachine)!: state machine
+    breaking fix api breaking changes take precedence over statemachine breaking
+    changes.
 
-Pull requests should aim to be small and self-contained to facilitate quick
-review and merging. Larger change sets should be broken up across multiple PRs.
-Commits should be concise but informative, and moderately clean. Commits will be squashed into a
-single commit for the PR with all the commit messages.
+- Commit messages should follow the [Conventional Commits
+  specification](https://www.conventionalcommits.org).
 
-If the issue you worked on was tagged `A: low-priority`, we'll do our best to
-review it in a timely manner, but please expect longer wait times for a review
-in general. If a low priority issue is important to you, please leave a comment
-explaining why, and we will reprioritize it!
+- Make reference to the relevant issue by including `Closes: #<issue number>` in
+  the PR’s description to auto-close the related issue once the PR is merged.
 
-## Responsibilities of a PR Reviewer
+- Update any relevant documentation and include tests.
 
-If you're tagged as the reviewer of a PR, you are responsible for shepherding it
-through to completion. This includes fixing issues with the PR and taking the
-lead on decisions that need to be resolved in order to get the PR merged.
+- Add a corresponding entry in the `.changelog` directory using `unclog`. See
+  the [Changelog](#changelog) section for more details.
 
-If you're tagged as a reviewer on a PR that affects a part of the code base that
-you are unfamiliar with, you can hand it off to someone (with their
-consent) who is more appropriate to shepherd the PR through to completion.
+- If possible, tick the `Allow edits from maintainers` box when opening your PR
+  from your fork of ibc-rs. This allows us to directly make minor edits /
+  refactors and speeds up the merging process.
 
 ## Forking
 
@@ -148,9 +163,10 @@ To pull in updates from the origin repo, run `git fetch upstream` followed by
 
 Every non-trivial PR must update the [CHANGELOG](CHANGELOG.md). This is
 accomplished indirectly by adding entries to the `.changelog` folder in
-[`unclog`](https://github.com/informalsystems/unclog) format using the `unclog` CLI tool.
-`CHANGELOG.md` will be built by whomever is responsible for performing a release just
-prior to release - this is to avoid changelog conflicts prior to releases.
+[`unclog`](https://github.com/informalsystems/unclog) format using the `unclog`
+CLI tool. `CHANGELOG.md` will be built by whomever is responsible for performing
+a release just prior to release - this is to avoid changelog conflicts prior to
+releases.
 
 ### Install `unclog`
 
@@ -179,33 +195,33 @@ unclog add -c ibc -s features --id a-new-feature --issue-no 1235 -m "msg about t
 unclog build -u
 ```
 
-The Changelog is *not* a record of what Pull Requests were merged;
-the commit history already shows that. The Changelog is a notice to users
-about how their expectations of the software should be modified.
-It is part of the UX of a release and is a *critical* user facing integration point.
-The Changelog must be clean, inviting, and readable, with concise, meaningful entries.
-Entries must be semantically meaningful to users. If a change takes multiple
-Pull Requests to complete, it should likely have only a single entry in the
-Changelog describing the net effect to the user. Instead of linking PRs directly, we
-instead prefer to log issues, which tend to be higher-level, hence more relevant for users.
+The Changelog is *not* a record of what Pull Requests were merged; the commit
+history already shows that. The Changelog is a notice to users about how their
+expectations of the software should be modified. It is part of the UX of a
+release and is a *critical* user facing integration point. The Changelog must be
+clean, inviting, and readable, with concise, meaningful entries. Entries must be
+semantically meaningful to users. If a change takes multiple Pull Requests to
+complete, it should likely have only a single entry in the Changelog describing
+the net effect to the user. Instead of linking PRs directly, we instead prefer
+to log issues, which tend to be higher-level, hence more relevant for users.
 
 When writing Changelog entries, ensure they are targeting users of the software,
 not fellow developers. Developers have much more context and care about more
 things than users do. Changelogs are for users.
 
-Changelog structure is modeled after
-[Tendermint Core](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md)
-and [Hashicorp Consul](http://github.com/hashicorp/consul/tree/master/CHANGELOG.md).
+Changelog structure is modeled after [Tendermint
+Core](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md) and
+[Hashicorp Consul](http://github.com/hashicorp/consul/tree/main/CHANGELOG.md).
 See those changelogs for examples.
 
-We currently split changes for a given release between these four sections: Breaking
-Changes, Features, Improvements, Bug Fixes.
+We currently split changes for a given release between these four sections:
+Breaking Changes, Features, Improvements, Bug Fixes.
 
-Entries in the changelog should initially be logged in the __Unreleased__ section, which
-represents a "staging area" for accumulating all the changes throughout a
-release (see [Pull Requests](#pull-requests) below). With each release,
-the entries then move from this section into their permanent place under a
-specific release number in Changelog.
+Entries in the changelog should initially be logged in the **Unreleased**
+section, which represents a "staging area" for accumulating all the changes
+throughout a release (see [Pull Requests](#pull-requests) above). With each
+release, the entries then move from this section into their permanent place
+under a specific release number in Changelog.
 
 Changelog entries should be formatted as follows:
 
@@ -213,17 +229,16 @@ Changelog entries should be formatted as follows:
 - [pkg] Some description about the change ([#xxx](https://github.com/cosmos/ibc-rs/issues/xxx)) (optional @contributor)
 ```
 
-Here, `pkg` is the part of the code that changed (typically a
-top-level crate, but could be `<crate>/<module>`), `xxx` is the issue number, and `contributor`
+Here, `pkg` is the part of the code that changed (typically a top-level crate,
+but could be `<crate>/<module>`), `xxx` is the issue number, and `contributor`
 is the author/s of the change.
 
 It's also acceptable for `xxx` to refer to the relevant pull request, but issue
-numbers are preferred.
-Note this means issues (or pull-requests) should be opened first so the changelog can then
-be updated with the corresponding number.
+numbers are preferred. Note this means issues (or pull-requests) should be
+opened first so the changelog can then be updated with the corresponding number.
 
-Changelog entries should be ordered alphabetically according to the
-`pkg`, and numerically according to their issue/PR number.
+Changelog entries should be ordered alphabetically according to the `pkg`, and
+numerically according to their issue/PR number.
 
 Changes with multiple classifications should be doubly included (eg. a bug fix
 that is also a breaking change should be recorded under both).
@@ -231,45 +246,5 @@ that is also a breaking change should be recorded under both).
 Breaking changes are further subdivided according to the APIs/users they impact.
 Any change that effects multiple APIs/users should be recorded multiply - for
 instance, a change to some core protocol data structure might need to be
-reflected both as breaking the core protocol but also breaking any APIs where core data structures are
-exposed.
-
-## Releases
-
-Our release process is as follows:
-
-1. In a new branch `release/vX.Y.Z`, update the [changelog](#changelog) to reflect and summarize all changes in
-   the release. This involves:
-   1. Running `unclog build -u` and copy pasting the output at the top
-      of the `CHANGELOG.md` file, making sure to update the header with
-      the new version.
-   2. Running `unclog release --editor <editor> vX.Y.Z` to create a summary of all of the changes
-      in this release.
-      1. Your text editor will open. Write the release summary, and close the editor.
-         1. Make sure to include a comment on whether or not the release contains consensus-breaking changes.
-      2. Add this same summary to `CHANGELOG.md` as well.
-   3. Committing the updated `CHANGELOG.md` file and `.changelog` directory to the repo.
-2. Push this to a branch `release/vX.Y.Z` according to the version number of
-   the anticipated release (e.g. `release/v0.18.0`) and open a **draft PR**.
-3. If there were changes in the `ibc-derive` crate, we need to publish a new version of that crate.
-   1. bump the version in `crates/ibc-derive/Cargo.toml`
-   2. Publish `ibc-derive` with `cargo publish -p ibc-derive`
-4. Bump all relevant versions in `crates/ibc/Cargo.toml` to the new version and
-      push these changes to the release PR.
-      + If you released a new version of `ibc-derive` in step 3, make sure to update that dependency.
-5. Run `cargo doc -p ibc --all-features --open` locally to double-check that all the
-   documentation compiles and seems up-to-date and coherent. Fix any potential
-   issues here and push them to the release PR.
-6. Run `cargo publish -p ibc --dry-run` to double-check that publishing will work. Fix
-   any potential issues here and push them to the release PR.
-7. Mark the PR as **Ready for Review** and incorporate feedback on the release.
-8. Once approved, merge the PR, and pull the `main` branch.
-9. Run `cargo publish -p ibc`
-9. Create a signed tag and push it to GitHub: `git tag -s -a vX.Y.Z`. In the tag
-   message, write the version and the link to the corresponding section of the
-   changelog.
-   + Push the tag with `git push --tags`
-10. Once the tag is pushed, create a GitHub release and append
-   `[📖CHANGELOG](https://github.com/cosmos/ibc-rs/blob/main/CHANGELOG.md#vXYZ)` 
-   to the release description.
-11. All done! 🎉
+reflected both as breaking the core protocol but also breaking any APIs where
+core data structures are exposed.
diff --git a/Cargo.toml b/Cargo.toml
index 9e05bd35d..b6fd6364a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,132 @@
 [workspace]
-
 resolver = "2"
-
+# members sorted by publishing order to `crates.io`
 members = [
-    "crates/ibc",
-    "crates/ibc-derive",
-]
+  "ibc-derive",
+  "ibc-primitives",
+  "ibc-core/ics24-host/types",
+  "ibc-core/ics26-routing/types",
+  "ibc-core/ics23-commitment/types",
+  "ibc-core/ics02-client/types",
+  "ibc-core/ics03-connection/types",
+  "ibc-core/ics04-channel/types",
+  "ibc-core/ics25-handler/types",
+  "ibc-core/ics02-client/context",
+  "ibc-core/ics24-host",
+  "ibc-core/ics26-routing",
+  "ibc-core/ics02-client",
+  "ibc-core/ics03-connection",
+  "ibc-core/ics04-channel",
+  "ibc-core/ics25-handler",
+  "ibc-core",
+  "ibc-clients/ics07-tendermint/types",
+  "ibc-clients/ics07-tendermint",
+  "ibc-clients/ics08-wasm/types",
+  "ibc-clients/cw-context",
+  "ibc-clients/ics07-tendermint/cw-contract",
+  "ibc-clients",
+  "ibc-apps/ics20-transfer/types",
+  "ibc-apps/ics20-transfer",
+  "ibc-apps/ics721-nft-transfer/types",
+  "ibc-apps/ics721-nft-transfer",
+  "ibc-apps/ics27-interchain-accounts",
+  "ibc-apps",
+  "ibc-core/ics24-host/cosmos",
+  "ibc-data-types",
+  "ibc",
+  "ibc-query",
+  "ibc-testkit",
 
+  # internal crates that are not published
+  "tests-integration",
+]
 exclude = [
-    "ci/no-std-check",
+  "ci/cw-check",
+  "ci/no-std-check",
 ]
+
+[workspace.package]
+version      = "0.53.0"
+license      = "Apache-2.0"
+edition      = "2021"
+rust-version = "1.71.1"
+readme       = "README.md"
+repository   = "https://github.com/cosmos/ibc-rs"
+authors      = [ "Informal Systems <hello@informal.systems>" ]
+
+[workspace.dependencies]
+# external dependencies
+base64          = { version = "0.21", default-features = false }
+borsh           = { version = "0.10", default-features = false }
+displaydoc      = { version = "0.2", default-features = false }
+prost           = { version = "0.12", default-features = false }
+derive_more     = { version = "0.99.17", default-features = false, features = [ "from", "into", "display", "try_into" ] }
+rstest          = { version = "0.19" }
+schemars        = { version = "0.8.15" }
+sha2            = { version = "0.10.8", default-features = false }
+serde           = { version = "1.0", default-features = false }
+serde_json      = { package = "serde-json-wasm", version = "1.0.1", default-features = false }
+subtle-encoding = { version = "0.5", default-features = false }
+
+# ibc dependencies
+ibc            = { version = "0.53.0", path = "./ibc", default-features = false }
+ibc-core       = { version = "0.53.0", path = "./ibc-core", default-features = false }
+ibc-clients    = { version = "0.53.0", path = "./ibc-clients", default-features = false }
+ibc-apps       = { version = "0.53.0", path = "./ibc-apps", default-features = false }
+ibc-primitives = { version = "0.53.0", path = "./ibc-primitives", default-features = false }
+ibc-testkit    = { version = "0.53.0", path = "./ibc-testkit", default-features = false }
+
+ibc-derive = { version = "0.7.0", path = "./ibc-derive" }
+
+ibc-core-client     = { version = "0.53.0", path = "./ibc-core/ics02-client", default-features = false }
+ibc-core-connection = { version = "0.53.0", path = "./ibc-core/ics03-connection", default-features = false }
+ibc-core-channel    = { version = "0.53.0", path = "./ibc-core/ics04-channel", default-features = false }
+ibc-core-host       = { version = "0.53.0", path = "./ibc-core/ics24-host", default-features = false }
+ibc-core-handler    = { version = "0.53.0", path = "./ibc-core/ics25-handler", default-features = false }
+ibc-core-router     = { version = "0.53.0", path = "./ibc-core/ics26-routing", default-features = false }
+ibc-query           = { version = "0.53.0", path = "./ibc-query", default-features = false }
+
+ibc-client-cw            = { version = "0.53.0", path = "./ibc-clients/cw-context", default-features = false }
+ibc-client-tendermint    = { version = "0.53.0", path = "./ibc-clients/ics07-tendermint", default-features = false }
+ibc-client-tendermint-cw = { version = "0.53.0", path = "./ibc-clients/ics07-tendermint/cw-contract", default-features = false }
+
+ibc-app-transfer     = { version = "0.53.0", path = "./ibc-apps/ics20-transfer", default-features = false }
+ibc-app-nft-transfer = { version = "0.53.0", path = "./ibc-apps/ics721-nft-transfer", default-features = false }
+ibc-app-interchain-accounts = { version = "0.53.0", path = "./ibc-apps/ics27-interchain-accounts", default-features = false }
+
+ibc-core-client-context     = { version = "0.53.0", path = "./ibc-core/ics02-client/context", default-features = false }
+ibc-core-client-types       = { version = "0.53.0", path = "./ibc-core/ics02-client/types", default-features = false }
+ibc-core-channel-types      = { version = "0.53.0", path = "./ibc-core/ics04-channel/types", default-features = false }
+ibc-core-connection-types   = { version = "0.53.0", path = "./ibc-core/ics03-connection/types", default-features = false }
+ibc-core-commitment-types   = { version = "0.53.0", path = "./ibc-core/ics23-commitment/types", default-features = false }
+ibc-core-host-cosmos        = { version = "0.53.0", path = "./ibc-core/ics24-host/cosmos", default-features = false }
+ibc-core-host-types         = { version = "0.53.0", path = "./ibc-core/ics24-host/types", default-features = false }
+ibc-core-handler-types      = { version = "0.53.0", path = "./ibc-core/ics25-handler/types", default-features = false }
+ibc-core-router-types       = { version = "0.53.0", path = "./ibc-core/ics26-routing/types", default-features = false }
+ibc-client-tendermint-types = { version = "0.53.0", path = "./ibc-clients/ics07-tendermint/types", default-features = false }
+ibc-client-wasm-types       = { version = "0.53.0", path = "./ibc-clients/ics08-wasm/types", default-features = false }
+ibc-app-transfer-types      = { version = "0.53.0", path = "./ibc-apps/ics20-transfer/types", default-features = false }
+ibc-app-nft-transfer-types  = { version = "0.53.0", path = "./ibc-apps/ics721-nft-transfer/types", default-features = false }
+
+ibc-proto = { version = "0.44.0", default-features = false }
+
+# cosmos dependencies
+tendermint                       = { version = "0.36.0", default-features = false }
+tendermint-light-client          = { version = "0.36.0", default-features = false }
+tendermint-light-client-verifier = { version = "0.36.0", default-features = false }
+tendermint-proto                 = { version = "0.36.0", default-features = false }
+tendermint-rpc                   = { version = "0.36.0", default-features = false }
+tendermint-testgen               = { version = "0.36.0", default-features = false }
+
+# cosmwasm dependencies
+### Note: Kept at the following version to match the CosmWasm module version
+### used by chains supporting the wasm-enabled version of ibc-go v7.3
+### (This is the min version of `ibc-go` that supports `08-wasm` light clients)
+cosmwasm-schema = { version = "1.5.4" }
+cosmwasm-std    = { version = "1.5.4" }
+cosmwasm-vm     = { version = "1.5.4" }
+cw-storage-plus = { version = "1.2.0" }
+
+# parity dependencies
+parity-scale-codec = { version = "3.6.5", default-features = false, features = [ "derive" ] }
+scale-info         = { version = "2.10.0", default-features = false }
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..fd1f04070
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,55 @@
+.PHONY: help
+
+help: ## Display help message.
+	@echo "Usage: make <target>"
+	@awk 'BEGIN {FS = ":.*?## "}/^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+install-tools: ## Install development tools including nightly rustfmt, cargo-hack and cargo-release.
+	rustup component add rustfmt --toolchain nightly
+	cargo install cargo-hack
+	cargo install cargo-release
+	cargo install typos-cli taplo-cli
+
+lint: ## Lint the code using rustfmt, clippy and whitespace lints.
+	cargo +nightly fmt --all --check
+	cargo clippy --all-targets --all-features
+	cargo clippy --all-targets --no-default-features
+	typos --config $(CURDIR)/.github/typos.toml
+	bash ./ci/code-quality/whitespace-lints.sh
+	taplo fmt --check
+
+check-features: ## Check that project compiles with all combinations of features.
+	cargo hack check --workspace --feature-powerset --exclude-features default
+
+check-docs: ## Build documentation with all features and without default features.
+	cargo doc --all --all-features --release
+	cargo doc --all --no-default-features --release
+
+check-no-std: ## Check that libraries compile with `no_std` feature.
+	$(MAKE) -C ./ci/no-std-check $@
+
+check-cw: ## Check that the CosmWasm smart contract compiles.
+	cd ./ci/cw-check \
+	&& cargo build --target wasm32-unknown-unknown --no-default-features --release
+
+test: ## Run tests with all features and without default features.
+	cargo test --all-targets --all-features
+	cargo test --all-targets --no-default-features
+
+check-release: ## Check that the release build compiles.
+	cargo release --workspace --no-push --no-tag \
+		--exclude ibc-derive \
+		--exclude ibc-primitives \
+		--exclude ibc-client-tendermint-cw
+
+release: ## Perform an actual release and publishes to crates.io.
+	cargo release --workspace --no-push --no-tag --allow-branch HEAD --execute \
+		--exclude ibc-derive \
+		--exclude ibc-primitives \
+		--exclude ibc-client-tendermint-cw
+
+build-tendermint-cw: ## Build the WASM file for the ICS-07 Tendermint light client.
+	@echo "Building the WASM file for the ICS-07 Tendermint light client"
+	RUSTFLAGS='-C link-arg=-s' cargo build -p ibc-client-tendermint-cw --target wasm32-unknown-unknown --release --lib --locked
+	mkdir -p cw-contracts
+	cp target/wasm32-unknown-unknown/release/ibc_client_tendermint_cw.wasm cw-contracts/
diff --git a/README.md b/README.md
index 63aa65592..e6412b710 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +1,92 @@
-# ibc-rs
+<div align="center">
+    <h1>ibc-rs</h1>
+</div>
+
+![banner](docs/static/img/ibc-rs-cover.svg)
+
+<div align="center">
+<div>
 
 [![Cosmos ecosystem][cosmos-shield]][cosmos-link]
 
+</div>
+<div>
+
 [![Docs][docs-image]][docs-link]
 [![Build Status][build-image]][build-link]
 [![Code Coverage][codecov-image]][codecov-link]
 [![Apache 2.0 Licensed][license-image]][license-link]
-![Rust Stable][rustc-image]
-![Rust 1.60+][rustc-version]
-
-Rust implementation of the Inter-Blockchain Communication (IBC) protocol. This project hosts
-the `ibc` rust crate which defines the main data structures and on-chain logic for the IBC protocol.
-
-See the [ibc](crates/ibc) crate's README.md for more detailed information on the `ibc` crate.
+![Version][crates-io-version]
+![Downloads][crates-io-downloads]
+![Rust Stable][msrv-image]
+
+</div>
+</div>
+
+Rust implementation of the Inter-Blockchain Communication (IBC) protocol that
+hosts all the data structures and on-chain logic implementations of various IBC
+core, clients and applications. This repository organized as a collection of
+sub-crates that can be used independently or together.
+
+## Project Structure
+
+| <div style="width:100px">Crate</div>  | Description |
+| ------------------------------------- | ----------- |
+|[ibc](ibc)                             | Re-exports all the data structures and on-chain logic of various IBC core, clients and applications. |
+|[ibc-data-types](ibc-data-types)       | Re-exports all the IBC data types that are shared across different IBC implementations. |
+|[ibc-core](ibc-core)                   | Contains data structures and implementations of all the IBC core specifications. |
+|[ibc-clients](ibc-clients)             | Contains data structures and implementations of various IBC light clients. |
+|[ibc-apps](ibc-apps)                   | Contains data structures and implementations of various IBC applications. |
+|[ibc-testkit](ibc-testkit)             | Provides testing toolkit to aid `ibc-rs` and host chains in writing integration tests. |
+|[ibc-query](ibc-query)                 | Contains utility traits and implementations for querying states of an integrated IBC module. |
+|[ibc-derive](ibc-derive)               | Derive macros for `ClientState` and `ConsensusState` traits, reducing boilerplate. |
 
 ## Contributing
 
-IBC is specified in English in the [cosmos/ibc repo][ibc]. Any
-protocol changes or clarifications should be contributed there.
-
-This repo contains the Rust implementation for the IBC modules. If you're interested in
-contributing, please comment on an issue or open a new one!
+IBC is specified in English in the [cosmos/ibc repo][ibc]. Any protocol changes
+or clarifications should be contributed there.
 
-See also [CONTRIBUTING.md](./CONTRIBUTING.md).
+If you're interested in contributing, please take a look at the
+[CONTRIBUTING](./CONTRIBUTING.md) guidelines. We welcome and appreciate
+community contributions!
 
 ## Community calls
 
-We run monthly community calls to update the community with current our direction and gather feedback on what to work on next. The community calls are also a platform for you to update everyone else with what you're working on, and find opportunities to collaborate.
+The IBC-rs community calls are now part of the IBC Core community calls. During
+these calls, we update the community on our current direction and gather
+feedback on what to work on next. The community calls are also a platform for
+you to update everyone else on what you're working on and find opportunities to
+collaborate.
 
-Please join the [Google group](https://groups.google.com/g/ibc-rs-community) to receive a calendar invitation for the monthly meeting.
+Please join the [Google group](https://groups.google.com/g/ibc-community) to
+receive a calendar invitation to the monthly meetings.
 
 ## Versioning
 
-We follow [Semantic Versioning][semver], though APIs are still
-under active development.
+We follow [Semantic Versioning][semver], though APIs are still under active
+development.
 
 ## Resources
 
 - [IBC Website][ibc-homepage]
 - [IBC Specification][ibc]
 - [IBC Go implementation][ibc-go]
+- [Protobuf definitions in Rust][ibc-proto-rs]
 
 ## License
 
 Copyright © 2022 Informal Systems Inc. and ibc-rs authors.
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use the files in this repository except in compliance with the License. You may
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+the files in this repository except in compliance with the License. You may
 obtain a copy of the License at
 
     https://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
 
 [//]: # (badges)
 [docs-image]: https://docs.rs/ibc/badge.svg
@@ -60,15 +95,16 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the speci
 [build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
 [codecov-image]: https://codecov.io/gh/cosmos/ibc-rs/branch/main/graph/badge.svg?token=wUm2aLCOu
 [codecov-link]: https://codecov.io/gh/cosmos/ibc-rs
-[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
+[license-image]: https://img.shields.io/crates/l/ibc
 [license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
-[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
-[rustc-version]: https://img.shields.io/badge/rustc-1.60+-blue.svg
+[crates-io-version]: https://img.shields.io/crates/v/ibc.svg
+[crates-io-downloads]: https://img.shields.io/crates/d/ibc.svg
+[msrv-image]: https://img.shields.io/crates/msrv/ibc
 
 [//]: # (general links)
-[ibc-rs]: https://github.com/cosmos/ibc-rs
 [ibc]: https://github.com/cosmos/ibc
 [ibc-go]: https://github.com/cosmos/ibc-go
+[ibc-proto-rs]: https://github.com/cosmos/ibc-proto-rs
 [ibc-homepage]: https://cosmos.network/ibc
 [cosmos-link]: https://cosmos.network
 [semver]: https://semver.org/
diff --git a/RELEASES.md b/RELEASES.md
new file mode 100644
index 000000000..9e260ab10
--- /dev/null
+++ b/RELEASES.md
@@ -0,0 +1,97 @@
+## Releases
+
+Our release process is as follows:
+
+1. In a new branch `release/vX.Y.Z`, update the [changelog](./CHANGELOG.md) to
+   reflect and summarize all changes in the release. This involves:
+   1. Running `unclog build -u` and copy pasting the output at the top of the
+      `CHANGELOG.md` file, making sure to update the header with the new
+      version.
+   2. Running `unclog release --editor <editor> vX.Y.Z` to create a summary of
+      all of the changes in this release.
+      1. Your text editor will open. Write the release summary, and close the
+         editor. Make sure to include a comment on whether or not the release
+         contains consensus-breaking changes.
+      2. Add this same summary to `CHANGELOG.md` as well.
+   3. Committing the updated `CHANGELOG.md` file and `.changelog` directory to
+      the repo.
+2. Push this to a branch `release/vX.Y.Z` according to the version number of the
+   anticipated release (e.g. `release/v0.18.0`) and open a **draft PR**.
+3. If there were changes in the `ibc-derive` crate, we need to publish a new
+   version of that crate.
+   1. bump the version in `crates/ibc-derive/Cargo.toml`
+   2. Publish `ibc-derive` with `cargo publish -p ibc-derive`
+4. Bump the versions of all crates to the new version in their Cargo.toml and in
+   the root `Cargo.toml` as well, and push these changes to the release PR.
+   - If you released a new version of `ibc-derive` in step 3, make sure to
+     update that dependency.
+   - Verify that there is no dev-dependency among the workspace crates. This is
+     important, as `cargo-release` ignores dev-dependency edges. You may use
+     `cargo-depgraph`:
+     ```sh
+     cargo depgraph --all-features --workspace-only --dev-deps | dot -Tpng > graph.png
+     ```
+     The command will generate a graph similar to this:
+     ![alt test](docs/dev-deps-graph.png) The dev dependencies are colored with
+     blue arrows. Currently, there are no blue arrows, i.e. there is no dev
+     dependency among the IBC crates. It is advised to avoid any dev dependency
+     because of release order complicacy (except maybe inside `ibc-testkit`, as
+     it is the top crate that depends on `ibc` crate and no other crate depends
+     on it).
+   - In order to resolve such a situation, the dev dependencies other than
+     `ibc-testkit` can be manually released to crates.io first so that the
+     subsequent crates that depend on them can then be released via the release
+     process. For instructions on how to release a crate on crates.io, refer
+     [here](https://doc.rust-lang.org/cargo/reference/publishing.html).
+5. Beware of [crates-io rate limit][cargo-release-rate-limit]. It is 5 for
+   publishing new crates and 30 for publishing existing crates. But the number
+   of our crates has reached 31. So we publish a leaf crate, `ibc-primitives`
+   manually and release the rest of the 30 crates via CI.
+   - Release `ibc-primitives` by running:
+   ```sh
+   cargo release -p ibc-primitives --no-push --no-tag --allow-branch main --execute
+   ```
+   - Validate the number of crates that need to be released via CI, it can not
+     be more than 30.
+   - There should be a 10 minutes delay between the release of `ibc-primitives`
+     and the release of the rest of the crates on CI.
+   - If new crates are added, we need to recompute the set of crates that we
+     want to release via CI. The rest must be released manually.
+6. Run `cargo doc -p ibc --all-features --open` locally to double-check that all
+   the documentation compiles and seems up-to-date and coherent. Fix any
+   potential issues here and push them to the release PR.
+7. Mark the PR as **Ready for Review** and incorporate feedback on the release.
+   Once approved, merge the PR.
+8. Checkout the `main` and pull it with
+   `git checkout main && git pull origin main`.
+9. Create a signed tag `git tag -s -a vX.Y.Z`. In the tag message, write the
+   version and the link to the corresponding section of the changelog. Then push
+   the tag to GitHub with `git push origin vX.Y.Z`.
+   - The [release workflow][release.yaml] will run the `cargo release --execute`
+     command in a CI worker.
+10. If some crates have not been released, check the cause of the failure and
+    act accordingly:
+    1. In case of intermittent problems with the registry, try `cargo release`
+       locally to publish any missing crates from this release. This step
+       requires the appropriate privileges to push crates to [crates.io].
+    2. If there is any new crate published locally, add
+       [ibcbot](https://crates.io/users/ibcbot) to its owners list.
+    3. In case problems arise from the source files, fix them, bump a new patch
+       version (e.g. `v0.48.1`) and repeat the process with its corresponding
+       new tag.
+11. Once the tag is pushed, wait for the CI bot to create a GitHub release, then
+    update the release description and append:
+    `[📖CHANGELOG](https://github.com/cosmos/ibc-rs/blob/main/CHANGELOG.md#vXYZ)`
+
+### Communications (non-technical) release pipeline
+
+- Notify the communications team about the pending release and prepare an
+  announcement.
+- Coordinate with other organizations that are active in IBC development (e.g.,
+  Interchain) and keep them in the loop.
+
+All done! 🎉
+
+[crates.io]: https://crates.io
+[release.yaml]: https://github.com/cosmos/ibc-rs/blob/main/.github/workflows/release.yaml
+[cargo-release-rate-limit]: https://github.com/crate-ci/cargo-release/blob/4b09269/src/steps/mod.rs#L214-L268
diff --git a/ci/code-quality/whitespace-lints.sh b/ci/code-quality/whitespace-lints.sh
new file mode 100755
index 000000000..ebf181c6c
--- /dev/null
+++ b/ci/code-quality/whitespace-lints.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -euo pipefail
+
+# use ggrep for macOS, and grep for Linux
+case "$OSTYPE" in
+    darwin*) GREP="ggrep" ;;
+    linux-gnu*) GREP="grep" ;;
+    *) echo "Unknown OS: $OSTYPE" && exit 1 ;;
+esac
+
+check_binary() {
+    # exactly one argument is passed
+    if [ $# -ne 1 ] || [ "$1" = "" ]; then
+        echo "Usage: check_binary <binary>"
+        exit 1
+    fi
+
+    if ! (type "$1" >/dev/null 2>&1); then
+        echo "$1 is not present"
+        exit 1
+    fi
+}
+
+check_binary "$GREP"
+check_binary find
+
+check_code_quality() {
+    # exactly three arguments are passed
+    if [ $# -ne 3 ] || [ "$1" = "" ] || [ "$2" = "" ] || [ "$3" = "" ]; then
+        echo "Usage: check_code_quality <option> <pattern> <message>"
+        exit 1
+    fi
+
+    if find . -type f -name "*.toml" -o -name "*.rs" \
+        -not -path '*/.*' -not -path '*/target/*' \
+        -exec "$GREP" "$1" "$2" {} \; | "$GREP" '.*'; then
+        echo "$3"
+        return 1
+    else
+        return 0
+    fi
+}
+
+exit_code=0
+
+check_code_quality -nHIP "\s+$" "found: trailing whitespaces" || exit_code=1
+check_code_quality -nHIP $"\t" "found: tabs" || exit_code=1
+check_code_quality -zLIP ".*\n\Z" "found: no newline at EOF" || exit_code=1
+
+if [ "$exit_code" -eq 0 ]; then
+    echo "All code quality checks passed successfully."
+fi
+
+exit "$exit_code"
diff --git a/ci/cw-check/Cargo.lock b/ci/cw-check/Cargo.lock
new file mode 100644
index 000000000..508b87196
--- /dev/null
+++ b/ci/cw-check/Cargo.lock
@@ -0,0 +1,1628 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bnum"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "cosmwasm-crypto"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd50718a2b6830ce9eb5d465de5a018a12e71729d66b70807ce97e6dd14f931d"
+dependencies = [
+ "digest 0.10.7",
+ "ecdsa",
+ "ed25519-zebra",
+ "k256",
+ "rand_core 0.6.4",
+ "thiserror",
+]
+
+[[package]]
+name = "cosmwasm-derive"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "242e98e7a231c122e08f300d9db3262d1007b51758a8732cd6210b3e9faa4f3a"
+dependencies = [
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "cosmwasm-schema"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7879036156092ad1c22fe0d7316efc5a5eceec2bc3906462a2560215f2a2f929"
+dependencies = [
+ "cosmwasm-schema-derive",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cosmwasm-schema-derive"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb57855fbfc83327f8445ae0d413b1a05ac0d68c396ab4d122b2abd7bb82cb6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "cosmwasm-std"
+version = "1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c1556156fdf892a55cced6115968b961eaaadd6f724a2c2cb7d1e168e32dd3"
+dependencies = [
+ "base64 0.21.7",
+ "bech32",
+ "bnum",
+ "cosmwasm-crypto",
+ "cosmwasm-derive",
+ "derivative",
+ "forward_ref",
+ "hex",
+ "schemars",
+ "serde",
+ "serde-json-wasm 0.5.2",
+ "sha2 0.10.8",
+ "static_assertions",
+ "thiserror",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "cw-check"
+version = "0.1.0"
+dependencies = [
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "ibc-apps",
+ "ibc-core",
+ "serde-json-wasm 1.0.1",
+ "thiserror",
+]
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer 0.10.4",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der",
+ "digest 0.10.7",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
+[[package]]
+name = "ed25519"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
+dependencies = [
+ "pkcs8",
+ "signature",
+]
+
+[[package]]
+name = "ed25519-zebra"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6"
+dependencies = [
+ "curve25519-dalek",
+ "hashbrown 0.12.3",
+ "hex",
+ "rand_core 0.6.4",
+ "serde",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
+[[package]]
+name = "either"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest 0.10.7",
+ "ff",
+ "generic-array",
+ "group",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "flex-error"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
+dependencies = [
+ "paste",
+]
+
+[[package]]
+name = "forward_ref"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "ibc-app-transfer"
+version = "0.53.0"
+dependencies = [
+ "ibc-app-transfer-types",
+ "ibc-core",
+ "serde-json-wasm 1.0.1",
+]
+
+[[package]]
+name = "ibc-app-transfer-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core",
+ "ibc-proto",
+ "parity-scale-codec",
+ "primitive-types",
+ "scale-info",
+ "serde",
+ "uint",
+]
+
+[[package]]
+name = "ibc-apps"
+version = "0.53.0"
+dependencies = [
+ "ibc-app-transfer",
+]
+
+[[package]]
+name = "ibc-core"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-channel",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-derive",
+ "ibc-primitives",
+]
+
+[[package]]
+name = "ibc-core-channel"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-channel-types",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
+]
+
+[[package]]
+name = "ibc-core-channel-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+ "sha2 0.10.8",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-core-client"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
+]
+
+[[package]]
+name = "ibc-core-client-context"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-core-client-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-core-commitment-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-primitives",
+ "ibc-proto",
+ "ics23",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+ "subtle-encoding",
+]
+
+[[package]]
+name = "ibc-core-connection"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-client",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
+]
+
+[[package]]
+name = "ibc-core-connection-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-core-handler"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-channel",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
+]
+
+[[package]]
+name = "ibc-core-handler-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-channel-types",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-host-types",
+ "ibc-core-router-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-core-host"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-channel-types",
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "subtle-encoding",
+]
+
+[[package]]
+name = "ibc-core-host-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-primitives",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+]
+
+[[package]]
+name = "ibc-core-router"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-channel-types",
+ "ibc-core-host-types",
+ "ibc-core-router-types",
+ "ibc-primitives",
+ "subtle-encoding",
+]
+
+[[package]]
+name = "ibc-core-router-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "parity-scale-codec",
+ "scale-info",
+ "schemars",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-derive"
+version = "0.7.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "ibc-primitives"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-proto",
+ "parity-scale-codec",
+ "prost",
+ "scale-info",
+ "schemars",
+ "serde",
+ "tendermint",
+ "time",
+]
+
+[[package]]
+name = "ibc-proto"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66080040d5a4800d52966d55b055400f86b79c34b854b935bef03c87aacda62a"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "flex-error",
+ "ics23",
+ "informalsystems-pbjson",
+ "parity-scale-codec",
+ "prost",
+ "scale-info",
+ "schemars",
+ "serde",
+ "subtle-encoding",
+ "tendermint-proto",
+]
+
+[[package]]
+name = "ics23"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc3b8be84e7285c73b88effdc3294b552277d6b0ec728ee016c861b7b9a2c19c"
+dependencies = [
+ "anyhow",
+ "blake2",
+ "blake3",
+ "bytes",
+ "hex",
+ "informalsystems-pbjson",
+ "prost",
+ "ripemd",
+ "serde",
+ "sha2 0.10.8",
+ "sha3",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "informalsystems-pbjson"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2 0.10.8",
+ "signature",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "parity-scale-codec"
+version = "3.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
+dependencies = [
+ "arrayvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "3.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "primitive-types"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
+dependencies = [
+ "fixed-hash",
+ "impl-serde",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9554e3ab233f0a932403704f1a1d08c30d5ccd931adfdfa1e8b5a19b52c1d55a"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
+dependencies = [
+ "prost",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "scale-info"
+version = "2.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024"
+dependencies = [
+ "cfg-if",
+ "derive_more",
+ "parity-scale-codec",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "2.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "schemars"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.201"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-json-wasm"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9213a07d53faa0b8dd81e767a54a8188a242fdb9be99ab75ec576a774bfdd7"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde-json-wasm"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.201"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest 0.10.7",
+ "keccak",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "subtle-encoding"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tendermint"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b50aae6ec24c3429149ad59b5b8d3374d7804d4c7d6125ceb97cb53907fb68d"
+dependencies = [
+ "bytes",
+ "digest 0.10.7",
+ "ed25519",
+ "flex-error",
+ "futures",
+ "num-traits",
+ "once_cell",
+ "prost",
+ "prost-types",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "serde_repr",
+ "signature",
+ "subtle",
+ "subtle-encoding",
+ "tendermint-proto",
+ "time",
+ "zeroize",
+]
+
+[[package]]
+name = "tendermint-proto"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f193d04afde6592c20fd70788a10b8cb3823091c07456db70d8a93f5fb99c1"
+dependencies = [
+ "bytes",
+ "flex-error",
+ "prost",
+ "prost-types",
+ "serde",
+ "serde_bytes",
+ "subtle-encoding",
+ "time",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
diff --git a/ci/cw-check/Cargo.toml b/ci/cw-check/Cargo.toml
new file mode 100644
index 000000000..fdb27f2cd
--- /dev/null
+++ b/ci/cw-check/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+edition = "2021"
+name    = "cw-check"
+version = "0.1.0"
+
+[lib]
+crate-type = [ "cdylib", "rlib" ]
+
+[dependencies]
+ibc-apps        = { path = "../../ibc-apps", default_features = false, features = [ "serde", "parity-scale-codec" ] }
+ibc-core        = { path = "../../ibc-core", features = [ "serde", "parity-scale-codec", "schema" ] }
+cosmwasm-std    = { version = "1.5.4", default-features = false }
+cosmwasm-schema = { version = "1.5.4", default-features = false }
+serde_json      = { package = "serde-json-wasm", version = "^1.0.1", default-features = false }
+thiserror       = { version = "^1.0", default-features = false }
+
+[profile.release]
+lto              = true
+codegen-units    = 1
+debug            = false
+debug-assertions = false
+opt-level        = "s"
+overflow-checks  = true
+panic            = "abort"
+rpath            = false
diff --git a/ci/cw-check/README.md b/ci/cw-check/README.md
new file mode 100644
index 000000000..0f5ba12cb
--- /dev/null
+++ b/ci/cw-check/README.md
@@ -0,0 +1,5 @@
+# CosmWasm Check
+
+This crate contains a simple CosmWasm contract, which incorporates `ibc-rs`, to ensure the compatibility of `ibc-rs` with the CosmWasm environment.
+
+CosmWasm is `std` targeting `wasm32-unknown-unknown` with `stable` rust which provides precompiled extensions `alloc/core/std` which has only features available in `wasmd` runner and passed `cosmwasm-check` (precompile extensions check and cosmwasm-check are not same set).
diff --git a/ci/cw-check/rust-toolchain.toml b/ci/cw-check/rust-toolchain.toml
new file mode 100644
index 000000000..50431042f
--- /dev/null
+++ b/ci/cw-check/rust-toolchain.toml
@@ -0,0 +1,5 @@
+[toolchain]
+channel = "nightly-2024-02-24"
+targets = [
+  "wasm32-unknown-unknown",
+]
diff --git a/ci/cw-check/src/lib.rs b/ci/cw-check/src/lib.rs
new file mode 100644
index 000000000..e567d844e
--- /dev/null
+++ b/ci/cw-check/src/lib.rs
@@ -0,0 +1,64 @@
+extern crate alloc;
+use std::str::FromStr;
+
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::{DepsMut, Env, MessageInfo, Response};
+use ibc_apps::transfer::types::msgs::transfer::MsgTransfer;
+use ibc_apps::transfer::types::packet::PacketData;
+use ibc_apps::transfer::types::{Amount, BaseDenom, PrefixedCoin, PrefixedDenom, TracePath};
+use ibc_core::host::types::identifiers::*;
+use thiserror::Error;
+
+#[cw_serde]
+pub struct Msg {
+    pub test: String,
+}
+
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
+pub fn instantiate(
+    _deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    msg: Msg,
+) -> Result<Response, ContractError> {
+    let _serde: (
+        PrefixedCoin,
+        Amount,
+        ChannelId,
+        ChainId,
+        ConnectionId,
+        MsgTransfer,
+        PacketData,
+    ) = serde_json::from_str(&msg.test).expect("test");
+    let a = serde_json::to_string(&ChannelId::from_str(msg.test.as_str()).unwrap()).expect("test");
+    let b = serde_json::to_string(&PortId::from_str(msg.test.as_str()).unwrap()).expect("test");
+    let c = serde_json::to_string(&ClientId::from_str(msg.test.as_str()).unwrap()).expect("test");
+    let d =
+        serde_json::to_string(&ConnectionId::from_str(msg.test.as_str()).unwrap()).expect("test");
+    let e = serde_json::to_string(&PrefixedDenom {
+        trace_path: TracePath::empty(),
+        base_denom: BaseDenom::from_str(msg.test.as_str()).unwrap(),
+    })
+    .expect("test");
+    let f = serde_json::to_string(&ConnectionId::from_str(msg.test.as_str()).expect("test"))
+        .expect("test");
+    Ok(Response::new()
+        .add_attribute(a, b)
+        .add_attribute(c, d)
+        .add_attribute(e, f)
+        .add_attribute(msg.test.clone(), msg.test.clone()))
+}
+
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
+pub fn execute(
+    _deps: DepsMut,
+    _env: Env,
+    _info: MessageInfo,
+    _msg: Msg,
+) -> Result<Response, ContractError> {
+    Ok(Response::default())
+}
+
+#[cw_serde]
+#[derive(Error)]
+pub enum ContractError {}
diff --git a/ci/no-std-check/Cargo.lock b/ci/no-std-check/Cargo.lock
index 313e97b68..f16deb620 100644
--- a/ci/no-std-check/Cargo.lock
+++ b/ci/no-std-check/Cargo.lock
@@ -14,20 +14,11 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.17.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
- "gimli 0.26.2",
-]
-
-[[package]]
-name = "addr2line"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
-dependencies = [
- "gimli 0.27.2",
+ "gimli",
 ]
 
 [[package]]
@@ -36,34 +27,45 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.10",
+ "getrandom",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -94,15 +96,144 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+
+[[package]]
+name = "ark-bls12-377"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bls12-381"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
+dependencies = [
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+ "itertools 0.10.5",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest 0.10.7",
+ "itertools 0.10.5",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-serialize-derive",
+ "ark-std",
+ "digest 0.10.7",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-serialize-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand",
+]
 
 [[package]]
 name = "array-bytes"
-version = "4.2.0"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0"
 
 [[package]]
 name = "arrayref"
@@ -112,37 +243,37 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
- "addr2line 0.19.0",
+ "addr2line",
  "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.30.4",
+ "object",
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -151,9 +282,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
@@ -162,12 +299,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
-name = "bincode"
-version = "1.3.3"
+name = "bitcoin-internals"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
 dependencies = [
- "serde",
+ "bitcoin-internals",
+ "hex-conservative",
 ]
 
 [[package]]
@@ -176,6 +320,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -199,25 +349,26 @@ dependencies = [
 
 [[package]]
 name = "blake2b_simd"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
+checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
+ "arrayvec",
  "constant_time_eq",
 ]
 
 [[package]]
-name = "block-buffer"
-version = "0.7.3"
+name = "blake3"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
 ]
 
 [[package]]
@@ -226,7 +377,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -235,33 +386,24 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
+ "generic-array",
 ]
 
 [[package]]
 name = "borsh"
-version = "0.9.3"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa"
+checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
 dependencies = [
  "borsh-derive",
- "hashbrown 0.11.2",
+ "hashbrown 0.13.2",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "0.9.3"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775"
+checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"
 dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
@@ -272,9 +414,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive-internal"
-version = "0.9.3"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065"
+checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -283,9 +425,9 @@ dependencies = [
 
 [[package]]
 name = "borsh-schema-derive-internal"
-version = "0.9.3"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0"
+checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -294,9 +436,9 @@ dependencies = [
 
 [[package]]
 name = "bounded-collections"
-version = "0.1.8"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6"
+checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -306,15 +448,18 @@ dependencies = [
 
 [[package]]
 name = "bs58"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
@@ -322,32 +467,26 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
 
 [[package]]
 name = "cfg-if"
@@ -357,92 +496,81 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "winapi",
+ "windows-targets",
 ]
 
+[[package]]
+name = "common-path"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
+
 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
 [[package]]
-name = "core-foundation-sys"
-version = "0.8.4"
+name = "constcat"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08"
 
 [[package]]
-name = "cpp_demangle"
-version = "0.3.5"
+name = "core-foundation-sys"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
-dependencies = [
- "cfg-if",
-]
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.7"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
-name = "cranelift-entity"
-version = "0.93.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cranelift-entity"
-version = "0.95.1"
+name = "crunchy"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
-dependencies = [
- "serde",
-]
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
-name = "crc32fast"
-version = "1.3.2"
+name = "crypto-bigint"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
- "cfg-if",
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
 ]
 
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -452,44 +580,49 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
  "subtle",
 ]
 
 [[package]]
-name = "crypto-mac"
-version = "0.11.1"
+name = "curve25519-dalek"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
 dependencies = [
- "generic-array 0.14.7",
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
  "subtle",
+ "zeroize",
 ]
 
 [[package]]
 name = "curve25519-dalek"
-version = "2.1.3"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216"
+checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
 dependencies = [
- "byteorder",
- "digest 0.8.1",
- "rand_core 0.5.1",
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.7",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
+name = "curve25519-dalek-derive"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -506,48 +639,44 @@ dependencies = [
 ]
 
 [[package]]
-name = "darling"
-version = "0.20.1"
+name = "der"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "const-oid",
+ "zeroize",
 ]
 
 [[package]]
-name = "darling_core"
-version = "0.20.1"
+name = "deranged"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.23",
+ "powerfmt",
 ]
 
 [[package]]
-name = "darling_macro"
-version = "0.20.1"
+name = "derivative"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "darling_core",
+ "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 1.0.109",
 ]
 
 [[package]]
-name = "der"
-version = "0.7.6"
+name = "derive-syn-parse"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17"
+checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
- "const-oid",
- "zeroize",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
 ]
 
 [[package]]
@@ -561,22 +690,13 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "digest"
 version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.7",
+ "generic-array",
 ]
 
 [[package]]
@@ -586,6 +706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -598,14 +719,35 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
-name = "downcast-rs"
-version = "1.2.0"
+name = "docify"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce"
+dependencies = [
+ "docify_macros",
+]
+
+[[package]]
+name = "docify_macros"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad"
+dependencies = [
+ "common-path",
+ "derive-syn-parse",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.63",
+ "termcolor",
+ "toml 0.8.12",
+ "walkdir",
+]
 
 [[package]]
 name = "dyn-clonable"
@@ -630,27 +772,33 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.11"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
-name = "ed25519"
-version = "1.5.3"
+name = "ecdsa"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "signature 1.6.4",
+ "der",
+ "digest 0.10.7",
+ "elliptic-curve",
+ "rfc6979",
+ "serdect",
+ "signature",
+ "spki",
 ]
 
 [[package]]
 name = "ed25519"
-version = "2.2.1"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb04eee5d9d907f29e80ee6b0e78f7e2c82342c63e3580d8c4f69d9d5aad963"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
- "signature 2.1.0",
+ "signature",
 ]
 
 [[package]]
@@ -668,13 +816,15 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 3.2.0",
- "ed25519 1.5.3",
- "sha2 0.9.9",
+ "curve25519-dalek 4.1.2",
+ "ed25519",
+ "serde",
+ "sha2 0.10.8",
+ "subtle",
  "zeroize",
 ]
 
@@ -694,48 +844,71 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
-
-[[package]]
-name = "environmental"
-version = "1.1.4"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
-name = "errno"
-version = "0.3.1"
+name = "elliptic-curve"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
+ "base16ct",
+ "crypto-bigint",
+ "digest 0.10.7",
+ "ff",
+ "generic-array",
+ "group",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "serdect",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "environmental"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "expander"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "00e83c02035136f1592a47964ea60c05a50e4ed8b5892cfac197063850898d4d"
 dependencies = [
- "cc",
- "libc",
+ "blake2",
+ "fs-err",
+ "prettier-please",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
 ]
 
 [[package]]
-name = "fake-simd"
-version = "0.1.2"
+name = "ff"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
 
 [[package]]
-name = "fallible-iterator"
-version = "0.2.0"
+name = "fiat-crypto"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "fixed-hash"
@@ -744,7 +917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
  "static_assertions",
 ]
@@ -759,18 +932,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.0"
+name = "fs-err"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
 dependencies = [
- "percent-encoding",
+ "autocfg",
 ]
 
 [[package]]
@@ -781,9 +948,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -796,9 +963,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -806,15 +973,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -824,38 +991,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -869,15 +1036,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -886,49 +1044,45 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.1.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.2.10"
+name = "getrandom_or_panic"
+version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
 dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "rand",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.26.2"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
-dependencies = [
- "fallible-iterator",
- "stable_deref_trait",
-]
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
-name = "gimli"
-version = "0.27.2"
+name = "group"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
- "fallible-iterator",
- "indexmap",
- "stable_deref_trait",
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
 ]
 
 [[package]]
@@ -946,22 +1100,13 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash 0.7.6",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -970,23 +1115,20 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.11",
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.2.6"
+name = "hashbrown"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -995,22 +1137,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
-name = "hmac"
-version = "0.8.1"
+name = "hex-conservative"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
-dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
-]
+checksum = "30ed443af458ccb6d81c1e7e661545f94d3176752fb1df2f543b902a1e0f51e2"
 
 [[package]]
 name = "hmac"
-version = "0.11.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
+checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
 dependencies = [
- "crypto-mac 0.11.1",
+ "crypto-mac",
  "digest 0.9.0",
 ]
 
@@ -1030,22 +1168,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
  "digest 0.9.0",
- "generic-array 0.14.7",
+ "generic-array",
  "hmac 0.8.1",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
@@ -1059,326 +1197,602 @@ dependencies = [
 
 [[package]]
 name = "ibc"
-version = "0.42.0"
+version = "0.53.0"
 dependencies = [
- "bytes",
- "derive_more",
- "displaydoc",
+ "ibc-apps",
+ "ibc-clients",
+ "ibc-core",
+ "ibc-core-host-cosmos",
  "ibc-derive",
- "ibc-proto",
- "ics23",
- "num-traits",
- "primitive-types",
- "prost",
- "safe-regex",
- "sha2 0.10.6",
- "subtle-encoding",
- "tendermint",
- "tendermint-light-client-verifier",
- "tendermint-proto",
- "time",
- "tracing",
- "uint",
+ "ibc-primitives",
 ]
 
 [[package]]
-name = "ibc-derive"
-version = "0.1.0"
+name = "ibc-app-transfer"
+version = "0.53.0"
 dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.23",
+ "ibc-app-transfer-types",
+ "ibc-core",
+ "serde-json-wasm",
 ]
 
 [[package]]
-name = "ibc-proto"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c888103095b45bee90cb9104513ade30abd69902153b0682b5ad81940ae1f865"
+name = "ibc-app-transfer-types"
+version = "0.53.0"
 dependencies = [
- "base64 0.21.2",
- "borsh",
- "bytes",
- "flex-error",
- "ics23",
- "parity-scale-codec",
- "prost",
- "scale-info",
+ "derive_more",
+ "displaydoc",
+ "ibc-core",
+ "ibc-proto",
+ "primitive-types",
  "serde",
- "subtle-encoding",
- "tendermint-proto",
+ "uint",
 ]
 
 [[package]]
-name = "ics23"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af9e8f569c5cc88e08b8d076dc207e0748aa1f52d4b84910ec919c8f2bed6ea7"
+name = "ibc-apps"
+version = "0.53.0"
 dependencies = [
- "anyhow",
- "bytes",
- "hex",
- "prost",
- "ripemd",
- "sha2 0.10.6",
- "sha3",
+ "ibc-app-transfer",
 ]
 
 [[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+name = "ibc-client-tendermint"
+version = "0.53.0"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "derive_more",
+ "ibc-client-tendermint-types",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
+ "serde",
+ "tendermint",
+ "tendermint-light-client-verifier",
 ]
 
 [[package]]
-name = "impl-codec"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+name = "ibc-client-tendermint-types"
+version = "0.53.0"
 dependencies = [
- "parity-scale-codec",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+ "tendermint",
+ "tendermint-light-client-verifier",
+ "tendermint-proto",
 ]
 
 [[package]]
-name = "impl-serde"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+name = "ibc-client-wasm-types"
+version = "0.53.0"
 dependencies = [
+ "base64 0.21.7",
+ "displaydoc",
+ "ibc-core-client",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
  "serde",
 ]
 
 [[package]]
-name = "impl-trait-for-tuples"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+name = "ibc-clients"
+version = "0.53.0"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "ibc-client-tendermint",
+ "ibc-client-wasm-types",
 ]
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+name = "ibc-core"
+version = "0.53.0"
 dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
+ "ibc-core-channel",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-derive",
+ "ibc-primitives",
 ]
 
 [[package]]
-name = "integer-sqrt"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+name = "ibc-core-channel"
+version = "0.53.0"
 dependencies = [
- "num-traits",
+ "ibc-core-channel-types",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
 ]
 
 [[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+name = "ibc-core-channel-types"
+version = "0.53.0"
 dependencies = [
- "hermit-abi 0.3.1",
- "libc",
- "windows-sys 0.48.0",
+ "derive_more",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+ "sha2 0.10.8",
+ "subtle-encoding",
+ "tendermint",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+name = "ibc-core-client"
+version = "0.53.0"
 dependencies = [
- "either",
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+name = "ibc-core-client-context"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "subtle-encoding",
+ "tendermint",
+]
 
 [[package]]
-name = "js-sys"
-version = "0.3.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+name = "ibc-core-client-types"
+version = "0.53.0"
 dependencies = [
- "wasm-bindgen",
+ "derive_more",
+ "displaydoc",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
 ]
 
 [[package]]
-name = "keccak"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+name = "ibc-core-commitment-types"
+version = "0.53.0"
 dependencies = [
- "cpufeatures",
+ "derive_more",
+ "displaydoc",
+ "ibc-primitives",
+ "ibc-proto",
+ "ics23",
+ "serde",
+ "subtle-encoding",
 ]
 
 [[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+name = "ibc-core-connection"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-client",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-primitives",
+]
 
 [[package]]
-name = "libc"
-version = "0.2.146"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+name = "ibc-core-connection-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
+]
 
 [[package]]
-name = "libm"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+name = "ibc-core-handler"
+version = "0.53.0"
+dependencies = [
+ "ibc-core-channel",
+ "ibc-core-client",
+ "ibc-core-commitment-types",
+ "ibc-core-connection",
+ "ibc-core-handler-types",
+ "ibc-core-host",
+ "ibc-core-router",
+ "ibc-primitives",
+]
 
 [[package]]
-name = "libsecp256k1"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
+name = "ibc-core-handler-types"
+version = "0.53.0"
 dependencies = [
- "arrayref",
- "base64 0.13.1",
- "digest 0.9.0",
- "hmac-drbg",
- "libsecp256k1-core",
- "libsecp256k1-gen-ecmult",
- "libsecp256k1-gen-genmult",
- "rand 0.8.5",
+ "derive_more",
+ "displaydoc",
+ "ibc-core-channel-types",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-host-types",
+ "ibc-core-router-types",
+ "ibc-primitives",
+ "ibc-proto",
  "serde",
- "sha2 0.9.9",
- "typenum",
+ "subtle-encoding",
+ "tendermint",
 ]
 
 [[package]]
-name = "libsecp256k1-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
+name = "ibc-core-host"
+version = "0.53.0"
 dependencies = [
- "crunchy",
- "digest 0.9.0",
- "subtle",
+ "derive_more",
+ "displaydoc",
+ "ibc-core-channel-types",
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "subtle-encoding",
 ]
 
 [[package]]
-name = "libsecp256k1-gen-ecmult"
-version = "0.3.0"
+name = "ibc-core-host-cosmos"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-app-transfer-types",
+ "ibc-client-tendermint",
+ "ibc-core-client-context",
+ "ibc-core-client-types",
+ "ibc-core-commitment-types",
+ "ibc-core-connection-types",
+ "ibc-core-handler-types",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+ "sha2 0.10.8",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-core-host-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-primitives",
+ "serde",
+]
+
+[[package]]
+name = "ibc-core-router"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-channel-types",
+ "ibc-core-host-types",
+ "ibc-core-router-types",
+ "ibc-primitives",
+ "subtle-encoding",
+]
+
+[[package]]
+name = "ibc-core-router-types"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-core-host-types",
+ "ibc-primitives",
+ "ibc-proto",
+ "serde",
+ "subtle-encoding",
+ "tendermint",
+]
+
+[[package]]
+name = "ibc-derive"
+version = "0.7.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "ibc-primitives"
+version = "0.53.0"
+dependencies = [
+ "derive_more",
+ "displaydoc",
+ "ibc-proto",
+ "prost",
+ "serde",
+ "tendermint",
+ "time",
+]
+
+[[package]]
+name = "ibc-proto"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
+checksum = "66080040d5a4800d52966d55b055400f86b79c34b854b935bef03c87aacda62a"
 dependencies = [
- "libsecp256k1-core",
+ "base64 0.22.1",
+ "borsh",
+ "bytes",
+ "flex-error",
+ "ics23",
+ "informalsystems-pbjson",
+ "parity-scale-codec",
+ "prost",
+ "scale-info",
+ "serde",
+ "subtle-encoding",
+ "tendermint-proto",
 ]
 
 [[package]]
-name = "libsecp256k1-gen-genmult"
-version = "0.3.0"
+name = "ics23"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
+checksum = "dc3b8be84e7285c73b88effdc3294b552277d6b0ec728ee016c861b7b9a2c19c"
 dependencies = [
- "libsecp256k1-core",
+ "anyhow",
+ "blake2",
+ "blake3",
+ "bytes",
+ "hex",
+ "informalsystems-pbjson",
+ "prost",
+ "ripemd",
+ "serde",
+ "sha2 0.10.8",
+ "sha3",
 ]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
+name = "impl-codec"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+dependencies = [
+ "parity-scale-codec",
+]
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
+name = "impl-serde"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+dependencies = [
+ "serde",
+]
 
 [[package]]
-name = "lock_api"
-version = "0.4.10"
+name = "impl-trait-for-tuples"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "autocfg",
- "scopeguard",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
-name = "log"
-version = "0.4.19"
+name = "indexmap"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
+]
 
 [[package]]
-name = "mach"
-version = "0.3.2"
+name = "informalsystems-pbjson"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+checksum = "9aa4a0980c8379295100d70854354e78df2ee1c6ca0f96ffe89afeb3140e3a3d"
 dependencies = [
- "libc",
+ "base64 0.21.7",
+ "serde",
 ]
 
 [[package]]
-name = "matchers"
-version = "0.0.1"
+name = "integer-sqrt"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
 dependencies = [
- "regex-automata",
+ "num-traits",
 ]
 
 [[package]]
-name = "memchr"
-version = "2.5.0"
+name = "itertools"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
 
 [[package]]
-name = "memfd"
-version = "0.6.3"
+name = "itertools"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
- "rustix 0.37.20",
+ "either",
 ]
 
 [[package]]
-name = "memoffset"
-version = "0.6.5"
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
- "autocfg",
+ "wasm-bindgen",
 ]
 
 [[package]]
-name = "memoffset"
-version = "0.8.0"
+name = "k256"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "serdect",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.154"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+
+[[package]]
+name = "libsecp256k1"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1"
+dependencies = [
+ "arrayref",
+ "base64 0.13.1",
+ "digest 0.9.0",
+ "hmac-drbg",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
+ "rand",
+ "serde",
+ "sha2 0.9.9",
+ "typenum",
+]
+
+[[package]]
+name = "libsecp256k1-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
+ "scopeguard",
 ]
 
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "matchers"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
 [[package]]
 name = "memory-db"
 version = "0.32.0"
@@ -1388,29 +1802,23 @@ dependencies = [
  "hash-db",
 ]
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
 [[package]]
 name = "merlin"
-version = "2.0.1"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
+checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
 dependencies = [
  "byteorder",
  "keccak",
- "rand_core 0.5.1",
+ "rand_core 0.6.4",
  "zeroize",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -1421,11 +1829,11 @@ version = "0.1.0"
 dependencies = [
  "ibc",
  "ibc-proto",
- "sp-core 21.0.0",
+ "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 7.0.0",
- "syn 2.0.23",
+ "sp-std",
+ "syn 2.0.63",
  "tendermint",
  "tendermint-light-client-verifier",
  "tendermint-proto",
@@ -1439,25 +1847,19 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "num-bigint"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
-name = "num-derive"
-version = "0.3.3"
+name = "num-conv"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-format"
@@ -1465,100 +1867,79 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
  "itoa",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
- "num-bigint",
- "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "object"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
-dependencies = [
- "crc32fast",
- "hashbrown 0.12.3",
- "indexmap",
- "memchr",
-]
-
-[[package]]
-name = "object"
-version = "0.30.4"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
- "crc32fast",
- "hashbrown 0.13.2",
- "indexmap",
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.2.3"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
-name = "opaque-debug"
-version = "0.3.0"
+name = "parity-bip39"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
+dependencies = [
+ "bitcoin_hashes",
+ "rand",
+ "rand_core 0.6.4",
+ "serde",
+ "unicode-normalization",
+]
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.5.0"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ddb756ca205bd108aee3c62c6d3c994e1df84a59b9d6d4a5ea42ee1fd5a9a28"
+checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec",
  "bitvec",
  "byte-slice-cast",
  "bytes",
@@ -1569,27 +1950,21 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.1.4"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "parity-wasm"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
-
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1597,52 +1972,49 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets",
 ]
 
 [[package]]
-name = "paste"
-version = "1.0.12"
+name = "password-hash"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
 
 [[package]]
-name = "pbkdf2"
-version = "0.8.0"
+name = "paste"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-dependencies = [
- "crypto-mac 0.11.1",
-]
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pbkdf2"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
+ "password-hash",
 ]
 
-[[package]]
-name = "percent-encoding"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -1660,17 +2032,76 @@ dependencies = [
  "spki",
 ]
 
+[[package]]
+name = "platforms"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
+
+[[package]]
+name = "polkavm-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
+
+[[package]]
+name = "polkavm-derive"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606"
+dependencies = [
+ "polkavm-derive-impl-macro",
+]
+
+[[package]]
+name = "polkavm-derive-impl"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
+dependencies = [
+ "polkavm-common",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "polkavm-derive-impl-macro"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
+dependencies = [
+ "polkavm-derive-impl",
+ "syn 2.0.63",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "prettier-please"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.63",
+]
+
 [[package]]
 name = "primitive-types"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec",
@@ -1685,33 +2116,32 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 dependencies = [
- "toml",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "once_cell",
- "toml_edit",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prost"
-version = "0.11.9"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -1719,40 +2149,31 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.11.9"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+checksum = "9554e3ab233f0a932403704f1a1d08c30d5ccd931adfdfa1e8b5a19b52c1d55a"
 dependencies = [
  "anyhow",
- "itertools",
+ "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.11.9"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
 dependencies = [
  "prost",
 ]
 
-[[package]]
-name = "psm"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -1763,19 +2184,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1783,20 +2191,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
+ "rand_chacha",
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -1812,9 +2210,6 @@ name = "rand_core"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
 
 [[package]]
 name = "rand_core"
@@ -1822,65 +2217,68 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.10",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.16"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43faa91b1c8b36841ee70e97188a869d37ae21759da6846d4be66de5bf7b12c"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.16"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d2275aab483050ab2a7364c1a46604865ee7d6906684e08db0f090acf74f9e7"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.1.10"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
- "regex-syntax 0.6.29",
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -1891,9 +2289,19 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac 0.12.1",
+ "subtle",
+]
 
 [[package]]
 name = "ripemd"
@@ -1906,15 +2314,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hex"
@@ -1923,97 +2325,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
 [[package]]
-name = "rustix"
-version = "0.36.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e4d67015953998ad0eb82887a0eb0129e18a7e2f3b7b0f6c422fddcd503d62"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.1.4",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.37.20"
+name = "rustc_version"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
+ "semver",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.12"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0"
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
-
-[[package]]
-name = "safe-proc-macro2"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "814c536dcd27acf03296c618dab7ad62d28e70abd7ba41d3f34a2ce707a2c666"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "safe-quote"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e530f7831f3feafcd5f1aae406ac205dd998436b4007c8e80f03eca78a88f7"
-dependencies = [
- "safe-proc-macro2",
-]
-
-[[package]]
-name = "safe-regex"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15289bf322e0673d52756a18194167f2378ec1a15fe884af6e2d2cb934822b0"
-dependencies = [
- "safe-regex-macro",
-]
-
-[[package]]
-name = "safe-regex-compiler"
-version = "0.2.5"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba76fae590a2aa665279deb1f57b5098cbace01a0c5e60e262fcf55f7c51542"
-dependencies = [
- "safe-proc-macro2",
- "safe-quote",
-]
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
-name = "safe-regex-macro"
-version = "0.2.5"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c2e96b5c03f158d1b16ba79af515137795f4ad4e8de3f790518aae91f1d127"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "safe-proc-macro2",
- "safe-regex-compiler",
+ "winapi-util",
 ]
 
 [[package]]
 name = "scale-info"
-version = "2.7.0"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b569c32c806ec3abdf3b5869fb8bf1e0d275a7c1c9b0b05603d9464632649edf"
+checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024"
 dependencies = [
  "bitvec",
  "cfg-if",
@@ -2025,11 +2370,11 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.6.0"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482"
+checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -2037,53 +2382,69 @@ dependencies = [
 
 [[package]]
 name = "schnellru"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
+checksum = "6b0cf7da6fc4477944d5529807234f66802fcb618fc62b9c05bedca7f9be6c43"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.11",
  "cfg-if",
  "hashbrown 0.13.2",
 ]
 
 [[package]]
 name = "schnorrkel"
-version = "0.9.1"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
+checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
+ "aead",
  "arrayref",
- "arrayvec 0.5.2",
- "curve25519-dalek 2.1.3",
- "getrandom 0.1.16",
+ "arrayvec",
+ "curve25519-dalek 4.1.2",
+ "getrandom_or_panic",
  "merlin",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "sha2 0.8.2",
+ "rand_core 0.6.4",
+ "serde_bytes",
+ "sha2 0.10.8",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "serdect",
+ "subtle",
+ "zeroize",
+]
 
 [[package]]
 name = "secp256k1"
-version = "0.24.3"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.6.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
 dependencies = [
  "cc",
 ]
@@ -2097,40 +2458,55 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
 dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-json-wasm"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05da0d153dd4595bdffd5099dc0e9ce425b205ee648eb93437ff7302af8c9a5"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_bytes"
-version = "0.11.9"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -2139,25 +2515,32 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.12"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
-name = "sha2"
-version = "0.8.2"
+name = "serde_spanned"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
+ "serde",
+]
+
+[[package]]
+name = "serdect"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
+dependencies = [
+ "base16ct",
+ "serde",
 ]
 
 [[package]]
@@ -2170,14 +2553,14 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug",
 ]
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2196,121 +2579,82 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
 
 [[package]]
-name = "signature"
-version = "2.1.0"
+name = "simple-mermaid"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "sp-application-crypto"
-version = "22.0.0"
+version = "34.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf23435a4bbd6eeec2bbbc346719ba4f3200e0ddb5f9e9f06c1724db03a8410"
+checksum = "1505fad69251900048ddddc6387265e1545d1a366e3b4dcd57b76a03f0a65ae7"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-core 20.0.0",
+ "sp-core",
  "sp-io",
- "sp-std 7.0.0",
+ "sp-std",
 ]
 
 [[package]]
 name = "sp-arithmetic"
-version = "15.0.0"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d3507a803e8bc332fa290ed3015a7b51d4436ce2b836744642fc412040456"
+checksum = "46d0d0a4c591c421d3231ddd5e27d828618c24456d51445d21a1f79fcee97c23"
 dependencies = [
+ "docify",
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 7.0.0",
+ "sp-std",
  "static_assertions",
 ]
 
 [[package]]
 name = "sp-core"
-version = "20.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7789372146f8ad40d0b40fad0596cb1db5771187a258eabe19b06f00767fcbd6"
-dependencies = [
- "array-bytes",
- "bitflags",
- "blake2",
- "bounded-collections",
- "bs58",
- "dyn-clonable",
- "ed25519-zebra",
- "futures",
- "hash-db",
- "hash256-std-hasher",
- "impl-serde",
- "lazy_static",
- "libsecp256k1",
- "log",
- "merlin",
- "parity-scale-codec",
- "parking_lot",
- "primitive-types",
- "rand 0.8.5",
- "regex",
- "scale-info",
- "schnorrkel",
- "secp256k1",
- "secrecy",
- "serde",
- "sp-core-hashing 8.0.0",
- "sp-debug-derive 7.0.0",
- "sp-externalities 0.18.0",
- "sp-runtime-interface 16.0.0",
- "sp-std 7.0.0",
- "sp-storage 12.0.0",
- "ss58-registry",
- "substrate-bip39",
- "thiserror",
- "tiny-bip39",
- "zeroize",
-]
-
-[[package]]
-name = "sp-core"
-version = "21.0.0"
+version = "32.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f18d9e2f67d8661f9729f35347069ac29d92758b59135176799db966947a7336"
+checksum = "bb2dac7e47c7ddbb61efe196d5cce99f6ea88926c961fa39909bfeae46fc5a7b"
 dependencies = [
  "array-bytes",
- "bitflags",
+ "bitflags 1.3.2",
  "blake2",
  "bounded-collections",
  "bs58",
@@ -2320,132 +2664,94 @@ dependencies = [
  "hash-db",
  "hash256-std-hasher",
  "impl-serde",
- "lazy_static",
+ "itertools 0.10.5",
+ "k256",
  "libsecp256k1",
  "log",
  "merlin",
+ "parity-bip39",
  "parity-scale-codec",
  "parking_lot",
  "paste",
  "primitive-types",
- "rand 0.8.5",
- "regex",
+ "rand",
  "scale-info",
  "schnorrkel",
  "secp256k1",
  "secrecy",
  "serde",
- "sp-core-hashing 9.0.0",
- "sp-debug-derive 8.0.0",
- "sp-externalities 0.19.0",
- "sp-runtime-interface 17.0.0",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
+ "sp-crypto-hashing",
+ "sp-debug-derive",
+ "sp-externalities",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
- "tiny-bip39",
+ "tracing",
+ "w3f-bls",
  "zeroize",
 ]
 
 [[package]]
-name = "sp-core-hashing"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27449abdfbe41b473e625bce8113745e81d65777dd1d5a8462cf24137930dad8"
-dependencies = [
- "blake2b_simd",
- "byteorder",
- "digest 0.10.7",
- "sha2 0.10.6",
- "sha3",
- "sp-std 7.0.0",
- "twox-hash",
-]
-
-[[package]]
-name = "sp-core-hashing"
-version = "9.0.0"
+name = "sp-crypto-hashing"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68"
+checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb"
 dependencies = [
  "blake2b_simd",
  "byteorder",
  "digest 0.10.7",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "sha3",
- "sp-std 8.0.0",
  "twox-hash",
 ]
 
 [[package]]
 name = "sp-debug-derive"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62211eed9ef9dac4b9d837c56ccc9f8ee4fc49d9d9b7e6b9daf098fe173389ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "8.0.0"
+version = "14.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f531814d2f16995144c74428830ccf7d94ff4a7749632b83ad8199b181140c"
+checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
-]
-
-[[package]]
-name = "sp-externalities"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae0f275760689aaefe967943331d458cd99f5169d18364365d4cb584b246d1c"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 7.0.0",
- "sp-storage 12.0.0",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "sp-externalities"
-version = "0.19.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0f71c671e01a8ca60da925d43a1b351b69626e268b8837f8371e320cf1dd100"
+checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
+ "sp-storage",
 ]
 
 [[package]]
 name = "sp-io"
-version = "22.0.0"
+version = "34.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd3431c245992fe51b8256c838fc2e981f8d3b0afc1d1377ca7dbe0a3287a764"
+checksum = "c44ed47247b6eee76ff703f9fa9f04f99c4104ac1faf629e6d1128e09066b57b"
 dependencies = [
  "bytes",
- "ed25519 1.5.3",
  "ed25519-dalek",
- "futures",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
+ "polkavm-derive",
  "rustversion",
  "secp256k1",
- "sp-core 20.0.0",
- "sp-externalities 0.18.0",
+ "sp-core",
+ "sp-crypto-hashing",
+ "sp-externalities",
  "sp-keystore",
- "sp-runtime-interface 16.0.0",
+ "sp-runtime-interface",
  "sp-state-machine",
- "sp-std 7.0.0",
- "sp-tracing 9.0.0",
+ "sp-std",
+ "sp-tracing",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -2453,25 +2759,21 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.26.0"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "452d079f592c97369c9ca8a5083b25f146751c6b5af10cbcacc2b24dc53fd72a"
+checksum = "4e6c7a7abd860a5211a356cf9d5fcabf0eb37d997985e5d722b6b33dcc815528"
 dependencies = [
- "futures",
- "merlin",
  "parity-scale-codec",
  "parking_lot",
- "schnorrkel",
- "sp-core 20.0.0",
- "sp-externalities 0.18.0",
- "thiserror",
+ "sp-core",
+ "sp-externalities",
 ]
 
 [[package]]
 name = "sp-panic-handler"
-version = "7.0.0"
+version = "13.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75986cc917d897e0f6d0c848088064df4c74ccbb8f1c1848700b725f5ca7fe04"
+checksum = "d8f5a17a0a11de029a8b811cb6e8b32ce7e02183cc04a3e965c383246798c416"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -2480,173 +2782,110 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "23.0.0"
+version = "35.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6220216caa67e3d931c693b06a3590dfcaa255f19bb3c3e3150f1672b8bc53f6"
+checksum = "42ce931b7fbfdeeca1340801dbd4a1cae54ad4c97a1e3dcfcc79709bc800dd46"
 dependencies = [
+ "docify",
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "paste",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "serde",
+ "simple-mermaid",
  "sp-application-crypto",
  "sp-arithmetic",
- "sp-core 20.0.0",
+ "sp-core",
  "sp-io",
- "sp-std 7.0.0",
+ "sp-std",
  "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
-version = "16.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca5d0cd80200bf85b8b064238b2508b69b6146b13adf36066ec5d924825af737"
-dependencies = [
- "bytes",
- "impl-trait-for-tuples",
- "parity-scale-codec",
- "primitive-types",
- "sp-externalities 0.18.0",
- "sp-runtime-interface-proc-macro 10.0.0",
- "sp-std 7.0.0",
- "sp-storage 12.0.0",
- "sp-tracing 9.0.0",
- "sp-wasm-interface 13.0.0",
- "static_assertions",
-]
-
-[[package]]
-name = "sp-runtime-interface"
-version = "17.0.0"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e676128182f90015e916f806cba635c8141e341e7abbc45d25525472e1bbce8"
+checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
+ "polkavm-derive",
  "primitive-types",
- "sp-externalities 0.19.0",
- "sp-runtime-interface-proc-macro 11.0.0",
- "sp-std 8.0.0",
- "sp-storage 13.0.0",
- "sp-tracing 10.0.0",
- "sp-wasm-interface 14.0.0",
+ "sp-externalities",
+ "sp-runtime-interface-proc-macro",
+ "sp-std",
+ "sp-storage",
+ "sp-tracing",
+ "sp-wasm-interface",
  "static_assertions",
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ae5b00aef477127ddb6177b3464ad1e2bdcc12ee913fc5dfc9d065c6cea89b"
-dependencies = [
- "Inflector",
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "sp-runtime-interface-proc-macro"
-version = "11.0.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d5bd5566fe5633ec48dfa35ab152fd29f8a577c21971e1c6db9f28afb9bbb9"
+checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294"
 dependencies = [
  "Inflector",
- "proc-macro-crate 1.3.1",
+ "expander",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "sp-state-machine"
-version = "0.27.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e49c3bfcc8c832c34552cd8194180cc60508c6d3d9b0b9615d6b7c3e275019"
+checksum = "21d9078306c3066f1824e41153e1ceec34231d39d9a7e7956b101eadf7b9fd3a"
 dependencies = [
  "hash-db",
  "log",
  "parity-scale-codec",
  "parking_lot",
- "rand 0.8.5",
+ "rand",
  "smallvec",
- "sp-core 20.0.0",
- "sp-externalities 0.18.0",
+ "sp-core",
+ "sp-externalities",
  "sp-panic-handler",
- "sp-std 7.0.0",
  "sp-trie",
  "thiserror",
  "tracing",
+ "trie-db",
 ]
 
 [[package]]
 name = "sp-std"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de8eef39962b5b97478719c493bed2926cf70cb621005bbf68ebe58252ff986"
-
-[[package]]
-name = "sp-std"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d"
-
-[[package]]
-name = "sp-storage"
-version = "12.0.0"
+version = "14.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ad1f8c52d4700ac7bc42b3375679a6c6fc1fe876f4b40c6efdf36f933ef0291"
-dependencies = [
- "impl-serde",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 7.0.0",
- "sp-std 7.0.0",
-]
+checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834"
 
 [[package]]
 name = "sp-storage"
-version = "13.0.0"
+version = "21.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94294be83f11d4958cfea89ed5798f0b6605f5defc3a996948848458abbcc18e"
+checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 8.0.0",
- "sp-std 8.0.0",
-]
-
-[[package]]
-name = "sp-tracing"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00fab60bf3d42255ce3f678903d3a2564662371c75623de4a1ffc7cac46143df"
-dependencies = [
- "parity-scale-codec",
- "sp-std 7.0.0",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
+ "sp-debug-derive",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "10.0.0"
+version = "17.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357f7591980dd58305956d32f8f6646d0a8ea9ea0e7e868e46f53b68ddf00cec"
+checksum = "90b3decf116db9f1dfaf1f1597096b043d0e12c952d3bcdc018c6d6b77deec7e"
 dependencies = [
  "parity-scale-codec",
- "sp-std 8.0.0",
  "tracing",
  "tracing-core",
  "tracing-subscriber",
@@ -2654,22 +2893,22 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "21.0.0"
+version = "33.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58401c53c08b6ecad83acd7e14534c8bbcb3fa73e81e26685e0ac70e51b00c56"
+checksum = "d1f5b3620a1c87c265a83d85d7519c6b60c47acf7f77593966afe313d086f00e"
 dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.11",
  "hash-db",
- "hashbrown 0.13.2",
  "lazy_static",
  "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot",
+ "rand",
  "scale-info",
  "schnellru",
- "sp-core 20.0.0",
- "sp-std 7.0.0",
+ "sp-core",
+ "sp-externalities",
  "thiserror",
  "tracing",
  "trie-db",
@@ -2678,54 +2917,35 @@ dependencies = [
 
 [[package]]
 name = "sp-wasm-interface"
-version = "13.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "153b7374179439e2aa783c66ed439bd86920c67bbc95d34c76390561972bc02f"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 7.0.0",
- "wasmi",
- "wasmtime 6.0.2",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "14.0.0"
+version = "21.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19c122609ca5d8246be6386888596320d03c7bc880959eaa2c36bcd5acd6846"
+checksum = "3b04b919e150b4736d85089d49327eab65507deb1485eec929af69daa2278eb3"
 dependencies = [
- "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "sp-std 8.0.0",
- "wasmtime 8.0.1",
 ]
 
 [[package]]
 name = "sp-weights"
-version = "19.0.0"
+version = "31.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123c661915e1bf328e21f8ecbe4e5247feba86f9149b782ea4348004547ce8ef"
+checksum = "93cdaf72a1dad537bbb130ba4d47307ebe5170405280ed1aa31fa712718a400e"
 dependencies = [
+ "bounded-collections",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-core 20.0.0",
- "sp-debug-derive 7.0.0",
- "sp-std 7.0.0",
+ "sp-debug-derive",
 ]
 
 [[package]]
 name = "spki"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
  "der",
@@ -2733,24 +2953,18 @@ dependencies = [
 
 [[package]]
 name = "ss58-registry"
-version = "1.40.0"
+version = "1.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47a8ad42e5fc72d5b1eb104a5546937eaf39843499948bb666d6e93c62423b"
+checksum = "4743ce898933fbff7bbf414f497c459a782d496269644b3d650a398ae6a487ba"
 dependencies = [
  "Inflector",
  "num-format",
  "proc-macro2",
  "quote",
  "serde",
- "serde_json",
- "unicode-xid",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+ "serde_json",
+ "unicode-xid",
+]
 
 [[package]]
 name = "static_assertions"
@@ -2758,30 +2972,24 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "substrate-bip39"
-version = "0.4.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c"
+checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a"
 dependencies = [
- "hmac 0.11.0",
- "pbkdf2 0.8.0",
+ "hmac 0.12.1",
+ "pbkdf2",
  "schnorrkel",
- "sha2 0.9.9",
+ "sha2 0.10.8",
  "zeroize",
 ]
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "subtle-encoding"
@@ -2811,9 +3019,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.23"
+version = "2.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "bf5be731623ca1a1fb7d8be6f261a3be6d3e2337b8a1f97be944d020c8fcb704"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2826,21 +3034,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
-[[package]]
-name = "target-lexicon"
-version = "0.12.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
-
 [[package]]
 name = "tendermint"
-version = "0.32.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a46ec6b25b028097ab682ffae11d09d64fe1e2535833b902f26a278a0f88a705"
+checksum = "8b50aae6ec24c3429149ad59b5b8d3374d7804d4c7d6125ceb97cb53907fb68d"
 dependencies = [
  "bytes",
  "digest 0.10.7",
- "ed25519 2.2.1",
+ "ed25519",
  "ed25519-consensus",
  "flex-error",
  "futures",
@@ -2852,8 +3054,8 @@ dependencies = [
  "serde_bytes",
  "serde_json",
  "serde_repr",
- "sha2 0.10.6",
- "signature 2.1.0",
+ "sha2 0.10.8",
+ "signature",
  "subtle",
  "subtle-encoding",
  "tendermint-proto",
@@ -2863,9 +3065,9 @@ dependencies = [
 
 [[package]]
 name = "tendermint-light-client-verifier"
-version = "0.32.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4bc4c47cf36e740645e04128bd14ff5723aef86f5377fbd4d3b0149198dfc7e"
+checksum = "4216e487165e5dbd7af79952eaa0d5f06c5bde861eb76c690acd7f2d2a19395c"
 dependencies = [
  "derive_more",
  "flex-error",
@@ -2876,14 +3078,12 @@ dependencies = [
 
 [[package]]
 name = "tendermint-proto"
-version = "0.32.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23c8ff0e6634eb4c3c4aeed45076dc97dac91aac5501a905a67fa222e165b"
+checksum = "46f193d04afde6592c20fd70788a10b8cb3823091c07456db70d8a93f5fb99c1"
 dependencies = [
  "bytes",
  "flex-error",
- "num-derive",
- "num-traits",
  "prost",
  "prost-types",
  "serde",
@@ -2892,31 +3092,40 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2924,48 +3133,33 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.21"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.9"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
-[[package]]
-name = "tiny-bip39"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
-dependencies = [
- "anyhow",
- "hmac 0.12.1",
- "once_cell",
- "pbkdf2 0.11.0",
- "rand 0.8.5",
- "rustc-hash",
- "sha2 0.10.6",
- "thiserror",
- "unicode-normalization",
- "wasm-bindgen",
- "zeroize",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -2987,587 +3181,308 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
-
-[[package]]
-name = "toml_edit"
-version = "0.19.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.23",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-serde"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
-dependencies = [
- "serde",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
-dependencies = [
- "ansi_term",
- "chrono",
- "lazy_static",
- "matchers",
- "regex",
- "serde",
- "serde_json",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-serde",
-]
-
-[[package]]
-name = "trie-db"
-version = "0.27.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85"
-dependencies = [
- "hash-db",
- "hashbrown 0.13.2",
- "log",
- "rustc-hex",
- "smallvec",
-]
-
-[[package]]
-name = "trie-root"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b"
-dependencies = [
- "hash-db",
-]
-
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "digest 0.10.7",
- "rand 0.8.5",
- "static_assertions",
-]
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "uint"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "url"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.23",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.23",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
+ "serde",
 ]
 
 [[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.86"
+name = "toml"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.12",
+]
 
 [[package]]
-name = "wasmi"
-version = "0.13.2"
+name = "toml_datetime"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
- "parity-wasm",
- "wasmi-validation",
- "wasmi_core",
+ "serde",
 ]
 
 [[package]]
-name = "wasmi-validation"
-version = "0.5.0"
+name = "toml_edit"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "parity-wasm",
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
 ]
 
 [[package]]
-name = "wasmi_core"
-version = "0.2.1"
+name = "toml_edit"
+version = "0.22.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
 dependencies = [
- "downcast-rs",
- "libm",
- "memory_units",
- "num-rational",
- "num-traits",
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.8",
 ]
 
 [[package]]
-name = "wasmparser"
-version = "0.100.0"
+name = "tracing"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "indexmap",
- "url",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
 ]
 
 [[package]]
-name = "wasmparser"
-version = "0.102.0"
+name = "tracing-attributes"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "indexmap",
- "url",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
 ]
 
 [[package]]
-name = "wasmtime"
-version = "6.0.2"
+name = "tracing-core"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
- "anyhow",
- "bincode",
- "cfg-if",
- "indexmap",
- "libc",
- "log",
- "object 0.29.0",
  "once_cell",
- "paste",
- "psm",
- "serde",
- "target-lexicon",
- "wasmparser 0.100.0",
- "wasmtime-environ 6.0.2",
- "wasmtime-jit 6.0.2",
- "wasmtime-runtime 6.0.2",
- "windows-sys 0.42.0",
+ "valuable",
 ]
 
 [[package]]
-name = "wasmtime"
-version = "8.0.1"
+name = "tracing-log"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
 dependencies = [
- "anyhow",
- "bincode",
- "cfg-if",
- "indexmap",
- "libc",
  "log",
- "object 0.30.4",
  "once_cell",
- "paste",
- "psm",
- "serde",
- "target-lexicon",
- "wasmparser 0.102.0",
- "wasmtime-environ 8.0.1",
- "wasmtime-jit 8.0.1",
- "wasmtime-runtime 8.0.1",
- "windows-sys 0.45.0",
+ "tracing-core",
 ]
 
 [[package]]
-name = "wasmtime-asm-macros"
-version = "6.0.2"
+name = "tracing-serde"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
 dependencies = [
- "cfg-if",
+ "serde",
+ "tracing-core",
 ]
 
 [[package]]
-name = "wasmtime-asm-macros"
-version = "8.0.1"
+name = "tracing-subscriber"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
 dependencies = [
- "cfg-if",
+ "ansi_term",
+ "chrono",
+ "lazy_static",
+ "matchers",
+ "regex",
+ "serde",
+ "serde_json",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+ "tracing-serde",
 ]
 
 [[package]]
-name = "wasmtime-environ"
-version = "6.0.2"
+name = "trie-db"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7"
+checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642"
 dependencies = [
- "anyhow",
- "cranelift-entity 0.93.2",
- "gimli 0.26.2",
- "indexmap",
+ "hash-db",
+ "hashbrown 0.13.2",
  "log",
- "object 0.29.0",
- "serde",
- "target-lexicon",
- "thiserror",
- "wasmparser 0.100.0",
- "wasmtime-types 6.0.2",
+ "rustc-hex",
+ "smallvec",
 ]
 
 [[package]]
-name = "wasmtime-environ"
-version = "8.0.1"
+name = "trie-root"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
+checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b"
 dependencies = [
- "anyhow",
- "cranelift-entity 0.95.1",
- "gimli 0.27.2",
- "indexmap",
- "log",
- "object 0.30.4",
- "serde",
- "target-lexicon",
- "thiserror",
- "wasmparser 0.102.0",
- "wasmtime-types 8.0.1",
+ "hash-db",
 ]
 
 [[package]]
-name = "wasmtime-jit"
-version = "6.0.2"
+name = "twox-hash"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "addr2line 0.17.0",
- "anyhow",
- "bincode",
  "cfg-if",
- "cpp_demangle",
- "gimli 0.26.2",
- "log",
- "object 0.29.0",
- "rustc-demangle",
- "serde",
- "target-lexicon",
- "wasmtime-environ 6.0.2",
- "wasmtime-jit-icache-coherence 6.0.2",
- "wasmtime-runtime 6.0.2",
- "windows-sys 0.42.0",
+ "digest 0.10.7",
+ "rand",
+ "static_assertions",
 ]
 
 [[package]]
-name = "wasmtime-jit"
-version = "8.0.1"
+name = "typenum"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
-dependencies = [
- "addr2line 0.19.0",
- "anyhow",
- "bincode",
- "cfg-if",
- "cpp_demangle",
- "gimli 0.27.2",
- "log",
- "object 0.30.4",
- "rustc-demangle",
- "serde",
- "target-lexicon",
- "wasmtime-environ 8.0.1",
- "wasmtime-jit-icache-coherence 8.0.1",
- "wasmtime-runtime 8.0.1",
- "windows-sys 0.45.0",
-]
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "wasmtime-jit-debug"
-version = "6.0.2"
+name = "uint"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
 dependencies = [
- "once_cell",
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
 ]
 
 [[package]]
-name = "wasmtime-jit-debug"
-version = "8.0.1"
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
- "once_cell",
+ "tinyvec",
 ]
 
 [[package]]
-name = "wasmtime-jit-icache-coherence"
-version = "6.0.2"
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "w3f-bls"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c"
+checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331"
 dependencies = [
- "cfg-if",
- "libc",
- "windows-sys 0.42.0",
+ "ark-bls12-377",
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-serialize-derive",
+ "arrayref",
+ "constcat",
+ "digest 0.10.7",
+ "rand",
+ "rand_chacha",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+ "sha3",
+ "thiserror",
+ "zeroize",
 ]
 
 [[package]]
-name = "wasmtime-jit-icache-coherence"
-version = "8.0.1"
+name = "walkdir"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
- "cfg-if",
- "libc",
- "windows-sys 0.45.0",
+ "same-file",
+ "winapi-util",
 ]
 
 [[package]]
-name = "wasmtime-runtime"
-version = "6.0.2"
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
- "anyhow",
- "cc",
  "cfg-if",
- "indexmap",
- "libc",
- "log",
- "mach",
- "memfd",
- "memoffset 0.6.5",
- "paste",
- "rand 0.8.5",
- "rustix 0.36.14",
- "wasmtime-asm-macros 6.0.2",
- "wasmtime-environ 6.0.2",
- "wasmtime-jit-debug 6.0.2",
- "windows-sys 0.42.0",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
-name = "wasmtime-runtime"
-version = "8.0.1"
+name = "wasm-bindgen-backend"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
- "anyhow",
- "cc",
- "cfg-if",
- "indexmap",
- "libc",
+ "bumpalo",
  "log",
- "mach",
- "memfd",
- "memoffset 0.8.0",
- "paste",
- "rand 0.8.5",
- "rustix 0.36.14",
- "wasmtime-asm-macros 8.0.1",
- "wasmtime-environ 8.0.1",
- "wasmtime-jit-debug 8.0.1",
- "windows-sys 0.45.0",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "wasmtime-types"
-version = "6.0.2"
+name = "wasm-bindgen-macro"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
- "cranelift-entity 0.93.2",
- "serde",
- "thiserror",
- "wasmparser 0.100.0",
+ "quote",
+ "wasm-bindgen-macro-support",
 ]
 
 [[package]]
-name = "wasmtime-types"
-version = "8.0.1"
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
- "cranelift-entity 0.95.1",
- "serde",
- "thiserror",
- "wasmparser 0.102.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3585,172 +3500,116 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.48.0"
+name = "winapi-util"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.45.0"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
+name = "winnow"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "winnow"
-version = "0.4.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
 dependencies = [
  "memchr",
 ]
@@ -3764,11 +3623,31 @@ dependencies = [
  "tap",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
@@ -3781,5 +3660,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.63",
 ]
diff --git a/ci/no-std-check/Cargo.toml b/ci/no-std-check/Cargo.toml
index 1b9f07446..ce66a2e6f 100644
--- a/ci/no-std-check/Cargo.toml
+++ b/ci/no-std-check/Cargo.toml
@@ -1,23 +1,24 @@
 [package]
-name = "no-std-check"
-version = "0.1.0"
-edition = "2021"
+name     = "no-std-check"
+version  = "0.1.0"
+edition  = "2021"
 resolver = "2"
 
 [dependencies]
-ibc = { path = "../../crates/ibc", default-features = false }
-ibc-proto = { version = "0.32.0", default-features = false, features = [
+ibc = { path = "../../ibc", default-features = false, features = [ "serde" ] }
+ibc-proto = { version = "0.44", default-features = false, features = [
   "parity-scale-codec",
   "borsh",
+  "serde",
 ] }
-tendermint = { version = "0.32.0", default-features = false }
-tendermint-proto = { version = "0.32.0", default-features = false }
-tendermint-light-client-verifier = { version = "0.32.0", default-features = false, features = ["rust-crypto"] }
+tendermint = { version = "0.36", default-features = false }
+tendermint-proto = { version = "0.36", default-features = false }
+tendermint-light-client-verifier = { version = "0.36", default-features = false, features = [ "rust-crypto" ] }
 
-sp-core = { version = "21.0.0", default-features = false, optional = true }
-sp-io = { version = "22.0.0", default-features = false, optional = true }
-sp-runtime = { version = "23.0.0", default-features = false, optional = true }
-sp-std = { version = "7.0.0", default-features = false, optional = true }
+sp-core    = { version = "32.0", default-features = false, optional = true }
+sp-io      = { version = "34.0", default-features = false, optional = true }
+sp-runtime = { version = "35.0", default-features = false, optional = true }
+sp-std     = { version = "14.0", default-features = false, optional = true }
 
 # The indirect dependency `syn` 2.0.4 has a bug that causes
 # compilation errors in `tendermint`. This is fixed in 2.0.5.
@@ -25,6 +26,6 @@ sp-std = { version = "7.0.0", default-features = false, optional = true }
 syn = ">=2.0.5"
 
 [features]
-panic-handler = []
-use-substrate = ["sp-core", "sp-io", "sp-runtime", "sp-std"]
-substrate-std = ["sp-core/std", "sp-io/std", "sp-runtime/std", "sp-std/std"]
+panic-handler = [  ]
+use-substrate = [ "sp-core", "sp-io", "sp-runtime", "sp-std" ]
+substrate-std = [ "sp-core/std", "sp-io/std", "sp-runtime/std", "sp-std/std" ]
diff --git a/ci/no-std-check/Makefile b/ci/no-std-check/Makefile
index 8d4328dfc..6702a89a4 100644
--- a/ci/no-std-check/Makefile
+++ b/ci/no-std-check/Makefile
@@ -1,12 +1,12 @@
-NIGHTLY_VERSION=nightly
+NIGHTLY_VERSION=nightly-2024-02-24
 
 .DEFAULT_GOAL := help
 
-.PHONY: all setup build-substrate check-panic-conflict check-cargo-build-std check-wasm check-substrate help
+.PHONY: all setup build-substrate check-no-std check-cargo-build-std check-wasm check-substrate help
 
 all: ## Run the setup and all checks
 	$(MAKE) build-substrate
-	$(MAKE) check-panic-conflict
+	$(MAKE) check-no-std
 	$(MAKE) check-cargo-build-std
 	$(MAKE) check-wasm
 	$(MAKE) check-substrate
@@ -21,7 +21,7 @@ build-substrate: ## Build with Substrate support
 		--no-default-features \
 		--features use-substrate,substrate-std
 
-check-panic-conflict: ## Check for `no_std` compliance by installing a panic handler, and any other crate importing `std` will cause a conflict. Runs on default target.
+check-no-std: ## Check for `no_std` compliance by installing a panic handler, and any other crate importing `std` will cause a conflict. Runs on default target.
 	cargo build \
 		--no-default-features \
 		--features panic-handler
diff --git a/clippy.toml b/clippy.toml
new file mode 100644
index 000000000..76e4dff64
--- /dev/null
+++ b/clippy.toml
@@ -0,0 +1,10 @@
+disallowed-types = [
+    # { path = "usize", reason = "variable size" }, # cannot on now, because mocks use it and serde, even if there is no usize in type
+    { path = "f64", reason = "not supported in CosmWasm" },
+    { path = "f32", reason = "not supported in CosmWasm" },
+]
+
+disallowed-methods = [
+    "std::time::Duration::as_secs_f64",
+]
+msrv = "1.71.1"
diff --git a/crates/ibc-derive/Cargo.toml b/crates/ibc-derive/Cargo.toml
deleted file mode 100644
index aa18910e4..000000000
--- a/crates/ibc-derive/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "ibc-derive"
-version = "0.1.0"
-license = "Apache-2.0"
-readme = "README.md"
-description = "Macros implementation of #[derive(ClientState)] and #[derive(ConsensusState)]"
-repository   = "https://github.com/cosmos/ibc-rs"
-edition = "2021"
-
-[lib]
-proc-macro = true
-
-[dependencies]
-syn = "2"
-proc-macro2 = "1"
-quote = "1"
-darling = "0.20"
diff --git a/crates/ibc-derive/README.md b/crates/ibc-derive/README.md
deleted file mode 100644
index 06db5de09..000000000
--- a/crates/ibc-derive/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# IBC in Rust
-
-[![Crate][crate-image]][crate-link]
-[![Docs][docs-image]][docs-link]
-[![Build Status][build-image]][build-link]
-[![Apache 2.0 Licensed][license-image]][license-link]
-![Rust Stable][rustc-image]
-![Rust 1.60+][rustc-version]
-
-Implementation of the Inter-Blockchain Communication Protocol ([IBC]) in Rust.
-
-## Documentation
-
-See documentation on [docs.rs][docs-link].
-
-## Third-party clients
-
-Here, we list IBC third-party clients that are compatible with ibc-rs. You should always audit the implementation of any third-party crate. If you have a client that you'd like to be added to this list, please open a PR!
-
-+ [ICS 6: Solomachine](https://github.com/octopus-network/ics06-solomachine) by Octopus Network
-
-## Divergence from the Interchain Standards (ICS)
-
-This crate diverges from the [ICS specification](https://github.com/cosmos/ibc) in a number of ways. See below for more details.
-
-### Module system: no support for untrusted modules
-
-ICS 24 (Host Requirements) gives the [following requirement](https://github.com/cosmos/ibc/blob/master/spec/core/ics-024-host-requirements/README.md#module-system) about the module system that the host state machine must support:
-
-> The host state machine must support a module system, whereby self-contained, potentially mutually distrusted packages of code can safely execute on the same ledger [...].
-
-**This crate currently does not support mutually distrusted packages**. That is, modules on the host state machine are assumed to be fully trusted. In practice, this means that every module has either been written by the host state machine developers, or fully vetted by them.
-
-### Port system: No object capability system
-
-ICS 5 (Port Allocation) requires the host system to support either object-capability reference or source authentication for modules.
-
-> In the former object-capability case, the IBC handler must have the ability to generate object-capabilities, unique, opaque references which can be passed to a module and will not be duplicable by other modules. [...]
-> In the latter source authentication case, the IBC handler must have the ability to securely read the source identifier of the calling module, a unique string for each module in the host state machine, which cannot be altered by the module or faked by another module.
-
-**This crate currently requires neither of the host system**. Since modules are assumed to be trusted, there is no need for this object capability system that protects resources for potentially malicious modules.
-
-For more background on this, see [this issue](https://github.com/informalsystems/ibc-rs/issues/2159).
-
-### Port system: transferring and releasing a port
-
-ICS 5 (Port Allocation) requires the IBC handler to permit [transferring ownership of a port](https://github.com/cosmos/ibc/tree/master/spec/core/ics-005-port-allocation#transferring-ownership-of-a-port) and [releasing a port](https://github.com/cosmos/ibc/tree/master/spec/core/ics-005-port-allocation#releasing-a-port).
-
-We currently support neither.
-
-### Asynchronous acknowledgements
-The standard gives the ability for modules to [acknowledge packets asynchronously](https://github.com/cosmos/ibc/tree/main/spec/core/ics-004-channel-and-packet-semantics#writing-acknowledgements). This allows modules to receive the packet, but only applying the changes at a later time (after which they would write the acknowledgement).
-
-We currently force applications to process the packets as part of `onRecvPacket()`. If you need asynchronous acknowledgements for your application, please open an issue.
-
-Note that this still makes us 100% compatible with ibc-go.
-
-## License
-
-Copyright © 2021 Informal Systems Inc. and ibc-rs authors.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use the files in this repository except in compliance with the License. You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-[//]: # (badges)
-
-[crate-image]: https://img.shields.io/crates/v/ibc.svg
-[crate-link]: https://crates.io/crates/ibc
-[docs-image]: https://docs.rs/ibc/badge.svg
-[docs-link]: https://docs.rs/ibc/
-[build-image]: https://github.com/cosmos/ibc-rs/workflows/Rust/badge.svg
-[build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
-[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
-[license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
-[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
-[rustc-version]: https://img.shields.io/badge/rustc-1.60+-blue.svg
-
-[//]: # (general links)
-
-[IBC]: https://github.com/cosmos/ibc
diff --git a/crates/ibc-derive/src/client_state.rs b/crates/ibc-derive/src/client_state.rs
deleted file mode 100644
index a6bb0e83c..000000000
--- a/crates/ibc-derive/src/client_state.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-mod traits;
-
-use darling::FromDeriveInput;
-use proc_macro2::TokenStream;
-use quote::quote;
-use syn::DeriveInput;
-
-use traits::{
-    client_state_common::impl_ClientStateCommon, client_state_execution::impl_ClientStateExecution,
-    client_state_validation::impl_ClientStateValidation,
-};
-
-#[derive(FromDeriveInput)]
-#[darling(attributes(generics))]
-pub(crate) struct Opts {
-    #[darling(rename = "ClientValidationContext")]
-    client_validation_context: syn::ExprPath,
-    #[darling(rename = "ClientExecutionContext")]
-    client_execution_context: syn::ExprPath,
-}
-
-pub fn client_state_derive_impl(ast: DeriveInput) -> TokenStream {
-    let opts = match Opts::from_derive_input(&ast) {
-        Ok(opts) => opts,
-        Err(e) => panic!(
-            "{} must be annotated with #[generics(ClientValidationContext = <your ClientValidationContext>, ClientExecutionContext: <your ClientExecutionContext>)]: {e}",
-            ast.ident
-        ),
-    };
-
-    let enum_name = &ast.ident;
-    let enum_variants = match ast.data {
-        syn::Data::Enum(ref enum_data) => &enum_data.variants,
-        _ => panic!("ClientState only supports enums"),
-    };
-
-    let ClientStateCommon_impl_block = impl_ClientStateCommon(enum_name, enum_variants);
-    let ClientStateValidation_impl_block =
-        impl_ClientStateValidation(enum_name, enum_variants, &opts);
-    let ClientStateExecution_impl_block =
-        impl_ClientStateExecution(enum_name, enum_variants, &opts);
-
-    let maybe_extern_crate_stmt = if is_mock(&ast) {
-        // Note: we must add this statement when in "mock mode"
-        // (i.e. in ibc-rs itself) because we don't have `ibc` as a dependency,
-        // so we need to define the `ibc` symbol to mean "the `self` crate".
-        quote! {extern crate self as ibc;}
-    } else {
-        quote! {}
-    };
-
-    quote! {
-        #maybe_extern_crate_stmt
-
-        #ClientStateCommon_impl_block
-        #ClientStateValidation_impl_block
-        #ClientStateExecution_impl_block
-    }
-}
-
-/// We are in "mock mode" (i.e. within ibc-rs crate itself) if the user added
-/// a #[mock] attribute
-fn is_mock(ast: &DeriveInput) -> bool {
-    for attr in &ast.attrs {
-        let path = match attr.meta {
-            syn::Meta::Path(ref path) => path,
-            _ => continue,
-        };
-
-        for path_segment in path.segments.iter() {
-            if path_segment.ident == "mock" {
-                return true;
-            }
-        }
-    }
-
-    false
-}
diff --git a/crates/ibc-derive/src/client_state/traits/client_state_validation.rs b/crates/ibc-derive/src/client_state/traits/client_state_validation.rs
deleted file mode 100644
index 3bc90958c..000000000
--- a/crates/ibc-derive/src/client_state/traits/client_state_validation.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-use proc_macro2::{Ident, TokenStream};
-use quote::quote;
-use syn::{
-    punctuated::{Iter, Punctuated},
-    token::Comma,
-    Variant,
-};
-
-use crate::{
-    client_state::Opts,
-    utils::{get_enum_variant_type_path, Imports},
-};
-
-pub(crate) fn impl_ClientStateValidation(
-    client_state_enum_name: &Ident,
-    enum_variants: &Punctuated<Variant, Comma>,
-    opts: &Opts,
-) -> TokenStream {
-    let verify_client_message_impl = delegate_call_in_match(
-        client_state_enum_name,
-        enum_variants.iter(),
-        opts,
-        quote! { verify_client_message(cs, ctx, client_id, client_message, update_kind) },
-    );
-
-    let check_for_misbehaviour_impl = delegate_call_in_match(
-        client_state_enum_name,
-        enum_variants.iter(),
-        opts,
-        quote! { check_for_misbehaviour(cs, ctx, client_id, client_message, update_kind) },
-    );
-
-    let HostClientState = client_state_enum_name;
-    let ClientValidationContext = &opts.client_validation_context;
-
-    let Any = Imports::Any();
-    let ClientId = Imports::ClientId();
-    let ClientError = Imports::ClientError();
-    let ClientStateValidation = Imports::ClientStateValidation();
-    let UpdateKind = Imports::UpdateKind();
-
-    quote! {
-        impl #ClientStateValidation<#ClientValidationContext> for #HostClientState {
-            fn verify_client_message(
-                &self,
-                ctx: &#ClientValidationContext,
-                client_id: &#ClientId,
-                client_message: #Any,
-                update_kind: &#UpdateKind,
-            ) -> core::result::Result<(), #ClientError> {
-                match self {
-                    #(#verify_client_message_impl),*
-                }
-            }
-
-            fn check_for_misbehaviour(
-                &self,
-                ctx: &#ClientValidationContext,
-                client_id: &#ClientId,
-                client_message: #Any,
-                update_kind: &#UpdateKind,
-            ) -> core::result::Result<bool, #ClientError> {
-                match self {
-                    #(#check_for_misbehaviour_impl),*
-                }
-            }
-        }
-
-    }
-}
-
-fn delegate_call_in_match(
-    enum_name: &Ident,
-    enum_variants: Iter<'_, Variant>,
-    opts: &Opts,
-    fn_call: TokenStream,
-) -> Vec<TokenStream> {
-    let ClientStateValidation = Imports::ClientStateValidation();
-
-    enum_variants
-        .map(|variant| {
-            let HostClientState = enum_name;
-            let Tendermint = &variant.ident;
-            let TmClientState = get_enum_variant_type_path(variant);
-            let ClientValidationContext = &opts.client_validation_context;
-
-            // Note: We use `HostClientState` and `Tendermint`, etc as *variable names*. They're
-            // only meant to improve readability of the `quote`; it's not literally what's generated!
-            quote! {
-                #HostClientState::#Tendermint(cs) => <#TmClientState as #ClientStateValidation<#ClientValidationContext>>::#fn_call
-            }
-        })
-        .collect()
-}
diff --git a/crates/ibc-derive/src/lib.rs b/crates/ibc-derive/src/lib.rs
deleted file mode 100644
index 9c165082c..000000000
--- a/crates/ibc-derive/src/lib.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#![deny(
-    warnings,
-    trivial_casts,
-    trivial_numeric_casts,
-    unused_import_braces,
-    unused_qualifications,
-    rust_2018_idioms
-)]
-#![allow(non_snake_case)]
-
-mod client_state;
-mod consensus_state;
-mod utils;
-
-use client_state::client_state_derive_impl;
-use consensus_state::consensus_state_derive_impl;
-use proc_macro::TokenStream as RawTokenStream;
-use syn::{parse_macro_input, DeriveInput};
-
-#[proc_macro_derive(ClientState, attributes(generics, mock))]
-pub fn client_state_macro_derive(input: RawTokenStream) -> RawTokenStream {
-    let ast: DeriveInput = parse_macro_input!(input);
-
-    let output = client_state_derive_impl(ast);
-
-    RawTokenStream::from(output)
-}
-
-#[proc_macro_derive(ConsensusState)]
-pub fn consensus_state_macro_derive(input: RawTokenStream) -> RawTokenStream {
-    let ast: DeriveInput = parse_macro_input!(input);
-
-    let output = consensus_state_derive_impl(ast);
-
-    RawTokenStream::from(output)
-}
diff --git a/crates/ibc-derive/src/utils.rs b/crates/ibc-derive/src/utils.rs
deleted file mode 100644
index 4dc30ad29..000000000
--- a/crates/ibc-derive/src/utils.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::quote;
-use syn::{Path, Variant};
-
-/// Encodes the ibc-rs types that will be used in the macro
-///
-/// Note: we use `ibc` as our top-level crate, due to the
-/// `extern crate ibc as ibc;` statement we inject.
-pub struct Imports;
-
-impl Imports {
-    pub fn CommitmentRoot() -> TokenStream {
-        quote! {ibc::core::ics23_commitment::commitment::CommitmentRoot}
-    }
-
-    pub fn CommitmentPrefix() -> TokenStream {
-        quote! {ibc::core::ics23_commitment::commitment::CommitmentPrefix}
-    }
-
-    pub fn CommitmentProofBytes() -> TokenStream {
-        quote! {ibc::core::ics23_commitment::commitment::CommitmentProofBytes}
-    }
-
-    pub fn Path() -> TokenStream {
-        quote! {ibc::core::ics24_host::path::Path}
-    }
-
-    pub fn ConsensusState() -> TokenStream {
-        quote! {ibc::core::ics02_client::consensus_state::ConsensusState}
-    }
-
-    pub fn ClientStateCommon() -> TokenStream {
-        quote! {ibc::core::ics02_client::client_state::ClientStateCommon}
-    }
-
-    pub fn ClientStateValidation() -> TokenStream {
-        quote! {ibc::core::ics02_client::client_state::ClientStateValidation}
-    }
-
-    pub fn ClientStateExecution() -> TokenStream {
-        quote! {ibc::core::ics02_client::client_state::ClientStateExecution}
-    }
-
-    pub fn ClientId() -> TokenStream {
-        quote! {ibc::core::ics24_host::identifier::ClientId}
-    }
-
-    pub fn ClientType() -> TokenStream {
-        quote! {ibc::core::ics02_client::client_type::ClientType}
-    }
-
-    pub fn ClientError() -> TokenStream {
-        quote! {ibc::core::ics02_client::error::ClientError}
-    }
-
-    pub fn Height() -> TokenStream {
-        quote! {ibc::Height}
-    }
-
-    pub fn Any() -> TokenStream {
-        quote! {ibc_proto::google::protobuf::Any}
-    }
-
-    pub fn Timestamp() -> TokenStream {
-        quote! {ibc::core::timestamp::Timestamp}
-    }
-
-    pub fn UpdateKind() -> TokenStream {
-        quote! {ibc::core::ics02_client::client_state::UpdateKind}
-    }
-}
-
-/// Retrieves the field of a given enum variant. Outputs an error message if the enum variant
-/// is in the wrong format (i.e. isn't an unnamed enum, or contains more than one field).
-///
-/// For example, given
-/// ```ignore
-///
-/// #[derive(ClientState)]
-/// enum HostClientState {
-///     Tendermint(TmClientState),
-/// }
-/// ```
-/// when acting on the `Tendermint` variant, this will return `TmClientState`.
-///
-pub fn get_enum_variant_type_path(enum_variant: &Variant) -> &Path {
-    let variant_name = &enum_variant.ident;
-    let variant_unnamed_fields = match &enum_variant.fields {
-            syn::Fields::Unnamed(fields) => fields,
-            _ => panic!("\"{variant_name}\" variant must be unnamed, such as `{variant_name}({variant_name}ClientState)`")
-        };
-
-    if variant_unnamed_fields.unnamed.iter().len() != 1 {
-        panic!("\"{variant_name}\" must contain exactly one field, such as `{variant_name}({variant_name}ClientState)`");
-    }
-
-    // A representation of the variant's field (e.g. `TmClientState`). We must dig into
-    // the field to get the `TmClientState` path.
-    let unnamed_field = variant_unnamed_fields.unnamed.first().unwrap();
-
-    match &unnamed_field.ty {
-        syn::Type::Path(path) => &path.path,
-        _ => {
-            panic!("Invalid enum variant {variant_name} field. Please use an explicit, named type.")
-        }
-    }
-}
diff --git a/crates/ibc/Cargo.toml b/crates/ibc/Cargo.toml
deleted file mode 100644
index a23209f7a..000000000
--- a/crates/ibc/Cargo.toml
+++ /dev/null
@@ -1,106 +0,0 @@
-[package]
-name         = "ibc"
-version      = "0.42.0"
-edition      = "2021"
-license      = "Apache-2.0"
-readme       = "README.md"
-keywords     = ["blockchain", "consensus", "cosmos", "ibc", "tendermint"]
-repository   = "https://github.com/cosmos/ibc-rs"
-authors      = ["Informal Systems <hello@informal.systems>"]
-rust-version = "1.60"
-description  = """
-    Implementation of the Inter-Blockchain Communication Protocol (IBC).
-    This crate comprises the main data structures and on-chain logic.
-"""
-
-[package.metadata.docs.rs]
-all-features = true
-
-[features]
-default = ["std"]
-std = [
-    "ibc-proto/std",
-    "ics23/std",
-    "serde/std",
-    "serde_json/std",
-    "tracing/std",
-    "prost/std",
-    "bytes/std",
-    "subtle-encoding/std",
-    "sha2/std",
-    "displaydoc/std",
-    "num-traits/std",
-    "uint/std",
-    "primitive-types/std",
-    "tendermint/clock",
-    "tendermint/std",
-]
-parity-scale-codec = ["dep:parity-scale-codec", "dep:scale-info", "ibc-proto/parity-scale-codec"]
-borsh = ["dep:borsh", "ibc-proto/borsh"]
-
-# This feature is required for token transfer (ICS-20)
-serde = ["dep:serde", "dep:serde_derive", "serde_json", "ics23/serde"]
-
-# This feature grants access to development-time mocking libraries, such as `MockContext` or `MockHeader`.
-# Depends on the `testgen` suite for generating Tendermint light blocks.
-mocks = ["tendermint-testgen", "tendermint/clock", "parking_lot"]
-
-# This feature guards the unfinished implementation of the interchain accounts (ICS27) application.
-interchain-accounts = []
-
-[dependencies]
-# Proto definitions for all IBC-related interfaces, e.g., connections or channels.
-ibc-proto = { version = "0.32.0", default-features = false }
-cosmrs = "0.14.0"
-ics23 = { version = "0.10.1", default-features = false, features = ["host-functions"] }
-time = { version = ">=0.3.0, <0.3.24", default-features = false }
-serde_derive = { version = "1.0.104", default-features = false, optional = true }
-serde = { version = "1.0", default-features = false, optional = true }
-serde_json = { version = "1", default-features = false, optional = true }
-tracing = { version = "0.1.36", default-features = false }
-prost = { version = "0.11", default-features = false }
-bytes = { version = "1.2.1", default-features = false }
-safe-regex = { version = "0.2.5", default-features = false }
-subtle-encoding = { version = "0.5", default-features = false }
-sha2 = { version = "0.10.6", default-features = false }
-displaydoc = { version = "0.2", default-features = false }
-num-traits = { version = "0.2.15", default-features = false }
-derive_more = { version = "0.99.17", default-features = false, features = ["from", "into", "display", "try_into"] }
-uint = { version = "0.9", default-features = false }
-primitive-types = { version = "0.12.0", default-features = false, features = ["serde_no_std"] }
-
-## for codec encode or decode
-parity-scale-codec = { version = "3.0.0", default-features = false, features = ["full"], optional = true }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"], optional = true }
-## for borsh encode or decode
-borsh = {version = "0.9.0", default-features = false, optional = true }
-parking_lot = { version = "0.12.1", default-features = false, optional = true }
-
-ibc-derive = { version = "0.1.0", path = "../ibc-derive"}
-
-[dependencies.tendermint]
-version = "0.32"
-default-features = false
-
-[dependencies.tendermint-proto]
-version = "0.32"
-default-features = false
-
-[dependencies.tendermint-light-client-verifier]
-version = "0.32"
-default-features = false
-features = ["rust-crypto"]
-
-[dependencies.tendermint-testgen]
-version = "0.32"
-optional = true
-default-features = false
-
-[dev-dependencies]
-env_logger = "0.10.0"
-rstest = "0.18.1"
-tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"]}
-test-log = { version = "0.2.10", features = ["trace"] }
-tendermint-rpc = { version = "0.32", features = ["http-client", "websocket-client"] }
-tendermint-testgen = { version = "0.32" } # Needed for generating (synthetic) light blocks.
-parking_lot = { version = "0.12.1" }
diff --git a/crates/ibc/README.md b/crates/ibc/README.md
deleted file mode 100644
index 06db5de09..000000000
--- a/crates/ibc/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# IBC in Rust
-
-[![Crate][crate-image]][crate-link]
-[![Docs][docs-image]][docs-link]
-[![Build Status][build-image]][build-link]
-[![Apache 2.0 Licensed][license-image]][license-link]
-![Rust Stable][rustc-image]
-![Rust 1.60+][rustc-version]
-
-Implementation of the Inter-Blockchain Communication Protocol ([IBC]) in Rust.
-
-## Documentation
-
-See documentation on [docs.rs][docs-link].
-
-## Third-party clients
-
-Here, we list IBC third-party clients that are compatible with ibc-rs. You should always audit the implementation of any third-party crate. If you have a client that you'd like to be added to this list, please open a PR!
-
-+ [ICS 6: Solomachine](https://github.com/octopus-network/ics06-solomachine) by Octopus Network
-
-## Divergence from the Interchain Standards (ICS)
-
-This crate diverges from the [ICS specification](https://github.com/cosmos/ibc) in a number of ways. See below for more details.
-
-### Module system: no support for untrusted modules
-
-ICS 24 (Host Requirements) gives the [following requirement](https://github.com/cosmos/ibc/blob/master/spec/core/ics-024-host-requirements/README.md#module-system) about the module system that the host state machine must support:
-
-> The host state machine must support a module system, whereby self-contained, potentially mutually distrusted packages of code can safely execute on the same ledger [...].
-
-**This crate currently does not support mutually distrusted packages**. That is, modules on the host state machine are assumed to be fully trusted. In practice, this means that every module has either been written by the host state machine developers, or fully vetted by them.
-
-### Port system: No object capability system
-
-ICS 5 (Port Allocation) requires the host system to support either object-capability reference or source authentication for modules.
-
-> In the former object-capability case, the IBC handler must have the ability to generate object-capabilities, unique, opaque references which can be passed to a module and will not be duplicable by other modules. [...]
-> In the latter source authentication case, the IBC handler must have the ability to securely read the source identifier of the calling module, a unique string for each module in the host state machine, which cannot be altered by the module or faked by another module.
-
-**This crate currently requires neither of the host system**. Since modules are assumed to be trusted, there is no need for this object capability system that protects resources for potentially malicious modules.
-
-For more background on this, see [this issue](https://github.com/informalsystems/ibc-rs/issues/2159).
-
-### Port system: transferring and releasing a port
-
-ICS 5 (Port Allocation) requires the IBC handler to permit [transferring ownership of a port](https://github.com/cosmos/ibc/tree/master/spec/core/ics-005-port-allocation#transferring-ownership-of-a-port) and [releasing a port](https://github.com/cosmos/ibc/tree/master/spec/core/ics-005-port-allocation#releasing-a-port).
-
-We currently support neither.
-
-### Asynchronous acknowledgements
-The standard gives the ability for modules to [acknowledge packets asynchronously](https://github.com/cosmos/ibc/tree/main/spec/core/ics-004-channel-and-packet-semantics#writing-acknowledgements). This allows modules to receive the packet, but only applying the changes at a later time (after which they would write the acknowledgement).
-
-We currently force applications to process the packets as part of `onRecvPacket()`. If you need asynchronous acknowledgements for your application, please open an issue.
-
-Note that this still makes us 100% compatible with ibc-go.
-
-## License
-
-Copyright © 2021 Informal Systems Inc. and ibc-rs authors.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use the files in this repository except in compliance with the License. You may obtain a copy of the License at
-
-    https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-[//]: # (badges)
-
-[crate-image]: https://img.shields.io/crates/v/ibc.svg
-[crate-link]: https://crates.io/crates/ibc
-[docs-image]: https://docs.rs/ibc/badge.svg
-[docs-link]: https://docs.rs/ibc/
-[build-image]: https://github.com/cosmos/ibc-rs/workflows/Rust/badge.svg
-[build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
-[license-image]: https://img.shields.io/badge/license-Apache2.0-blue.svg
-[license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
-[rustc-image]: https://img.shields.io/badge/rustc-stable-blue.svg
-[rustc-version]: https://img.shields.io/badge/rustc-1.60+-blue.svg
-
-[//]: # (general links)
-
-[IBC]: https://github.com/cosmos/ibc
diff --git a/crates/ibc/src/applications/transfer/amount.rs b/crates/ibc/src/applications/transfer/amount.rs
deleted file mode 100644
index 2b266a5ca..000000000
--- a/crates/ibc/src/applications/transfer/amount.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-//! Contains the `Amount` type, which represents amounts of tokens transferred.
-
-use core::{ops::Deref, str::FromStr};
-use derive_more::{Display, From, Into};
-
-use super::error::TokenTransferError;
-use primitive_types::U256;
-
-/// A type for representing token transfer amounts.
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Display, From, Into)]
-pub struct Amount(U256);
-
-#[cfg(feature = "parity-scale-codec")]
-impl parity_scale_codec::WrapperTypeDecode for Amount {
-    type Wrapped = [u64; 4];
-}
-
-#[cfg(feature = "parity-scale-codec")]
-impl parity_scale_codec::WrapperTypeEncode for Amount {}
-
-impl Deref for Amount {
-    type Target = [u64; 4];
-
-    fn deref(&self) -> &Self::Target {
-        &self.0 .0
-    }
-}
-
-impl From<[u64; 4]> for Amount {
-    fn from(value: [u64; 4]) -> Self {
-        Self(U256(value))
-    }
-}
-
-impl Amount {
-    pub fn checked_add(self, rhs: Self) -> Option<Self> {
-        self.0.checked_add(rhs.0).map(Self)
-    }
-
-    pub fn checked_sub(self, rhs: Self) -> Option<Self> {
-        self.0.checked_sub(rhs.0).map(Self)
-    }
-}
-
-impl AsRef<U256> for Amount {
-    fn as_ref(&self) -> &U256 {
-        &self.0
-    }
-}
-
-impl FromStr for Amount {
-    type Err = TokenTransferError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let amount = U256::from_dec_str(s).map_err(TokenTransferError::InvalidAmount)?;
-        Ok(Self(amount))
-    }
-}
-
-impl From<u64> for Amount {
-    fn from(v: u64) -> Self {
-        Self(v.into())
-    }
-}
diff --git a/crates/ibc/src/applications/transfer/coin.rs b/crates/ibc/src/applications/transfer/coin.rs
deleted file mode 100644
index f95988093..000000000
--- a/crates/ibc/src/applications/transfer/coin.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-//! Defines coin types; the objects that are being transferred.
-
-use core::fmt::{Display, Error as FmtError, Formatter};
-use core::str::{from_utf8, FromStr};
-use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin;
-use safe_regex::regex;
-
-use super::amount::Amount;
-use super::denom::{BaseDenom, PrefixedDenom};
-use super::error::TokenTransferError;
-use crate::prelude::*;
-
-#[cfg(feature = "serde")]
-use crate::serializers::serde_string;
-
-/// A `Coin` type with fully qualified `PrefixedDenom`.
-pub type PrefixedCoin = Coin<PrefixedDenom>;
-
-/// A `Coin` type with an unprefixed denomination.
-pub type BaseCoin = Coin<BaseDenom>;
-
-pub type RawCoin = Coin<String>;
-
-/// Coin defines a token with a denomination and an amount.
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
-)]
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub struct Coin<D> {
-    /// Denomination
-    pub denom: D,
-    /// Amount
-    #[cfg_attr(feature = "serde", serde(with = "serde_string"))]
-    pub amount: Amount,
-}
-
-impl<D: FromStr> Coin<D>
-where
-    D::Err: Into<TokenTransferError>,
-{
-    pub fn from_string_list(coin_str: &str) -> Result<Vec<Self>, TokenTransferError> {
-        coin_str.split(',').map(FromStr::from_str).collect()
-    }
-}
-
-impl<D: FromStr> FromStr for Coin<D>
-where
-    D::Err: Into<TokenTransferError>,
-{
-    type Err = TokenTransferError;
-
-    #[allow(clippy::assign_op_pattern)]
-    fn from_str(coin_str: &str) -> Result<Self, TokenTransferError> {
-        // Denominations can be 3 ~ 128 characters long and support letters, followed by either
-        // a letter, a number or a separator ('/', ':', '.', '_' or '-').
-        // Loosely copy the regex from here:
-        // https://github.com/cosmos/cosmos-sdk/blob/v0.45.5/types/coin.go#L760-L762
-        let matcher = regex!(br"([0-9]+)([a-zA-Z0-9/:\\._\x2d]+)");
-
-        let (m1, m2) = matcher.match_slices(coin_str.as_bytes()).ok_or_else(|| {
-            TokenTransferError::InvalidCoin {
-                coin: coin_str.to_string(),
-            }
-        })?;
-
-        let amount = from_utf8(m1)
-            .map_err(TokenTransferError::Utf8Decode)?
-            .parse()?;
-
-        let denom = from_utf8(m2)
-            .map_err(TokenTransferError::Utf8Decode)?
-            .parse()
-            .map_err(Into::into)?;
-
-        Ok(Coin { amount, denom })
-    }
-}
-
-impl<D: FromStr> TryFrom<ProtoCoin> for Coin<D>
-where
-    D::Err: Into<TokenTransferError>,
-{
-    type Error = TokenTransferError;
-
-    fn try_from(proto: ProtoCoin) -> Result<Coin<D>, Self::Error> {
-        let denom = D::from_str(&proto.denom).map_err(Into::into)?;
-        let amount = Amount::from_str(&proto.amount)?;
-        Ok(Self { denom, amount })
-    }
-}
-
-impl<D: ToString> From<Coin<D>> for ProtoCoin {
-    fn from(coin: Coin<D>) -> ProtoCoin {
-        ProtoCoin {
-            denom: coin.denom.to_string(),
-            amount: coin.amount.to_string(),
-        }
-    }
-}
-
-impl From<BaseCoin> for PrefixedCoin {
-    fn from(coin: BaseCoin) -> PrefixedCoin {
-        PrefixedCoin {
-            denom: coin.denom.into(),
-            amount: coin.amount,
-        }
-    }
-}
-
-impl<D: Display> Display for Coin<D> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}{}", self.amount, self.denom)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_raw_coin() -> Result<(), TokenTransferError> {
-        {
-            let coin = RawCoin::from_str("123stake")?;
-            assert_eq!(coin.denom, "stake");
-            assert_eq!(coin.amount, 123u64.into());
-        }
-
-        {
-            let coin = RawCoin::from_str("1a1")?;
-            assert_eq!(coin.denom, "a1");
-            assert_eq!(coin.amount, 1u64.into());
-        }
-
-        {
-            let coin = RawCoin::from_str("0x1/:.\\_-")?;
-            assert_eq!(coin.denom, "x1/:.\\_-");
-            assert_eq!(coin.amount, 0u64.into());
-        }
-
-        {
-            // `!` is not allowed
-            let res = RawCoin::from_str("0x!");
-            assert!(res.is_err());
-        }
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_parse_raw_coin_list() -> Result<(), TokenTransferError> {
-        {
-            let coins = RawCoin::from_string_list("123stake,1a1,999den0m")?;
-            assert_eq!(coins.len(), 3);
-
-            assert_eq!(coins[0].denom, "stake");
-            assert_eq!(coins[0].amount, 123u64.into());
-
-            assert_eq!(coins[1].denom, "a1");
-            assert_eq!(coins[1].amount, 1u64.into());
-
-            assert_eq!(coins[2].denom, "den0m");
-            assert_eq!(coins[2].amount, 999u64.into());
-        }
-
-        Ok(())
-    }
-}
diff --git a/crates/ibc/src/applications/transfer/context.rs b/crates/ibc/src/applications/transfer/context.rs
deleted file mode 100644
index 16f0d50ab..000000000
--- a/crates/ibc/src/applications/transfer/context.rs
+++ /dev/null
@@ -1,587 +0,0 @@
-//! Defines the main context traits and IBC module callbacks
-use crate::prelude::*;
-
-use sha2::{Digest, Sha256};
-
-use super::ack_success_b64;
-use super::error::TokenTransferError;
-use crate::applications::transfer::events::{AckEvent, AckStatusEvent, RecvEvent, TimeoutEvent};
-use crate::applications::transfer::packet::PacketData;
-use crate::applications::transfer::relay::refund_packet_token_execute;
-use crate::applications::transfer::relay::{
-    on_recv_packet::process_recv_packet_execute, refund_packet_token_validate,
-};
-use crate::applications::transfer::{PrefixedCoin, PrefixedDenom, VERSION};
-use crate::core::ics04_channel::acknowledgement::Acknowledgement;
-use crate::core::ics04_channel::acknowledgement::AcknowledgementStatus;
-use crate::core::ics04_channel::channel::{Counterparty, Order};
-use crate::core::ics04_channel::context::{
-    SendPacketExecutionContext, SendPacketValidationContext,
-};
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics04_channel::Version;
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-use crate::core::router::ModuleExtras;
-use crate::core::ContextError;
-use crate::signer::Signer;
-
-/// Methods required in token transfer validation, to be implemented by the host
-pub trait TokenTransferValidationContext: SendPacketValidationContext {
-    type AccountId: TryFrom<Signer>;
-
-    /// get_port returns the portID for the transfer module.
-    fn get_port(&self) -> Result<PortId, TokenTransferError>;
-
-    /// Returns the escrow account id for a port and channel combination
-    fn get_escrow_account(
-        &self,
-        port_id: &PortId,
-        channel_id: &ChannelId,
-    ) -> Result<Self::AccountId, TokenTransferError>;
-
-    /// Returns Ok() if the host chain supports sending coins.
-    fn can_send_coins(&self) -> Result<(), TokenTransferError>;
-
-    /// Returns Ok() if the host chain supports receiving coins.
-    fn can_receive_coins(&self) -> Result<(), TokenTransferError>;
-
-    /// Validates the sender and receiver accounts and the coin inputs
-    fn send_coins_validate(
-        &self,
-        from_account: &Self::AccountId,
-        to_account: &Self::AccountId,
-        coin: &PrefixedCoin,
-    ) -> Result<(), TokenTransferError>;
-
-    /// Validates the receiver account and the coin input
-    fn mint_coins_validate(
-        &self,
-        account: &Self::AccountId,
-        coin: &PrefixedCoin,
-    ) -> Result<(), TokenTransferError>;
-
-    /// Validates the sender account and the coin input
-    fn burn_coins_validate(
-        &self,
-        account: &Self::AccountId,
-        coin: &PrefixedCoin,
-    ) -> Result<(), TokenTransferError>;
-
-    /// Returns a hash of the prefixed denom.
-    /// Implement only if the host chain supports hashed denominations.
-    fn denom_hash_string(&self, _denom: &PrefixedDenom) -> Option<String> {
-        None
-    }
-}
-
-/// Methods required in token transfer execution, to be implemented by the host
-pub trait TokenTransferExecutionContext:
-    TokenTransferValidationContext + SendPacketExecutionContext
-{
-    /// This function should enable sending ibc fungible tokens from one account to another
-    fn send_coins_execute(
-        &mut self,
-        from_account: &Self::AccountId,
-        to_account: &Self::AccountId,
-        coin: &PrefixedCoin,
-    ) -> Result<(), TokenTransferError>;
-
-    /// This function to enable minting ibc tokens to a user account
-    fn mint_coins_execute(
-        &mut self,
-        account: &Self::AccountId,
-        coin: &PrefixedCoin,
-    ) -> Result<(), TokenTransferError>;
-
-    /// This function should enable burning of minted tokens in a user account
-    fn burn_coins_execute(
-        &mut self,
-        account: &Self::AccountId,
-        coin: &PrefixedCoin,
-    ) -> Result<(), TokenTransferError>;
-}
-
-// https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-028-public-key-addresses.md
-pub fn cosmos_adr028_escrow_address(port_id: &PortId, channel_id: &ChannelId) -> Vec<u8> {
-    let contents = format!("{port_id}/{channel_id}");
-
-    let mut hasher = Sha256::new();
-    hasher.update(VERSION.as_bytes());
-    hasher.update([0]);
-    hasher.update(contents.as_bytes());
-
-    let mut hash = hasher.finalize().to_vec();
-    hash.truncate(20);
-    hash
-}
-
-pub fn on_chan_open_init_validate(
-    ctx: &impl TokenTransferValidationContext,
-    order: Order,
-    _connection_hops: &[ConnectionId],
-    port_id: &PortId,
-    _channel_id: &ChannelId,
-    _counterparty: &Counterparty,
-    version: &Version,
-) -> Result<(), TokenTransferError> {
-    if order != Order::Unordered {
-        return Err(TokenTransferError::ChannelNotUnordered {
-            expect_order: Order::Unordered,
-            got_order: order,
-        });
-    }
-    let bound_port = ctx.get_port()?;
-    if port_id != &bound_port {
-        return Err(TokenTransferError::InvalidPort {
-            port_id: port_id.clone(),
-            exp_port_id: bound_port,
-        });
-    }
-
-    if !version.is_empty() {
-        version
-            .verify_is_expected(Version::new(VERSION.to_string()))
-            .map_err(ContextError::from)?;
-    }
-
-    Ok(())
-}
-
-pub fn on_chan_open_init_execute(
-    _ctx: &mut impl TokenTransferExecutionContext,
-    _order: Order,
-    _connection_hops: &[ConnectionId],
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-    _counterparty: &Counterparty,
-    _version: &Version,
-) -> Result<(ModuleExtras, Version), TokenTransferError> {
-    Ok((ModuleExtras::empty(), Version::new(VERSION.to_string())))
-}
-
-pub fn on_chan_open_try_validate(
-    _ctx: &impl TokenTransferValidationContext,
-    order: Order,
-    _connection_hops: &[ConnectionId],
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-    _counterparty: &Counterparty,
-    counterparty_version: &Version,
-) -> Result<(), TokenTransferError> {
-    if order != Order::Unordered {
-        return Err(TokenTransferError::ChannelNotUnordered {
-            expect_order: Order::Unordered,
-            got_order: order,
-        });
-    }
-
-    counterparty_version
-        .verify_is_expected(Version::new(VERSION.to_string()))
-        .map_err(ContextError::from)?;
-
-    Ok(())
-}
-
-pub fn on_chan_open_try_execute(
-    _ctx: &mut impl TokenTransferExecutionContext,
-    _order: Order,
-    _connection_hops: &[ConnectionId],
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-    _counterparty: &Counterparty,
-    _counterparty_version: &Version,
-) -> Result<(ModuleExtras, Version), TokenTransferError> {
-    Ok((ModuleExtras::empty(), Version::new(VERSION.to_string())))
-}
-
-pub fn on_chan_open_ack_validate(
-    _ctx: &impl TokenTransferValidationContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-    counterparty_version: &Version,
-) -> Result<(), TokenTransferError> {
-    counterparty_version
-        .verify_is_expected(Version::new(VERSION.to_string()))
-        .map_err(ContextError::from)?;
-
-    Ok(())
-}
-
-pub fn on_chan_open_ack_execute(
-    _ctx: &mut impl TokenTransferExecutionContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-    _counterparty_version: &Version,
-) -> Result<ModuleExtras, TokenTransferError> {
-    Ok(ModuleExtras::empty())
-}
-
-pub fn on_chan_open_confirm_validate(
-    _ctx: &impl TokenTransferValidationContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-) -> Result<(), TokenTransferError> {
-    Ok(())
-}
-
-pub fn on_chan_open_confirm_execute(
-    _ctx: &mut impl TokenTransferExecutionContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-) -> Result<ModuleExtras, TokenTransferError> {
-    Ok(ModuleExtras::empty())
-}
-
-pub fn on_chan_close_init_validate(
-    _ctx: &impl TokenTransferValidationContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-) -> Result<(), TokenTransferError> {
-    Err(TokenTransferError::CantCloseChannel)
-}
-
-pub fn on_chan_close_init_execute(
-    _ctx: &mut impl TokenTransferExecutionContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-) -> Result<ModuleExtras, TokenTransferError> {
-    Err(TokenTransferError::CantCloseChannel)
-}
-
-pub fn on_chan_close_confirm_validate(
-    _ctx: &impl TokenTransferValidationContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-) -> Result<(), TokenTransferError> {
-    Ok(())
-}
-
-pub fn on_chan_close_confirm_execute(
-    _ctx: &mut impl TokenTransferExecutionContext,
-    _port_id: &PortId,
-    _channel_id: &ChannelId,
-) -> Result<ModuleExtras, TokenTransferError> {
-    Ok(ModuleExtras::empty())
-}
-
-pub fn on_recv_packet_execute(
-    ctx_b: &mut impl TokenTransferExecutionContext,
-    packet: &Packet,
-) -> (ModuleExtras, Acknowledgement) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            let ack =
-                AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into());
-            return (ModuleExtras::empty(), ack.into());
-        }
-    };
-
-    let (mut extras, ack) = match process_recv_packet_execute(ctx_b, packet, data.clone()) {
-        Ok(extras) => (extras, AcknowledgementStatus::success(ack_success_b64())),
-        Err((extras, error)) => (extras, AcknowledgementStatus::error(error.into())),
-    };
-
-    let recv_event = RecvEvent {
-        sender: data.sender,
-        receiver: data.receiver,
-        denom: data.token.denom,
-        amount: data.token.amount,
-        memo: data.memo,
-        success: ack.is_successful(),
-    };
-    extras.events.push(recv_event.into());
-
-    (extras, ack.into())
-}
-
-pub fn on_acknowledgement_packet_validate<Ctx>(
-    ctx: &Ctx,
-    packet: &Packet,
-    acknowledgement: &Acknowledgement,
-    _relayer: &Signer,
-) -> Result<(), TokenTransferError>
-where
-    Ctx: TokenTransferValidationContext,
-{
-    let data = serde_json::from_slice::<PacketData>(&packet.data)
-        .map_err(|_| TokenTransferError::PacketDataDeserialization)?;
-
-    let acknowledgement = serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
-        .map_err(|_| TokenTransferError::AckDeserialization)?;
-
-    if !acknowledgement.is_successful() {
-        refund_packet_token_validate(ctx, packet, &data)?;
-    }
-
-    Ok(())
-}
-
-pub fn on_acknowledgement_packet_execute(
-    ctx: &mut impl TokenTransferExecutionContext,
-    packet: &Packet,
-    acknowledgement: &Acknowledgement,
-    _relayer: &Signer,
-) -> (ModuleExtras, Result<(), TokenTransferError>) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            return (
-                ModuleExtras::empty(),
-                Err(TokenTransferError::PacketDataDeserialization),
-            );
-        }
-    };
-
-    let acknowledgement =
-        match serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref()) {
-            Ok(ack) => ack,
-            Err(_) => {
-                return (
-                    ModuleExtras::empty(),
-                    Err(TokenTransferError::AckDeserialization),
-                );
-            }
-        };
-
-    if !acknowledgement.is_successful() {
-        if let Err(err) = refund_packet_token_execute(ctx, packet, &data) {
-            return (ModuleExtras::empty(), Err(err));
-        }
-    }
-
-    let ack_event = AckEvent {
-        sender: data.sender,
-        receiver: data.receiver,
-        denom: data.token.denom,
-        amount: data.token.amount,
-        memo: data.memo,
-        acknowledgement: acknowledgement.clone(),
-    };
-
-    let extras = ModuleExtras {
-        events: vec![ack_event.into(), AckStatusEvent { acknowledgement }.into()],
-        log: Vec::new(),
-    };
-
-    (extras, Ok(()))
-}
-
-pub fn on_timeout_packet_validate<Ctx>(
-    ctx: &Ctx,
-    packet: &Packet,
-    _relayer: &Signer,
-) -> Result<(), TokenTransferError>
-where
-    Ctx: TokenTransferValidationContext,
-{
-    let data = serde_json::from_slice::<PacketData>(&packet.data)
-        .map_err(|_| TokenTransferError::PacketDataDeserialization)?;
-
-    refund_packet_token_validate(ctx, packet, &data)?;
-
-    Ok(())
-}
-
-pub fn on_timeout_packet_execute(
-    ctx: &mut impl TokenTransferExecutionContext,
-    packet: &Packet,
-    _relayer: &Signer,
-) -> (ModuleExtras, Result<(), TokenTransferError>) {
-    let data = match serde_json::from_slice::<PacketData>(&packet.data) {
-        Ok(data) => data,
-        Err(_) => {
-            return (
-                ModuleExtras::empty(),
-                Err(TokenTransferError::PacketDataDeserialization),
-            );
-        }
-    };
-
-    if let Err(err) = refund_packet_token_execute(ctx, packet, &data) {
-        return (ModuleExtras::empty(), Err(err));
-    }
-
-    let timeout_event = TimeoutEvent {
-        refund_receiver: data.sender,
-        refund_denom: data.token.denom,
-        refund_amount: data.token.amount,
-        memo: data.memo,
-    };
-
-    let extras = ModuleExtras {
-        events: vec![timeout_event.into()],
-        log: Vec::new(),
-    };
-
-    (extras, Ok(()))
-}
-
-#[cfg(test)]
-pub(crate) mod test {
-    use super::*;
-    use subtle_encoding::bech32;
-
-    use crate::applications::transfer::context::cosmos_adr028_escrow_address;
-    use crate::core::ics04_channel::channel::{Counterparty, Order};
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-    use crate::mock::context::MockContext;
-
-    fn get_defaults() -> (
-        MockContext,
-        Order,
-        Vec<ConnectionId>,
-        PortId,
-        ChannelId,
-        Counterparty,
-    ) {
-        let ctx = MockContext::default();
-        let order = Order::Unordered;
-        let connection_hops = vec![ConnectionId::new(1)];
-        let port_id = PortId::transfer();
-        let channel_id = ChannelId::new(1);
-        let counterparty = Counterparty::new(port_id.clone(), Some(channel_id.clone()));
-
-        (
-            ctx,
-            order,
-            connection_hops,
-            port_id,
-            channel_id,
-            counterparty,
-        )
-    }
-
-    #[test]
-    fn test_cosmos_escrow_address() {
-        fn assert_eq_escrow_address(port_id: &str, channel_id: &str, address: &str) {
-            let port_id = port_id.parse().unwrap();
-            let channel_id = channel_id.parse().unwrap();
-            let gen_address = {
-                let addr = cosmos_adr028_escrow_address(&port_id, &channel_id);
-                bech32::encode("cosmos", addr)
-            };
-            assert_eq!(gen_address, address.to_owned())
-        }
-
-        // addresses obtained using `gaiad query ibc-transfer escrow-address [port-id] [channel-id]`
-        assert_eq_escrow_address(
-            "transfer",
-            "channel-141",
-            "cosmos1x54ltnyg88k0ejmk8ytwrhd3ltm84xehrnlslf",
-        );
-        assert_eq_escrow_address(
-            "transfer",
-            "channel-207",
-            "cosmos1ju6tlfclulxumtt2kglvnxduj5d93a64r5czge",
-        );
-        assert_eq_escrow_address(
-            "transfer",
-            "channel-187",
-            "cosmos177x69sver58mcfs74x6dg0tv6ls4s3xmmcaw53",
-        );
-    }
-
-    /// If the relayer passed "", indicating that it wants us to return the versions we support.
-    /// We currently only support ics20
-    #[test]
-    fn test_on_chan_open_init_empty_version() {
-        let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
-
-        let in_version = Version::new("".to_string());
-
-        let (_, out_version) = on_chan_open_init_execute(
-            &mut ctx,
-            order,
-            &connection_hops,
-            &port_id,
-            &channel_id,
-            &counterparty,
-            &in_version,
-        )
-        .unwrap();
-
-        assert_eq!(out_version, Version::new(VERSION.to_string()));
-    }
-
-    /// If the relayer passed in the only supported version (ics20), then return ics20
-    #[test]
-    fn test_on_chan_open_init_ics20_version() {
-        let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
-
-        let in_version = Version::new(VERSION.to_string());
-        let (_, out_version) = on_chan_open_init_execute(
-            &mut ctx,
-            order,
-            &connection_hops,
-            &port_id,
-            &channel_id,
-            &counterparty,
-            &in_version,
-        )
-        .unwrap();
-
-        assert_eq!(out_version, Version::new(VERSION.to_string()));
-    }
-
-    /// If the relayer passed in an unsupported version, then fail
-    #[test]
-    fn test_on_chan_open_init_incorrect_version() {
-        let (ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
-
-        let in_version = Version::new("some-unsupported-version".to_string());
-        let res = on_chan_open_init_validate(
-            &ctx,
-            order,
-            &connection_hops,
-            &port_id,
-            &channel_id,
-            &counterparty,
-            &in_version,
-        );
-
-        assert!(res.is_err());
-    }
-
-    /// If the counterparty supports ics20, then return ics20
-    #[test]
-    fn test_on_chan_open_try_counterparty_correct_version() {
-        let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
-
-        let counterparty_version = Version::new(VERSION.to_string());
-
-        let (_, out_version) = on_chan_open_try_execute(
-            &mut ctx,
-            order,
-            &connection_hops,
-            &port_id,
-            &channel_id,
-            &counterparty,
-            &counterparty_version,
-        )
-        .unwrap();
-
-        assert_eq!(out_version, Version::new(VERSION.to_string()));
-    }
-
-    /// If the counterparty doesn't support ics20, then fail
-    #[test]
-    fn test_on_chan_open_try_counterparty_incorrect_version() {
-        let (ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
-
-        let counterparty_version = Version::new("some-unsupported-version".to_string());
-
-        let res = on_chan_open_try_validate(
-            &ctx,
-            order,
-            &connection_hops,
-            &port_id,
-            &channel_id,
-            &counterparty,
-            &counterparty_version,
-        );
-
-        assert!(res.is_err());
-    }
-}
diff --git a/crates/ibc/src/applications/transfer/denom.rs b/crates/ibc/src/applications/transfer/denom.rs
deleted file mode 100644
index b97b007c5..000000000
--- a/crates/ibc/src/applications/transfer/denom.rs
+++ /dev/null
@@ -1,447 +0,0 @@
-//! Defines types to represent "denominations" [as defined in ICS-20](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md#data-structures)
-
-use core::fmt::{Display, Error as FmtError, Formatter};
-use core::str::FromStr;
-
-use derive_more::{Display, From};
-use ibc_proto::ibc::applications::transfer::v1::DenomTrace as RawDenomTrace;
-
-use super::error::TokenTransferError;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::prelude::*;
-
-#[cfg(feature = "serde")]
-use crate::serializers::serde_string;
-
-/// The "base" of a denomination.
-///
-/// For example, given the token `my_port-1/my_channel-1/my_port-2/my_channel-2/base_denom`,
-/// `base_denom` is the "base" of the denomination
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(feature = "serde", serde(transparent))]
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Display)]
-pub struct BaseDenom(String);
-
-impl BaseDenom {
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl FromStr for BaseDenom {
-    type Err = TokenTransferError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if s.trim().is_empty() {
-            Err(TokenTransferError::EmptyBaseDenom)
-        } else {
-            Ok(BaseDenom(s.to_owned()))
-        }
-    }
-}
-
-/// One hop in a token's trace, which consists of the port and channel IDs of the sender
-///
-/// For example, given the token `my_port-1/my_channel-1/my_port-2/my_channel-2/base_denom`,
-/// `my_port-1/my_channel-1` is a trace prefix, and `my_port-2/my_channel-2` is another one.
-/// See [TracePath] which stitches trace prefixes together.
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
-pub struct TracePrefix {
-    port_id: PortId,
-    channel_id: ChannelId,
-}
-
-impl TracePrefix {
-    pub fn new(port_id: PortId, channel_id: ChannelId) -> Self {
-        Self {
-            port_id,
-            channel_id,
-        }
-    }
-}
-
-impl Display for TracePrefix {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}/{}", self.port_id, self.channel_id)
-    }
-}
-
-/// A full trace path modelled as a collection of `TracePrefix`s.
-// Internally, the `TracePath` is modelled as a `Vec<TracePrefix>` but with the order reversed, i.e.
-// "transfer/channel-0/transfer/channel-1/uatom" => `["transfer/channel-1", "transfer/channel-0"]`
-// This is done for ease of addition/removal of prefixes.
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[derive(Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord, From)]
-pub struct TracePath(Vec<TracePrefix>);
-
-impl TracePath {
-    /// Returns true iff this path starts with the specified prefix
-    pub fn starts_with(&self, prefix: &TracePrefix) -> bool {
-        self.0.last().map(|p| p == prefix).unwrap_or(false)
-    }
-
-    /// Removes the specified prefix from the path if there is a match, otherwise does nothing.
-    pub fn remove_prefix(&mut self, prefix: &TracePrefix) {
-        if self.starts_with(prefix) {
-            self.0.pop();
-        }
-    }
-
-    /// Adds the specified prefix to the path.
-    pub fn add_prefix(&mut self, prefix: TracePrefix) {
-        self.0.push(prefix)
-    }
-
-    /// Returns true if the path is empty and false otherwise.
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-}
-
-impl<'a> TryFrom<Vec<&'a str>> for TracePath {
-    type Error = TokenTransferError;
-
-    fn try_from(v: Vec<&'a str>) -> Result<Self, Self::Error> {
-        if v.len() % 2 != 0 {
-            return Err(TokenTransferError::InvalidTraceLength { len: v.len() });
-        }
-
-        let mut trace = vec![];
-        let id_pairs = v.chunks_exact(2).map(|paths| (paths[0], paths[1]));
-        for (pos, (port_id, channel_id)) in id_pairs.rev().enumerate() {
-            let port_id =
-                PortId::from_str(port_id).map_err(|e| TokenTransferError::InvalidTracePortId {
-                    pos,
-                    validation_error: e,
-                })?;
-            let channel_id = ChannelId::from_str(channel_id).map_err(|e| {
-                TokenTransferError::InvalidTraceChannelId {
-                    pos,
-                    validation_error: e,
-                }
-            })?;
-            trace.push(TracePrefix {
-                port_id,
-                channel_id,
-            });
-        }
-
-        Ok(trace.into())
-    }
-}
-
-impl FromStr for TracePath {
-    type Err = TokenTransferError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let parts = {
-            let parts: Vec<&str> = s.split('/').collect();
-            if parts.len() == 1 && parts[0].trim().is_empty() {
-                vec![]
-            } else {
-                parts
-            }
-        };
-        parts.try_into()
-    }
-}
-
-impl Display for TracePath {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        let path = self
-            .0
-            .iter()
-            .rev()
-            .map(|prefix| prefix.to_string())
-            .collect::<Vec<String>>()
-            .join("/");
-        write!(f, "{path}")
-    }
-}
-
-/// A type that contains the base denomination for ICS20 and the source tracing information path.
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
-pub struct PrefixedDenom {
-    /// A series of `{port-id}/{channel-id}`s for tracing the source of the token.
-    #[cfg_attr(feature = "serde", serde(with = "serde_string"))]
-    pub trace_path: TracePath,
-    /// Base denomination of the relayed fungible token.
-    pub base_denom: BaseDenom,
-}
-
-impl PrefixedDenom {
-    /// Removes the specified prefix from the trace path if there is a match, otherwise does nothing.
-    pub fn remove_trace_prefix(&mut self, prefix: &TracePrefix) {
-        self.trace_path.remove_prefix(prefix)
-    }
-
-    /// Adds the specified prefix to the trace path.
-    pub fn add_trace_prefix(&mut self, prefix: TracePrefix) {
-        self.trace_path.add_prefix(prefix)
-    }
-}
-
-/// Returns true if the denomination originally came from the sender chain and
-/// false otherwise.
-///
-/// Note: It is better to think of the "source" chain as the chain that
-/// escrows/unescrows the token, while the other chain mints/burns the tokens,
-/// respectively. A chain being the "source" of a token does NOT mean it is the
-/// original creator of the token (e.g. "uatom"), as "source" might suggest.
-///
-/// This means that in any given transfer, a chain can very well be the source
-/// of a token of which it is not the creator. For example, let
-///
-/// A: sender chain in this transfer, port "transfer" and channel "c2b" (to B)
-/// B: receiver chain in this transfer, port "transfer" and channel "c2a" (to A)
-/// token denom: "transfer/someOtherChannel/someDenom"
-///
-/// A, initiator of the transfer, needs to figure out if it should escrow the
-/// tokens, or burn them. If B had originally sent the token to A in a previous
-/// transfer, then A would have stored the token as "transfer/c2b/someDenom".
-/// Now, A is sending to B, so to check if B is the source of the token, we need
-/// to check if the token starts with "transfer/c2b". In this example, it
-/// doesn't, so the token doesn't originate from B. A is considered the source,
-/// even though it is not the creator of the token. Specifically, the token was
-/// created by the chain at the other end of A's port "transfer" and channel
-/// "someOtherChannel".
-pub fn is_sender_chain_source(
-    source_port: PortId,
-    source_channel: ChannelId,
-    denom: &PrefixedDenom,
-) -> bool {
-    !is_receiver_chain_source(source_port, source_channel, denom)
-}
-
-/// Returns true if the denomination originally came from the receiving chain and false otherwise.
-pub fn is_receiver_chain_source(
-    source_port: PortId,
-    source_channel: ChannelId,
-    denom: &PrefixedDenom,
-) -> bool {
-    // For example, let
-    // A: sender chain in this transfer, port "transfer" and channel "c2b" (to B)
-    // B: receiver chain in this transfer, port "transfer" and channel "c2a" (to A)
-    //
-    // If B had originally sent the token in a previous transfer, then A would have stored the token as
-    // "transfer/c2b/{token_denom}". Now, A is sending to B, so to check if B is the source of the token,
-    // we need to check if the token starts with "transfer/c2b".
-    let prefix = TracePrefix::new(source_port, source_channel);
-    denom.trace_path.starts_with(&prefix)
-}
-
-impl FromStr for PrefixedDenom {
-    type Err = TokenTransferError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut parts: Vec<&str> = s.split('/').collect();
-        let last_part = parts.pop().expect("split() returned an empty iterator");
-
-        let (base_denom, trace_path) = {
-            if last_part == s {
-                (BaseDenom::from_str(s)?, TracePath::default())
-            } else {
-                let base_denom = BaseDenom::from_str(last_part)?;
-                let trace_path = TracePath::try_from(parts)?;
-                (base_denom, trace_path)
-            }
-        };
-
-        Ok(Self {
-            trace_path,
-            base_denom,
-        })
-    }
-}
-
-impl TryFrom<RawDenomTrace> for PrefixedDenom {
-    type Error = TokenTransferError;
-
-    fn try_from(value: RawDenomTrace) -> Result<Self, Self::Error> {
-        let base_denom = BaseDenom::from_str(&value.base_denom)?;
-        let trace_path = TracePath::from_str(&value.path)?;
-        Ok(Self {
-            trace_path,
-            base_denom,
-        })
-    }
-}
-
-impl From<PrefixedDenom> for RawDenomTrace {
-    fn from(value: PrefixedDenom) -> Self {
-        Self {
-            path: value.trace_path.to_string(),
-            base_denom: value.base_denom.to_string(),
-        }
-    }
-}
-
-impl From<BaseDenom> for PrefixedDenom {
-    fn from(denom: BaseDenom) -> Self {
-        Self {
-            trace_path: Default::default(),
-            base_denom: denom,
-        }
-    }
-}
-
-impl Display for PrefixedDenom {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        if self.trace_path.0.is_empty() {
-            write!(f, "{}", self.base_denom)
-        } else {
-            write!(f, "{}/{}", self.trace_path, self.base_denom)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_denom_validation() -> Result<(), TokenTransferError> {
-        assert!(BaseDenom::from_str("").is_err(), "empty base denom");
-        assert!(BaseDenom::from_str("uatom").is_ok(), "valid base denom");
-        assert!(PrefixedDenom::from_str("").is_err(), "empty denom trace");
-        assert!(
-            PrefixedDenom::from_str("transfer/channel-0/").is_err(),
-            "empty base denom with trace"
-        );
-        assert!(PrefixedDenom::from_str("/uatom").is_err(), "empty prefix");
-        assert!(PrefixedDenom::from_str("//uatom").is_err(), "empty ids");
-        assert!(
-            PrefixedDenom::from_str("transfer/").is_err(),
-            "single trace"
-        );
-        assert!(
-            PrefixedDenom::from_str("transfer/atom").is_err(),
-            "single trace with base denom"
-        );
-        assert!(
-            PrefixedDenom::from_str("transfer/channel-0/uatom").is_ok(),
-            "valid single trace info"
-        );
-        assert!(
-            PrefixedDenom::from_str("transfer/channel-0/transfer/channel-1/uatom").is_ok(),
-            "valid multiple trace info"
-        );
-        assert!(
-            PrefixedDenom::from_str("(transfer)/channel-0/uatom").is_err(),
-            "invalid port"
-        );
-        assert!(
-            PrefixedDenom::from_str("transfer/(channel-0)/uatom").is_err(),
-            "invalid channel"
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_denom_trace() -> Result<(), TokenTransferError> {
-        assert_eq!(
-            PrefixedDenom::from_str("transfer/channel-0/uatom")?,
-            PrefixedDenom {
-                trace_path: "transfer/channel-0".parse()?,
-                base_denom: "uatom".parse()?
-            },
-            "valid single trace info"
-        );
-        assert_eq!(
-            PrefixedDenom::from_str("transfer/channel-0/transfer/channel-1/uatom")?,
-            PrefixedDenom {
-                trace_path: "transfer/channel-0/transfer/channel-1".parse()?,
-                base_denom: "uatom".parse()?
-            },
-            "valid multiple trace info"
-        );
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_denom_serde() -> Result<(), TokenTransferError> {
-        let dt_str = "transfer/channel-0/uatom";
-        let dt = PrefixedDenom::from_str(dt_str)?;
-        assert_eq!(dt.to_string(), dt_str, "valid single trace info");
-
-        let dt_str = "transfer/channel-0/transfer/channel-1/uatom";
-        let dt = PrefixedDenom::from_str(dt_str)?;
-        assert_eq!(dt.to_string(), dt_str, "valid multiple trace info");
-
-        Ok(())
-    }
-
-    #[test]
-    fn test_trace_path() -> Result<(), TokenTransferError> {
-        assert!(TracePath::from_str("").is_ok(), "empty trace path");
-        assert!(
-            TracePath::from_str("transfer/uatom").is_err(),
-            "invalid trace path: bad ChannelId"
-        );
-        assert!(
-            TracePath::from_str("transfer//uatom").is_err(),
-            "malformed trace path: missing ChannelId"
-        );
-        assert!(
-            TracePath::from_str("transfer/channel-0/").is_err(),
-            "malformed trace path: trailing delimiter"
-        );
-
-        let prefix_1 = TracePrefix::new("transfer".parse().unwrap(), "channel-1".parse().unwrap());
-        let prefix_2 = TracePrefix::new("transfer".parse().unwrap(), "channel-0".parse().unwrap());
-        let mut trace_path = TracePath(vec![prefix_1.clone()]);
-
-        trace_path.add_prefix(prefix_2.clone());
-        assert_eq!(
-            TracePath::from_str("transfer/channel-0/transfer/channel-1")?,
-            trace_path
-        );
-        assert_eq!(
-            TracePath(vec![prefix_1.clone(), prefix_2.clone()]),
-            trace_path
-        );
-
-        trace_path.remove_prefix(&prefix_2);
-        assert_eq!(TracePath::from_str("transfer/channel-1")?, trace_path);
-        assert_eq!(TracePath(vec![prefix_1.clone()]), trace_path);
-
-        trace_path.remove_prefix(&prefix_1);
-        assert!(trace_path.is_empty());
-
-        Ok(())
-    }
-}
diff --git a/crates/ibc/src/applications/transfer/mod.rs b/crates/ibc/src/applications/transfer/mod.rs
deleted file mode 100644
index 198a9f82e..000000000
--- a/crates/ibc/src/applications/transfer/mod.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-//! Implementation of the [fungible token transfer module](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md) (ICS-20)
-
-pub mod amount;
-pub mod coin;
-pub mod context;
-pub mod denom;
-pub mod error;
-pub mod events;
-pub mod memo;
-pub mod msgs;
-pub mod packet;
-
-pub use amount::*;
-pub use coin::*;
-pub use denom::*;
-pub use memo::*;
-
-mod relay;
-
-pub use relay::send_transfer::{send_transfer, send_transfer_execute, send_transfer_validate};
-
-/// Module identifier for the ICS20 application.
-pub const MODULE_ID_STR: &str = "transfer";
-
-/// The port identifier that the ICS20 applications
-/// typically bind with.
-pub const PORT_ID_STR: &str = "transfer";
-
-/// ICS20 application current version.
-pub const VERSION: &str = "ics20-1";
-
-/// The successful string used for creating an acknowledgement status,
-/// equivalent to `base64::encode(0x01)`.
-pub const ACK_SUCCESS_B64: &str = "AQ==";
-
-use crate::core::ics04_channel::acknowledgement::StatusValue;
-
-/// Returns a successful acknowledgement status for the token transfer application.
-pub fn ack_success_b64() -> StatusValue {
-    StatusValue::new(ACK_SUCCESS_B64).expect("ack status value is never supposed to be empty")
-}
diff --git a/crates/ibc/src/applications/transfer/packet.rs b/crates/ibc/src/applications/transfer/packet.rs
deleted file mode 100644
index 89f1d5b4e..000000000
--- a/crates/ibc/src/applications/transfer/packet.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-//! Contains the `PacketData` type that defines the structure of token transfers' packet bytes
-
-use alloc::string::ToString;
-use core::convert::TryFrom;
-use core::str::FromStr;
-
-use ibc_proto::ibc::applications::transfer::v2::FungibleTokenPacketData as RawPacketData;
-
-use super::error::TokenTransferError;
-use super::{Amount, Memo, PrefixedCoin, PrefixedDenom};
-use crate::signer::Signer;
-
-/// Defines the structure of token transfers' packet bytes
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(
-    feature = "serde",
-    serde(try_from = "RawPacketData", into = "RawPacketData")
-)]
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
-)]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PacketData {
-    pub token: PrefixedCoin,
-    pub sender: Signer,
-    pub receiver: Signer,
-    pub memo: Memo,
-}
-
-impl TryFrom<RawPacketData> for PacketData {
-    type Error = TokenTransferError;
-
-    fn try_from(raw_pkt_data: RawPacketData) -> Result<Self, Self::Error> {
-        // This denom may be prefixed or unprefixed.
-        let denom = PrefixedDenom::from_str(&raw_pkt_data.denom)?;
-        let amount = Amount::from_str(&raw_pkt_data.amount)?;
-        Ok(Self {
-            token: PrefixedCoin { denom, amount },
-            sender: raw_pkt_data.sender.into(),
-            receiver: raw_pkt_data.receiver.into(),
-            memo: raw_pkt_data.memo.into(),
-        })
-    }
-}
-
-impl From<PacketData> for RawPacketData {
-    fn from(pkt_data: PacketData) -> Self {
-        Self {
-            denom: pkt_data.token.denom.to_string(),
-            amount: pkt_data.token.amount.to_string(),
-            sender: pkt_data.sender.to_string(),
-            receiver: pkt_data.receiver.to_string(),
-            memo: pkt_data.memo.to_string(),
-        }
-    }
-}
diff --git a/crates/ibc/src/clients/ics07_tendermint/client_state.rs b/crates/ibc/src/clients/ics07_tendermint/client_state.rs
deleted file mode 100644
index be1a1e7e0..000000000
--- a/crates/ibc/src/clients/ics07_tendermint/client_state.rs
+++ /dev/null
@@ -1,1157 +0,0 @@
-//! Implements the core [`ClientState`](crate::core::ics02_client::client_state::ClientState) trait
-//! for the Tendermint light client.
-
-mod misbehaviour;
-mod update_client;
-
-use crate::prelude::*;
-
-use core::cmp::max;
-use core::convert::{TryFrom, TryInto};
-use core::time::Duration;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
-use ibc_proto::ibc::lightclients::tendermint::v1::ClientState as RawTmClientState;
-use ibc_proto::protobuf::Protobuf;
-use prost::Message;
-
-use tendermint::chain::id::MAX_LENGTH as MaxChainIdLen;
-use tendermint::trust_threshold::TrustThresholdFraction as TendermintTrustThresholdFraction;
-use tendermint_light_client_verifier::options::Options;
-use tendermint_light_client_verifier::ProdVerifier;
-
-use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-use crate::clients::ics07_tendermint::error::Error;
-use crate::clients::ics07_tendermint::header::Header as TmHeader;
-use crate::clients::ics07_tendermint::misbehaviour::Misbehaviour as TmMisbehaviour;
-use crate::core::ics02_client::client_state::{
-    ClientStateCommon, ClientStateExecution, ClientStateValidation, UpdateKind,
-};
-use crate::core::ics02_client::client_type::ClientType;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics02_client::error::{ClientError, UpgradeClientError};
-use crate::core::ics02_client::ClientExecutionContext;
-use crate::core::ics23_commitment::commitment::{
-    CommitmentPrefix, CommitmentProofBytes, CommitmentRoot,
-};
-use crate::core::ics23_commitment::merkle::{apply_prefix, MerkleProof};
-use crate::core::ics23_commitment::specs::ProofSpecs;
-use crate::core::ics24_host::identifier::{ChainId, ClientId};
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ClientConsensusStatePath, ClientStatePath, UpgradeClientPath};
-use crate::core::timestamp::ZERO_DURATION;
-use crate::Height;
-
-use super::trust_threshold::TrustThreshold;
-use super::{
-    client_type as tm_client_type, ExecutionContext as TmExecutionContext,
-    ValidationContext as TmValidationContext,
-};
-
-pub const TENDERMINT_CLIENT_STATE_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.ClientState";
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct AllowUpdate {
-    pub after_expiry: bool,
-    pub after_misbehaviour: bool,
-}
-
-/// Contains the core implementation of the Tendermint light client
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq)]
-pub struct ClientState {
-    pub chain_id: ChainId,
-    pub trust_level: TrustThreshold,
-    pub trusting_period: Duration,
-    pub unbonding_period: Duration,
-    max_clock_drift: Duration,
-    pub latest_height: Height,
-    pub proof_specs: ProofSpecs,
-    pub upgrade_path: Vec<String>,
-    allow_update: AllowUpdate,
-    frozen_height: Option<Height>,
-    #[cfg_attr(feature = "serde", serde(skip))]
-    verifier: ProdVerifier,
-}
-
-impl ClientState {
-    #[allow(clippy::too_many_arguments)]
-    fn new_without_validation(
-        chain_id: ChainId,
-        trust_level: TrustThreshold,
-        trusting_period: Duration,
-        unbonding_period: Duration,
-        max_clock_drift: Duration,
-        latest_height: Height,
-        proof_specs: ProofSpecs,
-        upgrade_path: Vec<String>,
-        allow_update: AllowUpdate,
-    ) -> Self {
-        Self {
-            chain_id,
-            trust_level,
-            trusting_period,
-            unbonding_period,
-            max_clock_drift,
-            latest_height,
-            proof_specs,
-            upgrade_path,
-            allow_update,
-            frozen_height: None,
-            verifier: ProdVerifier::default(),
-        }
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        chain_id: ChainId,
-        trust_level: TrustThreshold,
-        trusting_period: Duration,
-        unbonding_period: Duration,
-        max_clock_drift: Duration,
-        latest_height: Height,
-        proof_specs: ProofSpecs,
-        upgrade_path: Vec<String>,
-        allow_update: AllowUpdate,
-    ) -> Result<Self, Error> {
-        let client_state = Self::new_without_validation(
-            chain_id,
-            trust_level,
-            trusting_period,
-            unbonding_period,
-            max_clock_drift,
-            latest_height,
-            proof_specs,
-            upgrade_path,
-            allow_update,
-        );
-        client_state.validate()?;
-        Ok(client_state)
-    }
-
-    pub fn with_header(self, header: TmHeader) -> Result<Self, Error> {
-        Ok(Self {
-            latest_height: max(header.height(), self.latest_height),
-            ..self
-        })
-    }
-
-    pub fn with_frozen_height(self, h: Height) -> Self {
-        Self {
-            frozen_height: Some(h),
-            ..self
-        }
-    }
-
-    pub fn validate(&self) -> Result<(), Error> {
-        if self.chain_id.as_str().len() > MaxChainIdLen {
-            return Err(Error::ChainIdTooLong {
-                chain_id: self.chain_id.clone(),
-                len: self.chain_id.as_str().len(),
-                max_len: MaxChainIdLen,
-            });
-        }
-
-        // `TrustThreshold` is guaranteed to be in the range `[0, 1)`, but a `TrustThreshold::ZERO`
-        // value is invalid in this context
-        if self.trust_level == TrustThreshold::ZERO {
-            return Err(Error::InvalidTrustThreshold {
-                reason: "ClientState trust-level cannot be zero".to_string(),
-            });
-        }
-
-        TendermintTrustThresholdFraction::new(
-            self.trust_level.numerator(),
-            self.trust_level.denominator(),
-        )
-        .map_err(Error::InvalidTendermintTrustThreshold)?;
-
-        // Basic validation of trusting period and unbonding period: each should be non-zero.
-        if self.trusting_period <= Duration::new(0, 0) {
-            return Err(Error::InvalidTrustThreshold {
-                reason: format!(
-                    "ClientState trusting period ({:?}) must be greater than zero",
-                    self.trusting_period
-                ),
-            });
-        }
-
-        if self.unbonding_period <= Duration::new(0, 0) {
-            return Err(Error::InvalidTrustThreshold {
-                reason: format!(
-                    "ClientState unbonding period ({:?}) must be greater than zero",
-                    self.unbonding_period
-                ),
-            });
-        }
-
-        if self.trusting_period >= self.unbonding_period {
-            return Err(Error::InvalidTrustThreshold {
-                reason: format!(
-                "ClientState trusting period ({:?}) must be smaller than unbonding period ({:?})", self.trusting_period, self.unbonding_period
-            ),
-            });
-        }
-
-        if self.max_clock_drift <= Duration::new(0, 0) {
-            return Err(Error::InvalidMaxClockDrift {
-                reason: "ClientState max-clock-drift must be greater than zero".to_string(),
-            });
-        }
-
-        if self.latest_height.revision_number() != self.chain_id.version() {
-            return Err(Error::InvalidLatestHeight {
-                reason: "ClientState latest-height revision number must match chain-id version"
-                    .to_string(),
-            });
-        }
-
-        // Disallow empty proof-specs
-        if self.proof_specs.is_empty() {
-            return Err(Error::Validation {
-                reason: "ClientState proof-specs cannot be empty".to_string(),
-            });
-        }
-
-        // `upgrade_path` itself may be empty, but if not then each key must be non-empty
-        for (idx, key) in self.upgrade_path.iter().enumerate() {
-            if key.trim().is_empty() {
-                return Err(Error::Validation {
-                    reason: format!(
-                        "ClientState upgrade-path key at index {idx:?} cannot be empty"
-                    ),
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Get the refresh time to ensure the state does not expire
-    pub fn refresh_time(&self) -> Option<Duration> {
-        Some(2 * self.trusting_period / 3)
-    }
-
-    /// Helper method to produce a [`Options`] struct for use in
-    /// Tendermint-specific light client verification.
-    pub fn as_light_client_options(&self) -> Result<Options, Error> {
-        Ok(Options {
-            trust_threshold: self.trust_level.try_into().map_err(|e: ClientError| {
-                Error::InvalidTrustThreshold {
-                    reason: e.to_string(),
-                }
-            })?,
-            trusting_period: self.trusting_period,
-            clock_drift: self.max_clock_drift,
-        })
-    }
-
-    fn chain_id(&self) -> ChainId {
-        self.chain_id.clone()
-    }
-
-    // Resets custom fields to zero values (used in `update_client`)
-    pub fn zero_custom_fields(&mut self) {
-        self.trusting_period = ZERO_DURATION;
-        self.trust_level = TrustThreshold::ZERO;
-        self.allow_update.after_expiry = false;
-        self.allow_update.after_misbehaviour = false;
-        self.frozen_height = None;
-        self.max_clock_drift = ZERO_DURATION;
-    }
-}
-
-impl ClientStateCommon for ClientState {
-    fn verify_consensus_state(&self, consensus_state: Any) -> Result<(), ClientError> {
-        let tm_consensus_state = TmConsensusState::try_from(consensus_state)?;
-        if tm_consensus_state.root().is_empty() {
-            return Err(ClientError::Other {
-                description: "empty commitment root".into(),
-            });
-        };
-
-        Ok(())
-    }
-
-    fn client_type(&self) -> ClientType {
-        tm_client_type()
-    }
-
-    fn latest_height(&self) -> Height {
-        self.latest_height
-    }
-
-    fn validate_proof_height(&self, proof_height: Height) -> Result<(), ClientError> {
-        if self.latest_height() < proof_height {
-            return Err(ClientError::InvalidProofHeight {
-                latest_height: self.latest_height(),
-                proof_height,
-            });
-        }
-        Ok(())
-    }
-
-    fn confirm_not_frozen(&self) -> Result<(), ClientError> {
-        if let Some(frozen_height) = self.frozen_height {
-            return Err(ClientError::ClientFrozen {
-                description: format!("the client is frozen at height {frozen_height}"),
-            });
-        }
-        Ok(())
-    }
-
-    fn expired(&self, elapsed: Duration) -> bool {
-        elapsed > self.trusting_period
-    }
-
-    /// Perform client-specific verifications and check all data in the new
-    /// client state to be the same across all valid Tendermint clients for the
-    /// new chain.
-    ///
-    /// You can learn more about how to upgrade IBC-connected SDK chains in
-    /// [this](https://ibc.cosmos.network/main/ibc/upgrades/quick-guide.html)
-    /// guide
-    fn verify_upgrade_client(
-        &self,
-        upgraded_client_state: Any,
-        upgraded_consensus_state: Any,
-        proof_upgrade_client: CommitmentProofBytes,
-        proof_upgrade_consensus_state: CommitmentProofBytes,
-        root: &CommitmentRoot,
-    ) -> Result<(), ClientError> {
-        // Make sure that the client type is of Tendermint type `ClientState`
-        let upgraded_tm_client_state = Self::try_from(upgraded_client_state.clone())?;
-
-        // Make sure that the consensus type is of Tendermint type `ConsensusState`
-        TmConsensusState::try_from(upgraded_consensus_state.clone())?;
-
-        // Make sure the latest height of the current client is not greater then
-        // the upgrade height This condition checks both the revision number and
-        // the height
-        if self.latest_height() >= upgraded_tm_client_state.latest_height {
-            return Err(UpgradeClientError::LowUpgradeHeight {
-                upgraded_height: self.latest_height(),
-                client_height: upgraded_tm_client_state.latest_height,
-            })?;
-        }
-
-        // Check to see if the upgrade path is set
-        let mut upgrade_path = self.upgrade_path.clone();
-        if upgrade_path.pop().is_none() {
-            return Err(ClientError::ClientSpecific {
-                description: "cannot upgrade client as no upgrade path has been set".to_string(),
-            });
-        };
-
-        let upgrade_path_prefix = CommitmentPrefix::try_from(upgrade_path[0].clone().into_bytes())
-            .map_err(ClientError::InvalidCommitmentProof)?;
-
-        let last_height = self.latest_height().revision_height();
-
-        let mut client_state_value = Vec::new();
-        upgraded_client_state
-            .encode(&mut client_state_value)
-            .map_err(ClientError::Encode)?;
-
-        // Verify the proof of the upgraded client state
-        self.verify_membership(
-            &upgrade_path_prefix,
-            &proof_upgrade_client,
-            root,
-            Path::UpgradeClient(UpgradeClientPath::UpgradedClientState(last_height)),
-            client_state_value,
-        )?;
-
-        let mut cons_state_value = Vec::new();
-        upgraded_consensus_state
-            .encode(&mut cons_state_value)
-            .map_err(ClientError::Encode)?;
-
-        // Verify the proof of the upgraded consensus state
-        self.verify_membership(
-            &upgrade_path_prefix,
-            &proof_upgrade_consensus_state,
-            root,
-            Path::UpgradeClient(UpgradeClientPath::UpgradedClientConsensusState(last_height)),
-            cons_state_value,
-        )?;
-
-        Ok(())
-    }
-
-    fn verify_membership(
-        &self,
-        prefix: &CommitmentPrefix,
-        proof: &CommitmentProofBytes,
-        root: &CommitmentRoot,
-        path: Path,
-        value: Vec<u8>,
-    ) -> Result<(), ClientError> {
-        let merkle_path = apply_prefix(prefix, vec![path.to_string()]);
-        let merkle_proof: MerkleProof = RawMerkleProof::try_from(proof.clone())
-            .map_err(ClientError::InvalidCommitmentProof)?
-            .into();
-
-        merkle_proof
-            .verify_membership(
-                &self.proof_specs,
-                root.clone().into(),
-                merkle_path,
-                value,
-                0,
-            )
-            .map_err(ClientError::Ics23Verification)
-    }
-
-    fn verify_non_membership(
-        &self,
-        prefix: &CommitmentPrefix,
-        proof: &CommitmentProofBytes,
-        root: &CommitmentRoot,
-        path: Path,
-    ) -> Result<(), ClientError> {
-        let merkle_path = apply_prefix(prefix, vec![path.to_string()]);
-        let merkle_proof: MerkleProof = RawMerkleProof::try_from(proof.clone())
-            .map_err(ClientError::InvalidCommitmentProof)?
-            .into();
-
-        merkle_proof
-            .verify_non_membership(&self.proof_specs, root.clone().into(), merkle_path)
-            .map_err(ClientError::Ics23Verification)
-    }
-}
-
-impl<ClientValidationContext> ClientStateValidation<ClientValidationContext> for ClientState
-where
-    ClientValidationContext: TmValidationContext,
-{
-    fn verify_client_message(
-        &self,
-        ctx: &ClientValidationContext,
-        client_id: &ClientId,
-        client_message: Any,
-        update_kind: &UpdateKind,
-    ) -> Result<(), ClientError> {
-        match update_kind {
-            UpdateKind::UpdateClient => {
-                let header = TmHeader::try_from(client_message)?;
-                self.verify_header(ctx, client_id, header)
-            }
-            UpdateKind::SubmitMisbehaviour => {
-                let misbehaviour = TmMisbehaviour::try_from(client_message)?;
-                self.verify_misbehaviour(ctx, client_id, misbehaviour)
-            }
-        }
-    }
-
-    fn check_for_misbehaviour(
-        &self,
-        ctx: &ClientValidationContext,
-        client_id: &ClientId,
-        client_message: Any,
-        update_kind: &UpdateKind,
-    ) -> Result<bool, ClientError> {
-        match update_kind {
-            UpdateKind::UpdateClient => {
-                let header = TmHeader::try_from(client_message)?;
-                self.check_for_misbehaviour_update_client(ctx, client_id, header)
-            }
-            UpdateKind::SubmitMisbehaviour => {
-                let misbehaviour = TmMisbehaviour::try_from(client_message)?;
-                self.check_for_misbehaviour_misbehavior(&misbehaviour)
-            }
-        }
-    }
-}
-
-impl<E> ClientStateExecution<E> for ClientState
-where
-    E: TmExecutionContext,
-    <E as ClientExecutionContext>::AnyClientState: From<ClientState>,
-    <E as ClientExecutionContext>::AnyConsensusState: From<TmConsensusState>,
-{
-    fn initialise(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        consensus_state: Any,
-    ) -> Result<(), ClientError> {
-        let tm_consensus_state = TmConsensusState::try_from(consensus_state)?;
-
-        ctx.store_client_state(ClientStatePath::new(client_id), self.clone().into())?;
-        ctx.store_consensus_state(
-            ClientConsensusStatePath::new(client_id, &self.latest_height),
-            tm_consensus_state.into(),
-        )?;
-
-        Ok(())
-    }
-
-    fn update_state(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        header: Any,
-    ) -> Result<Vec<Height>, ClientError> {
-        let header = TmHeader::try_from(header)?;
-        let header_height = header.height();
-
-        let maybe_existing_consensus_state = {
-            let path_at_header_height = ClientConsensusStatePath::new(client_id, &header_height);
-
-            ctx.consensus_state(&path_at_header_height).ok()
-        };
-
-        if maybe_existing_consensus_state.is_some() {
-            // if we already had the header installed by a previous relayer
-            // then this is a no-op.
-            //
-            // Do nothing.
-        } else {
-            let new_consensus_state = TmConsensusState::from(header.clone());
-            let new_client_state = self.clone().with_header(header)?;
-
-            ctx.store_consensus_state(
-                ClientConsensusStatePath::new(client_id, &new_client_state.latest_height),
-                new_consensus_state.into(),
-            )?;
-            ctx.store_client_state(ClientStatePath::new(client_id), new_client_state.into())?;
-        }
-
-        let updated_heights = vec![header_height];
-        Ok(updated_heights)
-    }
-
-    fn update_state_on_misbehaviour(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        _client_message: Any,
-        _update_kind: &UpdateKind,
-    ) -> Result<(), ClientError> {
-        let frozen_client_state = self.clone().with_frozen_height(Height::min(0));
-
-        ctx.store_client_state(ClientStatePath::new(client_id), frozen_client_state.into())?;
-
-        Ok(())
-    }
-
-    // Commit the new client state and consensus state to the store
-    fn update_state_on_upgrade(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        upgraded_client_state: Any,
-        upgraded_consensus_state: Any,
-    ) -> Result<Height, ClientError> {
-        let mut upgraded_tm_client_state = Self::try_from(upgraded_client_state)?;
-        let upgraded_tm_cons_state = TmConsensusState::try_from(upgraded_consensus_state)?;
-
-        upgraded_tm_client_state.zero_custom_fields();
-
-        // Construct new client state and consensus state relayer chosen client
-        // parameters are ignored. All chain-chosen parameters come from
-        // committed client, all client-chosen parameters come from current
-        // client.
-        let new_client_state = ClientState::new(
-            upgraded_tm_client_state.chain_id,
-            self.trust_level,
-            self.trusting_period,
-            upgraded_tm_client_state.unbonding_period,
-            self.max_clock_drift,
-            upgraded_tm_client_state.latest_height,
-            upgraded_tm_client_state.proof_specs,
-            upgraded_tm_client_state.upgrade_path,
-            self.allow_update,
-        )?;
-
-        // The new consensus state is merely used as a trusted kernel against
-        // which headers on the new chain can be verified. The root is just a
-        // stand-in sentinel value as it cannot be known in advance, thus no
-        // proof verification will pass. The timestamp and the
-        // NextValidatorsHash of the consensus state is the blocktime and
-        // NextValidatorsHash of the last block committed by the old chain. This
-        // will allow the first block of the new chain to be verified against
-        // the last validators of the old chain so long as it is submitted
-        // within the TrustingPeriod of this client.
-        // NOTE: We do not set processed time for this consensus state since
-        // this consensus state should not be used for packet verification as
-        // the root is empty. The next consensus state submitted using update
-        // will be usable for packet-verification.
-        let sentinel_root = "sentinel_root".as_bytes().to_vec();
-        let new_consensus_state = TmConsensusState::new(
-            sentinel_root.into(),
-            upgraded_tm_cons_state.timestamp,
-            upgraded_tm_cons_state.next_validators_hash,
-        );
-
-        let latest_height = new_client_state.latest_height;
-
-        ctx.store_client_state(ClientStatePath::new(client_id), new_client_state.into())?;
-        ctx.store_consensus_state(
-            ClientConsensusStatePath::new(client_id, &latest_height),
-            new_consensus_state.into(),
-        )?;
-
-        Ok(latest_height)
-    }
-}
-
-impl Protobuf<RawTmClientState> for ClientState {}
-
-impl TryFrom<RawTmClientState> for ClientState {
-    type Error = Error;
-
-    fn try_from(raw: RawTmClientState) -> Result<Self, Self::Error> {
-        let chain_id = ChainId::from_string(raw.chain_id.as_str());
-
-        let trust_level = {
-            let trust_level = raw
-                .trust_level
-                .clone()
-                .ok_or(Error::MissingTrustingPeriod)?;
-            trust_level
-                .try_into()
-                .map_err(|e| Error::InvalidTrustThreshold {
-                    reason: format!("{e}"),
-                })?
-        };
-
-        let trusting_period = raw
-            .trusting_period
-            .ok_or(Error::MissingTrustingPeriod)?
-            .try_into()
-            .map_err(|_| Error::MissingTrustingPeriod)?;
-
-        let unbonding_period = raw
-            .unbonding_period
-            .ok_or(Error::MissingUnbondingPeriod)?
-            .try_into()
-            .map_err(|_| Error::MissingUnbondingPeriod)?;
-
-        let max_clock_drift = raw
-            .max_clock_drift
-            .ok_or(Error::NegativeMaxClockDrift)?
-            .try_into()
-            .map_err(|_| Error::NegativeMaxClockDrift)?;
-
-        let latest_height = raw
-            .latest_height
-            .ok_or(Error::MissingLatestHeight)?
-            .try_into()
-            .map_err(|_| Error::MissingLatestHeight)?;
-
-        // In `RawClientState`, a `frozen_height` of `0` means "not frozen".
-        // See:
-        // https://github.com/cosmos/ibc-go/blob/8422d0c4c35ef970539466c5bdec1cd27369bab3/modules/light-clients/07-tendermint/types/client_state.go#L74
-        if raw
-            .frozen_height
-            .and_then(|h| Height::try_from(h).ok())
-            .is_some()
-        {
-            return Err(Error::FrozenHeightNotAllowed);
-        }
-
-        // We use set this deprecated field just so that we can properly convert
-        // it back in its raw form
-        #[allow(deprecated)]
-        let allow_update = AllowUpdate {
-            after_expiry: raw.allow_update_after_expiry,
-            after_misbehaviour: raw.allow_update_after_misbehaviour,
-        };
-
-        let client_state = Self::new_without_validation(
-            chain_id,
-            trust_level,
-            trusting_period,
-            unbonding_period,
-            max_clock_drift,
-            latest_height,
-            raw.proof_specs.into(),
-            raw.upgrade_path,
-            allow_update,
-        );
-
-        Ok(client_state)
-    }
-}
-
-impl From<ClientState> for RawTmClientState {
-    fn from(value: ClientState) -> Self {
-        #[allow(deprecated)]
-        Self {
-            chain_id: value.chain_id.to_string(),
-            trust_level: Some(value.trust_level.into()),
-            trusting_period: Some(value.trusting_period.into()),
-            unbonding_period: Some(value.unbonding_period.into()),
-            max_clock_drift: Some(value.max_clock_drift.into()),
-            frozen_height: Some(value.frozen_height.map(|height| height.into()).unwrap_or(
-                RawHeight {
-                    revision_number: 0,
-                    revision_height: 0,
-                },
-            )),
-            latest_height: Some(value.latest_height.into()),
-            proof_specs: value.proof_specs.into(),
-            upgrade_path: value.upgrade_path,
-            allow_update_after_expiry: value.allow_update.after_expiry,
-            allow_update_after_misbehaviour: value.allow_update.after_misbehaviour,
-        }
-    }
-}
-
-impl Protobuf<Any> for ClientState {}
-
-impl TryFrom<Any> for ClientState {
-    type Error = ClientError;
-
-    fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        use bytes::Buf;
-        use core::ops::Deref;
-
-        fn decode_client_state<B: Buf>(buf: B) -> Result<ClientState, Error> {
-            RawTmClientState::decode(buf)
-                .map_err(Error::Decode)?
-                .try_into()
-        }
-
-        match raw.type_url.as_str() {
-            TENDERMINT_CLIENT_STATE_TYPE_URL => {
-                decode_client_state(raw.value.deref()).map_err(Into::into)
-            }
-            _ => Err(ClientError::UnknownClientStateType {
-                client_state_type: raw.type_url,
-            }),
-        }
-    }
-}
-
-impl From<ClientState> for Any {
-    fn from(client_state: ClientState) -> Self {
-        Any {
-            type_url: TENDERMINT_CLIENT_STATE_TYPE_URL.to_string(),
-            value: Protobuf::<RawTmClientState>::encode_vec(&client_state),
-        }
-    }
-}
-
-// `header.trusted_validator_set` was given to us by the relayer. Thus, we
-// need to ensure that the relayer gave us the right set, i.e. by ensuring
-// that it matches the hash we have stored on chain.
-fn check_header_trusted_next_validator_set(
-    header: &TmHeader,
-    trusted_consensus_state: &TmConsensusState,
-) -> Result<(), ClientError> {
-    if header.trusted_next_validator_set.hash() == trusted_consensus_state.next_validators_hash {
-        Ok(())
-    } else {
-        Err(ClientError::HeaderVerificationFailure {
-            reason: "header trusted next validator set hash does not match hash stored on chain"
-                .to_string(),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::clients::ics07_tendermint::header::test_util::get_dummy_tendermint_header;
-    use crate::Height;
-    use core::time::Duration;
-    use test_log::test;
-
-    use ibc_proto::google::protobuf::Any;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-    use ibc_proto::ics23::ProofSpec as Ics23ProofSpec;
-
-    use crate::clients::ics07_tendermint::client_state::AllowUpdate;
-    use crate::clients::ics07_tendermint::error::Error;
-    use crate::core::ics23_commitment::specs::ProofSpecs;
-    use crate::core::ics24_host::identifier::ChainId;
-    use crate::core::timestamp::ZERO_DURATION;
-
-    #[derive(Clone, Debug, PartialEq)]
-    struct ClientStateParams {
-        id: ChainId,
-        trust_level: TrustThreshold,
-        trusting_period: Duration,
-        unbonding_period: Duration,
-        max_clock_drift: Duration,
-        latest_height: Height,
-        proof_specs: ProofSpecs,
-        upgrade_path: Vec<String>,
-        allow_update: AllowUpdate,
-    }
-
-    #[test]
-    fn client_state_new() {
-        // Define a "default" set of parameters to reuse throughout these tests.
-        let default_params: ClientStateParams = ClientStateParams {
-            id: ChainId::default(),
-            trust_level: TrustThreshold::ONE_THIRD,
-            trusting_period: Duration::new(64000, 0),
-            unbonding_period: Duration::new(128000, 0),
-            max_clock_drift: Duration::new(3, 0),
-            latest_height: Height::new(0, 10).expect("Never fails"),
-            proof_specs: ProofSpecs::default(),
-            upgrade_path: Default::default(),
-            allow_update: AllowUpdate {
-                after_expiry: false,
-                after_misbehaviour: false,
-            },
-        };
-
-        struct Test {
-            name: String,
-            params: ClientStateParams,
-            want_pass: bool,
-        }
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Valid parameters".to_string(),
-                params: default_params.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Valid (empty) upgrade-path".to_string(),
-                params: ClientStateParams {
-                    upgrade_path: vec![],
-                    ..default_params.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Valid upgrade-path".to_string(),
-                params: ClientStateParams {
-                    upgrade_path: vec!["upgrade".to_owned(), "upgradedIBCState".to_owned()],
-                    ..default_params.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Valid long (50 chars) chain-id".to_string(),
-                params: ClientStateParams {
-                    id: ChainId::new(&"a".repeat(48), 0),
-                    ..default_params.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Invalid too-long (51 chars) chain-id".to_string(),
-                params: ClientStateParams {
-                    id: ChainId::new(&"a".repeat(49), 0),
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (zero) max-clock-drift period".to_string(),
-                params: ClientStateParams {
-                    max_clock_drift: ZERO_DURATION,
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid unbonding period".to_string(),
-                params: ClientStateParams {
-                    unbonding_period: ZERO_DURATION,
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (too small) trusting period".to_string(),
-                params: ClientStateParams {
-                    trusting_period: ZERO_DURATION,
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (too large) trusting period w.r.t. unbonding period".to_string(),
-                params: ClientStateParams {
-                    trusting_period: Duration::new(11, 0),
-                    unbonding_period: Duration::new(10, 0),
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (equal) trusting period w.r.t. unbonding period".to_string(),
-                params: ClientStateParams {
-                    trusting_period: Duration::new(10, 0),
-                    unbonding_period: Duration::new(10, 0),
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (zero) trusting trust threshold".to_string(),
-                params: ClientStateParams {
-                    trust_level: TrustThreshold::ZERO,
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (too small) trusting trust threshold".to_string(),
-                params: ClientStateParams {
-                    trust_level: TrustThreshold::new(1, 4).expect("Never fails"),
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid latest height revision number (doesn't match chain)".to_string(),
-                params: ClientStateParams {
-                    latest_height: Height::new(1, 1).expect("Never fails"),
-                    ..default_params.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Invalid (empty) proof specs".to_string(),
-                params: ClientStateParams {
-                    proof_specs: ProofSpecs::from(Vec::<Ics23ProofSpec>::new()),
-                    ..default_params
-                },
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let p = test.params.clone();
-
-            let cs_result = ClientState::new(
-                p.id,
-                p.trust_level,
-                p.trusting_period,
-                p.unbonding_period,
-                p.max_clock_drift,
-                p.latest_height,
-                p.proof_specs,
-                p.upgrade_path,
-                p.allow_update,
-            );
-
-            assert_eq!(
-                test.want_pass,
-                cs_result.is_ok(),
-                "ClientState::new() failed for test {}, \nmsg{:?} with error {:?}",
-                test.name,
-                test.params.clone(),
-                cs_result.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn client_state_verify_height() {
-        // Define a "default" set of parameters to reuse throughout these tests.
-        let default_params: ClientStateParams = ClientStateParams {
-            id: ChainId::new("ibc", 1),
-            trust_level: TrustThreshold::ONE_THIRD,
-            trusting_period: Duration::new(64000, 0),
-            unbonding_period: Duration::new(128000, 0),
-            max_clock_drift: Duration::new(3, 0),
-            latest_height: Height::new(1, 10).expect("Never fails"),
-            proof_specs: ProofSpecs::default(),
-            upgrade_path: Default::default(),
-            allow_update: AllowUpdate {
-                after_expiry: false,
-                after_misbehaviour: false,
-            },
-        };
-
-        struct Test {
-            name: String,
-            height: Height,
-            setup: Option<Box<dyn FnOnce(ClientState) -> ClientState>>,
-            want_pass: bool,
-        }
-
-        let tests = vec![
-            Test {
-                name: "Successful height verification".to_string(),
-                height: Height::new(1, 8).expect("Never fails"),
-                setup: None,
-                want_pass: true,
-            },
-            Test {
-                name: "Invalid (too large)  client height".to_string(),
-                height: Height::new(1, 12).expect("Never fails"),
-                setup: None,
-                want_pass: false,
-            },
-        ];
-
-        for test in tests {
-            let p = default_params.clone();
-            let client_state = ClientState::new(
-                p.id,
-                p.trust_level,
-                p.trusting_period,
-                p.unbonding_period,
-                p.max_clock_drift,
-                p.latest_height,
-                p.proof_specs,
-                p.upgrade_path,
-                p.allow_update,
-            )
-            .expect("Never fails");
-            let client_state = match test.setup {
-                Some(setup) => (setup)(client_state),
-                _ => client_state,
-            };
-            let res = client_state.validate_proof_height(test.height);
-
-            assert_eq!(
-                test.want_pass,
-                res.is_ok(),
-                "ClientState::validate_proof_height() failed for test {}, \nmsg{:?} with error {:?}",
-                test.name,
-                test.height,
-                res.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn tm_client_state_conversions_healthy() {
-        // check client state creation path from a proto type
-        let tm_client_state_from_raw = ClientState::new_dummy_from_raw(RawHeight {
-            revision_number: 0,
-            revision_height: 0,
-        });
-        assert!(tm_client_state_from_raw.is_ok());
-
-        let any_from_tm_client_state = Any::from(
-            tm_client_state_from_raw
-                .as_ref()
-                .expect("Never fails")
-                .clone(),
-        );
-        let tm_client_state_from_any = ClientState::try_from(any_from_tm_client_state);
-        assert!(tm_client_state_from_any.is_ok());
-        assert_eq!(
-            tm_client_state_from_raw.expect("Never fails"),
-            tm_client_state_from_any.expect("Never fails")
-        );
-
-        // check client state creation path from a tendermint header
-        let tm_header = get_dummy_tendermint_header();
-        let tm_client_state_from_header = ClientState::new_dummy_from_header(tm_header);
-        let any_from_header = Any::from(tm_client_state_from_header.clone());
-        let tm_client_state_from_any = ClientState::try_from(any_from_header);
-        assert!(tm_client_state_from_any.is_ok());
-        assert_eq!(
-            tm_client_state_from_header,
-            tm_client_state_from_any.expect("Never fails")
-        );
-    }
-
-    #[test]
-    fn tm_client_state_malformed_with_frozen_height() {
-        let tm_client_state_from_raw = ClientState::new_dummy_from_raw(RawHeight {
-            revision_number: 0,
-            revision_height: 10,
-        });
-        match tm_client_state_from_raw {
-            Err(Error::FrozenHeightNotAllowed) => {}
-            _ => panic!("Expected to fail with FrozenHeightNotAllowed error"),
-        }
-    }
-}
-
-#[cfg(all(test, feature = "serde"))]
-mod serde_tests {
-    use tendermint_rpc::endpoint::abci_query::AbciQuery;
-
-    use crate::test::test_serialization_roundtrip;
-
-    #[test]
-    fn serialization_roundtrip_no_proof() {
-        let json_data =
-            include_str!("../../../tests/support/query/serialization/client_state.json");
-        test_serialization_roundtrip::<AbciQuery>(json_data);
-    }
-
-    #[test]
-    fn serialization_roundtrip_with_proof() {
-        let json_data =
-            include_str!("../../../tests/support/query/serialization/client_state_proof.json");
-        test_serialization_roundtrip::<AbciQuery>(json_data);
-    }
-}
-
-#[cfg(any(test, feature = "mocks"))]
-pub mod test_util {
-    use crate::prelude::*;
-    use core::time::Duration;
-
-    use tendermint::block::Header;
-
-    use crate::clients::ics07_tendermint::client_state::{AllowUpdate, ClientState};
-    use crate::clients::ics07_tendermint::error::Error;
-    use crate::core::ics02_client::height::Height;
-    use crate::core::ics23_commitment::specs::ProofSpecs;
-    use crate::core::ics24_host::identifier::ChainId;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-    use ibc_proto::ibc::lightclients::tendermint::v1::{ClientState as RawTmClientState, Fraction};
-
-    impl ClientState {
-        pub fn new_dummy_from_raw(frozen_height: RawHeight) -> Result<Self, Error> {
-            Self::try_from(get_dummy_raw_tm_client_state(frozen_height))
-        }
-
-        pub fn new_dummy_from_header(tm_header: Header) -> Self {
-            Self::new(
-                tm_header.chain_id.to_string().into(),
-                Default::default(),
-                Duration::from_secs(64000),
-                Duration::from_secs(128000),
-                Duration::from_millis(3000),
-                Height::new(
-                    ChainId::chain_version(tm_header.chain_id.as_str()),
-                    u64::from(tm_header.height),
-                )
-                .expect("Never fails"),
-                Default::default(),
-                Default::default(),
-                AllowUpdate {
-                    after_expiry: false,
-                    after_misbehaviour: false,
-                },
-            )
-            .expect("Never fails")
-        }
-    }
-
-    pub fn get_dummy_raw_tm_client_state(frozen_height: RawHeight) -> RawTmClientState {
-        #[allow(deprecated)]
-        RawTmClientState {
-            chain_id: ChainId::new("ibc", 0).to_string(),
-            trust_level: Some(Fraction {
-                numerator: 1,
-                denominator: 3,
-            }),
-            trusting_period: Some(Duration::from_secs(64000).into()),
-            unbonding_period: Some(Duration::from_secs(128000).into()),
-            max_clock_drift: Some(Duration::from_millis(3000).into()),
-            latest_height: Some(Height::new(0, 10).expect("Never fails").into()),
-            proof_specs: ProofSpecs::default().into(),
-            upgrade_path: Default::default(),
-            frozen_height: Some(frozen_height),
-            allow_update_after_expiry: false,
-            allow_update_after_misbehaviour: false,
-        }
-    }
-}
diff --git a/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs b/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs
deleted file mode 100644
index 5dc2aa02e..000000000
--- a/crates/ibc/src/clients/ics07_tendermint/client_state/misbehaviour.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use tendermint_light_client_verifier::Verifier;
-
-use crate::prelude::*;
-
-use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-use crate::clients::ics07_tendermint::error::{Error, IntoResult};
-use crate::clients::ics07_tendermint::header::Header as TmHeader;
-use crate::clients::ics07_tendermint::misbehaviour::Misbehaviour as TmMisbehaviour;
-use crate::clients::ics07_tendermint::ValidationContext as TmValidationContext;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::path::ClientConsensusStatePath;
-use crate::core::timestamp::Timestamp;
-
-use super::{check_header_trusted_next_validator_set, ClientState};
-
-impl ClientState {
-    // verify_misbehaviour determines whether or not two conflicting headers at
-    // the same height would have convinced the light client.
-    pub fn verify_misbehaviour<ClientValidationContext>(
-        &self,
-        ctx: &ClientValidationContext,
-        client_id: &ClientId,
-        misbehaviour: TmMisbehaviour,
-    ) -> Result<(), ClientError>
-    where
-        ClientValidationContext: TmValidationContext,
-    {
-        misbehaviour.validate_basic()?;
-
-        let header_1 = misbehaviour.header1();
-        let trusted_consensus_state_1 = {
-            let consensus_state_path =
-                ClientConsensusStatePath::new(client_id, &header_1.trusted_height);
-            let consensus_state = ctx.consensus_state(&consensus_state_path)?;
-
-            consensus_state
-                .try_into()
-                .map_err(|err| ClientError::Other {
-                    description: err.to_string(),
-                })?
-        };
-
-        let header_2 = misbehaviour.header2();
-        let trusted_consensus_state_2 = {
-            let consensus_state_path =
-                ClientConsensusStatePath::new(client_id, &header_2.trusted_height);
-            let consensus_state = ctx.consensus_state(&consensus_state_path)?;
-
-            consensus_state
-                .try_into()
-                .map_err(|err| ClientError::Other {
-                    description: err.to_string(),
-                })?
-        };
-
-        let current_timestamp = ctx.host_timestamp()?;
-        self.verify_misbehaviour_header(header_1, &trusted_consensus_state_1, current_timestamp)?;
-        self.verify_misbehaviour_header(header_2, &trusted_consensus_state_2, current_timestamp)
-    }
-
-    pub fn verify_misbehaviour_header(
-        &self,
-        header: &TmHeader,
-        trusted_consensus_state: &TmConsensusState,
-        current_timestamp: Timestamp,
-    ) -> Result<(), ClientError> {
-        // ensure correctness of the trusted next validator set provided by the relayer
-        check_header_trusted_next_validator_set(header, trusted_consensus_state)?;
-
-        // ensure trusted consensus state is within trusting period
-        {
-            let duration_since_consensus_state = current_timestamp
-                .duration_since(&trusted_consensus_state.timestamp())
-                .ok_or_else(|| ClientError::InvalidConsensusStateTimestamp {
-                    time1: trusted_consensus_state.timestamp(),
-                    time2: current_timestamp,
-                })?;
-
-            if duration_since_consensus_state >= self.trusting_period {
-                return Err(Error::ConsensusStateTimestampGteTrustingPeriod {
-                    duration_since_consensus_state,
-                    trusting_period: self.trusting_period,
-                }
-                .into());
-            }
-        }
-
-        // main header verification, delegated to the tendermint-light-client crate.
-        let untrusted_state = header.as_untrusted_block_state();
-
-        let chain_id = self
-            .chain_id
-            .to_string()
-            .try_into()
-            .map_err(|e| ClientError::Other {
-                description: format!("failed to parse chain id: {}", e),
-            })?;
-        let trusted_state = header.as_trusted_block_state(trusted_consensus_state, &chain_id)?;
-
-        let options = self.as_light_client_options()?;
-        let current_timestamp = current_timestamp.into_tm_time().ok_or(ClientError::Other {
-            description: "host timestamp must not be zero".to_string(),
-        })?;
-
-        self.verifier
-            .verify_misbehaviour_header(untrusted_state, trusted_state, &options, current_timestamp)
-            .into_result()?;
-
-        Ok(())
-    }
-
-    pub fn check_for_misbehaviour_misbehavior(
-        &self,
-        misbehaviour: &TmMisbehaviour,
-    ) -> Result<bool, ClientError> {
-        let header_1 = misbehaviour.header1();
-        let header_2 = misbehaviour.header2();
-
-        if header_1.height() == header_2.height() {
-            // when the height of the 2 headers are equal, we only have evidence
-            // of misbehaviour in the case where the headers are different
-            // (otherwise, the same header was added twice in the message,
-            // and this is evidence of nothing)
-            Ok(header_1.signed_header.commit.block_id.hash
-                != header_2.signed_header.commit.block_id.hash)
-        } else {
-            // header_1 is at greater height than header_2, therefore
-            // header_1 time must be less than or equal to
-            // header_2 time in order to be valid misbehaviour (violation of
-            // monotonic time).
-            Ok(header_1.signed_header.header.time <= header_2.signed_header.header.time)
-        }
-    }
-}
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
deleted file mode 100644
index 86050de97..000000000
--- a/crates/ibc/src/clients/ics07_tendermint/client_state/update_client.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use crate::prelude::*;
-
-use tendermint_light_client_verifier::types::{TrustedBlockState, UntrustedBlockState};
-use tendermint_light_client_verifier::Verifier;
-
-use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-use crate::clients::ics07_tendermint::error::{Error, IntoResult};
-use crate::clients::ics07_tendermint::header::Header as TmHeader;
-use crate::clients::ics07_tendermint::ValidationContext as TmValidationContext;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::path::ClientConsensusStatePath;
-
-use super::{check_header_trusted_next_validator_set, ClientState};
-
-impl ClientState {
-    pub fn verify_header<ClientValidationContext>(
-        &self,
-        ctx: &ClientValidationContext,
-        client_id: &ClientId,
-        header: TmHeader,
-    ) -> Result<(), ClientError>
-    where
-        ClientValidationContext: TmValidationContext,
-    {
-        // Checks that the header fields are valid.
-        header.validate_basic()?;
-
-        // The tendermint-light-client crate though works on heights that are assumed
-        // to have the same revision number. We ensure this here.
-        header.verify_chain_id_version_matches_height(&self.chain_id())?;
-
-        // Delegate to tendermint-light-client, which contains the required checks
-        // of the new header against the trusted consensus state.
-        {
-            let trusted_state =
-                {
-                    let trusted_client_cons_state_path =
-                        ClientConsensusStatePath::new(client_id, &header.trusted_height);
-                    let trusted_consensus_state: TmConsensusState = ctx
-                        .consensus_state(&trusted_client_cons_state_path)?
-                        .try_into()
-                        .map_err(|err| ClientError::Other {
-                            description: err.to_string(),
-                        })?;
-
-                    check_header_trusted_next_validator_set(&header, &trusted_consensus_state)?;
-
-                    TrustedBlockState {
-                        chain_id: &self.chain_id.to_string().try_into().map_err(|e| {
-                            ClientError::Other {
-                                description: format!("failed to parse chain id: {}", e),
-                            }
-                        })?,
-                        header_time: trusted_consensus_state.timestamp,
-                        height: header.trusted_height.revision_height().try_into().map_err(
-                            |_| ClientError::ClientSpecific {
-                                description: Error::InvalidHeaderHeight {
-                                    height: header.trusted_height.revision_height(),
-                                }
-                                .to_string(),
-                            },
-                        )?,
-                        next_validators: &header.trusted_next_validator_set,
-                        next_validators_hash: trusted_consensus_state.next_validators_hash,
-                    }
-                };
-
-            let untrusted_state = UntrustedBlockState {
-                signed_header: &header.signed_header,
-                validators: &header.validator_set,
-                // NB: This will skip the
-                // VerificationPredicates::next_validators_match check for the
-                // untrusted state.
-                next_validators: None,
-            };
-
-            let options = self.as_light_client_options()?;
-            let now = ctx.host_timestamp()?.into_tm_time().ok_or_else(|| {
-                ClientError::ClientSpecific {
-                    description: "host timestamp is not a valid TM timestamp".to_string(),
-                }
-            })?;
-
-            // main header verification, delegated to the tendermint-light-client crate.
-            self.verifier
-                .verify_update_header(untrusted_state, trusted_state, &options, now)
-                .into_result()?;
-        }
-
-        Ok(())
-    }
-
-    pub fn check_for_misbehaviour_update_client<ClientValidationContext>(
-        &self,
-        ctx: &ClientValidationContext,
-        client_id: &ClientId,
-        header: TmHeader,
-    ) -> Result<bool, ClientError>
-    where
-        ClientValidationContext: TmValidationContext,
-    {
-        let header_consensus_state = TmConsensusState::from(header.clone());
-
-        let maybe_existing_consensus_state = {
-            let path_at_header_height = ClientConsensusStatePath::new(client_id, &header.height());
-
-            ctx.consensus_state(&path_at_header_height).ok()
-        };
-
-        match maybe_existing_consensus_state {
-            Some(existing_consensus_state) => {
-                let existing_consensus_state: TmConsensusState = existing_consensus_state
-                    .try_into()
-                    .map_err(|err| ClientError::Other {
-                        description: err.to_string(),
-                    })?;
-
-                // There is evidence of misbehaviour if the stored consensus state
-                // is different from the new one we received.
-                Ok(existing_consensus_state != header_consensus_state)
-            }
-            None => {
-                // If no header was previously installed, we ensure the monotonicity of timestamps.
-
-                // 1. for all headers, the new header needs to have a larger timestamp than
-                //    the “previous header”
-                {
-                    let maybe_prev_cs = ctx.prev_consensus_state(client_id, &header.height())?;
-
-                    if let Some(prev_cs) = maybe_prev_cs {
-                        // New header timestamp cannot occur *before* the
-                        // previous consensus state's height
-                        let prev_cs: TmConsensusState =
-                            prev_cs.try_into().map_err(|err| ClientError::Other {
-                                description: err.to_string(),
-                            })?;
-
-                        if header.signed_header.header().time <= prev_cs.timestamp {
-                            return Ok(true);
-                        }
-                    }
-                }
-
-                // 2. if a header comes in and is not the “last” header, then we also ensure
-                //    that its timestamp is less than the “next header”
-                if header.height() < self.latest_height {
-                    let maybe_next_cs = ctx.next_consensus_state(client_id, &header.height())?;
-
-                    if let Some(next_cs) = maybe_next_cs {
-                        // New (untrusted) header timestamp cannot occur *after* next
-                        // consensus state's height
-                        let next_cs: TmConsensusState =
-                            next_cs.try_into().map_err(|err| ClientError::Other {
-                                description: err.to_string(),
-                            })?;
-
-                        if header.signed_header.header().time >= next_cs.timestamp {
-                            return Ok(true);
-                        }
-                    }
-                }
-
-                Ok(false)
-            }
-        }
-    }
-}
diff --git a/crates/ibc/src/clients/ics07_tendermint/context.rs b/crates/ibc/src/clients/ics07_tendermint/context.rs
deleted file mode 100644
index 3c3674389..000000000
--- a/crates/ibc/src/clients/ics07_tendermint/context.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use alloc::string::ToString;
-
-use crate::{
-    core::{
-        ics02_client::ClientExecutionContext,
-        ics24_host::{identifier::ClientId, path::ClientConsensusStatePath},
-        timestamp::Timestamp,
-        ContextError,
-    },
-    Height,
-};
-
-use super::consensus_state::ConsensusState as TmConsensusState;
-
-/// Client's context required during both validation and execution
-pub trait CommonContext {
-    type ConversionError: ToString;
-    type AnyConsensusState: TryInto<TmConsensusState, Error = Self::ConversionError>;
-
-    /// Retrieve the consensus state for the given client ID at the specified
-    /// height.
-    ///
-    /// Returns an error if no such state exists.
-    fn consensus_state(
-        &self,
-        client_cons_state_path: &ClientConsensusStatePath,
-    ) -> Result<Self::AnyConsensusState, ContextError>;
-}
-
-/// Client's context required during validation
-pub trait ValidationContext: CommonContext {
-    /// Returns the current timestamp of the local chain.
-    fn host_timestamp(&self) -> Result<Timestamp, ContextError>;
-
-    /// Search for the lowest consensus state higher than `height`.
-    fn next_consensus_state(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Option<Self::AnyConsensusState>, ContextError>;
-
-    /// Search for the highest consensus state lower than `height`.
-    fn prev_consensus_state(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Option<Self::AnyConsensusState>, ContextError>;
-}
-
-/// Client's context required during execution.
-///
-/// This trait is automatically implemented for all types that implement
-/// [`CommonContext`] and [`ClientExecutionContext`]
-pub trait ExecutionContext: CommonContext + ClientExecutionContext {}
-
-impl<T> ExecutionContext for T where T: CommonContext + ClientExecutionContext {}
diff --git a/crates/ibc/src/clients/ics07_tendermint/mod.rs b/crates/ibc/src/clients/ics07_tendermint/mod.rs
deleted file mode 100644
index 2bb58ec4b..000000000
--- a/crates/ibc/src/clients/ics07_tendermint/mod.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-//! ICS 07: Tendermint Client implements a client verification algorithm for blockchains which use
-//! the Tendermint consensus algorithm.
-
-use crate::core::ics02_client::client_type::ClientType;
-use core::str::FromStr;
-
-pub mod client_state;
-pub mod consensus_state;
-pub mod error;
-pub mod header;
-pub mod misbehaviour;
-pub mod trust_threshold;
-
-mod context;
-pub use context::*;
-
-pub(crate) const TENDERMINT_CLIENT_TYPE: &str = "07-tendermint";
-
-/// Returns the tendermint `ClientType`
-pub fn client_type() -> ClientType {
-    ClientType::from_str(TENDERMINT_CLIENT_TYPE).expect("Never fails because it's valid")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Ensures that the validation in `ClientType::from_str` doesn't fail for the tendermint client type
-    #[test]
-    pub fn test_tm_client_type() {
-        let _ = ClientType::from_str(TENDERMINT_CLIENT_TYPE).unwrap();
-    }
-}
diff --git a/crates/ibc/src/clients/mod.rs b/crates/ibc/src/clients/mod.rs
deleted file mode 100644
index 24f804757..000000000
--- a/crates/ibc/src/clients/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//! Light client implementations to be used in [core](crate::core).
-
-use core::any::Any;
-
-pub mod ics07_tendermint;
-
-/// Allows type to be converted to `&dyn Any`
-pub trait AsAny: Any {
-    fn as_any(&self) -> &dyn Any;
-}
-
-impl<M: Any> AsAny for M {
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-}
diff --git a/crates/ibc/src/core/handler.rs b/crates/ibc/src/core/handler.rs
deleted file mode 100644
index 8d359650b..000000000
--- a/crates/ibc/src/core/handler.rs
+++ /dev/null
@@ -1,821 +0,0 @@
-use super::context::RouterError;
-use super::ics02_client::handler::{create_client, update_client, upgrade_client};
-use super::ics02_client::msgs::{ClientMsg, MsgUpdateOrMisbehaviour};
-use super::ics03_connection::handler::{
-    conn_open_ack, conn_open_confirm, conn_open_init, conn_open_try,
-};
-use super::ics03_connection::msgs::ConnectionMsg;
-use super::ics04_channel::handler::acknowledgement::{
-    acknowledgement_packet_execute, acknowledgement_packet_validate,
-};
-use super::ics04_channel::handler::chan_close_confirm::{
-    chan_close_confirm_execute, chan_close_confirm_validate,
-};
-use super::ics04_channel::handler::chan_close_init::{
-    chan_close_init_execute, chan_close_init_validate,
-};
-use super::ics04_channel::handler::chan_open_ack::{chan_open_ack_execute, chan_open_ack_validate};
-use super::ics04_channel::handler::chan_open_confirm::{
-    chan_open_confirm_execute, chan_open_confirm_validate,
-};
-use super::ics04_channel::handler::chan_open_init::{
-    chan_open_init_execute, chan_open_init_validate,
-};
-use super::ics04_channel::handler::chan_open_try::{chan_open_try_execute, chan_open_try_validate};
-use super::ics04_channel::handler::recv_packet::{recv_packet_execute, recv_packet_validate};
-use super::ics04_channel::handler::timeout::{
-    timeout_packet_execute, timeout_packet_validate, TimeoutMsgType,
-};
-use super::ics04_channel::msgs::{ChannelMsg, PacketMsg};
-use super::msgs::MsgEnvelope;
-use super::{ContextError, ExecutionContext, ValidationContext};
-
-/// Entrypoint which performs both validation and message execution
-pub fn dispatch(ctx: &mut impl ExecutionContext, msg: MsgEnvelope) -> Result<(), RouterError> {
-    validate(ctx, msg.clone())?;
-    execute(ctx, msg)
-}
-
-/// Entrypoint which only performs message validation
-///
-/// If a transaction contains `n` messages `m_1` ... `m_n`, then
-/// they MUST be processed as follows:
-///     validate(m_1), execute(m_1), ..., validate(m_n), execute(m_n)
-/// That is, the state transition of message `i` must be applied before
-/// message `i+1` is validated. This is equivalent to calling
-/// `dispatch()` on each successively.
-pub fn validate<Ctx>(ctx: &Ctx, msg: MsgEnvelope) -> Result<(), RouterError>
-where
-    Ctx: ValidationContext,
-{
-    match msg {
-        MsgEnvelope::Client(msg) => match msg {
-            ClientMsg::CreateClient(msg) => create_client::validate(ctx, msg),
-            ClientMsg::UpdateClient(msg) => {
-                update_client::validate(ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg))
-            }
-            ClientMsg::Misbehaviour(msg) => {
-                update_client::validate(ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg))
-            }
-            ClientMsg::UpgradeClient(msg) => upgrade_client::validate(ctx, msg),
-        }
-        .map_err(RouterError::ContextError),
-        MsgEnvelope::Connection(msg) => match msg {
-            ConnectionMsg::OpenInit(msg) => conn_open_init::validate(ctx, msg),
-            ConnectionMsg::OpenTry(msg) => conn_open_try::validate(ctx, msg),
-            ConnectionMsg::OpenAck(msg) => conn_open_ack::validate(ctx, msg),
-            ConnectionMsg::OpenConfirm(ref msg) => conn_open_confirm::validate(ctx, msg),
-        }
-        .map_err(RouterError::ContextError),
-        MsgEnvelope::Channel(msg) => {
-            let module_id = ctx
-                .lookup_module_channel(&msg)
-                .map_err(ContextError::from)?;
-
-            match msg {
-                ChannelMsg::OpenInit(msg) => chan_open_init_validate(ctx, module_id, msg),
-                ChannelMsg::OpenTry(msg) => chan_open_try_validate(ctx, module_id, msg),
-                ChannelMsg::OpenAck(msg) => chan_open_ack_validate(ctx, module_id, msg),
-                ChannelMsg::OpenConfirm(msg) => chan_open_confirm_validate(ctx, module_id, msg),
-                ChannelMsg::CloseInit(msg) => chan_close_init_validate(ctx, module_id, msg),
-                ChannelMsg::CloseConfirm(msg) => chan_close_confirm_validate(ctx, module_id, msg),
-            }
-            .map_err(RouterError::ContextError)
-        }
-        MsgEnvelope::Packet(msg) => {
-            let module_id = ctx.lookup_module_packet(&msg).map_err(ContextError::from)?;
-
-            match msg {
-                PacketMsg::Recv(msg) => recv_packet_validate(ctx, msg),
-                PacketMsg::Ack(msg) => acknowledgement_packet_validate(ctx, module_id, msg),
-                PacketMsg::Timeout(msg) => {
-                    timeout_packet_validate(ctx, module_id, TimeoutMsgType::Timeout(msg))
-                }
-                PacketMsg::TimeoutOnClose(msg) => {
-                    timeout_packet_validate(ctx, module_id, TimeoutMsgType::TimeoutOnClose(msg))
-                }
-            }
-            .map_err(RouterError::ContextError)
-        }
-    }
-}
-
-/// Entrypoint which only performs message execution
-pub fn execute<Ctx>(ctx: &mut Ctx, msg: MsgEnvelope) -> Result<(), RouterError>
-where
-    Ctx: ExecutionContext,
-{
-    match msg {
-        MsgEnvelope::Client(msg) => match msg {
-            ClientMsg::CreateClient(msg) => create_client::execute(ctx, msg),
-            ClientMsg::UpdateClient(msg) => {
-                update_client::execute(ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg))
-            }
-            ClientMsg::Misbehaviour(msg) => {
-                update_client::execute(ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg))
-            }
-            ClientMsg::UpgradeClient(msg) => upgrade_client::execute(ctx, msg),
-        }
-        .map_err(RouterError::ContextError),
-        MsgEnvelope::Connection(msg) => match msg {
-            ConnectionMsg::OpenInit(msg) => conn_open_init::execute(ctx, msg),
-            ConnectionMsg::OpenTry(msg) => conn_open_try::execute(ctx, msg),
-            ConnectionMsg::OpenAck(msg) => conn_open_ack::execute(ctx, msg),
-            ConnectionMsg::OpenConfirm(ref msg) => conn_open_confirm::execute(ctx, msg),
-        }
-        .map_err(RouterError::ContextError),
-        MsgEnvelope::Channel(msg) => {
-            let module_id = ctx
-                .lookup_module_channel(&msg)
-                .map_err(ContextError::from)?;
-
-            match msg {
-                ChannelMsg::OpenInit(msg) => chan_open_init_execute(ctx, module_id, msg),
-                ChannelMsg::OpenTry(msg) => chan_open_try_execute(ctx, module_id, msg),
-                ChannelMsg::OpenAck(msg) => chan_open_ack_execute(ctx, module_id, msg),
-                ChannelMsg::OpenConfirm(msg) => chan_open_confirm_execute(ctx, module_id, msg),
-                ChannelMsg::CloseInit(msg) => chan_close_init_execute(ctx, module_id, msg),
-                ChannelMsg::CloseConfirm(msg) => chan_close_confirm_execute(ctx, module_id, msg),
-            }
-            .map_err(RouterError::ContextError)
-        }
-        MsgEnvelope::Packet(msg) => {
-            let module_id = ctx.lookup_module_packet(&msg).map_err(ContextError::from)?;
-
-            match msg {
-                PacketMsg::Recv(msg) => recv_packet_execute(ctx, module_id, msg),
-                PacketMsg::Ack(msg) => acknowledgement_packet_execute(ctx, module_id, msg),
-                PacketMsg::Timeout(msg) => {
-                    timeout_packet_execute(ctx, module_id, TimeoutMsgType::Timeout(msg))
-                }
-                PacketMsg::TimeoutOnClose(msg) => {
-                    timeout_packet_execute(ctx, module_id, TimeoutMsgType::TimeoutOnClose(msg))
-                }
-            }
-            .map_err(RouterError::ContextError)
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use core::default::Default;
-    use core::time::Duration;
-
-    use test_log::test;
-
-    use crate::applications::transfer::error::TokenTransferError;
-    use crate::applications::transfer::msgs::transfer::test_util::get_dummy_transfer_packet;
-    use crate::applications::transfer::send_transfer;
-    use crate::applications::transfer::{
-        msgs::transfer::test_util::get_dummy_msg_transfer, msgs::transfer::MsgTransfer,
-        packet::PacketData, PrefixedCoin, MODULE_ID_STR,
-    };
-    use crate::core::dispatch;
-    use crate::core::events::{IbcEvent, MessageEvent};
-    use crate::core::ics02_client::msgs::{
-        create_client::MsgCreateClient, update_client::MsgUpdateClient,
-        upgrade_client::MsgUpgradeClient, ClientMsg,
-    };
-    use crate::core::ics03_connection::connection::{
-        ConnectionEnd, Counterparty as ConnCounterparty, State as ConnState,
-    };
-    use crate::core::ics03_connection::msgs::{
-        conn_open_ack::MsgConnectionOpenAck, conn_open_init::MsgConnectionOpenInit,
-        conn_open_try::MsgConnectionOpenTry, ConnectionMsg,
-    };
-    use crate::core::ics03_connection::version::Version as ConnVersion;
-    use crate::core::ics04_channel::channel::ChannelEnd;
-    use crate::core::ics04_channel::channel::Counterparty as ChannelCounterparty;
-    use crate::core::ics04_channel::channel::Order as ChannelOrder;
-    use crate::core::ics04_channel::channel::State as ChannelState;
-    use crate::core::ics04_channel::error::ChannelError;
-    use crate::core::ics04_channel::msgs::acknowledgement::test_util::get_dummy_raw_msg_ack_with_packet;
-    use crate::core::ics04_channel::msgs::acknowledgement::MsgAcknowledgement;
-    use crate::core::ics04_channel::msgs::chan_open_confirm::test_util::get_dummy_raw_msg_chan_open_confirm;
-    use crate::core::ics04_channel::msgs::chan_open_confirm::MsgChannelOpenConfirm;
-    use crate::core::ics04_channel::msgs::{
-        chan_close_confirm::{
-            test_util::get_dummy_raw_msg_chan_close_confirm, MsgChannelCloseConfirm,
-        },
-        chan_close_init::{test_util::get_dummy_raw_msg_chan_close_init, MsgChannelCloseInit},
-        chan_open_ack::{test_util::get_dummy_raw_msg_chan_open_ack, MsgChannelOpenAck},
-        chan_open_init::{test_util::get_dummy_raw_msg_chan_open_init, MsgChannelOpenInit},
-        chan_open_try::{test_util::get_dummy_raw_msg_chan_open_try, MsgChannelOpenTry},
-        recv_packet::{test_util::get_dummy_raw_msg_recv_packet, MsgRecvPacket},
-        timeout_on_close::{test_util::get_dummy_raw_msg_timeout_on_close, MsgTimeoutOnClose},
-        ChannelMsg, PacketMsg,
-    };
-    use crate::core::ics04_channel::timeout::TimeoutHeight;
-    use crate::core::ics04_channel::Version as ChannelVersion;
-    use crate::core::ics23_commitment::commitment::CommitmentPrefix;
-    use crate::core::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
-    use crate::core::ics24_host::path::CommitmentPath;
-    use crate::core::msgs::MsgEnvelope;
-    use crate::core::router::ModuleId;
-    use crate::core::timestamp::Timestamp;
-    use crate::mock::client_state::MockClientState;
-    use crate::mock::consensus_state::MockConsensusState;
-    use crate::mock::context::MockContext;
-    use crate::mock::header::MockHeader;
-    use crate::prelude::*;
-    use crate::test_utils::{get_dummy_account_id, DummyTransferModule};
-    use crate::Height;
-
-    #[test]
-    /// These tests exercise two main paths: (1) the ability of the ICS26 routing module to dispatch
-    /// messages to the correct module handler, and more importantly: (2) the ability of ICS handlers
-    /// to work with the context and correctly store results.
-    fn routing_module_and_keepers() {
-        #[derive(Clone, Debug)]
-        enum TestMsg {
-            Ics26(MsgEnvelope),
-            Ics20(MsgTransfer),
-        }
-
-        impl From<MsgEnvelope> for TestMsg {
-            fn from(msg: MsgEnvelope) -> Self {
-                Self::Ics26(msg)
-            }
-        }
-
-        impl From<MsgTransfer> for TestMsg {
-            fn from(msg: MsgTransfer) -> Self {
-                Self::Ics20(msg)
-            }
-        }
-
-        type StateCheckFn = dyn FnOnce(&MockContext) -> bool;
-
-        // Test parameters
-        struct Test {
-            name: String,
-            msg: TestMsg,
-            want_pass: bool,
-            state_check: Option<Box<StateCheckFn>>,
-        }
-        let default_signer = get_dummy_account_id();
-        let client_height = 5;
-        let start_client_height = Height::new(0, client_height).unwrap();
-        let update_client_height = Height::new(0, 34).unwrap();
-        let update_client_height_after_send = Height::new(0, 35).unwrap();
-
-        let update_client_height_after_second_send = Height::new(0, 36).unwrap();
-
-        let upgrade_client_height = Height::new(1, 2).unwrap();
-
-        let upgrade_client_height_second = Height::new(1, 1).unwrap();
-
-        let transfer_module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-
-        // We reuse this same context across all tests. Nothing in particular needs parametrizing.
-        let mut ctx = {
-            let mut ctx = MockContext::default();
-            let module = DummyTransferModule::new();
-            ctx.add_route(transfer_module_id.clone(), module).unwrap();
-
-            ctx
-        };
-
-        let create_client_msg = MsgCreateClient::new(
-            MockClientState::new(MockHeader::new(start_client_height)).into(),
-            MockConsensusState::new(MockHeader::new(start_client_height)).into(),
-            default_signer.clone(),
-        );
-
-        //
-        // Connection handshake messages.
-        //
-        let msg_conn_init = MsgConnectionOpenInit::new_dummy();
-
-        let correct_msg_conn_try = MsgConnectionOpenTry::new_dummy(client_height, client_height);
-
-        // The handler will fail to process this msg because the client height is too advanced.
-        let incorrect_msg_conn_try =
-            MsgConnectionOpenTry::new_dummy(client_height + 1, client_height + 1);
-
-        let msg_conn_ack = MsgConnectionOpenAck::new_dummy(client_height, client_height);
-
-        //
-        // Channel handshake messages.
-        //
-        let msg_chan_init =
-            MsgChannelOpenInit::try_from(get_dummy_raw_msg_chan_open_init(None)).unwrap();
-
-        // The handler will fail to process this b/c the associated connection does not exist
-        let mut incorrect_msg_chan_init = msg_chan_init.clone();
-        incorrect_msg_chan_init.connection_hops_on_a = vec![ConnectionId::new(590)];
-
-        let msg_chan_try =
-            MsgChannelOpenTry::try_from(get_dummy_raw_msg_chan_open_try(client_height)).unwrap();
-
-        let msg_chan_ack =
-            MsgChannelOpenAck::try_from(get_dummy_raw_msg_chan_open_ack(client_height)).unwrap();
-
-        let msg_chan_close_init =
-            MsgChannelCloseInit::try_from(get_dummy_raw_msg_chan_close_init()).unwrap();
-
-        let msg_chan_close_confirm =
-            MsgChannelCloseConfirm::try_from(get_dummy_raw_msg_chan_close_confirm(client_height))
-                .unwrap();
-
-        let msg_transfer = get_dummy_msg_transfer(Height::new(0, 35).unwrap().into(), None);
-        let msg_transfer_two = get_dummy_msg_transfer(Height::new(0, 36).unwrap().into(), None);
-        let msg_transfer_no_timeout = get_dummy_msg_transfer(TimeoutHeight::no_timeout(), None);
-        let msg_transfer_no_timeout_or_timestamp = get_dummy_msg_transfer(
-            TimeoutHeight::no_timeout(),
-            Some(Timestamp::from_nanoseconds(0).unwrap()),
-        );
-
-        let mut msg_to_on_close =
-            MsgTimeoutOnClose::try_from(get_dummy_raw_msg_timeout_on_close(36, 5)).unwrap();
-        msg_to_on_close.packet.seq_on_a = 2.into();
-        msg_to_on_close.packet.timeout_height_on_b = msg_transfer_two.timeout_height_on_b;
-        msg_to_on_close.packet.timeout_timestamp_on_b = msg_transfer_two.timeout_timestamp_on_b;
-
-        let denom = msg_transfer_two.packet_data.token.denom.clone();
-        let packet_data = {
-            let data = PacketData {
-                token: PrefixedCoin {
-                    denom,
-                    amount: msg_transfer_two.packet_data.token.amount,
-                },
-                sender: msg_transfer_two.packet_data.sender.clone(),
-                receiver: msg_transfer_two.packet_data.receiver.clone(),
-                memo: "".to_owned().into(),
-            };
-            serde_json::to_vec(&data).expect("PacketData's infallible Serialize impl failed")
-        };
-        msg_to_on_close.packet.data = packet_data;
-
-        let msg_recv_packet = MsgRecvPacket::try_from(get_dummy_raw_msg_recv_packet(35)).unwrap();
-        let msg_ack_packet = MsgAcknowledgement::try_from(get_dummy_raw_msg_ack_with_packet(
-            get_dummy_transfer_packet(msg_transfer.clone(), 1u64.into()).into(),
-            35,
-        ))
-        .unwrap();
-
-        // First, create a client..
-        let res = dispatch(
-            &mut ctx,
-            MsgEnvelope::Client(ClientMsg::CreateClient(create_client_msg.clone())),
-        );
-
-        assert!(
-            res.is_ok(),
-            "ICS26 routing dispatch test 'client creation' failed for message {create_client_msg:?} with result: {res:?}",
-        );
-
-        ctx.scope_port_to_module(msg_chan_init.port_id_on_a.clone(), transfer_module_id);
-
-        // Figure out the ID of the client that was just created.
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Client)
-        ));
-        let client_id_event = ctx.events.get(1);
-        assert!(
-            client_id_event.is_some(),
-            "There was no event generated for client creation!"
-        );
-        let client_id = match client_id_event.unwrap() {
-            IbcEvent::CreateClient(create_client) => create_client.client_id().clone(),
-            event => panic!("unexpected IBC event: {:?}", event),
-        };
-
-        let tests: Vec<Test> = vec![
-            // Test some ICS2 client functionality.
-            Test {
-                name: "Client update successful".to_string(),
-                msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
-                    client_id: client_id.clone(),
-                    header: MockHeader::new(update_client_height)
-                        .with_timestamp(Timestamp::now())
-                        .into(),
-                    signer: default_signer.clone(),
-                }))
-                .into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Client update fails due to stale header".to_string(),
-                msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
-                    client_id: client_id.clone(),
-                    header: MockHeader::new(update_client_height).into(),
-                    signer: default_signer.clone(),
-                }))
-                .into(),
-                want_pass: false,
-                state_check: None,
-            },
-            Test {
-                name: "Connection open init succeeds".to_string(),
-                msg: MsgEnvelope::Connection(ConnectionMsg::OpenInit(
-                    msg_conn_init.with_client_id(client_id.clone()),
-                ))
-                .into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Connection open try fails due to InvalidConsensusHeight (too high)"
-                    .to_string(),
-                msg: MsgEnvelope::Connection(ConnectionMsg::OpenTry(incorrect_msg_conn_try)).into(),
-                want_pass: false,
-                state_check: None,
-            },
-            Test {
-                name: "Connection open try succeeds".to_string(),
-                msg: MsgEnvelope::Connection(ConnectionMsg::OpenTry(
-                    correct_msg_conn_try.with_client_id(client_id.clone()),
-                ))
-                .into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Connection open ack succeeds".to_string(),
-                msg: MsgEnvelope::Connection(ConnectionMsg::OpenAck(msg_conn_ack)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            // ICS04
-            Test {
-                name: "Channel open init succeeds".to_string(),
-                msg: MsgEnvelope::Channel(ChannelMsg::OpenInit(msg_chan_init)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Channel open init fail due to missing connection".to_string(),
-                msg: MsgEnvelope::Channel(ChannelMsg::OpenInit(incorrect_msg_chan_init)).into(),
-                want_pass: false,
-                state_check: None,
-            },
-            Test {
-                name: "Channel open try succeeds".to_string(),
-                msg: MsgEnvelope::Channel(ChannelMsg::OpenTry(msg_chan_try)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Channel open ack succeeds".to_string(),
-                msg: MsgEnvelope::Channel(ChannelMsg::OpenAck(msg_chan_ack)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Packet send".to_string(),
-                msg: msg_transfer.into(),
-                want_pass: true,
-                state_check: None,
-            },
-            // The client update is required in this test, because the proof associated with
-            // msg_recv_packet has the same height as the packet TO height (see get_dummy_raw_msg_recv_packet)
-            Test {
-                name: "Client update successful #2".to_string(),
-                msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
-                    client_id: client_id.clone(),
-                    header: MockHeader::new(update_client_height_after_send)
-                        .with_timestamp(Timestamp::now())
-                        .into(),
-                    signer: default_signer.clone(),
-                }))
-                .into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Receive packet".to_string(),
-                msg: MsgEnvelope::Packet(PacketMsg::Recv(msg_recv_packet.clone())).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Re-Receive packet".to_string(),
-                msg: MsgEnvelope::Packet(PacketMsg::Recv(msg_recv_packet)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            // Ack packet
-            Test {
-                name: "Ack packet".to_string(),
-                msg: MsgEnvelope::Packet(PacketMsg::Ack(msg_ack_packet.clone())).into(),
-                want_pass: true,
-                state_check: Some(Box::new(move |ctx| {
-                    ctx.get_packet_commitment(&CommitmentPath::new(
-                        &msg_ack_packet.packet.port_id_on_a,
-                        &msg_ack_packet.packet.chan_id_on_a,
-                        msg_ack_packet.packet.seq_on_a,
-                    ))
-                    .is_err()
-                })),
-            },
-            Test {
-                name: "Packet send".to_string(),
-                msg: msg_transfer_two.into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Client update successful".to_string(),
-                msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
-                    client_id: client_id.clone(),
-                    header: MockHeader::new(update_client_height_after_second_send).into(),
-                    signer: default_signer,
-                }))
-                .into(),
-                want_pass: true,
-                state_check: None,
-            },
-            // Timeout packets
-            Test {
-                name: "Transfer message no timeout".to_string(),
-                msg: msg_transfer_no_timeout.into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Transfer message no timeout nor timestamp".to_string(),
-                msg: msg_transfer_no_timeout_or_timestamp.into(),
-                want_pass: true,
-                state_check: None,
-            },
-            //ICS04-close channel
-            Test {
-                name: "Channel close init succeeds".to_string(),
-                msg: MsgEnvelope::Channel(ChannelMsg::CloseInit(msg_chan_close_init)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Channel close confirm fails cause channel is already closed".to_string(),
-                msg: MsgEnvelope::Channel(ChannelMsg::CloseConfirm(msg_chan_close_confirm)).into(),
-                want_pass: false,
-                state_check: None,
-            },
-            //ICS04-to_on_close
-            Test {
-                name: "Timeout on close".to_string(),
-                msg: MsgEnvelope::Packet(PacketMsg::TimeoutOnClose(msg_to_on_close)).into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Client upgrade successful".to_string(),
-                msg: MsgEnvelope::Client(ClientMsg::UpgradeClient(
-                    MsgUpgradeClient::new_dummy(upgrade_client_height)
-                        .with_client_id(client_id.clone()),
-                ))
-                .into(),
-                want_pass: true,
-                state_check: None,
-            },
-            Test {
-                name: "Client upgrade un-successful".to_string(),
-                msg: MsgEnvelope::Client(ClientMsg::UpgradeClient(
-                    MsgUpgradeClient::new_dummy(upgrade_client_height_second)
-                        .with_client_id(client_id),
-                ))
-                .into(),
-                want_pass: false,
-                state_check: None,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let res = match test.msg.clone() {
-                TestMsg::Ics26(msg) => dispatch(&mut ctx, msg).map(|_| ()),
-                TestMsg::Ics20(msg) => send_transfer(&mut ctx, msg)
-                    .map_err(|e: TokenTransferError| ChannelError::AppModule {
-                        description: e.to_string(),
-                    })
-                    .map_err(|e| RouterError::ContextError(e.into())),
-            };
-
-            assert_eq!(
-                test.want_pass,
-                res.is_ok(),
-                "ICS26 routing dispatch test '{}' failed for message {:?}\nwith result: {:?}",
-                test.name,
-                test.msg,
-                res
-            );
-
-            if let Some(state_check) = test.state_check {
-                assert_eq!(
-                    test.want_pass,
-                    state_check(&ctx),
-                    "ICS26 routing state check '{}' failed for message {:?}\nwith result: {:?}",
-                    test.name,
-                    test.msg,
-                    res
-                );
-            }
-        }
-    }
-
-    fn get_channel_events_ctx() -> MockContext {
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        let mut ctx = MockContext::default()
-            .with_client(&ClientId::default(), Height::new(0, 1).unwrap())
-            .with_connection(
-                ConnectionId::new(0),
-                ConnectionEnd::new(
-                    ConnState::Open,
-                    ClientId::default(),
-                    ConnCounterparty::new(
-                        ClientId::default(),
-                        Some(ConnectionId::new(0)),
-                        CommitmentPrefix::default(),
-                    ),
-                    vec![ConnVersion::default()],
-                    Duration::MAX,
-                )
-                .unwrap(),
-            );
-        let module = DummyTransferModule::new();
-
-        ctx.add_route(module_id.clone(), module).unwrap();
-
-        // Note: messages will be using the default port
-        ctx.scope_port_to_module(PortId::default(), module_id);
-
-        ctx
-    }
-
-    #[test]
-    fn test_chan_open_init_event() {
-        let mut ctx = get_channel_events_ctx();
-
-        let msg_chan_open_init =
-            MsgChannelOpenInit::try_from(get_dummy_raw_msg_chan_open_init(None)).unwrap();
-
-        dispatch(
-            &mut ctx,
-            MsgEnvelope::Channel(ChannelMsg::OpenInit(msg_chan_open_init)),
-        )
-        .unwrap();
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::OpenInitChannel(_)));
-    }
-
-    #[test]
-    fn test_chan_open_try_event() {
-        let mut ctx = get_channel_events_ctx();
-
-        let msg_chan_open_try =
-            MsgChannelOpenTry::try_from(get_dummy_raw_msg_chan_open_try(1)).unwrap();
-
-        dispatch(
-            &mut ctx,
-            MsgEnvelope::Channel(ChannelMsg::OpenTry(msg_chan_open_try)),
-        )
-        .unwrap();
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::OpenTryChannel(_)));
-    }
-
-    #[test]
-    fn test_chan_open_ack_event() {
-        let mut ctx = get_channel_events_ctx().with_channel(
-            PortId::default(),
-            ChannelId::default(),
-            ChannelEnd::new(
-                ChannelState::Init,
-                ChannelOrder::Unordered,
-                ChannelCounterparty::new(PortId::default(), Some(ChannelId::default())),
-                vec![ConnectionId::new(0)],
-                ChannelVersion::default(),
-            )
-            .unwrap(),
-        );
-
-        let msg_chan_open_ack =
-            MsgChannelOpenAck::try_from(get_dummy_raw_msg_chan_open_ack(1)).unwrap();
-
-        dispatch(
-            &mut ctx,
-            MsgEnvelope::Channel(ChannelMsg::OpenAck(msg_chan_open_ack)),
-        )
-        .unwrap();
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::OpenAckChannel(_)));
-    }
-
-    #[test]
-    fn test_chan_open_confirm_event() {
-        let mut ctx = get_channel_events_ctx().with_channel(
-            PortId::default(),
-            ChannelId::default(),
-            ChannelEnd::new(
-                ChannelState::TryOpen,
-                ChannelOrder::Unordered,
-                ChannelCounterparty::new(PortId::default(), Some(ChannelId::default())),
-                vec![ConnectionId::new(0)],
-                ChannelVersion::default(),
-            )
-            .unwrap(),
-        );
-
-        let msg_chan_open_confirm =
-            MsgChannelOpenConfirm::try_from(get_dummy_raw_msg_chan_open_confirm(1)).unwrap();
-
-        dispatch(
-            &mut ctx,
-            MsgEnvelope::Channel(ChannelMsg::OpenConfirm(msg_chan_open_confirm)),
-        )
-        .unwrap();
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::OpenConfirmChannel(_)));
-    }
-
-    #[test]
-    fn test_chan_close_init_event() {
-        let mut ctx = get_channel_events_ctx().with_channel(
-            PortId::default(),
-            ChannelId::default(),
-            ChannelEnd::new(
-                ChannelState::Open,
-                ChannelOrder::Unordered,
-                ChannelCounterparty::new(PortId::default(), Some(ChannelId::default())),
-                vec![ConnectionId::new(0)],
-                ChannelVersion::default(),
-            )
-            .unwrap(),
-        );
-
-        let msg_chan_close_init =
-            MsgChannelCloseInit::try_from(get_dummy_raw_msg_chan_close_init()).unwrap();
-
-        dispatch(
-            &mut ctx,
-            MsgEnvelope::Channel(ChannelMsg::CloseInit(msg_chan_close_init)),
-        )
-        .unwrap();
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::CloseInitChannel(_)));
-    }
-
-    #[test]
-    fn test_chan_close_confirm_event() {
-        let mut ctx = get_channel_events_ctx().with_channel(
-            PortId::default(),
-            ChannelId::default(),
-            ChannelEnd::new(
-                ChannelState::Open,
-                ChannelOrder::Unordered,
-                ChannelCounterparty::new(PortId::default(), Some(ChannelId::default())),
-                vec![ConnectionId::new(0)],
-                ChannelVersion::default(),
-            )
-            .unwrap(),
-        );
-
-        let msg_chan_close_confirm =
-            MsgChannelCloseConfirm::try_from(get_dummy_raw_msg_chan_close_confirm(1)).unwrap();
-
-        dispatch(
-            &mut ctx,
-            MsgEnvelope::Channel(ChannelMsg::CloseConfirm(msg_chan_close_confirm)),
-        )
-        .unwrap();
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::CloseConfirmChannel(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/client_type.rs b/crates/ibc/src/core/ics02_client/client_type.rs
deleted file mode 100644
index d842e84b3..000000000
--- a/crates/ibc/src/core/ics02_client/client_type.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-//! Defines the `ClientType` format, typically used in chain IDs.
-
-use crate::prelude::*;
-use core::{
-    fmt::{Display, Error as FmtError, Formatter},
-    str::FromStr,
-};
-
-use crate::core::ics24_host::{
-    identifier::validate::validate_client_type, identifier::IdentifierError,
-};
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-/// Type of the client, depending on the specific consensus algorithm.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ClientType(String);
-
-impl ClientType {
-    /// Constructs a new `ClientType` from the given `String` if it ends with a valid client identifier.
-    pub fn new(s: &str) -> Result<Self, IdentifierError> {
-        let s_trim = s.trim();
-        validate_client_type(s_trim)?;
-        Ok(Self(s_trim.to_string()))
-    }
-
-    /// Yields this identifier as a borrowed `&str`
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl FromStr for ClientType {
-    type Err = IdentifierError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::new(s)
-    }
-}
-
-impl Display for ClientType {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "ClientType({})", self.0)
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/consensus_state.rs b/crates/ibc/src/core/ics02_client/consensus_state.rs
deleted file mode 100644
index 377272b0d..000000000
--- a/crates/ibc/src/core/ics02_client/consensus_state.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Defines the trait to be implemented by all concrete consensus state types
-
-use crate::prelude::*;
-
-use core::marker::{Send, Sync};
-
-use crate::core::ics23_commitment::commitment::CommitmentRoot;
-use crate::core::timestamp::Timestamp;
-
-/// Derive macro that implements [`ConsensusState`] for enums containing
-/// variants that implement [`ConsensusState`]
-pub use ibc_derive::ConsensusState;
-
-/// Defines methods that all `ConsensusState`s should provide.
-///
-/// One can think of a "consensus state" as a pruned header, to be stored on chain. In other words,
-/// a consensus state only contains the header's information needed by IBC message handlers.
-pub trait ConsensusState: Send + Sync {
-    /// Commitment root of the consensus state, which is used for key-value pair verification.
-    fn root(&self) -> &CommitmentRoot;
-
-    /// The timestamp of the consensus state
-    fn timestamp(&self) -> Timestamp;
-
-    /// Serializes the `ConsensusState`. This is expected to be implemented as
-    /// first converting to the raw type (i.e. the protobuf definition), and then
-    /// serializing that.
-    fn encode_vec(&self) -> Vec<u8>;
-}
diff --git a/crates/ibc/src/core/ics02_client/context.rs b/crates/ibc/src/core/ics02_client/context.rs
deleted file mode 100644
index 4423d4690..000000000
--- a/crates/ibc/src/core/ics02_client/context.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use super::client_state::ClientState;
-use super::consensus_state::ConsensusState;
-use crate::core::ics24_host::path::ClientConsensusStatePath;
-use crate::core::ics24_host::path::ClientStatePath;
-use crate::core::ContextError;
-
-/// Defines the methods that all client `ExecutionContext`s (precisely the
-/// generic parameter of
-/// [`crate::core::ics02_client::client_state::ClientStateExecution`] ) must
-/// implement.
-///
-/// Specifically, clients have the responsibility to store their client state
-/// and consensus states. This trait defines a uniform interface to do that for
-/// all clients.
-pub trait ClientExecutionContext: Sized {
-    type ClientValidationContext;
-    type AnyClientState: ClientState<Self::ClientValidationContext, Self>;
-    type AnyConsensusState: ConsensusState;
-
-    /// Called upon successful client creation and update
-    fn store_client_state(
-        &mut self,
-        client_state_path: ClientStatePath,
-        client_state: Self::AnyClientState,
-    ) -> Result<(), ContextError>;
-
-    /// Called upon successful client creation and update
-    fn store_consensus_state(
-        &mut self,
-        consensus_state_path: ClientConsensusStatePath,
-        consensus_state: Self::AnyConsensusState,
-    ) -> Result<(), ContextError>;
-}
diff --git a/crates/ibc/src/core/ics02_client/handler/create_client.rs b/crates/ibc/src/core/ics02_client/handler/create_client.rs
deleted file mode 100644
index e3ee280ab..000000000
--- a/crates/ibc/src/core/ics02_client/handler/create_client.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-//! Protocol logic specific to processing ICS2 messages of type `MsgCreateClient`.
-
-use crate::prelude::*;
-
-use crate::core::context::ContextError;
-use crate::core::events::IbcEvent;
-use crate::core::events::MessageEvent;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::client_state::ClientStateExecution;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics02_client::events::CreateClient;
-use crate::core::ics02_client::msgs::create_client::MsgCreateClient;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ExecutionContext;
-use crate::core::ValidationContext;
-
-pub(crate) fn validate<Ctx>(ctx: &Ctx, msg: MsgCreateClient) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    let MsgCreateClient {
-        client_state,
-        consensus_state,
-        signer,
-    } = msg;
-
-    ctx.validate_message_signer(&signer)?;
-
-    // Construct this client's identifier
-    let id_counter = ctx.client_counter()?;
-
-    let client_state = ctx.decode_client_state(client_state)?;
-
-    client_state.verify_consensus_state(consensus_state)?;
-
-    let client_type = client_state.client_type();
-
-    let client_id = ClientId::new(client_type, id_counter).map_err(|e| {
-        ClientError::ClientIdentifierConstructor {
-            client_type: client_state.client_type(),
-            counter: id_counter,
-            validation_error: e,
-        }
-    })?;
-
-    if ctx.client_state(&client_id).is_ok() {
-        return Err(ClientError::ClientStateAlreadyExists { client_id }.into());
-    };
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(ctx: &mut Ctx, msg: MsgCreateClient) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let MsgCreateClient {
-        client_state,
-        consensus_state,
-        signer: _,
-    } = msg;
-
-    // Construct this client's identifier
-    let id_counter = ctx.client_counter()?;
-
-    let client_state = ctx.decode_client_state(client_state)?;
-
-    let client_type = client_state.client_type();
-
-    let client_id = ClientId::new(client_type.clone(), id_counter).map_err(|e| {
-        ContextError::from(ClientError::ClientIdentifierConstructor {
-            client_type: client_state.client_type(),
-            counter: id_counter,
-            validation_error: e,
-        })
-    })?;
-
-    client_state.initialise(
-        ctx.get_client_execution_context(),
-        &client_id,
-        consensus_state,
-    )?;
-
-    let latest_height = client_state.latest_height();
-
-    ctx.store_update_time(client_id.clone(), latest_height, ctx.host_timestamp()?)?;
-    ctx.store_update_height(client_id.clone(), latest_height, ctx.host_height()?)?;
-    ctx.increase_client_counter();
-
-    let event = IbcEvent::CreateClient(CreateClient::new(
-        client_id.clone(),
-        client_type,
-        latest_height,
-    ));
-    ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client));
-    ctx.emit_ibc_event(event);
-
-    ctx.log_message(format!(
-        "success: generated new client identifier: {client_id}"
-    ));
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use test_log::test;
-
-    use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-    use crate::clients::ics07_tendermint::client_type as tm_client_type;
-    use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-    use crate::clients::ics07_tendermint::header::test_util::get_dummy_tendermint_header;
-    use crate::core::ics02_client::handler::create_client::{execute, validate};
-    use crate::core::ics02_client::msgs::create_client::MsgCreateClient;
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::mock::client_state::{client_type as mock_client_type, MockClientState};
-    use crate::mock::consensus_state::MockConsensusState;
-    use crate::mock::context::MockContext;
-    use crate::mock::header::MockHeader;
-    use crate::test_utils::get_dummy_account_id;
-    use crate::Height;
-
-    #[test]
-    fn test_create_client_ok() {
-        let mut ctx = MockContext::default();
-        let signer = get_dummy_account_id();
-        let height = Height::new(0, 42).unwrap();
-
-        let msg = MsgCreateClient::new(
-            MockClientState::new(MockHeader::new(height)).into(),
-            MockConsensusState::new(MockHeader::new(height)).into(),
-            signer,
-        );
-
-        let client_type = mock_client_type();
-
-        let client_id = {
-            let id_counter = ctx.client_counter().unwrap();
-            ClientId::new(client_type.clone(), id_counter).unwrap()
-        };
-
-        let res = validate(&ctx, msg.clone());
-
-        assert!(res.is_ok(), "validation happy path");
-
-        let res = execute(&mut ctx, msg.clone());
-
-        assert!(res.is_ok(), "execution happy path");
-
-        let expected_client_state = ctx.decode_client_state(msg.client_state).unwrap();
-        assert_eq!(expected_client_state.client_type(), client_type);
-        assert_eq!(ctx.client_state(&client_id).unwrap(), expected_client_state);
-    }
-
-    #[test]
-    fn test_tm_create_client_ok() {
-        let signer = get_dummy_account_id();
-
-        let mut ctx = MockContext::default();
-
-        let tm_header = get_dummy_tendermint_header();
-
-        let tm_client_state = TmClientState::new_dummy_from_header(tm_header.clone()).into();
-
-        let client_type = tm_client_type();
-
-        let client_id = {
-            let id_counter = ctx.client_counter().unwrap();
-            ClientId::new(client_type.clone(), id_counter).unwrap()
-        };
-
-        let msg = MsgCreateClient::new(
-            tm_client_state,
-            TmConsensusState::try_from(tm_header).unwrap().into(),
-            signer,
-        );
-
-        let res = validate(&ctx, msg.clone());
-        assert!(res.is_ok(), "tendermint client validation happy path");
-
-        let res = execute(&mut ctx, msg.clone());
-        assert!(res.is_ok(), "tendermint client execution happy path");
-
-        let expected_client_state = ctx.decode_client_state(msg.client_state).unwrap();
-        assert_eq!(expected_client_state.client_type(), client_type);
-        assert_eq!(ctx.client_state(&client_id).unwrap(), expected_client_state);
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/handler/update_client.rs b/crates/ibc/src/core/ics02_client/handler/update_client.rs
deleted file mode 100644
index 4b88d77cc..000000000
--- a/crates/ibc/src/core/ics02_client/handler/update_client.rs
+++ /dev/null
@@ -1,685 +0,0 @@
-//! Protocol logic specific to processing ICS2 messages of type `MsgUpdateAnyClient`.
-
-use crate::prelude::*;
-
-use crate::core::context::ContextError;
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::client_state::ClientStateExecution;
-use crate::core::ics02_client::client_state::ClientStateValidation;
-use crate::core::ics02_client::client_state::UpdateKind;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics02_client::events::{ClientMisbehaviour, UpdateClient};
-use crate::core::ics02_client::msgs::MsgUpdateOrMisbehaviour;
-use crate::core::{ExecutionContext, ValidationContext};
-
-pub(crate) fn validate<Ctx>(ctx: &Ctx, msg: MsgUpdateOrMisbehaviour) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx.validate_message_signer(msg.signer())?;
-
-    let client_id = msg.client_id().clone();
-    let update_kind = match msg {
-        MsgUpdateOrMisbehaviour::UpdateClient(_) => UpdateKind::UpdateClient,
-        MsgUpdateOrMisbehaviour::Misbehaviour(_) => UpdateKind::SubmitMisbehaviour,
-    };
-
-    // Read client state from the host chain store. The client should already exist.
-    let client_state = ctx.client_state(&client_id)?;
-
-    client_state.confirm_not_frozen()?;
-
-    let client_message = msg.client_message();
-
-    client_state.verify_client_message(
-        ctx.get_client_validation_context(),
-        &client_id,
-        client_message,
-        &update_kind,
-    )?;
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(ctx: &mut Ctx, msg: MsgUpdateOrMisbehaviour) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let client_id = msg.client_id().clone();
-    let update_kind = match msg {
-        MsgUpdateOrMisbehaviour::UpdateClient(_) => UpdateKind::UpdateClient,
-        MsgUpdateOrMisbehaviour::Misbehaviour(_) => UpdateKind::SubmitMisbehaviour,
-    };
-    let client_message = msg.client_message();
-
-    let client_state = ctx.client_state(&client_id)?;
-
-    let found_misbehaviour = client_state.check_for_misbehaviour(
-        ctx.get_client_validation_context(),
-        &client_id,
-        client_message.clone(),
-        &update_kind,
-    )?;
-
-    if found_misbehaviour {
-        client_state.update_state_on_misbehaviour(
-            ctx.get_client_execution_context(),
-            &client_id,
-            client_message,
-            &update_kind,
-        )?;
-
-        let event = IbcEvent::ClientMisbehaviour(ClientMisbehaviour::new(
-            client_id,
-            client_state.client_type(),
-        ));
-        ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client));
-        ctx.emit_ibc_event(event);
-    } else {
-        if !matches!(update_kind, UpdateKind::UpdateClient) {
-            return Err(ClientError::MisbehaviourHandlingFailure {
-                reason: "misbehaviour submitted, but none found".to_string(),
-            }
-            .into());
-        }
-
-        let header = client_message;
-
-        let consensus_heights = client_state.update_state(
-            ctx.get_client_execution_context(),
-            &client_id,
-            header.clone(),
-        )?;
-
-        // Store host height and time for all updated headers
-        {
-            let host_timestamp = ctx.host_timestamp()?;
-            let host_height = ctx.host_height()?;
-
-            for consensus_height in consensus_heights.iter() {
-                ctx.store_update_time(client_id.clone(), *consensus_height, host_timestamp)?;
-                ctx.store_update_height(client_id.clone(), *consensus_height, host_height)?;
-            }
-        }
-
-        {
-            let event = {
-                let consensus_height = consensus_heights.get(0).ok_or(ClientError::Other {
-                    description: "client update state returned no updated height".to_string(),
-                })?;
-
-                IbcEvent::UpdateClient(UpdateClient::new(
-                    client_id,
-                    client_state.client_type(),
-                    *consensus_height,
-                    consensus_heights,
-                    header,
-                ))
-            };
-            ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client));
-            ctx.emit_ibc_event(event);
-        }
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use core::str::FromStr;
-    use core::time::Duration;
-    use ibc_proto::google::protobuf::Any;
-    use test_log::test;
-
-    use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-    use crate::clients::ics07_tendermint::client_type as tm_client_type;
-    use crate::clients::ics07_tendermint::header::Header as TmHeader;
-    use crate::clients::ics07_tendermint::misbehaviour::Misbehaviour as TmMisbehaviour;
-    use crate::core::events::IbcEvent;
-    use crate::core::ics02_client::client_type::ClientType;
-    use crate::core::ics02_client::handler::update_client::{execute, validate};
-    use crate::core::ics02_client::msgs::misbehaviour::MsgSubmitMisbehaviour;
-    use crate::core::ics02_client::msgs::update_client::MsgUpdateClient;
-    use crate::core::ics23_commitment::specs::ProofSpecs;
-    use crate::core::ics24_host::identifier::{ChainId, ClientId};
-    use crate::core::timestamp::Timestamp;
-    use crate::downcast;
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::client_state::MockClientState;
-    use crate::mock::context::{AnyConsensusState, MockContext};
-    use crate::mock::header::MockHeader;
-    use crate::mock::host::{HostBlock, HostType};
-    use crate::mock::misbehaviour::Misbehaviour as MockMisbehaviour;
-    use crate::test_utils::get_dummy_account_id;
-    use crate::Height;
-    use ibc_proto::ibc::lightclients::tendermint::v1::{ClientState as RawTmClientState, Fraction};
-
-    #[test]
-    fn test_update_client_ok() {
-        let client_id = ClientId::default();
-        let signer = get_dummy_account_id();
-
-        let timestamp = Timestamp::now();
-
-        let mut ctx = MockContext::default().with_client(&client_id, Height::new(0, 42).unwrap());
-        let height = Height::new(0, 46).unwrap();
-        let msg = MsgUpdateClient {
-            client_id,
-            header: MockHeader::new(height).with_timestamp(timestamp).into(),
-            signer,
-        };
-
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-
-        assert!(res.is_ok(), "validation happy path");
-
-        let res = execute(&mut ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-        assert!(res.is_ok(), "execution happy path");
-
-        assert_eq!(
-            ctx.client_state(&msg.client_id).unwrap(),
-            MockClientState::new(MockHeader::new(height).with_timestamp(timestamp)).into()
-        );
-    }
-
-    #[test]
-    fn test_update_nonexisting_client() {
-        let client_id = ClientId::from_str("mockclient1").unwrap();
-        let signer = get_dummy_account_id();
-
-        let ctx = MockContext::default().with_client(&client_id, Height::new(0, 42).unwrap());
-
-        let msg = MsgUpdateClient {
-            client_id: ClientId::from_str("nonexistingclient").unwrap(),
-            header: MockHeader::new(Height::new(0, 46).unwrap()).into(),
-            signer,
-        };
-
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg));
-
-        assert!(res.is_err());
-    }
-
-    #[test]
-    fn test_update_synthetic_tendermint_client_adjacent_ok() {
-        let client_id = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(1, 20).unwrap();
-        let update_height = Height::new(1, 21).unwrap();
-        let chain_id_b = ChainId::new("mockgaiaB", 1);
-
-        let mut ctx = MockContext::new(
-            ChainId::new("mockgaiaA", 1),
-            HostType::Mock,
-            5,
-            Height::new(1, 1).unwrap(),
-        )
-        .with_client_parametrized_with_chain_id(
-            chain_id_b.clone(),
-            &client_id,
-            client_height,
-            Some(tm_client_type()), // The target host chain (B) is synthetic TM.
-            Some(client_height),
-        );
-
-        let ctx_b = MockContext::new(chain_id_b, HostType::SyntheticTendermint, 5, update_height);
-
-        let signer = get_dummy_account_id();
-
-        let mut block = ctx_b.host_block(&update_height).unwrap().clone();
-        block.set_trusted_height(client_height);
-
-        let latest_header_height = block.height();
-        let msg = MsgUpdateClient {
-            client_id,
-            header: block.into(),
-            signer,
-        };
-
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-        assert!(res.is_ok());
-
-        let res = execute(&mut ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-        assert!(res.is_ok(), "result: {res:?}");
-
-        let client_state = ctx.client_state(&msg.client_id).unwrap();
-        assert!(client_state.confirm_not_frozen().is_ok());
-        assert_eq!(client_state.latest_height(), latest_header_height);
-    }
-
-    #[test]
-    fn test_update_synthetic_tendermint_client_non_adjacent_ok() {
-        let client_id = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(1, 20).unwrap();
-        let update_height = Height::new(1, 21).unwrap();
-        let chain_id_b = ChainId::new("mockgaiaB", 1);
-
-        let mut ctx = MockContext::new(
-            ChainId::new("mockgaiaA", 1),
-            HostType::Mock,
-            5,
-            Height::new(1, 1).unwrap(),
-        )
-        .with_client_parametrized_history_with_chain_id(
-            chain_id_b.clone(),
-            &client_id,
-            client_height,
-            Some(tm_client_type()), // The target host chain (B) is synthetic TM.
-            Some(client_height),
-        );
-
-        let ctx_b = MockContext::new(chain_id_b, HostType::SyntheticTendermint, 5, update_height);
-
-        let signer = get_dummy_account_id();
-
-        let mut block = ctx_b.host_block(&update_height).unwrap().clone();
-        let trusted_height = client_height.clone().sub(1).unwrap();
-        block.set_trusted_height(trusted_height);
-
-        let latest_header_height = block.height();
-        let msg = MsgUpdateClient {
-            client_id,
-            header: block.into(),
-            signer,
-        };
-
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-        assert!(res.is_ok());
-
-        let res = execute(&mut ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-        assert!(res.is_ok(), "result: {res:?}");
-
-        let client_state = ctx.client_state(&msg.client_id).unwrap();
-        assert!(client_state.confirm_not_frozen().is_ok());
-        assert_eq!(client_state.latest_height(), latest_header_height);
-    }
-
-    #[test]
-    fn test_update_synthetic_tendermint_client_duplicate_ok() {
-        let client_id = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(1, 20).unwrap();
-
-        let ctx_a_chain_id = ChainId::new("mockgaiaA", 1);
-        let ctx_b_chain_id = ChainId::new("mockgaiaB", 1);
-        let start_height = Height::new(1, 11).unwrap();
-
-        let mut ctx_a = MockContext::new(ctx_a_chain_id, HostType::Mock, 5, start_height)
-            .with_client_parametrized_with_chain_id(
-                ctx_b_chain_id.clone(),
-                &client_id,
-                client_height,
-                Some(tm_client_type()), // The target host chain (B) is synthetic TM.
-                Some(start_height),
-            );
-
-        let ctx_b = MockContext::new(
-            ctx_b_chain_id,
-            HostType::SyntheticTendermint,
-            5,
-            client_height,
-        );
-
-        let signer = get_dummy_account_id();
-
-        let block = ctx_b.host_block(&client_height).unwrap().clone();
-
-        // Update the trusted height of the header to point to the previous height
-        // (`start_height` in this case).
-        //
-        // Note: The current MockContext interface doesn't allow us to
-        // do this without a major redesign.
-        let block = match block {
-            HostBlock::SyntheticTendermint(mut theader) => {
-                // current problem: the timestamp of the new header doesn't match the timestamp of
-                // the stored consensus state. If we hack them to match, then commit check fails.
-                // FIXME: figure out why they don't match.
-                theader.trusted_height = start_height;
-
-                HostBlock::SyntheticTendermint(theader)
-            }
-            _ => block,
-        };
-
-        // Update the client height to `client_height`
-        //
-        // Note: The current MockContext interface doesn't allow us to
-        // do this without a major redesign.
-        {
-            // FIXME: idea: we need to update the light client with the latest block from
-            // chain B
-            let consensus_state: AnyConsensusState = block.clone().into();
-
-            let tm_block = downcast!(block.clone() => HostBlock::SyntheticTendermint).unwrap();
-
-            let client_state = {
-                #[allow(deprecated)]
-                let raw_client_state = RawTmClientState {
-                    chain_id: ChainId::from(tm_block.header().chain_id.to_string()).to_string(),
-                    trust_level: Some(Fraction {
-                        numerator: 1,
-                        denominator: 3,
-                    }),
-                    trusting_period: Some(Duration::from_secs(64000).into()),
-                    unbonding_period: Some(Duration::from_secs(128000).into()),
-                    max_clock_drift: Some(Duration::from_millis(3000).into()),
-                    latest_height: Some(
-                        Height::new(
-                            ChainId::chain_version(tm_block.header().chain_id.as_str()),
-                            u64::from(tm_block.header().height),
-                        )
-                        .unwrap()
-                        .into(),
-                    ),
-                    proof_specs: ProofSpecs::default().into(),
-                    upgrade_path: Default::default(),
-                    frozen_height: None,
-                    allow_update_after_expiry: false,
-                    allow_update_after_misbehaviour: false,
-                };
-
-                let client_state = TmClientState::try_from(raw_client_state).unwrap();
-
-                client_state.into()
-            };
-
-            let mut ibc_store = ctx_a.ibc_store.lock();
-            let client_record = ibc_store.clients.get_mut(&client_id).unwrap();
-
-            client_record
-                .consensus_states
-                .insert(client_height, consensus_state);
-
-            client_record.client_state = Some(client_state);
-        }
-
-        let latest_header_height = block.height();
-        let msg = MsgUpdateClient {
-            client_id,
-            header: block.into(),
-            signer,
-        };
-
-        let res = validate(&ctx_a, MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()));
-        assert!(res.is_ok(), "result: {res:?}");
-
-        let res = execute(
-            &mut ctx_a,
-            MsgUpdateOrMisbehaviour::UpdateClient(msg.clone()),
-        );
-        assert!(res.is_ok(), "result: {res:?}");
-
-        let client_state = ctx_a.client_state(&msg.client_id).unwrap();
-        assert!(client_state.confirm_not_frozen().is_ok());
-        assert_eq!(client_state.latest_height(), latest_header_height);
-        assert_eq!(client_state, ctx_a.latest_client_states(&msg.client_id));
-    }
-
-    #[test]
-    fn test_update_synthetic_tendermint_client_lower_height() {
-        let client_id = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(1, 20).unwrap();
-
-        let client_update_height = Height::new(1, 19).unwrap();
-
-        let chain_start_height = Height::new(1, 11).unwrap();
-
-        let ctx = MockContext::new(
-            ChainId::new("mockgaiaA", 1),
-            HostType::Mock,
-            5,
-            chain_start_height,
-        )
-        .with_client_parametrized(
-            &client_id,
-            client_height,
-            Some(tm_client_type()), // The target host chain (B) is synthetic TM.
-            Some(client_height),
-        );
-
-        let ctx_b = MockContext::new(
-            ChainId::new("mockgaiaB", 1),
-            HostType::SyntheticTendermint,
-            5,
-            client_height,
-        );
-
-        let signer = get_dummy_account_id();
-
-        let block_ref = ctx_b.host_block(&client_update_height).unwrap();
-
-        let msg = MsgUpdateClient {
-            client_id,
-            header: block_ref.clone().into(),
-            signer,
-        };
-
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg));
-        assert!(res.is_err());
-    }
-
-    #[test]
-    fn test_update_client_events() {
-        let client_id = ClientId::default();
-        let signer = get_dummy_account_id();
-
-        let timestamp = Timestamp::now();
-
-        let mut ctx = MockContext::default().with_client(&client_id, Height::new(0, 42).unwrap());
-        let height = Height::new(0, 46).unwrap();
-        let header: Any = MockHeader::new(height).with_timestamp(timestamp).into();
-        let msg = MsgUpdateClient {
-            client_id: client_id.clone(),
-            header: header.clone(),
-            signer,
-        };
-
-        let res = execute(&mut ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg));
-        assert!(res.is_ok());
-
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Client)
-        ));
-        let update_client_event = downcast!(&ctx.events[1] => IbcEvent::UpdateClient).unwrap();
-
-        assert_eq!(update_client_event.client_id(), &client_id);
-        assert_eq!(update_client_event.client_type(), &mock_client_type());
-        assert_eq!(update_client_event.consensus_height(), &height);
-        assert_eq!(update_client_event.consensus_heights(), &vec![height]);
-        assert_eq!(update_client_event.header(), &header);
-    }
-
-    fn ensure_misbehaviour(ctx: &MockContext, client_id: &ClientId, client_type: &ClientType) {
-        let client_state = ctx.client_state(client_id).unwrap();
-
-        assert!(client_state.confirm_not_frozen().is_err());
-
-        // check events
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Client),
-        ));
-        let misbehaviour_client_event =
-            downcast!(&ctx.events[1] => IbcEvent::ClientMisbehaviour).unwrap();
-        assert_eq!(misbehaviour_client_event.client_id(), client_id);
-        assert_eq!(misbehaviour_client_event.client_type(), client_type);
-    }
-
-    /// Tests misbehaviour handling for the mock client.
-    /// Misbehaviour evidence consists of identical headers - mock misbehaviour handler considers it
-    /// a valid proof of misbehaviour
-    #[test]
-    fn test_misbehaviour_client_ok() {
-        let client_id = ClientId::default();
-        let timestamp = Timestamp::now();
-        let height = Height::new(0, 46).unwrap();
-        let msg = MsgSubmitMisbehaviour {
-            client_id: client_id.clone(),
-            misbehaviour: MockMisbehaviour {
-                client_id: client_id.clone(),
-                header1: MockHeader::new(height).with_timestamp(timestamp),
-                header2: MockHeader::new(height).with_timestamp(timestamp),
-            }
-            .into(),
-            signer: get_dummy_account_id(),
-        };
-
-        let mut ctx = MockContext::default().with_client(&client_id, Height::new(0, 42).unwrap());
-
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg.clone()));
-        assert!(res.is_ok());
-        let res = execute(&mut ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg));
-        assert!(res.is_ok());
-
-        ensure_misbehaviour(&ctx, &client_id, &mock_client_type());
-    }
-
-    /// Tests misbehaviour handling failure for a non-existent client
-    #[test]
-    fn test_misbehaviour_nonexisting_client() {
-        let client_id = ClientId::from_str("mockclient1").unwrap();
-        let height = Height::new(0, 46).unwrap();
-        let msg = MsgSubmitMisbehaviour {
-            client_id: ClientId::from_str("nonexistingclient").unwrap(),
-            misbehaviour: MockMisbehaviour {
-                client_id: client_id.clone(),
-                header1: MockHeader::new(height),
-                header2: MockHeader::new(height),
-            }
-            .into(),
-            signer: get_dummy_account_id(),
-        };
-
-        let ctx = MockContext::default().with_client(&client_id, Height::new(0, 42).unwrap());
-        let res = validate(&ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg));
-        assert!(res.is_err());
-    }
-
-    /// Tests misbehaviour handling for the synthetic Tendermint client.
-    /// Misbehaviour evidence consists of equivocal headers.
-    #[test]
-    fn test_misbehaviour_synthetic_tendermint_equivocation() {
-        let client_id = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(1, 20).unwrap();
-        let misbehaviour_height = Height::new(1, 21).unwrap();
-        let chain_id_b = ChainId::new("mockgaiaB", 1);
-
-        // Create a mock context for chain-A with a synthetic tendermint light client for chain-B
-        let mut ctx_a = MockContext::new(
-            ChainId::new("mockgaiaA", 1),
-            HostType::Mock,
-            5,
-            Height::new(1, 1).unwrap(),
-        )
-        .with_client_parametrized_with_chain_id(
-            chain_id_b.clone(),
-            &client_id,
-            client_height,
-            Some(tm_client_type()),
-            Some(client_height),
-        );
-
-        // Create a mock context for chain-B
-        let ctx_b = MockContext::new(
-            chain_id_b.clone(),
-            HostType::SyntheticTendermint,
-            5,
-            misbehaviour_height,
-        );
-
-        // Get chain-B's header at `misbehaviour_height`
-        let header1: TmHeader = {
-            let mut block = ctx_b.host_block(&misbehaviour_height).unwrap().clone();
-            block.set_trusted_height(client_height);
-            block.try_into_tm_block().unwrap().into()
-        };
-
-        // Generate an equivocal header for chain-B at `misbehaviour_height`
-        let header2 = {
-            let mut tm_block = HostBlock::generate_tm_block(
-                chain_id_b,
-                misbehaviour_height.revision_height(),
-                Timestamp::now(),
-            );
-            tm_block.trusted_height = client_height;
-            tm_block.into()
-        };
-
-        let msg = MsgSubmitMisbehaviour {
-            client_id: client_id.clone(),
-            misbehaviour: TmMisbehaviour::new(client_id.clone(), header1, header2).into(),
-            signer: get_dummy_account_id(),
-        };
-
-        let res = validate(&ctx_a, MsgUpdateOrMisbehaviour::Misbehaviour(msg.clone()));
-        assert!(res.is_ok());
-        let res = execute(&mut ctx_a, MsgUpdateOrMisbehaviour::Misbehaviour(msg));
-        assert!(res.is_ok());
-        ensure_misbehaviour(&ctx_a, &client_id, &tm_client_type());
-    }
-
-    #[test]
-    fn test_misbehaviour_synthetic_tendermint_bft_time() {
-        let client_id = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(1, 20).unwrap();
-        let misbehaviour_height = Height::new(1, 21).unwrap();
-        let chain_id_b = ChainId::new("mockgaiaB", 1);
-
-        // Create a mock context for chain-A with a synthetic tendermint light client for chain-B
-        let mut ctx_a = MockContext::new(
-            ChainId::new("mockgaiaA", 1),
-            HostType::Mock,
-            5,
-            Height::new(1, 1).unwrap(),
-        )
-        .with_client_parametrized_with_chain_id(
-            chain_id_b.clone(),
-            &client_id,
-            client_height,
-            Some(tm_client_type()),
-            Some(client_height),
-        );
-
-        // Generate `header1` for chain-B
-        let header1 = {
-            let mut tm_block = HostBlock::generate_tm_block(
-                chain_id_b.clone(),
-                misbehaviour_height.revision_height(),
-                Timestamp::now(),
-            );
-            tm_block.trusted_height = client_height;
-            tm_block
-        };
-
-        // Generate `header2` for chain-B which is identical to `header1` but with a conflicting
-        // timestamp
-        let header2 = {
-            let timestamp =
-                Timestamp::from_nanoseconds(Timestamp::now().nanoseconds() + 1_000_000_000)
-                    .unwrap();
-            let mut tm_block = HostBlock::generate_tm_block(
-                chain_id_b,
-                misbehaviour_height.revision_height(),
-                timestamp,
-            );
-            tm_block.trusted_height = client_height;
-            tm_block
-        };
-
-        let msg = MsgSubmitMisbehaviour {
-            client_id: client_id.clone(),
-            misbehaviour: TmMisbehaviour::new(client_id.clone(), header1.into(), header2.into())
-                .into(),
-            signer: get_dummy_account_id(),
-        };
-
-        let res = validate(&ctx_a, MsgUpdateOrMisbehaviour::Misbehaviour(msg.clone()));
-        assert!(res.is_ok());
-        let res = execute(&mut ctx_a, MsgUpdateOrMisbehaviour::Misbehaviour(msg));
-        assert!(res.is_ok());
-        ensure_misbehaviour(&ctx_a, &client_id, &tm_client_type());
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/handler/upgrade_client.rs b/crates/ibc/src/core/ics02_client/handler/upgrade_client.rs
deleted file mode 100644
index 70035c5b3..000000000
--- a/crates/ibc/src/core/ics02_client/handler/upgrade_client.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-//! Protocol logic specific to processing ICS2 messages of type `MsgUpgradeAnyClient`.
-//!
-use crate::prelude::*;
-
-use crate::core::context::ContextError;
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::client_state::ClientStateExecution;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics02_client::events::UpgradeClient;
-use crate::core::ics02_client::msgs::upgrade_client::MsgUpgradeClient;
-use crate::core::ics24_host::path::ClientConsensusStatePath;
-use crate::core::{ExecutionContext, ValidationContext};
-
-pub(crate) fn validate<Ctx>(ctx: &Ctx, msg: MsgUpgradeClient) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    let MsgUpgradeClient {
-        client_id, signer, ..
-    } = msg;
-
-    ctx.validate_message_signer(&signer)?;
-
-    // Read the current latest client state from the host chain store.
-    let old_client_state = ctx.client_state(&client_id)?;
-
-    // Check if the client is frozen.
-    old_client_state.confirm_not_frozen()?;
-
-    // Read the latest consensus state from the host chain store.
-    let old_client_cons_state_path =
-        ClientConsensusStatePath::new(&client_id, &old_client_state.latest_height());
-    let old_consensus_state = ctx
-        .consensus_state(&old_client_cons_state_path)
-        .map_err(|_| ClientError::ConsensusStateNotFound {
-            client_id: client_id.clone(),
-            height: old_client_state.latest_height(),
-        })?;
-
-    let now = ctx.host_timestamp()?;
-    let duration = now
-        .duration_since(&old_consensus_state.timestamp())
-        .ok_or_else(|| ClientError::InvalidConsensusStateTimestamp {
-            time1: old_consensus_state.timestamp(),
-            time2: now,
-        })?;
-
-    // Check if the latest consensus state is within the trust period.
-    if old_client_state.expired(duration) {
-        return Err(ContextError::ClientError(
-            ClientError::HeaderNotWithinTrustPeriod {
-                latest_time: old_consensus_state.timestamp(),
-                update_time: now,
-            },
-        ));
-    };
-
-    // Validate the upgraded client state and consensus state and verify proofs against the root
-    old_client_state.verify_upgrade_client(
-        msg.upgraded_client_state.clone(),
-        msg.upgraded_consensus_state,
-        msg.proof_upgrade_client,
-        msg.proof_upgrade_consensus_state,
-        old_consensus_state.root(),
-    )?;
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(ctx: &mut Ctx, msg: MsgUpgradeClient) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let MsgUpgradeClient { client_id, .. } = msg;
-
-    let old_client_state = ctx.client_state(&client_id)?;
-
-    let latest_height = old_client_state.update_state_on_upgrade(
-        ctx.get_client_execution_context(),
-        &client_id,
-        msg.upgraded_client_state.clone(),
-        msg.upgraded_consensus_state,
-    )?;
-
-    let event = IbcEvent::UpgradeClient(UpgradeClient::new(
-        client_id,
-        old_client_state.client_type(),
-        latest_height,
-    ));
-    ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client));
-    ctx.emit_ibc_event(event);
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-    use crate::clients::ics07_tendermint::client_type;
-    use crate::clients::ics07_tendermint::header::test_util::get_dummy_tendermint_header;
-
-    use crate::core::ics02_client::error::UpgradeClientError;
-    use crate::core::ics03_connection::handler::test_util::{Expect, Fixture};
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::downcast;
-    use crate::Height;
-
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::{AnyClientState, AnyConsensusState, MockContext};
-
-    enum Ctx {
-        Default,
-        WithClient,
-    }
-
-    enum Msg {
-        Default,
-        LowUpgradeHeight,
-        UnknownUpgradedClientStateType,
-    }
-
-    fn msg_upgrade_client_fixture(ctx_variant: Ctx, msg_variant: Msg) -> Fixture<MsgUpgradeClient> {
-        let client_id = ClientId::new(mock_client_type(), 0).unwrap();
-
-        let ctx_default = MockContext::default();
-        let ctx_with_client = ctx_default
-            .clone()
-            .with_client(&client_id, Height::new(0, 42).unwrap());
-        let ctx = match ctx_variant {
-            Ctx::Default => ctx_default,
-            Ctx::WithClient => ctx_with_client,
-        };
-
-        let upgrade_height = Height::new(1, 26).unwrap();
-        let msg_default = MsgUpgradeClient::new_dummy(upgrade_height);
-
-        let low_upgrade_height = Height::new(0, 26).unwrap();
-        let msg_with_low_upgrade_height = MsgUpgradeClient::new_dummy(low_upgrade_height);
-
-        let msg_with_unknown_upgraded_cs = MsgUpgradeClient {
-            upgraded_client_state: TmClientState::new_dummy_from_header(
-                get_dummy_tendermint_header(),
-            )
-            .into(),
-            ..msg_default.clone()
-        };
-
-        let msg = match msg_variant {
-            Msg::Default => msg_default,
-            Msg::LowUpgradeHeight => msg_with_low_upgrade_height,
-            Msg::UnknownUpgradedClientStateType => msg_with_unknown_upgraded_cs,
-        };
-
-        Fixture { ctx, msg }
-    }
-
-    fn upgrade_client_validate(fxt: &Fixture<MsgUpgradeClient>, expect: Expect) {
-        let Fixture { ctx, msg } = fxt;
-        let res = validate(ctx, msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
-
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}");
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-            }
-        };
-    }
-
-    fn upgrade_client_execute(fxt: &mut Fixture<MsgUpgradeClient>, expect: Expect) {
-        let res = execute(&mut fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
-        match expect {
-            Expect::Failure(err) => {
-                assert!(res.is_err(), "{err_msg}");
-                assert_eq!(
-                    core::mem::discriminant(res.as_ref().unwrap_err()),
-                    core::mem::discriminant(&err.unwrap())
-                );
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-                assert!(matches!(
-                    fxt.ctx.events[0],
-                    IbcEvent::Message(MessageEvent::Client)
-                ));
-                let upgrade_client_event =
-                    downcast!(&fxt.ctx.events[1] => IbcEvent::UpgradeClient).unwrap();
-                let plan_height = Height::new(1, 26).unwrap();
-
-                assert_eq!(upgrade_client_event.client_id(), &fxt.msg.client_id);
-                assert_eq!(upgrade_client_event.client_type(), &mock_client_type());
-                assert_eq!(upgrade_client_event.consensus_height(), &plan_height);
-
-                let client_state = fxt.ctx.client_state(&fxt.msg.client_id).unwrap();
-                let msg_client_state: AnyClientState =
-                    fxt.msg.upgraded_client_state.clone().try_into().unwrap();
-                assert_eq!(client_state, msg_client_state);
-
-                let consensus_state = fxt
-                    .ctx
-                    .consensus_state(&ClientConsensusStatePath::new(
-                        &fxt.msg.client_id,
-                        &plan_height,
-                    ))
-                    .unwrap();
-                let msg_consensus_state: AnyConsensusState =
-                    fxt.msg.upgraded_consensus_state.clone().try_into().unwrap();
-                assert_eq!(consensus_state, msg_consensus_state);
-            }
-        };
-    }
-
-    #[test]
-    fn msg_upgrade_client_healthy() {
-        let mut fxt = msg_upgrade_client_fixture(Ctx::WithClient, Msg::Default);
-        upgrade_client_validate(&fxt, Expect::Success);
-        upgrade_client_execute(&mut fxt, Expect::Success);
-    }
-
-    #[test]
-    fn upgrade_client_fail_nonexisting_client() {
-        let fxt = msg_upgrade_client_fixture(Ctx::Default, Msg::Default);
-        let expected_err = ContextError::ClientError(ClientError::ClientStateNotFound {
-            client_id: fxt.msg.client_id.clone(),
-        });
-        upgrade_client_validate(&fxt, Expect::Failure(Some(expected_err)));
-    }
-
-    #[test]
-    fn upgrade_client_fail_low_upgrade_height() {
-        let fxt: Fixture<MsgUpgradeClient> =
-            msg_upgrade_client_fixture(Ctx::WithClient, Msg::LowUpgradeHeight);
-        let expected_err: ClientError = UpgradeClientError::LowUpgradeHeight {
-            upgraded_height: Height::new(0, 26).unwrap(),
-            client_height: fxt.ctx.latest_height(),
-        }
-        .into();
-        upgrade_client_validate(&fxt, Expect::Failure(Some(expected_err.into())));
-    }
-
-    #[test]
-    fn upgrade_client_fail_unknown_upgraded_client_state() {
-        let fxt = msg_upgrade_client_fixture(Ctx::WithClient, Msg::UnknownUpgradedClientStateType);
-        let expected_err = ContextError::ClientError(ClientError::UnknownClientStateType {
-            client_state_type: client_type().to_string(),
-        });
-        upgrade_client_validate(&fxt, Expect::Failure(Some(expected_err)));
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/mod.rs b/crates/ibc/src/core/ics02_client/mod.rs
deleted file mode 100644
index 682e72fb3..000000000
--- a/crates/ibc/src/core/ics02_client/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//! ICS 02: Client implementation for verifying remote IBC-enabled chains.
-
-pub mod client_state;
-pub mod client_type;
-pub mod consensus_state;
-pub mod error;
-pub mod events;
-pub mod handler;
-pub mod height;
-pub mod msgs;
-
-mod context;
-pub use context::ClientExecutionContext;
diff --git a/crates/ibc/src/core/ics02_client/msgs/create_client.rs b/crates/ibc/src/core/ics02_client/msgs/create_client.rs
deleted file mode 100644
index de3de83f2..000000000
--- a/crates/ibc/src/core/ics02_client/msgs/create_client.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-//! Definition of domain type message `MsgCreateClient`.
-
-use crate::prelude::*;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::core::client::v1::MsgCreateClient as RawMsgCreateClient;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics02_client::error::ClientError;
-use crate::core::Msg;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.client.v1.MsgCreateClient";
-
-/// A type of message that triggers the creation of a new on-chain (IBC) client.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgCreateClient {
-    pub client_state: Any,
-    pub consensus_state: Any,
-    pub signer: Signer,
-}
-
-impl MsgCreateClient {
-    pub fn new(client_state: Any, consensus_state: Any, signer: Signer) -> Self {
-        MsgCreateClient {
-            client_state,
-            consensus_state,
-            signer,
-        }
-    }
-}
-
-impl Msg for MsgCreateClient {
-    type Raw = RawMsgCreateClient;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgCreateClient> for MsgCreateClient {}
-
-impl TryFrom<RawMsgCreateClient> for MsgCreateClient {
-    type Error = ClientError;
-
-    fn try_from(raw: RawMsgCreateClient) -> Result<Self, Self::Error> {
-        let raw_client_state = raw.client_state.ok_or(ClientError::MissingRawClientState)?;
-
-        let raw_consensus_state = raw
-            .consensus_state
-            .ok_or(ClientError::MissingRawConsensusState)?;
-
-        Ok(MsgCreateClient::new(
-            raw_client_state,
-            raw_consensus_state,
-            raw.signer.into(),
-        ))
-    }
-}
-
-impl From<MsgCreateClient> for RawMsgCreateClient {
-    fn from(ics_msg: MsgCreateClient) -> Self {
-        RawMsgCreateClient {
-            client_state: Some(ics_msg.client_state),
-            consensus_state: Some(ics_msg.consensus_state),
-            signer: ics_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::client::v1::MsgCreateClient as RawMsgCreateClient;
-
-    use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-    use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-    use crate::clients::ics07_tendermint::header::test_util::get_dummy_tendermint_header;
-    use crate::core::ics02_client::msgs::create_client::MsgCreateClient;
-    use crate::test_utils::get_dummy_account_id;
-
-    #[test]
-    fn msg_create_client_serialization() {
-        let signer = get_dummy_account_id();
-
-        let tm_header = get_dummy_tendermint_header();
-        let tm_client_state = TmClientState::new_dummy_from_header(tm_header.clone()).into();
-
-        let msg = MsgCreateClient::new(
-            tm_client_state,
-            TmConsensusState::try_from(tm_header).unwrap().into(),
-            signer,
-        );
-
-        let raw = RawMsgCreateClient::from(msg.clone());
-        let msg_back = MsgCreateClient::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgCreateClient::from(msg_back.clone());
-        assert_eq!(msg, msg_back);
-        assert_eq!(raw, raw_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/msgs/update_client.rs b/crates/ibc/src/core/ics02_client/msgs/update_client.rs
deleted file mode 100644
index 8597f106c..000000000
--- a/crates/ibc/src/core/ics02_client/msgs/update_client.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-//! Definition of domain type message `MsgUpdateClient`.
-
-use crate::core::Msg;
-use crate::prelude::*;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::core::client::v1::MsgUpdateClient as RawMsgUpdateClient;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.client.v1.MsgUpdateClient";
-
-/// Represents the message that triggers the update of an on-chain (IBC) client
-/// either with new headers, or evidence of misbehaviour.
-/// Note that some types of misbehaviour can be detected when a headers
-/// are updated (`UpdateKind::UpdateClient`).
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgUpdateClient {
-    pub client_id: ClientId,
-    pub header: Any,
-    pub signer: Signer,
-}
-
-impl Msg for MsgUpdateClient {
-    type Raw = RawMsgUpdateClient;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgUpdateClient> for MsgUpdateClient {}
-
-impl TryFrom<RawMsgUpdateClient> for MsgUpdateClient {
-    type Error = ClientError;
-
-    fn try_from(raw: RawMsgUpdateClient) -> Result<Self, Self::Error> {
-        Ok(MsgUpdateClient {
-            client_id: raw
-                .client_id
-                .parse()
-                .map_err(ClientError::InvalidMsgUpdateClientId)?,
-            header: raw.header.ok_or(ClientError::MissingRawHeader)?,
-            signer: raw.signer.into(),
-        })
-    }
-}
-
-impl From<MsgUpdateClient> for RawMsgUpdateClient {
-    fn from(ics_msg: MsgUpdateClient) -> Self {
-        RawMsgUpdateClient {
-            client_id: ics_msg.client_id.to_string(),
-            header: Some(ics_msg.header),
-            signer: ics_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use test_log::test;
-
-    use ibc_proto::google::protobuf::Any;
-    use ibc_proto::ibc::core::client::v1::MsgUpdateClient as RawMsgUpdateClient;
-
-    use crate::clients::ics07_tendermint::header::test_util::get_dummy_ics07_header;
-    use crate::core::ics02_client::msgs::MsgUpdateClient;
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::signer::Signer;
-    use crate::test_utils::get_dummy_account_id;
-
-    impl MsgUpdateClient {
-        pub fn new(client_id: ClientId, header: Any, signer: Signer) -> Self {
-            MsgUpdateClient {
-                client_id,
-                header,
-                signer,
-            }
-        }
-    }
-
-    #[test]
-    fn msg_update_client_serialization() {
-        let client_id: ClientId = "tendermint".parse().unwrap();
-        let signer = get_dummy_account_id();
-
-        let header = get_dummy_ics07_header();
-
-        let msg = MsgUpdateClient::new(client_id, header.into(), signer);
-        let raw = RawMsgUpdateClient::from(msg.clone());
-        let msg_back = MsgUpdateClient::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgUpdateClient::from(msg_back.clone());
-        assert_eq!(msg, msg_back);
-        assert_eq!(raw, raw_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/msgs/upgrade_client.rs b/crates/ibc/src/core/ics02_client/msgs/upgrade_client.rs
deleted file mode 100644
index b5c49613b..000000000
--- a/crates/ibc/src/core/ics02_client/msgs/upgrade_client.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-//! Definition of domain type msg `MsgUpgradeClient`.
-
-use crate::prelude::*;
-
-use core::str::FromStr;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::core::client::v1::MsgUpgradeClient as RawMsgUpgradeClient;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics02_client::error::{ClientError, UpgradeClientError};
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::ics23_commitment::error::CommitmentError;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::Msg;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.client.v1.MsgUpgradeClient";
-
-/// A type of message that triggers the upgrade of an on-chain (IBC) client.
-#[derive(Clone, Debug, PartialEq)]
-pub struct MsgUpgradeClient {
-    // client unique identifier
-    pub client_id: ClientId,
-    // Upgraded client state
-    pub upgraded_client_state: Any,
-    // Upgraded consensus state, only contains enough information
-    // to serve as a basis of trust in update logic
-    pub upgraded_consensus_state: Any,
-    // proof that old chain committed to new client
-    pub proof_upgrade_client: CommitmentProofBytes,
-    // proof that old chain committed to new consensus state
-    pub proof_upgrade_consensus_state: CommitmentProofBytes,
-    // signer address
-    pub signer: Signer,
-}
-
-impl Msg for MsgUpgradeClient {
-    type Raw = RawMsgUpgradeClient;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgUpgradeClient> for MsgUpgradeClient {}
-
-impl From<MsgUpgradeClient> for RawMsgUpgradeClient {
-    fn from(dm_msg: MsgUpgradeClient) -> RawMsgUpgradeClient {
-        RawMsgUpgradeClient {
-            client_id: dm_msg.client_id.to_string(),
-            client_state: Some(dm_msg.upgraded_client_state),
-            consensus_state: Some(dm_msg.upgraded_consensus_state),
-            proof_upgrade_client: dm_msg.proof_upgrade_client.into(),
-            proof_upgrade_consensus_state: dm_msg.proof_upgrade_consensus_state.into(),
-            signer: dm_msg.signer.to_string(),
-        }
-    }
-}
-
-impl TryFrom<RawMsgUpgradeClient> for MsgUpgradeClient {
-    type Error = ClientError;
-
-    fn try_from(proto_msg: RawMsgUpgradeClient) -> Result<Self, Self::Error> {
-        let raw_client_state = proto_msg
-            .client_state
-            .ok_or(ClientError::MissingRawClientState)?;
-
-        let raw_consensus_state = proto_msg
-            .consensus_state
-            .ok_or(ClientError::MissingRawConsensusState)?;
-
-        let c_bytes =
-            CommitmentProofBytes::try_from(proto_msg.proof_upgrade_client).map_err(|_| {
-                UpgradeClientError::InvalidUpgradeClientProof(CommitmentError::EmptyMerkleProof)
-            })?;
-        let cs_bytes = CommitmentProofBytes::try_from(proto_msg.proof_upgrade_consensus_state)
-            .map_err(|_| {
-                UpgradeClientError::InvalidUpgradeConsensusStateProof(
-                    CommitmentError::EmptyMerkleProof,
-                )
-            })?;
-
-        Ok(MsgUpgradeClient {
-            client_id: ClientId::from_str(&proto_msg.client_id)
-                .map_err(ClientError::InvalidClientIdentifier)?,
-            upgraded_client_state: raw_client_state,
-            upgraded_consensus_state: raw_consensus_state,
-            proof_upgrade_client: c_bytes,
-            proof_upgrade_consensus_state: cs_bytes,
-            signer: proto_msg.signer.into(),
-        })
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use super::*;
-
-    use crate::core::ics23_commitment::commitment::test_util::get_dummy_commitment_proof_bytes;
-    use crate::core::{ics02_client::height::Height, ics24_host::identifier::ClientId};
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::{
-        client_state::MockClientState, consensus_state::MockConsensusState, header::MockHeader,
-    };
-    use crate::test_utils::{get_dummy_account_id, get_dummy_bech32_account, get_dummy_proof};
-
-    /// Extends the implementation with additional helper methods.
-    impl MsgUpgradeClient {
-        pub fn new_dummy(upgrade_height: Height) -> Self {
-            MsgUpgradeClient {
-                client_id: ClientId::new(mock_client_type(), 0).unwrap(),
-                upgraded_client_state: MockClientState::new(MockHeader::new(upgrade_height)).into(),
-                upgraded_consensus_state: MockConsensusState::new(MockHeader::new(upgrade_height))
-                    .into(),
-                proof_upgrade_client: get_dummy_commitment_proof_bytes(),
-                proof_upgrade_consensus_state: get_dummy_commitment_proof_bytes(),
-                signer: get_dummy_account_id(),
-            }
-        }
-
-        pub fn with_client_id(self, client_id: ClientId) -> Self {
-            MsgUpgradeClient { client_id, ..self }
-        }
-    }
-
-    /// Returns a dummy `RawMsgUpgradeClient`, for testing only!
-    pub fn get_dummy_raw_msg_upgrade_client(upgrade_height: Height) -> RawMsgUpgradeClient {
-        RawMsgUpgradeClient {
-            client_id: mock_client_type().to_string(),
-            client_state: Some(MockClientState::new(MockHeader::new(upgrade_height)).into()),
-            consensus_state: Some(MockConsensusState::new(MockHeader::new(upgrade_height)).into()),
-            proof_upgrade_client: get_dummy_proof(),
-            proof_upgrade_consensus_state: get_dummy_proof(),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::core::ics02_client::height::Height;
-
-    #[test]
-    fn msg_upgrade_client_serialization() {
-        let msg = MsgUpgradeClient::new_dummy(Height::new(1, 1).unwrap());
-        let raw: RawMsgUpgradeClient = RawMsgUpgradeClient::from(msg.clone());
-        let msg_back = MsgUpgradeClient::try_from(raw.clone()).unwrap();
-        let raw_back: RawMsgUpgradeClient = RawMsgUpgradeClient::from(msg_back.clone());
-        assert_eq!(msg, msg_back);
-        assert_eq!(raw, raw_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/handler.rs b/crates/ibc/src/core/ics03_connection/handler.rs
deleted file mode 100644
index 8946943c6..000000000
--- a/crates/ibc/src/core/ics03_connection/handler.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-//! This module implements the processing logic for ICS3 (connection open
-//! handshake) messages.
-
-pub mod conn_open_ack;
-pub mod conn_open_confirm;
-pub mod conn_open_init;
-pub mod conn_open_try;
-
-#[cfg(test)]
-pub mod test_util {
-    use core::fmt::Debug;
-
-    use crate::{core::ContextError, mock::context::MockContext, prelude::String};
-    use alloc::format;
-
-    pub enum Expect {
-        Success,
-        Failure(Option<ContextError>),
-    }
-
-    #[derive(Clone, Debug)]
-    pub struct Fixture<M: Debug> {
-        pub ctx: MockContext,
-        pub msg: M,
-    }
-
-    impl<M: Debug> Fixture<M> {
-        pub fn generate_error_msg(
-            &self,
-            expect: &Expect,
-            process: &str,
-            res: &Result<(), ContextError>,
-        ) -> String {
-            let base_error = match expect {
-                Expect::Success => "step failed!",
-                Expect::Failure(_) => "step passed but was supposed to fail!",
-            };
-            format!(
-                "{process} {base_error} /n {res:?} /n {:?} /n {:?}",
-                &self.msg, &self.ctx
-            )
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_ack.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_ack.rs
deleted file mode 100644
index fffb0a747..000000000
--- a/crates/ibc/src/core/ics03_connection/handler/conn_open_ack.rs
+++ /dev/null
@@ -1,384 +0,0 @@
-//! Protocol logic specific to processing ICS3 messages of type `MsgConnectionOpenAck`.
-
-use ibc_proto::protobuf::Protobuf;
-use prost::Message;
-
-use crate::core::context::ContextError;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::events::OpenAck;
-use crate::core::ics03_connection::msgs::conn_open_ack::MsgConnectionOpenAck;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ClientConsensusStatePath, ClientStatePath, ConnectionPath};
-use crate::core::{ExecutionContext, ValidationContext};
-use crate::prelude::*;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-
-pub(crate) fn validate<Ctx>(ctx_a: &Ctx, msg: MsgConnectionOpenAck) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    let vars = LocalVars::new(ctx_a, &msg)?;
-    validate_impl(ctx_a, &msg, &vars)
-}
-
-fn validate_impl<Ctx>(
-    ctx_a: &Ctx,
-    msg: &MsgConnectionOpenAck,
-    vars: &LocalVars,
-) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    let host_height = ctx_a.host_height().map_err(|_| ConnectionError::Other {
-        description: "failed to get host height".to_string(),
-    })?;
-    if msg.consensus_height_of_a_on_b > host_height {
-        return Err(ConnectionError::InvalidConsensusHeight {
-            target_height: msg.consensus_height_of_a_on_b,
-            current_height: host_height,
-        }
-        .into());
-    }
-
-    ctx_a.validate_self_client(msg.client_state_of_a_on_b.clone())?;
-
-    msg.version
-        .verify_is_supported(vars.conn_end_on_a.versions())?;
-
-    vars.conn_end_on_a.verify_state_matches(&State::Init)?;
-
-    // Proof verification.
-    {
-        let client_state_of_b_on_a = ctx_a.client_state(vars.client_id_on_a())?;
-
-        client_state_of_b_on_a.confirm_not_frozen()?;
-        client_state_of_b_on_a.validate_proof_height(msg.proofs_height_on_b)?;
-
-        let client_cons_state_path_on_a =
-            ClientConsensusStatePath::new(vars.client_id_on_a(), &msg.proofs_height_on_b);
-        let consensus_state_of_b_on_a = ctx_a.consensus_state(&client_cons_state_path_on_a)?;
-
-        let prefix_on_a = ctx_a.commitment_prefix();
-        let prefix_on_b = vars.conn_end_on_a.counterparty().prefix();
-
-        {
-            let expected_conn_end_on_b = ConnectionEnd::new(
-                State::TryOpen,
-                vars.client_id_on_b().clone(),
-                Counterparty::new(
-                    vars.client_id_on_a().clone(),
-                    Some(msg.conn_id_on_a.clone()),
-                    prefix_on_a,
-                ),
-                vec![msg.version.clone()],
-                vars.conn_end_on_a.delay_period(),
-            )?;
-
-            client_state_of_b_on_a
-                .verify_membership(
-                    prefix_on_b,
-                    &msg.proof_conn_end_on_b,
-                    consensus_state_of_b_on_a.root(),
-                    Path::Connection(ConnectionPath::new(&msg.conn_id_on_b)),
-                    expected_conn_end_on_b.encode_vec(),
-                )
-                .map_err(ConnectionError::VerifyConnectionState)?;
-        }
-
-        client_state_of_b_on_a
-            .verify_membership(
-                prefix_on_b,
-                &msg.proof_client_state_of_a_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::ClientState(ClientStatePath::new(vars.client_id_on_b())),
-                msg.client_state_of_a_on_b.encode_to_vec(),
-            )
-            .map_err(|e| ConnectionError::ClientStateVerificationFailure {
-                client_id: vars.client_id_on_b().clone(),
-                client_error: e,
-            })?;
-
-        let expected_consensus_state_of_a_on_b =
-            ctx_a.host_consensus_state(&msg.consensus_height_of_a_on_b)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(vars.client_id_on_b(), &msg.consensus_height_of_a_on_b);
-
-        client_state_of_b_on_a
-            .verify_membership(
-                prefix_on_b,
-                &msg.proof_consensus_state_of_a_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::ClientConsensusState(client_cons_state_path_on_b),
-                expected_consensus_state_of_a_on_b.encode_vec(),
-            )
-            .map_err(|e| ConnectionError::ConsensusStateVerificationFailure {
-                height: msg.proofs_height_on_b,
-                client_error: e,
-            })?;
-    }
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(ctx_a: &mut Ctx, msg: MsgConnectionOpenAck) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let vars = LocalVars::new(ctx_a, &msg)?;
-    execute_impl(ctx_a, msg, vars)
-}
-
-fn execute_impl<Ctx>(
-    ctx_a: &mut Ctx,
-    msg: MsgConnectionOpenAck,
-    vars: LocalVars,
-) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let event = IbcEvent::OpenAckConnection(OpenAck::new(
-        msg.conn_id_on_a.clone(),
-        vars.client_id_on_a().clone(),
-        msg.conn_id_on_b.clone(),
-        vars.client_id_on_b().clone(),
-    ));
-    ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection));
-    ctx_a.emit_ibc_event(event);
-
-    ctx_a.log_message("success: conn_open_ack verification passed".to_string());
-
-    {
-        let new_conn_end_on_a = {
-            let mut counterparty = vars.conn_end_on_a.counterparty().clone();
-            counterparty.connection_id = Some(msg.conn_id_on_b.clone());
-
-            let mut new_conn_end_on_a = vars.conn_end_on_a;
-            new_conn_end_on_a.set_state(State::Open);
-            new_conn_end_on_a.set_version(msg.version.clone());
-            new_conn_end_on_a.set_counterparty(counterparty);
-            new_conn_end_on_a
-        };
-
-        ctx_a.store_connection(&ConnectionPath::new(&msg.conn_id_on_a), new_conn_end_on_a)?;
-    }
-
-    Ok(())
-}
-
-struct LocalVars {
-    conn_end_on_a: ConnectionEnd,
-}
-
-impl LocalVars {
-    fn new<Ctx>(ctx_a: &Ctx, msg: &MsgConnectionOpenAck) -> Result<Self, ContextError>
-    where
-        Ctx: ValidationContext,
-    {
-        Ok(LocalVars {
-            conn_end_on_a: ctx_a.connection_end(&msg.conn_id_on_a)?,
-        })
-    }
-
-    fn client_id_on_a(&self) -> &ClientId {
-        self.conn_end_on_a.client_id()
-    }
-
-    fn client_id_on_b(&self) -> &ClientId {
-        self.conn_end_on_a.counterparty().client_id()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use core::str::FromStr;
-    use test_log::test;
-
-    use crate::core::ics02_client::height::Height;
-    use crate::core::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
-    use crate::core::ics03_connection::handler::test_util::{Expect, Fixture};
-    use crate::core::ics03_connection::msgs::conn_open_ack::MsgConnectionOpenAck;
-    use crate::core::ics23_commitment::commitment::CommitmentPrefix;
-    use crate::core::ics24_host::identifier::{ChainId, ClientId};
-
-    use crate::core::events::IbcEvent;
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::mock::context::MockContext;
-    use crate::mock::host::HostType;
-
-    enum Ctx {
-        New,
-        NewWithConnection,
-        NewWithConnectionEndOpen,
-        DefaultWithConnection,
-    }
-
-    fn conn_open_ack_fixture(ctx: Ctx) -> Fixture<MsgConnectionOpenAck> {
-        let msg = MsgConnectionOpenAck::new_dummy(10, 10);
-
-        // Client parameters -- identifier and correct height (matching the proof height)
-        let client_id = ClientId::from_str("mock_clientid").unwrap();
-        let proof_height = msg.proofs_height_on_b;
-        let conn_id = msg.conn_id_on_a.clone();
-
-        // Parametrize the host chain to have a height at least as recent as the
-        // the height of the proofs in the Ack msg.
-        let latest_height = proof_height.increment();
-        let max_history_size = 5;
-
-        // A connection end that will exercise the successful path.
-        let default_conn_end = ConnectionEnd::new(
-            State::Init,
-            client_id.clone(),
-            Counterparty::new(
-                client_id.clone(),
-                Some(msg.conn_id_on_b.clone()),
-                CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
-            ),
-            vec![msg.version.clone()],
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        // A connection end with incorrect state `Open`; will be part of the context.
-        let mut conn_end_open = default_conn_end.clone();
-        conn_end_open.set_state(State::Open); // incorrect field
-
-        let ctx_default = MockContext::default();
-        let ctx_new = MockContext::new(
-            ChainId::new("mockgaia", latest_height.revision_number()),
-            HostType::Mock,
-            max_history_size,
-            latest_height,
-        );
-        let ctx = match ctx {
-            Ctx::New => ctx_new,
-            Ctx::NewWithConnection => ctx_new
-                .with_client(&client_id, proof_height)
-                .with_connection(conn_id, default_conn_end),
-            Ctx::DefaultWithConnection => ctx_default
-                .with_client(&client_id, proof_height)
-                .with_connection(conn_id, default_conn_end),
-            Ctx::NewWithConnectionEndOpen => ctx_new
-                .with_client(&client_id, proof_height)
-                .with_connection(conn_id, conn_end_open),
-        };
-
-        Fixture { ctx, msg }
-    }
-
-    fn conn_open_ack_validate(fxt: &Fixture<MsgConnectionOpenAck>, expect: Expect) {
-        let res = validate(&fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
-        match expect {
-            Expect::Failure(err) => {
-                assert!(res.is_err(), "{err_msg}");
-                assert_eq!(
-                    core::mem::discriminant(res.as_ref().unwrap_err()),
-                    core::mem::discriminant(&err.unwrap())
-                );
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-                return;
-            }
-        };
-        let right_connection_id = fxt.msg.conn_id_on_a.clone();
-        let cons_state_height = fxt.msg.consensus_height_of_a_on_b;
-        match res.unwrap_err() {
-            ContextError::ConnectionError(ConnectionError::ConnectionNotFound {
-                connection_id,
-            }) => {
-                assert_eq!(connection_id, right_connection_id)
-            }
-            ContextError::ConnectionError(ConnectionError::InvalidConsensusHeight {
-                target_height,
-                current_height: _,
-            }) => {
-                assert_eq!(cons_state_height, target_height);
-            }
-            ContextError::ConnectionError(ConnectionError::InvalidState {
-                expected: _,
-                actual: _,
-            }) => {}
-            _ => unreachable!(),
-        }
-    }
-
-    fn conn_open_ack_execute(fxt: &mut Fixture<MsgConnectionOpenAck>, expect: Expect) {
-        let res = execute(&mut fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}");
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-                assert_eq!(fxt.ctx.events.len(), 2);
-
-                assert!(matches!(
-                    fxt.ctx.events[0],
-                    IbcEvent::Message(MessageEvent::Connection)
-                ));
-                let event = &fxt.ctx.events[1];
-                assert!(matches!(event, &IbcEvent::OpenAckConnection(_)));
-
-                let conn_open_try_event = match event {
-                    IbcEvent::OpenAckConnection(e) => e,
-                    _ => unreachable!(),
-                };
-                let conn_end = <MockContext as ValidationContext>::connection_end(
-                    &fxt.ctx,
-                    conn_open_try_event.conn_id_on_a(),
-                )
-                .unwrap();
-                assert_eq!(conn_end.state().clone(), State::Open);
-            }
-        }
-    }
-
-    #[test]
-    fn conn_open_ack_healthy() {
-        let mut fxt = conn_open_ack_fixture(Ctx::NewWithConnection);
-        conn_open_ack_validate(&fxt, Expect::Success);
-        conn_open_ack_execute(&mut fxt, Expect::Success);
-    }
-
-    #[test]
-    fn conn_open_ack_no_connection() {
-        let fxt = conn_open_ack_fixture(Ctx::New);
-        let expected_err = ContextError::ConnectionError(ConnectionError::ConnectionNotFound {
-            connection_id: fxt.msg.conn_id_on_a.clone(),
-        });
-        conn_open_ack_validate(&fxt, Expect::Failure(Some(expected_err)));
-    }
-
-    #[test]
-    fn conn_open_ack_invalid_consensus_height() {
-        let fxt = conn_open_ack_fixture(Ctx::DefaultWithConnection);
-        let expected_err = ContextError::ConnectionError(ConnectionError::InvalidConsensusHeight {
-            target_height: fxt.msg.consensus_height_of_a_on_b,
-            current_height: Height::new(0, 10).unwrap(),
-        });
-        conn_open_ack_validate(&fxt, Expect::Failure(Some(expected_err)));
-    }
-
-    #[test]
-    fn conn_open_ack_connection_mismatch() {
-        let fxt = conn_open_ack_fixture(Ctx::NewWithConnectionEndOpen);
-        let expected_err = ContextError::ConnectionError(ConnectionError::InvalidState {
-            expected: State::Init.to_string(),
-            actual: State::Open.to_string(),
-        });
-        conn_open_ack_validate(&fxt, Expect::Failure(Some(expected_err)));
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_confirm.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_confirm.rs
deleted file mode 100644
index 3f7d88f23..000000000
--- a/crates/ibc/src/core/ics03_connection/handler/conn_open_confirm.rs
+++ /dev/null
@@ -1,287 +0,0 @@
-//! Protocol logic specific to processing ICS3 messages of type `MsgConnectionOpenConfirm`.
-
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::context::ContextError;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::events::OpenConfirm;
-use crate::core::ics03_connection::msgs::conn_open_confirm::MsgConnectionOpenConfirm;
-use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ClientConsensusStatePath, ConnectionPath};
-use crate::core::{ExecutionContext, ValidationContext};
-use crate::prelude::*;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-
-pub(crate) fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgConnectionOpenConfirm) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    let vars = LocalVars::new(ctx_b, msg)?;
-    validate_impl(ctx_b, msg, &vars)
-}
-
-fn validate_impl<Ctx>(
-    ctx_b: &Ctx,
-    msg: &MsgConnectionOpenConfirm,
-    vars: &LocalVars,
-) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_b.validate_message_signer(&msg.signer)?;
-
-    let conn_end_on_b = vars.conn_end_on_b();
-
-    conn_end_on_b.verify_state_matches(&State::TryOpen)?;
-
-    let client_id_on_a = vars.client_id_on_a();
-    let client_id_on_b = vars.client_id_on_b();
-    let conn_id_on_a = vars.conn_id_on_a()?;
-
-    // Verify proofs
-    {
-        let client_state_of_a_on_b = ctx_b.client_state(client_id_on_b)?;
-
-        client_state_of_a_on_b.confirm_not_frozen()?;
-        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(client_id_on_b, &msg.proof_height_on_a);
-        let consensus_state_of_a_on_b = ctx_b.consensus_state(&client_cons_state_path_on_b)?;
-
-        let prefix_on_a = conn_end_on_b.counterparty().prefix();
-        let prefix_on_b = ctx_b.commitment_prefix();
-
-        let expected_conn_end_on_a = ConnectionEnd::new(
-            State::Open,
-            client_id_on_a.clone(),
-            Counterparty::new(
-                client_id_on_b.clone(),
-                Some(msg.conn_id_on_b.clone()),
-                prefix_on_b,
-            ),
-            conn_end_on_b.versions().to_vec(),
-            conn_end_on_b.delay_period(),
-        )?;
-
-        client_state_of_a_on_b
-            .verify_membership(
-                prefix_on_a,
-                &msg.proof_conn_end_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::Connection(ConnectionPath::new(conn_id_on_a)),
-                expected_conn_end_on_a.encode_vec(),
-            )
-            .map_err(ConnectionError::VerifyConnectionState)?;
-    }
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(
-    ctx_b: &mut Ctx,
-    msg: &MsgConnectionOpenConfirm,
-) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let vars = LocalVars::new(ctx_b, msg)?;
-    execute_impl(ctx_b, msg, vars)
-}
-
-fn execute_impl<Ctx>(
-    ctx_b: &mut Ctx,
-    msg: &MsgConnectionOpenConfirm,
-    vars: LocalVars,
-) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let client_id_on_a = vars.client_id_on_a();
-    let client_id_on_b = vars.client_id_on_b();
-    let conn_id_on_a = vars.conn_id_on_a()?;
-
-    let event = IbcEvent::OpenConfirmConnection(OpenConfirm::new(
-        msg.conn_id_on_b.clone(),
-        client_id_on_b.clone(),
-        conn_id_on_a.clone(),
-        client_id_on_a.clone(),
-    ));
-    ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection));
-    ctx_b.emit_ibc_event(event);
-    ctx_b.log_message("success: conn_open_confirm verification passed".to_string());
-
-    {
-        let new_conn_end_on_b = {
-            let mut new_conn_end_on_b = vars.conn_end_on_b;
-
-            new_conn_end_on_b.set_state(State::Open);
-            new_conn_end_on_b
-        };
-
-        ctx_b.store_connection(&ConnectionPath(msg.conn_id_on_b.clone()), new_conn_end_on_b)?;
-    }
-
-    Ok(())
-}
-
-struct LocalVars {
-    conn_end_on_b: ConnectionEnd,
-}
-
-impl LocalVars {
-    fn new<Ctx>(ctx_b: &Ctx, msg: &MsgConnectionOpenConfirm) -> Result<Self, ContextError>
-    where
-        Ctx: ValidationContext,
-    {
-        Ok(Self {
-            conn_end_on_b: ctx_b.connection_end(&msg.conn_id_on_b)?,
-        })
-    }
-
-    fn conn_end_on_b(&self) -> &ConnectionEnd {
-        &self.conn_end_on_b
-    }
-
-    fn client_id_on_a(&self) -> &ClientId {
-        self.conn_end_on_b.counterparty().client_id()
-    }
-
-    fn client_id_on_b(&self) -> &ClientId {
-        self.conn_end_on_b.client_id()
-    }
-
-    fn conn_id_on_a(&self) -> Result<&ConnectionId, ConnectionError> {
-        self.conn_end_on_b
-            .counterparty()
-            .connection_id()
-            .ok_or(ConnectionError::InvalidCounterparty)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use core::str::FromStr;
-    use test_log::test;
-
-    use crate::core::events::IbcEvent;
-    use crate::core::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
-    use crate::core::ics03_connection::handler::test_util::{Expect, Fixture};
-    use crate::core::ics03_connection::msgs::conn_open_confirm::MsgConnectionOpenConfirm;
-    use crate::core::ics23_commitment::commitment::CommitmentPrefix;
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::mock::context::MockContext;
-    use crate::Height;
-
-    enum Ctx {
-        Default,
-        CorrectConnection,
-        IncorrectConnection,
-    }
-
-    fn conn_open_confirm_fixture(ctx: Ctx) -> Fixture<MsgConnectionOpenConfirm> {
-        let client_id = ClientId::from_str("mock_clientid").unwrap();
-        let msg = MsgConnectionOpenConfirm::new_dummy();
-        let counterparty = Counterparty::new(
-            client_id.clone(),
-            Some(msg.conn_id_on_b.clone()),
-            CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
-        );
-
-        let ctx_default = MockContext::default();
-
-        let incorrect_conn_end_state = ConnectionEnd::new(
-            State::Init,
-            client_id.clone(),
-            counterparty,
-            ValidationContext::get_compatible_versions(&ctx_default),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let mut correct_conn_end = incorrect_conn_end_state.clone();
-        correct_conn_end.set_state(State::TryOpen);
-
-        let ctx = match ctx {
-            Ctx::Default => ctx_default,
-            Ctx::IncorrectConnection => ctx_default
-                .with_client(&client_id, Height::new(0, 10).unwrap())
-                .with_connection(msg.conn_id_on_b.clone(), incorrect_conn_end_state),
-            Ctx::CorrectConnection => ctx_default
-                .with_client(&client_id, Height::new(0, 10).unwrap())
-                .with_connection(msg.conn_id_on_b.clone(), correct_conn_end),
-        };
-
-        Fixture { ctx, msg }
-    }
-
-    fn conn_open_confirm_validate(fxt: &Fixture<MsgConnectionOpenConfirm>, expect: Expect) {
-        let res = validate(&fxt.ctx, &fxt.msg);
-        let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}");
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-            }
-        };
-    }
-
-    fn conn_open_confirm_execute(fxt: &mut Fixture<MsgConnectionOpenConfirm>, expect: Expect) {
-        let res = execute(&mut fxt.ctx, &fxt.msg);
-        let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}");
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-                assert_eq!(fxt.ctx.events.len(), 2);
-
-                assert!(matches!(
-                    fxt.ctx.events[0],
-                    IbcEvent::Message(MessageEvent::Connection)
-                ));
-                let event = &fxt.ctx.events[1];
-                assert!(matches!(event, &IbcEvent::OpenConfirmConnection(_)));
-
-                let conn_open_try_event = match event {
-                    IbcEvent::OpenConfirmConnection(e) => e,
-                    _ => unreachable!(),
-                };
-                let conn_end =
-                    ValidationContext::connection_end(&fxt.ctx, conn_open_try_event.conn_id_on_b())
-                        .unwrap();
-                assert_eq!(conn_end.state().clone(), State::Open);
-            }
-        }
-    }
-
-    #[test]
-    fn conn_open_confirm_healthy() {
-        let mut fxt = conn_open_confirm_fixture(Ctx::CorrectConnection);
-        conn_open_confirm_validate(&fxt, Expect::Success);
-        conn_open_confirm_execute(&mut fxt, Expect::Success);
-    }
-
-    #[test]
-    fn conn_open_confirm_no_connection() {
-        let fxt = conn_open_confirm_fixture(Ctx::Default);
-        conn_open_confirm_validate(&fxt, Expect::Failure(None));
-    }
-
-    #[test]
-    fn conn_open_confirm_connection_mismatch() {
-        let fxt = conn_open_confirm_fixture(Ctx::IncorrectConnection);
-        conn_open_confirm_validate(&fxt, Expect::Failure(None));
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_init.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_init.rs
deleted file mode 100644
index ec64be11b..000000000
--- a/crates/ibc/src/core/ics03_connection/handler/conn_open_init.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-//! Protocol logic specific to ICS3 messages of type `MsgConnectionOpenInit`.
-use crate::prelude::*;
-
-use crate::core::context::ContextError;
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
-use crate::core::ics03_connection::events::OpenInit;
-use crate::core::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
-use crate::core::ics24_host::identifier::ConnectionId;
-use crate::core::ics24_host::path::{ClientConnectionPath, ConnectionPath};
-use crate::core::{ExecutionContext, ValidationContext};
-
-pub(crate) fn validate<Ctx>(ctx_a: &Ctx, msg: MsgConnectionOpenInit) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    // An IBC client running on the local (host) chain should exist.
-    let client_state_of_b_on_a = ctx_a.client_state(&msg.client_id_on_a)?;
-    client_state_of_b_on_a.confirm_not_frozen()?;
-
-    if let Some(version) = msg.version {
-        version.verify_is_supported(&ctx_a.get_compatible_versions())?;
-    }
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(ctx_a: &mut Ctx, msg: MsgConnectionOpenInit) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let versions = if let Some(version) = msg.version {
-        version.verify_is_supported(&ctx_a.get_compatible_versions())?;
-        vec![version]
-    } else {
-        ctx_a.get_compatible_versions()
-    };
-
-    let conn_end_on_a = ConnectionEnd::new(
-        State::Init,
-        msg.client_id_on_a.clone(),
-        Counterparty::new(
-            msg.counterparty.client_id().clone(),
-            None,
-            msg.counterparty.prefix().clone(),
-        ),
-        versions,
-        msg.delay_period,
-    )?;
-
-    // Construct the identifier for the new connection.
-    let conn_id_on_a = ConnectionId::new(ctx_a.connection_counter()?);
-
-    ctx_a.log_message(format!(
-        "success: conn_open_init: generated new connection identifier: {conn_id_on_a}"
-    ));
-
-    {
-        let client_id_on_b = msg.counterparty.client_id().clone();
-
-        let event = IbcEvent::OpenInitConnection(OpenInit::new(
-            conn_id_on_a.clone(),
-            msg.client_id_on_a.clone(),
-            client_id_on_b,
-        ));
-        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection));
-        ctx_a.emit_ibc_event(event);
-    }
-
-    ctx_a.increase_connection_counter();
-    ctx_a.store_connection_to_client(
-        &ClientConnectionPath::new(&msg.client_id_on_a),
-        conn_id_on_a.clone(),
-    )?;
-    ctx_a.store_connection(&ConnectionPath::new(&conn_id_on_a), conn_end_on_a)?;
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::core::events::IbcEvent;
-    use crate::core::ics03_connection::connection::State;
-    use crate::core::ics03_connection::handler::test_util::{Expect, Fixture};
-    use crate::core::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
-    use crate::core::ics03_connection::version::Version;
-    use crate::mock::context::MockContext;
-    use crate::Height;
-    use test_log::test;
-
-    enum Ctx {
-        Default,
-        WithClient,
-    }
-
-    enum Msg {
-        Default,
-        NoVersion,
-        BadVersion,
-        WithCounterpartyConnId,
-    }
-
-    fn conn_open_init_fixture(
-        ctx_variant: Ctx,
-        msg_variant: Msg,
-    ) -> Fixture<MsgConnectionOpenInit> {
-        let msg_default = MsgConnectionOpenInit::new_dummy();
-        let msg = match msg_variant {
-            Msg::Default => msg_default,
-            Msg::NoVersion => msg_default.with_version(None),
-            Msg::BadVersion => msg_default.with_version(Some("random identifier 424242")),
-            Msg::WithCounterpartyConnId => msg_default.with_counterparty_conn_id(2),
-        };
-
-        let ctx_default = MockContext::default();
-        let ctx = match ctx_variant {
-            Ctx::WithClient => {
-                ctx_default.with_client(&msg.client_id_on_a, Height::new(0, 10).unwrap())
-            }
-            _ => ctx_default,
-        };
-
-        Fixture { ctx, msg }
-    }
-
-    fn conn_open_init_validate(fxt: &Fixture<MsgConnectionOpenInit>, expect: Expect) {
-        let res = validate(&fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}")
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}")
-            }
-        }
-    }
-
-    fn conn_open_init_execute(
-        fxt: &mut Fixture<MsgConnectionOpenInit>,
-        expect: Expect,
-        expected_version: Vec<Version>,
-    ) {
-        let res = execute(&mut fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}")
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-                assert_eq!(fxt.ctx.events.len(), 2);
-
-                assert!(matches!(
-                    fxt.ctx.events[0],
-                    IbcEvent::Message(MessageEvent::Connection)
-                ));
-                let event = &fxt.ctx.events[1];
-                assert!(matches!(event, &IbcEvent::OpenInitConnection(_)));
-
-                let conn_open_init_event = match event {
-                    IbcEvent::OpenInitConnection(e) => e,
-                    _ => unreachable!(),
-                };
-                let conn_end = ValidationContext::connection_end(
-                    &fxt.ctx,
-                    conn_open_init_event.conn_id_on_a(),
-                )
-                .unwrap();
-                assert_eq!(conn_end.state().clone(), State::Init);
-                assert_eq!(conn_end.versions(), expected_version);
-            }
-        }
-    }
-
-    #[test]
-    fn conn_open_init_healthy() {
-        let mut fxt = conn_open_init_fixture(Ctx::WithClient, Msg::Default);
-        conn_open_init_validate(&fxt, Expect::Success);
-        let expected_version = vec![fxt.msg.version.clone().unwrap()];
-        conn_open_init_execute(&mut fxt, Expect::Success, expected_version);
-    }
-
-    #[test]
-    fn conn_open_init_no_context() {
-        let fxt = conn_open_init_fixture(Ctx::Default, Msg::Default);
-        conn_open_init_validate(&fxt, Expect::Failure(None));
-    }
-
-    #[test]
-    fn conn_open_init_no_version() {
-        let mut fxt = conn_open_init_fixture(Ctx::WithClient, Msg::NoVersion);
-        conn_open_init_validate(&fxt, Expect::Success);
-        let expected_version = ValidationContext::get_compatible_versions(&fxt.ctx.clone());
-        conn_open_init_execute(&mut fxt, Expect::Success, expected_version);
-    }
-    #[test]
-    fn conn_open_init_incompatible_version() {
-        let fxt = conn_open_init_fixture(Ctx::WithClient, Msg::BadVersion);
-        conn_open_init_validate(&fxt, Expect::Failure(None));
-    }
-
-    #[test]
-    fn conn_open_init_with_counterparty_conn_id() {
-        let mut fxt = conn_open_init_fixture(Ctx::WithClient, Msg::WithCounterpartyConnId);
-        conn_open_init_validate(&fxt, Expect::Success);
-        let expected_version = vec![fxt.msg.version.clone().unwrap()];
-        conn_open_init_execute(&mut fxt, Expect::Success, expected_version);
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/handler/conn_open_try.rs b/crates/ibc/src/core/ics03_connection/handler/conn_open_try.rs
deleted file mode 100644
index 5608fe7c0..000000000
--- a/crates/ibc/src/core/ics03_connection/handler/conn_open_try.rs
+++ /dev/null
@@ -1,345 +0,0 @@
-//! Protocol logic specific to processing ICS3 messages of type `MsgConnectionOpenTry`.
-
-use ibc_proto::protobuf::Protobuf;
-use prost::Message;
-
-use crate::core::context::ContextError;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::{ConnectionEnd, Counterparty, State};
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::events::OpenTry;
-use crate::core::ics03_connection::msgs::conn_open_try::MsgConnectionOpenTry;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::identifier::ConnectionId;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{
-    ClientConnectionPath, ClientConsensusStatePath, ClientStatePath, ConnectionPath,
-};
-use crate::core::{ExecutionContext, ValidationContext};
-use crate::prelude::*;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-
-pub(crate) fn validate<Ctx>(ctx_b: &Ctx, msg: MsgConnectionOpenTry) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    let vars = LocalVars::new(ctx_b, &msg)?;
-    validate_impl(ctx_b, &msg, &vars)
-}
-
-fn validate_impl<Ctx>(
-    ctx_b: &Ctx,
-    msg: &MsgConnectionOpenTry,
-    vars: &LocalVars,
-) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_b.validate_message_signer(&msg.signer)?;
-
-    ctx_b.validate_self_client(msg.client_state_of_b_on_a.clone())?;
-
-    let host_height = ctx_b.host_height().map_err(|_| ConnectionError::Other {
-        description: "failed to get host height".to_string(),
-    })?;
-    if msg.consensus_height_of_b_on_a > host_height {
-        // Fail if the consensus height is too advanced.
-        return Err(ConnectionError::InvalidConsensusHeight {
-            target_height: msg.consensus_height_of_b_on_a,
-            current_height: host_height,
-        }
-        .into());
-    }
-
-    let client_id_on_a = msg.counterparty.client_id();
-
-    // Verify proofs
-    {
-        let client_state_of_a_on_b = ctx_b.client_state(vars.conn_end_on_b.client_id())?;
-
-        client_state_of_a_on_b.confirm_not_frozen()?;
-        client_state_of_a_on_b.validate_proof_height(msg.proofs_height_on_a)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(&msg.client_id_on_b, &msg.proofs_height_on_a);
-        let consensus_state_of_a_on_b = ctx_b.consensus_state(&client_cons_state_path_on_b)?;
-
-        let prefix_on_a = vars.conn_end_on_b.counterparty().prefix();
-        let prefix_on_b = ctx_b.commitment_prefix();
-
-        {
-            let expected_conn_end_on_a = ConnectionEnd::new(
-                State::Init,
-                client_id_on_a.clone(),
-                Counterparty::new(msg.client_id_on_b.clone(), None, prefix_on_b),
-                msg.versions_on_a.clone(),
-                msg.delay_period,
-            )?;
-
-            client_state_of_a_on_b
-                .verify_membership(
-                    prefix_on_a,
-                    &msg.proof_conn_end_on_a,
-                    consensus_state_of_a_on_b.root(),
-                    Path::Connection(ConnectionPath::new(&vars.conn_id_on_a)),
-                    expected_conn_end_on_a.encode_vec(),
-                )
-                .map_err(ConnectionError::VerifyConnectionState)?;
-        }
-
-        client_state_of_a_on_b
-            .verify_membership(
-                prefix_on_a,
-                &msg.proof_client_state_of_b_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::ClientState(ClientStatePath::new(client_id_on_a)),
-                msg.client_state_of_b_on_a.encode_to_vec(),
-            )
-            .map_err(|e| ConnectionError::ClientStateVerificationFailure {
-                client_id: msg.client_id_on_b.clone(),
-                client_error: e,
-            })?;
-
-        let expected_consensus_state_of_b_on_a =
-            ctx_b.host_consensus_state(&msg.consensus_height_of_b_on_a)?;
-
-        let client_cons_state_path_on_a =
-            ClientConsensusStatePath::new(client_id_on_a, &msg.consensus_height_of_b_on_a);
-
-        client_state_of_a_on_b
-            .verify_membership(
-                prefix_on_a,
-                &msg.proof_consensus_state_of_b_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::ClientConsensusState(client_cons_state_path_on_a),
-                expected_consensus_state_of_b_on_a.encode_vec(),
-            )
-            .map_err(|e| ConnectionError::ConsensusStateVerificationFailure {
-                height: msg.proofs_height_on_a,
-                client_error: e,
-            })?;
-    }
-
-    Ok(())
-}
-
-pub(crate) fn execute<Ctx>(ctx_b: &mut Ctx, msg: MsgConnectionOpenTry) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let vars = LocalVars::new(ctx_b, &msg)?;
-    execute_impl(ctx_b, msg, vars)
-}
-
-fn execute_impl<Ctx>(
-    ctx_b: &mut Ctx,
-    msg: MsgConnectionOpenTry,
-    vars: LocalVars,
-) -> Result<(), ContextError>
-where
-    Ctx: ExecutionContext,
-{
-    let conn_id_on_a = vars
-        .conn_end_on_b
-        .counterparty()
-        .connection_id()
-        .ok_or(ConnectionError::InvalidCounterparty)?;
-    let event = IbcEvent::OpenTryConnection(OpenTry::new(
-        vars.conn_id_on_b.clone(),
-        msg.client_id_on_b.clone(),
-        conn_id_on_a.clone(),
-        vars.client_id_on_a.clone(),
-    ));
-    ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection));
-    ctx_b.emit_ibc_event(event);
-    ctx_b.log_message("success: conn_open_try verification passed".to_string());
-
-    ctx_b.increase_connection_counter();
-    ctx_b.store_connection_to_client(
-        &ClientConnectionPath::new(&msg.client_id_on_b),
-        vars.conn_id_on_b.clone(),
-    )?;
-    ctx_b.store_connection(&ConnectionPath::new(&vars.conn_id_on_b), vars.conn_end_on_b)?;
-
-    Ok(())
-}
-
-struct LocalVars {
-    conn_id_on_b: ConnectionId,
-    conn_end_on_b: ConnectionEnd,
-    client_id_on_a: ClientId,
-    conn_id_on_a: ConnectionId,
-}
-
-impl LocalVars {
-    fn new<Ctx>(ctx_b: &Ctx, msg: &MsgConnectionOpenTry) -> Result<Self, ContextError>
-    where
-        Ctx: ValidationContext,
-    {
-        let version_on_b = ctx_b.pick_version(&msg.versions_on_a)?;
-
-        Ok(Self {
-            conn_id_on_b: ConnectionId::new(ctx_b.connection_counter()?),
-            conn_end_on_b: ConnectionEnd::new(
-                State::TryOpen,
-                msg.client_id_on_b.clone(),
-                msg.counterparty.clone(),
-                vec![version_on_b],
-                msg.delay_period,
-            )?,
-            client_id_on_a: msg.counterparty.client_id().clone(),
-            conn_id_on_a: msg
-                .counterparty
-                .connection_id()
-                .ok_or(ConnectionError::InvalidCounterparty)?
-                .clone(),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use test_log::test;
-
-    use crate::core::events::IbcEvent;
-    use crate::core::ics03_connection::connection::State;
-    use crate::core::ics03_connection::handler::test_util::{Expect, Fixture};
-    use crate::core::ics03_connection::msgs::conn_open_try::MsgConnectionOpenTry;
-    use crate::core::ics24_host::identifier::ChainId;
-    use crate::mock::context::MockContext;
-    use crate::mock::host::HostType;
-    use crate::Height;
-
-    enum Ctx {
-        Default,
-        WithClient,
-    }
-
-    enum Msg {
-        Default,
-        HeightAdvanced,
-        HeightOld,
-        ProofHeightMissing,
-    }
-
-    fn conn_open_try_fixture(ctx_variant: Ctx, msg_variant: Msg) -> Fixture<MsgConnectionOpenTry> {
-        let max_history_size = 5;
-        let client_cons_state_height = 10;
-        let host_chain_height = Height::new(0, 35).unwrap();
-        let pruned_height = host_chain_height
-            .sub(max_history_size as u64 + 1)
-            .unwrap()
-            .revision_height();
-
-        let msg = match msg_variant {
-            Msg::Default => MsgConnectionOpenTry::new_dummy(
-                client_cons_state_height,
-                host_chain_height.revision_height(),
-            ),
-            Msg::HeightAdvanced => MsgConnectionOpenTry::new_dummy(
-                client_cons_state_height,
-                host_chain_height.increment().revision_height(),
-            ),
-            Msg::HeightOld => {
-                MsgConnectionOpenTry::new_dummy(client_cons_state_height, pruned_height)
-            }
-            Msg::ProofHeightMissing => MsgConnectionOpenTry::new_dummy(
-                client_cons_state_height - 1,
-                host_chain_height.revision_height(),
-            ),
-        };
-
-        let ctx_new = MockContext::new(
-            ChainId::new("mockgaia", 0),
-            HostType::Mock,
-            max_history_size,
-            host_chain_height,
-        );
-        let ctx = match ctx_variant {
-            Ctx::Default => MockContext::default(),
-            Ctx::WithClient => ctx_new.with_client(
-                &msg.client_id_on_b,
-                Height::new(0, client_cons_state_height).unwrap(),
-            ),
-        };
-        Fixture { ctx, msg }
-    }
-
-    fn conn_open_try_validate(fxt: &Fixture<MsgConnectionOpenTry>, expect: Expect) {
-        let res = validate(&fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}")
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-            }
-        }
-    }
-
-    fn conn_open_try_execute(fxt: &mut Fixture<MsgConnectionOpenTry>, expect: Expect) {
-        let res = execute(&mut fxt.ctx, fxt.msg.clone());
-        let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
-        match expect {
-            Expect::Failure(_) => {
-                assert!(res.is_err(), "{err_msg}")
-            }
-            Expect::Success => {
-                assert!(res.is_ok(), "{err_msg}");
-                assert_eq!(fxt.ctx.events.len(), 2);
-
-                assert!(matches!(
-                    fxt.ctx.events[0],
-                    IbcEvent::Message(MessageEvent::Connection)
-                ));
-                let event = &fxt.ctx.events[1];
-                assert!(matches!(event, &IbcEvent::OpenTryConnection(_)));
-
-                let conn_open_try_event = match event {
-                    IbcEvent::OpenTryConnection(e) => e,
-                    _ => unreachable!(),
-                };
-                let conn_end =
-                    ValidationContext::connection_end(&fxt.ctx, conn_open_try_event.conn_id_on_b())
-                        .unwrap();
-                assert_eq!(conn_end.state().clone(), State::TryOpen);
-            }
-        }
-    }
-
-    #[test]
-    fn conn_open_try_healthy() {
-        let mut fxt = conn_open_try_fixture(Ctx::WithClient, Msg::Default);
-        conn_open_try_validate(&fxt, Expect::Success);
-        conn_open_try_execute(&mut fxt, Expect::Success);
-    }
-
-    #[test]
-    fn conn_open_try_height_advanced() {
-        let fxt = conn_open_try_fixture(Ctx::WithClient, Msg::HeightAdvanced);
-        conn_open_try_validate(&fxt, Expect::Failure(None));
-    }
-
-    #[test]
-    fn conn_open_try_height_old() {
-        let fxt = conn_open_try_fixture(Ctx::WithClient, Msg::HeightOld);
-        conn_open_try_validate(&fxt, Expect::Failure(None));
-    }
-
-    #[test]
-    fn conn_open_try_proof_height_missing() {
-        let fxt = conn_open_try_fixture(Ctx::WithClient, Msg::ProofHeightMissing);
-        conn_open_try_validate(&fxt, Expect::Failure(None));
-    }
-
-    #[test]
-    fn conn_open_try_no_client() {
-        let fxt = conn_open_try_fixture(Ctx::Default, Msg::Default);
-        conn_open_try_validate(&fxt, Expect::Failure(None));
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/mod.rs b/crates/ibc/src/core/ics03_connection/mod.rs
deleted file mode 100644
index 550e5bcaa..000000000
--- a/crates/ibc/src/core/ics03_connection/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! ICS 03: Connection implementation for connecting a client
-//! on the local chain with a client on a remote chain.
-
-pub mod connection;
-pub(crate) mod delay;
-pub mod error;
-pub mod events;
-/// Message processing logic (protocol) for ICS 03.
-pub mod handler;
-pub mod msgs;
-pub mod version;
diff --git a/crates/ibc/src/core/ics03_connection/msgs.rs b/crates/ibc/src/core/ics03_connection/msgs.rs
deleted file mode 100644
index 55f445ea3..000000000
--- a/crates/ibc/src/core/ics03_connection/msgs.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-//! Message definitions for the connection handshake datagrams.
-//!
-//! We define each of the four messages in the connection handshake protocol as a `struct`.
-//! Each such message comprises the same fields as the datagrams defined in ICS3 English spec:
-//! <https://github.com/cosmos/ibc/tree/master/spec/core/ics-003-connection-semantics>.
-//!
-//! One departure from ICS3 is that we abstract the three counterparty fields (connection id,
-//! prefix, and client id) into a single field of type `Counterparty`; this applies to messages
-//! `MsgConnectionOpenInit` and `MsgConnectionOpenTry`. One other difference with regards to
-//! abstraction is that all proof-related attributes in a message are encapsulated in `Proofs` type.
-//!
-//! Another difference to ICS3 specs is that each message comprises an additional field called
-//! `signer` which is specific to Cosmos-SDK.
-
-use crate::core::ics03_connection::msgs::conn_open_ack::MsgConnectionOpenAck;
-use crate::core::ics03_connection::msgs::conn_open_confirm::MsgConnectionOpenConfirm;
-use crate::core::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
-use crate::core::ics03_connection::msgs::conn_open_try::MsgConnectionOpenTry;
-
-pub mod conn_open_ack;
-pub mod conn_open_confirm;
-pub mod conn_open_init;
-pub mod conn_open_try;
-
-/// Enumeration of all possible messages that the ICS3 protocol processes.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum ConnectionMsg {
-    OpenInit(MsgConnectionOpenInit),
-    OpenTry(MsgConnectionOpenTry),
-    OpenAck(MsgConnectionOpenAck),
-    OpenConfirm(MsgConnectionOpenConfirm),
-}
-
-#[cfg(test)]
-pub mod test_util {
-
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::commitment::v1::MerklePrefix;
-    use ibc_proto::ibc::core::connection::v1::Counterparty as RawCounterparty;
-
-    pub fn get_dummy_raw_counterparty(conn_id: Option<u64>) -> RawCounterparty {
-        let connection_id = match conn_id {
-            Some(id) => ConnectionId::new(id).to_string(),
-            None => "".to_string(),
-        };
-        RawCounterparty {
-            client_id: ClientId::default().to_string(),
-            connection_id,
-            prefix: Some(MerklePrefix {
-                key_prefix: b"ibc".to_vec(),
-            }),
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/msgs/conn_open_ack.rs b/crates/ibc/src/core/ics03_connection/msgs/conn_open_ack.rs
deleted file mode 100644
index 1f674c499..000000000
--- a/crates/ibc/src/core/ics03_connection/msgs/conn_open_ack.rs
+++ /dev/null
@@ -1,260 +0,0 @@
-use crate::prelude::*;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenAck as RawMsgConnectionOpenAck;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::version::Version;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::ics24_host::identifier::ConnectionId;
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::Height;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenAck";
-
-/// Per our convention, this message is sent to chain A.
-/// The handler will check proofs of chain B.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgConnectionOpenAck {
-    /// ConnectionId that chain A has chosen for it's ConnectionEnd
-    pub conn_id_on_a: ConnectionId,
-    /// ConnectionId that chain B has chosen for it's ConnectionEnd
-    pub conn_id_on_b: ConnectionId,
-    /// ClientState of client tracking chain A on chain B
-    pub client_state_of_a_on_b: Any,
-    /// proof of ConnectionEnd stored on Chain B during ConnOpenTry
-    pub proof_conn_end_on_b: CommitmentProofBytes,
-    /// proof of ClientState tracking chain A on chain B
-    pub proof_client_state_of_a_on_b: CommitmentProofBytes,
-    /// proof that chain B has stored ConsensusState of chain A on its client
-    pub proof_consensus_state_of_a_on_b: CommitmentProofBytes,
-    /// Height at which all proofs in this message were taken
-    pub proofs_height_on_b: Height,
-    /// height of latest header of chain A that updated the client on chain B
-    pub consensus_height_of_a_on_b: Height,
-    pub version: Version,
-    pub signer: Signer,
-}
-
-impl Msg for MsgConnectionOpenAck {
-    type Raw = RawMsgConnectionOpenAck;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgConnectionOpenAck> for MsgConnectionOpenAck {}
-
-impl TryFrom<RawMsgConnectionOpenAck> for MsgConnectionOpenAck {
-    type Error = ConnectionError;
-
-    fn try_from(msg: RawMsgConnectionOpenAck) -> Result<Self, Self::Error> {
-        Ok(Self {
-            conn_id_on_a: msg
-                .connection_id
-                .parse()
-                .map_err(ConnectionError::InvalidIdentifier)?,
-            conn_id_on_b: msg
-                .counterparty_connection_id
-                .parse()
-                .map_err(ConnectionError::InvalidIdentifier)?,
-            client_state_of_a_on_b: msg
-                .client_state
-                .ok_or(ConnectionError::MissingClientState)?,
-            version: msg
-                .version
-                .ok_or(ConnectionError::EmptyVersions)?
-                .try_into()?,
-            proof_conn_end_on_b: msg
-                .proof_try
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proof_client_state_of_a_on_b: msg
-                .proof_client
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proof_consensus_state_of_a_on_b: msg
-                .proof_consensus
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proofs_height_on_b: msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ConnectionError::MissingProofHeight)?,
-            consensus_height_of_a_on_b: msg
-                .consensus_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ConnectionError::MissingConsensusHeight)?,
-            signer: msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgConnectionOpenAck> for RawMsgConnectionOpenAck {
-    fn from(msg: MsgConnectionOpenAck) -> Self {
-        RawMsgConnectionOpenAck {
-            connection_id: msg.conn_id_on_a.as_str().to_string(),
-            counterparty_connection_id: msg.conn_id_on_b.as_str().to_string(),
-            client_state: Some(msg.client_state_of_a_on_b),
-            proof_height: Some(msg.proofs_height_on_b.into()),
-            proof_try: msg.proof_conn_end_on_b.into(),
-            proof_client: msg.proof_client_state_of_a_on_b.into(),
-            proof_consensus: msg.proof_consensus_state_of_a_on_b.into(),
-            consensus_height: Some(msg.consensus_height_of_a_on_b.into()),
-            version: Some(msg.version.into()),
-            signer: msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::core::ics02_client::height::Height;
-    use crate::mock::client_state::MockClientState;
-    use crate::mock::header::MockHeader;
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenAck as RawMsgConnectionOpenAck;
-
-    use crate::core::ics03_connection::version::Version;
-    use crate::core::ics24_host::identifier::ConnectionId;
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    use super::MsgConnectionOpenAck;
-
-    /// Testing-specific helper methods.
-    impl MsgConnectionOpenAck {
-        /// Returns a new `MsgConnectionOpenAck` with dummy values.
-        pub fn new_dummy(proof_height: u64, consensus_height: u64) -> Self {
-            MsgConnectionOpenAck::try_from(get_dummy_raw_msg_conn_open_ack(
-                proof_height,
-                consensus_height,
-            ))
-            .unwrap()
-        }
-    }
-
-    pub fn get_dummy_raw_msg_conn_open_ack(
-        proof_height: u64,
-        consensus_height: u64,
-    ) -> RawMsgConnectionOpenAck {
-        let client_state_height = Height::new(0, consensus_height).unwrap();
-        RawMsgConnectionOpenAck {
-            connection_id: ConnectionId::new(0).to_string(),
-            counterparty_connection_id: ConnectionId::new(1).to_string(),
-            proof_try: get_dummy_proof(),
-            proof_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            proof_consensus: get_dummy_proof(),
-            consensus_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: consensus_height,
-            }),
-            client_state: Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
-            proof_client: get_dummy_proof(),
-            version: Some(Version::default().into()),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::client::v1::Height;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenAck as RawMsgConnectionOpenAck;
-
-    use crate::core::ics03_connection::msgs::conn_open_ack::test_util::get_dummy_raw_msg_conn_open_ack;
-    use crate::core::ics03_connection::msgs::conn_open_ack::MsgConnectionOpenAck;
-
-    #[test]
-    fn parse_connection_open_ack_msg() {
-        #[derive(Clone, Debug, PartialEq)]
-        struct Test {
-            name: String,
-            raw: RawMsgConnectionOpenAck,
-            want_pass: bool,
-        }
-
-        let default_ack_msg = get_dummy_raw_msg_conn_open_ack(5, 5);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_ack_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Bad connection id, non-alpha".to_string(),
-                raw: RawMsgConnectionOpenAck {
-                    connection_id: "con007".to_string(),
-                    ..default_ack_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad version, missing version".to_string(),
-                raw: RawMsgConnectionOpenAck {
-                    version: None,
-                    ..default_ack_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad proof height, height is 0".to_string(),
-                raw: RawMsgConnectionOpenAck {
-                    proof_height: Some(Height {
-                        revision_number: 1,
-                        revision_height: 0,
-                    }),
-                    ..default_ack_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad consensus height, height is 0".to_string(),
-                raw: RawMsgConnectionOpenAck {
-                    consensus_height: Some(Height {
-                        revision_number: 1,
-                        revision_height: 0,
-                    }),
-                    ..default_ack_msg
-                },
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let msg = MsgConnectionOpenAck::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                msg.is_ok(),
-                "MsgConnOpenAck::new failed for test {}, \nmsg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_conn_open_ack(5, 6);
-        let msg = MsgConnectionOpenAck::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgConnectionOpenAck::from(msg.clone());
-        let msg_back = MsgConnectionOpenAck::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/msgs/conn_open_confirm.rs b/crates/ibc/src/core/ics03_connection/msgs/conn_open_confirm.rs
deleted file mode 100644
index 69592e31b..000000000
--- a/crates/ibc/src/core/ics03_connection/msgs/conn_open_confirm.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::{prelude::*, Height};
-
-use ibc_proto::protobuf::Protobuf;
-
-use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenConfirm as RawMsgConnectionOpenConfirm;
-
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics24_host::identifier::ConnectionId;
-use crate::core::Msg;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenConfirm";
-
-/// Per our convention, this message is sent to chain B.
-/// The handler will check proofs of chain A.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgConnectionOpenConfirm {
-    /// ConnectionId that chain B has chosen for it's ConnectionEnd
-    pub conn_id_on_b: ConnectionId,
-    /// proof of ConnectionEnd stored on Chain A during ConnOpenInit
-    pub proof_conn_end_on_a: CommitmentProofBytes,
-    /// Height at which `proof_conn_end_on_a` in this message was taken
-    pub proof_height_on_a: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgConnectionOpenConfirm {
-    type Raw = RawMsgConnectionOpenConfirm;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgConnectionOpenConfirm> for MsgConnectionOpenConfirm {}
-
-impl TryFrom<RawMsgConnectionOpenConfirm> for MsgConnectionOpenConfirm {
-    type Error = ConnectionError;
-
-    fn try_from(msg: RawMsgConnectionOpenConfirm) -> Result<Self, Self::Error> {
-        Ok(Self {
-            conn_id_on_b: msg
-                .connection_id
-                .parse()
-                .map_err(ConnectionError::InvalidIdentifier)?,
-            proof_conn_end_on_a: msg
-                .proof_ack
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proof_height_on_a: msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ConnectionError::MissingProofHeight)?,
-            signer: msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgConnectionOpenConfirm> for RawMsgConnectionOpenConfirm {
-    fn from(msg: MsgConnectionOpenConfirm) -> Self {
-        RawMsgConnectionOpenConfirm {
-            connection_id: msg.conn_id_on_b.as_str().to_string(),
-            proof_ack: msg.proof_conn_end_on_a.into(),
-            proof_height: Some(msg.proof_height_on_a.into()),
-            signer: msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use super::MsgConnectionOpenConfirm;
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::client::v1::Height;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenConfirm as RawMsgConnectionOpenConfirm;
-
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    /// Testing-specific helper methods.
-    impl MsgConnectionOpenConfirm {
-        /// Returns a new `MsgConnectionOpenConfirm` with dummy values.
-        pub fn new_dummy() -> Self {
-            MsgConnectionOpenConfirm::try_from(get_dummy_raw_msg_conn_open_confirm()).unwrap()
-        }
-    }
-
-    pub fn get_dummy_raw_msg_conn_open_confirm() -> RawMsgConnectionOpenConfirm {
-        RawMsgConnectionOpenConfirm {
-            connection_id: "srcconnection".to_string(),
-            proof_ack: get_dummy_proof(),
-            proof_height: Some(Height {
-                revision_number: 0,
-                revision_height: 10,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::client::v1::Height;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenConfirm as RawMsgConnectionOpenConfirm;
-
-    use crate::core::ics03_connection::msgs::conn_open_confirm::test_util::get_dummy_raw_msg_conn_open_confirm;
-    use crate::core::ics03_connection::msgs::conn_open_confirm::MsgConnectionOpenConfirm;
-
-    #[test]
-    fn parse_connection_open_confirm_msg() {
-        #[derive(Clone, Debug, PartialEq)]
-        struct Test {
-            name: String,
-            raw: RawMsgConnectionOpenConfirm,
-            want_pass: bool,
-        }
-
-        let default_ack_msg = get_dummy_raw_msg_conn_open_confirm();
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_ack_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Bad connection id, non-alpha".to_string(),
-                raw: RawMsgConnectionOpenConfirm {
-                    connection_id: "con007".to_string(),
-                    ..default_ack_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad proof height, height is 0".to_string(),
-                raw: RawMsgConnectionOpenConfirm {
-                    proof_height: Some(Height {
-                        revision_number: 1,
-                        revision_height: 0,
-                    }),
-                    ..default_ack_msg
-                },
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let msg = MsgConnectionOpenConfirm::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                msg.is_ok(),
-                "MsgConnOpenTry::new failed for test {}, \nmsg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_conn_open_confirm();
-        let msg = MsgConnectionOpenConfirm::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgConnectionOpenConfirm::from(msg.clone());
-        let msg_back = MsgConnectionOpenConfirm::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/msgs/conn_open_init.rs b/crates/ibc/src/core/ics03_connection/msgs/conn_open_init.rs
deleted file mode 100644
index ae7c0e0a9..000000000
--- a/crates/ibc/src/core/ics03_connection/msgs/conn_open_init.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-use crate::prelude::*;
-
-use core::time::Duration;
-
-use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenInit as RawMsgConnectionOpenInit;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics03_connection::connection::Counterparty;
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::version::Version;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::Msg;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenInit";
-
-/// Per our convention, this message is sent to chain A.
-/// The handler will check proofs of chain B.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgConnectionOpenInit {
-    /// ClientId on chain A that the connection is being opened for
-    pub client_id_on_a: ClientId,
-    pub counterparty: Counterparty,
-    pub version: Option<Version>,
-    pub delay_period: Duration,
-    pub signer: Signer,
-}
-
-impl Msg for MsgConnectionOpenInit {
-    type Raw = RawMsgConnectionOpenInit;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgConnectionOpenInit> for MsgConnectionOpenInit {}
-
-impl TryFrom<RawMsgConnectionOpenInit> for MsgConnectionOpenInit {
-    type Error = ConnectionError;
-
-    fn try_from(msg: RawMsgConnectionOpenInit) -> Result<Self, Self::Error> {
-        let counterparty: Counterparty = msg
-            .counterparty
-            .ok_or(ConnectionError::MissingCounterparty)?
-            .try_into()?;
-
-        counterparty.verify_empty_connection_id()?;
-
-        Ok(Self {
-            client_id_on_a: msg
-                .client_id
-                .parse()
-                .map_err(ConnectionError::InvalidIdentifier)?,
-            counterparty,
-            version: msg.version.map(|version| version.try_into()).transpose()?,
-            delay_period: Duration::from_nanos(msg.delay_period),
-            signer: msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgConnectionOpenInit> for RawMsgConnectionOpenInit {
-    fn from(ics_msg: MsgConnectionOpenInit) -> Self {
-        RawMsgConnectionOpenInit {
-            client_id: ics_msg.client_id_on_a.as_str().to_string(),
-            counterparty: Some(ics_msg.counterparty.into()),
-            version: ics_msg.version.map(|version| version.into()),
-            delay_period: ics_msg.delay_period.as_nanos() as u64,
-            signer: ics_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::core::ics03_connection::connection::Counterparty;
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::connection::v1::{
-        MsgConnectionOpenInit as RawMsgConnectionOpenInit, Version as RawVersion,
-    };
-
-    use crate::core::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::Version;
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::test_utils::get_dummy_bech32_account;
-
-    /// Extends the implementation with additional helper methods.
-    impl MsgConnectionOpenInit {
-        /// Returns a new `MsgConnectionOpenInit` with dummy values.
-        pub fn new_dummy() -> Self {
-            MsgConnectionOpenInit::try_from(get_dummy_raw_msg_conn_open_init()).unwrap()
-        }
-
-        /// Setter for `client_id`. Amenable to chaining, since it consumes the input message.
-        pub fn with_client_id(self, client_id: ClientId) -> Self {
-            MsgConnectionOpenInit {
-                client_id_on_a: client_id,
-                ..self
-            }
-        }
-
-        /// Setter for `counterparty`. Amenable to chaining, since it consumes the input message.\
-        pub fn with_counterparty_conn_id(self, counterparty_conn_id: u64) -> Self {
-            let counterparty =
-                Counterparty::try_from(get_dummy_raw_counterparty(Some(counterparty_conn_id)))
-                    .unwrap();
-            MsgConnectionOpenInit {
-                counterparty,
-                ..self
-            }
-        }
-
-        pub fn with_version(self, identifier: Option<&str>) -> Self {
-            let version = match identifier {
-                Some(v) => Version::try_from(RawVersion {
-                    identifier: v.to_string(),
-                    features: vec![],
-                })
-                .unwrap()
-                .into(),
-                None => None,
-            };
-            MsgConnectionOpenInit { version, ..self }
-        }
-    }
-
-    /// Returns a dummy message, for testing only.
-    /// Other unit tests may import this if they depend on a MsgConnectionOpenInit.
-    pub fn get_dummy_raw_msg_conn_open_init() -> RawMsgConnectionOpenInit {
-        RawMsgConnectionOpenInit {
-            client_id: ClientId::default().to_string(),
-            counterparty: Some(get_dummy_raw_counterparty(None)),
-            version: Some(Version::default().into()),
-            delay_period: 0,
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::connection::v1::Counterparty as RawCounterparty;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenInit as RawMsgConnectionOpenInit;
-
-    use super::MsgConnectionOpenInit;
-    use crate::core::ics03_connection::msgs::conn_open_init::test_util::get_dummy_raw_msg_conn_open_init;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-
-    #[test]
-    fn parse_connection_open_init_msg() {
-        #[derive(Clone, Debug, PartialEq)]
-        struct Test {
-            name: String,
-            raw: RawMsgConnectionOpenInit,
-            want_pass: bool,
-        }
-
-        let default_init_msg = get_dummy_raw_msg_conn_open_init();
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_init_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Bad client id, name too short".to_string(),
-                raw: RawMsgConnectionOpenInit {
-                    client_id: "client".to_string(),
-                    ..default_init_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad destination connection id, name too long".to_string(),
-                raw: RawMsgConnectionOpenInit {
-                    counterparty: Some(RawCounterparty {
-                        connection_id:
-                            "abcdefghijksdffjssdkflweldflsfladfsfwjkrekcmmsdfsdfjflddmnopqrstu"
-                                .to_string(),
-                        ..get_dummy_raw_counterparty(None)
-                    }),
-                    ..default_init_msg
-                },
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let msg = MsgConnectionOpenInit::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                msg.is_ok(),
-                "MsgConnOpenInit::new failed for test {}, \nmsg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_conn_open_init();
-        let msg = MsgConnectionOpenInit::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgConnectionOpenInit::from(msg.clone());
-        let msg_back = MsgConnectionOpenInit::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-
-        // Check if handler sets counterparty connection id to `None`
-        // in case relayer passes `MsgConnectionOpenInit` message with it set to `Some(_)`.
-        let raw_with_counterpary_conn_id_some = get_dummy_raw_msg_conn_open_init();
-        let msg_with_counterpary_conn_id_some =
-            MsgConnectionOpenInit::try_from(raw_with_counterpary_conn_id_some).unwrap();
-        let raw_with_counterpary_conn_id_some_back =
-            RawMsgConnectionOpenInit::from(msg_with_counterpary_conn_id_some.clone());
-        let msg_with_counterpary_conn_id_some_back =
-            MsgConnectionOpenInit::try_from(raw_with_counterpary_conn_id_some_back.clone())
-                .unwrap();
-        assert_eq!(
-            raw_with_counterpary_conn_id_some_back
-                .counterparty
-                .unwrap()
-                .connection_id,
-            "".to_string()
-        );
-        assert_eq!(
-            msg_with_counterpary_conn_id_some,
-            msg_with_counterpary_conn_id_some_back
-        );
-    }
-}
diff --git a/crates/ibc/src/core/ics03_connection/msgs/conn_open_try.rs b/crates/ibc/src/core/ics03_connection/msgs/conn_open_try.rs
deleted file mode 100644
index 075ca9122..000000000
--- a/crates/ibc/src/core/ics03_connection/msgs/conn_open_try.rs
+++ /dev/null
@@ -1,343 +0,0 @@
-use crate::prelude::*;
-
-use core::{
-    convert::{TryFrom, TryInto},
-    time::Duration,
-};
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenTry as RawMsgConnectionOpenTry;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics03_connection::connection::Counterparty;
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::version::Version;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::Height;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenTry";
-
-/// Per our convention, this message is sent to chain B.
-/// The handler will check proofs of chain A.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgConnectionOpenTry {
-    /// ClientId on B that the connection is being opened for
-    pub client_id_on_b: ClientId,
-    /// ClientState of client tracking chain B on chain A
-    pub client_state_of_b_on_a: Any,
-    /// ClientId, ConnectionId and prefix of chain A
-    pub counterparty: Counterparty,
-    /// Versions supported by chain A
-    pub versions_on_a: Vec<Version>,
-    /// proof of ConnectionEnd stored on Chain A during ConnOpenInit
-    pub proof_conn_end_on_a: CommitmentProofBytes,
-    /// proof that chain A has stored ClientState of chain B on its client
-    pub proof_client_state_of_b_on_a: CommitmentProofBytes,
-    /// proof that chain A has stored ConsensusState of chain B on its client
-    pub proof_consensus_state_of_b_on_a: CommitmentProofBytes,
-    /// Height at which all proofs in this message were taken
-    pub proofs_height_on_a: Height,
-    /// height of latest header of chain A that updated the client on chain B
-    pub consensus_height_of_b_on_a: Height,
-    pub delay_period: Duration,
-    pub signer: Signer,
-
-    #[deprecated(since = "0.22.0")]
-    /// Only kept here for proper conversion to/from the raw type
-    previous_connection_id: String,
-}
-
-impl Msg for MsgConnectionOpenTry {
-    type Raw = RawMsgConnectionOpenTry;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgConnectionOpenTry> for MsgConnectionOpenTry {}
-
-impl TryFrom<RawMsgConnectionOpenTry> for MsgConnectionOpenTry {
-    type Error = ConnectionError;
-
-    fn try_from(msg: RawMsgConnectionOpenTry) -> Result<Self, Self::Error> {
-        let counterparty_versions = msg
-            .counterparty_versions
-            .into_iter()
-            .map(Version::try_from)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        if counterparty_versions.is_empty() {
-            return Err(ConnectionError::EmptyVersions);
-        }
-
-        // We set the deprecated `previous_connection_id` field so that we can
-        // properly convert `MsgConnectionOpenTry` into its raw form
-        #[allow(deprecated)]
-        Ok(Self {
-            previous_connection_id: msg.previous_connection_id,
-            client_id_on_b: msg
-                .client_id
-                .parse()
-                .map_err(ConnectionError::InvalidIdentifier)?,
-            client_state_of_b_on_a: msg
-                .client_state
-                .ok_or(ConnectionError::MissingClientState)?,
-            counterparty: msg
-                .counterparty
-                .ok_or(ConnectionError::MissingCounterparty)?
-                .try_into()?,
-            versions_on_a: counterparty_versions,
-            proof_conn_end_on_a: msg
-                .proof_init
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proof_client_state_of_b_on_a: msg
-                .proof_client
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proof_consensus_state_of_b_on_a: msg
-                .proof_consensus
-                .try_into()
-                .map_err(|_| ConnectionError::InvalidProof)?,
-            proofs_height_on_a: msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ConnectionError::MissingProofHeight)?,
-            consensus_height_of_b_on_a: msg
-                .consensus_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ConnectionError::MissingConsensusHeight)?,
-            delay_period: Duration::from_nanos(msg.delay_period),
-            signer: msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgConnectionOpenTry> for RawMsgConnectionOpenTry {
-    fn from(msg: MsgConnectionOpenTry) -> Self {
-        #[allow(deprecated)]
-        RawMsgConnectionOpenTry {
-            client_id: msg.client_id_on_b.as_str().to_string(),
-            previous_connection_id: msg.previous_connection_id,
-            client_state: Some(msg.client_state_of_b_on_a),
-            counterparty: Some(msg.counterparty.into()),
-            delay_period: msg.delay_period.as_nanos() as u64,
-            counterparty_versions: msg.versions_on_a.iter().map(|v| v.clone().into()).collect(),
-            proof_height: Some(msg.proofs_height_on_a.into()),
-            proof_init: msg.proof_conn_end_on_a.into(),
-            proof_client: msg.proof_client_state_of_b_on_a.into(),
-            proof_consensus: msg.proof_consensus_state_of_b_on_a.into(),
-            consensus_height: Some(msg.consensus_height_of_b_on_a.into()),
-            signer: msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::core::ics02_client::height::Height;
-    use crate::mock::client_state::MockClientState;
-    use crate::mock::header::MockHeader;
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenTry as RawMsgConnectionOpenTry;
-
-    use crate::core::ics03_connection::msgs::conn_open_try::MsgConnectionOpenTry;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    /// Testing-specific helper methods.
-    impl MsgConnectionOpenTry {
-        /// Returns a new `MsgConnectionOpenTry` with dummy values.
-        pub fn new_dummy(proof_height: u64, consensus_height: u64) -> Self {
-            MsgConnectionOpenTry::try_from(get_dummy_raw_msg_conn_open_try(
-                proof_height,
-                consensus_height,
-            ))
-            .unwrap()
-        }
-        /// Setter for `client_id`.
-        pub fn with_client_id(self, client_id: ClientId) -> MsgConnectionOpenTry {
-            MsgConnectionOpenTry {
-                client_id_on_b: client_id,
-                ..self
-            }
-        }
-    }
-
-    /// Returns a dummy `RawMsgConnectionOpenTry` with parametrized heights. The parameter
-    /// `proof_height` represents the height, on the source chain, at which this chain produced the
-    /// proof. Parameter `consensus_height` represents the height of destination chain which a
-    /// client on the source chain stores.
-    pub fn get_dummy_raw_msg_conn_open_try(
-        proof_height: u64,
-        consensus_height: u64,
-    ) -> RawMsgConnectionOpenTry {
-        let client_state_height = Height::new(0, consensus_height).unwrap();
-
-        #[allow(deprecated)]
-        RawMsgConnectionOpenTry {
-            client_id: ClientId::default().to_string(),
-            previous_connection_id: ConnectionId::default().to_string(),
-            client_state: Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
-            counterparty: Some(get_dummy_raw_counterparty(Some(0))),
-            delay_period: 0,
-            counterparty_versions: get_compatible_versions()
-                .iter()
-                .map(|v| v.clone().into())
-                .collect(),
-            proof_init: get_dummy_proof(),
-            proof_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            proof_consensus: get_dummy_proof(),
-            consensus_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: consensus_height,
-            }),
-            proof_client: get_dummy_proof(),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::client::v1::Height;
-    use ibc_proto::ibc::core::connection::v1::Counterparty as RawCounterparty;
-    use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenTry as RawMsgConnectionOpenTry;
-
-    use crate::core::ics03_connection::msgs::conn_open_try::test_util::get_dummy_raw_msg_conn_open_try;
-    use crate::core::ics03_connection::msgs::conn_open_try::MsgConnectionOpenTry;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-
-    #[test]
-    fn parse_connection_open_try_msg() {
-        #[derive(Clone, Debug, PartialEq)]
-        struct Test {
-            name: String,
-            raw: RawMsgConnectionOpenTry,
-            want_pass: bool,
-        }
-
-        let default_try_msg = get_dummy_raw_msg_conn_open_try(10, 34);
-
-        let tests: Vec<Test> =
-            vec![
-                Test {
-                    name: "Good parameters".to_string(),
-                    raw: default_try_msg.clone(),
-                    want_pass: true,
-                },
-                Test {
-                    name: "Bad client id, name too short".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        client_id: "client".to_string(),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: false,
-                },
-                Test {
-                    name: "Bad destination connection id, name too long".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        counterparty: Some(RawCounterparty {
-                            connection_id:
-                            "abcdasdfasdfsdfasfdwefwfsdfsfsfasfwewvxcvdvwgadvaadsefghijklmnopqrstu"
-                                .to_string(),
-                            ..get_dummy_raw_counterparty(Some(0))
-                        }),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: false,
-                },
-                Test {
-                    name: "Correct destination client id with lower/upper case and special chars"
-                        .to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        counterparty: Some(RawCounterparty {
-                            client_id: "ClientId_".to_string(),
-                            ..get_dummy_raw_counterparty(Some(0))
-                        }),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: true,
-                },
-                Test {
-                    name: "Bad counterparty versions, empty versions vec".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        counterparty_versions: Vec::new(),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: false,
-                },
-                Test {
-                    name: "Bad counterparty versions, empty version string".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        counterparty_versions: Vec::new(),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: false,
-                },
-                Test {
-                    name: "Bad proof height, height is 0".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        proof_height: Some(Height { revision_number: 1, revision_height: 0 }),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: false,
-                },
-                Test {
-                    name: "Bad consensus height, height is 0".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        proof_height: Some(Height { revision_number: 1, revision_height: 0 }),
-                        ..default_try_msg.clone()
-                    },
-                    want_pass: false,
-                },
-                Test {
-                    name: "Empty proof".to_string(),
-                    raw: RawMsgConnectionOpenTry {
-                        proof_init: b"".to_vec(),
-                        ..default_try_msg
-                    },
-                    want_pass: false,
-                }
-            ]
-            .into_iter()
-            .collect();
-
-        for test in tests {
-            let msg = MsgConnectionOpenTry::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                msg.is_ok(),
-                "MsgConnOpenTry::new failed for test {}, \nmsg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_conn_open_try(10, 34);
-        let msg = MsgConnectionOpenTry::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgConnectionOpenTry::from(msg.clone());
-        let msg_back = MsgConnectionOpenTry::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/context.rs b/crates/ibc/src/core/ics04_channel/context.rs
deleted file mode 100644
index 1f95c6521..000000000
--- a/crates/ibc/src/core/ics04_channel/context.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-//! ICS4 (channel) context.
-
-use crate::core::events::IbcEvent;
-use crate::core::ics02_client::client_state::ClientState;
-use crate::core::ics02_client::ClientExecutionContext;
-use crate::core::ics24_host::path::{
-    ChannelEndPath, ClientConsensusStatePath, CommitmentPath, SeqSendPath,
-};
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-use crate::prelude::*;
-use core::time::Duration;
-use num_traits::float::FloatCore;
-
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::ConnectionEnd;
-use crate::core::ics04_channel::channel::ChannelEnd;
-use crate::core::ics04_channel::commitment::PacketCommitment;
-use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-
-use super::packet::Sequence;
-
-/// Methods required in send packet validation, to be implemented by the host
-pub trait SendPacketValidationContext {
-    type ClientValidationContext;
-    type E: ClientExecutionContext;
-    type AnyConsensusState: ConsensusState;
-    type AnyClientState: ClientState<Self::ClientValidationContext, Self::E>;
-
-    /// Returns the ChannelEnd for the given `port_id` and `chan_id`.
-    fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError>;
-
-    /// Returns the ConnectionState for the given identifier `connection_id`.
-    fn connection_end(&self, connection_id: &ConnectionId) -> Result<ConnectionEnd, ContextError>;
-
-    /// Returns the ClientState for the given identifier `client_id`. Necessary dependency towards
-    /// proof verification.
-    fn client_state(&self, client_id: &ClientId) -> Result<Self::AnyClientState, ContextError>;
-
-    fn client_consensus_state(
-        &self,
-        client_cons_state_path: &ClientConsensusStatePath,
-    ) -> Result<Self::AnyConsensusState, ContextError>;
-
-    fn get_next_sequence_send(&self, seq_send_path: &SeqSendPath)
-        -> Result<Sequence, ContextError>;
-}
-
-impl<T> SendPacketValidationContext for T
-where
-    T: ValidationContext,
-{
-    type ClientValidationContext = T::ClientValidationContext;
-    type E = T::E;
-    type AnyConsensusState = T::AnyConsensusState;
-    type AnyClientState = T::AnyClientState;
-
-    fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError> {
-        self.channel_end(channel_end_path)
-    }
-
-    fn connection_end(&self, connection_id: &ConnectionId) -> Result<ConnectionEnd, ContextError> {
-        self.connection_end(connection_id)
-    }
-
-    fn client_state(&self, client_id: &ClientId) -> Result<T::AnyClientState, ContextError> {
-        self.client_state(client_id)
-    }
-
-    fn client_consensus_state(
-        &self,
-        client_cons_state_path: &ClientConsensusStatePath,
-    ) -> Result<T::AnyConsensusState, ContextError> {
-        self.consensus_state(client_cons_state_path)
-    }
-
-    fn get_next_sequence_send(
-        &self,
-        seq_send_path: &SeqSendPath,
-    ) -> Result<Sequence, ContextError> {
-        self.get_next_sequence_send(seq_send_path)
-    }
-}
-
-/// Methods required in send packet execution, to be implemented by the host
-pub trait SendPacketExecutionContext: SendPacketValidationContext {
-    fn store_next_sequence_send(
-        &mut self,
-        seq_send_path: &SeqSendPath,
-        seq: Sequence,
-    ) -> Result<(), ContextError>;
-
-    fn store_packet_commitment(
-        &mut self,
-        commitment_path: &CommitmentPath,
-        commitment: PacketCommitment,
-    ) -> Result<(), ContextError>;
-
-    /// Ibc events
-    fn emit_ibc_event(&mut self, event: IbcEvent);
-
-    /// Logging facility
-    fn log_message(&mut self, message: String);
-}
-
-impl<T> SendPacketExecutionContext for T
-where
-    T: ExecutionContext,
-{
-    fn store_next_sequence_send(
-        &mut self,
-        seq_send_path: &SeqSendPath,
-        seq: Sequence,
-    ) -> Result<(), ContextError> {
-        self.store_next_sequence_send(seq_send_path, seq)
-    }
-
-    fn store_packet_commitment(
-        &mut self,
-        commitment_path: &CommitmentPath,
-        commitment: PacketCommitment,
-    ) -> Result<(), ContextError> {
-        self.store_packet_commitment(commitment_path, commitment)
-    }
-
-    fn emit_ibc_event(&mut self, event: IbcEvent) {
-        self.emit_ibc_event(event)
-    }
-
-    fn log_message(&mut self, message: String) {
-        self.log_message(message)
-    }
-}
-
-pub(crate) fn calculate_block_delay(
-    delay_period_time: &Duration,
-    max_expected_time_per_block: &Duration,
-) -> u64 {
-    if max_expected_time_per_block.is_zero() {
-        return 0;
-    }
-
-    FloatCore::ceil(delay_period_time.as_secs_f64() / max_expected_time_per_block.as_secs_f64())
-        as u64
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler.rs b/crates/ibc/src/core/ics04_channel/handler.rs
deleted file mode 100644
index 0950dc923..000000000
--- a/crates/ibc/src/core/ics04_channel/handler.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//! This module implements the processing logic for ICS4 (channel) messages.
-
-pub(crate) mod acknowledgement;
-pub(crate) mod chan_close_confirm;
-pub(crate) mod chan_close_init;
-pub(crate) mod chan_open_ack;
-pub(crate) mod chan_open_confirm;
-pub(crate) mod chan_open_init;
-pub(crate) mod chan_open_try;
-pub(crate) mod recv_packet;
-pub(crate) mod send_packet;
-pub(crate) mod timeout;
-pub(crate) mod timeout_on_close;
diff --git a/crates/ibc/src/core/ics04_channel/handler/acknowledgement.rs b/crates/ibc/src/core/ics04_channel/handler/acknowledgement.rs
deleted file mode 100644
index e65cbecaa..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/acknowledgement.rs
+++ /dev/null
@@ -1,474 +0,0 @@
-use crate::prelude::*;
-
-use crate::core::events::MessageEvent;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics03_connection::delay::verify_conn_delay_passed;
-use crate::core::ics04_channel::channel::{Counterparty, Order, State as ChannelState};
-use crate::core::ics04_channel::commitment::{compute_ack_commitment, compute_packet_commitment};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::msgs::acknowledgement::MsgAcknowledgement;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{
-    AckPath, ChannelEndPath, ClientConsensusStatePath, CommitmentPath, SeqAckPath,
-};
-use crate::core::{events::IbcEvent, ics04_channel::events::AcknowledgePacket, router::ModuleId};
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn acknowledgement_packet_validate<ValCtx>(
-    ctx_a: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgAcknowledgement,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_a, &msg)?;
-
-    let module = ctx_a
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    module
-        .on_acknowledgement_packet_validate(&msg.packet, &msg.acknowledgement, &msg.signer)
-        .map_err(ContextError::PacketError)
-}
-
-pub(crate) fn acknowledgement_packet_execute<ExecCtx>(
-    ctx_a: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgAcknowledgement,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let chan_end_path_on_a =
-        ChannelEndPath::new(&msg.packet.port_id_on_a, &msg.packet.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-    let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
-
-    // In all cases, this event is emitted
-    let event = IbcEvent::AcknowledgePacket(AcknowledgePacket::new(
-        msg.packet.clone(),
-        chan_end_on_a.ordering,
-        conn_id_on_a.clone(),
-    ));
-    ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-    ctx_a.emit_ibc_event(event);
-
-    let commitment_path_on_a = CommitmentPath::new(
-        &msg.packet.port_id_on_a,
-        &msg.packet.chan_id_on_a,
-        msg.packet.seq_on_a,
-    );
-
-    // check if we're in the NO-OP case
-    if ctx_a.get_packet_commitment(&commitment_path_on_a).is_err() {
-        // This error indicates that the timeout has already been relayed
-        // or there is a misconfigured relayer attempting to prove a timeout
-        // for a packet never sent. Core IBC will treat this error as a no-op in order to
-        // prevent an entire relay transaction from failing and consuming unnecessary fees.
-        return Ok(());
-    };
-
-    let module = ctx_a
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    let (extras, cb_result) =
-        module.on_acknowledgement_packet_execute(&msg.packet, &msg.acknowledgement, &msg.signer);
-
-    cb_result?;
-
-    // apply state changes
-    {
-        let commitment_path_on_a = CommitmentPath {
-            port_id: msg.packet.port_id_on_a.clone(),
-            channel_id: msg.packet.chan_id_on_a.clone(),
-            sequence: msg.packet.seq_on_a,
-        };
-        ctx_a.delete_packet_commitment(&commitment_path_on_a)?;
-
-        if let Order::Ordered = chan_end_on_a.ordering {
-            // Note: in validation, we verified that `msg.packet.sequence == nextSeqRecv`
-            // (where `nextSeqRecv` is the value in the store)
-            let seq_ack_path_on_a =
-                SeqAckPath::new(&msg.packet.port_id_on_a, &msg.packet.chan_id_on_a);
-            ctx_a.store_next_sequence_ack(&seq_ack_path_on_a, msg.packet.seq_on_a.increment())?;
-        }
-    }
-
-    // emit events and logs
-    {
-        ctx_a.log_message("success: packet acknowledgement".to_string());
-
-        // Note: Acknowledgement event was emitted at the beginning
-
-        for module_event in extras.events {
-            ctx_a.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_a.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgAcknowledgement) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    let packet = &msg.packet;
-    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    chan_end_on_a.verify_state_matches(&ChannelState::Open)?;
-
-    let counterparty = Counterparty::new(
-        packet.port_id_on_b.clone(),
-        Some(packet.chan_id_on_b.clone()),
-    );
-
-    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
-
-    let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
-    let conn_end_on_a = ctx_a.connection_end(conn_id_on_a)?;
-
-    conn_end_on_a.verify_state_matches(&ConnectionState::Open)?;
-
-    let commitment_path_on_a =
-        CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a);
-
-    // Verify packet commitment
-    let commitment_on_a = match ctx_a.get_packet_commitment(&commitment_path_on_a) {
-        Ok(commitment_on_a) => commitment_on_a,
-
-        // This error indicates that the timeout has already been relayed
-        // or there is a misconfigured relayer attempting to prove a timeout
-        // for a packet never sent. Core IBC will treat this error as a no-op in order to
-        // prevent an entire relay transaction from failing and consuming unnecessary fees.
-        Err(_) => return Ok(()),
-    };
-
-    if commitment_on_a
-        != compute_packet_commitment(
-            &packet.data,
-            &packet.timeout_height_on_b,
-            &packet.timeout_timestamp_on_b,
-        )
-    {
-        return Err(PacketError::IncorrectPacketCommitment {
-            sequence: packet.seq_on_a,
-        }
-        .into());
-    }
-
-    if let Order::Ordered = chan_end_on_a.ordering {
-        let seq_ack_path_on_a = SeqAckPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-        let next_seq_ack = ctx_a.get_next_sequence_ack(&seq_ack_path_on_a)?;
-        if packet.seq_on_a != next_seq_ack {
-            return Err(PacketError::InvalidPacketSequence {
-                given_sequence: packet.seq_on_a,
-                next_sequence: next_seq_ack,
-            }
-            .into());
-        }
-    }
-
-    // Verify proofs
-    {
-        let client_id_on_a = conn_end_on_a.client_id();
-        let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-
-        client_state_of_b_on_a.confirm_not_frozen()?;
-        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
-
-        let client_cons_state_path_on_a =
-            ClientConsensusStatePath::new(client_id_on_a, &msg.proof_height_on_b);
-        let consensus_state_of_b_on_a = ctx_a.consensus_state(&client_cons_state_path_on_a)?;
-        let ack_commitment = compute_ack_commitment(&msg.acknowledgement);
-        let ack_path_on_b =
-            AckPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a);
-
-        verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
-
-        // Verify the proof for the packet against the chain store.
-        client_state_of_b_on_a
-            .verify_membership(
-                conn_end_on_a.counterparty().prefix(),
-                &msg.proof_acked_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::Ack(ack_path_on_b),
-                ack_commitment.into_vec(),
-            )
-            .map_err(|e| ChannelError::PacketVerificationFailed {
-                sequence: packet.seq_on_a,
-                client_error: e,
-            })
-            .map_err(PacketError::Channel)?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rstest::*;
-    use test_log::test;
-
-    use crate::core::ics02_client::height::Height;
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order, State};
-    use crate::core::ics04_channel::commitment::PacketCommitment;
-    use crate::core::ics04_channel::msgs::acknowledgement::test_util::get_dummy_raw_msg_acknowledgement;
-    use crate::core::ics04_channel::msgs::acknowledgement::MsgAcknowledgement;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::ChannelId;
-    use crate::core::ics24_host::identifier::PortId;
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::core::timestamp::Timestamp;
-    use crate::core::timestamp::ZERO_DURATION;
-
-    use crate::mock::context::MockContext;
-    use crate::{applications::transfer::MODULE_ID_STR, test_utils::DummyTransferModule};
-
-    struct Fixture {
-        ctx: MockContext,
-        client_height: Height,
-        module_id: ModuleId,
-        msg: MsgAcknowledgement,
-        packet_commitment: PacketCommitment,
-        conn_end_on_a: ConnectionEnd,
-        chan_end_on_a_ordered: ChannelEnd,
-        chan_end_on_a_unordered: ChannelEnd,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let client_height = Height::new(0, 2).unwrap();
-        let mut ctx = MockContext::default().with_client(&ClientId::default(), client_height);
-
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        let module = DummyTransferModule::new();
-        ctx.add_route(module_id.clone(), module).unwrap();
-
-        let msg = MsgAcknowledgement::try_from(get_dummy_raw_msg_acknowledgement(
-            client_height.revision_height(),
-        ))
-        .unwrap();
-
-        let packet = msg.packet.clone();
-
-        let packet_commitment = compute_packet_commitment(
-            &packet.data,
-            &packet.timeout_height_on_b,
-            &packet.timeout_timestamp_on_b,
-        );
-
-        let chan_end_on_a_unordered = ChannelEnd::new(
-            State::Open,
-            Order::Unordered,
-            Counterparty::new(packet.port_id_on_b, Some(packet.chan_id_on_b)),
-            vec![ConnectionId::default()],
-            Version::new("ics20-1".to_string()),
-        )
-        .unwrap();
-
-        let mut chan_end_on_a_ordered = chan_end_on_a_unordered.clone();
-        chan_end_on_a_ordered.ordering = Order::Ordered;
-
-        let conn_end_on_a = ConnectionEnd::new(
-            ConnectionState::Open,
-            ClientId::default(),
-            ConnectionCounterparty::new(
-                ClientId::default(),
-                Some(ConnectionId::default()),
-                Default::default(),
-            ),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        Fixture {
-            ctx,
-            client_height,
-            module_id,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_unordered,
-            chan_end_on_a_ordered,
-        }
-    }
-
-    #[rstest]
-    fn ack_fail_no_channel(fixture: Fixture) {
-        let Fixture { ctx, msg, .. } = fixture;
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no channel exists in the context"
-        )
-    }
-
-    /// NO-OP case
-    #[rstest]
-    fn ack_success_no_packet_commitment(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            conn_end_on_a,
-            chan_end_on_a_unordered,
-            client_height,
-            ..
-        } = fixture;
-        let ctx = ctx
-            .with_client(&ClientId::default(), client_height)
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a);
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Validation should succeed when no packet commitment is present"
-        )
-    }
-
-    #[rstest]
-    fn ack_success_happy_path(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_unordered,
-            client_height,
-            ..
-        } = fixture;
-        let mut ctx: MockContext = ctx
-            .with_client(&ClientId::default(), client_height)
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                msg.packet.port_id_on_a.clone(),
-                msg.packet.chan_id_on_a.clone(),
-                msg.packet.seq_on_a,
-                packet_commitment,
-            );
-        ctx.store_update_time(
-            ClientId::default(),
-            client_height,
-            Timestamp::from_nanoseconds(1000).unwrap(),
-        )
-        .unwrap();
-        ctx.store_update_height(
-            ClientId::default(),
-            client_height,
-            Height::new(0, 4).unwrap(),
-        )
-        .unwrap();
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Happy path: validation should succeed. err: {res:?}"
-        )
-    }
-
-    #[rstest]
-    fn ack_unordered_chan_execute(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            module_id,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_unordered,
-            ..
-        } = fixture;
-        let mut ctx = ctx
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                msg.packet.port_id_on_a.clone(),
-                msg.packet.chan_id_on_a.clone(),
-                msg.packet.seq_on_a,
-                packet_commitment,
-            );
-
-        let res = acknowledgement_packet_execute(&mut ctx, module_id, msg);
-
-        assert!(res.is_ok());
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::AcknowledgePacket(_)));
-    }
-
-    #[rstest]
-    fn ack_ordered_chan_execute(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            module_id,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_ordered,
-            ..
-        } = fixture;
-        let mut ctx = ctx
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_ordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                msg.packet.port_id_on_a.clone(),
-                msg.packet.chan_id_on_a.clone(),
-                msg.packet.seq_on_a,
-                packet_commitment,
-            );
-
-        let res = acknowledgement_packet_execute(&mut ctx, module_id, msg);
-
-        assert!(res.is_ok());
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::AcknowledgePacket(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/chan_close_confirm.rs b/crates/ibc/src/core/ics04_channel/handler/chan_close_confirm.rs
deleted file mode 100644
index 85f5df02f..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/chan_close_confirm.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-//! Protocol logic specific to ICS4 messages of type `MsgChannelCloseConfirm`.
-
-use crate::prelude::*;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, State as ChannelState};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::events::CloseConfirm;
-use crate::core::ics04_channel::msgs::chan_close_confirm::MsgChannelCloseConfirm;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ChannelEndPath, ClientConsensusStatePath};
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn chan_close_confirm_validate<ValCtx>(
-    ctx_b: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgChannelCloseConfirm,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_b, &msg)?;
-
-    let module = ctx_b
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    module.on_chan_close_confirm_validate(&msg.port_id_on_b, &msg.chan_id_on_b)?;
-
-    Ok(())
-}
-
-pub(crate) fn chan_close_confirm_execute<ExecCtx>(
-    ctx_b: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgChannelCloseConfirm,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let module = ctx_b
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    let extras = module.on_chan_close_confirm_execute(&msg.port_id_on_b, &msg.chan_id_on_b)?;
-    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
-    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
-
-    // state changes
-    {
-        let chan_end_on_b = {
-            let mut chan_end_on_b = chan_end_on_b.clone();
-            chan_end_on_b.set_state(State::Closed);
-            chan_end_on_b
-        };
-        ctx_b.store_channel(&chan_end_path_on_b, chan_end_on_b)?;
-    }
-
-    // emit events and logs
-    {
-        ctx_b.log_message("success: channel close confirm".to_string());
-
-        let core_event = {
-            let port_id_on_a = chan_end_on_b.counterparty().port_id.clone();
-            let chan_id_on_a = chan_end_on_b
-                .counterparty()
-                .channel_id
-                .clone()
-                .ok_or(ContextError::ChannelError(ChannelError::Other {
-                description:
-                    "internal error: ChannelEnd doesn't have a counterparty channel id in CloseInit"
-                        .to_string(),
-            }))?;
-            let conn_id_on_b = chan_end_on_b.connection_hops[0].clone();
-
-            IbcEvent::CloseConfirmChannel(CloseConfirm::new(
-                msg.port_id_on_b.clone(),
-                msg.chan_id_on_b.clone(),
-                port_id_on_a,
-                chan_id_on_a,
-                conn_id_on_b,
-            ))
-        };
-        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_b.emit_ibc_event(core_event);
-
-        for module_event in extras.events {
-            ctx_b.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_b.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgChannelCloseConfirm) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_b.validate_message_signer(&msg.signer)?;
-
-    // Retrieve the old channel end and validate it against the message.
-    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
-    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
-
-    // Validate that the channel end is in a state where it can be closed.
-    chan_end_on_b.verify_not_closed()?;
-
-    let conn_end_on_b = ctx_b.connection_end(&chan_end_on_b.connection_hops()[0])?;
-
-    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
-
-    // Verify proofs
-    {
-        let client_id_on_b = conn_end_on_b.client_id();
-        let client_state_of_a_on_b = ctx_b.client_state(client_id_on_b)?;
-
-        client_state_of_a_on_b.confirm_not_frozen()?;
-        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(client_id_on_b, &msg.proof_height_on_a);
-        let consensus_state_of_a_on_b = ctx_b.consensus_state(&client_cons_state_path_on_b)?;
-        let prefix_on_a = conn_end_on_b.counterparty().prefix();
-        let port_id_on_a = &chan_end_on_b.counterparty().port_id;
-        let chan_id_on_a = chan_end_on_b
-            .counterparty()
-            .channel_id()
-            .ok_or(ChannelError::MissingCounterparty)?;
-        let conn_id_on_a = conn_end_on_b.counterparty().connection_id().ok_or(
-            ChannelError::UndefinedConnectionCounterparty {
-                connection_id: chan_end_on_b.connection_hops()[0].clone(),
-            },
-        )?;
-
-        let expected_chan_end_on_a = ChannelEnd::new(
-            ChannelState::Closed,
-            *chan_end_on_b.ordering(),
-            Counterparty::new(msg.port_id_on_b.clone(), Some(msg.chan_id_on_b.clone())),
-            vec![conn_id_on_a.clone()],
-            chan_end_on_b.version().clone(),
-        )?;
-        let chan_end_path_on_a = ChannelEndPath::new(port_id_on_a, chan_id_on_a);
-
-        // Verify the proof for the channel state against the expected channel end.
-        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
-        client_state_of_a_on_b
-            .verify_membership(
-                prefix_on_a,
-                &msg.proof_chan_end_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::ChannelEnd(chan_end_path_on_a),
-                expected_chan_end_on_a.encode_vec(),
-            )
-            .map_err(ChannelError::VerifyChannelFailed)?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{
-        ChannelEnd, Counterparty, Order, State as ChannelState,
-    };
-    use crate::core::ics04_channel::msgs::chan_close_confirm::test_util::get_dummy_raw_msg_chan_close_confirm;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::core::router::ModuleId;
-    use crate::core::timestamp::ZERO_DURATION;
-
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::MockContext;
-
-    use crate::applications::transfer::MODULE_ID_STR;
-    use crate::test_utils::DummyTransferModule;
-
-    #[test]
-    fn test_chan_close_confirm_validate() {
-        let client_id = ClientId::new(mock_client_type(), 24).unwrap();
-        let conn_id = ConnectionId::new(2);
-        let default_context = MockContext::default();
-        let client_consensus_state_height = default_context.host_height().unwrap();
-
-        let conn_end = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let msg_chan_close_confirm = MsgChannelCloseConfirm::try_from(
-            get_dummy_raw_msg_chan_close_confirm(client_consensus_state_height.revision_height()),
-        )
-        .unwrap();
-
-        let chan_end = ChannelEnd::new(
-            ChannelState::Open,
-            Order::default(),
-            Counterparty::new(
-                msg_chan_close_confirm.port_id_on_b.clone(),
-                Some(msg_chan_close_confirm.chan_id_on_b.clone()),
-            ),
-            vec![conn_id.clone()],
-            Version::default(),
-        )
-        .unwrap();
-
-        let context = default_context
-            .with_client(&client_id, client_consensus_state_height)
-            .with_connection(conn_id, conn_end)
-            .with_channel(
-                msg_chan_close_confirm.port_id_on_b.clone(),
-                msg_chan_close_confirm.chan_id_on_b.clone(),
-                chan_end,
-            );
-
-        let res = validate(&context, &msg_chan_close_confirm);
-        assert!(
-            res.is_ok(),
-            "Validation expected to succeed (happy path). Error: {res:?}"
-        );
-    }
-
-    #[test]
-    fn test_chan_close_confirm_execute() {
-        let client_id = ClientId::new(mock_client_type(), 24).unwrap();
-        let conn_id = ConnectionId::new(2);
-        let default_context = MockContext::default();
-        let client_consensus_state_height = default_context.host_height().unwrap();
-
-        let conn_end = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let msg_chan_close_confirm = MsgChannelCloseConfirm::try_from(
-            get_dummy_raw_msg_chan_close_confirm(client_consensus_state_height.revision_height()),
-        )
-        .unwrap();
-
-        let chan_end = ChannelEnd::new(
-            ChannelState::Open,
-            Order::default(),
-            Counterparty::new(
-                msg_chan_close_confirm.port_id_on_b.clone(),
-                Some(msg_chan_close_confirm.chan_id_on_b.clone()),
-            ),
-            vec![conn_id.clone()],
-            Version::default(),
-        )
-        .unwrap();
-
-        let mut context = default_context
-            .with_client(&client_id, client_consensus_state_height)
-            .with_connection(conn_id, conn_end)
-            .with_channel(
-                msg_chan_close_confirm.port_id_on_b.clone(),
-                msg_chan_close_confirm.chan_id_on_b.clone(),
-                chan_end,
-            );
-
-        let module = DummyTransferModule::new();
-        let module_id = ModuleId::new(MODULE_ID_STR.to_string());
-        context.add_route(module_id.clone(), module).unwrap();
-
-        let res = chan_close_confirm_execute(&mut context, module_id, msg_chan_close_confirm);
-        assert!(res.is_ok(), "Execution success: happy path");
-
-        assert_eq!(context.events.len(), 2);
-        assert!(matches!(
-            context.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(
-            context.events[1],
-            IbcEvent::CloseConfirmChannel(_)
-        ));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/chan_close_init.rs b/crates/ibc/src/core/ics04_channel/handler/chan_close_init.rs
deleted file mode 100644
index 448801a15..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/chan_close_init.rs
+++ /dev/null
@@ -1,258 +0,0 @@
-//! Protocol logic specific to ICS4 messages of type `MsgChannelCloseInit`.
-use crate::prelude::*;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::events::CloseInit;
-use crate::core::ics04_channel::msgs::chan_close_init::MsgChannelCloseInit;
-use crate::core::ics24_host::path::ChannelEndPath;
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn chan_close_init_validate<ValCtx>(
-    ctx_a: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgChannelCloseInit,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_a, &msg)?;
-
-    let module = ctx_a
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    module.on_chan_close_init_validate(&msg.port_id_on_a, &msg.chan_id_on_a)?;
-
-    Ok(())
-}
-
-pub(crate) fn chan_close_init_execute<ExecCtx>(
-    ctx_a: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgChannelCloseInit,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let module = ctx_a
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    let extras = module.on_chan_close_init_execute(&msg.port_id_on_a, &msg.chan_id_on_a)?;
-    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    // state changes
-    {
-        let chan_end_on_a = {
-            let mut chan_end_on_a = chan_end_on_a.clone();
-            chan_end_on_a.set_state(State::Closed);
-            chan_end_on_a
-        };
-
-        ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a)?;
-    }
-
-    // emit events and logs
-    {
-        ctx_a.log_message("success: channel close init".to_string());
-
-        let core_event = {
-            let port_id_on_b = chan_end_on_a.counterparty().port_id.clone();
-            let chan_id_on_b = chan_end_on_a
-                .counterparty()
-                .channel_id
-                .clone()
-                .ok_or(ContextError::ChannelError(ChannelError::Other {
-                description:
-                    "internal error: ChannelEnd doesn't have a counterparty channel id in CloseInit"
-                        .to_string(),
-            }))?;
-            let conn_id_on_a = chan_end_on_a.connection_hops[0].clone();
-
-            IbcEvent::CloseInitChannel(CloseInit::new(
-                msg.port_id_on_a.clone(),
-                msg.chan_id_on_a.clone(),
-                port_id_on_b,
-                chan_id_on_b,
-                conn_id_on_a,
-            ))
-        };
-        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_a.emit_ibc_event(core_event);
-
-        for module_event in extras.events {
-            ctx_a.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_a.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgChannelCloseInit) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    // Validate that the channel end is in a state where it can be closed.
-    chan_end_on_a.verify_not_closed()?;
-
-    // An OPEN IBC connection running on the local (host) chain should exist.
-    chan_end_on_a.verify_connection_hops_length()?;
-
-    let conn_end_on_a = ctx_a.connection_end(&chan_end_on_a.connection_hops()[0])?;
-
-    conn_end_on_a.verify_state_matches(&ConnectionState::Open)?;
-
-    let client_id_on_a = conn_end_on_a.client_id();
-    let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-    client_state_of_b_on_a.confirm_not_frozen()?;
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{
-        ChannelEnd, Counterparty, Order, State as ChannelState,
-    };
-    use crate::core::ics04_channel::msgs::chan_close_init::test_util::get_dummy_raw_msg_chan_close_init;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::core::timestamp::ZERO_DURATION;
-
-    use crate::applications::transfer::MODULE_ID_STR;
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::MockContext;
-    use crate::test_utils::DummyTransferModule;
-
-    #[test]
-    fn test_chan_close_init_validate() {
-        let client_id = ClientId::new(mock_client_type(), 24).unwrap();
-        let conn_id = ConnectionId::new(2);
-
-        let conn_end = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let msg_chan_close_init =
-            MsgChannelCloseInit::try_from(get_dummy_raw_msg_chan_close_init()).unwrap();
-
-        let chan_end = ChannelEnd::new(
-            ChannelState::Open,
-            Order::default(),
-            Counterparty::new(
-                msg_chan_close_init.port_id_on_a.clone(),
-                Some(msg_chan_close_init.chan_id_on_a.clone()),
-            ),
-            vec![conn_id.clone()],
-            Version::default(),
-        )
-        .unwrap();
-
-        let context = {
-            let default_context = MockContext::default();
-            let client_consensus_state_height = default_context.host_height().unwrap();
-
-            default_context
-                .with_client(&client_id, client_consensus_state_height)
-                .with_connection(conn_id, conn_end)
-                .with_channel(
-                    msg_chan_close_init.port_id_on_a.clone(),
-                    msg_chan_close_init.chan_id_on_a.clone(),
-                    chan_end,
-                )
-        };
-
-        let res = validate(&context, &msg_chan_close_init);
-        assert!(
-            res.is_ok(),
-            "Validation expected to succeed (happy path). Error: {res:?}"
-        );
-    }
-
-    #[test]
-    fn test_chan_close_init_execute() {
-        let client_id = ClientId::new(mock_client_type(), 24).unwrap();
-        let conn_id = ConnectionId::new(2);
-
-        let conn_end = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let msg_chan_close_init =
-            MsgChannelCloseInit::try_from(get_dummy_raw_msg_chan_close_init()).unwrap();
-
-        let chan_end = ChannelEnd::new(
-            ChannelState::Open,
-            Order::default(),
-            Counterparty::new(
-                msg_chan_close_init.port_id_on_a.clone(),
-                Some(msg_chan_close_init.chan_id_on_a.clone()),
-            ),
-            vec![conn_id.clone()],
-            Version::default(),
-        )
-        .unwrap();
-
-        let mut context = {
-            let mut default_context = MockContext::default();
-            let client_consensus_state_height = default_context.host_height().unwrap();
-
-            let module = DummyTransferModule::new();
-            let module_id = ModuleId::new(MODULE_ID_STR.to_string());
-            default_context.add_route(module_id, module).unwrap();
-
-            default_context
-                .with_client(&client_id, client_consensus_state_height)
-                .with_connection(conn_id, conn_end)
-                .with_channel(
-                    msg_chan_close_init.port_id_on_a.clone(),
-                    msg_chan_close_init.chan_id_on_a.clone(),
-                    chan_end,
-                )
-        };
-
-        let res = chan_close_init_execute(
-            &mut context,
-            ModuleId::new(MODULE_ID_STR.to_string()),
-            msg_chan_close_init,
-        );
-        assert!(res.is_ok(), "Execution happy path");
-
-        assert_eq!(context.events.len(), 2);
-        assert!(matches!(
-            context.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(context.events[1], IbcEvent::CloseInitChannel(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/chan_open_ack.rs b/crates/ibc/src/core/ics04_channel/handler/chan_open_ack.rs
deleted file mode 100644
index b1d229cdb..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/chan_open_ack.rs
+++ /dev/null
@@ -1,392 +0,0 @@
-//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenAck`.
-
-use crate::prelude::*;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, State as ChannelState};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::events::OpenAck;
-use crate::core::ics04_channel::msgs::chan_open_ack::MsgChannelOpenAck;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ChannelEndPath, ClientConsensusStatePath};
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn chan_open_ack_validate<ValCtx>(
-    ctx_a: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenAck,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_a, &msg)?;
-
-    let module = ctx_a
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    module.on_chan_open_ack_validate(&msg.port_id_on_a, &msg.chan_id_on_a, &msg.version_on_b)?;
-
-    Ok(())
-}
-
-pub(crate) fn chan_open_ack_execute<ExecCtx>(
-    ctx_a: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenAck,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let module = ctx_a
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    let extras =
-        module.on_chan_open_ack_execute(&msg.port_id_on_a, &msg.chan_id_on_a, &msg.version_on_b)?;
-    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    // state changes
-    {
-        let chan_end_on_a = {
-            let mut chan_end_on_a = chan_end_on_a.clone();
-
-            chan_end_on_a.set_state(State::Open);
-            chan_end_on_a.set_version(msg.version_on_b.clone());
-            chan_end_on_a.set_counterparty_channel_id(msg.chan_id_on_b.clone());
-
-            chan_end_on_a
-        };
-        ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a)?;
-    }
-
-    // emit events and logs
-    {
-        ctx_a.log_message("success: channel open ack".to_string());
-
-        let core_event = {
-            let port_id_on_b = chan_end_on_a.counterparty().port_id.clone();
-            let conn_id_on_a = chan_end_on_a.connection_hops[0].clone();
-
-            IbcEvent::OpenAckChannel(OpenAck::new(
-                msg.port_id_on_a.clone(),
-                msg.chan_id_on_a.clone(),
-                port_id_on_b,
-                msg.chan_id_on_b,
-                conn_id_on_a,
-            ))
-        };
-        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_a.emit_ibc_event(core_event);
-
-        for module_event in extras.events {
-            ctx_a.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_a.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgChannelOpenAck) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    // Validate that the channel end is in a state where it can be ack.
-    chan_end_on_a.verify_state_matches(&ChannelState::Init)?;
-
-    // An OPEN IBC connection running on the local (host) chain should exist.
-    chan_end_on_a.verify_connection_hops_length()?;
-
-    let conn_end_on_a = ctx_a.connection_end(&chan_end_on_a.connection_hops()[0])?;
-
-    conn_end_on_a.verify_state_matches(&ConnectionState::Open)?;
-
-    // Verify proofs
-    {
-        let client_id_on_a = conn_end_on_a.client_id();
-        let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-
-        client_state_of_b_on_a.confirm_not_frozen()?;
-        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
-
-        let client_cons_state_path_on_a =
-            ClientConsensusStatePath::new(client_id_on_a, &msg.proof_height_on_b);
-        let consensus_state_of_b_on_a = ctx_a.consensus_state(&client_cons_state_path_on_a)?;
-        let prefix_on_b = conn_end_on_a.counterparty().prefix();
-        let port_id_on_b = &chan_end_on_a.counterparty().port_id;
-        let conn_id_on_b = conn_end_on_a.counterparty().connection_id().ok_or(
-            ChannelError::UndefinedConnectionCounterparty {
-                connection_id: chan_end_on_a.connection_hops()[0].clone(),
-            },
-        )?;
-
-        let expected_chan_end_on_b = ChannelEnd::new(
-            ChannelState::TryOpen,
-            // Note: Both ends of a channel must have the same ordering, so it's
-            // fine to use A's ordering here
-            *chan_end_on_a.ordering(),
-            Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
-            vec![conn_id_on_b.clone()],
-            msg.version_on_b.clone(),
-        )?;
-        let chan_end_path_on_b = ChannelEndPath::new(port_id_on_b, &msg.chan_id_on_b);
-
-        // Verify the proof for the channel state against the expected channel end.
-        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
-        client_state_of_b_on_a
-            .verify_membership(
-                prefix_on_b,
-                &msg.proof_chan_end_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::ChannelEnd(chan_end_path_on_b),
-                expected_chan_end_on_b.encode_vec(),
-            )
-            .map_err(ChannelError::VerifyChannelFailed)?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-
-    use super::*;
-    use rstest::*;
-    use test_log::test;
-
-    use crate::applications::transfer::MODULE_ID_STR;
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::Order;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, State};
-    use crate::core::ics04_channel::msgs::chan_open_ack::test_util::get_dummy_raw_msg_chan_open_ack;
-    use crate::core::ics04_channel::msgs::chan_open_ack::MsgChannelOpenAck;
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::core::ics24_host::identifier::ConnectionId;
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::Height;
-
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::MockContext;
-    use crate::test_utils::DummyTransferModule;
-
-    pub struct Fixture {
-        pub context: MockContext,
-        pub module_id: ModuleId,
-        pub msg: MsgChannelOpenAck,
-        pub client_id_on_a: ClientId,
-        pub conn_id_on_a: ConnectionId,
-        pub conn_end_on_a: ConnectionEnd,
-        pub chan_end_on_a: ChannelEnd,
-        pub proof_height: u64,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let proof_height = 10;
-        let mut context = MockContext::default();
-        let module = DummyTransferModule::new();
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        context.add_route(module_id.clone(), module).unwrap();
-
-        let client_id_on_a = ClientId::new(mock_client_type(), 45).unwrap();
-        let conn_id_on_a = ConnectionId::new(2);
-        let conn_end_on_a = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id_on_a.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let msg =
-            MsgChannelOpenAck::try_from(get_dummy_raw_msg_chan_open_ack(proof_height)).unwrap();
-
-        let chan_end_on_a = ChannelEnd::new(
-            State::Init,
-            Order::Unordered,
-            Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_b.clone())),
-            vec![conn_id_on_a.clone()],
-            msg.version_on_b.clone(),
-        )
-        .unwrap();
-
-        Fixture {
-            context,
-            module_id,
-            msg,
-            client_id_on_a,
-            conn_id_on_a,
-            conn_end_on_a,
-            chan_end_on_a,
-            proof_height,
-        }
-    }
-
-    #[rstest]
-    fn chan_open_ack_fail_no_channel(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_a,
-            conn_id_on_a,
-            conn_end_on_a,
-            proof_height,
-            ..
-        } = fixture;
-        let context = context
-            .with_client(&client_id_on_a, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_a, conn_end_on_a);
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no channel exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_ack_fail_channel_wrong_state(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_a,
-            conn_id_on_a,
-            conn_end_on_a,
-            proof_height,
-            ..
-        } = fixture;
-
-        let wrong_chan_end = ChannelEnd::new(
-            State::Open,
-            Order::Unordered,
-            Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_b.clone())),
-            vec![conn_id_on_a.clone()],
-            msg.version_on_b.clone(),
-        )
-        .unwrap();
-        let context = context
-            .with_client(&client_id_on_a, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_a, conn_end_on_a)
-            .with_channel(
-                msg.port_id_on_a.clone(),
-                msg.chan_id_on_a.clone(),
-                wrong_chan_end,
-            );
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because channel is in the wrong state"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_ack_fail_no_connection(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_a,
-            chan_end_on_a,
-            proof_height,
-            ..
-        } = fixture;
-
-        let context = context
-            .with_client(&client_id_on_a, Height::new(0, proof_height).unwrap())
-            .with_channel(
-                msg.port_id_on_a.clone(),
-                msg.chan_id_on_a.clone(),
-                chan_end_on_a,
-            );
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no connection exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_ack_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_a,
-            conn_id_on_a,
-            conn_end_on_a,
-            chan_end_on_a,
-            proof_height,
-            ..
-        } = fixture;
-
-        let context = context
-            .with_client(&client_id_on_a, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_a, conn_end_on_a)
-            .with_channel(
-                msg.port_id_on_a.clone(),
-                msg.chan_id_on_a.clone(),
-                chan_end_on_a,
-            );
-
-        let res = validate(&context, &msg);
-
-        assert!(res.is_ok(), "Validation happy path")
-    }
-
-    #[rstest]
-    fn chan_open_ack_execute_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            module_id,
-            msg,
-            client_id_on_a,
-            conn_id_on_a,
-            conn_end_on_a,
-            chan_end_on_a,
-            proof_height,
-            ..
-        } = fixture;
-
-        let mut context = context
-            .with_client(&client_id_on_a, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_a, conn_end_on_a)
-            .with_channel(
-                msg.port_id_on_a.clone(),
-                msg.chan_id_on_a.clone(),
-                chan_end_on_a,
-            );
-
-        let res = chan_open_ack_execute(&mut context, module_id, msg);
-
-        assert!(res.is_ok(), "Execution happy path");
-
-        assert_eq!(context.events.len(), 2);
-        assert!(matches!(
-            context.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(context.events[1], IbcEvent::OpenAckChannel(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/chan_open_confirm.rs b/crates/ibc/src/core/ics04_channel/handler/chan_open_confirm.rs
deleted file mode 100644
index dd8e52463..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/chan_open_confirm.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenConfirm`.
-
-use crate::prelude::*;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, State as ChannelState};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::events::OpenConfirm;
-use crate::core::ics04_channel::msgs::chan_open_confirm::MsgChannelOpenConfirm;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ChannelEndPath, ClientConsensusStatePath};
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn chan_open_confirm_validate<ValCtx>(
-    ctx_b: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenConfirm,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_b, &msg)?;
-
-    let module = ctx_b
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    module.on_chan_open_confirm_validate(&msg.port_id_on_b, &msg.chan_id_on_b)?;
-
-    Ok(())
-}
-
-pub(crate) fn chan_open_confirm_execute<ExecCtx>(
-    ctx_b: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenConfirm,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let module = ctx_b
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    let extras = module.on_chan_open_confirm_execute(&msg.port_id_on_b, &msg.chan_id_on_b)?;
-    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
-    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
-
-    // state changes
-    {
-        let chan_end_on_b = {
-            let mut chan_end_on_b = chan_end_on_b.clone();
-            chan_end_on_b.set_state(State::Open);
-
-            chan_end_on_b
-        };
-        ctx_b.store_channel(&chan_end_path_on_b, chan_end_on_b)?;
-    }
-
-    // emit events and logs
-    {
-        ctx_b.log_message("success: channel open confirm".to_string());
-
-        let conn_id_on_b = chan_end_on_b.connection_hops[0].clone();
-        let port_id_on_a = chan_end_on_b.counterparty().port_id.clone();
-        let chan_id_on_a = chan_end_on_b
-            .counterparty()
-            .channel_id
-            .clone()
-            .ok_or(ContextError::ChannelError(ChannelError::Other {
-            description:
-                "internal error: ChannelEnd doesn't have a counterparty channel id in OpenConfirm"
-                    .to_string(),
-        }))?;
-
-        let core_event = IbcEvent::OpenConfirmChannel(OpenConfirm::new(
-            msg.port_id_on_b.clone(),
-            msg.chan_id_on_b.clone(),
-            port_id_on_a,
-            chan_id_on_a,
-            conn_id_on_b,
-        ));
-        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_b.emit_ibc_event(core_event);
-
-        for module_event in extras.events {
-            ctx_b.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_b.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgChannelOpenConfirm) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_b.validate_message_signer(&msg.signer)?;
-
-    // Unwrap the old channel end and validate it against the message.
-    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
-    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
-
-    // Validate that the channel end is in a state where it can be confirmed.
-    chan_end_on_b.verify_state_matches(&ChannelState::TryOpen)?;
-
-    // An OPEN IBC connection running on the local (host) chain should exist.
-    chan_end_on_b.verify_connection_hops_length()?;
-
-    let conn_end_on_b = ctx_b.connection_end(&chan_end_on_b.connection_hops()[0])?;
-
-    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
-
-    // Verify proofs
-    {
-        let client_id_on_b = conn_end_on_b.client_id();
-        let client_state_of_a_on_b = ctx_b.client_state(client_id_on_b)?;
-
-        client_state_of_a_on_b.confirm_not_frozen()?;
-        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(client_id_on_b, &msg.proof_height_on_a);
-        let consensus_state_of_a_on_b = ctx_b.consensus_state(&client_cons_state_path_on_b)?;
-        let prefix_on_a = conn_end_on_b.counterparty().prefix();
-        let port_id_on_a = &chan_end_on_b.counterparty().port_id;
-        let chan_id_on_a = chan_end_on_b
-            .counterparty()
-            .channel_id()
-            .ok_or(ChannelError::MissingCounterparty)?;
-        let conn_id_on_a = conn_end_on_b.counterparty().connection_id().ok_or(
-            ChannelError::UndefinedConnectionCounterparty {
-                connection_id: chan_end_on_b.connection_hops()[0].clone(),
-            },
-        )?;
-
-        let expected_chan_end_on_a = ChannelEnd::new(
-            ChannelState::Open,
-            *chan_end_on_b.ordering(),
-            Counterparty::new(msg.port_id_on_b.clone(), Some(msg.chan_id_on_b.clone())),
-            vec![conn_id_on_a.clone()],
-            chan_end_on_b.version.clone(),
-        )?;
-        let chan_end_path_on_a = ChannelEndPath::new(port_id_on_a, chan_id_on_a);
-
-        // Verify the proof for the channel state against the expected channel end.
-        // A counterparty channel id of None in not possible, and is checked in msg.
-        client_state_of_a_on_b
-            .verify_membership(
-                prefix_on_a,
-                &msg.proof_chan_end_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::ChannelEnd(chan_end_path_on_a),
-                expected_chan_end_on_a.encode_vec(),
-            )
-            .map_err(ChannelError::VerifyChannelFailed)?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rstest::*;
-    use test_log::test;
-
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order, State};
-    use crate::core::ics04_channel::msgs::chan_open_confirm::test_util::get_dummy_raw_msg_chan_open_confirm;
-    use crate::core::ics04_channel::msgs::chan_open_confirm::MsgChannelOpenConfirm;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::ChannelId;
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::Height;
-
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::MockContext;
-    use crate::{applications::transfer::MODULE_ID_STR, test_utils::DummyTransferModule};
-
-    pub struct Fixture {
-        pub context: MockContext,
-        pub module_id: ModuleId,
-        pub msg: MsgChannelOpenConfirm,
-        pub client_id_on_b: ClientId,
-        pub conn_id_on_b: ConnectionId,
-        pub conn_end_on_b: ConnectionEnd,
-        pub chan_end_on_b: ChannelEnd,
-        pub proof_height: u64,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let proof_height = 10;
-        let mut context = MockContext::default();
-        let module = DummyTransferModule::new();
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        context.add_route(module_id.clone(), module).unwrap();
-
-        let client_id_on_b = ClientId::new(mock_client_type(), 45).unwrap();
-        let conn_id_on_b = ConnectionId::new(2);
-        let conn_end_on_b = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id_on_b.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let msg =
-            MsgChannelOpenConfirm::try_from(get_dummy_raw_msg_chan_open_confirm(proof_height))
-                .unwrap();
-
-        let chan_end_on_b = ChannelEnd::new(
-            State::TryOpen,
-            Order::Unordered,
-            Counterparty::new(msg.port_id_on_b.clone(), Some(ChannelId::default())),
-            vec![conn_id_on_b.clone()],
-            Version::default(),
-        )
-        .unwrap();
-
-        Fixture {
-            context,
-            module_id,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            chan_end_on_b,
-            proof_height,
-        }
-    }
-
-    #[rstest]
-    fn chan_open_confirm_fail_no_channel(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            proof_height,
-            ..
-        } = fixture;
-        let context = context
-            .with_client(&client_id_on_b, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_b, conn_end_on_b);
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no channel exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_confirm_fail_channel_wrong_state(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            proof_height,
-            ..
-        } = fixture;
-
-        let wrong_chan_end = ChannelEnd::new(
-            State::Init,
-            Order::Unordered,
-            Counterparty::new(msg.port_id_on_b.clone(), Some(ChannelId::default())),
-            vec![conn_id_on_b.clone()],
-            Version::default(),
-        )
-        .unwrap();
-        let context = context
-            .with_client(&client_id_on_b, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_b, conn_end_on_b)
-            .with_channel(
-                msg.port_id_on_b.clone(),
-                ChannelId::default(),
-                wrong_chan_end,
-            );
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because channel is in the wrong state"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_confirm_validate_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            chan_end_on_b,
-            proof_height,
-            ..
-        } = fixture;
-
-        let context = context
-            .with_client(&client_id_on_b, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_b, conn_end_on_b)
-            .with_channel(
-                msg.port_id_on_b.clone(),
-                ChannelId::default(),
-                chan_end_on_b,
-            );
-
-        let res = validate(&context, &msg);
-
-        assert!(res.is_ok(), "Validation happy path")
-    }
-
-    #[rstest]
-    fn chan_open_confirm_execute_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            module_id,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            chan_end_on_b,
-            proof_height,
-            ..
-        } = fixture;
-
-        let mut context = context
-            .with_client(&client_id_on_b, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_b, conn_end_on_b)
-            .with_channel(
-                msg.port_id_on_b.clone(),
-                ChannelId::default(),
-                chan_end_on_b,
-            );
-
-        let res = chan_open_confirm_execute(&mut context, module_id, msg);
-
-        assert!(res.is_ok(), "Execution happy path");
-
-        assert_eq!(context.events.len(), 2);
-        assert!(matches!(
-            context.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(context.events[1], IbcEvent::OpenConfirmChannel(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/chan_open_init.rs b/crates/ibc/src/core/ics04_channel/handler/chan_open_init.rs
deleted file mode 100644
index 95e9ba3e9..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/chan_open_init.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenInit`.
-
-use crate::prelude::*;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, State};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::events::OpenInit;
-use crate::core::ics04_channel::msgs::chan_open_init::MsgChannelOpenInit;
-use crate::core::ics24_host::identifier::ChannelId;
-use crate::core::ics24_host::path::{ChannelEndPath, SeqAckPath, SeqRecvPath, SeqSendPath};
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn chan_open_init_validate<ValCtx>(
-    ctx_a: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenInit,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_a, &msg)?;
-    let chan_id_on_a = ChannelId::new(ctx_a.channel_counter()?);
-
-    let module = ctx_a
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    module.on_chan_open_init_validate(
-        msg.ordering,
-        &msg.connection_hops_on_a,
-        &msg.port_id_on_a,
-        &chan_id_on_a,
-        &Counterparty::new(msg.port_id_on_b.clone(), None),
-        &msg.version_proposal,
-    )?;
-
-    Ok(())
-}
-
-pub(crate) fn chan_open_init_execute<ExecCtx>(
-    ctx_a: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenInit,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let chan_id_on_a = ChannelId::new(ctx_a.channel_counter()?);
-    let module = ctx_a
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    let (extras, version) = module.on_chan_open_init_execute(
-        msg.ordering,
-        &msg.connection_hops_on_a,
-        &msg.port_id_on_a,
-        &chan_id_on_a,
-        &Counterparty::new(msg.port_id_on_b.clone(), None),
-        &msg.version_proposal,
-    )?;
-
-    let conn_id_on_a = msg.connection_hops_on_a[0].clone();
-
-    // state changes
-    {
-        let chan_end_on_a = ChannelEnd::new(
-            State::Init,
-            msg.ordering,
-            Counterparty::new(msg.port_id_on_b.clone(), None),
-            msg.connection_hops_on_a.clone(),
-            msg.version_proposal.clone(),
-        )?;
-        let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &chan_id_on_a);
-        ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a)?;
-
-        ctx_a.increase_channel_counter();
-
-        // Initialize send, recv, and ack sequence numbers.
-        let seq_send_path = SeqSendPath::new(&msg.port_id_on_a, &chan_id_on_a);
-        ctx_a.store_next_sequence_send(&seq_send_path, 1.into())?;
-
-        let seq_recv_path = SeqRecvPath::new(&msg.port_id_on_a, &chan_id_on_a);
-        ctx_a.store_next_sequence_recv(&seq_recv_path, 1.into())?;
-
-        let seq_ack_path = SeqAckPath::new(&msg.port_id_on_a, &chan_id_on_a);
-        ctx_a.store_next_sequence_ack(&seq_ack_path, 1.into())?;
-    }
-
-    // emit events and logs
-    {
-        ctx_a.log_message(format!(
-            "success: channel open init with channel identifier: {chan_id_on_a}"
-        ));
-        let core_event = IbcEvent::OpenInitChannel(OpenInit::new(
-            msg.port_id_on_a.clone(),
-            chan_id_on_a.clone(),
-            msg.port_id_on_b,
-            conn_id_on_a,
-            version,
-        ));
-        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_a.emit_ibc_event(core_event);
-
-        for module_event in extras.events {
-            ctx_a.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_a.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgChannelOpenInit) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    msg.verify_connection_hops_length()?;
-    // An IBC connection running on the local (host) chain should exist.
-    let conn_end_on_a = ctx_a.connection_end(&msg.connection_hops_on_a[0])?;
-
-    // Note: Not needed check if the connection end is OPEN. Optimistic channel handshake is allowed.
-
-    let client_id_on_a = conn_end_on_a.client_id();
-    let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-    client_state_of_b_on_a.confirm_not_frozen()?;
-
-    let conn_version = conn_end_on_a.versions();
-
-    conn_version[0].verify_feature_supported(msg.ordering.to_string())?;
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rstest::*;
-
-    use crate::clients::ics07_tendermint::client_type as tm_client_type;
-    use crate::core::ics02_client::height::Height;
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::msgs::conn_open_init::MsgConnectionOpenInit;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::handler::chan_open_init::validate;
-    use crate::core::ics04_channel::msgs::chan_open_init::test_util::get_dummy_raw_msg_chan_open_init;
-    use crate::core::ics04_channel::msgs::chan_open_init::MsgChannelOpenInit;
-    use crate::core::ics24_host::identifier::ClientId;
-    use crate::core::ics24_host::identifier::ConnectionId;
-
-    use crate::applications::transfer::MODULE_ID_STR;
-    use crate::mock::context::MockContext;
-    use crate::test_utils::DummyTransferModule;
-    use test_log::test;
-
-    pub struct Fixture {
-        pub ctx: MockContext,
-        pub module_id: ModuleId,
-        pub msg: MsgChannelOpenInit,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let msg = MsgChannelOpenInit::try_from(get_dummy_raw_msg_chan_open_init(None)).unwrap();
-
-        let mut default_ctx = MockContext::default();
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        let module = DummyTransferModule::new();
-        default_ctx.add_route(module_id.clone(), module).unwrap();
-
-        let msg_conn_init = MsgConnectionOpenInit::new_dummy();
-
-        let client_id_on_a = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_height = Height::new(0, 10).unwrap();
-
-        let conn_end_on_a = ConnectionEnd::new(
-            ConnectionState::Init,
-            msg_conn_init.client_id_on_a.clone(),
-            msg_conn_init.counterparty.clone(),
-            get_compatible_versions(),
-            msg_conn_init.delay_period,
-        )
-        .unwrap();
-
-        let ctx = default_ctx
-            .with_client(&client_id_on_a, client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_a);
-
-        Fixture {
-            ctx,
-            module_id,
-            msg,
-        }
-    }
-
-    #[rstest]
-    fn chan_open_init_fail_no_connection(fixture: Fixture) {
-        let Fixture { msg, .. } = fixture;
-
-        let res = validate(&MockContext::default(), &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no connection exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_init_validate_happy_path(fixture: Fixture) {
-        let Fixture { ctx, msg, .. } = fixture;
-
-        let res = validate(&ctx, &msg);
-
-        assert!(res.is_ok(), "Validation succeeds; good parameters")
-    }
-
-    #[rstest]
-    fn chan_open_init_validate_counterparty_chan_id_set(fixture: Fixture) {
-        let Fixture { ctx, .. } = fixture;
-
-        let msg = MsgChannelOpenInit::try_from(get_dummy_raw_msg_chan_open_init(None)).unwrap();
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Validation succeeds even if counterparty channel id is set by relayer"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_init_execute_happy_path(fixture: Fixture) {
-        let Fixture {
-            mut ctx,
-            module_id,
-            msg,
-        } = fixture;
-
-        let res = chan_open_init_execute(&mut ctx, module_id, msg);
-
-        assert!(res.is_ok(), "Execution succeeds; good parameters");
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::OpenInitChannel(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/chan_open_try.rs b/crates/ibc/src/core/ics04_channel/handler/chan_open_try.rs
deleted file mode 100644
index a9ca05e43..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/chan_open_try.rs
+++ /dev/null
@@ -1,340 +0,0 @@
-//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenTry`.
-
-use crate::prelude::*;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, State as ChannelState};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::events::OpenTry;
-use crate::core::ics04_channel::msgs::chan_open_try::MsgChannelOpenTry;
-use crate::core::ics24_host::identifier::ChannelId;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ChannelEndPath, ClientConsensusStatePath};
-use crate::core::ics24_host::path::{SeqAckPath, SeqRecvPath, SeqSendPath};
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn chan_open_try_validate<ValCtx>(
-    ctx_b: &ValCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenTry,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    validate(ctx_b, &msg)?;
-
-    let chan_id_on_b = ChannelId::new(ctx_b.channel_counter()?);
-
-    let module = ctx_b
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-    module.on_chan_open_try_validate(
-        msg.ordering,
-        &msg.connection_hops_on_b,
-        &msg.port_id_on_b,
-        &chan_id_on_b,
-        &Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
-        &msg.version_supported_on_a,
-    )?;
-
-    Ok(())
-}
-
-pub(crate) fn chan_open_try_execute<ExecCtx>(
-    ctx_b: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgChannelOpenTry,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let chan_id_on_b = ChannelId::new(ctx_b.channel_counter()?);
-    let module = ctx_b
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    let (extras, version) = module.on_chan_open_try_execute(
-        msg.ordering,
-        &msg.connection_hops_on_b,
-        &msg.port_id_on_b,
-        &chan_id_on_b,
-        &Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
-        &msg.version_supported_on_a,
-    )?;
-
-    let conn_id_on_b = msg.connection_hops_on_b[0].clone();
-
-    // state changes
-    {
-        let chan_end_on_b = ChannelEnd::new(
-            State::TryOpen,
-            msg.ordering,
-            Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
-            msg.connection_hops_on_b.clone(),
-            version.clone(),
-        )?;
-
-        let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &chan_id_on_b);
-        ctx_b.store_channel(&chan_end_path_on_b, chan_end_on_b)?;
-        ctx_b.increase_channel_counter();
-
-        // Initialize send, recv, and ack sequence numbers.
-        let seq_send_path = SeqSendPath::new(&msg.port_id_on_b, &chan_id_on_b);
-        ctx_b.store_next_sequence_send(&seq_send_path, 1.into())?;
-
-        let seq_recv_path = SeqRecvPath::new(&msg.port_id_on_b, &chan_id_on_b);
-        ctx_b.store_next_sequence_recv(&seq_recv_path, 1.into())?;
-
-        let seq_ack_path = SeqAckPath::new(&msg.port_id_on_b, &chan_id_on_b);
-        ctx_b.store_next_sequence_ack(&seq_ack_path, 1.into())?;
-    }
-
-    // emit events and logs
-    {
-        ctx_b.log_message(format!(
-            "success: channel open try with channel identifier: {chan_id_on_b}"
-        ));
-
-        let core_event = IbcEvent::OpenTryChannel(OpenTry::new(
-            msg.port_id_on_b.clone(),
-            chan_id_on_b.clone(),
-            msg.port_id_on_a.clone(),
-            msg.chan_id_on_a.clone(),
-            conn_id_on_b,
-            version,
-        ));
-        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_b.emit_ibc_event(core_event);
-
-        for module_event in extras.events {
-            ctx_b.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_b.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgChannelOpenTry) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_b.validate_message_signer(&msg.signer)?;
-
-    msg.verify_connection_hops_length()?;
-
-    let conn_end_on_b = ctx_b.connection_end(&msg.connection_hops_on_b[0])?;
-
-    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
-
-    let conn_version = conn_end_on_b.versions();
-
-    conn_version[0].verify_feature_supported(msg.ordering.to_string())?;
-
-    // Verify proofs
-    {
-        let client_id_on_b = conn_end_on_b.client_id();
-        let client_state_of_a_on_b = ctx_b.client_state(client_id_on_b)?;
-
-        client_state_of_a_on_b.confirm_not_frozen()?;
-        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(client_id_on_b, &msg.proof_height_on_a);
-        let consensus_state_of_a_on_b = ctx_b.consensus_state(&client_cons_state_path_on_b)?;
-        let prefix_on_a = conn_end_on_b.counterparty().prefix();
-        let port_id_on_a = msg.port_id_on_a.clone();
-        let chan_id_on_a = msg.chan_id_on_a.clone();
-        let conn_id_on_a = conn_end_on_b.counterparty().connection_id().ok_or(
-            ChannelError::UndefinedConnectionCounterparty {
-                connection_id: msg.connection_hops_on_b[0].clone(),
-            },
-        )?;
-
-        let expected_chan_end_on_a = ChannelEnd::new(
-            ChannelState::Init,
-            msg.ordering,
-            Counterparty::new(msg.port_id_on_b.clone(), None),
-            vec![conn_id_on_a.clone()],
-            msg.version_supported_on_a.clone(),
-        )?;
-        let chan_end_path_on_a = ChannelEndPath::new(&port_id_on_a, &chan_id_on_a);
-
-        // Verify the proof for the channel state against the expected channel end.
-        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
-        client_state_of_a_on_b
-            .verify_membership(
-                prefix_on_a,
-                &msg.proof_chan_end_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::ChannelEnd(chan_end_path_on_a),
-                expected_chan_end_on_a.encode_vec(),
-            )
-            .map_err(ChannelError::VerifyChannelFailed)?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rstest::*;
-    use test_log::test;
-
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::msgs::test_util::get_dummy_raw_counterparty;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::msgs::chan_open_try::test_util::get_dummy_raw_msg_chan_open_try;
-    use crate::core::ics04_channel::msgs::chan_open_try::MsgChannelOpenTry;
-    use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::Height;
-
-    use crate::applications::transfer::MODULE_ID_STR;
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::MockContext;
-    use crate::test_utils::DummyTransferModule;
-
-    pub struct Fixture {
-        pub ctx: MockContext,
-        pub module_id: ModuleId,
-        pub msg: MsgChannelOpenTry,
-        pub client_id_on_b: ClientId,
-        pub conn_id_on_b: ConnectionId,
-        pub conn_end_on_b: ConnectionEnd,
-        pub proof_height: u64,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let proof_height = 10;
-        let conn_id_on_b = ConnectionId::new(2);
-        let client_id_on_b = ClientId::new(mock_client_type(), 45).unwrap();
-
-        // This is the connection underlying the channel we're trying to open.
-        let conn_end_on_b = ConnectionEnd::new(
-            ConnectionState::Open,
-            client_id_on_b.clone(),
-            ConnectionCounterparty::try_from(get_dummy_raw_counterparty(Some(0))).unwrap(),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        // We're going to test message processing against this message.
-        // Note: we make the counterparty's channel_id `None`.
-        let mut msg =
-            MsgChannelOpenTry::try_from(get_dummy_raw_msg_chan_open_try(proof_height)).unwrap();
-
-        let hops = vec![conn_id_on_b.clone()];
-        msg.connection_hops_on_b = hops;
-
-        let mut ctx = MockContext::default();
-        let module = DummyTransferModule::new();
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        ctx.add_route(module_id.clone(), module).unwrap();
-
-        Fixture {
-            ctx,
-            module_id,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            proof_height,
-        }
-    }
-
-    #[rstest]
-    fn chan_open_try_fail_no_connection(fixture: Fixture) {
-        let Fixture { ctx, msg, .. } = fixture;
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no connection exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_try_fail_no_client_state(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            conn_id_on_b,
-            conn_end_on_b,
-            ..
-        } = fixture;
-        let ctx = ctx.with_connection(conn_id_on_b, conn_end_on_b);
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because the context has no client state"
-        )
-    }
-
-    #[rstest]
-    fn chan_open_try_validate_happy_path(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            proof_height,
-            ..
-        } = fixture;
-
-        let ctx = ctx
-            .with_client(&client_id_on_b, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_b, conn_end_on_b);
-
-        let res = validate(&ctx, &msg);
-
-        assert!(res.is_ok(), "Validation success: happy path")
-    }
-
-    #[rstest]
-    fn chan_open_try_execute_happy_path(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            module_id,
-            msg,
-            client_id_on_b,
-            conn_id_on_b,
-            conn_end_on_b,
-            proof_height,
-            ..
-        } = fixture;
-
-        let mut ctx = ctx
-            .with_client(&client_id_on_b, Height::new(0, proof_height).unwrap())
-            .with_connection(conn_id_on_b, conn_end_on_b);
-
-        let res = chan_open_try_execute(&mut ctx, module_id, msg);
-
-        assert!(res.is_ok(), "Execution success: happy path");
-
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::OpenTryChannel(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/recv_packet.rs b/crates/ibc/src/core/ics04_channel/handler/recv_packet.rs
deleted file mode 100644
index fe0f0d131..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/recv_packet.rs
+++ /dev/null
@@ -1,514 +0,0 @@
-use crate::prelude::*;
-
-use crate::core::events::{IbcEvent, MessageEvent};
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::connection::State as ConnectionState;
-use crate::core::ics03_connection::delay::verify_conn_delay_passed;
-use crate::core::ics04_channel::channel::{Counterparty, Order, State as ChannelState};
-use crate::core::ics04_channel::commitment::{compute_ack_commitment, compute_packet_commitment};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::events::{ReceivePacket, WriteAcknowledgement};
-use crate::core::ics04_channel::msgs::recv_packet::MsgRecvPacket;
-use crate::core::ics04_channel::packet::Receipt;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{
-    AckPath, ChannelEndPath, ClientConsensusStatePath, CommitmentPath, ReceiptPath, SeqRecvPath,
-};
-use crate::core::router::ModuleId;
-use crate::core::timestamp::Expiry;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) fn recv_packet_validate<ValCtx>(
-    ctx_b: &ValCtx,
-    msg: MsgRecvPacket,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    // Note: this contains the validation for `write_acknowledgement` as well.
-    validate(ctx_b, &msg)
-
-    // nothing to validate with the module, since `onRecvPacket` cannot fail.
-    // If any error occurs, then an "error acknowledgement" must be returned.
-}
-
-pub(crate) fn recv_packet_execute<ExecCtx>(
-    ctx_b: &mut ExecCtx,
-    module_id: ModuleId,
-    msg: MsgRecvPacket,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let chan_end_path_on_b =
-        ChannelEndPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
-    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
-
-    // Check if another relayer already relayed the packet.
-    // We don't want to fail the transaction in this case.
-    {
-        let packet_already_received = match chan_end_on_b.ordering {
-            // Note: ibc-go doesn't make the check for `Order::None` channels
-            Order::None => false,
-            Order::Unordered => {
-                let packet = &msg.packet;
-                let receipt_path_on_b =
-                    ReceiptPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a);
-                ctx_b.get_packet_receipt(&receipt_path_on_b).is_ok()
-            }
-            Order::Ordered => {
-                let seq_recv_path_on_b =
-                    SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
-                let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
-
-                // the sequence number has already been incremented, so
-                // another relayer already relayed the packet
-                msg.packet.seq_on_a < next_seq_recv
-            }
-        };
-
-        if packet_already_received {
-            return Ok(());
-        }
-    }
-
-    let module = ctx_b
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    let (extras, acknowledgement) = module.on_recv_packet_execute(&msg.packet, &msg.signer);
-
-    // state changes
-    {
-        // `recvPacket` core handler state changes
-        match chan_end_on_b.ordering {
-            Order::Unordered => {
-                let receipt_path_on_b = ReceiptPath {
-                    port_id: msg.packet.port_id_on_b.clone(),
-                    channel_id: msg.packet.chan_id_on_b.clone(),
-                    sequence: msg.packet.seq_on_a,
-                };
-
-                ctx_b.store_packet_receipt(&receipt_path_on_b, Receipt::Ok)?;
-            }
-            Order::Ordered => {
-                let seq_recv_path_on_b =
-                    SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
-                let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
-                ctx_b.store_next_sequence_recv(&seq_recv_path_on_b, next_seq_recv.increment())?;
-            }
-            _ => {}
-        }
-        let ack_path_on_b = AckPath::new(
-            &msg.packet.port_id_on_b,
-            &msg.packet.chan_id_on_b,
-            msg.packet.seq_on_a,
-        );
-        // `writeAcknowledgement` handler state changes
-        ctx_b.store_packet_acknowledgement(
-            &ack_path_on_b,
-            compute_ack_commitment(&acknowledgement),
-        )?;
-    }
-
-    // emit events and logs
-    {
-        ctx_b.log_message("success: packet receive".to_string());
-        ctx_b.log_message("success: packet write acknowledgement".to_string());
-
-        let conn_id_on_b = &chan_end_on_b.connection_hops()[0];
-        let event = IbcEvent::ReceivePacket(ReceivePacket::new(
-            msg.packet.clone(),
-            chan_end_on_b.ordering,
-            conn_id_on_b.clone(),
-        ));
-        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_b.emit_ibc_event(event);
-        let event = IbcEvent::WriteAcknowledgement(WriteAcknowledgement::new(
-            msg.packet,
-            acknowledgement,
-            conn_id_on_b.clone(),
-        ));
-        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_b.emit_ibc_event(event);
-
-        for module_event in extras.events {
-            ctx_b.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_b.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgRecvPacket) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_b.validate_message_signer(&msg.signer)?;
-
-    let chan_end_path_on_b =
-        ChannelEndPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
-    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
-
-    chan_end_on_b.verify_state_matches(&ChannelState::Open)?;
-
-    let counterparty = Counterparty::new(
-        msg.packet.port_id_on_a.clone(),
-        Some(msg.packet.chan_id_on_a.clone()),
-    );
-
-    chan_end_on_b.verify_counterparty_matches(&counterparty)?;
-
-    let conn_id_on_b = &chan_end_on_b.connection_hops()[0];
-    let conn_end_on_b = ctx_b.connection_end(conn_id_on_b)?;
-
-    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
-
-    let latest_height = ctx_b.host_height()?;
-    if msg.packet.timeout_height_on_b.has_expired(latest_height) {
-        return Err(PacketError::LowPacketHeight {
-            chain_height: latest_height,
-            timeout_height: msg.packet.timeout_height_on_b,
-        }
-        .into());
-    }
-
-    let latest_timestamp = ctx_b.host_timestamp()?;
-    if let Expiry::Expired = latest_timestamp.check_expiry(&msg.packet.timeout_timestamp_on_b) {
-        return Err(PacketError::LowPacketTimestamp.into());
-    }
-
-    // Verify proofs
-    {
-        let client_id_on_b = conn_end_on_b.client_id();
-        let client_state_of_a_on_b = ctx_b.client_state(client_id_on_b)?;
-
-        client_state_of_a_on_b.confirm_not_frozen()?;
-        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
-
-        let client_cons_state_path_on_b =
-            ClientConsensusStatePath::new(client_id_on_b, &msg.proof_height_on_a);
-        let consensus_state_of_a_on_b = ctx_b.consensus_state(&client_cons_state_path_on_b)?;
-
-        let expected_commitment_on_a = compute_packet_commitment(
-            &msg.packet.data,
-            &msg.packet.timeout_height_on_b,
-            &msg.packet.timeout_timestamp_on_b,
-        );
-        let commitment_path_on_a = CommitmentPath::new(
-            &msg.packet.port_id_on_a,
-            &msg.packet.chan_id_on_a,
-            msg.packet.seq_on_a,
-        );
-
-        verify_conn_delay_passed(ctx_b, msg.proof_height_on_a, &conn_end_on_b)?;
-
-        // Verify the proof for the packet against the chain store.
-        client_state_of_a_on_b
-            .verify_membership(
-                conn_end_on_b.counterparty().prefix(),
-                &msg.proof_commitment_on_a,
-                consensus_state_of_a_on_b.root(),
-                Path::Commitment(commitment_path_on_a),
-                expected_commitment_on_a.into_vec(),
-            )
-            .map_err(|e| ChannelError::PacketVerificationFailed {
-                sequence: msg.packet.seq_on_a,
-                client_error: e,
-            })
-            .map_err(PacketError::Channel)?;
-    }
-
-    if chan_end_on_b.order_matches(&Order::Ordered) {
-        let seq_recv_path_on_b =
-            SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
-        let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
-        if msg.packet.seq_on_a > next_seq_recv {
-            return Err(PacketError::InvalidPacketSequence {
-                given_sequence: msg.packet.seq_on_a,
-                next_sequence: next_seq_recv,
-            }
-            .into());
-        }
-
-        if msg.packet.seq_on_a == next_seq_recv {
-            // Case where the recvPacket is successful and an
-            // acknowledgement will be written (not a no-op)
-            validate_write_acknowledgement(ctx_b, msg)?;
-        }
-    } else {
-        let receipt_path_on_b = ReceiptPath::new(
-            &msg.packet.port_id_on_a,
-            &msg.packet.chan_id_on_a,
-            msg.packet.seq_on_a,
-        );
-        let packet_rec = ctx_b.get_packet_receipt(&receipt_path_on_b);
-        match packet_rec {
-            Ok(_receipt) => {}
-            Err(ContextError::PacketError(PacketError::PacketReceiptNotFound { sequence }))
-                if sequence == msg.packet.seq_on_a => {}
-            Err(e) => return Err(e),
-        }
-        // Case where the recvPacket is successful and an
-        // acknowledgement will be written (not a no-op)
-        validate_write_acknowledgement(ctx_b, msg)?;
-    };
-
-    Ok(())
-}
-
-fn validate_write_acknowledgement<Ctx>(ctx_b: &Ctx, msg: &MsgRecvPacket) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    let packet = msg.packet.clone();
-    let ack_path_on_b = AckPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a);
-    if ctx_b.get_packet_acknowledgement(&ack_path_on_b).is_ok() {
-        return Err(PacketError::AcknowledgementExists {
-            sequence: msg.packet.seq_on_a,
-        }
-        .into());
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rstest::*;
-    use test_log::test;
-
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order, State};
-    use crate::core::ics04_channel::msgs::recv_packet::test_util::get_dummy_raw_msg_recv_packet;
-    use crate::core::ics04_channel::msgs::recv_packet::MsgRecvPacket;
-    use crate::core::ics04_channel::packet::Packet;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
-    use crate::core::timestamp::Timestamp;
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::Height;
-
-    use crate::mock::context::MockContext;
-    use crate::mock::ics18_relayer::context::RelayerContext;
-    use crate::test_utils::get_dummy_account_id;
-    use crate::{applications::transfer::MODULE_ID_STR, test_utils::DummyTransferModule};
-
-    pub struct Fixture {
-        pub context: MockContext,
-        pub module_id: ModuleId,
-        pub client_height: Height,
-        pub host_height: Height,
-        pub msg: MsgRecvPacket,
-        pub conn_end_on_b: ConnectionEnd,
-        pub chan_end_on_b: ChannelEnd,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let mut context = MockContext::default();
-
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        let module = DummyTransferModule::new();
-        context.add_route(module_id.clone(), module).unwrap();
-
-        let host_height = context.query_latest_height().unwrap().increment();
-
-        let client_height = host_height.increment();
-
-        let msg = MsgRecvPacket::try_from(get_dummy_raw_msg_recv_packet(
-            client_height.revision_height(),
-        ))
-        .unwrap();
-
-        let packet = msg.packet.clone();
-
-        let chan_end_on_b = ChannelEnd::new(
-            State::Open,
-            Order::default(),
-            Counterparty::new(packet.port_id_on_a, Some(packet.chan_id_on_a)),
-            vec![ConnectionId::default()],
-            Version::new("ics20-1".to_string()),
-        )
-        .unwrap();
-
-        let conn_end_on_b = ConnectionEnd::new(
-            ConnectionState::Open,
-            ClientId::default(),
-            ConnectionCounterparty::new(
-                ClientId::default(),
-                Some(ConnectionId::default()),
-                Default::default(),
-            ),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        Fixture {
-            context,
-            module_id,
-            client_height,
-            host_height,
-            msg,
-            conn_end_on_b,
-            chan_end_on_b,
-        }
-    }
-
-    #[rstest]
-    fn recv_packet_fail_no_channel(fixture: Fixture) {
-        let Fixture { context, msg, .. } = fixture;
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no channel exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn recv_packet_validate_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            conn_end_on_b,
-            chan_end_on_b,
-            client_height,
-            host_height,
-            ..
-        } = fixture;
-
-        let packet = &msg.packet;
-        let mut context = context
-            .with_client(&ClientId::default(), client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_b)
-            .with_channel(
-                packet.port_id_on_b.clone(),
-                packet.chan_id_on_b.clone(),
-                chan_end_on_b,
-            )
-            .with_send_sequence(
-                packet.port_id_on_b.clone(),
-                packet.chan_id_on_b.clone(),
-                1.into(),
-            )
-            .with_height(host_height)
-            // This `with_recv_sequence` is required for ordered channels
-            .with_recv_sequence(
-                packet.port_id_on_b.clone(),
-                packet.chan_id_on_b.clone(),
-                packet.seq_on_a,
-            );
-
-        context
-            .store_update_time(
-                ClientId::default(),
-                client_height,
-                Timestamp::from_nanoseconds(1000).unwrap(),
-            )
-            .unwrap();
-        context
-            .store_update_height(
-                ClientId::default(),
-                client_height,
-                Height::new(0, 5).unwrap(),
-            )
-            .unwrap();
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Happy path: validation should succeed. err: {res:?}"
-        )
-    }
-
-    #[rstest]
-    fn recv_packet_timeout_expired(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            conn_end_on_b,
-            chan_end_on_b,
-            client_height,
-            host_height,
-            ..
-        } = fixture;
-
-        let packet_old = Packet {
-            seq_on_a: 1.into(),
-            port_id_on_a: PortId::default(),
-            chan_id_on_a: ChannelId::default(),
-            port_id_on_b: PortId::default(),
-            chan_id_on_b: ChannelId::default(),
-            data: Vec::new(),
-            timeout_height_on_b: client_height.into(),
-            timeout_timestamp_on_b: Timestamp::from_nanoseconds(1).unwrap(),
-        };
-
-        let msg_packet_old = MsgRecvPacket::new(
-            packet_old,
-            msg.proof_commitment_on_a.clone(),
-            msg.proof_height_on_a,
-            get_dummy_account_id(),
-        );
-        let context = context
-            .with_client(&ClientId::default(), client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_b)
-            .with_channel(PortId::default(), ChannelId::default(), chan_end_on_b)
-            .with_send_sequence(PortId::default(), ChannelId::default(), 1.into())
-            .with_height(host_height);
-
-        let res = validate(&context, &msg_packet_old);
-
-        assert!(
-            res.is_err(),
-            "recv_packet validation should fail when the packet has timed out"
-        )
-    }
-
-    #[rstest]
-    fn recv_packet_execute_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            module_id,
-            msg,
-            conn_end_on_b,
-            chan_end_on_b,
-            client_height,
-            ..
-        } = fixture;
-        let mut ctx = context
-            .with_client(&ClientId::default(), client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_b)
-            .with_channel(PortId::default(), ChannelId::default(), chan_end_on_b);
-
-        let res = recv_packet_execute(&mut ctx, module_id, msg);
-
-        assert!(res.is_ok());
-
-        assert_eq!(ctx.events.len(), 4);
-        assert!(matches!(
-            &ctx.events[0],
-            &IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(&ctx.events[1], &IbcEvent::ReceivePacket(_)));
-        assert!(matches!(
-            &ctx.events[2],
-            &IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(&ctx.events[3], &IbcEvent::WriteAcknowledgement(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/send_packet.rs b/crates/ibc/src/core/ics04_channel/handler/send_packet.rs
deleted file mode 100644
index 009f6ee99..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/send_packet.rs
+++ /dev/null
@@ -1,326 +0,0 @@
-use crate::prelude::*;
-
-use crate::core::events::IbcEvent;
-use crate::core::events::MessageEvent;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics04_channel::channel::Counterparty;
-use crate::core::ics04_channel::commitment::compute_packet_commitment;
-use crate::core::ics04_channel::context::SendPacketExecutionContext;
-use crate::core::ics04_channel::events::SendPacket;
-use crate::core::ics04_channel::{
-    context::SendPacketValidationContext, error::PacketError, packet::Packet,
-};
-use crate::core::ics24_host::path::ChannelEndPath;
-use crate::core::ics24_host::path::ClientConsensusStatePath;
-use crate::core::ics24_host::path::CommitmentPath;
-use crate::core::ics24_host::path::SeqSendPath;
-use crate::core::timestamp::Expiry;
-use crate::core::ContextError;
-
-/// Send the given packet, including all necessary validation.
-///
-/// Equivalent to calling [`send_packet_validate`], followed by [`send_packet_execute`]
-pub fn send_packet(
-    ctx_a: &mut impl SendPacketExecutionContext,
-    packet: Packet,
-) -> Result<(), ContextError> {
-    send_packet_validate(ctx_a, &packet)?;
-    send_packet_execute(ctx_a, packet)
-}
-
-/// Validate that sending the given packet would succeed.
-pub fn send_packet_validate(
-    ctx_a: &impl SendPacketValidationContext,
-    packet: &Packet,
-) -> Result<(), ContextError> {
-    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    // Checks the channel end not be `Closed`.
-    // This allows for optimistic packet processing before a channel opens
-    chan_end_on_a.verify_not_closed()?;
-
-    let counterparty = Counterparty::new(
-        packet.port_id_on_b.clone(),
-        Some(packet.chan_id_on_b.clone()),
-    );
-
-    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
-
-    let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
-
-    let conn_end_on_a = ctx_a.connection_end(conn_id_on_a)?;
-
-    let client_id_on_a = conn_end_on_a.client_id();
-
-    let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-
-    client_state_of_b_on_a.confirm_not_frozen()?;
-
-    let latest_height_on_a = client_state_of_b_on_a.latest_height();
-
-    if packet.timeout_height_on_b.has_expired(latest_height_on_a) {
-        return Err(PacketError::LowPacketHeight {
-            chain_height: latest_height_on_a,
-            timeout_height: packet.timeout_height_on_b,
-        }
-        .into());
-    }
-
-    let client_cons_state_path_on_a =
-        ClientConsensusStatePath::new(client_id_on_a, &latest_height_on_a);
-    let consensus_state_of_b_on_a = ctx_a.client_consensus_state(&client_cons_state_path_on_a)?;
-    let latest_timestamp = consensus_state_of_b_on_a.timestamp();
-    let packet_timestamp = packet.timeout_timestamp_on_b;
-    if let Expiry::Expired = latest_timestamp.check_expiry(&packet_timestamp) {
-        return Err(PacketError::LowPacketTimestamp.into());
-    }
-
-    let seq_send_path_on_a = SeqSendPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-    let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
-
-    if packet.seq_on_a != next_seq_send_on_a {
-        return Err(PacketError::InvalidPacketSequence {
-            given_sequence: packet.seq_on_a,
-            next_sequence: next_seq_send_on_a,
-        }
-        .into());
-    }
-
-    Ok(())
-}
-
-/// Send the packet without any validation.
-///
-/// A prior call to [`send_packet_validate`] MUST have succeeded.
-pub fn send_packet_execute(
-    ctx_a: &mut impl SendPacketExecutionContext,
-    packet: Packet,
-) -> Result<(), ContextError> {
-    {
-        let seq_send_path_on_a = SeqSendPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-        let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
-
-        ctx_a.store_next_sequence_send(&seq_send_path_on_a, next_seq_send_on_a.increment())?;
-    }
-
-    ctx_a.store_packet_commitment(
-        &CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a),
-        compute_packet_commitment(
-            &packet.data,
-            &packet.timeout_height_on_b,
-            &packet.timeout_timestamp_on_b,
-        ),
-    )?;
-
-    // emit events and logs
-    {
-        let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-        let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-        let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
-
-        ctx_a.log_message("success: packet send".to_string());
-        let event = IbcEvent::SendPacket(SendPacket::new(
-            packet,
-            chan_end_on_a.ordering,
-            conn_id_on_a.clone(),
-        ));
-        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-        ctx_a.emit_ibc_event(event);
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use core::ops::Add;
-    use core::time::Duration;
-
-    use test_log::test;
-
-    use crate::core::events::IbcEvent;
-    use crate::core::ics02_client::height::Height;
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order, State};
-    use crate::core::ics04_channel::handler::send_packet::send_packet;
-    use crate::core::ics04_channel::packet::test_utils::get_dummy_raw_packet;
-    use crate::core::ics04_channel::packet::Packet;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
-    use crate::core::timestamp::Timestamp;
-    use crate::core::timestamp::ZERO_DURATION;
-    use crate::mock::context::MockContext;
-
-    #[test]
-    fn send_packet_processing() {
-        struct Test {
-            name: String,
-            ctx: MockContext,
-            packet: Packet,
-            want_pass: bool,
-        }
-
-        let context = MockContext::default();
-
-        let chan_end_on_a = ChannelEnd::new(
-            State::Open,
-            Order::default(),
-            Counterparty::new(PortId::default(), Some(ChannelId::default())),
-            vec![ConnectionId::default()],
-            Version::new("ics20-1".to_string()),
-        )
-        .unwrap();
-
-        let conn_end_on_a = ConnectionEnd::new(
-            ConnectionState::Open,
-            ClientId::default(),
-            ConnectionCounterparty::new(
-                ClientId::default(),
-                Some(ConnectionId::default()),
-                Default::default(),
-            ),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        let timestamp_future = Timestamp::now().add(Duration::from_secs(10)).unwrap();
-        let timestamp_ns_past = 1;
-
-        let timeout_height_future = 10;
-
-        let mut packet: Packet =
-            get_dummy_raw_packet(timeout_height_future, timestamp_future.nanoseconds())
-                .try_into()
-                .unwrap();
-        packet.seq_on_a = 1.into();
-        packet.data = vec![0];
-
-        let mut packet_with_timestamp_old: Packet =
-            get_dummy_raw_packet(timeout_height_future, timestamp_ns_past)
-                .try_into()
-                .unwrap();
-        packet_with_timestamp_old.seq_on_a = 1.into();
-        packet_with_timestamp_old.data = vec![0];
-
-        let client_raw_height = 5;
-        let packet_timeout_equal_client_height: Packet =
-            get_dummy_raw_packet(client_raw_height, timestamp_future.nanoseconds())
-                .try_into()
-                .unwrap();
-        let packet_timeout_one_before_client_height: Packet =
-            get_dummy_raw_packet(client_raw_height - 1, timestamp_future.nanoseconds())
-                .try_into()
-                .unwrap();
-
-        let client_height = Height::new(0, client_raw_height).unwrap();
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Processing fails because no channel exists in the context".to_string(),
-                ctx: context.clone(),
-                packet: packet.clone(),
-                want_pass: false,
-            },
-            Test {
-                name: "Good parameters".to_string(),
-                ctx: context
-                    .clone()
-                    .with_client(&ClientId::default(), client_height)
-                    .with_connection(ConnectionId::default(), conn_end_on_a.clone())
-                    .with_channel(
-                        PortId::default(),
-                        ChannelId::default(),
-                        chan_end_on_a.clone(),
-                    )
-                    .with_send_sequence(PortId::default(), ChannelId::default(), 1.into()),
-                packet,
-                want_pass: true,
-            },
-            Test {
-                name: "Packet timeout height same as destination chain height".to_string(),
-                ctx: context
-                    .clone()
-                    .with_client(&ClientId::default(), client_height)
-                    .with_connection(ConnectionId::default(), conn_end_on_a.clone())
-                    .with_channel(
-                        PortId::default(),
-                        ChannelId::default(),
-                        chan_end_on_a.clone(),
-                    )
-                    .with_send_sequence(PortId::default(), ChannelId::default(), 1.into()),
-                packet: packet_timeout_equal_client_height,
-                want_pass: true,
-            },
-            Test {
-                name: "Packet timeout height one more than destination chain height".to_string(),
-                ctx: context
-                    .clone()
-                    .with_client(&ClientId::default(), client_height)
-                    .with_connection(ConnectionId::default(), conn_end_on_a.clone())
-                    .with_channel(
-                        PortId::default(),
-                        ChannelId::default(),
-                        chan_end_on_a.clone(),
-                    )
-                    .with_send_sequence(PortId::default(), ChannelId::default(), 1.into()),
-                packet: packet_timeout_one_before_client_height,
-                want_pass: false,
-            },
-            Test {
-                name: "Packet timeout due to timestamp".to_string(),
-                ctx: context
-                    .with_client(&ClientId::default(), client_height)
-                    .with_connection(ConnectionId::default(), conn_end_on_a)
-                    .with_channel(PortId::default(), ChannelId::default(), chan_end_on_a)
-                    .with_send_sequence(PortId::default(), ChannelId::default(), 1.into()),
-                packet: packet_with_timestamp_old,
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for mut test in tests {
-            let res = send_packet(&mut test.ctx, test.packet.clone());
-            // Additionally check the events and the output objects in the result.
-            match res {
-                Ok(()) => {
-                    assert!(
-                        test.want_pass,
-                        "send_packet: test passed but was supposed to fail for test: {}, \nparams {:?} {:?}",
-                        test.name,
-                        test.packet.clone(),
-                        test.ctx.clone()
-                    );
-
-                    assert!(!test.ctx.events.is_empty()); // Some events must exist.
-
-                    assert_eq!(test.ctx.events.len(), 2);
-                    assert!(matches!(
-                        &test.ctx.events[0],
-                        &IbcEvent::Message(MessageEvent::Channel)
-                    ));
-                    // TODO: The object in the output is a PacketResult what can we check on it?
-                    assert!(matches!(&test.ctx.events[1], &IbcEvent::SendPacket(_)));
-                }
-                Err(e) => {
-                    assert!(
-                        !test.want_pass,
-                        "send_packet: did not pass test: {}, \nparams {:?} {:?} error: {:?}",
-                        test.name,
-                        test.packet.clone(),
-                        test.ctx.clone(),
-                        e,
-                    );
-                }
-            }
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/timeout.rs b/crates/ibc/src/core/ics04_channel/handler/timeout.rs
deleted file mode 100644
index 8a142d9fc..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/timeout.rs
+++ /dev/null
@@ -1,687 +0,0 @@
-use crate::prelude::*;
-use prost::Message;
-
-use crate::core::events::IbcEvent;
-use crate::core::events::MessageEvent;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::delay::verify_conn_delay_passed;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::channel::{Counterparty, Order};
-use crate::core::ics04_channel::commitment::compute_packet_commitment;
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::events::ChannelClosed;
-use crate::core::ics04_channel::msgs::timeout::MsgTimeout;
-use crate::core::ics04_channel::msgs::timeout_on_close::MsgTimeoutOnClose;
-use crate::core::ics04_channel::{events::TimeoutPacket, handler::timeout_on_close};
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{
-    ChannelEndPath, ClientConsensusStatePath, CommitmentPath, ReceiptPath, SeqRecvPath,
-};
-use crate::core::router::ModuleId;
-use crate::core::{ContextError, ExecutionContext, ValidationContext};
-
-pub(crate) enum TimeoutMsgType {
-    Timeout(MsgTimeout),
-    TimeoutOnClose(MsgTimeoutOnClose),
-}
-
-pub(crate) fn timeout_packet_validate<ValCtx>(
-    ctx_a: &ValCtx,
-    module_id: ModuleId,
-    timeout_msg_type: TimeoutMsgType,
-) -> Result<(), ContextError>
-where
-    ValCtx: ValidationContext,
-{
-    match &timeout_msg_type {
-        TimeoutMsgType::Timeout(msg) => validate(ctx_a, msg),
-        TimeoutMsgType::TimeoutOnClose(msg) => timeout_on_close::validate(ctx_a, msg),
-    }?;
-
-    let module = ctx_a
-        .get_route(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    let (packet, signer) = match timeout_msg_type {
-        TimeoutMsgType::Timeout(msg) => (msg.packet, msg.signer),
-        TimeoutMsgType::TimeoutOnClose(msg) => (msg.packet, msg.signer),
-    };
-
-    module
-        .on_timeout_packet_validate(&packet, &signer)
-        .map_err(ContextError::PacketError)
-}
-
-pub(crate) fn timeout_packet_execute<ExecCtx>(
-    ctx_a: &mut ExecCtx,
-    module_id: ModuleId,
-    timeout_msg_type: TimeoutMsgType,
-) -> Result<(), ContextError>
-where
-    ExecCtx: ExecutionContext,
-{
-    let (packet, signer) = match timeout_msg_type {
-        TimeoutMsgType::Timeout(msg) => (msg.packet, msg.signer),
-        TimeoutMsgType::TimeoutOnClose(msg) => (msg.packet, msg.signer),
-    };
-    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    // In all cases, this event is emitted
-    let event = IbcEvent::TimeoutPacket(TimeoutPacket::new(packet.clone(), chan_end_on_a.ordering));
-    ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-    ctx_a.emit_ibc_event(event);
-
-    let commitment_path_on_a =
-        CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a);
-
-    // check if we're in the NO-OP case
-    if ctx_a.get_packet_commitment(&commitment_path_on_a).is_err() {
-        // This error indicates that the timeout has already been relayed
-        // or there is a misconfigured relayer attempting to prove a timeout
-        // for a packet never sent. Core IBC will treat this error as a no-op in order to
-        // prevent an entire relay transaction from failing and consuming unnecessary fees.
-        return Ok(());
-    };
-
-    let module = ctx_a
-        .get_route_mut(&module_id)
-        .ok_or(ChannelError::RouteNotFound)?;
-
-    let (extras, cb_result) = module.on_timeout_packet_execute(&packet, &signer);
-
-    cb_result?;
-
-    // apply state changes
-    let chan_end_on_a = {
-        let commitment_path_on_a = CommitmentPath {
-            port_id: packet.port_id_on_a.clone(),
-            channel_id: packet.chan_id_on_a.clone(),
-            sequence: packet.seq_on_a,
-        };
-        ctx_a.delete_packet_commitment(&commitment_path_on_a)?;
-
-        if let Order::Ordered = chan_end_on_a.ordering {
-            let mut chan_end_on_a = chan_end_on_a;
-            chan_end_on_a.state = State::Closed;
-            ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a.clone())?;
-
-            chan_end_on_a
-        } else {
-            chan_end_on_a
-        }
-    };
-
-    // emit events and logs
-    {
-        ctx_a.log_message("success: packet timeout".to_string());
-
-        if let Order::Ordered = chan_end_on_a.ordering {
-            let conn_id_on_a = chan_end_on_a.connection_hops()[0].clone();
-
-            let event = IbcEvent::ChannelClosed(ChannelClosed::new(
-                packet.port_id_on_a.clone(),
-                packet.chan_id_on_a.clone(),
-                chan_end_on_a.counterparty().port_id.clone(),
-                chan_end_on_a.counterparty().channel_id.clone(),
-                conn_id_on_a,
-                chan_end_on_a.ordering,
-            ));
-            ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel));
-            ctx_a.emit_ibc_event(event);
-        }
-
-        for module_event in extras.events {
-            ctx_a.emit_ibc_event(IbcEvent::Module(module_event));
-        }
-
-        for log_message in extras.log {
-            ctx_a.log_message(log_message);
-        }
-    }
-
-    Ok(())
-}
-
-fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgTimeout) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    let chan_end_on_a = ctx_a.channel_end(&ChannelEndPath::new(
-        &msg.packet.port_id_on_a,
-        &msg.packet.chan_id_on_a,
-    ))?;
-
-    chan_end_on_a.verify_state_matches(&State::Open)?;
-
-    let counterparty = Counterparty::new(
-        msg.packet.port_id_on_b.clone(),
-        Some(msg.packet.chan_id_on_b.clone()),
-    );
-
-    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
-
-    let conn_id_on_a = chan_end_on_a.connection_hops()[0].clone();
-    let conn_end_on_a = ctx_a.connection_end(&conn_id_on_a)?;
-
-    //verify packet commitment
-    let commitment_path_on_a = CommitmentPath::new(
-        &msg.packet.port_id_on_a,
-        &msg.packet.chan_id_on_a,
-        msg.packet.seq_on_a,
-    );
-    let commitment_on_a = match ctx_a.get_packet_commitment(&commitment_path_on_a) {
-        Ok(commitment_on_a) => commitment_on_a,
-
-        // This error indicates that the timeout has already been relayed
-        // or there is a misconfigured relayer attempting to prove a timeout
-        // for a packet never sent. Core IBC will treat this error as a no-op in order to
-        // prevent an entire relay transaction from failing and consuming unnecessary fees.
-        Err(_) => return Ok(()),
-    };
-
-    let expected_commitment_on_a = compute_packet_commitment(
-        &msg.packet.data,
-        &msg.packet.timeout_height_on_b,
-        &msg.packet.timeout_timestamp_on_b,
-    );
-    if commitment_on_a != expected_commitment_on_a {
-        return Err(PacketError::IncorrectPacketCommitment {
-            sequence: msg.packet.seq_on_a,
-        }
-        .into());
-    }
-
-    // Verify proofs
-    {
-        let client_id_on_a = conn_end_on_a.client_id();
-        let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-        client_state_of_b_on_a.confirm_not_frozen()?;
-        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
-
-        // check that timeout height or timeout timestamp has passed on the other end
-        let client_cons_state_path_on_a =
-            ClientConsensusStatePath::new(client_id_on_a, &msg.proof_height_on_b);
-        let consensus_state_of_b_on_a = ctx_a.consensus_state(&client_cons_state_path_on_a)?;
-        let timestamp_of_b = consensus_state_of_b_on_a.timestamp();
-
-        if !msg.packet.timed_out(&timestamp_of_b, msg.proof_height_on_b) {
-            return Err(PacketError::PacketTimeoutNotReached {
-                timeout_height: msg.packet.timeout_height_on_b,
-                chain_height: msg.proof_height_on_b,
-                timeout_timestamp: msg.packet.timeout_timestamp_on_b,
-                chain_timestamp: timestamp_of_b,
-            }
-            .into());
-        }
-
-        verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
-
-        let next_seq_recv_verification_result = if chan_end_on_a.order_matches(&Order::Ordered) {
-            if msg.packet.seq_on_a < msg.next_seq_recv_on_b {
-                return Err(PacketError::InvalidPacketSequence {
-                    given_sequence: msg.packet.seq_on_a,
-                    next_sequence: msg.next_seq_recv_on_b,
-                }
-                .into());
-            }
-            let seq_recv_path_on_b =
-                SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
-
-            let mut value = Vec::new();
-            u64::from(msg.packet.seq_on_a)
-                .encode(&mut value)
-                .map_err(|_| PacketError::CannotEncodeSequence {
-                    sequence: msg.packet.seq_on_a,
-                })?;
-
-            client_state_of_b_on_a.verify_membership(
-                conn_end_on_a.counterparty().prefix(),
-                &msg.proof_unreceived_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::SeqRecv(seq_recv_path_on_b),
-                value,
-            )
-        } else {
-            let receipt_path_on_b = ReceiptPath::new(
-                &msg.packet.port_id_on_b,
-                &msg.packet.chan_id_on_b,
-                msg.packet.seq_on_a,
-            );
-
-            client_state_of_b_on_a.verify_non_membership(
-                conn_end_on_a.counterparty().prefix(),
-                &msg.proof_unreceived_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::Receipt(receipt_path_on_b),
-            )
-        };
-        next_seq_recv_verification_result
-            .map_err(|e| ChannelError::PacketVerificationFailed {
-                sequence: msg.next_seq_recv_on_b,
-                client_error: e,
-            })
-            .map_err(PacketError::Channel)?;
-    }
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rstest::*;
-
-    use crate::core::ics02_client::height::Height;
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order, State};
-    use crate::core::ics04_channel::commitment::PacketCommitment;
-    use crate::core::ics04_channel::handler::timeout::validate;
-    use crate::core::ics04_channel::msgs::timeout::test_util::get_dummy_raw_msg_timeout;
-    use crate::core::ics04_channel::msgs::timeout::MsgTimeout;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
-    use crate::core::timestamp::Timestamp;
-    use crate::core::timestamp::ZERO_DURATION;
-
-    use crate::applications::transfer::MODULE_ID_STR;
-    use crate::mock::context::MockContext;
-    use crate::test_utils::DummyTransferModule;
-
-    struct Fixture {
-        ctx: MockContext,
-        client_height: Height,
-        module_id: ModuleId,
-        msg: MsgTimeout,
-        packet_commitment: PacketCommitment,
-        conn_end_on_a: ConnectionEnd,
-        chan_end_on_a_ordered: ChannelEnd,
-        chan_end_on_a_unordered: ChannelEnd,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let client_height = Height::new(0, 2).unwrap();
-        let mut ctx = MockContext::default().with_client(&ClientId::default(), client_height);
-
-        let client_height = Height::new(0, 2).unwrap();
-
-        let module_id: ModuleId = ModuleId::new(MODULE_ID_STR.to_string());
-        let module = DummyTransferModule::new();
-        ctx.add_route(module_id.clone(), module).unwrap();
-
-        let msg_proof_height = 2;
-        let msg_timeout_height = 5;
-        let timeout_timestamp = Timestamp::now().nanoseconds();
-
-        let msg = MsgTimeout::try_from(get_dummy_raw_msg_timeout(
-            msg_proof_height,
-            msg_timeout_height,
-            timeout_timestamp,
-        ))
-        .unwrap();
-
-        let packet = msg.packet.clone();
-
-        let packet_commitment = compute_packet_commitment(
-            &msg.packet.data,
-            &msg.packet.timeout_height_on_b,
-            &msg.packet.timeout_timestamp_on_b,
-        );
-
-        let chan_end_on_a_unordered = ChannelEnd::new(
-            State::Open,
-            Order::Unordered,
-            Counterparty::new(packet.port_id_on_b.clone(), Some(packet.chan_id_on_b)),
-            vec![ConnectionId::default()],
-            Version::new("ics20-1".to_string()),
-        )
-        .unwrap();
-
-        let mut chan_end_on_a_ordered = chan_end_on_a_unordered.clone();
-        chan_end_on_a_ordered.ordering = Order::Ordered;
-
-        let conn_end_on_a = ConnectionEnd::new(
-            ConnectionState::Open,
-            ClientId::default(),
-            ConnectionCounterparty::new(
-                ClientId::default(),
-                Some(ConnectionId::default()),
-                Default::default(),
-            ),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        Fixture {
-            ctx,
-            client_height,
-            module_id,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_ordered,
-            chan_end_on_a_unordered,
-        }
-    }
-
-    #[rstest]
-    fn timeout_fail_no_channel(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            client_height,
-            ..
-        } = fixture;
-        let ctx = ctx.with_client(&ClientId::default(), client_height);
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no channel exists in the context"
-        )
-    }
-
-    #[rstest]
-    fn timeout_fail_no_consensus_state_for_height(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            chan_end_on_a_unordered,
-            conn_end_on_a,
-            packet_commitment,
-            ..
-        } = fixture;
-
-        let packet = msg.packet.clone();
-
-        let ctx = ctx
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                packet.port_id_on_a,
-                packet.chan_id_on_a,
-                packet.seq_on_a,
-                packet_commitment,
-            );
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because the client does not have a consensus state for the required height"
-        )
-    }
-
-    #[rstest]
-    fn timeout_fail_proof_timeout_not_reached(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            mut msg,
-            chan_end_on_a_unordered,
-            conn_end_on_a,
-            client_height,
-            ..
-        } = fixture;
-
-        // timeout timestamp has not reached yet
-        let timeout_timestamp_on_b =
-            (msg.packet.timeout_timestamp_on_b + core::time::Duration::new(10, 0)).unwrap();
-        msg.packet.timeout_timestamp_on_b = timeout_timestamp_on_b;
-        let packet_commitment = compute_packet_commitment(
-            &msg.packet.data,
-            &msg.packet.timeout_height_on_b,
-            &msg.packet.timeout_timestamp_on_b,
-        );
-
-        let packet = msg.packet.clone();
-
-        let mut ctx = ctx
-            .with_client(&ClientId::default(), client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_packet_commitment(
-                packet.port_id_on_a,
-                packet.chan_id_on_a,
-                packet.seq_on_a,
-                packet_commitment,
-            );
-
-        ctx.store_update_time(
-            ClientId::default(),
-            client_height,
-            Timestamp::from_nanoseconds(5).unwrap(),
-        )
-        .unwrap();
-        ctx.store_update_height(
-            ClientId::default(),
-            client_height,
-            Height::new(0, 4).unwrap(),
-        )
-        .unwrap();
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation should fail because the timeout height was reached, but the timestamp hasn't been reached. Both the height and timestamp need to be reached for the packet to be considered timed out"
-        )
-    }
-
-    /// NO-OP case
-    #[rstest]
-    fn timeout_success_no_packet_commitment(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            conn_end_on_a,
-            chan_end_on_a_unordered,
-            ..
-        } = fixture;
-        let ctx = ctx
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a);
-
-        let res = validate(&ctx, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Validation should succeed when no packet commitment is present"
-        )
-    }
-
-    #[rstest]
-    fn timeout_unordered_channel_validate(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            chan_end_on_a_unordered,
-            conn_end_on_a,
-            packet_commitment,
-            client_height,
-            ..
-        } = fixture;
-
-        let packet = msg.packet.clone();
-
-        let mut ctx = ctx
-            .with_client(&ClientId::default(), client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_packet_commitment(
-                packet.port_id_on_a,
-                packet.chan_id_on_a,
-                packet.seq_on_a,
-                packet_commitment,
-            );
-
-        ctx.store_update_time(
-            ClientId::default(),
-            client_height,
-            Timestamp::from_nanoseconds(1000).unwrap(),
-        )
-        .unwrap();
-        ctx.store_update_height(
-            ClientId::default(),
-            client_height,
-            Height::new(0, 5).unwrap(),
-        )
-        .unwrap();
-
-        let res = validate(&ctx, &msg);
-
-        assert!(res.is_ok(), "Good parameters for unordered channels")
-    }
-
-    #[rstest]
-    fn timeout_ordered_channel_validate(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            msg,
-            chan_end_on_a_ordered,
-            conn_end_on_a,
-            packet_commitment,
-            client_height,
-            ..
-        } = fixture;
-
-        let packet = msg.packet.clone();
-
-        let mut ctx = ctx
-            .with_client(&ClientId::default(), client_height)
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_ordered,
-            )
-            .with_packet_commitment(
-                packet.port_id_on_a,
-                packet.chan_id_on_a,
-                packet.seq_on_a,
-                packet_commitment,
-            );
-
-        ctx.store_update_time(
-            ClientId::default(),
-            client_height,
-            Timestamp::from_nanoseconds(1000).unwrap(),
-        )
-        .unwrap();
-        ctx.store_update_height(
-            ClientId::default(),
-            client_height,
-            Height::new(0, 4).unwrap(),
-        )
-        .unwrap();
-
-        let res = validate(&ctx, &msg);
-
-        assert!(res.is_ok(), "Good parameters for unordered channels")
-    }
-
-    #[rstest]
-    fn timeout_unordered_chan_execute(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            module_id,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_unordered,
-            ..
-        } = fixture;
-        let mut ctx = ctx
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_unordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                msg.packet.port_id_on_a.clone(),
-                msg.packet.chan_id_on_a.clone(),
-                msg.packet.seq_on_a,
-                packet_commitment,
-            );
-
-        let res = timeout_packet_execute(&mut ctx, module_id, TimeoutMsgType::Timeout(msg));
-
-        assert!(res.is_ok());
-
-        // Unordered channels only emit one event
-        assert_eq!(ctx.events.len(), 2);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::TimeoutPacket(_)));
-    }
-
-    #[rstest]
-    fn timeout_ordered_chan_execute(fixture: Fixture) {
-        let Fixture {
-            ctx,
-            module_id,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a_ordered,
-            ..
-        } = fixture;
-        let mut ctx = ctx
-            .with_channel(
-                PortId::default(),
-                ChannelId::default(),
-                chan_end_on_a_ordered,
-            )
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                msg.packet.port_id_on_a.clone(),
-                msg.packet.chan_id_on_a.clone(),
-                msg.packet.seq_on_a,
-                packet_commitment,
-            );
-
-        let res = timeout_packet_execute(&mut ctx, module_id, TimeoutMsgType::Timeout(msg));
-
-        assert!(res.is_ok());
-
-        // Ordered channels emit 2 events
-        assert_eq!(ctx.events.len(), 4);
-        assert!(matches!(
-            ctx.events[0],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[1], IbcEvent::TimeoutPacket(_)));
-        assert!(matches!(
-            ctx.events[2],
-            IbcEvent::Message(MessageEvent::Channel)
-        ));
-        assert!(matches!(ctx.events[3], IbcEvent::ChannelClosed(_)));
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/handler/timeout_on_close.rs b/crates/ibc/src/core/ics04_channel/handler/timeout_on_close.rs
deleted file mode 100644
index 5630a1f2a..000000000
--- a/crates/ibc/src/core/ics04_channel/handler/timeout_on_close.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-use crate::prelude::*;
-use ibc_proto::protobuf::Protobuf;
-use prost::Message;
-
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics03_connection::delay::verify_conn_delay_passed;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order};
-use crate::core::ics04_channel::commitment::compute_packet_commitment;
-use crate::core::ics04_channel::error::{ChannelError, PacketError};
-use crate::core::ics04_channel::msgs::timeout_on_close::MsgTimeoutOnClose;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{
-    ChannelEndPath, ClientConsensusStatePath, CommitmentPath, ReceiptPath, SeqRecvPath,
-};
-use crate::core::{ContextError, ValidationContext};
-
-pub fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgTimeoutOnClose) -> Result<(), ContextError>
-where
-    Ctx: ValidationContext,
-{
-    ctx_a.validate_message_signer(&msg.signer)?;
-
-    let packet = &msg.packet;
-    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
-
-    let counterparty = Counterparty::new(
-        packet.port_id_on_b.clone(),
-        Some(packet.chan_id_on_b.clone()),
-    );
-
-    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
-
-    let commitment_path_on_a = CommitmentPath::new(
-        &msg.packet.port_id_on_a,
-        &msg.packet.chan_id_on_a,
-        msg.packet.seq_on_a,
-    );
-
-    //verify the packet was sent, check the store
-    let commitment_on_a = match ctx_a.get_packet_commitment(&commitment_path_on_a) {
-        Ok(commitment_on_a) => commitment_on_a,
-
-        // This error indicates that the timeout has already been relayed
-        // or there is a misconfigured relayer attempting to prove a timeout
-        // for a packet never sent. Core IBC will treat this error as a no-op in order to
-        // prevent an entire relay transaction from failing and consuming unnecessary fees.
-        Err(_) => return Ok(()),
-    };
-
-    let expected_commitment_on_a = compute_packet_commitment(
-        &packet.data,
-        &packet.timeout_height_on_b,
-        &packet.timeout_timestamp_on_b,
-    );
-    if commitment_on_a != expected_commitment_on_a {
-        return Err(PacketError::IncorrectPacketCommitment {
-            sequence: packet.seq_on_a,
-        }
-        .into());
-    }
-
-    let conn_id_on_a = chan_end_on_a.connection_hops()[0].clone();
-    let conn_end_on_a = ctx_a.connection_end(&conn_id_on_a)?;
-
-    // Verify proofs
-    {
-        let client_id_on_a = conn_end_on_a.client_id();
-        let client_state_of_b_on_a = ctx_a.client_state(client_id_on_a)?;
-
-        client_state_of_b_on_a.confirm_not_frozen()?;
-        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
-
-        let client_cons_state_path_on_a =
-            ClientConsensusStatePath::new(client_id_on_a, &msg.proof_height_on_b);
-        let consensus_state_of_b_on_a = ctx_a.consensus_state(&client_cons_state_path_on_a)?;
-        let prefix_on_b = conn_end_on_a.counterparty().prefix();
-        let port_id_on_b = chan_end_on_a.counterparty().port_id.clone();
-        let chan_id_on_b = chan_end_on_a
-            .counterparty()
-            .channel_id()
-            .ok_or(PacketError::Channel(ChannelError::MissingCounterparty))?;
-        let conn_id_on_b = conn_end_on_a.counterparty().connection_id().ok_or(
-            PacketError::UndefinedConnectionCounterparty {
-                connection_id: chan_end_on_a.connection_hops()[0].clone(),
-            },
-        )?;
-        let expected_conn_hops_on_b = vec![conn_id_on_b.clone()];
-        let expected_counterparty = Counterparty::new(
-            packet.port_id_on_a.clone(),
-            Some(packet.chan_id_on_a.clone()),
-        );
-        let expected_chan_end_on_b = ChannelEnd::new(
-            State::Closed,
-            *chan_end_on_a.ordering(),
-            expected_counterparty,
-            expected_conn_hops_on_b,
-            chan_end_on_a.version().clone(),
-        )?;
-
-        let chan_end_path_on_b = ChannelEndPath(port_id_on_b, chan_id_on_b.clone());
-
-        // Verify the proof for the channel state against the expected channel end.
-        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
-        client_state_of_b_on_a
-            .verify_membership(
-                prefix_on_b,
-                &msg.proof_unreceived_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::ChannelEnd(chan_end_path_on_b),
-                expected_chan_end_on_b.encode_vec(),
-            )
-            .map_err(ChannelError::VerifyChannelFailed)
-            .map_err(PacketError::Channel)?;
-
-        verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
-
-        let next_seq_recv_verification_result = if chan_end_on_a.order_matches(&Order::Ordered) {
-            if packet.seq_on_a < msg.next_seq_recv_on_b {
-                return Err(PacketError::InvalidPacketSequence {
-                    given_sequence: packet.seq_on_a,
-                    next_sequence: msg.next_seq_recv_on_b,
-                }
-                .into());
-            }
-            let seq_recv_path_on_b = SeqRecvPath::new(&packet.port_id_on_b, &packet.chan_id_on_b);
-
-            let mut value = Vec::new();
-            u64::from(packet.seq_on_a).encode(&mut value).map_err(|_| {
-                PacketError::CannotEncodeSequence {
-                    sequence: packet.seq_on_a,
-                }
-            })?;
-
-            client_state_of_b_on_a.verify_membership(
-                conn_end_on_a.counterparty().prefix(),
-                &msg.proof_unreceived_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::SeqRecv(seq_recv_path_on_b),
-                value,
-            )
-        } else {
-            let receipt_path_on_b = ReceiptPath::new(
-                &msg.packet.port_id_on_b,
-                &msg.packet.chan_id_on_b,
-                msg.packet.seq_on_a,
-            );
-
-            client_state_of_b_on_a.verify_non_membership(
-                conn_end_on_a.counterparty().prefix(),
-                &msg.proof_unreceived_on_b,
-                consensus_state_of_b_on_a.root(),
-                Path::Receipt(receipt_path_on_b),
-            )
-        };
-        next_seq_recv_verification_result
-            .map_err(|e| ChannelError::PacketVerificationFailed {
-                sequence: msg.next_seq_recv_on_b,
-                client_error: e,
-            })
-            .map_err(PacketError::Channel)?;
-    };
-
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::core::ics04_channel::commitment::compute_packet_commitment;
-    use crate::core::ics04_channel::commitment::PacketCommitment;
-    use crate::core::ics04_channel::handler::timeout_on_close::validate;
-    use crate::core::timestamp::Timestamp;
-    use crate::core::ExecutionContext;
-    use crate::mock::context::MockContext;
-    use crate::prelude::*;
-    use crate::Height;
-    use rstest::*;
-
-    use crate::core::ics03_connection::connection::ConnectionEnd;
-    use crate::core::ics03_connection::connection::Counterparty as ConnectionCounterparty;
-    use crate::core::ics03_connection::connection::State as ConnectionState;
-    use crate::core::ics03_connection::version::get_compatible_versions;
-    use crate::core::ics04_channel::channel::{ChannelEnd, Counterparty, Order, State};
-    use crate::core::ics04_channel::msgs::timeout_on_close::test_util::get_dummy_raw_msg_timeout_on_close;
-    use crate::core::ics04_channel::msgs::timeout_on_close::MsgTimeoutOnClose;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
-    use crate::core::timestamp::ZERO_DURATION;
-
-    pub struct Fixture {
-        pub context: MockContext,
-        pub msg: MsgTimeoutOnClose,
-        pub packet_commitment: PacketCommitment,
-        pub conn_end_on_a: ConnectionEnd,
-        pub chan_end_on_a: ChannelEnd,
-    }
-
-    #[fixture]
-    fn fixture() -> Fixture {
-        let client_height = Height::new(0, 2).unwrap();
-        let context = MockContext::default().with_client(&ClientId::default(), client_height);
-
-        let height = 2;
-        let timeout_timestamp = 5;
-
-        let msg = MsgTimeoutOnClose::try_from(get_dummy_raw_msg_timeout_on_close(
-            height,
-            timeout_timestamp,
-        ))
-        .unwrap();
-
-        let packet = msg.packet.clone();
-
-        let packet_commitment = compute_packet_commitment(
-            &msg.packet.data,
-            &msg.packet.timeout_height_on_b,
-            &msg.packet.timeout_timestamp_on_b,
-        );
-
-        let chan_end_on_a = ChannelEnd::new(
-            State::Open,
-            Order::Ordered,
-            Counterparty::new(packet.port_id_on_b.clone(), Some(packet.chan_id_on_b)),
-            vec![ConnectionId::default()],
-            Version::new("ics20-1".to_string()),
-        )
-        .unwrap();
-
-        let conn_end_on_a = ConnectionEnd::new(
-            ConnectionState::Open,
-            ClientId::default(),
-            ConnectionCounterparty::new(
-                ClientId::default(),
-                Some(ConnectionId::default()),
-                Default::default(),
-            ),
-            get_compatible_versions(),
-            ZERO_DURATION,
-        )
-        .unwrap();
-
-        Fixture {
-            context,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a,
-        }
-    }
-
-    #[rstest]
-    fn timeout_on_close_fail_no_channel(fixture: Fixture) {
-        let Fixture { context, msg, .. } = fixture;
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_err(),
-            "Validation fails because no channel exists in the context"
-        )
-    }
-
-    /// NO-OP case
-    #[rstest]
-    fn timeout_on_close_success_no_packet_commitment(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            conn_end_on_a,
-            chan_end_on_a,
-            ..
-        } = fixture;
-        let context = context
-            .with_channel(PortId::default(), ChannelId::default(), chan_end_on_a)
-            .with_connection(ConnectionId::default(), conn_end_on_a);
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Validation should succeed when no packet commitment is present"
-        )
-    }
-
-    #[rstest]
-    fn timeout_on_close_success_happy_path(fixture: Fixture) {
-        let Fixture {
-            context,
-            msg,
-            packet_commitment,
-            conn_end_on_a,
-            chan_end_on_a,
-            ..
-        } = fixture;
-        let mut context = context
-            .with_channel(PortId::default(), ChannelId::default(), chan_end_on_a)
-            .with_connection(ConnectionId::default(), conn_end_on_a)
-            .with_packet_commitment(
-                msg.packet.port_id_on_a.clone(),
-                msg.packet.chan_id_on_a.clone(),
-                msg.packet.seq_on_a,
-                packet_commitment,
-            );
-
-        context
-            .store_update_time(
-                ClientId::default(),
-                Height::new(0, 2).unwrap(),
-                Timestamp::from_nanoseconds(5000).unwrap(),
-            )
-            .unwrap();
-        context
-            .store_update_height(
-                ClientId::default(),
-                Height::new(0, 2).unwrap(),
-                Height::new(0, 5).unwrap(),
-            )
-            .unwrap();
-
-        let res = validate(&context, &msg);
-
-        assert!(
-            res.is_ok(),
-            "Happy path: validation should succeed. err: {res:?}"
-        )
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/mod.rs b/crates/ibc/src/core/ics04_channel/mod.rs
deleted file mode 100644
index 40e6538cf..000000000
--- a/crates/ibc/src/core/ics04_channel/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! ICS 04: Channel implementation that facilitates communication between
-//! applications and the chains those applications are built upon.
-
-pub mod channel;
-pub mod context;
-pub mod error;
-pub mod events;
-
-pub(crate) mod handler;
-pub mod msgs;
-pub mod packet;
-pub mod timeout;
-
-pub mod acknowledgement;
-pub mod commitment;
-mod version;
-pub use version::Version;
diff --git a/crates/ibc/src/core/ics04_channel/msgs.rs b/crates/ibc/src/core/ics04_channel/msgs.rs
deleted file mode 100644
index fdffdeeda..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-//! Message definitions for all ICS4 domain types: channel open & close handshake datagrams, as well
-//! as packets.
-
-pub(crate) mod acknowledgement;
-pub(crate) mod chan_close_confirm;
-pub(crate) mod chan_close_init;
-pub(crate) mod chan_open_ack;
-pub(crate) mod chan_open_confirm;
-pub(crate) mod chan_open_init;
-pub(crate) mod chan_open_try;
-pub(crate) mod recv_packet;
-pub(crate) mod timeout;
-pub(crate) mod timeout_on_close;
-
-// Opening handshake messages.
-pub use chan_open_ack::MsgChannelOpenAck;
-pub use chan_open_confirm::MsgChannelOpenConfirm;
-pub use chan_open_init::MsgChannelOpenInit;
-pub use chan_open_try::MsgChannelOpenTry;
-
-// Closing handshake messages.
-pub use chan_close_confirm::MsgChannelCloseConfirm;
-pub use chan_close_init::MsgChannelCloseInit;
-
-// Packet specific messages.
-pub use acknowledgement::MsgAcknowledgement;
-pub use recv_packet::MsgRecvPacket;
-pub use timeout::MsgTimeout;
-pub use timeout_on_close::MsgTimeoutOnClose;
-
-/// All channel messages
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum ChannelMsg {
-    OpenInit(MsgChannelOpenInit),
-    OpenTry(MsgChannelOpenTry),
-    OpenAck(MsgChannelOpenAck),
-    OpenConfirm(MsgChannelOpenConfirm),
-    CloseInit(MsgChannelCloseInit),
-    CloseConfirm(MsgChannelCloseConfirm),
-}
-
-/// All packet messages
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum PacketMsg {
-    Recv(MsgRecvPacket),
-    Ack(MsgAcknowledgement),
-    Timeout(MsgTimeout),
-    TimeoutOnClose(MsgTimeoutOnClose),
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/acknowledgement.rs b/crates/ibc/src/core/ics04_channel/msgs/acknowledgement.rs
deleted file mode 100644
index 7e414263e..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/acknowledgement.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-use crate::prelude::*;
-
-use ibc_proto::ibc::core::channel::v1::MsgAcknowledgement as RawMsgAcknowledgement;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics04_channel::acknowledgement::Acknowledgement;
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::Height;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgAcknowledgement";
-
-///
-/// Message definition for packet acknowledgements.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgAcknowledgement {
-    pub packet: Packet,
-    pub acknowledgement: Acknowledgement,
-    /// Proof of packet acknowledgement on the receiving chain
-    pub proof_acked_on_b: CommitmentProofBytes,
-    /// Height at which the commitment proof in this message were taken
-    pub proof_height_on_b: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgAcknowledgement {
-    type Raw = RawMsgAcknowledgement;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgAcknowledgement> for MsgAcknowledgement {}
-
-impl TryFrom<RawMsgAcknowledgement> for MsgAcknowledgement {
-    type Error = PacketError;
-
-    fn try_from(raw_msg: RawMsgAcknowledgement) -> Result<Self, Self::Error> {
-        Ok(MsgAcknowledgement {
-            packet: raw_msg
-                .packet
-                .ok_or(PacketError::MissingPacket)?
-                .try_into()?,
-            acknowledgement: raw_msg.acknowledgement.try_into()?,
-            proof_acked_on_b: raw_msg
-                .proof_acked
-                .try_into()
-                .map_err(|_| PacketError::InvalidProof)?,
-            proof_height_on_b: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(PacketError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgAcknowledgement> for RawMsgAcknowledgement {
-    fn from(domain_msg: MsgAcknowledgement) -> Self {
-        RawMsgAcknowledgement {
-            packet: Some(domain_msg.packet.into()),
-            acknowledgement: domain_msg.acknowledgement.into(),
-            signer: domain_msg.signer.to_string(),
-            proof_height: Some(domain_msg.proof_height_on_b.into()),
-            proof_acked: domain_msg.proof_acked_on_b.into(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use ibc_proto::ibc::core::channel::v1::MsgAcknowledgement as RawMsgAcknowledgement;
-    use ibc_proto::ibc::core::channel::v1::Packet as RawPacket;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-
-    use crate::core::ics04_channel::packet::test_utils::get_dummy_raw_packet;
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    /// Returns a dummy `RawMsgAcknowledgement`, for testing only!
-    /// The `height` parametrizes both the proof height as well as the timeout height.
-    pub fn get_dummy_raw_msg_acknowledgement(height: u64) -> RawMsgAcknowledgement {
-        get_dummy_raw_msg_ack_with_packet(get_dummy_raw_packet(height, 1), height)
-    }
-
-    pub fn get_dummy_raw_msg_ack_with_packet(
-        packet: RawPacket,
-        height: u64,
-    ) -> RawMsgAcknowledgement {
-        RawMsgAcknowledgement {
-            packet: Some(packet),
-            acknowledgement: get_dummy_proof(),
-            proof_acked: get_dummy_proof(),
-            proof_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: height,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::channel::v1::MsgAcknowledgement as RawMsgAcknowledgement;
-
-    use crate::core::ics04_channel::error::PacketError;
-    use crate::core::ics04_channel::msgs::acknowledgement::test_util::get_dummy_raw_msg_acknowledgement;
-    use crate::core::ics04_channel::msgs::acknowledgement::MsgAcknowledgement;
-    use crate::test_utils::get_dummy_bech32_account;
-
-    #[test]
-    fn msg_acknowledgment_try_from_raw() {
-        struct Test {
-            name: String,
-            raw: RawMsgAcknowledgement,
-            want_pass: bool,
-        }
-
-        let height = 50;
-        let default_raw_msg = get_dummy_raw_msg_acknowledgement(height);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Missing packet".to_string(),
-                raw: RawMsgAcknowledgement {
-                    packet: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof height".to_string(),
-                raw: RawMsgAcknowledgement {
-                    proof_height: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Empty signer".to_string(),
-                raw: RawMsgAcknowledgement {
-                    signer: get_dummy_bech32_account(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Empty proof acked".to_string(),
-                raw: RawMsgAcknowledgement {
-                    proof_acked: Vec::new(),
-                    ..default_raw_msg
-                },
-                want_pass: false,
-            },
-        ];
-
-        for test in tests {
-            let res_msg: Result<MsgAcknowledgement, PacketError> = test.raw.clone().try_into();
-
-            assert_eq!(
-                res_msg.is_ok(),
-                test.want_pass,
-                "MsgAcknowledgement::try_from failed for test {} \nraw message: {:?} with error: {:?}",
-                test.name,
-                test.raw,
-                res_msg.err()
-            );
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/chan_close_confirm.rs b/crates/ibc/src/core/ics04_channel/msgs/chan_close_confirm.rs
deleted file mode 100644
index 6d73b3492..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/chan_close_confirm.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::{prelude::*, Height};
-
-use ibc_proto::protobuf::Protobuf;
-
-use ibc_proto::ibc::core::channel::v1::MsgChannelCloseConfirm as RawMsgChannelCloseConfirm;
-
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::core::Msg;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelCloseConfirm";
-
-///
-/// Message definition for the second step in the channel close handshake (the `ChanCloseConfirm`
-/// datagram).
-/// Per our convention, this message is sent to chain B.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgChannelCloseConfirm {
-    pub port_id_on_b: PortId,
-    pub chan_id_on_b: ChannelId,
-    pub proof_chan_end_on_a: CommitmentProofBytes,
-    pub proof_height_on_a: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgChannelCloseConfirm {
-    type Raw = RawMsgChannelCloseConfirm;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgChannelCloseConfirm> for MsgChannelCloseConfirm {}
-
-impl TryFrom<RawMsgChannelCloseConfirm> for MsgChannelCloseConfirm {
-    type Error = ChannelError;
-
-    fn try_from(raw_msg: RawMsgChannelCloseConfirm) -> Result<Self, Self::Error> {
-        Ok(MsgChannelCloseConfirm {
-            port_id_on_b: raw_msg.port_id.parse()?,
-            chan_id_on_b: raw_msg.channel_id.parse()?,
-            proof_chan_end_on_a: raw_msg
-                .proof_init
-                .try_into()
-                .map_err(|_| ChannelError::InvalidProof)?,
-            proof_height_on_a: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ChannelError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgChannelCloseConfirm> for RawMsgChannelCloseConfirm {
-    fn from(domain_msg: MsgChannelCloseConfirm) -> Self {
-        RawMsgChannelCloseConfirm {
-            port_id: domain_msg.port_id_on_b.to_string(),
-            channel_id: domain_msg.chan_id_on_b.to_string(),
-            proof_init: domain_msg.proof_chan_end_on_a.clone().into(),
-            proof_height: Some(domain_msg.proof_height_on_a.into()),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelCloseConfirm as RawMsgChannelCloseConfirm;
-    use ibc_proto::ibc::core::client::v1::Height;
-
-    use crate::core::ics24_host::identifier::{ChannelId, PortId};
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    /// Returns a dummy `RawMsgChannelCloseConfirm`, for testing only!
-    pub fn get_dummy_raw_msg_chan_close_confirm(proof_height: u64) -> RawMsgChannelCloseConfirm {
-        RawMsgChannelCloseConfirm {
-            port_id: PortId::default().to_string(),
-            channel_id: ChannelId::default().to_string(),
-            proof_init: get_dummy_proof(),
-            proof_height: Some(Height {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use ibc_proto::ibc::core::channel::v1::MsgChannelCloseConfirm as RawMsgChannelCloseConfirm;
-    use ibc_proto::ibc::core::client::v1::Height;
-
-    use crate::core::ics04_channel::msgs::chan_close_confirm::test_util::get_dummy_raw_msg_chan_close_confirm;
-    use crate::core::ics04_channel::msgs::chan_close_confirm::MsgChannelCloseConfirm;
-
-    #[test]
-    fn parse_channel_close_confirm_msg() {
-        struct Test {
-            name: String,
-            raw: RawMsgChannelCloseConfirm,
-            want_pass: bool,
-        }
-
-        let proof_height = 10;
-        let default_raw_msg = get_dummy_raw_msg_chan_close_confirm(proof_height);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Correct port".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    port_id: "p34".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad port, name too short".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    port_id: "p".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad port, name too long".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    port_id:
-                        "abcdefghijklmnsdfasdfasdfasdfasdgafgadsfasdfasdfasdasfdasdfsadfopqrstuabcdefghijklmnsdfasdfasdfasdfasdgafgadsfasdfasdfasdasfdasdfsadfopqrstu"
-                            .to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Correct channel identifier".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    channel_id: "channel-34".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad channel, name too short".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    channel_id: "chshort".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad channel, name too long".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    channel_id:
-                        "channel-128391283791827398127398791283912837918273981273987912839"
-                            .to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad proof height, height = 0".to_string(),
-                raw: RawMsgChannelCloseConfirm {
-                    proof_height: Some(Height {
-                        revision_number: 0,
-                        revision_height: 0,
-                    }),
-                    ..default_raw_msg
-                },
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let msg = MsgChannelCloseConfirm::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                msg.is_ok(),
-                "MsgChanCloseConfirm::try_from raw failed for test {}, \nraw msg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_chan_close_confirm(19);
-        let msg = MsgChannelCloseConfirm::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgChannelCloseConfirm::from(msg.clone());
-        let msg_back = MsgChannelCloseConfirm::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/chan_open_init.rs b/crates/ibc/src/core/ics04_channel/msgs/chan_open_init.rs
deleted file mode 100644
index eb1714292..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/chan_open_init.rs
+++ /dev/null
@@ -1,221 +0,0 @@
-use crate::core::ics04_channel::channel::verify_connection_hops_length;
-use crate::core::ics04_channel::channel::ChannelEnd;
-use crate::core::ics04_channel::channel::Counterparty;
-use crate::core::ics04_channel::channel::{Order, State};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::Version;
-use crate::core::ics24_host::identifier::{ConnectionId, PortId};
-use crate::core::Msg;
-use crate::prelude::*;
-use crate::signer::Signer;
-
-use ibc_proto::ibc::core::channel::v1::MsgChannelOpenInit as RawMsgChannelOpenInit;
-use ibc_proto::protobuf::Protobuf;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenInit";
-
-///
-/// Message definition for the first step in the channel open handshake (`ChanOpenInit` datagram).
-/// Per our convention, this message is sent to chain A.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgChannelOpenInit {
-    pub port_id_on_a: PortId,
-    pub connection_hops_on_a: Vec<ConnectionId>,
-    pub port_id_on_b: PortId,
-    pub ordering: Order,
-    pub signer: Signer,
-    /// Allow a relayer to specify a particular version by providing a non-empty version string
-    pub version_proposal: Version,
-}
-
-impl MsgChannelOpenInit {
-    pub fn new(
-        port_id_on_a: PortId,
-        connection_hops_on_a: Vec<ConnectionId>,
-        port_id_on_b: PortId,
-        ordering: Order,
-        signer: Signer,
-        version_proposal: Version,
-    ) -> Self {
-        Self {
-            port_id_on_a,
-            connection_hops_on_a,
-            port_id_on_b,
-            ordering,
-            signer,
-            version_proposal,
-        }
-    }
-
-    /// Checks if the `connection_hops` has a length of `expected`.
-    ///
-    /// Note: Current IBC version only supports one connection hop.
-    pub(crate) fn verify_connection_hops_length(&self) -> Result<(), ChannelError> {
-        verify_connection_hops_length(&self.connection_hops_on_a, 1)
-    }
-}
-
-impl Msg for MsgChannelOpenInit {
-    type Raw = RawMsgChannelOpenInit;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgChannelOpenInit> for MsgChannelOpenInit {}
-
-impl TryFrom<RawMsgChannelOpenInit> for MsgChannelOpenInit {
-    type Error = ChannelError;
-
-    fn try_from(raw_msg: RawMsgChannelOpenInit) -> Result<Self, Self::Error> {
-        let chan_end_on_a: ChannelEnd = raw_msg
-            .channel
-            .ok_or(ChannelError::MissingChannel)?
-            .try_into()?;
-        chan_end_on_a.verify_state_matches(&State::Init)?;
-        chan_end_on_a.counterparty().verify_empty_channel_id()?;
-
-        Ok(MsgChannelOpenInit {
-            port_id_on_a: raw_msg.port_id.parse()?,
-            connection_hops_on_a: chan_end_on_a.connection_hops,
-            port_id_on_b: chan_end_on_a.remote.port_id,
-            ordering: chan_end_on_a.ordering,
-            signer: raw_msg.signer.into(),
-            version_proposal: chan_end_on_a.version,
-        })
-    }
-}
-
-impl From<MsgChannelOpenInit> for RawMsgChannelOpenInit {
-    fn from(domain_msg: MsgChannelOpenInit) -> Self {
-        let chan_end_on_a = ChannelEnd::new_without_validation(
-            State::Init,
-            domain_msg.ordering,
-            Counterparty::new(domain_msg.port_id_on_b, None),
-            domain_msg.connection_hops_on_a,
-            domain_msg.version_proposal,
-        );
-        RawMsgChannelOpenInit {
-            port_id: domain_msg.port_id_on_a.to_string(),
-            channel: Some(chan_end_on_a.into()),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenInit as RawMsgChannelOpenInit;
-
-    use crate::core::ics04_channel::channel::test_util::get_dummy_raw_channel_end;
-    use crate::core::ics24_host::identifier::PortId;
-    use crate::test_utils::get_dummy_bech32_account;
-
-    /// Returns a dummy `RawMsgChannelOpenInit`, for testing only!
-    pub fn get_dummy_raw_msg_chan_open_init(
-        counterparty_channel_id: Option<u64>,
-    ) -> RawMsgChannelOpenInit {
-        RawMsgChannelOpenInit {
-            port_id: PortId::default().to_string(),
-            channel: Some(get_dummy_raw_channel_end(1, counterparty_channel_id)),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::core::ics04_channel::msgs::chan_open_init::test_util::get_dummy_raw_msg_chan_open_init;
-    use crate::core::ics04_channel::msgs::chan_open_init::MsgChannelOpenInit;
-    use crate::prelude::*;
-
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenInit as RawMsgChannelOpenInit;
-    use test_log::test;
-
-    #[test]
-    fn channel_open_init_from_raw() {
-        struct Test {
-            name: String,
-            raw: RawMsgChannelOpenInit,
-            want_pass: bool,
-        }
-
-        let default_raw_init_msg = get_dummy_raw_msg_chan_open_init(None);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_init_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Incorrect port identifier, slash (separator) prohibited".to_string(),
-                raw: RawMsgChannelOpenInit {
-                    port_id: "p34/".to_string(),
-                    ..default_raw_init_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing channel".to_string(),
-                raw: RawMsgChannelOpenInit {
-                    channel: None,
-                    ..default_raw_init_msg
-                },
-                want_pass: false,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let res_msg = MsgChannelOpenInit::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                res_msg.is_ok(),
-                "MsgChanOpenInit::try_from failed for test {}, \nraw msg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                res_msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        // Check if raw and domain types are equal after conversions
-        let raw = get_dummy_raw_msg_chan_open_init(None);
-        let msg = MsgChannelOpenInit::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgChannelOpenInit::from(msg.clone());
-        let msg_back = MsgChannelOpenInit::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-
-        // Check if handler sets counterparty channel id to `None`
-        // in case relayer passes `MsgChannelOpenInit` message with it set to `Some(_)`
-        let raw_with_counterpary_chan_id_some = get_dummy_raw_msg_chan_open_init(None);
-        let msg_with_counterpary_chan_id_some =
-            MsgChannelOpenInit::try_from(raw_with_counterpary_chan_id_some).unwrap();
-        let raw_with_counterpary_chan_id_some_back =
-            RawMsgChannelOpenInit::from(msg_with_counterpary_chan_id_some.clone());
-        let msg_with_counterpary_chan_id_some_back =
-            MsgChannelOpenInit::try_from(raw_with_counterpary_chan_id_some_back.clone()).unwrap();
-        assert_eq!(
-            raw_with_counterpary_chan_id_some_back
-                .channel
-                .unwrap()
-                .counterparty
-                .unwrap()
-                .channel_id,
-            "".to_string()
-        );
-        assert_eq!(
-            msg_with_counterpary_chan_id_some,
-            msg_with_counterpary_chan_id_some_back
-        );
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/chan_open_try.rs b/crates/ibc/src/core/ics04_channel/msgs/chan_open_try.rs
deleted file mode 100644
index 1759b2deb..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/chan_open_try.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-use crate::core::ics04_channel::channel::verify_connection_hops_length;
-use crate::core::ics04_channel::channel::ChannelEnd;
-use crate::core::ics04_channel::channel::Counterparty;
-use crate::core::ics04_channel::channel::{Order, State};
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::Version;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::{prelude::*, Height};
-
-use ibc_proto::ibc::core::channel::v1::MsgChannelOpenTry as RawMsgChannelOpenTry;
-use ibc_proto::protobuf::Protobuf;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenTry";
-
-///
-/// Message definition for the second step in the channel open handshake (`ChanOpenTry` datagram).
-/// Per our convention, this message is sent to chain B.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgChannelOpenTry {
-    pub port_id_on_b: PortId,
-    pub connection_hops_on_b: Vec<ConnectionId>,
-    pub port_id_on_a: PortId,
-    pub chan_id_on_a: ChannelId,
-    pub version_supported_on_a: Version,
-    pub proof_chan_end_on_a: CommitmentProofBytes,
-    pub proof_height_on_a: Height,
-    pub ordering: Order,
-    pub signer: Signer,
-
-    #[deprecated(since = "0.22.0")]
-    /// Only kept here for proper conversion to/from the raw type
-    pub version_proposal: Version,
-}
-
-impl MsgChannelOpenTry {
-    /// Checks if the `connection_hops` has a length of `expected`.
-    ///
-    /// Note: Current IBC version only supports one connection hop.
-    pub(crate) fn verify_connection_hops_length(&self) -> Result<(), ChannelError> {
-        verify_connection_hops_length(&self.connection_hops_on_b, 1)
-    }
-}
-
-impl Msg for MsgChannelOpenTry {
-    type Raw = RawMsgChannelOpenTry;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgChannelOpenTry> for MsgChannelOpenTry {}
-
-impl TryFrom<RawMsgChannelOpenTry> for MsgChannelOpenTry {
-    type Error = ChannelError;
-
-    fn try_from(raw_msg: RawMsgChannelOpenTry) -> Result<Self, Self::Error> {
-        let chan_end_on_b: ChannelEnd = raw_msg
-            .channel
-            .ok_or(ChannelError::MissingChannel)?
-            .try_into()?;
-
-        chan_end_on_b.verify_state_matches(&State::TryOpen)?;
-
-        #[allow(deprecated)]
-        if !raw_msg.previous_channel_id.is_empty() {
-            return Err(ChannelError::InvalidChannelId {
-                expected: "previous channel id must be empty. It has been deprecated as crossing hellos are no longer supported".to_string(),
-                actual: raw_msg.previous_channel_id,
-            });
-        }
-
-        #[allow(deprecated)]
-        let msg = MsgChannelOpenTry {
-            port_id_on_b: raw_msg.port_id.parse()?,
-            ordering: chan_end_on_b.ordering,
-            connection_hops_on_b: chan_end_on_b.connection_hops,
-            port_id_on_a: chan_end_on_b.remote.port_id,
-            chan_id_on_a: chan_end_on_b
-                .remote
-                .channel_id
-                .ok_or(ChannelError::MissingCounterparty)?,
-            version_supported_on_a: raw_msg.counterparty_version.into(),
-            proof_chan_end_on_a: raw_msg
-                .proof_init
-                .try_into()
-                .map_err(|_| ChannelError::InvalidProof)?,
-            proof_height_on_a: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ChannelError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-            version_proposal: chan_end_on_b.version,
-        };
-
-        Ok(msg)
-    }
-}
-
-impl From<MsgChannelOpenTry> for RawMsgChannelOpenTry {
-    fn from(domain_msg: MsgChannelOpenTry) -> Self {
-        let chan_end_on_b = ChannelEnd::new_without_validation(
-            State::TryOpen,
-            domain_msg.ordering,
-            Counterparty::new(domain_msg.port_id_on_a, Some(domain_msg.chan_id_on_a)),
-            domain_msg.connection_hops_on_b,
-            Version::empty(), // Excessive field to satisfy the type conversion
-        );
-        #[allow(deprecated)]
-        RawMsgChannelOpenTry {
-            port_id: domain_msg.port_id_on_b.to_string(),
-            previous_channel_id: "".to_string(), // Excessive field to satisfy the type conversion",
-            channel: Some(chan_end_on_b.into()),
-            counterparty_version: domain_msg.version_supported_on_a.to_string(),
-            proof_init: domain_msg.proof_chan_end_on_a.clone().into(),
-            proof_height: Some(domain_msg.proof_height_on_a.into()),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenTry as RawMsgChannelOpenTry;
-
-    use crate::core::ics04_channel::channel::test_util::get_dummy_raw_channel_end;
-    use crate::core::ics24_host::identifier::PortId;
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-    use ibc_proto::ibc::core::client::v1::Height;
-
-    /// Returns a dummy `RawMsgChannelOpenTry`, for testing only!
-    pub fn get_dummy_raw_msg_chan_open_try(proof_height: u64) -> RawMsgChannelOpenTry {
-        #[allow(deprecated)]
-        RawMsgChannelOpenTry {
-            port_id: PortId::default().to_string(),
-            previous_channel_id: "".to_string(),
-            channel: Some(get_dummy_raw_channel_end(2, Some(0))),
-            counterparty_version: "".to_string(),
-            proof_init: get_dummy_proof(),
-            proof_height: Some(Height {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::core::ics04_channel::msgs::chan_open_try::test_util::get_dummy_raw_msg_chan_open_try;
-    use crate::core::ics04_channel::msgs::chan_open_try::MsgChannelOpenTry;
-    use crate::prelude::*;
-
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenTry as RawMsgChannelOpenTry;
-    use ibc_proto::ibc::core::client::v1::Height;
-    use test_log::test;
-
-    #[test]
-    fn channel_open_try_from_raw() {
-        struct Test {
-            name: String,
-            raw: RawMsgChannelOpenTry,
-            want_pass: bool,
-        }
-
-        let proof_height = 10;
-        let default_raw_msg = get_dummy_raw_msg_chan_open_try(proof_height);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Correct port".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    port_id: "p34".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad port, name too short".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    port_id: "p".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad port, name too long".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    port_id: "abcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfaabcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfa".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Empty counterparty version (valid choice)".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    counterparty_version: " ".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Arbitrary counterparty version (valid choice)".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    counterparty_version: "anyversion".to_string(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad proof height, height = 0".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    proof_height: Some(Height {
-                        revision_number: 0,
-                        revision_height: 0,
-                    }),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof height".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    proof_height: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof init (object proof)".to_string(),
-                raw: RawMsgChannelOpenTry {
-                    proof_init: Vec::new(),
-                    ..default_raw_msg
-                },
-                want_pass: false,
-            },
-        ]
-            .into_iter()
-            .collect();
-
-        for test in tests {
-            let res_msg = MsgChannelOpenTry::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                res_msg.is_ok(),
-                "MsgChanOpenTry::try_from failed for test {}, \nraw msg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                res_msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_chan_open_try(10);
-        let msg = MsgChannelOpenTry::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgChannelOpenTry::from(msg.clone());
-        let msg_back = MsgChannelOpenTry::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/recv_packet.rs b/crates/ibc/src/core/ics04_channel/msgs/recv_packet.rs
deleted file mode 100644
index ae96fe80f..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/recv_packet.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-use crate::prelude::*;
-
-use ibc_proto::protobuf::Protobuf;
-
-use ibc_proto::ibc::core::channel::v1::MsgRecvPacket as RawMsgRecvPacket;
-
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::Height;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgRecvPacket";
-
-///
-/// Message definition for the "packet receiving" datagram.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgRecvPacket {
-    /// The packet to be received
-    pub packet: Packet,
-    /// Proof of packet commitment on the sending chain
-    pub proof_commitment_on_a: CommitmentProofBytes,
-    /// Height at which the commitment proof in this message were taken
-    pub proof_height_on_a: Height,
-    /// The signer of the message
-    pub signer: Signer,
-}
-
-impl Msg for MsgRecvPacket {
-    type Raw = RawMsgRecvPacket;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgRecvPacket> for MsgRecvPacket {}
-
-impl TryFrom<RawMsgRecvPacket> for MsgRecvPacket {
-    type Error = PacketError;
-
-    fn try_from(raw_msg: RawMsgRecvPacket) -> Result<Self, Self::Error> {
-        Ok(MsgRecvPacket {
-            packet: raw_msg
-                .packet
-                .ok_or(PacketError::MissingPacket)?
-                .try_into()?,
-            proof_commitment_on_a: raw_msg
-                .proof_commitment
-                .try_into()
-                .map_err(|_| PacketError::InvalidProof)?,
-            proof_height_on_a: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(PacketError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgRecvPacket> for RawMsgRecvPacket {
-    fn from(domain_msg: MsgRecvPacket) -> Self {
-        RawMsgRecvPacket {
-            packet: Some(domain_msg.packet.into()),
-            proof_commitment: domain_msg.proof_commitment_on_a.into(),
-            proof_height: Some(domain_msg.proof_height_on_a.into()),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use ibc_proto::ibc::core::channel::v1::MsgRecvPacket as RawMsgRecvPacket;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-
-    use super::MsgRecvPacket;
-    use crate::core::ics04_channel::packet::test_utils::get_dummy_raw_packet;
-    use crate::core::ics04_channel::packet::Packet;
-    use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-    use crate::core::timestamp::Timestamp;
-    use crate::signer::Signer;
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-    use core::ops::Add;
-    use core::time::Duration;
-
-    impl MsgRecvPacket {
-        pub fn new(
-            packet: Packet,
-            proof_commitment_on_a: CommitmentProofBytes,
-            proof_height_on_a: crate::Height,
-            signer: Signer,
-        ) -> MsgRecvPacket {
-            Self {
-                packet,
-                proof_commitment_on_a,
-                proof_height_on_a,
-                signer,
-            }
-        }
-    }
-
-    /// Returns a dummy `RawMsgRecvPacket`, for testing only! The `height` parametrizes both the
-    /// proof height as well as the timeout height.
-    pub fn get_dummy_raw_msg_recv_packet(height: u64) -> RawMsgRecvPacket {
-        let timestamp = Timestamp::now().add(Duration::from_secs(9));
-        RawMsgRecvPacket {
-            packet: Some(get_dummy_raw_packet(
-                height,
-                timestamp.unwrap().nanoseconds(),
-            )),
-            proof_commitment: get_dummy_proof(),
-            proof_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: height,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::channel::v1::MsgRecvPacket as RawMsgRecvPacket;
-
-    use crate::core::ics04_channel::error::PacketError;
-    use crate::core::ics04_channel::msgs::recv_packet::test_util::get_dummy_raw_msg_recv_packet;
-    use crate::core::ics04_channel::msgs::recv_packet::MsgRecvPacket;
-    use crate::test_utils::get_dummy_bech32_account;
-
-    #[test]
-    fn msg_recv_packet_try_from_raw() {
-        struct Test {
-            name: String,
-            raw: RawMsgRecvPacket,
-            want_pass: bool,
-        }
-
-        let height = 20;
-        let default_raw_msg = get_dummy_raw_msg_recv_packet(height);
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Missing proof".to_string(),
-                raw: RawMsgRecvPacket {
-                    proof_commitment: Vec::new(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof height".to_string(),
-                raw: RawMsgRecvPacket {
-                    proof_height: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Empty signer".to_string(),
-                raw: RawMsgRecvPacket {
-                    signer: get_dummy_bech32_account(),
-                    ..default_raw_msg
-                },
-                want_pass: true,
-            },
-        ];
-
-        for test in tests {
-            let res_msg: Result<MsgRecvPacket, PacketError> = test.raw.clone().try_into();
-
-            assert_eq!(
-                res_msg.is_ok(),
-                test.want_pass,
-                "MsgRecvPacket::try_from failed for test {} \nraw message: {:?} with error: {:?}",
-                test.name,
-                test.raw,
-                res_msg.err()
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_recv_packet(15);
-        let msg = MsgRecvPacket::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgRecvPacket::from(msg.clone());
-        let msg_back = MsgRecvPacket::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/timeout.rs b/crates/ibc/src/core/ics04_channel/msgs/timeout.rs
deleted file mode 100644
index 5595a27ee..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/timeout.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use crate::prelude::*;
-
-use ibc_proto::protobuf::Protobuf;
-
-use ibc_proto::ibc::core::channel::v1::MsgTimeout as RawMsgTimeout;
-
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::packet::{Packet, Sequence};
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::Height;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgTimeout";
-
-///
-/// Message definition for packet timeout domain type,
-/// which is sent on chain A and needs to prove that a previously sent packet was not received on chain B
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgTimeout {
-    pub packet: Packet,
-    pub next_seq_recv_on_b: Sequence,
-    pub proof_unreceived_on_b: CommitmentProofBytes,
-    pub proof_height_on_b: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgTimeout {
-    type Raw = RawMsgTimeout;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgTimeout> for MsgTimeout {}
-
-impl TryFrom<RawMsgTimeout> for MsgTimeout {
-    type Error = PacketError;
-
-    fn try_from(raw_msg: RawMsgTimeout) -> Result<Self, Self::Error> {
-        if raw_msg.next_sequence_recv == 0 {
-            return Err(PacketError::ZeroPacketSequence);
-        }
-        Ok(MsgTimeout {
-            packet: raw_msg
-                .packet
-                .ok_or(PacketError::MissingPacket)?
-                .try_into()?,
-            next_seq_recv_on_b: Sequence::from(raw_msg.next_sequence_recv),
-            proof_unreceived_on_b: raw_msg
-                .proof_unreceived
-                .try_into()
-                .map_err(|_| PacketError::InvalidProof)?,
-            proof_height_on_b: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(PacketError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgTimeout> for RawMsgTimeout {
-    fn from(domain_msg: MsgTimeout) -> Self {
-        RawMsgTimeout {
-            packet: Some(domain_msg.packet.into()),
-            proof_unreceived: domain_msg.proof_unreceived_on_b.into(),
-            proof_height: Some(domain_msg.proof_height_on_b.into()),
-            next_sequence_recv: domain_msg.next_seq_recv_on_b.into(),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use ibc_proto::ibc::core::channel::v1::MsgTimeout as RawMsgTimeout;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-
-    use crate::core::ics04_channel::packet::test_utils::get_dummy_raw_packet;
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    /// Returns a dummy `RawMsgTimeout`, for testing only!
-    /// The `height` parametrizes both the proof height as well as the timeout height.
-    pub fn get_dummy_raw_msg_timeout(
-        proof_height: u64,
-        timeout_height: u64,
-        timeout_timestamp: u64,
-    ) -> RawMsgTimeout {
-        RawMsgTimeout {
-            packet: Some(get_dummy_raw_packet(timeout_height, timeout_timestamp)),
-            proof_unreceived: get_dummy_proof(),
-            proof_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            next_sequence_recv: 1,
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::channel::v1::MsgTimeout as RawMsgTimeout;
-
-    use crate::core::ics04_channel::error::PacketError;
-    use crate::core::ics04_channel::msgs::timeout::test_util::get_dummy_raw_msg_timeout;
-    use crate::core::ics04_channel::msgs::timeout::MsgTimeout;
-    use crate::test_utils::get_dummy_bech32_account;
-
-    #[test]
-    fn msg_timeout_try_from_raw() {
-        struct Test {
-            name: String,
-            raw: RawMsgTimeout,
-            want_pass: bool,
-        }
-
-        let proof_height = 50;
-        let timeout_height = proof_height;
-        let timeout_timestamp = 0;
-        let default_raw_msg =
-            get_dummy_raw_msg_timeout(proof_height, timeout_height, timeout_timestamp);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Missing packet".to_string(),
-                raw: RawMsgTimeout {
-                    packet: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof".to_string(),
-                raw: RawMsgTimeout {
-                    proof_unreceived: Vec::new(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof height".to_string(),
-                raw: RawMsgTimeout {
-                    proof_height: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Empty signer".to_string(),
-                raw: RawMsgTimeout {
-                    signer: get_dummy_bech32_account(),
-                    ..default_raw_msg
-                },
-                want_pass: true,
-            },
-        ];
-
-        for test in tests {
-            let res_msg: Result<MsgTimeout, PacketError> = test.raw.clone().try_into();
-
-            assert_eq!(
-                res_msg.is_ok(),
-                test.want_pass,
-                "MsgTimeout::try_from failed for test {} \nraw message: {:?} with error: {:?}",
-                test.name,
-                test.raw,
-                res_msg.err()
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_msg_timeout(15, 20, 0);
-        let msg = MsgTimeout::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgTimeout::from(msg.clone());
-        let msg_back = MsgTimeout::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/timeout_on_close.rs b/crates/ibc/src/core/ics04_channel/msgs/timeout_on_close.rs
deleted file mode 100644
index 90401c4c4..000000000
--- a/crates/ibc/src/core/ics04_channel/msgs/timeout_on_close.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use crate::prelude::*;
-
-use ibc_proto::ibc::core::channel::v1::MsgTimeoutOnClose as RawMsgTimeoutOnClose;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::packet::{Packet, Sequence};
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::Height;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgTimeoutOnClose";
-
-///
-/// Message definition for packet timeout domain type.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgTimeoutOnClose {
-    pub packet: Packet,
-    pub next_seq_recv_on_b: Sequence,
-    pub proof_unreceived_on_b: CommitmentProofBytes,
-    pub proof_close_on_b: CommitmentProofBytes,
-    pub proof_height_on_b: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgTimeoutOnClose {
-    type Raw = RawMsgTimeoutOnClose;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgTimeoutOnClose> for MsgTimeoutOnClose {}
-
-impl TryFrom<RawMsgTimeoutOnClose> for MsgTimeoutOnClose {
-    type Error = PacketError;
-
-    fn try_from(raw_msg: RawMsgTimeoutOnClose) -> Result<Self, Self::Error> {
-        if raw_msg.next_sequence_recv == 0 {
-            return Err(PacketError::ZeroPacketSequence);
-        }
-
-        Ok(MsgTimeoutOnClose {
-            packet: raw_msg
-                .packet
-                .ok_or(PacketError::MissingPacket)?
-                .try_into()?,
-            next_seq_recv_on_b: Sequence::from(raw_msg.next_sequence_recv),
-            proof_unreceived_on_b: raw_msg
-                .proof_unreceived
-                .try_into()
-                .map_err(|_| PacketError::InvalidProof)?,
-            proof_close_on_b: raw_msg
-                .proof_close
-                .try_into()
-                .map_err(|_| PacketError::InvalidProof)?,
-            proof_height_on_b: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(PacketError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgTimeoutOnClose> for RawMsgTimeoutOnClose {
-    fn from(domain_msg: MsgTimeoutOnClose) -> Self {
-        RawMsgTimeoutOnClose {
-            packet: Some(domain_msg.packet.into()),
-            proof_unreceived: domain_msg.proof_unreceived_on_b.into(),
-            proof_close: domain_msg.proof_close_on_b.into(),
-            proof_height: Some(domain_msg.proof_height_on_b.into()),
-            next_sequence_recv: domain_msg.next_seq_recv_on_b.into(),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgTimeoutOnClose as RawMsgTimeoutOnClose;
-    use test_log::test;
-
-    use crate::core::ics04_channel::msgs::timeout_on_close::test_util::get_dummy_raw_msg_timeout_on_close;
-    use crate::core::ics04_channel::msgs::timeout_on_close::MsgTimeoutOnClose;
-
-    #[test]
-    fn msg_timeout_on_close_try_from_raw() {
-        let height = 50;
-        let timeout_timestamp = 5;
-        let raw = get_dummy_raw_msg_timeout_on_close(height, timeout_timestamp);
-
-        let msg = MsgTimeoutOnClose::try_from(raw.clone()).unwrap();
-        let raw_back = RawMsgTimeoutOnClose::from(msg);
-        assert_eq!(raw, raw_back);
-    }
-
-    #[test]
-    fn parse_timeout_on_close_msg() {
-        struct Test {
-            name: String,
-            raw: RawMsgTimeoutOnClose,
-            want_pass: bool,
-        }
-
-        let height = 50;
-        let timeout_timestamp = 5;
-        let default_raw_msg = get_dummy_raw_msg_timeout_on_close(height, timeout_timestamp);
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_msg.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Missing packet".to_string(),
-                raw: RawMsgTimeoutOnClose {
-                    packet: None,
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof of unreceived packet".to_string(),
-                raw: RawMsgTimeoutOnClose {
-                    proof_unreceived: Vec::new(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof of channel".to_string(),
-                raw: RawMsgTimeoutOnClose {
-                    proof_close: Vec::new(),
-                    ..default_raw_msg.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Missing proof height".to_string(),
-                raw: RawMsgTimeoutOnClose {
-                    proof_height: None,
-                    ..default_raw_msg
-                },
-                want_pass: false,
-            },
-        ];
-
-        for test in tests {
-            let res_msg = MsgTimeoutOnClose::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                res_msg.is_ok(),
-                "MsgTimeoutOnClose::try_from raw failed for test {}, \nraw msg {:?} with error {:?}",
-                test.name,
-                test.raw,
-                res_msg.err(),
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use ibc_proto::ibc::core::channel::v1::MsgTimeoutOnClose as RawMsgTimeoutOnClose;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-
-    use crate::core::ics04_channel::packet::test_utils::get_dummy_raw_packet;
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-
-    /// Returns a dummy `RawMsgTimeoutOnClose`, for testing only!
-    /// The `height` parametrizes both the proof height as well as the timeout height.
-    pub fn get_dummy_raw_msg_timeout_on_close(
-        height: u64,
-        timeout_timestamp: u64,
-    ) -> RawMsgTimeoutOnClose {
-        RawMsgTimeoutOnClose {
-            packet: Some(get_dummy_raw_packet(height, timeout_timestamp)),
-            proof_unreceived: get_dummy_proof(),
-            proof_close: get_dummy_proof(),
-            proof_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: height,
-            }),
-            next_sequence_recv: 1,
-            signer: get_dummy_bech32_account(),
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/packet.rs b/crates/ibc/src/core/ics04_channel/packet.rs
deleted file mode 100644
index e369c9ab4..000000000
--- a/crates/ibc/src/core/ics04_channel/packet.rs
+++ /dev/null
@@ -1,505 +0,0 @@
-//! Defines the packet type
-
-use crate::prelude::*;
-
-use core::str::FromStr;
-
-use ibc_proto::ibc::core::channel::v1::Packet as RawPacket;
-
-use super::timeout::TimeoutHeight;
-use crate::core::ics04_channel::error::{ChannelError, PacketError};
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::core::timestamp::{Expiry::Expired, Timestamp};
-use crate::Height;
-
-/// Enumeration of proof carrying ICS4 message, helper for relayer.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum PacketMsgType {
-    Recv,
-    Ack,
-    TimeoutUnordered,
-    TimeoutOrdered,
-    TimeoutOnClose,
-}
-
-/// Packet receipt, used over unordered channels.
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[derive(Clone, Debug)]
-pub enum Receipt {
-    Ok,
-}
-
-impl core::fmt::Display for PacketMsgType {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        match self {
-            PacketMsgType::Recv => write!(f, "(PacketMsgType::Recv)"),
-            PacketMsgType::Ack => write!(f, "(PacketMsgType::Ack)"),
-            PacketMsgType::TimeoutUnordered => write!(f, "(PacketMsgType::TimeoutUnordered)"),
-            PacketMsgType::TimeoutOrdered => write!(f, "(PacketMsgType::TimeoutOrdered)"),
-            PacketMsgType::TimeoutOnClose => write!(f, "(PacketMsgType::TimeoutOnClose)"),
-        }
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-/// The sequence number of a packet enforces ordering among packets from the same source.
-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct Sequence(u64);
-
-impl FromStr for Sequence {
-    type Err = ChannelError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Self::from(s.parse::<u64>().map_err(|e| {
-            ChannelError::InvalidStringAsSequence {
-                value: s.to_string(),
-                error: e,
-            }
-        })?))
-    }
-}
-
-impl Sequence {
-    pub fn is_zero(&self) -> bool {
-        self.0 == 0
-    }
-
-    pub fn increment(&self) -> Sequence {
-        Sequence(self.0 + 1)
-    }
-}
-
-impl From<u64> for Sequence {
-    fn from(seq: u64) -> Self {
-        Sequence(seq)
-    }
-}
-
-impl From<Sequence> for u64 {
-    fn from(s: Sequence) -> u64 {
-        s.0
-    }
-}
-
-impl core::fmt::Display for Sequence {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
-        write!(f, "{}", self.0)
-    }
-}
-
-/// The packet type; this is what applications send to one another.
-///
-/// Each application defines the structure of the `data` field.
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Default, Hash, PartialEq, Eq)]
-pub struct Packet {
-    pub seq_on_a: Sequence,
-    pub port_id_on_a: PortId,
-    pub chan_id_on_a: ChannelId,
-    pub port_id_on_b: PortId,
-    pub chan_id_on_b: ChannelId,
-    #[cfg_attr(
-        feature = "serde",
-        serde(serialize_with = "crate::serializers::ser_hex_upper")
-    )]
-    pub data: Vec<u8>,
-    pub timeout_height_on_b: TimeoutHeight,
-    pub timeout_timestamp_on_b: Timestamp,
-}
-
-struct PacketData<'a>(&'a [u8]);
-
-impl<'a> core::fmt::Debug for PacketData<'a> {
-    fn fmt(&self, formatter: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
-        write!(formatter, "{:?}", self.0)
-    }
-}
-
-impl core::fmt::Debug for Packet {
-    fn fmt(&self, formatter: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
-        // Remember: if you alter the definition of `Packet`,
-        // 1. update the formatter debug struct builder calls (return object of
-        //    this function)
-        // 2. update this destructuring assignment accordingly
-        let Packet {
-            seq_on_a: _,
-            port_id_on_a: _,
-            chan_id_on_a: _,
-            port_id_on_b: _,
-            chan_id_on_b: _,
-            data,
-            timeout_height_on_b: _,
-            timeout_timestamp_on_b: _,
-        } = self;
-        let data_wrapper = PacketData(data);
-
-        formatter
-            .debug_struct("Packet")
-            .field("sequence", &self.seq_on_a)
-            .field("source_port", &self.port_id_on_a)
-            .field("source_channel", &self.chan_id_on_a)
-            .field("destination_port", &self.port_id_on_b)
-            .field("destination_channel", &self.chan_id_on_b)
-            .field("data", &data_wrapper)
-            .field("timeout_height", &self.timeout_height_on_b)
-            .field("timeout_timestamp", &self.timeout_timestamp_on_b)
-            .finish()
-    }
-}
-
-impl Packet {
-    /// Checks whether a packet from a
-    /// [`SendPacket`](crate::core::ics04_channel::events::SendPacket)
-    /// event is timed-out relative to the current state of the
-    /// destination chain.
-    ///
-    /// Checks both for time-out relative to the destination chain's
-    /// current timestamp `dst_chain_ts` as well as relative to
-    /// the height `dst_chain_height`.
-    ///
-    /// Note: a timed-out packet should result in a
-    /// [`MsgTimeout`](crate::core::ics04_channel::msgs::timeout::MsgTimeout),
-    /// instead of the common-case where it results in
-    /// [`MsgRecvPacket`](crate::core::ics04_channel::msgs::recv_packet::MsgRecvPacket).
-    pub fn timed_out(&self, dst_chain_ts: &Timestamp, dst_chain_height: Height) -> bool {
-        let height_timed_out = self.timeout_height_on_b.has_expired(dst_chain_height);
-
-        let timestamp_timed_out = self.timeout_timestamp_on_b.is_set()
-            && dst_chain_ts.check_expiry(&self.timeout_timestamp_on_b) == Expired;
-
-        height_timed_out || timestamp_timed_out
-    }
-}
-
-/// Custom debug output to omit the packet data
-impl core::fmt::Display for Packet {
-    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
-        write!(
-            f,
-            "seq:{}, path:{}/{}->{}/{}, toh:{}, tos:{})",
-            self.seq_on_a,
-            self.chan_id_on_a,
-            self.port_id_on_a,
-            self.chan_id_on_b,
-            self.port_id_on_b,
-            self.timeout_height_on_b,
-            self.timeout_timestamp_on_b
-        )
-    }
-}
-
-impl TryFrom<RawPacket> for Packet {
-    type Error = PacketError;
-
-    fn try_from(raw_pkt: RawPacket) -> Result<Self, Self::Error> {
-        if Sequence::from(raw_pkt.sequence).is_zero() {
-            return Err(PacketError::ZeroPacketSequence);
-        }
-
-        if raw_pkt.data.is_empty() {
-            return Err(PacketError::ZeroPacketData);
-        }
-
-        // Note: ibc-go currently (July 2022) incorrectly treats the timeout
-        // heights `{revision_number : >0, revision_height: 0}` as valid
-        // timeouts. However, heights with `revision_height == 0` are invalid in
-        // Tendermint. We explicitly reject these values because they go against
-        // the Tendermint spec, and shouldn't be used. To timeout on the next
-        // revision_number as soon as the chain starts,
-        // `{revision_number: old_rev + 1, revision_height: 1}`
-        // should be used.
-        let packet_timeout_height: TimeoutHeight = raw_pkt
-            .timeout_height
-            .try_into()
-            .map_err(|_| PacketError::InvalidTimeoutHeight)?;
-
-        let timeout_timestamp_on_b = Timestamp::from_nanoseconds(raw_pkt.timeout_timestamp)
-            .map_err(PacketError::InvalidPacketTimestamp)?;
-
-        // Packet timeout height and packet timeout timestamp cannot both be unset.
-        if !packet_timeout_height.is_set() && !timeout_timestamp_on_b.is_set() {
-            return Err(PacketError::MissingTimeout);
-        }
-
-        Ok(Packet {
-            seq_on_a: Sequence::from(raw_pkt.sequence),
-            port_id_on_a: raw_pkt.source_port.parse()?,
-            chan_id_on_a: raw_pkt.source_channel.parse()?,
-            port_id_on_b: raw_pkt.destination_port.parse()?,
-            chan_id_on_b: raw_pkt.destination_channel.parse()?,
-            data: raw_pkt.data,
-            timeout_height_on_b: packet_timeout_height,
-            timeout_timestamp_on_b,
-        })
-    }
-}
-
-impl From<Packet> for RawPacket {
-    fn from(packet: Packet) -> Self {
-        RawPacket {
-            sequence: packet.seq_on_a.0,
-            source_port: packet.port_id_on_a.to_string(),
-            source_channel: packet.chan_id_on_a.to_string(),
-            destination_port: packet.port_id_on_b.to_string(),
-            destination_channel: packet.chan_id_on_b.to_string(),
-            data: packet.data,
-            timeout_height: packet.timeout_height_on_b.into(),
-            timeout_timestamp: packet.timeout_timestamp_on_b.nanoseconds(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_utils {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::Packet as RawPacket;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-
-    use crate::core::ics24_host::identifier::{ChannelId, PortId};
-
-    /// Returns a dummy `RawPacket`, for testing only!
-    pub fn get_dummy_raw_packet(timeout_height: u64, timeout_timestamp: u64) -> RawPacket {
-        RawPacket {
-            sequence: 1,
-            source_port: PortId::default().to_string(),
-            source_channel: ChannelId::default().to_string(),
-            destination_port: PortId::default().to_string(),
-            destination_channel: ChannelId::default().to_string(),
-            data: vec![0],
-            timeout_height: Some(RawHeight {
-                revision_number: 0,
-                revision_height: timeout_height,
-            }),
-            timeout_timestamp,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::channel::v1::Packet as RawPacket;
-    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
-
-    use crate::core::ics04_channel::packet::test_utils::get_dummy_raw_packet;
-    use crate::core::ics04_channel::packet::Packet;
-
-    #[test]
-    fn packet_try_from_raw() {
-        struct Test {
-            name: String,
-            raw: RawPacket,
-            want_pass: bool,
-        }
-
-        let proof_height = 10;
-        let default_raw_packet = get_dummy_raw_packet(proof_height, 1000);
-        let raw_packet_no_timeout_or_timestamp = get_dummy_raw_packet(10, 0);
-
-        let mut raw_packet_invalid_timeout_height = get_dummy_raw_packet(0, 10);
-        raw_packet_invalid_timeout_height.timeout_height = Some(RawHeight {
-            revision_number: 1,
-            revision_height: 0,
-        });
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Good parameters".to_string(),
-                raw: default_raw_packet.clone(),
-                want_pass: true,
-            },
-            Test {
-                // Note: ibc-go currently (July 2022) incorrectly rejects this
-                // case, even though it is allowed in ICS-4.
-                name: "Packet with no timeout of timestamp".to_string(),
-                raw: raw_packet_no_timeout_or_timestamp.clone(),
-                want_pass: true,
-            },
-            Test {
-                name: "Packet with invalid timeout height".to_string(),
-                raw: raw_packet_invalid_timeout_height,
-                want_pass: false,
-            },
-            Test {
-                name: "Src port validation: correct".to_string(),
-                raw: RawPacket {
-                    source_port: "srcportp34".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad src port, name too short".to_string(),
-                raw: RawPacket {
-                    source_port: "p".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad src port, name too long".to_string(),
-                raw: RawPacket {
-                    source_port: "abcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfasdfasdfaklmnopqrstuabcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfasdfasdfaklmnopqrstu".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Dst port validation: correct".to_string(),
-                raw: RawPacket {
-                    destination_port: "destportsrcp34".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad dst port, name too short".to_string(),
-                raw: RawPacket {
-                    destination_port: "p".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad dst port, name too long".to_string(),
-                raw: RawPacket {
-                    destination_port: "abcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfasdfasdfaklmnopqrstuabcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfas".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Src channel validation: correct".to_string(),
-                raw: RawPacket {
-                    source_channel: "channel-1".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad src channel, name too short".to_string(),
-                raw: RawPacket {
-                    source_channel: "p".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad src channel, name too long".to_string(),
-                raw: RawPacket {
-                    source_channel: "channel-128391283791827398127398791283912837918273981273987912839".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Dst channel validation: correct".to_string(),
-                raw: RawPacket {
-                    destination_channel: "channel-34".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Bad dst channel, name too short".to_string(),
-                raw: RawPacket {
-                    destination_channel: "p".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Bad dst channel, name too long".to_string(),
-                raw: RawPacket {
-                    destination_channel: "channel-128391283791827398127398791283912837918273981273987912839".to_string(),
-                    ..default_raw_packet.clone()
-                },
-                want_pass: false,
-            },
-            // Note: `timeout_height == None` is a quirk of protobuf. In
-            // `proto3` syntax, all structs are "nullable" by default and are
-            // represented as `Option<T>`. `ibc-go` defines the protobuf file
-            // with the extension option `gogoproto.nullable = false`, which
-            // means that they will always generate a field. It is left
-            // unspecified what a `None` value means. In this case, I believe it
-            // is best to assume the obvious semantic of "no timeout".
-            Test {
-                name: "Missing timeout height".to_string(),
-                raw: RawPacket {
-                    timeout_height: None,
-                    ..default_raw_packet
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Missing both timeout height and timestamp".to_string(),
-                raw: RawPacket {
-                    timeout_height: None,
-                    ..raw_packet_no_timeout_or_timestamp
-                },
-                want_pass: false,
-            }
-        ];
-
-        for test in tests {
-            let res_msg = Packet::try_from(test.raw.clone());
-
-            assert_eq!(
-                test.want_pass,
-                res_msg.is_ok(),
-                "Packet::try_from failed for test {}, \nraw packet {:?} with error {:?}",
-                test.name,
-                test.raw,
-                res_msg.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn to_and_from() {
-        let raw = get_dummy_raw_packet(15, 0);
-        let msg = Packet::try_from(raw.clone()).unwrap();
-        let raw_back = RawPacket::from(msg.clone());
-        let msg_back = Packet::try_from(raw_back.clone()).unwrap();
-        assert_eq!(raw, raw_back);
-        assert_eq!(msg, msg_back);
-    }
-}
diff --git a/crates/ibc/src/core/ics23_commitment/mod.rs b/crates/ibc/src/core/ics23_commitment/mod.rs
deleted file mode 100644
index ecffa81d6..000000000
--- a/crates/ibc/src/core/ics23_commitment/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! ICS 23: Commitment implementation of a cryptographic scheme that verifies
-//! state transitions between chains.
-
-pub mod commitment;
-pub mod error;
-pub mod merkle;
-pub mod specs;
diff --git a/crates/ibc/src/core/ics23_commitment/specs.rs b/crates/ibc/src/core/ics23_commitment/specs.rs
deleted file mode 100644
index 902a97315..000000000
--- a/crates/ibc/src/core/ics23_commitment/specs.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-//! Defines proof specs, which encode the structure of proofs
-
-use crate::prelude::*;
-use ibc_proto::ics23::{InnerSpec as RawInnerSpec, LeafOp as RawLeafOp, ProofSpec as RawProofSpec};
-/// An array of proof specifications.
-///
-/// This type encapsulates different types of proof specifications, mostly predefined, e.g., for
-/// Cosmos-SDK.
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq)]
-pub struct ProofSpecs(Vec<ProofSpec>);
-
-impl ProofSpecs {
-    /// Returns the specification for Cosmos-SDK proofs
-    pub fn cosmos() -> Self {
-        vec![
-            ics23::iavl_spec(),       // Format of proofs-iavl (iavl merkle proofs)
-            ics23::tendermint_spec(), // Format of proofs-tendermint (crypto/ merkle SimpleProof)
-        ]
-        .into()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-}
-
-impl Default for ProofSpecs {
-    fn default() -> Self {
-        Self::cosmos()
-    }
-}
-
-impl From<Vec<RawProofSpec>> for ProofSpecs {
-    fn from(ics23_specs: Vec<RawProofSpec>) -> Self {
-        Self(
-            ics23_specs
-                .into_iter()
-                .map(|ics23_spec| ics23_spec.into())
-                .collect(),
-        )
-    }
-}
-
-impl From<ProofSpecs> for Vec<RawProofSpec> {
-    fn from(specs: ProofSpecs) -> Self {
-        specs.0.into_iter().map(|spec| spec.into()).collect()
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq)]
-struct ProofSpec(RawProofSpec);
-
-impl From<RawProofSpec> for ProofSpec {
-    fn from(spec: RawProofSpec) -> Self {
-        Self(RawProofSpec {
-            leaf_spec: spec.leaf_spec.map(|lop| LeafOp::from(lop).0),
-            inner_spec: spec.inner_spec.map(|ispec| InnerSpec::from(ispec).0),
-            max_depth: spec.max_depth,
-            min_depth: spec.min_depth,
-            prehash_key_before_comparison: spec.prehash_key_before_comparison,
-        })
-    }
-}
-
-impl From<ProofSpec> for RawProofSpec {
-    fn from(spec: ProofSpec) -> Self {
-        let spec = spec.0;
-        RawProofSpec {
-            leaf_spec: spec.leaf_spec.map(|lop| LeafOp(lop).into()),
-            inner_spec: spec.inner_spec.map(|ispec| InnerSpec(ispec).into()),
-            max_depth: spec.max_depth,
-            min_depth: spec.min_depth,
-            prehash_key_before_comparison: spec.prehash_key_before_comparison,
-        }
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq)]
-struct LeafOp(RawLeafOp);
-
-impl From<RawLeafOp> for LeafOp {
-    fn from(leaf_op: RawLeafOp) -> Self {
-        Self(RawLeafOp {
-            hash: leaf_op.hash,
-            prehash_key: leaf_op.prehash_key,
-            prehash_value: leaf_op.prehash_value,
-            length: leaf_op.length,
-            prefix: leaf_op.prefix,
-        })
-    }
-}
-
-impl From<LeafOp> for RawLeafOp {
-    fn from(leaf_op: LeafOp) -> Self {
-        let leaf_op = leaf_op.0;
-        RawLeafOp {
-            hash: leaf_op.hash,
-            prehash_key: leaf_op.prehash_key,
-            prehash_value: leaf_op.prehash_value,
-            length: leaf_op.length,
-            prefix: leaf_op.prefix,
-        }
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq)]
-struct InnerSpec(RawInnerSpec);
-
-impl From<RawInnerSpec> for InnerSpec {
-    fn from(inner_spec: RawInnerSpec) -> Self {
-        Self(RawInnerSpec {
-            child_order: inner_spec.child_order,
-            child_size: inner_spec.child_size,
-            min_prefix_length: inner_spec.min_prefix_length,
-            max_prefix_length: inner_spec.max_prefix_length,
-            empty_child: inner_spec.empty_child,
-            hash: inner_spec.hash,
-        })
-    }
-}
-
-impl From<InnerSpec> for RawInnerSpec {
-    fn from(inner_spec: InnerSpec) -> Self {
-        let inner_spec = inner_spec.0;
-        RawInnerSpec {
-            child_order: inner_spec.child_order,
-            child_size: inner_spec.child_size,
-            min_prefix_length: inner_spec.min_prefix_length,
-            max_prefix_length: inner_spec.max_prefix_length,
-            empty_child: inner_spec.empty_child,
-            hash: inner_spec.hash,
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics24_host/identifier.rs b/crates/ibc/src/core/ics24_host/identifier.rs
deleted file mode 100644
index 5023faade..000000000
--- a/crates/ibc/src/core/ics24_host/identifier.rs
+++ /dev/null
@@ -1,520 +0,0 @@
-//! Defines identifier types
-
-pub(crate) mod validate;
-use validate::*;
-
-use core::convert::{From, Infallible};
-use core::fmt::{Debug, Display, Error as FmtError, Formatter};
-use core::str::FromStr;
-
-use derive_more::Into;
-use displaydoc::Display;
-
-use crate::clients::ics07_tendermint::client_type as tm_client_type;
-use crate::core::ics02_client::client_type::ClientType;
-
-use crate::prelude::*;
-
-const CONNECTION_ID_PREFIX: &str = "connection";
-const CHANNEL_ID_PREFIX: &str = "channel";
-
-const DEFAULT_CHAIN_ID: &str = "defaultChainId";
-const DEFAULT_PORT_ID: &str = "defaultPort";
-const TRANSFER_PORT_ID: &str = "transfer";
-
-/// A `ChainId` is in "epoch format" if it is of the form `{chain name}-{epoch number}`,
-/// where the epoch number is the number of times the chain was upgraded. Chain IDs not
-/// in that format will be assumed to have epoch number 0.
-///
-/// This is not standardized yet, although compatible with ibc-go.
-/// See: <https://github.com/informalsystems/ibc-rs/pull/304#discussion_r503917283>.
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ChainId {
-    id: String,
-    version: u64,
-}
-
-impl ChainId {
-    /// Creates a new `ChainId` given a chain name and an epoch number.
-    ///
-    /// The returned `ChainId` will have the format: `{chain name}-{epoch number}`.
-    ///
-    /// ```
-    /// use ibc::core::ics24_host::identifier::ChainId;
-    ///
-    /// let epoch_number = 10;
-    /// let id = ChainId::new("chainA", epoch_number);
-    /// assert_eq!(id.version(), epoch_number);
-    /// ```
-    pub fn new(name: &str, version: u64) -> Self {
-        let id = format!("{name}-{version}");
-        Self { id, version }
-    }
-
-    pub fn from_string(id: &str) -> Self {
-        let version = if Self::is_epoch_format(id) {
-            Self::chain_version(id)
-        } else {
-            0
-        };
-
-        Self {
-            id: id.to_string(),
-            version,
-        }
-    }
-
-    /// Get a reference to the underlying string.
-    pub fn as_str(&self) -> &str {
-        &self.id
-    }
-
-    // TODO: this should probably be named epoch_number.
-    /// Extract the version from this chain identifier.
-    pub fn version(&self) -> u64 {
-        self.version
-    }
-
-    /// Extract the version from the given chain identifier.
-    /// ```
-    /// use ibc::core::ics24_host::identifier::ChainId;
-    ///
-    /// assert_eq!(ChainId::chain_version("chain--a-0"), 0);
-    /// assert_eq!(ChainId::chain_version("ibc-10"), 10);
-    /// assert_eq!(ChainId::chain_version("cosmos-hub-97"), 97);
-    /// assert_eq!(ChainId::chain_version("testnet-helloworld-2"), 2);
-    /// ```
-    pub fn chain_version(chain_id: &str) -> u64 {
-        if !ChainId::is_epoch_format(chain_id) {
-            return 0;
-        }
-
-        let split: Vec<_> = chain_id.split('-').collect();
-        split
-            .last()
-            .expect("get revision number from chain_id")
-            .parse()
-            .unwrap_or(0)
-    }
-
-    /// is_epoch_format() checks if a chain_id is in the format required for parsing epochs
-    /// The chainID must be in the form: `{chainID}-{version}`
-    /// ```
-    /// use ibc::core::ics24_host::identifier::ChainId;
-    /// assert_eq!(ChainId::is_epoch_format("chainA-0"), false);
-    /// assert_eq!(ChainId::is_epoch_format("chainA"), false);
-    /// assert_eq!(ChainId::is_epoch_format("chainA-1"), true);
-    /// assert_eq!(ChainId::is_epoch_format("c-1"), true);
-    /// ```
-    pub fn is_epoch_format(chain_id: &str) -> bool {
-        let re = safe_regex::regex!(br".*[^-]-[1-9][0-9]*");
-        re.is_match(chain_id.as_bytes())
-    }
-
-    /// with_version() checks if a chain_id is in the format required for parsing epochs, and if so
-    /// replaces it's version with the specified version
-    /// ```
-    /// use ibc::core::ics24_host::identifier::ChainId;
-    /// assert_eq!(ChainId::new("chainA", 1).with_version(2), ChainId::new("chainA", 2));
-    /// assert_eq!("chain1".parse::<ChainId>().unwrap().with_version(2), "chain1".parse::<ChainId>().unwrap());
-    /// ```
-    pub fn with_version(mut self, version: u64) -> Self {
-        if Self::is_epoch_format(&self.id) {
-            self.id = {
-                let mut split: Vec<&str> = self.id.split('-').collect();
-                let version = version.to_string();
-                if let Some(last_elem) = split.last_mut() {
-                    *last_elem = &version;
-                }
-                split.join("-")
-            };
-            self.version = version;
-        }
-        self
-    }
-}
-
-impl FromStr for ChainId {
-    type Err = Infallible;
-
-    fn from_str(id: &str) -> Result<Self, Self::Err> {
-        Ok(Self::from_string(id))
-    }
-}
-
-impl Display for ChainId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}", self.id)
-    }
-}
-
-impl Default for ChainId {
-    fn default() -> Self {
-        Self::from_string(DEFAULT_CHAIN_ID)
-    }
-}
-
-impl From<String> for ChainId {
-    fn from(value: String) -> Self {
-        Self::from_string(&value)
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
-pub struct ClientId(String);
-
-impl ClientId {
-    /// Builds a new client identifier. Client identifiers are deterministically formed from two
-    /// elements: a prefix derived from the client type `ctype`, and a monotonically increasing
-    /// `counter`; these are separated by a dash "-".
-    ///
-    /// ```
-    /// # use ibc::core::ics24_host::identifier::ClientId;
-    /// # use ibc::core::ics02_client::client_type::ClientType;
-    /// # use std::str::FromStr;
-    /// let tm_client_id = ClientId::new(ClientType::from_str("07-tendermint").unwrap(), 0);
-    /// assert!(tm_client_id.is_ok());
-    /// tm_client_id.map(|id| { assert_eq!(&id, "07-tendermint-0") });
-    /// ```
-    pub fn new(client_type: ClientType, counter: u64) -> Result<Self, IdentifierError> {
-        let prefix = client_type.as_str().trim();
-        validate_client_type(prefix)?;
-        let id = format!("{prefix}-{counter}");
-        Self::from_str(id.as_str())
-    }
-
-    /// Get this identifier as a borrowed `&str`
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    /// Get this identifier as a borrowed byte slice
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-}
-
-/// This implementation provides a `to_string` method.
-impl Display for ClientId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl FromStr for ClientId {
-    type Err = IdentifierError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        validate_client_identifier(s).map(|_| Self(s.to_string()))
-    }
-}
-
-impl Default for ClientId {
-    fn default() -> Self {
-        Self::new(tm_client_type(), 0).expect("Never fails because we use a valid client type")
-    }
-}
-
-/// Equality check against string literal (satisfies &ClientId == &str).
-/// ```
-/// use core::str::FromStr;
-/// use ibc::core::ics24_host::identifier::ClientId;
-/// let client_id = ClientId::from_str("clientidtwo");
-/// assert!(client_id.is_ok());
-/// client_id.map(|id| {assert_eq!(&id, "clientidtwo")});
-/// ```
-impl PartialEq<str> for ClientId {
-    fn eq(&self, other: &str) -> bool {
-        self.as_str().eq(other)
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ConnectionId(String);
-
-impl ConnectionId {
-    /// Builds a new connection identifier. Connection identifiers are deterministically formed from
-    /// two elements: a prefix `prefix`, and a monotonically increasing `counter`; these are
-    /// separated by a dash "-". The prefix is currently determined statically (see
-    /// `ConnectionId::prefix()`) so this method accepts a single argument, the `counter`.
-    ///
-    /// ```
-    /// # use ibc::core::ics24_host::identifier::ConnectionId;
-    /// let conn_id = ConnectionId::new(11);
-    /// assert_eq!(&conn_id, "connection-11");
-    /// ```
-    pub fn new(identifier: u64) -> Self {
-        let id = format!("{}-{}", Self::prefix(), identifier);
-        Self(id)
-    }
-
-    /// Returns the static prefix to be used across all connection identifiers.
-    pub fn prefix() -> &'static str {
-        CONNECTION_ID_PREFIX
-    }
-
-    /// Get this identifier as a borrowed `&str`
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    /// Get this identifier as a borrowed byte slice
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-}
-
-/// This implementation provides a `to_string` method.
-impl Display for ConnectionId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl FromStr for ConnectionId {
-    type Err = IdentifierError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        validate_connection_identifier(s).map(|_| Self(s.to_string()))
-    }
-}
-
-impl Default for ConnectionId {
-    fn default() -> Self {
-        Self::new(0)
-    }
-}
-
-/// Equality check against string literal (satisfies &ConnectionId == &str).
-/// ```
-/// use core::str::FromStr;
-/// use ibc::core::ics24_host::identifier::ConnectionId;
-/// let conn_id = ConnectionId::from_str("connectionId-0");
-/// assert!(conn_id.is_ok());
-/// conn_id.map(|id| {assert_eq!(&id, "connectionId-0")});
-/// ```
-impl PartialEq<str> for ConnectionId {
-    fn eq(&self, other: &str) -> bool {
-        self.as_str().eq(other)
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct PortId(String);
-
-impl PortId {
-    pub fn new(id: String) -> Result<Self, IdentifierError> {
-        Self::from_str(&id)
-    }
-
-    /// Infallible creation of the well-known transfer port
-    pub fn transfer() -> Self {
-        Self(TRANSFER_PORT_ID.to_string())
-    }
-
-    /// Get this identifier as a borrowed `&str`
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    /// Get this identifier as a borrowed byte slice
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-
-    pub fn validate(&self) -> Result<(), IdentifierError> {
-        validate_port_identifier(self.as_str())
-    }
-}
-
-/// This implementation provides a `to_string` method.
-impl Display for PortId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl FromStr for PortId {
-    type Err = IdentifierError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        validate_port_identifier(s).map(|_| Self(s.to_string()))
-    }
-}
-
-impl AsRef<str> for PortId {
-    fn as_ref(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl Default for PortId {
-    fn default() -> Self {
-        Self(DEFAULT_PORT_ID.to_string())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ChannelId(String);
-
-impl ChannelId {
-    /// Builds a new channel identifier. Like client and connection identifiers, channel ids are
-    /// deterministically formed from two elements: a prefix `prefix`, and a monotonically
-    /// increasing `counter`, separated by a dash "-".
-    /// The prefix is currently determined statically (see `ChannelId::prefix()`) so this method
-    /// accepts a single argument, the `counter`.
-    ///
-    /// ```
-    /// # use ibc::core::ics24_host::identifier::ChannelId;
-    /// let chan_id = ChannelId::new(27);
-    /// assert_eq!(chan_id.to_string(), "channel-27");
-    /// ```
-    pub fn new(identifier: u64) -> Self {
-        let id = format!("{}-{}", Self::prefix(), identifier);
-        Self(id)
-    }
-
-    /// Returns the static prefix to be used across all channel identifiers.
-    pub fn prefix() -> &'static str {
-        CHANNEL_ID_PREFIX
-    }
-
-    /// Get this identifier as a borrowed `&str`
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    /// Get this identifier as a borrowed byte slice
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-}
-
-/// This implementation provides a `to_string` method.
-impl Display for ChannelId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl FromStr for ChannelId {
-    type Err = IdentifierError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        validate_channel_identifier(s).map(|_| Self(s.to_string()))
-    }
-}
-
-impl AsRef<str> for ChannelId {
-    fn as_ref(&self) -> &str {
-        &self.0
-    }
-}
-
-impl Default for ChannelId {
-    fn default() -> Self {
-        Self::new(0)
-    }
-}
-
-/// Equality check against string literal (satisfies &ChannelId == &str).
-/// ```
-/// use core::str::FromStr;
-/// use ibc::core::ics24_host::identifier::ChannelId;
-/// let channel_id = ChannelId::from_str("channelId-0");
-/// assert!(channel_id.is_ok());
-/// channel_id.map(|id| {assert_eq!(&id, "channelId-0")});
-/// ```
-impl PartialEq<str> for ChannelId {
-    fn eq(&self, other: &str) -> bool {
-        self.as_str().eq(other)
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize))]
-#[derive(Debug, Display)]
-pub enum IdentifierError {
-    /// identifier `{id}` cannot contain separator '/'
-    ContainSeparator { id: String },
-    /// identifier `{id}` has invalid length `{length}` must be between `{min}`-`{max}` characters
-    InvalidLength {
-        id: String,
-        length: usize,
-        min: usize,
-        max: usize,
-    },
-    /// identifier `{id}` must only contain alphanumeric characters or `.`, `_`, `+`, `-`, `#`, - `[`, `]`, `<`, `>`
-    InvalidCharacter { id: String },
-    /// identifier prefix `{prefix}` is invalid
-    InvalidPrefix { prefix: String },
-    /// identifier cannot be empty
-    Empty,
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for IdentifierError {}
diff --git a/crates/ibc/src/core/ics24_host/identifier/validate.rs b/crates/ibc/src/core/ics24_host/identifier/validate.rs
deleted file mode 100644
index 2e7c0fe00..000000000
--- a/crates/ibc/src/core/ics24_host/identifier/validate.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-use crate::prelude::*;
-
-use super::IdentifierError as Error;
-
-/// Path separator (ie. forward slash '/')
-const PATH_SEPARATOR: char = '/';
-const VALID_SPECIAL_CHARS: &str = "._+-#[]<>";
-
-/// Default validator function for identifiers.
-///
-/// A valid identifier only contain valid characters, and be of a given min and
-/// max length as specified in the
-/// [`ICS-24`](https://github.com/cosmos/ibc/tree/main/spec/core/ics-024-host-requirements#paths-identifiers-separators)]
-/// spec.
-pub fn validate_identifier(id: &str, min: usize, max: usize) -> Result<(), Error> {
-    assert!(max >= min);
-
-    // Check identifier is not empty
-    if id.is_empty() {
-        return Err(Error::Empty);
-    }
-
-    // Check identifier does not contain path separators
-    if id.contains(PATH_SEPARATOR) {
-        return Err(Error::ContainSeparator { id: id.into() });
-    }
-
-    // Check identifier length is between given min/max
-    if id.len() < min || id.len() > max {
-        return Err(Error::InvalidLength {
-            id: id.into(),
-            length: id.len(),
-            min,
-            max,
-        });
-    }
-
-    // Check that the identifier comprises only valid characters:
-    // - Alphanumeric
-    // - `.`, `_`, `+`, `-`, `#`
-    // - `[`, `]`, `<`, `>`
-    if !id
-        .chars()
-        .all(|c| c.is_alphanumeric() || VALID_SPECIAL_CHARS.contains(c))
-    {
-        return Err(Error::InvalidCharacter { id: id.into() });
-    }
-
-    // All good!
-    Ok(())
-}
-
-/// Checks if the prefix can form a valid identifier with the given min/max identifier's length.
-fn validate_prefix_epoch_format(
-    prefix: &str,
-    min_id_length: usize,
-    max_id_length: usize,
-) -> Result<(), Error> {
-    // Checks if the prefix is not blank
-    if prefix.is_empty() {
-        return Err(Error::Empty)?;
-    }
-
-    // Checks if the prefix forms a valid identifier when used with `0`
-    validate_identifier(
-        &format!("{prefix}-{}", u64::MIN),
-        min_id_length,
-        max_id_length,
-    )?;
-
-    // Checks if the prefix forms a valid identifier when used with `u64::MAX`
-    validate_identifier(
-        &format!("{prefix}-{}", u64::MAX),
-        min_id_length,
-        max_id_length,
-    )?;
-
-    Ok(())
-}
-
-/// Default validator function for the Client types.
-pub fn validate_client_type(id: &str) -> Result<(), Error> {
-    validate_prefix_epoch_format(id, 9, 64)
-}
-
-/// Default validator function for Client identifiers.
-///
-/// A valid client identifier must be between 9-64 characters as specified in
-/// the ICS-24 spec.
-pub fn validate_client_identifier(id: &str) -> Result<(), Error> {
-    validate_identifier(id, 9, 64)
-}
-
-/// Default validator function for Connection identifiers.
-///
-/// A valid connection identifier must be between 10-64 characters as specified
-/// in the ICS-24 spec.
-pub fn validate_connection_identifier(id: &str) -> Result<(), Error> {
-    validate_identifier(id, 10, 64)
-}
-
-/// Default validator function for Port identifiers.
-///
-/// A valid port identifier must be between 2-128 characters as specified in the
-/// ICS-24 spec.
-pub fn validate_port_identifier(id: &str) -> Result<(), Error> {
-    validate_identifier(id, 2, 128)
-}
-
-/// Default validator function for Channel identifiers.
-///
-/// A valid channel identifier must be between 8-64 characters as specified in
-/// the ICS-24 spec.
-pub fn validate_channel_identifier(id: &str) -> Result<(), Error> {
-    validate_identifier(id, 8, 64)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use test_log::test;
-
-    #[test]
-    fn parse_invalid_port_id_min() {
-        // invalid min port id
-        let id = validate_port_identifier("p");
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_port_id_max() {
-        // invalid max port id (test string length is 130 chars)
-        let id = validate_port_identifier(
-            "9anxkcme6je544d5lnj46zqiiiygfqzf8w4bjecbnyj4lj6s7zlpst67yln64tixp9anxkcme6je544d5lnj46zqiiiygfqzf8w4bjecbnyj4lj6s7zlpst67yln64tixp",
-        );
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_connection_id_min() {
-        // invalid min connection id
-        let id = validate_connection_identifier("connect01");
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_connection_id_max() {
-        // invalid max connection id (test string length is 65)
-        let id = validate_connection_identifier(
-            "ihhankr30iy4nna65hjl2wjod7182io1t2s7u3ip3wqtbbn1sl0rgcntqc540r36r",
-        );
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_channel_id_min() {
-        // invalid channel id, must be at least 8 characters
-        let id = validate_channel_identifier("channel");
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_channel_id_max() {
-        // invalid channel id (test string length is 65)
-        let id = validate_channel_identifier(
-            "ihhankr30iy4nna65hjl2wjod7182io1t2s7u3ip3wqtbbn1sl0rgcntqc540r36r",
-        );
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_client_id_min() {
-        // invalid min client id
-        let id = validate_client_identifier("client");
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_client_id_max() {
-        // invalid max client id (test string length is 65)
-        let id = validate_client_identifier(
-            "f0isrs5enif9e4td3r2jcbxoevhz6u1fthn4aforq7ams52jn5m48eiesfht9ckpn",
-        );
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_id_chars() {
-        // invalid id chars
-        let id = validate_identifier("channel@01", 1, 10);
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_id_empty() {
-        // invalid id empty
-        let id = validate_identifier("", 1, 10);
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_id_path_separator() {
-        // invalid id with path separator
-        let id = validate_identifier("id/1", 1, 10);
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_healthy_client_type() {
-        let id = validate_client_type("07-tendermint");
-        assert!(id.is_ok())
-    }
-
-    #[test]
-    fn parse_invalid_short_client_type() {
-        let id = validate_client_type("<7Char");
-        assert!(id.is_err())
-    }
-
-    #[test]
-    fn parse_invalid_lengthy_client_type() {
-        let id = validate_client_type("InvalidClientTypeWithLengthOfClientId>65Char");
-        assert!(id.is_err())
-    }
-}
diff --git a/crates/ibc/src/core/ics24_host/mod.rs b/crates/ibc/src/core/ics24_host/mod.rs
deleted file mode 100644
index c7ceab539..000000000
--- a/crates/ibc/src/core/ics24_host/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! ICS 24: Host defines the minimal set of interfaces that a
-//! state machine hosting an IBC-enabled chain must implement.
-
-pub mod identifier;
-pub mod path;
diff --git a/crates/ibc/src/core/ics24_host/path.rs b/crates/ibc/src/core/ics24_host/path.rs
deleted file mode 100644
index 24dc1bb48..000000000
--- a/crates/ibc/src/core/ics24_host/path.rs
+++ /dev/null
@@ -1,1228 +0,0 @@
-//! Defines all store paths used by IBC
-
-use crate::{prelude::*, Height};
-
-/// Path-space as listed in ICS-024
-/// https://github.com/cosmos/ibc/tree/master/spec/core/ics-024-host-requirements#path-space
-/// Some of these are implemented in other ICSs, but ICS-024 has a nice summary table.
-///
-use core::str::FromStr;
-
-use crate::core::ics04_channel::packet::Sequence;
-use crate::core::ics24_host::identifier::{ChannelId, ClientId, ConnectionId, PortId};
-
-use derive_more::{Display, From};
-
-/// ABCI client upgrade keys
-/// - The key identifying the upgraded IBC state within the upgrade sub-store
-const UPGRADED_IBC_STATE: &str = "upgradedIBCState";
-///- The key identifying the upgraded client state
-const UPGRADED_CLIENT_STATE: &str = "upgradedClient";
-/// - The key identifying the upgraded consensus state
-const UPGRADED_CLIENT_CONSENSUS_STATE: &str = "upgradedConsState";
-
-/// The Path enum abstracts out the different sub-paths.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, From, Display)]
-pub enum Path {
-    ClientState(ClientStatePath),
-    ClientConsensusState(ClientConsensusStatePath),
-    ClientConnection(ClientConnectionPath),
-    Connection(ConnectionPath),
-    Ports(PortPath),
-    ChannelEnd(ChannelEndPath),
-    SeqSend(SeqSendPath),
-    SeqRecv(SeqRecvPath),
-    SeqAck(SeqAckPath),
-    Commitment(CommitmentPath),
-    Ack(AckPath),
-    Receipt(ReceiptPath),
-    UpgradeClient(UpgradeClientPath),
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "clients/{_0}/clientState")]
-pub struct ClientStatePath(pub ClientId);
-
-impl ClientStatePath {
-    pub fn new(client_id: &ClientId) -> ClientStatePath {
-        ClientStatePath(client_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "clients/{client_id}/consensusStates/{epoch}-{height}")]
-pub struct ClientConsensusStatePath {
-    pub client_id: ClientId,
-    pub epoch: u64,
-    pub height: u64,
-}
-
-impl ClientConsensusStatePath {
-    pub fn new(client_id: &ClientId, height: &Height) -> ClientConsensusStatePath {
-        ClientConsensusStatePath {
-            client_id: client_id.clone(),
-            epoch: height.revision_number(),
-            height: height.revision_height(),
-        }
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "clients/{_0}/connections")]
-pub struct ClientConnectionPath(pub ClientId);
-
-impl ClientConnectionPath {
-    pub fn new(client_id: &ClientId) -> ClientConnectionPath {
-        ClientConnectionPath(client_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "connections/{_0}")]
-pub struct ConnectionPath(pub ConnectionId);
-
-impl ConnectionPath {
-    pub fn new(connection_id: &ConnectionId) -> ConnectionPath {
-        ConnectionPath(connection_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "ports/{_0}")]
-pub struct PortPath(pub PortId);
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "channelEnds/ports/{_0}/channels/{_1}")]
-pub struct ChannelEndPath(pub PortId, pub ChannelId);
-
-impl ChannelEndPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> ChannelEndPath {
-        ChannelEndPath(port_id.clone(), channel_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "nextSequenceSend/ports/{_0}/channels/{_1}")]
-pub struct SeqSendPath(pub PortId, pub ChannelId);
-
-impl SeqSendPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> SeqSendPath {
-        SeqSendPath(port_id.clone(), channel_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "nextSequenceRecv/ports/{_0}/channels/{_1}")]
-pub struct SeqRecvPath(pub PortId, pub ChannelId);
-
-impl SeqRecvPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> SeqRecvPath {
-        SeqRecvPath(port_id.clone(), channel_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "nextSequenceAck/ports/{_0}/channels/{_1}")]
-pub struct SeqAckPath(pub PortId, pub ChannelId);
-
-impl SeqAckPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> SeqAckPath {
-        SeqAckPath(port_id.clone(), channel_id.clone())
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "commitments/ports/{port_id}/channels/{channel_id}/sequences/{sequence}")]
-pub struct CommitmentPath {
-    pub port_id: PortId,
-    pub channel_id: ChannelId,
-    pub sequence: Sequence,
-}
-
-impl CommitmentPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId, sequence: Sequence) -> CommitmentPath {
-        CommitmentPath {
-            port_id: port_id.clone(),
-            channel_id: channel_id.clone(),
-            sequence,
-        }
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "acks/ports/{port_id}/channels/{channel_id}/sequences/{sequence}")]
-pub struct AckPath {
-    pub port_id: PortId,
-    pub channel_id: ChannelId,
-    pub sequence: Sequence,
-}
-
-impl AckPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId, sequence: Sequence) -> AckPath {
-        AckPath {
-            port_id: port_id.clone(),
-            channel_id: channel_id.clone(),
-            sequence,
-        }
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-#[display(fmt = "receipts/ports/{port_id}/channels/{channel_id}/sequences/{sequence}")]
-pub struct ReceiptPath {
-    pub port_id: PortId,
-    pub channel_id: ChannelId,
-    pub sequence: Sequence,
-}
-
-impl ReceiptPath {
-    pub fn new(port_id: &PortId, channel_id: &ChannelId, sequence: Sequence) -> ReceiptPath {
-        ReceiptPath {
-            port_id: port_id.clone(),
-            channel_id: channel_id.clone(),
-            sequence,
-        }
-    }
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-/// Paths that are specific for client upgrades.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
-pub enum UpgradeClientPath {
-    #[display(fmt = "{UPGRADED_IBC_STATE}/{_0}/{UPGRADED_CLIENT_STATE}")]
-    UpgradedClientState(u64),
-    #[display(fmt = "{UPGRADED_IBC_STATE}/{_0}/{UPGRADED_CLIENT_CONSENSUS_STATE}")]
-    UpgradedClientConsensusState(u64),
-}
-
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-/// Sub-paths which are not part of the specification, but are still
-/// useful to represent for parsing purposes.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-enum SubPath {
-    Channels(ChannelId),
-    Sequences(Sequence),
-}
-
-impl Path {
-    /// Indication if the path is provable.
-    pub fn is_provable(&self) -> bool {
-        !matches!(&self, Path::ClientConnection(_) | Path::Ports(_))
-    }
-
-    /// into_bytes implementation
-    pub fn into_bytes(self) -> Vec<u8> {
-        self.to_string().into_bytes()
-    }
-}
-
-#[derive(Debug, displaydoc::Display)]
-pub enum PathError {
-    /// `{path}` could not be parsed into a Path
-    ParseFailure { path: String },
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for PathError {}
-
-/// The FromStr trait allows paths encoded as strings to be parsed into Paths.
-impl FromStr for Path {
-    type Err = PathError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let components: Vec<&str> = s.split('/').collect();
-
-        parse_client_paths(&components)
-            .or_else(|| parse_connections(&components))
-            .or_else(|| parse_ports(&components))
-            .or_else(|| parse_channel_ends(&components))
-            .or_else(|| parse_seqs(&components))
-            .or_else(|| parse_commitments(&components))
-            .or_else(|| parse_acks(&components))
-            .or_else(|| parse_receipts(&components))
-            .or_else(|| parse_upgrades(&components))
-            .ok_or(PathError::ParseFailure {
-                path: s.to_string(),
-            })
-    }
-}
-
-fn parse_client_paths(components: &[&str]) -> Option<Path> {
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "clients" {
-        return None;
-    }
-
-    let client_id = match ClientId::from_str(components[1]) {
-        Ok(s) => s,
-        Err(_) => return None,
-    };
-
-    if components.len() == 3 {
-        match components[2] {
-            "clientState" => Some(ClientStatePath(client_id).into()),
-            "connections" => Some(ClientConnectionPath(client_id).into()),
-            _ => None,
-        }
-    } else if components.len() == 4 {
-        if "consensusStates" != components[2] {
-            return None;
-        }
-
-        let epoch_height = match components.last() {
-            Some(eh) => *eh,
-            None => return None,
-        };
-
-        let epoch_height: Vec<&str> = epoch_height.split('-').collect();
-
-        if epoch_height.len() != 2 {
-            return None;
-        }
-
-        let epoch = epoch_height[0];
-        let height = epoch_height[1];
-
-        let epoch = match epoch.parse::<u64>() {
-            Ok(ep) => ep,
-            Err(_) => return None,
-        };
-
-        let height = match height.parse::<u64>() {
-            Ok(h) => h,
-            Err(_) => return None,
-        };
-
-        Some(
-            ClientConsensusStatePath {
-                client_id,
-                epoch,
-                height,
-            }
-            .into(),
-        )
-    } else {
-        None
-    }
-}
-
-fn parse_connections(components: &[&str]) -> Option<Path> {
-    if components.len() != 2 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "connections" {
-        return None;
-    }
-
-    let connection_id = match components.last() {
-        Some(c) => *c,
-        None => return None,
-    };
-
-    let connection_id = match ConnectionId::from_str(connection_id) {
-        Ok(c) => c,
-        Err(_) => return None,
-    };
-
-    Some(ConnectionPath(connection_id).into())
-}
-
-fn parse_ports(components: &[&str]) -> Option<Path> {
-    if components.len() != 2 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "ports" {
-        return None;
-    }
-
-    let port_id = match components.last() {
-        Some(p) => *p,
-        None => return None,
-    };
-
-    let port_id = match PortId::from_str(port_id) {
-        Ok(p) => p,
-        Err(_) => return None,
-    };
-
-    Some(PortPath(port_id).into())
-}
-
-fn parse_channels(components: &[&str]) -> Option<SubPath> {
-    if components.len() != 2 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "channels" {
-        return None;
-    }
-
-    let channel_id = match components.last() {
-        Some(c) => *c,
-        None => return None,
-    };
-
-    let channel_id = match ChannelId::from_str(channel_id) {
-        Ok(c) => c,
-        Err(_) => return None,
-    };
-
-    Some(SubPath::Channels(channel_id))
-}
-
-fn parse_sequences(components: &[&str]) -> Option<SubPath> {
-    if components.len() != 2 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "sequences" {
-        return None;
-    }
-
-    let sequence_number = match components.last() {
-        Some(s) => *s,
-        None => return None,
-    };
-
-    match Sequence::from_str(sequence_number) {
-        Ok(seq) => Some(SubPath::Sequences(seq)),
-        Err(_) => None,
-    }
-}
-
-fn parse_channel_ends(components: &[&str]) -> Option<Path> {
-    if components.len() != 5 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "channelEnds" {
-        return None;
-    }
-
-    let port = parse_ports(&components[1..=2]);
-    let channel = parse_channels(&components[3..=4]);
-
-    let port_id = if let Some(Path::Ports(PortPath(port_id))) = port {
-        port_id
-    } else {
-        return None;
-    };
-
-    let channel_id = if let Some(SubPath::Channels(channel_id)) = channel {
-        channel_id
-    } else {
-        return None;
-    };
-
-    Some(ChannelEndPath(port_id, channel_id).into())
-}
-
-fn parse_seqs(components: &[&str]) -> Option<Path> {
-    if components.len() != 5 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    let port = parse_ports(&components[1..=2]);
-    let channel = parse_channels(&components[3..=4]);
-
-    let port_id = if let Some(Path::Ports(PortPath(port_id))) = port {
-        port_id
-    } else {
-        return None;
-    };
-
-    let channel_id = if let Some(SubPath::Channels(channel_id)) = channel {
-        channel_id
-    } else {
-        return None;
-    };
-
-    match first {
-        "nextSequenceSend" => Some(SeqSendPath(port_id, channel_id).into()),
-        "nextSequenceRecv" => Some(SeqRecvPath(port_id, channel_id).into()),
-        "nextSequenceAck" => Some(SeqAckPath(port_id, channel_id).into()),
-        _ => None,
-    }
-}
-
-fn parse_commitments(components: &[&str]) -> Option<Path> {
-    if components.len() != 7 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "commitments" {
-        return None;
-    }
-
-    let port = parse_ports(&components[1..=2]);
-    let channel = parse_channels(&components[3..=4]);
-    let sequence = parse_sequences(&components[5..]);
-
-    let port_id = if let Some(Path::Ports(PortPath(port_id))) = port {
-        port_id
-    } else {
-        return None;
-    };
-
-    let channel_id = if let Some(SubPath::Channels(channel_id)) = channel {
-        channel_id
-    } else {
-        return None;
-    };
-
-    let sequence = if let Some(SubPath::Sequences(seq)) = sequence {
-        seq
-    } else {
-        return None;
-    };
-
-    Some(
-        CommitmentPath {
-            port_id,
-            channel_id,
-            sequence,
-        }
-        .into(),
-    )
-}
-
-fn parse_acks(components: &[&str]) -> Option<Path> {
-    if components.len() != 7 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "acks" {
-        return None;
-    }
-
-    let port = parse_ports(&components[1..=2]);
-    let channel = parse_channels(&components[3..=4]);
-    let sequence = parse_sequences(&components[5..]);
-
-    let port_id = if let Some(Path::Ports(PortPath(port_id))) = port {
-        port_id
-    } else {
-        return None;
-    };
-
-    let channel_id = if let Some(SubPath::Channels(channel_id)) = channel {
-        channel_id
-    } else {
-        return None;
-    };
-
-    let sequence = if let Some(SubPath::Sequences(seq)) = sequence {
-        seq
-    } else {
-        return None;
-    };
-
-    Some(
-        AckPath {
-            port_id,
-            channel_id,
-            sequence,
-        }
-        .into(),
-    )
-}
-
-fn parse_receipts(components: &[&str]) -> Option<Path> {
-    if components.len() != 7 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != "receipts" {
-        return None;
-    }
-
-    let port = parse_ports(&components[1..=2]);
-    let channel = parse_channels(&components[3..=4]);
-    let sequence = parse_sequences(&components[5..]);
-
-    let port_id = if let Some(Path::Ports(PortPath(port_id))) = port {
-        port_id
-    } else {
-        return None;
-    };
-
-    let channel_id = if let Some(SubPath::Channels(channel_id)) = channel {
-        channel_id
-    } else {
-        return None;
-    };
-
-    let sequence = if let Some(SubPath::Sequences(seq)) = sequence {
-        seq
-    } else {
-        return None;
-    };
-
-    Some(
-        ReceiptPath {
-            port_id,
-            channel_id,
-            sequence,
-        }
-        .into(),
-    )
-}
-
-fn parse_upgrades(components: &[&str]) -> Option<Path> {
-    if components.len() != 3 {
-        return None;
-    }
-
-    let first = match components.first() {
-        Some(f) => *f,
-        None => return None,
-    };
-
-    if first != UPGRADED_IBC_STATE {
-        return None;
-    }
-
-    let last = match components.last() {
-        Some(l) => *l,
-        None => return None,
-    };
-
-    let height = match components[1].parse::<u64>() {
-        Ok(h) => h,
-        Err(_) => return None,
-    };
-
-    match last {
-        UPGRADED_CLIENT_STATE => Some(UpgradeClientPath::UpgradedClientState(height).into()),
-        UPGRADED_CLIENT_CONSENSUS_STATE => {
-            Some(UpgradeClientPath::UpgradedClientConsensusState(height).into())
-        }
-        _ => None,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use core::str::FromStr;
-
-    #[test]
-    fn invalid_path_doesnt_parse() {
-        let invalid_path = Path::from_str("clients/clientType");
-
-        assert!(invalid_path.is_err());
-    }
-
-    #[test]
-    fn test_parse_client_paths_fn() {
-        let path = "clients/07-tendermint-0/clientState";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_client_paths(&components),
-            Some(Path::ClientState(ClientStatePath(ClientId::default())))
-        );
-
-        let path = "clients/07-tendermint-0/consensusStates/15-31";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_client_paths(&components),
-            Some(Path::ClientConsensusState(ClientConsensusStatePath {
-                client_id: ClientId::default(),
-                epoch: 15,
-                height: 31,
-            }))
-        );
-    }
-
-    #[test]
-    fn client_state_path_parses() {
-        let path = "clients/07-tendermint-0/clientState";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::ClientState(ClientStatePath(ClientId::default()))
-        );
-    }
-
-    #[test]
-    fn client_consensus_state_path_parses() {
-        let path = "clients/07-tendermint-0/consensusStates/15-31";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::ClientConsensusState(ClientConsensusStatePath {
-                client_id: ClientId::default(),
-                epoch: 15,
-                height: 31,
-            })
-        );
-    }
-
-    #[test]
-    fn client_connections_path_parses() {
-        let path = "clients/07-tendermint-0/connections";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::ClientConnection(ClientConnectionPath(ClientId::default()))
-        );
-    }
-
-    #[test]
-    fn test_parse_connections_fn() {
-        let path = "connections/connection-0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_connections(&components),
-            Some(Path::Connection(ConnectionPath(ConnectionId::new(0)))),
-        );
-    }
-
-    #[test]
-    fn connections_path_parses() {
-        let path = "connections/connection-0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::Connection(ConnectionPath(ConnectionId::new(0)))
-        );
-    }
-
-    #[test]
-    fn test_parse_ports_fn() {
-        let path = "ports/defaultPort";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_ports(&components),
-            Some(Path::Ports(PortPath(PortId::default()))),
-        );
-    }
-
-    #[test]
-    fn ports_path_parses() {
-        let path = "ports/defaultPort";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(path.unwrap(), Path::Ports(PortPath(PortId::default())));
-    }
-
-    #[test]
-    fn test_parse_channels_fn() {
-        let path = "channels/channel-0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_channels(&components),
-            Some(SubPath::Channels(ChannelId::default())),
-        );
-    }
-
-    #[test]
-    fn channels_path_doesnt_parse() {
-        let path = "channels/channel-0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_err());
-    }
-
-    #[test]
-    fn test_parse_sequences_fn() {
-        let path = "sequences/0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_sequences(&components),
-            Some(SubPath::Sequences(Sequence::default()))
-        );
-    }
-
-    #[test]
-    fn sequences_path_doesnt_parse() {
-        let path = "sequences/0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_err());
-    }
-
-    #[test]
-    fn test_parse_channel_ends_fn() {
-        let path = "channelEnds/ports/defaultPort/channels/channel-0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_channel_ends(&components),
-            Some(Path::ChannelEnd(ChannelEndPath(
-                PortId::default(),
-                ChannelId::default()
-            ))),
-        );
-    }
-
-    #[test]
-    fn channel_ends_path_parses() {
-        let path = "channelEnds/ports/defaultPort/channels/channel-0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::ChannelEnd(ChannelEndPath(PortId::default(), ChannelId::default())),
-        );
-    }
-
-    #[test]
-    fn test_parse_seqs_fn() {
-        let path = "nextSequenceSend/ports/defaultPort/channels/channel-0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_seqs(&components),
-            Some(Path::SeqSend(SeqSendPath(
-                PortId::default(),
-                ChannelId::default()
-            ))),
-        );
-
-        let path = "nextSequenceRecv/ports/defaultPort/channels/channel-0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_seqs(&components),
-            Some(Path::SeqRecv(SeqRecvPath(
-                PortId::default(),
-                ChannelId::default()
-            ))),
-        );
-
-        let path = "nextSequenceAck/ports/defaultPort/channels/channel-0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_seqs(&components),
-            Some(Path::SeqAck(SeqAckPath(
-                PortId::default(),
-                ChannelId::default()
-            ))),
-        );
-    }
-
-    #[test]
-    fn sequence_send_path_parses() {
-        let path = "nextSequenceSend/ports/defaultPort/channels/channel-0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::SeqSend(SeqSendPath(PortId::default(), ChannelId::default())),
-        );
-    }
-
-    #[test]
-    fn sequence_recv_path_parses() {
-        let path = "nextSequenceRecv/ports/defaultPort/channels/channel-0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::SeqRecv(SeqRecvPath(PortId::default(), ChannelId::default())),
-        );
-    }
-
-    #[test]
-    fn sequence_ack_path_parses() {
-        let path = "nextSequenceAck/ports/defaultPort/channels/channel-0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::SeqAck(SeqAckPath(PortId::default(), ChannelId::default())),
-        );
-    }
-
-    #[test]
-    fn test_parse_commitments_fn() {
-        let path = "commitments/ports/defaultPort/channels/channel-0/sequences/0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_commitments(&components),
-            Some(Path::Commitment(CommitmentPath {
-                port_id: PortId::default(),
-                channel_id: ChannelId::default(),
-                sequence: Sequence::default(),
-            })),
-        );
-    }
-
-    #[test]
-    fn commitments_path_parses() {
-        let path = "commitments/ports/defaultPort/channels/channel-0/sequences/0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::Commitment(CommitmentPath {
-                port_id: PortId::default(),
-                channel_id: ChannelId::default(),
-                sequence: Sequence::default(),
-            }),
-        );
-    }
-
-    #[test]
-    fn test_parse_acks_fn() {
-        let path = "acks/ports/defaultPort/channels/channel-0/sequences/0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_acks(&components),
-            Some(Path::Ack(AckPath {
-                port_id: PortId::default(),
-                channel_id: ChannelId::default(),
-                sequence: Sequence::default(),
-            })),
-        );
-    }
-
-    #[test]
-    fn acks_path_parses() {
-        let path = "acks/ports/defaultPort/channels/channel-0/sequences/0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::Ack(AckPath {
-                port_id: PortId::default(),
-                channel_id: ChannelId::default(),
-                sequence: Sequence::default(),
-            }),
-        );
-    }
-
-    #[test]
-    fn test_parse_receipts_fn() {
-        let path = "receipts/ports/defaultPort/channels/channel-0/sequences/0";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_receipts(&components),
-            Some(Path::Receipt(ReceiptPath {
-                port_id: PortId::default(),
-                channel_id: ChannelId::default(),
-                sequence: Sequence::default(),
-            })),
-        );
-    }
-
-    #[test]
-    fn receipts_path_parses() {
-        let path = "receipts/ports/defaultPort/channels/channel-0/sequences/0";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::Receipt(ReceiptPath {
-                port_id: PortId::default(),
-                channel_id: ChannelId::default(),
-                sequence: Sequence::default(),
-            }),
-        );
-    }
-
-    #[test]
-    fn test_parse_upgrades_fn() {
-        let path = "upgradedIBCState/0/upgradedClient";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_upgrades(&components),
-            Some(Path::UpgradeClient(UpgradeClientPath::UpgradedClientState(
-                0
-            ))),
-        );
-
-        let path = "upgradedIBCState/0/upgradedConsState";
-        let components: Vec<&str> = path.split('/').collect();
-
-        assert_eq!(
-            parse_upgrades(&components),
-            Some(Path::UpgradeClient(
-                UpgradeClientPath::UpgradedClientConsensusState(0)
-            )),
-        )
-    }
-
-    #[test]
-    fn upgrade_client_state_path_parses() {
-        let path = "upgradedIBCState/0/upgradedClient";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::UpgradeClient(UpgradeClientPath::UpgradedClientState(0)),
-        );
-    }
-
-    #[test]
-    fn upgrade_client_consensus_state_path_parses() {
-        let path = "upgradedIBCState/0/upgradedConsState";
-        let path = Path::from_str(path);
-
-        assert!(path.is_ok());
-        assert_eq!(
-            path.unwrap(),
-            Path::UpgradeClient(UpgradeClientPath::UpgradedClientConsensusState(0)),
-        );
-    }
-}
diff --git a/crates/ibc/src/core/mod.rs b/crates/ibc/src/core/mod.rs
deleted file mode 100644
index 66d10b0dd..000000000
--- a/crates/ibc/src/core/mod.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-//! Implementation of the core IBC protocol.
-
-// Naming is hard in the IBC handlers, since we deal with a client on a
-// *counterparty* chain, which is itself a light client of *self* (the chain
-// the handler is currently running on). So depending on the frame of reference
-// chosen, e.g. counterparty_client_state could mean:
-//
-// 1. the client state of the client running on the counterparty chain
-// 2. or the state of the "counterparty client" (that is, the client that we
-//    run of the counterparty chain) running on the host chain
-//
-// We remove such ambiguity by adopting the following conventions:
-// + During handshakes
-//     + we call "chain A" the chain that runs `OpenInit` and `OpenAck`
-//     + we call "chain B" the chain that runs `OpenTry` and `OpenConfirm`
-// + During packet transfers
-//     + we call "chain A" the chain that runs `SendPacket`, `Acknowledgement`, and timeouts
-//     + we call "chain B" the chain that runs `RecvPacket` and `WriteAcknowledgement`
-// + In variable names,
-//     + `on_a` implies "stored on chain A"
-//     + `of_a` implies "of light client for chain A" So
-// `client_state_of_a_on_b` means "the client state of light client for chain A
-// stored on chain B"
-
-pub mod ics02_client;
-pub mod ics03_connection;
-pub mod ics04_channel;
-pub mod ics23_commitment;
-pub mod ics24_host;
-pub mod router;
-
-pub mod events;
-pub mod timestamp;
-
-mod context;
-mod handler;
-mod msgs;
-
-pub use handler::dispatch;
-pub use handler::execute;
-pub use handler::validate;
-
-pub use context::*;
-
-pub use msgs::Msg;
-pub use msgs::MsgEnvelope;
-
-pub use ics04_channel::handler::send_packet::{
-    send_packet, send_packet_execute, send_packet_validate,
-};
diff --git a/crates/ibc/src/core/msgs.rs b/crates/ibc/src/core/msgs.rs
deleted file mode 100644
index 7fbff903c..000000000
--- a/crates/ibc/src/core/msgs.rs
+++ /dev/null
@@ -1,228 +0,0 @@
-use crate::prelude::*;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::context::RouterError;
-use crate::core::ics02_client::msgs::{
-    create_client, misbehaviour, update_client, upgrade_client, ClientMsg,
-};
-use crate::core::ics03_connection::msgs::{
-    conn_open_ack, conn_open_confirm, conn_open_init, conn_open_try, ConnectionMsg,
-};
-use crate::core::ics04_channel::msgs::{
-    acknowledgement, chan_close_confirm, chan_close_init, chan_open_ack, chan_open_confirm,
-    chan_open_init, chan_open_try, recv_packet, timeout, timeout_on_close, ChannelMsg, PacketMsg,
-};
-use crate::Signer;
-
-/// Trait to be implemented by all IBC messages
-pub trait Msg: Clone {
-    type Raw: From<Self> + prost::Message;
-
-    /// Unique type identifier for this message, to support encoding to/from `prost_types::Any`.
-    fn type_url(&self) -> String;
-
-    fn signer(&self) -> Signer {
-        Signer::new_empty()
-    }
-
-    fn get_sign_bytes(self) -> Vec<u8> {
-        let raw_msg: Self::Raw = self.into();
-        prost::Message::encode_to_vec(&raw_msg)
-    }
-
-    fn to_any(self) -> Any {
-        Any {
-            type_url: self.type_url(),
-            value: self.get_sign_bytes(),
-        }
-    }
-}
-
-/// Enumeration of all messages that the local ICS26 module is capable of routing.
-#[derive(Clone, Debug)]
-pub enum MsgEnvelope {
-    Client(ClientMsg),
-    Connection(ConnectionMsg),
-    Channel(ChannelMsg),
-    Packet(PacketMsg),
-}
-
-impl MsgEnvelope {
-    pub fn signer(&self) -> Signer {
-        match self {
-            MsgEnvelope::Client(msg) => match msg {
-                ClientMsg::CreateClient(msg) => msg.signer(),
-                ClientMsg::UpdateClient(msg) => msg.signer(),
-                ClientMsg::UpgradeClient(msg) => msg.signer(),
-                ClientMsg::Misbehaviour(msg) => msg.signer(),
-            },
-            MsgEnvelope::Connection(msg) => match msg {
-                ConnectionMsg::OpenInit(msg) => msg.signer(),
-                ConnectionMsg::OpenTry(msg) => msg.signer(),
-                ConnectionMsg::OpenAck(msg) => msg.signer(),
-                ConnectionMsg::OpenConfirm(msg) => msg.signer(),
-            },
-            MsgEnvelope::Channel(msg) => match msg {
-                ChannelMsg::OpenInit(msg) => msg.signer(),
-                ChannelMsg::OpenTry(msg) => msg.signer(),
-                ChannelMsg::OpenAck(msg) => msg.signer(),
-                ChannelMsg::OpenConfirm(msg) => msg.signer(),
-                ChannelMsg::CloseInit(msg) => msg.signer(),
-                ChannelMsg::CloseConfirm(msg) => msg.signer(),
-            },
-            MsgEnvelope::Packet(msg) => match msg {
-                PacketMsg::Recv(msg) => msg.signer(),
-                PacketMsg::Ack(msg) => msg.signer(),
-                PacketMsg::Timeout(msg) => msg.signer(),
-                PacketMsg::TimeoutOnClose(msg) => msg.signer(),
-            },
-        }
-    }
-
-    pub fn type_url(&self) -> String {
-        match self {
-            MsgEnvelope::Client(msg) => match msg {
-                ClientMsg::CreateClient(msg) => msg.type_url(),
-                ClientMsg::UpdateClient(msg) => msg.type_url(),
-                ClientMsg::UpgradeClient(msg) => msg.type_url(),
-                ClientMsg::Misbehaviour(msg) => msg.type_url(),
-            },
-            MsgEnvelope::Connection(msg) => match msg {
-                ConnectionMsg::OpenInit(msg) => msg.type_url(),
-                ConnectionMsg::OpenTry(msg) => msg.type_url(),
-                ConnectionMsg::OpenAck(msg) => msg.type_url(),
-                ConnectionMsg::OpenConfirm(msg) => msg.type_url(),
-            },
-            MsgEnvelope::Channel(msg) => match msg {
-                ChannelMsg::OpenInit(msg) => msg.type_url(),
-                ChannelMsg::OpenTry(msg) => msg.type_url(),
-                ChannelMsg::OpenAck(msg) => msg.type_url(),
-                ChannelMsg::OpenConfirm(msg) => msg.type_url(),
-                ChannelMsg::CloseInit(msg) => msg.type_url(),
-                ChannelMsg::CloseConfirm(msg) => msg.type_url(),
-            },
-            MsgEnvelope::Packet(msg) => match msg {
-                PacketMsg::Recv(msg) => msg.type_url(),
-                PacketMsg::Ack(msg) => msg.type_url(),
-                PacketMsg::Timeout(msg) => msg.type_url(),
-                PacketMsg::TimeoutOnClose(msg) => msg.type_url(),
-            },
-        }
-    }
-}
-
-impl TryFrom<Any> for MsgEnvelope {
-    type Error = RouterError;
-
-    fn try_from(any_msg: Any) -> Result<Self, Self::Error> {
-        match any_msg.type_url.as_str() {
-            // ICS2 messages
-            create_client::TYPE_URL => {
-                // Pop out the message and then wrap it in the corresponding type.
-                let domain_msg = create_client::MsgCreateClient::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Client(ClientMsg::CreateClient(domain_msg)))
-            }
-            update_client::TYPE_URL => {
-                let domain_msg = update_client::MsgUpdateClient::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Client(ClientMsg::UpdateClient(domain_msg)))
-            }
-            upgrade_client::TYPE_URL => {
-                let domain_msg = upgrade_client::MsgUpgradeClient::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Client(ClientMsg::UpgradeClient(domain_msg)))
-            }
-            misbehaviour::TYPE_URL => {
-                let domain_msg = misbehaviour::MsgSubmitMisbehaviour::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Client(ClientMsg::Misbehaviour(domain_msg)))
-            }
-
-            // ICS03
-            conn_open_init::TYPE_URL => {
-                let domain_msg = conn_open_init::MsgConnectionOpenInit::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenInit(domain_msg)))
-            }
-            conn_open_try::TYPE_URL => {
-                let domain_msg = conn_open_try::MsgConnectionOpenTry::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenTry(domain_msg)))
-            }
-            conn_open_ack::TYPE_URL => {
-                let domain_msg = conn_open_ack::MsgConnectionOpenAck::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenAck(domain_msg)))
-            }
-            conn_open_confirm::TYPE_URL => {
-                let domain_msg =
-                    conn_open_confirm::MsgConnectionOpenConfirm::decode_vec(&any_msg.value)
-                        .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenConfirm(
-                    domain_msg,
-                )))
-            }
-
-            // ICS04 channel messages
-            chan_open_init::TYPE_URL => {
-                let domain_msg = chan_open_init::MsgChannelOpenInit::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Channel(ChannelMsg::OpenInit(domain_msg)))
-            }
-            chan_open_try::TYPE_URL => {
-                let domain_msg = chan_open_try::MsgChannelOpenTry::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Channel(ChannelMsg::OpenTry(domain_msg)))
-            }
-            chan_open_ack::TYPE_URL => {
-                let domain_msg = chan_open_ack::MsgChannelOpenAck::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Channel(ChannelMsg::OpenAck(domain_msg)))
-            }
-            chan_open_confirm::TYPE_URL => {
-                let domain_msg =
-                    chan_open_confirm::MsgChannelOpenConfirm::decode_vec(&any_msg.value)
-                        .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Channel(ChannelMsg::OpenConfirm(domain_msg)))
-            }
-            chan_close_init::TYPE_URL => {
-                let domain_msg = chan_close_init::MsgChannelCloseInit::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Channel(ChannelMsg::CloseInit(domain_msg)))
-            }
-            chan_close_confirm::TYPE_URL => {
-                let domain_msg =
-                    chan_close_confirm::MsgChannelCloseConfirm::decode_vec(&any_msg.value)
-                        .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Channel(ChannelMsg::CloseConfirm(domain_msg)))
-            }
-            // ICS04 packet messages
-            recv_packet::TYPE_URL => {
-                let domain_msg = recv_packet::MsgRecvPacket::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Packet(PacketMsg::Recv(domain_msg)))
-            }
-            acknowledgement::TYPE_URL => {
-                let domain_msg = acknowledgement::MsgAcknowledgement::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Packet(PacketMsg::Ack(domain_msg)))
-            }
-            timeout::TYPE_URL => {
-                let domain_msg = timeout::MsgTimeout::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Packet(PacketMsg::Timeout(domain_msg)))
-            }
-            timeout_on_close::TYPE_URL => {
-                let domain_msg = timeout_on_close::MsgTimeoutOnClose::decode_vec(&any_msg.value)
-                    .map_err(RouterError::MalformedMessageBytes)?;
-                Ok(MsgEnvelope::Packet(PacketMsg::TimeoutOnClose(domain_msg)))
-            }
-            _ => Err(RouterError::UnknownMessageTypeUrl {
-                url: any_msg.type_url,
-            }),
-        }
-    }
-}
diff --git a/crates/ibc/src/core/router.rs b/crates/ibc/src/core/router.rs
deleted file mode 100644
index 34421ae38..000000000
--- a/crates/ibc/src/core/router.rs
+++ /dev/null
@@ -1,280 +0,0 @@
-//! Defines the `Router`, which binds modules to ports
-
-use crate::prelude::*;
-use alloc::borrow::Borrow;
-use core::fmt::{Debug, Display, Error as FmtError, Formatter};
-
-use crate::core::events::ModuleEvent;
-use crate::core::ics04_channel::acknowledgement::Acknowledgement;
-use crate::core::ics04_channel::channel::{Counterparty, Order};
-use crate::core::ics04_channel::error::PortError::UnknownPort;
-use crate::core::ics04_channel::error::{ChannelError, PacketError};
-use crate::core::ics04_channel::msgs::ChannelMsg;
-use crate::core::ics04_channel::msgs::PacketMsg;
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics04_channel::Version;
-use crate::core::ics24_host::identifier::PortId;
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId};
-use crate::signer::Signer;
-
-/// Router as defined in ICS-26, which binds modules to ports.
-pub trait Router {
-    /// Returns a reference to a `Module` registered against the specified `ModuleId`
-    fn get_route(&self, module_id: &ModuleId) -> Option<&dyn Module>;
-
-    /// Returns a mutable reference to a `Module` registered against the specified `ModuleId`
-    fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn Module>;
-
-    /// Return the module_id associated with a given port_id
-    fn lookup_module_by_port(&self, port_id: &PortId) -> Option<ModuleId>;
-
-    fn lookup_module_channel(&self, msg: &ChannelMsg) -> Result<ModuleId, ChannelError> {
-        let port_id = match msg {
-            ChannelMsg::OpenInit(msg) => &msg.port_id_on_a,
-            ChannelMsg::OpenTry(msg) => &msg.port_id_on_b,
-            ChannelMsg::OpenAck(msg) => &msg.port_id_on_a,
-            ChannelMsg::OpenConfirm(msg) => &msg.port_id_on_b,
-            ChannelMsg::CloseInit(msg) => &msg.port_id_on_a,
-            ChannelMsg::CloseConfirm(msg) => &msg.port_id_on_b,
-        };
-        let module_id = self
-            .lookup_module_by_port(port_id)
-            .ok_or(ChannelError::Port(UnknownPort {
-                port_id: port_id.clone(),
-            }))?;
-        Ok(module_id)
-    }
-
-    fn lookup_module_packet(&self, msg: &PacketMsg) -> Result<ModuleId, ChannelError> {
-        let port_id = match msg {
-            PacketMsg::Recv(msg) => &msg.packet.port_id_on_b,
-            PacketMsg::Ack(msg) => &msg.packet.port_id_on_a,
-            PacketMsg::Timeout(msg) => &msg.packet.port_id_on_a,
-            PacketMsg::TimeoutOnClose(msg) => &msg.packet.port_id_on_a,
-        };
-        let module_id = self
-            .lookup_module_by_port(port_id)
-            .ok_or(ChannelError::Port(UnknownPort {
-                port_id: port_id.clone(),
-            }))?;
-        Ok(module_id)
-    }
-}
-
-/// Module name, internal to the chain.
-///
-/// That is, the IBC protocol never exposes this name. Note that this is
-/// different from IBC host [identifiers][crate::core::ics24_host::identifier],
-/// which are exposed to other chains by the protocol.
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct ModuleId(String);
-
-impl ModuleId {
-    pub fn new(s: String) -> Self {
-        Self(s)
-    }
-}
-
-impl Display for ModuleId {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Borrow<str> for ModuleId {
-    fn borrow(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-/// Logs and events produced during module callbacks
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug)]
-pub struct ModuleExtras {
-    pub events: Vec<ModuleEvent>,
-    pub log: Vec<String>,
-}
-
-impl ModuleExtras {
-    pub fn empty() -> Self {
-        ModuleExtras {
-            events: Vec::new(),
-            log: Vec::new(),
-        }
-    }
-}
-
-/// The trait that defines an IBC application
-pub trait Module: Debug {
-    fn on_chan_open_init_validate(
-        &self,
-        order: Order,
-        connection_hops: &[ConnectionId],
-        port_id: &PortId,
-        channel_id: &ChannelId,
-        counterparty: &Counterparty,
-        version: &Version,
-    ) -> Result<Version, ChannelError>;
-
-    fn on_chan_open_init_execute(
-        &mut self,
-        order: Order,
-        connection_hops: &[ConnectionId],
-        port_id: &PortId,
-        channel_id: &ChannelId,
-        counterparty: &Counterparty,
-        version: &Version,
-    ) -> Result<(ModuleExtras, Version), ChannelError>;
-
-    fn on_chan_open_try_validate(
-        &self,
-        order: Order,
-        connection_hops: &[ConnectionId],
-        port_id: &PortId,
-        channel_id: &ChannelId,
-        counterparty: &Counterparty,
-        counterparty_version: &Version,
-    ) -> Result<Version, ChannelError>;
-
-    fn on_chan_open_try_execute(
-        &mut self,
-        order: Order,
-        connection_hops: &[ConnectionId],
-        port_id: &PortId,
-        channel_id: &ChannelId,
-        counterparty: &Counterparty,
-        counterparty_version: &Version,
-    ) -> Result<(ModuleExtras, Version), ChannelError>;
-
-    fn on_chan_open_ack_validate(
-        &self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-        _counterparty_version: &Version,
-    ) -> Result<(), ChannelError> {
-        Ok(())
-    }
-
-    fn on_chan_open_ack_execute(
-        &mut self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-        _counterparty_version: &Version,
-    ) -> Result<ModuleExtras, ChannelError> {
-        Ok(ModuleExtras::empty())
-    }
-
-    fn on_chan_open_confirm_validate(
-        &self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-    ) -> Result<(), ChannelError> {
-        Ok(())
-    }
-
-    fn on_chan_open_confirm_execute(
-        &mut self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-    ) -> Result<ModuleExtras, ChannelError> {
-        Ok(ModuleExtras::empty())
-    }
-
-    fn on_chan_close_init_validate(
-        &self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-    ) -> Result<(), ChannelError> {
-        Ok(())
-    }
-
-    fn on_chan_close_init_execute(
-        &mut self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-    ) -> Result<ModuleExtras, ChannelError> {
-        Ok(ModuleExtras::empty())
-    }
-
-    fn on_chan_close_confirm_validate(
-        &self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-    ) -> Result<(), ChannelError> {
-        Ok(())
-    }
-
-    fn on_chan_close_confirm_execute(
-        &mut self,
-        _port_id: &PortId,
-        _channel_id: &ChannelId,
-    ) -> Result<ModuleExtras, ChannelError> {
-        Ok(ModuleExtras::empty())
-    }
-
-    // Note: no `on_recv_packet_validate()`
-    // the `onRecvPacket` callback always succeeds
-    // if any error occurs, than an "error acknowledgement"
-    // must be returned
-
-    fn on_recv_packet_execute(
-        &mut self,
-        packet: &Packet,
-        relayer: &Signer,
-    ) -> (ModuleExtras, Acknowledgement);
-
-    fn on_acknowledgement_packet_validate(
-        &self,
-        _packet: &Packet,
-        _acknowledgement: &Acknowledgement,
-        _relayer: &Signer,
-    ) -> Result<(), PacketError>;
-
-    fn on_acknowledgement_packet_execute(
-        &mut self,
-        _packet: &Packet,
-        _acknowledgement: &Acknowledgement,
-        _relayer: &Signer,
-    ) -> (ModuleExtras, Result<(), PacketError>);
-
-    /// Note: `MsgTimeout` and `MsgTimeoutOnClose` use the same callback
-
-    fn on_timeout_packet_validate(
-        &self,
-        packet: &Packet,
-        relayer: &Signer,
-    ) -> Result<(), PacketError>;
-
-    /// Note: `MsgTimeout` and `MsgTimeoutOnClose` use the same callback
-
-    fn on_timeout_packet_execute(
-        &mut self,
-        packet: &Packet,
-        relayer: &Signer,
-    ) -> (ModuleExtras, Result<(), PacketError>);
-}
diff --git a/crates/ibc/src/hosts/mod.rs b/crates/ibc/src/hosts/mod.rs
deleted file mode 100644
index 8d3836cfe..000000000
--- a/crates/ibc/src/hosts/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Provides convenience implementations for various hosts
-pub mod tendermint;
diff --git a/crates/ibc/src/hosts/tendermint/mod.rs b/crates/ibc/src/hosts/tendermint/mod.rs
deleted file mode 100644
index fc7188dc4..000000000
--- a/crates/ibc/src/hosts/tendermint/mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! Provides convenience implementations for Tendermint-based hosts
-
-pub mod upgrade_proposal;
-
-mod validate_self_client;
-pub use validate_self_client::ValidateSelfClientContext;
-
-/// ABCI store/query path for the IBC sub-store
-pub const IBC_QUERY_PATH: &str = "store/ibc/key";
-
-/// ABCI store/query path for the upgrade sub-store
-pub const SDK_UPGRADE_QUERY_PATH: &str = "store/upgrade/key";
diff --git a/crates/ibc/src/hosts/tendermint/validate_self_client.rs b/crates/ibc/src/hosts/tendermint/validate_self_client.rs
deleted file mode 100644
index b305027d4..000000000
--- a/crates/ibc/src/hosts/tendermint/validate_self_client.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use core::time::Duration;
-
-use alloc::format;
-use alloc::string::{String, ToString};
-use ibc_proto::google::protobuf::Any;
-
-use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics23_commitment::specs::ProofSpecs;
-use crate::core::ics24_host::identifier::ChainId;
-use crate::core::ContextError;
-use crate::Height;
-
-use tendermint::trust_threshold::TrustThresholdFraction as TendermintTrustThresholdFraction;
-
-/// Provides an implementation of `ValidationContext::validate_self_client` for
-/// Tendermint-based hosts.
-pub trait ValidateSelfClientContext {
-    fn validate_self_tendermint_client(
-        &self,
-        client_state_of_host_on_counterparty: Any,
-    ) -> Result<(), ContextError> {
-        let tm_client_state = TmClientState::try_from(client_state_of_host_on_counterparty)
-            .map_err(|_| ConnectionError::InvalidClientState {
-                reason: "client must be a tendermint client".to_string(),
-            })
-            .map_err(ContextError::ConnectionError)?;
-
-        tm_client_state.validate().map_err(ClientError::from)?;
-
-        tm_client_state.confirm_not_frozen()?;
-
-        let self_chain_id = self.chain_id();
-        if self_chain_id != &tm_client_state.chain_id {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "invalid chain-id. expected: {}, got: {}",
-                    self_chain_id, tm_client_state.chain_id
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        let self_revision_number = self_chain_id.version();
-        if self_revision_number != tm_client_state.latest_height().revision_number() {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "client is not in the same revision as the chain. expected: {}, got: {}",
-                    self_revision_number,
-                    tm_client_state.latest_height().revision_number()
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        if tm_client_state.latest_height() >= self.host_current_height() {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "client has latest height {} greater than or equal to chain height {}",
-                    tm_client_state.latest_height(),
-                    self.host_current_height()
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        if self.proof_specs() != &tm_client_state.proof_specs {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "client has invalid proof specs. expected: {:?}, got: {:?}",
-                    self.proof_specs(),
-                    tm_client_state.proof_specs
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        let _ = {
-            let trust_level = tm_client_state.trust_level;
-
-            TendermintTrustThresholdFraction::new(
-                trust_level.numerator(),
-                trust_level.denominator(),
-            )
-            .map_err(|_| ConnectionError::InvalidClientState {
-                reason: "invalid trust level".to_string(),
-            })?
-        };
-
-        if self.unbonding_period() != tm_client_state.unbonding_period {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "invalid unbonding period. expected: {:?}, got: {:?}",
-                    self.unbonding_period(),
-                    tm_client_state.unbonding_period,
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        if tm_client_state.unbonding_period < tm_client_state.trusting_period {
-            return Err(ConnectionError::InvalidClientState{ reason: format!(
-                "unbonding period must be greater than trusting period. unbonding period ({:?}) < trusting period ({:?})",
-                tm_client_state.unbonding_period,
-                tm_client_state.trusting_period
-            )})
-            .map_err(ContextError::ConnectionError);
-        }
-
-        if !tm_client_state.upgrade_path.is_empty()
-            && self.upgrade_path() != tm_client_state.upgrade_path
-        {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "invalid upgrade path. expected: {:?}, got: {:?}",
-                    self.upgrade_path(),
-                    tm_client_state.upgrade_path
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        Ok(())
-    }
-
-    /// Returns the host chain id
-    fn chain_id(&self) -> &ChainId;
-
-    /// Returns the host current height
-    fn host_current_height(&self) -> Height;
-
-    /// Returns the host proof specs
-    fn proof_specs(&self) -> &ProofSpecs;
-
-    /// Returns the host unbonding period
-    fn unbonding_period(&self) -> Duration;
-
-    /// Returns the host upgrade path. May be empty.
-    fn upgrade_path(&self) -> &[String];
-}
diff --git a/crates/ibc/src/lib.rs b/crates/ibc/src/lib.rs
deleted file mode 100644
index 234af7a48..000000000
--- a/crates/ibc/src/lib.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-#![cfg_attr(not(test), deny(clippy::unwrap_used))]
-#![no_std]
-#![deny(
-    warnings,
-    trivial_casts,
-    trivial_numeric_casts,
-    unused_import_braces,
-    unused_qualifications,
-    rust_2018_idioms
-)]
-#![forbid(unsafe_code)]
-// https://github.com/cosmos/ibc-rs/issues/342
-#![allow(clippy::result_large_err)]
-//! This library implements the InterBlockchain Communication (IBC) protocol in Rust. IBC is
-//! a distributed protocol that enables communication between distinct sovereign blockchains.
-//!
-//! The layout of this crate mirrors the organization of the [IBC
-//! Standard][ibc-standard]:
-//!
-//! + [Core](core) implements the transport, authentication, and ordering layers of the IBC protocol.
-//!
-//! + [Clients](clients) consists of implementations of client verification algorithms (following the base
-//! client interface that is defined in `Core`) for specific consensus algorithms. A chain uses these
-//! verification algorithms to verify the state of remote chains.
-//!
-//! + [Applications](applications) consists of implementations of some IBC applications. This is the part of
-//! the protocol that abstracts away the core protocol and focuses solely on business logic.
-//!
-//! When processing a given message `M`, if any method in this library returns an error, the runtime
-//! is expected to rollback all state modifications made to the context
-//! (e.g. [`ExecutionContext`](core::ExecutionContext)) while processing `M`. If a transaction on your
-//! blockchain contains multiple messages, then typically the state modifications from all messages
-//! is expected to be rolled back as well.
-//!
-//! # Note
-//!
-//! Currently, the `serde` feature (required by the token transfer app) does not work in `no_std` environments.
-//! See context [here](https://github.com/cosmos/ibc-proto-rs/pull/92). If this is a blocker for you, please
-//! open a Github issue.
-//!
-//! [ibc-standard]: https://github.com/cosmos/ibc
-
-extern crate alloc;
-#[cfg(any(test, feature = "std"))]
-extern crate std;
-
-/// Represents a block height
-pub use crate::core::ics02_client::height::Height;
-pub use signer::Signer;
-
-pub mod applications;
-pub mod clients;
-pub mod core;
-pub mod hosts;
-
-#[cfg(any(test, feature = "mocks", feature = "mocks-no-std"))]
-pub mod mock;
-#[cfg(any(test, feature = "mocks"))]
-pub mod test_utils; // Context mock, the underlying host chain, and client types: for testing all handlers.
-
-mod prelude;
-mod signer;
-mod utils;
-
-#[cfg(feature = "serde")]
-mod serializers;
-
-#[cfg(test)]
-mod test;
-
-/// Re-export the `Any` type which used across the library.
-pub use ibc_proto::google::protobuf::Any;
diff --git a/crates/ibc/src/mock/client_state.rs b/crates/ibc/src/mock/client_state.rs
deleted file mode 100644
index 24b2bd688..000000000
--- a/crates/ibc/src/mock/client_state.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-use crate::prelude::*;
-
-use core::str::FromStr;
-use core::time::Duration;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::mock::ClientState as RawMockClientState;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::client_state::ClientStateExecution;
-use crate::core::ics02_client::client_state::ClientStateValidation;
-use crate::core::ics02_client::client_state::UpdateKind;
-use crate::core::ics02_client::client_type::ClientType;
-use crate::core::ics02_client::error::{ClientError, UpgradeClientError};
-use crate::core::ics02_client::ClientExecutionContext;
-use crate::core::ics23_commitment::commitment::{
-    CommitmentPrefix, CommitmentProofBytes, CommitmentRoot,
-};
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::path::Path;
-use crate::core::ics24_host::path::{ClientConsensusStatePath, ClientStatePath};
-use crate::mock::client_state::client_type as mock_client_type;
-use crate::mock::consensus_state::MockConsensusState;
-use crate::mock::header::MockHeader;
-use crate::mock::misbehaviour::Misbehaviour;
-
-use crate::Height;
-
-pub const MOCK_CLIENT_STATE_TYPE_URL: &str = "/ibc.mock.ClientState";
-pub const MOCK_CLIENT_TYPE: &str = "9999-mock";
-
-pub fn client_type() -> ClientType {
-    ClientType::from_str(MOCK_CLIENT_TYPE).expect("never fails because it's valid client type")
-}
-
-/// A mock of a client state. For an example of a real structure that this mocks, you can see
-/// `ClientState` of ics07_tendermint/client_state.rs.
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct MockClientState {
-    pub header: MockHeader,
-    pub frozen_height: Option<Height>,
-}
-
-impl MockClientState {
-    pub fn new(header: MockHeader) -> Self {
-        Self {
-            header,
-            frozen_height: None,
-        }
-    }
-
-    pub fn latest_height(&self) -> Height {
-        self.header.height()
-    }
-
-    pub fn refresh_time(&self) -> Option<Duration> {
-        None
-    }
-
-    pub fn with_frozen_height(self, frozen_height: Height) -> Self {
-        Self {
-            frozen_height: Some(frozen_height),
-            ..self
-        }
-    }
-}
-
-impl Protobuf<RawMockClientState> for MockClientState {}
-
-impl TryFrom<RawMockClientState> for MockClientState {
-    type Error = ClientError;
-
-    fn try_from(raw: RawMockClientState) -> Result<Self, Self::Error> {
-        Ok(Self::new(raw.header.expect("Never fails").try_into()?))
-    }
-}
-
-impl From<MockClientState> for RawMockClientState {
-    fn from(value: MockClientState) -> Self {
-        RawMockClientState {
-            header: Some(ibc_proto::ibc::mock::Header {
-                height: Some(value.header.height().into()),
-                timestamp: value.header.timestamp.nanoseconds(),
-            }),
-        }
-    }
-}
-
-impl Protobuf<Any> for MockClientState {}
-
-impl TryFrom<Any> for MockClientState {
-    type Error = ClientError;
-
-    fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        use bytes::Buf;
-        use core::ops::Deref;
-        use prost::Message;
-
-        fn decode_client_state<B: Buf>(buf: B) -> Result<MockClientState, ClientError> {
-            RawMockClientState::decode(buf)
-                .map_err(ClientError::Decode)?
-                .try_into()
-        }
-
-        match raw.type_url.as_str() {
-            MOCK_CLIENT_STATE_TYPE_URL => {
-                decode_client_state(raw.value.deref()).map_err(Into::into)
-            }
-            _ => Err(ClientError::UnknownClientStateType {
-                client_state_type: raw.type_url,
-            }),
-        }
-    }
-}
-
-impl From<MockClientState> for Any {
-    fn from(client_state: MockClientState) -> Self {
-        Any {
-            type_url: MOCK_CLIENT_STATE_TYPE_URL.to_string(),
-            value: Protobuf::<RawMockClientState>::encode_vec(&client_state),
-        }
-    }
-}
-
-impl ClientStateCommon for MockClientState {
-    fn verify_consensus_state(&self, consensus_state: Any) -> Result<(), ClientError> {
-        let _mock_consensus_state = MockConsensusState::try_from(consensus_state)?;
-
-        Ok(())
-    }
-
-    fn client_type(&self) -> ClientType {
-        mock_client_type()
-    }
-
-    fn latest_height(&self) -> Height {
-        self.header.height()
-    }
-
-    fn validate_proof_height(&self, proof_height: Height) -> Result<(), ClientError> {
-        if self.latest_height() < proof_height {
-            return Err(ClientError::InvalidProofHeight {
-                latest_height: self.latest_height(),
-                proof_height,
-            });
-        }
-        Ok(())
-    }
-
-    fn confirm_not_frozen(&self) -> Result<(), ClientError> {
-        if let Some(frozen_height) = self.frozen_height {
-            return Err(ClientError::ClientFrozen {
-                description: format!("The client is frozen at height {frozen_height}"),
-            });
-        }
-        Ok(())
-    }
-
-    fn expired(&self, _elapsed: Duration) -> bool {
-        false
-    }
-
-    fn verify_upgrade_client(
-        &self,
-        upgraded_client_state: Any,
-        upgraded_consensus_state: Any,
-        _proof_upgrade_client: CommitmentProofBytes,
-        _proof_upgrade_consensus_state: CommitmentProofBytes,
-        _root: &CommitmentRoot,
-    ) -> Result<(), ClientError> {
-        let upgraded_mock_client_state = MockClientState::try_from(upgraded_client_state)?;
-        MockConsensusState::try_from(upgraded_consensus_state)?;
-        if self.latest_height() >= upgraded_mock_client_state.latest_height() {
-            return Err(UpgradeClientError::LowUpgradeHeight {
-                upgraded_height: self.latest_height(),
-                client_height: upgraded_mock_client_state.latest_height(),
-            })?;
-        }
-        Ok(())
-    }
-
-    fn verify_membership(
-        &self,
-        _prefix: &CommitmentPrefix,
-        _proof: &CommitmentProofBytes,
-        _root: &CommitmentRoot,
-        _path: Path,
-        _value: Vec<u8>,
-    ) -> Result<(), ClientError> {
-        Ok(())
-    }
-
-    fn verify_non_membership(
-        &self,
-        _prefix: &CommitmentPrefix,
-        _proof: &CommitmentProofBytes,
-        _root: &CommitmentRoot,
-        _path: Path,
-    ) -> Result<(), ClientError> {
-        Ok(())
-    }
-}
-
-impl<ClientValidationContext> ClientStateValidation<ClientValidationContext> for MockClientState {
-    fn verify_client_message(
-        &self,
-        _ctx: &ClientValidationContext,
-        _client_id: &ClientId,
-        client_message: Any,
-        update_kind: &UpdateKind,
-    ) -> Result<(), ClientError> {
-        match update_kind {
-            UpdateKind::UpdateClient => {
-                let header = MockHeader::try_from(client_message)?;
-
-                if self.latest_height() >= header.height() {
-                    return Err(ClientError::LowHeaderHeight {
-                        header_height: header.height(),
-                        latest_height: self.latest_height(),
-                    });
-                }
-            }
-            UpdateKind::SubmitMisbehaviour => {
-                let _misbehaviour = Misbehaviour::try_from(client_message)?;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn check_for_misbehaviour(
-        &self,
-        _ctx: &ClientValidationContext,
-        _client_id: &ClientId,
-        client_message: Any,
-        update_kind: &UpdateKind,
-    ) -> Result<bool, ClientError> {
-        match update_kind {
-            UpdateKind::UpdateClient => Ok(false),
-            UpdateKind::SubmitMisbehaviour => {
-                let misbehaviour = Misbehaviour::try_from(client_message)?;
-                let header_1 = misbehaviour.header1;
-                let header_2 = misbehaviour.header2;
-
-                let header_heights_equal = header_1.height() == header_2.height();
-                let headers_are_in_future = self.latest_height() < header_1.height();
-
-                Ok(header_heights_equal && headers_are_in_future)
-            }
-        }
-    }
-}
-
-impl<E> ClientStateExecution<E> for MockClientState
-where
-    E: ClientExecutionContext,
-    <E as ClientExecutionContext>::AnyClientState: From<MockClientState>,
-    <E as ClientExecutionContext>::AnyConsensusState: From<MockConsensusState>,
-{
-    fn initialise(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        consensus_state: Any,
-    ) -> Result<(), ClientError> {
-        let mock_consensus_state = MockConsensusState::try_from(consensus_state)?;
-
-        ctx.store_client_state(ClientStatePath::new(client_id), (*self).into())?;
-        ctx.store_consensus_state(
-            ClientConsensusStatePath::new(client_id, &self.latest_height()),
-            mock_consensus_state.into(),
-        )?;
-
-        Ok(())
-    }
-
-    fn update_state(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        header: Any,
-    ) -> Result<Vec<Height>, ClientError> {
-        let header = MockHeader::try_from(header)?;
-        let header_height = header.height;
-
-        let new_client_state = MockClientState::new(header);
-        let new_consensus_state = MockConsensusState::new(header);
-
-        ctx.store_consensus_state(
-            ClientConsensusStatePath::new(client_id, &new_client_state.latest_height()),
-            new_consensus_state.into(),
-        )?;
-        ctx.store_client_state(ClientStatePath::new(client_id), new_client_state.into())?;
-
-        Ok(vec![header_height])
-    }
-
-    fn update_state_on_misbehaviour(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        _client_message: Any,
-        _update_kind: &UpdateKind,
-    ) -> Result<(), ClientError> {
-        let frozen_client_state = self.with_frozen_height(Height::min(0));
-
-        ctx.store_client_state(ClientStatePath::new(client_id), frozen_client_state.into())?;
-
-        Ok(())
-    }
-
-    fn update_state_on_upgrade(
-        &self,
-        ctx: &mut E,
-        client_id: &ClientId,
-        upgraded_client_state: Any,
-        upgraded_consensus_state: Any,
-    ) -> Result<Height, ClientError> {
-        let new_client_state = MockClientState::try_from(upgraded_client_state)?;
-        let new_consensus_state = MockConsensusState::try_from(upgraded_consensus_state)?;
-
-        let latest_height = new_client_state.latest_height();
-
-        ctx.store_consensus_state(
-            ClientConsensusStatePath::new(client_id, &latest_height),
-            new_consensus_state.into(),
-        )?;
-        ctx.store_client_state(ClientStatePath::new(client_id), new_client_state.into())?;
-
-        Ok(latest_height)
-    }
-}
-
-impl From<MockConsensusState> for MockClientState {
-    fn from(cs: MockConsensusState) -> Self {
-        Self::new(cs.header)
-    }
-}
diff --git a/crates/ibc/src/mock/context.rs b/crates/ibc/src/mock/context.rs
deleted file mode 100644
index 78b5bc802..000000000
--- a/crates/ibc/src/mock/context.rs
+++ /dev/null
@@ -1,1758 +0,0 @@
-//! Implementation of a global context mock. Used in testing handlers of all IBC modules.
-
-mod applications;
-mod clients;
-
-use crate::clients::ics07_tendermint::TENDERMINT_CLIENT_TYPE;
-use crate::core::ics24_host::path::{
-    AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, CommitmentPath,
-    ConnectionPath, ReceiptPath, SeqAckPath, SeqRecvPath, SeqSendPath,
-};
-use crate::prelude::*;
-
-use alloc::collections::btree_map::BTreeMap;
-use alloc::sync::Arc;
-use core::cmp::min;
-use core::fmt::Debug;
-use core::ops::{Add, Sub};
-use core::time::Duration;
-use derive_more::{From, TryInto};
-use ibc_proto::protobuf::Protobuf;
-use parking_lot::Mutex;
-
-use ibc_proto::google::protobuf::Any;
-use tracing::debug;
-
-use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-use crate::clients::ics07_tendermint::client_state::TENDERMINT_CLIENT_STATE_TYPE_URL;
-use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-use crate::clients::ics07_tendermint::consensus_state::TENDERMINT_CONSENSUS_STATE_TYPE_URL;
-
-use crate::core::dispatch;
-use crate::core::events::IbcEvent;
-use crate::core::ics02_client::client_state::ClientState;
-use crate::core::ics02_client::client_state::ClientStateCommon;
-use crate::core::ics02_client::client_type::ClientType;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics03_connection::connection::ConnectionEnd;
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics04_channel::channel::ChannelEnd;
-use crate::core::ics04_channel::commitment::{AcknowledgementCommitment, PacketCommitment};
-use crate::core::ics04_channel::error::{ChannelError, PacketError};
-use crate::core::ics04_channel::packet::{Receipt, Sequence};
-use crate::core::ics23_commitment::commitment::CommitmentPrefix;
-use crate::core::ics24_host::identifier::{ChainId, ChannelId, ClientId, ConnectionId, PortId};
-use crate::core::router::Router;
-use crate::core::router::{Module, ModuleId};
-use crate::core::timestamp::Timestamp;
-use crate::core::{ContextError, ValidationContext};
-use crate::core::{ExecutionContext, MsgEnvelope};
-use crate::mock::client_state::{client_type as mock_client_type, MockClientState};
-use crate::mock::consensus_state::MockConsensusState;
-use crate::mock::header::MockHeader;
-use crate::mock::host::{HostBlock, HostType};
-use crate::mock::ics18_relayer::context::RelayerContext;
-use crate::mock::ics18_relayer::error::RelayerError;
-use crate::signer::Signer;
-use crate::Height;
-
-use super::client_state::{MOCK_CLIENT_STATE_TYPE_URL, MOCK_CLIENT_TYPE};
-use super::consensus_state::MOCK_CONSENSUS_STATE_TYPE_URL;
-
-pub const DEFAULT_BLOCK_TIME_SECS: u64 = 3;
-
-#[derive(Debug, Clone, From, PartialEq, ClientState)]
-#[generics(ClientValidationContext = MockContext,
-           ClientExecutionContext = MockContext)
-]
-#[mock]
-pub enum AnyClientState {
-    Tendermint(TmClientState),
-    Mock(MockClientState),
-}
-
-impl Protobuf<Any> for AnyClientState {}
-
-impl TryFrom<Any> for AnyClientState {
-    type Error = ClientError;
-
-    fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        if raw.type_url == TENDERMINT_CLIENT_STATE_TYPE_URL {
-            TmClientState::try_from(raw).map(Into::into)
-        } else if raw.type_url == MOCK_CLIENT_STATE_TYPE_URL {
-            MockClientState::try_from(raw).map(Into::into)
-        } else {
-            Err(ClientError::Other {
-                description: "failed to deserialize message".to_string(),
-            })
-        }
-    }
-}
-
-impl From<AnyClientState> for Any {
-    fn from(host_client_state: AnyClientState) -> Self {
-        match host_client_state {
-            AnyClientState::Tendermint(cs) => cs.into(),
-            AnyClientState::Mock(cs) => cs.into(),
-        }
-    }
-}
-
-#[derive(Debug, Clone, From, TryInto, PartialEq, ConsensusState)]
-pub enum AnyConsensusState {
-    Tendermint(TmConsensusState),
-    Mock(MockConsensusState),
-}
-
-impl Protobuf<Any> for AnyConsensusState {}
-
-impl TryFrom<Any> for AnyConsensusState {
-    type Error = ClientError;
-
-    fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        if raw.type_url == TENDERMINT_CONSENSUS_STATE_TYPE_URL {
-            TmConsensusState::try_from(raw).map(Into::into)
-        } else if raw.type_url == MOCK_CONSENSUS_STATE_TYPE_URL {
-            MockConsensusState::try_from(raw).map(Into::into)
-        } else {
-            Err(ClientError::Other {
-                description: "failed to deserialize message".to_string(),
-            })
-        }
-    }
-}
-
-impl From<AnyConsensusState> for Any {
-    fn from(host_consensus_state: AnyConsensusState) -> Self {
-        match host_consensus_state {
-            AnyConsensusState::Tendermint(cs) => cs.into(),
-            AnyConsensusState::Mock(cs) => cs.into(),
-        }
-    }
-}
-
-/// A mock of an IBC client record as it is stored in a mock context.
-/// For testing ICS02 handlers mostly, cf. `MockClientContext`.
-#[derive(Clone, Debug)]
-pub struct MockClientRecord {
-    /// The client state (representing only the latest height at the moment).
-    pub client_state: Option<AnyClientState>,
-
-    /// Mapping of heights to consensus states for this client.
-    pub consensus_states: BTreeMap<Height, AnyConsensusState>,
-}
-
-/// An object that stores all IBC related data.
-#[derive(Clone, Debug, Default)]
-pub struct MockIbcStore {
-    /// The set of all clients, indexed by their id.
-    pub clients: BTreeMap<ClientId, MockClientRecord>,
-
-    /// Tracks the processed time for clients header updates
-    pub client_processed_times: BTreeMap<(ClientId, Height), Timestamp>,
-
-    /// Tracks the processed height for the clients
-    pub client_processed_heights: BTreeMap<(ClientId, Height), Height>,
-
-    /// Counter for the client identifiers, necessary for `increase_client_counter` and the
-    /// `client_counter` methods.
-    pub client_ids_counter: u64,
-
-    /// Association between client ids and connection ids.
-    pub client_connections: BTreeMap<ClientId, ConnectionId>,
-
-    /// All the connections in the store.
-    pub connections: BTreeMap<ConnectionId, ConnectionEnd>,
-
-    /// Counter for connection identifiers (see `increase_connection_counter`).
-    pub connection_ids_counter: u64,
-
-    /// Association between connection ids and channel ids.
-    pub connection_channels: BTreeMap<ConnectionId, Vec<(PortId, ChannelId)>>,
-
-    /// Counter for channel identifiers (see `increase_channel_counter`).
-    pub channel_ids_counter: u64,
-
-    /// All the channels in the store. TODO Make new key PortId X ChannelId
-    pub channels: PortChannelIdMap<ChannelEnd>,
-
-    /// Tracks the sequence number for the next packet to be sent.
-    pub next_sequence_send: PortChannelIdMap<Sequence>,
-
-    /// Tracks the sequence number for the next packet to be received.
-    pub next_sequence_recv: PortChannelIdMap<Sequence>,
-
-    /// Tracks the sequence number for the next packet to be acknowledged.
-    pub next_sequence_ack: PortChannelIdMap<Sequence>,
-
-    pub packet_acknowledgement: PortChannelIdMap<BTreeMap<Sequence, AcknowledgementCommitment>>,
-
-    /// Maps ports to the the module that owns it
-    pub port_to_module: BTreeMap<PortId, ModuleId>,
-
-    /// Constant-size commitments to packets data fields
-    pub packet_commitment: PortChannelIdMap<BTreeMap<Sequence, PacketCommitment>>,
-
-    // Used by unordered channel
-    pub packet_receipt: PortChannelIdMap<BTreeMap<Sequence, Receipt>>,
-}
-
-/// A context implementing the dependencies necessary for testing any IBC module.
-#[derive(Debug)]
-pub struct MockContext {
-    /// The type of host chain underlying this mock context.
-    host_chain_type: HostType,
-
-    /// Host chain identifier.
-    host_chain_id: ChainId,
-
-    /// Maximum size for the history of the host chain. Any block older than this is pruned.
-    max_history_size: usize,
-
-    /// The chain of blocks underlying this context. A vector of size up to `max_history_size`
-    /// blocks, ascending order by their height (latest block is on the last position).
-    history: Vec<HostBlock>,
-
-    /// Average time duration between blocks
-    block_time: Duration,
-
-    /// An object that stores all IBC related data.
-    pub ibc_store: Arc<Mutex<MockIbcStore>>,
-
-    /// To implement ValidationContext Router
-    router: BTreeMap<ModuleId, Arc<dyn Module>>,
-
-    pub events: Vec<IbcEvent>,
-
-    pub logs: Vec<String>,
-}
-
-/// Returns a MockContext with bare minimum initialization: no clients, no connections and no channels are
-/// present, and the chain has Height(5). This should be used sparingly, mostly for testing the
-/// creation of new domain objects.
-impl Default for MockContext {
-    fn default() -> Self {
-        Self::new(
-            ChainId::new("mockgaia", 0),
-            HostType::Mock,
-            5,
-            Height::new(0, 5).expect("Never fails"),
-        )
-    }
-}
-
-/// A manual clone impl is provided because the tests are oblivious to the fact that the `ibc_store`
-/// is a shared ptr.
-impl Clone for MockContext {
-    fn clone(&self) -> Self {
-        let ibc_store = {
-            let ibc_store = self.ibc_store.lock().clone();
-            Arc::new(Mutex::new(ibc_store))
-        };
-
-        Self {
-            host_chain_type: self.host_chain_type,
-            host_chain_id: self.host_chain_id.clone(),
-            max_history_size: self.max_history_size,
-            history: self.history.clone(),
-            block_time: self.block_time,
-            ibc_store,
-            router: self.router.clone(),
-            events: self.events.clone(),
-            logs: self.logs.clone(),
-        }
-    }
-}
-
-/// Implementation of internal interface for use in testing. The methods in this interface should
-/// _not_ be accessible to any Ics handler.
-impl MockContext {
-    /// Creates a mock context. Parameter `max_history_size` determines how many blocks will
-    /// the chain maintain in its history, which also determines the pruning window. Parameter
-    /// `latest_height` determines the current height of the chain. This context
-    /// has support to emulate two type of underlying chains: Mock or SyntheticTendermint.
-    pub fn new(
-        host_id: ChainId,
-        host_type: HostType,
-        max_history_size: usize,
-        latest_height: Height,
-    ) -> Self {
-        assert_ne!(
-            max_history_size, 0,
-            "The chain must have a non-zero max_history_size"
-        );
-
-        assert_ne!(
-            latest_height.revision_height(),
-            0,
-            "The chain must have a non-zero revision_height"
-        );
-
-        // Compute the number of blocks to store.
-        let n = min(max_history_size as u64, latest_height.revision_height());
-
-        assert_eq!(
-            host_id.version(),
-            latest_height.revision_number(),
-            "The version in the chain identifier must match the version in the latest height"
-        );
-
-        let block_time = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS);
-        let next_block_timestamp = Timestamp::now().add(block_time).expect("Never fails");
-        MockContext {
-            host_chain_type: host_type,
-            host_chain_id: host_id.clone(),
-            max_history_size,
-            history: (0..n)
-                .rev()
-                .map(|i| {
-                    // generate blocks with timestamps -> N, N - BT, N - 2BT, ...
-                    // where N = now(), BT = block_time
-                    HostBlock::generate_block(
-                        host_id.clone(),
-                        host_type,
-                        latest_height.sub(i).expect("Never fails").revision_height(),
-                        next_block_timestamp
-                            .sub(Duration::from_secs(DEFAULT_BLOCK_TIME_SECS * (i + 1)))
-                            .expect("Never fails"),
-                    )
-                })
-                .collect(),
-            block_time,
-            ibc_store: Arc::new(Mutex::new(MockIbcStore::default())),
-            router: BTreeMap::new(),
-            events: Vec::new(),
-            logs: Vec::new(),
-        }
-    }
-
-    /// Associates a client record to this context.
-    /// Given a client id and a height, registers a new client in the context and also associates
-    /// to this client a mock client state and a mock consensus state for height `height`. The type
-    /// of this client is implicitly assumed to be Mock.
-    pub fn with_client(self, client_id: &ClientId, height: Height) -> Self {
-        self.with_client_parametrized(client_id, height, Some(mock_client_type()), Some(height))
-    }
-
-    /// Similar to `with_client`, this function associates a client record to this context, but
-    /// additionally permits to parametrize two details of the client. If `client_type` is None,
-    /// then the client will have type Mock, otherwise the specified type. If
-    /// `consensus_state_height` is None, then the client will be initialized with a consensus
-    /// state matching the same height as the client state (`client_state_height`).
-    pub fn with_client_parametrized(
-        self,
-        client_id: &ClientId,
-        client_state_height: Height,
-        client_type: Option<ClientType>,
-        consensus_state_height: Option<Height>,
-    ) -> Self {
-        // NOTE: this is wrong; the client chain ID is supposed to represent
-        // the chain ID of the counterparty chain. But at this point this is
-        // too ingrained in our tests; `with_client()` is called everywhere,
-        // which delegates to this.
-        let client_chain_id = self.host_chain_id.clone();
-
-        self.with_client_parametrized_with_chain_id(
-            client_chain_id,
-            client_id,
-            client_state_height,
-            client_type,
-            consensus_state_height,
-        )
-    }
-
-    pub fn with_client_parametrized_with_chain_id(
-        self,
-        client_chain_id: ChainId,
-        client_id: &ClientId,
-        client_state_height: Height,
-        client_type: Option<ClientType>,
-        consensus_state_height: Option<Height>,
-    ) -> Self {
-        let cs_height = consensus_state_height.unwrap_or(client_state_height);
-
-        let client_type = client_type.unwrap_or_else(mock_client_type);
-        let (client_state, consensus_state) = if client_type.as_str() == MOCK_CLIENT_TYPE {
-            (
-                Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
-                MockConsensusState::new(MockHeader::new(cs_height)).into(),
-            )
-        } else if client_type.as_str() == TENDERMINT_CLIENT_TYPE {
-            let light_block = HostBlock::generate_tm_block(
-                client_chain_id,
-                cs_height.revision_height(),
-                Timestamp::now(),
-            );
-
-            let client_state =
-                TmClientState::new_dummy_from_header(light_block.header().clone()).into();
-
-            // Return the tuple.
-            (Some(client_state), light_block.into())
-        } else {
-            panic!("unknown client type")
-        };
-        // If it's a mock client, create the corresponding mock states.
-        let consensus_states = vec![(cs_height, consensus_state)].into_iter().collect();
-
-        debug!("consensus states: {:?}", consensus_states);
-
-        let client_record = MockClientRecord {
-            client_state,
-            consensus_states,
-        };
-        self.ibc_store
-            .lock()
-            .clients
-            .insert(client_id.clone(), client_record);
-        self
-    }
-
-    pub fn with_client_parametrized_history(
-        self,
-        client_id: &ClientId,
-        client_state_height: Height,
-        client_type: Option<ClientType>,
-        consensus_state_height: Option<Height>,
-    ) -> Self {
-        let client_chain_id = self.host_chain_id.clone();
-        self.with_client_parametrized_history_with_chain_id(
-            client_chain_id,
-            client_id,
-            client_state_height,
-            client_type,
-            consensus_state_height,
-        )
-    }
-
-    pub(crate) fn with_client_parametrized_history_with_chain_id(
-        self,
-        client_chain_id: ChainId,
-        client_id: &ClientId,
-        client_state_height: Height,
-        client_type: Option<ClientType>,
-        consensus_state_height: Option<Height>,
-    ) -> Self {
-        let cs_height = consensus_state_height.unwrap_or(client_state_height);
-        let prev_cs_height = cs_height.clone().sub(1).unwrap_or(client_state_height);
-
-        let client_type = client_type.unwrap_or_else(mock_client_type);
-        let now = Timestamp::now();
-
-        let (client_state, consensus_state): (Option<AnyClientState>, AnyConsensusState) =
-            if client_type.as_str() == MOCK_CLIENT_TYPE {
-                // If it's a mock client, create the corresponding mock states.
-                (
-                    Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
-                    MockConsensusState::new(MockHeader::new(cs_height)).into(),
-                )
-            } else if client_type.as_str() == TENDERMINT_CLIENT_TYPE {
-                // If it's a Tendermint client, we need TM states.
-                let light_block =
-                    HostBlock::generate_tm_block(client_chain_id, cs_height.revision_height(), now);
-
-                let client_state =
-                    TmClientState::new_dummy_from_header(light_block.header().clone()).into();
-
-                // Return the tuple.
-                (Some(client_state), light_block.into())
-            } else {
-                panic!("Unknown client type")
-            };
-
-        let prev_consensus_state = if client_type.as_str() == MOCK_CLIENT_TYPE {
-            MockConsensusState::new(MockHeader::new(prev_cs_height)).into()
-        } else if client_type.as_str() == TENDERMINT_CLIENT_TYPE {
-            let light_block = HostBlock::generate_tm_block(
-                self.host_chain_id.clone(),
-                prev_cs_height.revision_height(),
-                now.sub(self.block_time).expect("Never fails"),
-            );
-            light_block.into()
-        } else {
-            panic!("Unknown client type")
-        };
-
-        let consensus_states = vec![
-            (prev_cs_height, prev_consensus_state),
-            (cs_height, consensus_state),
-        ]
-        .into_iter()
-        .collect();
-
-        debug!("consensus states: {:?}", consensus_states);
-
-        let client_record = MockClientRecord {
-            client_state,
-            consensus_states,
-        };
-
-        self.ibc_store
-            .lock()
-            .clients
-            .insert(client_id.clone(), client_record);
-        self
-    }
-
-    /// Associates a connection to this context.
-    pub fn with_connection(
-        self,
-        connection_id: ConnectionId,
-        connection_end: ConnectionEnd,
-    ) -> Self {
-        self.ibc_store
-            .lock()
-            .connections
-            .insert(connection_id, connection_end);
-        self
-    }
-
-    /// Associates a channel (in an arbitrary state) to this context.
-    pub fn with_channel(
-        self,
-        port_id: PortId,
-        chan_id: ChannelId,
-        channel_end: ChannelEnd,
-    ) -> Self {
-        let mut channels = self.ibc_store.lock().channels.clone();
-        channels
-            .entry(port_id)
-            .or_default()
-            .insert(chan_id, channel_end);
-        self.ibc_store.lock().channels = channels;
-        self
-    }
-
-    pub fn with_send_sequence(
-        self,
-        port_id: PortId,
-        chan_id: ChannelId,
-        seq_number: Sequence,
-    ) -> Self {
-        let mut next_sequence_send = self.ibc_store.lock().next_sequence_send.clone();
-        next_sequence_send
-            .entry(port_id)
-            .or_default()
-            .insert(chan_id, seq_number);
-        self.ibc_store.lock().next_sequence_send = next_sequence_send;
-        self
-    }
-
-    pub fn with_recv_sequence(
-        self,
-        port_id: PortId,
-        chan_id: ChannelId,
-        seq_number: Sequence,
-    ) -> Self {
-        let mut next_sequence_recv = self.ibc_store.lock().next_sequence_recv.clone();
-        next_sequence_recv
-            .entry(port_id)
-            .or_default()
-            .insert(chan_id, seq_number);
-        self.ibc_store.lock().next_sequence_recv = next_sequence_recv;
-        self
-    }
-
-    pub fn with_ack_sequence(
-        self,
-        port_id: PortId,
-        chan_id: ChannelId,
-        seq_number: Sequence,
-    ) -> Self {
-        let mut next_sequence_ack = self.ibc_store.lock().next_sequence_send.clone();
-        next_sequence_ack
-            .entry(port_id)
-            .or_default()
-            .insert(chan_id, seq_number);
-        self.ibc_store.lock().next_sequence_ack = next_sequence_ack;
-        self
-    }
-
-    pub fn with_height(self, target_height: Height) -> Self {
-        let latest_height = self.latest_height();
-        if target_height.revision_number() > latest_height.revision_number() {
-            unimplemented!()
-        } else if target_height.revision_number() < latest_height.revision_number() {
-            panic!("Cannot rewind history of the chain to a smaller revision number!")
-        } else if target_height.revision_height() < latest_height.revision_height() {
-            panic!("Cannot rewind history of the chain to a smaller revision height!")
-        } else if target_height.revision_height() > latest_height.revision_height() {
-            // Repeatedly advance the host chain height till we hit the desired height
-            let mut ctx = MockContext { ..self };
-            while ctx.latest_height().revision_height() < target_height.revision_height() {
-                ctx.advance_host_chain_height()
-            }
-            ctx
-        } else {
-            // Both the revision number and height match
-            self
-        }
-    }
-
-    pub fn with_packet_commitment(
-        self,
-        port_id: PortId,
-        chan_id: ChannelId,
-        seq: Sequence,
-        data: PacketCommitment,
-    ) -> Self {
-        let mut packet_commitment = self.ibc_store.lock().packet_commitment.clone();
-        packet_commitment
-            .entry(port_id)
-            .or_default()
-            .entry(chan_id)
-            .or_default()
-            .insert(seq, data);
-        self.ibc_store.lock().packet_commitment = packet_commitment;
-        self
-    }
-
-    pub fn add_route(
-        &mut self,
-        module_id: ModuleId,
-        module: impl Module + 'static,
-    ) -> Result<(), String> {
-        match self.router.insert(module_id, Arc::new(module)) {
-            None => Ok(()),
-            Some(_) => Err("Duplicate module_id".to_owned()),
-        }
-    }
-
-    /// Accessor for a block of the local (host) chain from this context.
-    /// Returns `None` if the block at the requested height does not exist.
-    pub fn host_block(&self, target_height: &Height) -> Option<&HostBlock> {
-        let target = target_height.revision_height() as usize;
-        let latest = self.latest_height().revision_height() as usize;
-
-        // Check that the block is not too advanced, nor has it been pruned.
-        if (target > latest) || (target <= latest - self.history.len()) {
-            None // Block for requested height does not exist in history.
-        } else {
-            Some(&self.history[self.history.len() + target - latest - 1])
-        }
-    }
-
-    /// Triggers the advancing of the host chain, by extending the history of blocks (or headers).
-    pub fn advance_host_chain_height(&mut self) {
-        let latest_block = self.history.last().expect("history cannot be empty");
-        let new_block = HostBlock::generate_block(
-            self.host_chain_id.clone(),
-            self.host_chain_type,
-            latest_block.height().increment().revision_height(),
-            latest_block
-                .timestamp()
-                .add(self.block_time)
-                .expect("Never fails"),
-        );
-
-        // Append the new header at the tip of the history.
-        if self.history.len() >= self.max_history_size {
-            // History is full, we rotate and replace the tip with the new header.
-            self.history.rotate_left(1);
-            self.history[self.max_history_size - 1] = new_block;
-        } else {
-            // History is not full yet.
-            self.history.push(new_block);
-        }
-    }
-
-    /// A datagram passes from the relayer to the IBC module (on host chain).
-    /// Alternative method to `Ics18Context::send` that does not exercise any serialization.
-    /// Used in testing the Ics18 algorithms, hence this may return a Ics18Error.
-    pub fn deliver(&mut self, msg: MsgEnvelope) -> Result<(), RelayerError> {
-        dispatch(self, msg).map_err(RelayerError::TransactionFailed)?;
-        // Create a new block.
-        self.advance_host_chain_height();
-        Ok(())
-    }
-
-    /// Validates this context. Should be called after the context is mutated by a test.
-    pub fn validate(&self) -> Result<(), String> {
-        // Check that the number of entries is not higher than window size.
-        if self.history.len() > self.max_history_size {
-            return Err("too many entries".to_string());
-        }
-
-        // Check the content of the history.
-        if !self.history.is_empty() {
-            // Get the highest block.
-            let lh = &self.history[self.history.len() - 1];
-            // Check latest is properly updated with highest header height.
-            if lh.height() != self.latest_height() {
-                return Err("latest height is not updated".to_string());
-            }
-        }
-
-        // Check that headers in the history are in sequential order.
-        for i in 1..self.history.len() {
-            let ph = &self.history[i - 1];
-            let h = &self.history[i];
-            if ph.height().increment() != h.height() {
-                return Err("headers in history not sequential".to_string());
-            }
-        }
-        Ok(())
-    }
-
-    pub fn add_port(&mut self, port_id: PortId) {
-        let module_id = ModuleId::new(format!("module{port_id}"));
-        self.ibc_store
-            .lock()
-            .port_to_module
-            .insert(port_id, module_id);
-    }
-
-    pub fn scope_port_to_module(&mut self, port_id: PortId, module_id: ModuleId) {
-        self.ibc_store
-            .lock()
-            .port_to_module
-            .insert(port_id, module_id);
-    }
-
-    pub fn latest_client_states(&self, client_id: &ClientId) -> AnyClientState {
-        self.ibc_store.lock().clients[client_id]
-            .client_state
-            .as_ref()
-            .expect("Never fails")
-            .clone()
-    }
-
-    pub fn latest_consensus_states(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> AnyConsensusState {
-        self.ibc_store.lock().clients[client_id]
-            .consensus_states
-            .get(height)
-            .expect("Never fails")
-            .clone()
-    }
-
-    pub fn latest_height(&self) -> Height {
-        self.history
-            .last()
-            .expect("history cannot be empty")
-            .height()
-    }
-
-    pub fn ibc_store_share(&self) -> Arc<Mutex<MockIbcStore>> {
-        self.ibc_store.clone()
-    }
-
-    pub fn query_latest_header(&self) -> Option<HostBlock> {
-        let block_ref = self.host_block(&self.host_height().expect("Never fails"));
-        block_ref.cloned()
-    }
-}
-
-type PortChannelIdMap<V> = BTreeMap<PortId, BTreeMap<ChannelId, V>>;
-
-impl RelayerContext for MockContext {
-    fn query_latest_height(&self) -> Result<Height, ContextError> {
-        ValidationContext::host_height(self)
-    }
-
-    fn query_client_full_state(&self, client_id: &ClientId) -> Option<AnyClientState> {
-        // Forward call to Ics2.
-        self.client_state(client_id).ok()
-    }
-
-    fn signer(&self) -> Signer {
-        "0CDA3F47EF3C4906693B170EF650EB968C5F4B2C"
-            .to_string()
-            .into()
-    }
-}
-
-impl Router for MockContext {
-    fn get_route(&self, module_id: &ModuleId) -> Option<&dyn Module> {
-        self.router.get(module_id).map(Arc::as_ref)
-    }
-    fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn Module> {
-        // NOTE: The following:
-
-        // self.router.get_mut(module_id).and_then(Arc::get_mut)
-
-        // doesn't work due to a compiler bug. So we expand it out manually.
-
-        match self.router.get_mut(module_id) {
-            Some(arc_mod) => match Arc::get_mut(arc_mod) {
-                Some(m) => Some(m),
-                None => None,
-            },
-            None => None,
-        }
-    }
-
-    fn lookup_module_by_port(&self, port_id: &PortId) -> Option<ModuleId> {
-        self.ibc_store.lock().port_to_module.get(port_id).cloned()
-    }
-}
-
-impl ValidationContext for MockContext {
-    type ClientValidationContext = Self;
-    type E = Self;
-    type AnyConsensusState = AnyConsensusState;
-    type AnyClientState = AnyClientState;
-
-    fn client_state(&self, client_id: &ClientId) -> Result<Self::AnyClientState, ContextError> {
-        match self.ibc_store.lock().clients.get(client_id) {
-            Some(client_record) => {
-                client_record
-                    .client_state
-                    .clone()
-                    .ok_or_else(|| ClientError::ClientStateNotFound {
-                        client_id: client_id.clone(),
-                    })
-            }
-            None => Err(ClientError::ClientStateNotFound {
-                client_id: client_id.clone(),
-            }),
-        }
-        .map_err(ContextError::ClientError)
-    }
-
-    fn decode_client_state(&self, client_state: Any) -> Result<Self::AnyClientState, ContextError> {
-        if let Ok(client_state) = TmClientState::try_from(client_state.clone()) {
-            client_state.validate().map_err(ClientError::from)?;
-            Ok(client_state.into())
-        } else if let Ok(client_state) = MockClientState::try_from(client_state.clone()) {
-            Ok(client_state.into())
-        } else {
-            Err(ClientError::UnknownClientStateType {
-                client_state_type: client_state.type_url,
-            })
-        }
-        .map_err(ContextError::ClientError)
-    }
-
-    fn consensus_state(
-        &self,
-        client_cons_state_path: &ClientConsensusStatePath,
-    ) -> Result<AnyConsensusState, ContextError> {
-        let client_id = &client_cons_state_path.client_id;
-        let height = Height::new(client_cons_state_path.epoch, client_cons_state_path.height)?;
-        match self.ibc_store.lock().clients.get(client_id) {
-            Some(client_record) => match client_record.consensus_states.get(&height) {
-                Some(consensus_state) => Ok(consensus_state.clone()),
-                None => Err(ClientError::ConsensusStateNotFound {
-                    client_id: client_id.clone(),
-                    height,
-                }),
-            },
-            None => Err(ClientError::ConsensusStateNotFound {
-                client_id: client_id.clone(),
-                height,
-            }),
-        }
-        .map_err(ContextError::ClientError)
-    }
-
-    fn host_height(&self) -> Result<Height, ContextError> {
-        Ok(self.latest_height())
-    }
-
-    fn host_timestamp(&self) -> Result<Timestamp, ContextError> {
-        Ok(self
-            .history
-            .last()
-            .expect("history cannot be empty")
-            .timestamp()
-            .add(self.block_time)
-            .expect("Never fails"))
-    }
-
-    fn host_consensus_state(&self, height: &Height) -> Result<AnyConsensusState, ContextError> {
-        match self.host_block(height) {
-            Some(block_ref) => Ok(block_ref.clone().into()),
-            None => Err(ClientError::MissingLocalConsensusState { height: *height }),
-        }
-        .map_err(ConnectionError::Client)
-        .map_err(ContextError::ConnectionError)
-    }
-
-    fn client_counter(&self) -> Result<u64, ContextError> {
-        Ok(self.ibc_store.lock().client_ids_counter)
-    }
-
-    fn connection_end(&self, cid: &ConnectionId) -> Result<ConnectionEnd, ContextError> {
-        match self.ibc_store.lock().connections.get(cid) {
-            Some(connection_end) => Ok(connection_end.clone()),
-            None => Err(ConnectionError::ConnectionNotFound {
-                connection_id: cid.clone(),
-            }),
-        }
-        .map_err(ContextError::ConnectionError)
-    }
-
-    fn validate_self_client(
-        &self,
-        client_state_of_host_on_counterparty: Any,
-    ) -> Result<(), ContextError> {
-        let mock_client_state = MockClientState::try_from(client_state_of_host_on_counterparty)
-            .map_err(|_| ConnectionError::InvalidClientState {
-                reason: "client must be a mock client".to_string(),
-            })
-            .map_err(ContextError::ConnectionError)?;
-
-        mock_client_state.confirm_not_frozen()?;
-
-        let self_chain_id = &self.host_chain_id;
-        let self_revision_number = self_chain_id.version();
-        if self_revision_number != mock_client_state.latest_height().revision_number() {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "client is not in the same revision as the chain. expected: {}, got: {}",
-                    self_revision_number,
-                    mock_client_state.latest_height().revision_number()
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        let host_current_height = self.latest_height().increment();
-        if mock_client_state.latest_height() >= host_current_height {
-            return Err(ConnectionError::InvalidClientState {
-                reason: format!(
-                    "client has latest height {} greater than or equal to chain height {}",
-                    mock_client_state.latest_height(),
-                    host_current_height
-                ),
-            })
-            .map_err(ContextError::ConnectionError);
-        }
-
-        Ok(())
-    }
-
-    fn commitment_prefix(&self) -> CommitmentPrefix {
-        CommitmentPrefix::try_from(b"mock".to_vec()).expect("Never fails")
-    }
-
-    fn connection_counter(&self) -> Result<u64, ContextError> {
-        Ok(self.ibc_store.lock().connection_ids_counter)
-    }
-
-    fn channel_end(&self, chan_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError> {
-        let port_id = &chan_end_path.0;
-        let channel_id = &chan_end_path.1;
-
-        match self
-            .ibc_store
-            .lock()
-            .channels
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-        {
-            Some(channel_end) => Ok(channel_end.clone()),
-            None => Err(ChannelError::ChannelNotFound {
-                port_id: port_id.clone(),
-                channel_id: channel_id.clone(),
-            }),
-        }
-        .map_err(ContextError::ChannelError)
-    }
-
-    fn get_next_sequence_send(
-        &self,
-        seq_send_path: &SeqSendPath,
-    ) -> Result<Sequence, ContextError> {
-        let port_id = &seq_send_path.0;
-        let channel_id = &seq_send_path.1;
-
-        match self
-            .ibc_store
-            .lock()
-            .next_sequence_send
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-        {
-            Some(sequence) => Ok(*sequence),
-            None => Err(PacketError::MissingNextSendSeq {
-                port_id: port_id.clone(),
-                channel_id: channel_id.clone(),
-            }),
-        }
-        .map_err(ContextError::PacketError)
-    }
-
-    fn get_next_sequence_recv(
-        &self,
-        seq_recv_path: &SeqRecvPath,
-    ) -> Result<Sequence, ContextError> {
-        let port_id = &seq_recv_path.0;
-        let channel_id = &seq_recv_path.1;
-
-        match self
-            .ibc_store
-            .lock()
-            .next_sequence_recv
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-        {
-            Some(sequence) => Ok(*sequence),
-            None => Err(PacketError::MissingNextRecvSeq {
-                port_id: port_id.clone(),
-                channel_id: channel_id.clone(),
-            }),
-        }
-        .map_err(ContextError::PacketError)
-    }
-
-    fn get_next_sequence_ack(&self, seq_ack_path: &SeqAckPath) -> Result<Sequence, ContextError> {
-        let port_id = &seq_ack_path.0;
-        let channel_id = &seq_ack_path.1;
-
-        match self
-            .ibc_store
-            .lock()
-            .next_sequence_ack
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-        {
-            Some(sequence) => Ok(*sequence),
-            None => Err(PacketError::MissingNextAckSeq {
-                port_id: port_id.clone(),
-                channel_id: channel_id.clone(),
-            }),
-        }
-        .map_err(ContextError::PacketError)
-    }
-
-    fn get_packet_commitment(
-        &self,
-        commitment_path: &CommitmentPath,
-    ) -> Result<PacketCommitment, ContextError> {
-        let port_id = &commitment_path.port_id;
-        let channel_id = &commitment_path.channel_id;
-        let seq = &commitment_path.sequence;
-
-        match self
-            .ibc_store
-            .lock()
-            .packet_commitment
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-            .and_then(|map| map.get(seq))
-        {
-            Some(commitment) => Ok(commitment.clone()),
-            None => Err(PacketError::PacketCommitmentNotFound { sequence: *seq }),
-        }
-        .map_err(ContextError::PacketError)
-    }
-
-    fn get_packet_receipt(&self, receipt_path: &ReceiptPath) -> Result<Receipt, ContextError> {
-        let port_id = &receipt_path.port_id;
-        let channel_id = &receipt_path.channel_id;
-        let seq = &receipt_path.sequence;
-
-        match self
-            .ibc_store
-            .lock()
-            .packet_receipt
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-            .and_then(|map| map.get(seq))
-        {
-            Some(receipt) => Ok(receipt.clone()),
-            None => Err(PacketError::PacketReceiptNotFound { sequence: *seq }),
-        }
-        .map_err(ContextError::PacketError)
-    }
-
-    fn get_packet_acknowledgement(
-        &self,
-        ack_path: &AckPath,
-    ) -> Result<AcknowledgementCommitment, ContextError> {
-        let port_id = &ack_path.port_id;
-        let channel_id = &ack_path.channel_id;
-        let seq = &ack_path.sequence;
-
-        match self
-            .ibc_store
-            .lock()
-            .packet_acknowledgement
-            .get(port_id)
-            .and_then(|map| map.get(channel_id))
-            .and_then(|map| map.get(seq))
-        {
-            Some(ack) => Ok(ack.clone()),
-            None => Err(PacketError::PacketAcknowledgementNotFound { sequence: *seq }),
-        }
-        .map_err(ContextError::PacketError)
-    }
-
-    fn client_update_time(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Timestamp, ContextError> {
-        match self
-            .ibc_store
-            .lock()
-            .client_processed_times
-            .get(&(client_id.clone(), *height))
-        {
-            Some(time) => Ok(*time),
-            None => Err(ChannelError::ProcessedTimeNotFound {
-                client_id: client_id.clone(),
-                height: *height,
-            }),
-        }
-        .map_err(ContextError::ChannelError)
-    }
-
-    fn client_update_height(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Height, ContextError> {
-        match self
-            .ibc_store
-            .lock()
-            .client_processed_heights
-            .get(&(client_id.clone(), *height))
-        {
-            Some(height) => Ok(*height),
-            None => Err(ChannelError::ProcessedHeightNotFound {
-                client_id: client_id.clone(),
-                height: *height,
-            }),
-        }
-        .map_err(ContextError::ChannelError)
-    }
-
-    fn channel_counter(&self) -> Result<u64, ContextError> {
-        Ok(self.ibc_store.lock().channel_ids_counter)
-    }
-
-    fn max_expected_time_per_block(&self) -> Duration {
-        self.block_time
-    }
-
-    fn validate_message_signer(&self, _signer: &Signer) -> Result<(), ContextError> {
-        Ok(())
-    }
-
-    fn get_client_validation_context(&self) -> &Self::ClientValidationContext {
-        self
-    }
-}
-
-impl ExecutionContext for MockContext {
-    fn get_client_execution_context(&mut self) -> &mut Self::E {
-        self
-    }
-
-    fn increase_client_counter(&mut self) {
-        self.ibc_store.lock().client_ids_counter += 1
-    }
-
-    fn store_update_time(
-        &mut self,
-        client_id: ClientId,
-        height: Height,
-        timestamp: Timestamp,
-    ) -> Result<(), ContextError> {
-        let _ = self
-            .ibc_store
-            .lock()
-            .client_processed_times
-            .insert((client_id, height), timestamp);
-        Ok(())
-    }
-
-    fn store_update_height(
-        &mut self,
-        client_id: ClientId,
-        height: Height,
-        host_height: Height,
-    ) -> Result<(), ContextError> {
-        let _ = self
-            .ibc_store
-            .lock()
-            .client_processed_heights
-            .insert((client_id, height), host_height);
-        Ok(())
-    }
-
-    fn store_connection(
-        &mut self,
-        connection_path: &ConnectionPath,
-        connection_end: ConnectionEnd,
-    ) -> Result<(), ContextError> {
-        let connection_id = connection_path.0.clone();
-        self.ibc_store
-            .lock()
-            .connections
-            .insert(connection_id, connection_end);
-        Ok(())
-    }
-
-    fn store_connection_to_client(
-        &mut self,
-        client_connection_path: &ClientConnectionPath,
-        conn_id: ConnectionId,
-    ) -> Result<(), ContextError> {
-        let client_id = client_connection_path.0.clone();
-        self.ibc_store
-            .lock()
-            .client_connections
-            .insert(client_id, conn_id);
-        Ok(())
-    }
-
-    fn increase_connection_counter(&mut self) {
-        self.ibc_store.lock().connection_ids_counter += 1;
-    }
-
-    fn store_packet_commitment(
-        &mut self,
-        commitment_path: &CommitmentPath,
-        commitment: PacketCommitment,
-    ) -> Result<(), ContextError> {
-        self.ibc_store
-            .lock()
-            .packet_commitment
-            .entry(commitment_path.port_id.clone())
-            .or_default()
-            .entry(commitment_path.channel_id.clone())
-            .or_default()
-            .insert(commitment_path.sequence, commitment);
-        Ok(())
-    }
-
-    fn delete_packet_commitment(
-        &mut self,
-        commitment_path: &CommitmentPath,
-    ) -> Result<(), ContextError> {
-        self.ibc_store
-            .lock()
-            .packet_commitment
-            .get_mut(&commitment_path.port_id)
-            .and_then(|map| map.get_mut(&commitment_path.channel_id))
-            .and_then(|map| map.remove(&commitment_path.sequence));
-        Ok(())
-    }
-
-    fn store_packet_receipt(
-        &mut self,
-        path: &ReceiptPath,
-        receipt: Receipt,
-    ) -> Result<(), ContextError> {
-        self.ibc_store
-            .lock()
-            .packet_receipt
-            .entry(path.port_id.clone())
-            .or_default()
-            .entry(path.channel_id.clone())
-            .or_default()
-            .insert(path.sequence, receipt);
-        Ok(())
-    }
-
-    fn store_packet_acknowledgement(
-        &mut self,
-        ack_path: &AckPath,
-        ack_commitment: AcknowledgementCommitment,
-    ) -> Result<(), ContextError> {
-        let port_id = ack_path.port_id.clone();
-        let channel_id = ack_path.channel_id.clone();
-        let seq = ack_path.sequence;
-
-        self.ibc_store
-            .lock()
-            .packet_acknowledgement
-            .entry(port_id)
-            .or_default()
-            .entry(channel_id)
-            .or_default()
-            .insert(seq, ack_commitment);
-        Ok(())
-    }
-
-    fn delete_packet_acknowledgement(&mut self, ack_path: &AckPath) -> Result<(), ContextError> {
-        let port_id = ack_path.port_id.clone();
-        let channel_id = ack_path.channel_id.clone();
-        let sequence = ack_path.sequence;
-
-        self.ibc_store
-            .lock()
-            .packet_acknowledgement
-            .get_mut(&port_id)
-            .and_then(|map| map.get_mut(&channel_id))
-            .and_then(|map| map.remove(&sequence));
-        Ok(())
-    }
-
-    fn store_channel(
-        &mut self,
-        channel_end_path: &ChannelEndPath,
-        channel_end: ChannelEnd,
-    ) -> Result<(), ContextError> {
-        let port_id = channel_end_path.0.clone();
-        let channel_id = channel_end_path.1.clone();
-
-        self.ibc_store
-            .lock()
-            .channels
-            .entry(port_id)
-            .or_default()
-            .insert(channel_id, channel_end);
-        Ok(())
-    }
-
-    fn store_next_sequence_send(
-        &mut self,
-        seq_send_path: &SeqSendPath,
-        seq: Sequence,
-    ) -> Result<(), ContextError> {
-        let port_id = seq_send_path.0.clone();
-        let channel_id = seq_send_path.1.clone();
-
-        self.ibc_store
-            .lock()
-            .next_sequence_send
-            .entry(port_id)
-            .or_default()
-            .insert(channel_id, seq);
-        Ok(())
-    }
-
-    fn store_next_sequence_recv(
-        &mut self,
-        seq_recv_path: &SeqRecvPath,
-        seq: Sequence,
-    ) -> Result<(), ContextError> {
-        let port_id = seq_recv_path.0.clone();
-        let channel_id = seq_recv_path.1.clone();
-
-        self.ibc_store
-            .lock()
-            .next_sequence_recv
-            .entry(port_id)
-            .or_default()
-            .insert(channel_id, seq);
-        Ok(())
-    }
-
-    fn store_next_sequence_ack(
-        &mut self,
-        seq_ack_path: &SeqAckPath,
-        seq: Sequence,
-    ) -> Result<(), ContextError> {
-        let port_id = seq_ack_path.0.clone();
-        let channel_id = seq_ack_path.1.clone();
-
-        self.ibc_store
-            .lock()
-            .next_sequence_ack
-            .entry(port_id)
-            .or_default()
-            .insert(channel_id, seq);
-        Ok(())
-    }
-
-    fn increase_channel_counter(&mut self) {
-        self.ibc_store.lock().channel_ids_counter += 1;
-    }
-
-    fn emit_ibc_event(&mut self, event: IbcEvent) {
-        self.events.push(event);
-    }
-
-    fn log_message(&mut self, message: String) {
-        self.logs.push(message);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use test_log::test;
-
-    use crate::core::ics04_channel::acknowledgement::Acknowledgement;
-    use crate::core::ics04_channel::channel::{Counterparty, Order};
-    use crate::core::ics04_channel::error::ChannelError;
-    use crate::core::ics04_channel::packet::Packet;
-    use crate::core::ics04_channel::Version;
-    use crate::core::ics24_host::identifier::ChainId;
-    use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-    use crate::core::router::{Module, ModuleExtras, ModuleId};
-    use crate::mock::context::MockContext;
-    use crate::mock::host::HostType;
-    use crate::signer::Signer;
-    use crate::test_utils::get_dummy_bech32_account;
-    use crate::Height;
-
-    #[test]
-    fn test_history_manipulation() {
-        pub struct Test {
-            name: String,
-            ctx: MockContext,
-        }
-        let cv = 1; // The version to use for all chains.
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Empty history, small pruning window".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::Mock,
-                    2,
-                    Height::new(cv, 1).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "[Synthetic TM host] Empty history, small pruning window".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mocksgaia", cv),
-                    HostType::SyntheticTendermint,
-                    2,
-                    Height::new(cv, 1).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "Large pruning window".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::Mock,
-                    30,
-                    Height::new(cv, 2).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "[Synthetic TM host] Large pruning window".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mocksgaia", cv),
-                    HostType::SyntheticTendermint,
-                    30,
-                    Height::new(cv, 2).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "Small pruning window".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::Mock,
-                    3,
-                    Height::new(cv, 30).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "[Synthetic TM host] Small pruning window".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::SyntheticTendermint,
-                    3,
-                    Height::new(cv, 30).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "Small pruning window, small starting height".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::Mock,
-                    3,
-                    Height::new(cv, 2).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "[Synthetic TM host] Small pruning window, small starting height".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::SyntheticTendermint,
-                    3,
-                    Height::new(cv, 2).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "Large pruning window, large starting height".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::Mock,
-                    50,
-                    Height::new(cv, 2000).expect("Never fails"),
-                ),
-            },
-            Test {
-                name: "[Synthetic TM host] Large pruning window, large starting height".to_string(),
-                ctx: MockContext::new(
-                    ChainId::new("mockgaia", cv),
-                    HostType::SyntheticTendermint,
-                    50,
-                    Height::new(cv, 2000).expect("Never fails"),
-                ),
-            },
-        ];
-
-        for mut test in tests {
-            // All tests should yield a valid context after initialization.
-            assert!(
-                test.ctx.validate().is_ok(),
-                "failed in test {} while validating context {:?}",
-                test.name,
-                test.ctx
-            );
-
-            let current_height = test.ctx.latest_height();
-
-            // After advancing the chain's height, the context should still be valid.
-            test.ctx.advance_host_chain_height();
-            assert!(
-                test.ctx.validate().is_ok(),
-                "failed in test {} while validating context {:?}",
-                test.name,
-                test.ctx
-            );
-
-            let next_height = current_height.increment();
-            assert_eq!(
-                test.ctx.latest_height(),
-                next_height,
-                "failed while increasing height for context {:?}",
-                test.ctx
-            );
-
-            assert_eq!(
-                test.ctx
-                    .host_block(&current_height)
-                    .expect("Never fails")
-                    .height(),
-                current_height,
-                "failed while fetching height {:?} of context {:?}",
-                current_height,
-                test.ctx
-            );
-        }
-    }
-
-    #[test]
-    fn test_router() {
-        #[derive(Debug, Default)]
-        struct FooModule {
-            counter: usize,
-        }
-
-        impl Module for FooModule {
-            fn on_chan_open_init_validate(
-                &self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                version: &Version,
-            ) -> Result<Version, ChannelError> {
-                Ok(version.clone())
-            }
-
-            fn on_chan_open_init_execute(
-                &mut self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                version: &Version,
-            ) -> Result<(ModuleExtras, Version), ChannelError> {
-                Ok((ModuleExtras::empty(), version.clone()))
-            }
-
-            fn on_chan_open_try_validate(
-                &self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                counterparty_version: &Version,
-            ) -> Result<Version, ChannelError> {
-                Ok(counterparty_version.clone())
-            }
-
-            fn on_chan_open_try_execute(
-                &mut self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                counterparty_version: &Version,
-            ) -> Result<(ModuleExtras, Version), ChannelError> {
-                Ok((ModuleExtras::empty(), counterparty_version.clone()))
-            }
-
-            fn on_recv_packet_execute(
-                &mut self,
-                _packet: &Packet,
-                _relayer: &Signer,
-            ) -> (ModuleExtras, Acknowledgement) {
-                self.counter += 1;
-
-                (
-                    ModuleExtras::empty(),
-                    Acknowledgement::try_from(vec![1u8]).expect("Never fails"),
-                )
-            }
-
-            fn on_timeout_packet_validate(
-                &self,
-                _packet: &Packet,
-                _relayer: &Signer,
-            ) -> Result<(), PacketError> {
-                Ok(())
-            }
-
-            fn on_timeout_packet_execute(
-                &mut self,
-                _packet: &Packet,
-                _relayer: &Signer,
-            ) -> (ModuleExtras, Result<(), PacketError>) {
-                (ModuleExtras::empty(), Ok(()))
-            }
-
-            fn on_acknowledgement_packet_validate(
-                &self,
-                _packet: &Packet,
-                _acknowledgement: &Acknowledgement,
-                _relayer: &Signer,
-            ) -> Result<(), PacketError> {
-                Ok(())
-            }
-
-            fn on_acknowledgement_packet_execute(
-                &mut self,
-                _packet: &Packet,
-                _acknowledgement: &Acknowledgement,
-                _relayer: &Signer,
-            ) -> (ModuleExtras, Result<(), PacketError>) {
-                (ModuleExtras::empty(), Ok(()))
-            }
-        }
-
-        #[derive(Debug, Default)]
-        struct BarModule;
-
-        impl Module for BarModule {
-            fn on_chan_open_init_validate(
-                &self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                version: &Version,
-            ) -> Result<Version, ChannelError> {
-                Ok(version.clone())
-            }
-
-            fn on_chan_open_init_execute(
-                &mut self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                version: &Version,
-            ) -> Result<(ModuleExtras, Version), ChannelError> {
-                Ok((ModuleExtras::empty(), version.clone()))
-            }
-
-            fn on_chan_open_try_validate(
-                &self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                counterparty_version: &Version,
-            ) -> Result<Version, ChannelError> {
-                Ok(counterparty_version.clone())
-            }
-
-            fn on_chan_open_try_execute(
-                &mut self,
-                _order: Order,
-                _connection_hops: &[ConnectionId],
-                _port_id: &PortId,
-                _channel_id: &ChannelId,
-                _counterparty: &Counterparty,
-                counterparty_version: &Version,
-            ) -> Result<(ModuleExtras, Version), ChannelError> {
-                Ok((ModuleExtras::empty(), counterparty_version.clone()))
-            }
-
-            fn on_recv_packet_execute(
-                &mut self,
-                _packet: &Packet,
-                _relayer: &Signer,
-            ) -> (ModuleExtras, Acknowledgement) {
-                (
-                    ModuleExtras::empty(),
-                    Acknowledgement::try_from(vec![1u8]).expect("Never fails"),
-                )
-            }
-
-            fn on_timeout_packet_validate(
-                &self,
-                _packet: &Packet,
-                _relayer: &Signer,
-            ) -> Result<(), PacketError> {
-                Ok(())
-            }
-
-            fn on_timeout_packet_execute(
-                &mut self,
-                _packet: &Packet,
-                _relayer: &Signer,
-            ) -> (ModuleExtras, Result<(), PacketError>) {
-                (ModuleExtras::empty(), Ok(()))
-            }
-
-            fn on_acknowledgement_packet_validate(
-                &self,
-                _packet: &Packet,
-                _acknowledgement: &Acknowledgement,
-                _relayer: &Signer,
-            ) -> Result<(), PacketError> {
-                Ok(())
-            }
-
-            fn on_acknowledgement_packet_execute(
-                &mut self,
-                _packet: &Packet,
-                _acknowledgement: &Acknowledgement,
-                _relayer: &Signer,
-            ) -> (ModuleExtras, Result<(), PacketError>) {
-                (ModuleExtras::empty(), Ok(()))
-            }
-        }
-
-        let mut ctx = MockContext::new(
-            ChainId::new("mockgaia", 1),
-            HostType::Mock,
-            1,
-            Height::new(1, 1).expect("Never fails"),
-        );
-        ctx.add_route(ModuleId::new("foomodule".to_string()), FooModule::default())
-            .expect("Never fails");
-        ctx.add_route(ModuleId::new("barmodule".to_string()), BarModule)
-            .expect("Never fails");
-
-        let mut on_recv_packet_result = |module_id: &'static str| {
-            let module_id = ModuleId::new(module_id.to_string());
-            let m = ctx.get_route_mut(&module_id).expect("Never fails");
-            let result =
-                m.on_recv_packet_execute(&Packet::default(), &get_dummy_bech32_account().into());
-            (module_id, result)
-        };
-
-        let _results = vec![
-            on_recv_packet_result("foomodule"),
-            on_recv_packet_result("barmodule"),
-        ];
-    }
-}
diff --git a/crates/ibc/src/mock/context/clients.rs b/crates/ibc/src/mock/context/clients.rs
deleted file mode 100644
index f9b13fd25..000000000
--- a/crates/ibc/src/mock/context/clients.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-//! Client context implementations for `MockContext`
-
-use crate::prelude::*;
-
-use super::{AnyClientState, AnyConsensusState, MockClientRecord, MockContext};
-use crate::clients::ics07_tendermint::CommonContext as TmCommonContext;
-use crate::clients::ics07_tendermint::ValidationContext as TmValidationContext;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics02_client::ClientExecutionContext;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::path::ClientConsensusStatePath;
-use crate::core::ics24_host::path::ClientStatePath;
-use crate::core::timestamp::Timestamp;
-use crate::core::ContextError;
-use crate::core::ValidationContext;
-use crate::Height;
-
-impl TmCommonContext for MockContext {
-    type ConversionError = &'static str;
-    type AnyConsensusState = AnyConsensusState;
-
-    fn consensus_state(
-        &self,
-        client_cons_state_path: &ClientConsensusStatePath,
-    ) -> Result<Self::AnyConsensusState, ContextError> {
-        ValidationContext::consensus_state(self, client_cons_state_path)
-    }
-}
-
-impl TmValidationContext for MockContext {
-    fn host_timestamp(&self) -> Result<Timestamp, ContextError> {
-        ValidationContext::host_timestamp(self)
-    }
-
-    fn next_consensus_state(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Option<Self::AnyConsensusState>, ContextError> {
-        let ibc_store = self.ibc_store.lock();
-        let client_record =
-            ibc_store
-                .clients
-                .get(client_id)
-                .ok_or_else(|| ClientError::ClientStateNotFound {
-                    client_id: client_id.clone(),
-                })?;
-
-        // Get the consensus state heights and sort them in ascending order.
-        let mut heights: Vec<Height> = client_record.consensus_states.keys().cloned().collect();
-        heights.sort();
-
-        // Search for next state.
-        for h in heights {
-            if h > *height {
-                // unwrap should never happen, as the consensus state for h must exist
-                return Ok(Some(
-                    client_record
-                        .consensus_states
-                        .get(&h)
-                        .expect("Never fails")
-                        .clone(),
-                ));
-            }
-        }
-        Ok(None)
-    }
-
-    fn prev_consensus_state(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Option<Self::AnyConsensusState>, ContextError> {
-        let ibc_store = self.ibc_store.lock();
-        let client_record =
-            ibc_store
-                .clients
-                .get(client_id)
-                .ok_or_else(|| ClientError::ClientStateNotFound {
-                    client_id: client_id.clone(),
-                })?;
-
-        // Get the consensus state heights and sort them in descending order.
-        let mut heights: Vec<Height> = client_record.consensus_states.keys().cloned().collect();
-        heights.sort_by(|a, b| b.cmp(a));
-
-        // Search for previous state.
-        for h in heights {
-            if h < *height {
-                // unwrap should never happen, as the consensus state for h must exist
-                return Ok(Some(
-                    client_record
-                        .consensus_states
-                        .get(&h)
-                        .expect("Never fails")
-                        .clone(),
-                ));
-            }
-        }
-        Ok(None)
-    }
-}
-
-impl ClientExecutionContext for MockContext {
-    type ClientValidationContext = Self;
-    type AnyClientState = AnyClientState;
-    type AnyConsensusState = AnyConsensusState;
-
-    fn store_client_state(
-        &mut self,
-        client_state_path: ClientStatePath,
-        client_state: Self::AnyClientState,
-    ) -> Result<(), ContextError> {
-        let mut ibc_store = self.ibc_store.lock();
-
-        let client_id = client_state_path.0;
-        let client_record = ibc_store
-            .clients
-            .entry(client_id)
-            .or_insert(MockClientRecord {
-                consensus_states: Default::default(),
-                client_state: Default::default(),
-            });
-
-        client_record.client_state = Some(client_state);
-
-        Ok(())
-    }
-
-    fn store_consensus_state(
-        &mut self,
-        consensus_state_path: ClientConsensusStatePath,
-        consensus_state: Self::AnyConsensusState,
-    ) -> Result<(), ContextError> {
-        let mut ibc_store = self.ibc_store.lock();
-
-        let client_record = ibc_store
-            .clients
-            .entry(consensus_state_path.client_id)
-            .or_insert(MockClientRecord {
-                consensus_states: Default::default(),
-                client_state: Default::default(),
-            });
-
-        let height = Height::new(consensus_state_path.epoch, consensus_state_path.height)
-            .expect("Never fails");
-        client_record
-            .consensus_states
-            .insert(height, consensus_state);
-
-        Ok(())
-    }
-}
diff --git a/crates/ibc/src/mock/host.rs b/crates/ibc/src/mock/host.rs
deleted file mode 100644
index 1c52e2700..000000000
--- a/crates/ibc/src/mock/host.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-//! Host chain types and methods, used by context mock.
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader;
-use ibc_proto::protobuf::Protobuf as ErasedProtobuf;
-
-use tendermint::block::Header as TmHeader;
-use tendermint_testgen::light_block::TmLightBlock;
-use tendermint_testgen::{Generator, LightBlock as TestgenLightBlock};
-
-use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-use crate::clients::ics07_tendermint::header::TENDERMINT_HEADER_TYPE_URL;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ChainId;
-use crate::core::timestamp::Timestamp;
-use crate::mock::consensus_state::MockConsensusState;
-use crate::mock::header::MockHeader;
-use crate::prelude::*;
-use crate::Height;
-
-use super::context::AnyConsensusState;
-
-/// Defines the different types of host chains that a mock context can emulate.
-/// The variants are as follows:
-/// - `Mock` defines that the context history consists of `MockHeader` blocks.
-/// - `SyntheticTendermint`: the context has synthetically-generated Tendermint (light) blocks.
-/// See also the `HostBlock` enum to get more insights into the underlying block type.
-#[derive(Clone, Debug, Copy)]
-pub enum HostType {
-    Mock,
-    SyntheticTendermint,
-}
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize))]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct SyntheticTmBlock {
-    pub trusted_height: Height,
-    pub light_block: TmLightBlock,
-}
-
-impl SyntheticTmBlock {
-    pub fn header(&self) -> &TmHeader {
-        &self.light_block.signed_header.header
-    }
-}
-
-/// Depending on `HostType` (the type of host chain underlying a context mock), this enum defines
-/// the type of blocks composing the history of the host chain.
-#[cfg_attr(feature = "serde", derive(serde::Serialize))]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum HostBlock {
-    Mock(Box<MockHeader>),
-    SyntheticTendermint(Box<SyntheticTmBlock>),
-}
-
-impl HostBlock {
-    /// Returns the height of a block.
-    pub fn height(&self) -> Height {
-        match self {
-            HostBlock::Mock(header) => header.height(),
-            HostBlock::SyntheticTendermint(light_block) => Height::new(
-                ChainId::chain_version(light_block.header().chain_id.as_str()),
-                light_block.header().height.value(),
-            )
-            .expect("Never fails"),
-        }
-    }
-
-    pub fn set_trusted_height(&mut self, height: Height) {
-        match self {
-            HostBlock::Mock(_) => {}
-            HostBlock::SyntheticTendermint(light_block) => light_block.trusted_height = height,
-        }
-    }
-
-    /// Returns the timestamp of a block.
-    pub fn timestamp(&self) -> Timestamp {
-        match self {
-            HostBlock::Mock(header) => header.timestamp,
-            HostBlock::SyntheticTendermint(light_block) => light_block.header().time.into(),
-        }
-    }
-
-    /// Generates a new block at `height` for the given chain identifier and chain type.
-    pub fn generate_block(
-        chain_id: ChainId,
-        chain_type: HostType,
-        height: u64,
-        timestamp: Timestamp,
-    ) -> HostBlock {
-        match chain_type {
-            HostType::Mock => HostBlock::Mock(Box::new(MockHeader {
-                height: Height::new(chain_id.version(), height).expect("Never fails"),
-                timestamp,
-            })),
-            HostType::SyntheticTendermint => HostBlock::SyntheticTendermint(Box::new(
-                Self::generate_tm_block(chain_id, height, timestamp),
-            )),
-        }
-    }
-
-    pub fn generate_tm_block(
-        chain_id: ChainId,
-        height: u64,
-        timestamp: Timestamp,
-    ) -> SyntheticTmBlock {
-        let light_block = TestgenLightBlock::new_default_with_time_and_chain_id(
-            chain_id.to_string(),
-            timestamp.into_tm_time().expect("Never fails"),
-            height,
-        )
-        .generate()
-        .expect("Never fails");
-        SyntheticTmBlock {
-            trusted_height: Height::new(chain_id.version(), 1).expect("Never fails"),
-            light_block,
-        }
-    }
-
-    pub fn try_into_tm_block(self) -> Option<SyntheticTmBlock> {
-        match self {
-            HostBlock::Mock(_) => None,
-            HostBlock::SyntheticTendermint(tm_block) => Some(*tm_block),
-        }
-    }
-}
-
-impl From<SyntheticTmBlock> for AnyConsensusState {
-    fn from(light_block: SyntheticTmBlock) -> Self {
-        let cs = TmConsensusState::from(light_block.header().clone());
-        cs.into()
-    }
-}
-
-impl From<HostBlock> for AnyConsensusState {
-    fn from(any_block: HostBlock) -> Self {
-        match any_block {
-            HostBlock::Mock(mock_header) => MockConsensusState::new(*mock_header).into(),
-            HostBlock::SyntheticTendermint(light_block) => {
-                TmConsensusState::from(light_block.header().clone()).into()
-            }
-        }
-    }
-}
-
-impl ErasedProtobuf<Any> for HostBlock {}
-
-impl TryFrom<Any> for HostBlock {
-    type Error = ClientError;
-
-    fn try_from(_raw: Any) -> Result<Self, Self::Error> {
-        todo!()
-    }
-}
-
-impl From<HostBlock> for Any {
-    fn from(value: HostBlock) -> Self {
-        fn encode_light_block(light_block: SyntheticTmBlock) -> Vec<u8> {
-            use prost::Message;
-
-            let SyntheticTmBlock {
-                trusted_height,
-                light_block,
-            } = light_block;
-
-            RawHeader {
-                signed_header: Some(light_block.signed_header.into()),
-                validator_set: Some(light_block.validators.into()),
-                trusted_height: Some(trusted_height.into()),
-                trusted_validators: Some(light_block.next_validators.into()),
-            }
-            .encode_to_vec()
-        }
-
-        match value {
-            HostBlock::Mock(mock_header) => (*mock_header).into(),
-            HostBlock::SyntheticTendermint(light_block) => Self {
-                type_url: TENDERMINT_HEADER_TYPE_URL.to_string(),
-                value: encode_light_block(*light_block),
-            },
-        }
-    }
-}
diff --git a/crates/ibc/src/mock/ics18_relayer/context.rs b/crates/ibc/src/mock/ics18_relayer/context.rs
deleted file mode 100644
index d9ec46f1e..000000000
--- a/crates/ibc/src/mock/ics18_relayer/context.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-use crate::prelude::*;
-
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ContextError;
-use crate::mock::context::AnyClientState;
-use crate::signer::Signer;
-use crate::Height;
-
-/// Trait capturing all dependencies (i.e., the context) which algorithms in ICS18 require to
-/// relay packets between chains. This trait comprises the dependencies towards a single chain.
-/// Most of the functions in this represent wrappers over the ABCI interface.
-/// This trait mimics the `Chain` trait, but at a lower level of abstraction (no networking, header
-/// types, light client, RPC client, etc.)
-pub trait RelayerContext {
-    /// Returns the latest height of the chain.
-    fn query_latest_height(&self) -> Result<Height, ContextError>;
-
-    /// Returns this client state for the given `client_id` on this chain.
-    /// Wrapper over the `/abci_query?path=..` endpoint.
-    fn query_client_full_state(&self, client_id: &ClientId) -> Option<AnyClientState>;
-
-    /// Temporary solution. Similar to `CosmosSDKChain::key_and_signer()` but simpler.
-    fn signer(&self) -> Signer;
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::clients::ics07_tendermint::client_type as tm_client_type;
-    use crate::core::ics02_client::client_state::ClientStateCommon;
-    use crate::core::ics02_client::msgs::update_client::MsgUpdateClient;
-    use crate::core::ics02_client::msgs::ClientMsg;
-    use crate::core::ics24_host::identifier::{ChainId, ClientId};
-    use crate::core::MsgEnvelope;
-    use crate::mock::client_state::client_type as mock_client_type;
-    use crate::mock::context::MockContext;
-    use crate::mock::host::{HostBlock, HostType};
-    use crate::mock::ics18_relayer::context::RelayerContext;
-    use crate::mock::ics18_relayer::error::RelayerError;
-    use crate::prelude::*;
-    use crate::Height;
-
-    use test_log::test;
-    use tracing::debug;
-
-    /// Builds a `ClientMsg::UpdateClient` for a client with id `client_id` running on the `dest`
-    /// context, assuming that the latest header on the source context is `src_header`.
-    pub(crate) fn build_client_update_datagram<Ctx>(
-        dest: &Ctx,
-        client_id: &ClientId,
-        src_header: &HostBlock,
-    ) -> Result<ClientMsg, RelayerError>
-    where
-        Ctx: RelayerContext,
-    {
-        // Check if client for ibc0 on ibc1 has been updated to latest height:
-        // - query client state on destination chain
-        let dest_client_state = dest.query_client_full_state(client_id).ok_or_else(|| {
-            RelayerError::ClientStateNotFound {
-                client_id: client_id.clone(),
-            }
-        })?;
-
-        let dest_client_latest_height = dest_client_state.latest_height();
-
-        if src_header.height() == dest_client_latest_height {
-            return Err(RelayerError::ClientAlreadyUpToDate {
-                client_id: client_id.clone(),
-                source_height: src_header.height(),
-                destination_height: dest_client_latest_height,
-            });
-        };
-
-        if dest_client_latest_height > src_header.height() {
-            return Err(RelayerError::ClientAtHigherHeight {
-                client_id: client_id.clone(),
-                source_height: src_header.height(),
-                destination_height: dest_client_latest_height,
-            });
-        };
-
-        // Client on destination chain can be updated.
-        Ok(ClientMsg::UpdateClient(MsgUpdateClient {
-            client_id: client_id.clone(),
-            header: (*src_header).clone().into(),
-            signer: dest.signer(),
-        }))
-    }
-
-    #[test]
-    /// Serves to test both ICS 26 `dispatch` & `build_client_update_datagram` functions.
-    /// Implements a "ping pong" of client update messages, so that two chains repeatedly
-    /// process a client update message and update their height in succession.
-    fn client_update_ping_pong() {
-        let chain_a_start_height = Height::new(1, 11).unwrap();
-        let chain_b_start_height = Height::new(1, 20).unwrap();
-        let client_on_b_for_a_height = Height::new(1, 10).unwrap(); // Should be smaller than `chain_a_start_height`
-        let client_on_a_for_b_height = Height::new(1, 20).unwrap(); // Should be smaller than `chain_b_start_height`
-        let num_iterations = 4;
-
-        let client_on_a_for_b = ClientId::new(tm_client_type(), 0).unwrap();
-        let client_on_b_for_a = ClientId::new(mock_client_type(), 0).unwrap();
-
-        let chain_id_a = ChainId::new("mockgaiaA", 1);
-        let chain_id_b = ChainId::new("mockgaiaB", 1);
-
-        // Create two mock contexts, one for each chain.
-        let mut ctx_a =
-            MockContext::new(chain_id_a.clone(), HostType::Mock, 5, chain_a_start_height)
-                .with_client_parametrized_with_chain_id(
-                    chain_id_b.clone(),
-                    &client_on_a_for_b,
-                    client_on_a_for_b_height,
-                    Some(tm_client_type()), // The target host chain (B) is synthetic TM.
-                    Some(client_on_a_for_b_height),
-                );
-        let mut ctx_b = MockContext::new(
-            chain_id_b,
-            HostType::SyntheticTendermint,
-            5,
-            chain_b_start_height,
-        )
-        .with_client_parametrized_with_chain_id(
-            chain_id_a,
-            &client_on_b_for_a,
-            client_on_b_for_a_height,
-            Some(mock_client_type()), // The target host chain is mock.
-            Some(client_on_b_for_a_height),
-        );
-
-        for _i in 0..num_iterations {
-            // Update client on chain B to latest height of A.
-            // - create the client update message with the latest header from A
-            let a_latest_header = ctx_a.query_latest_header().unwrap();
-            let client_msg_b_res =
-                build_client_update_datagram(&ctx_b, &client_on_b_for_a, &a_latest_header);
-
-            assert!(
-                client_msg_b_res.is_ok(),
-                "create_client_update failed for context destination {ctx_b:?}, error: {client_msg_b_res:?}",
-            );
-
-            let client_msg_b = client_msg_b_res.unwrap();
-
-            // - send the message to B. We bypass ICS18 interface and call directly into
-            // MockContext `recv` method (to avoid additional serialization steps).
-            let dispatch_res_b = ctx_b.deliver(MsgEnvelope::Client(client_msg_b));
-            let validation_res = ctx_b.validate();
-            assert!(
-                validation_res.is_ok(),
-                "context validation failed with error {validation_res:?} for context {ctx_b:?}",
-            );
-
-            // Check if the update succeeded.
-            assert!(
-                dispatch_res_b.is_ok(),
-                "Dispatch failed for host chain b with error: {dispatch_res_b:?}"
-            );
-            let client_height_b = ctx_b
-                .query_client_full_state(&client_on_b_for_a)
-                .unwrap()
-                .latest_height();
-            assert_eq!(client_height_b, ctx_a.query_latest_height().unwrap());
-
-            // Update client on chain A to latest height of B.
-            // - create the client update message with the latest header from B
-            // The test uses LightClientBlock that does not store the trusted height
-            let mut b_latest_header = ctx_b.query_latest_header().unwrap();
-
-            let th = b_latest_header.height();
-            b_latest_header.set_trusted_height(th.decrement().unwrap());
-
-            let client_msg_a_res =
-                build_client_update_datagram(&ctx_a, &client_on_a_for_b, &b_latest_header);
-
-            assert!(
-                client_msg_a_res.is_ok(),
-                "create_client_update failed for context destination {ctx_a:?}, error: {client_msg_a_res:?}",
-            );
-
-            let client_msg_a = client_msg_a_res.unwrap();
-
-            debug!("client_msg_a = {:?}", client_msg_a);
-
-            // - send the message to A
-            let dispatch_res_a = ctx_a.deliver(MsgEnvelope::Client(client_msg_a));
-            let validation_res = ctx_a.validate();
-            assert!(
-                validation_res.is_ok(),
-                "context validation failed with error {validation_res:?} for context {ctx_a:?}",
-            );
-
-            // Check if the update succeeded.
-            assert!(
-                dispatch_res_a.is_ok(),
-                "Dispatch failed for host chain a with error: {dispatch_res_a:?}"
-            );
-            let client_height_a = ctx_a
-                .query_client_full_state(&client_on_a_for_b)
-                .unwrap()
-                .latest_height();
-            assert_eq!(client_height_a, ctx_b.query_latest_height().unwrap());
-        }
-    }
-}
diff --git a/crates/ibc/src/mock/ics18_relayer/mod.rs b/crates/ibc/src/mock/ics18_relayer/mod.rs
deleted file mode 100644
index 8a7f14e5b..000000000
--- a/crates/ibc/src/mock/ics18_relayer/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-//! ICS 18: Relayer contains utilities for testing `ibc` against the Hermes relayer.
-
-pub mod context;
-pub mod error;
diff --git a/crates/ibc/src/mock/mod.rs b/crates/ibc/src/mock/mod.rs
deleted file mode 100644
index 8547ce3fe..000000000
--- a/crates/ibc/src/mock/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//! Implementation of mocks for context, host chain, and client.
-
-#[cfg(any(test, feature = "mocks", feature = "mocks-no-std"))]
-pub mod client_state;
-#[cfg(any(test, feature = "mocks", feature = "mocks-no-std"))]
-pub mod consensus_state;
-#[cfg(any(test, feature = "mocks"))]
-pub mod context;
-#[cfg(any(test, feature = "mocks", feature = "mocks-no-std"))]
-pub mod header;
-#[cfg(any(test, feature = "mocks"))]
-pub mod host;
-#[cfg(any(test, feature = "mocks"))]
-pub mod ics18_relayer;
-#[cfg(any(test, feature = "mocks", feature = "mocks-no-std"))]
-pub mod misbehaviour;
diff --git a/crates/ibc/src/proofs.rs b/crates/ibc/src/proofs.rs
deleted file mode 100644
index 918cc14a7..000000000
--- a/crates/ibc/src/proofs.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::Height;
-use displaydoc::Display;
-
-#[derive(Debug, Display)]
-pub enum ProofError {
-    /// proof height cannot be zero
-    ZeroHeight,
-    /// proof cannot be empty
-    EmptyProof,
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for ProofError {}
-
-/// Structure comprising proofs in a message. Proofs are typically present in messages for
-/// handshake protocols, e.g., ICS3 connection (open) handshake or ICS4 channel (open and close)
-/// handshake, as well as for ICS4 packets, timeouts, and acknowledgements.
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Proofs {
-    object_proof: CommitmentProofBytes,
-    client_proof: Option<CommitmentProofBytes>,
-    consensus_proof: Option<ConsensusProof>,
-    /// Currently used for proof_close for MsgTimeoutOnCLose where object_proof is proof_unreceived
-    other_proof: Option<CommitmentProofBytes>,
-    /// Height for the commitment root for proving the proofs above.
-    /// When creating these proofs, the chain is queried at `height-1`.
-    height: Height,
-}
-
-impl Proofs {
-    pub fn new(
-        object_proof: CommitmentProofBytes,
-        client_proof: Option<CommitmentProofBytes>,
-        consensus_proof: Option<ConsensusProof>,
-        other_proof: Option<CommitmentProofBytes>,
-        height: Height,
-    ) -> Result<Self, ProofError> {
-        Ok(Self {
-            object_proof,
-            client_proof,
-            consensus_proof,
-            other_proof,
-            height,
-        })
-    }
-
-    /// Getter for the consensus_proof field of this proof. Intuitively, this is a proof that a
-    /// client on the source chain stores a consensus state for the destination chain.
-    pub fn consensus_proof(&self) -> Option<ConsensusProof> {
-        self.consensus_proof.clone()
-    }
-
-    /// Getter for the height field of this proof (i.e., the consensus height where this proof was
-    /// created).
-    pub fn height(&self) -> Height {
-        self.height
-    }
-
-    /// Getter for the object-specific proof (e.g., proof for connection state or channel state).
-    pub fn object_proof(&self) -> &CommitmentProofBytes {
-        &self.object_proof
-    }
-
-    /// Getter for the client_proof.
-    pub fn client_proof(&self) -> &Option<CommitmentProofBytes> {
-        &self.client_proof
-    }
-
-    /// Getter for the other_proof.
-    pub fn other_proof(&self) -> &Option<CommitmentProofBytes> {
-        &self.other_proof
-    }
-}
-
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ConsensusProof {
-    proof: CommitmentProofBytes,
-    height: Height,
-}
-
-impl ConsensusProof {
-    pub fn new(
-        consensus_proof: CommitmentProofBytes,
-        consensus_height: Height,
-    ) -> Result<Self, ProofError> {
-        Ok(Self {
-            proof: consensus_proof,
-            height: consensus_height,
-        })
-    }
-
-    /// Getter for the height field of this consensus proof.
-    pub fn height(&self) -> Height {
-        self.height
-    }
-
-    /// Getter for the proof (CommitmentProof) field of this consensus proof.
-    pub fn proof(&self) -> &CommitmentProofBytes {
-        &self.proof
-    }
-}
diff --git a/crates/ibc/src/serializers.rs b/crates/ibc/src/serializers.rs
deleted file mode 100644
index 42aead55a..000000000
--- a/crates/ibc/src/serializers.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use serde::ser::{Serialize, Serializer};
-use subtle_encoding::{Encoding, Hex};
-
-pub fn ser_hex_upper<S, T>(data: T, serializer: S) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-    T: AsRef<[u8]>,
-{
-    let hex = Hex::upper_case()
-        .encode_to_string(data)
-        .map_err(|e| serde::ser::Error::custom(alloc::format!("failed to serialize hex: {}", e)))?;
-    hex.serialize(serializer)
-}
-
-pub mod serde_string {
-    use core::fmt::Display;
-    use core::str::FromStr;
-
-    use serde::{de, Deserialize, Deserializer, Serializer};
-
-    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        T: Display,
-        S: Serializer,
-    {
-        serializer.collect_str(value)
-    }
-
-    pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
-    where
-        T: FromStr,
-        T::Err: Display,
-        D: Deserializer<'de>,
-    {
-        <&str>::deserialize(deserializer)?
-            .parse()
-            .map_err(de::Error::custom)
-    }
-}
diff --git a/crates/ibc/src/test.rs b/crates/ibc/src/test.rs
deleted file mode 100644
index e8347cdcd..000000000
--- a/crates/ibc/src/test.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-#[cfg(feature = "serde")]
-use serde::{de::DeserializeOwned, Serialize};
-
-/// Test that a struct `T` can be:
-///
-/// - parsed out of the provided JSON data
-/// - serialized back to JSON
-/// - parsed back from the serialized JSON of the previous step
-/// - that the two parsed structs are equal according to their `PartialEq` impl
-#[cfg(feature = "serde")]
-pub fn test_serialization_roundtrip<T>(json_data: &str)
-where
-    T: core::fmt::Debug + PartialEq + Serialize + DeserializeOwned,
-{
-    let parsed0 = serde_json::from_str::<T>(json_data);
-    assert!(parsed0.is_ok());
-    let parsed0 = parsed0.unwrap();
-
-    let serialized = serde_json::to_string(&parsed0);
-    assert!(serialized.is_ok());
-    let serialized = serialized.unwrap();
-
-    let parsed1 = serde_json::from_str::<T>(&serialized);
-    assert!(parsed1.is_ok());
-    let parsed1 = parsed1.unwrap();
-
-    assert_eq!(parsed0, parsed1);
-}
diff --git a/crates/ibc/src/utils/macros.rs b/crates/ibc/src/utils/macros.rs
deleted file mode 100644
index c4ad6655d..000000000
--- a/crates/ibc/src/utils/macros.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-/// Downcast the given arguments to the associated enum variant.
-///
-/// ## Note
-/// Only works for enums whose variants only hold a single value.
-///
-/// ## Example
-///
-/// ```rust
-/// use ibc::downcast;
-///
-/// enum Foo {
-///     Bar(u32),
-///     Baz(bool),
-/// }
-///
-/// let bar = Foo::Bar(42);
-/// let baz = Foo::Baz(true);
-///
-/// if let Some(value) = downcast!(bar => Foo::Bar) {
-///     println!("value is a u32: {}", value);
-/// }
-///
-/// if let Some(value) = downcast!(baz => Foo::Baz) {
-///     println!("value is a bool: {}", value);
-/// }
-///
-/// if let Some((a, b)) = downcast!(bar => Foo::Bar, baz => Foo::Baz) {
-///     println!("a is a u32: {}", a);
-///     println!("b is a bool: {}", b);
-/// }
-/// ```
-#[macro_export]
-macro_rules! downcast {
-    ( $e1:expr => $p1:path, $( $e:expr => $p:path ),+ $(,)? ) => {
-        downcast!($e1 => $p1).zip(downcast!($($e => $p),+))
-    };
-
-    ($e:expr => $p:path) => {
-        match $e {
-            $p(e) => Some(e),
-            #[allow(unreachable_patterns)]
-            _ => None,
-        }
-    };
-
-    () => {
-        None
-    }
-}
diff --git a/crates/ibc/src/utils/mod.rs b/crates/ibc/src/utils/mod.rs
deleted file mode 100644
index 7720ae1ed..000000000
--- a/crates/ibc/src/utils/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-//! Various utilities used internally
-
-pub mod macros;
-pub mod pretty;
diff --git a/docs/architecture/README.md b/docs/architecture/README.md
index 181417010..8e4d40e1e 100644
--- a/docs/architecture/README.md
+++ b/docs/architecture/README.md
@@ -25,12 +25,14 @@ To suggest an ADR, please make use of the [ADR template](./adr-template.md) prov
 
 ## Table of Contents
 
-| ADR \#                                             | Description                                           | Status   |
-|----------------------------------------------------|-------------------------------------------------------|----------|
-| [001](./adr-001-handler-implementation.md)         | IBC handlers implementation                           | Accepted |
-| [002](./adr-002-error.md)                          | Error Management                                      | Accepted |
-| [003](./adr-003-ics20-implementation.md)           | ICS20 implementation                                  | Accepted |
-| [004](./adr-004-light-client-crates-extraction.md) | Light client crates extraction                        | Accepted |
-| [005](./adr-005-handlers-redesign.md)              | Handlers validation and execution separation          | Accepted |
-| [006](./adr-006-upgrade-client-implementation.md)  | Chain and client upgradability                        | Accepted |
-| [007](./adr-007-light-client-contexts.md)          | Light client contexts                                 | Accepted |
+| ADR \#                                                  | Description                                  | Status   |
+| ------------------------------------------------------- | -------------------------------------------- | -------- |
+| [001](./adr-001-handler-implementation.md)              | IBC handlers implementation                  | Accepted |
+| [002](./adr-002-error.md)                               | Error Management                             | Accepted |
+| [003](./adr-003-ics20-implementation.md)                | ICS20 implementation                         | Accepted |
+| [004](./adr-004-light-client-crates-extraction.md)      | Light client crates extraction               | Accepted |
+| [005](./adr-005-handlers-redesign.md)                   | Handlers validation and execution separation | Accepted |
+| [006](./adr-006-upgrade-client-implementation.md)       | Chain and client upgradability               | Accepted |
+| [007](./adr-007-light-client-contexts.md)               | Light client contexts                        | Accepted |
+| [008](./adr-008-restructure-ibc-crate.md)               | Restructure `ibc` crate                      | Accepted |
+| [010](./adr-010-enable-standalone-ics02-integration.md) | Enable standalone `ics-02` integration       | Accepted |
diff --git a/docs/architecture/adr-005-handlers-redesign.md b/docs/architecture/adr-005-handlers-redesign.md
index 6d4be433c..e808f2892 100644
--- a/docs/architecture/adr-005-handlers-redesign.md
+++ b/docs/architecture/adr-005-handlers-redesign.md
@@ -40,14 +40,14 @@ function updateClient(
 
     clientState.VerifyClientMessage(clientMessage)
     // Validation END
-    
+
     // Execution START
     foundMisbehaviour := clientState.CheckForMisbehaviour(clientMessage)
     if foundMisbehaviour {
         clientState.UpdateStateOnMisbehaviour(clientMessage)
     }
-    else {    
-        clientState.UpdateState(clientMessage) 
+    else {
+        clientState.UpdateState(clientMessage)
     }
     // Execution END
 }
@@ -99,13 +99,13 @@ pub trait Host {
     /// An error type that can represent all host errors.
     type Error;
 
-    /// The Host's key-value store that must provide access to IBC paths. 
+    /// The Host's key-value store that must provide access to IBC paths.
     type KvStore: IbcStore<Self::Error>;
 
     /// An event logging facility.
     type EventLogger: EventLogger<Event=Event<DefaultIbcTypes>>;
 
-    /// Methods to access the store (ro & rw). 
+    /// Methods to access the store (ro & rw).
     fn store(&self) -> &Self::KvStore;
     fn store_mut(&mut self) -> &mut Self::KvStore;
 
@@ -296,7 +296,7 @@ trait ValidationContext {
     /// Function required by ICS 03. Returns the list of all possible versions that the connection
     /// handshake protocol supports.
     fn get_compatible_versions(&self) -> Vec<Version> {
-        get_compatible_versions()
+        ConnectionVersion::compatibles()
     }
 
     /// Function required by ICS 03. Returns one version out of the supplied list of versions, which the
@@ -373,11 +373,9 @@ trait ValidationContext {
     /// A hashing function for packet commitments
     fn hash(&self, value: Vec<u8>) -> Vec<u8>;
 
-    /// Returns the time when the client state for the given [`ClientId`] was updated with a header for the given [`Height`]
-    fn client_update_time(&self, client_id: &ClientId, height: Height) -> Result<Timestamp, Error>;
-
-    /// Returns the height when the client state for the given [`ClientId`] was updated with a header for the given [`Height`]
-    fn client_update_height(&self, client_id: &ClientId, height: Height) -> Result<Height, Error>;
+    /// Returns the time and height when the client state for the
+    /// given [`ClientId`] was updated with a header for the given [`Height`]
+    fn update_meta(&self, client_id: &ClientId, height: Height) -> Result<(Timestamp, Height), Error>;
 
     /// Returns a counter on the number of channel ids that have been created thus far.
     /// The value of this counter should increase only via method
@@ -423,26 +421,17 @@ trait ExecutionContext {
 
     /// Called upon client creation.
     /// Increases the counter which keeps track of how many clients have been created.
-    /// Should never fail.
     fn increase_client_counter(&mut self);
 
     /// Called upon successful client update.
-    /// Implementations are expected to use this to record the specified time as the time at which
-    /// this update (or header) was processed.
-    fn store_update_time(
-        &mut self,
-        client_id: ClientId,
-        height: Height,
-        timestamp: Timestamp,
-    ) -> Result<(), Error>;
-
-    /// Called upon successful client update.
-    /// Implementations are expected to use this to record the specified height as the height at
-    /// at which this update (or header) was processed.
-    fn store_update_height(
+    ///
+    /// Implementations are expected to use this to record the specified time
+    /// and height as the time at which this update (or header) was processed.
+    fn store_update_meta(
         &mut self,
         client_id: ClientId,
         height: Height,
+        host_timestamp: Timestamp,
         host_height: Height,
     ) -> Result<(), Error>;
 
@@ -462,7 +451,6 @@ trait ExecutionContext {
 
     /// Called upon connection identifier creation (Init or Try process).
     /// Increases the counter which keeps track of how many connections have been created.
-    /// Should never fail.
     fn increase_connection_counter(&mut self);
 
     fn store_packet_commitment(
@@ -524,7 +512,6 @@ trait ExecutionContext {
 
     /// Called upon channel identifier creation (Init or Try message processing).
     /// Increases the counter which keeps track of how many channels have been created.
-    /// Should never fail.
     fn increase_channel_counter(&mut self);
 
     /// Ibc events
@@ -550,16 +537,11 @@ pub trait Host {
 
     /// Methods currently in `ClientKeeper`
     fn increase_client_counter(&mut self);
-    fn store_update_time(
-        &mut self,
-        client_id: ClientId,
-        height: Height,
-        timestamp: Timestamp,
-    ) -> Result<(), Error>;
-    fn store_update_height(
+    fn store_update_meta(
         &mut self,
         client_id: ClientId,
         height: Height,
+        host_timestamp: Timestamp,
         host_height: Height,
     ) -> Result<(), Error>;
 
@@ -574,8 +556,7 @@ pub trait Host {
     /// Methods currently in `ChannelReader`
     fn connection_channels(&self, cid: &ConnectionId) -> Result<Vec<(PortId, ChannelId)>, Error>;
     fn hash(&self, value: Vec<u8>) -> Vec<u8>;
-    fn client_update_time(&self, client_id: &ClientId, height: Height) -> Result<Timestamp, Error>;
-    fn client_update_height(&self, client_id: &ClientId, height: Height) -> Result<Height, Error>;
+    fn update_meta(&self, client_id: &ClientId, height: Height) -> Result<(Timestamp, Height), Error>;
     fn channel_counter(&self) -> Result<u64, Error>;
     fn max_expected_time_per_block(&self) -> Duration;
     fn block_delay(&self, delay_period_time: Duration) -> u64;
@@ -626,7 +607,7 @@ pub trait StoreSerde {
     /// Serialize to canonical binary representation
     fn serialize(self) -> Vec<u8>;
 
-    /// Deserialize from bytes 
+    /// Deserialize from bytes
     fn deserialize(value: &[u8]) -> Self;
 }
 
diff --git a/docs/architecture/adr-006-upgrade-client-implementation.md b/docs/architecture/adr-006-upgrade-client-implementation.md
index f389a6336..d1aa8fc86 100644
--- a/docs/architecture/adr-006-upgrade-client-implementation.md
+++ b/docs/architecture/adr-006-upgrade-client-implementation.md
@@ -20,7 +20,7 @@ justify the chain-wide logic behind upgrading light clients, list requisites for
 validation and execution steps, determine the boundary between basic and
 upgrade-specific validations by an IBC handler, and explain Tendermint's upgrade
 client implementation within the
-[ics07_tendermint](../../crates/ibc/src/clients/ics07_tendermint).
+[ics07_tendermint](../../ibc-clients/ics07-tendermint).
 
 ## Decision
 
@@ -41,9 +41,9 @@ we will explain how we have implemented this rationale in IBC-rs.
 * There **MUST** be a proof verification process to check upgraded client and
   consensus states against the host chain's state.
 * Chain upgrades **MUST NOT** result in changing
-  [ClientState](../../crates/ibc/src/core/ics02_client/client_state.rs#ClientState)
+  [ClientState](../../ibc-core/ics02-client/context/src/client_state.rs)
   or
-  [ConsensusState](../../crates/ibc/src/core/ics02_client/consensus_state.rs#ConsensusState)
+  [ConsensusState](../../ibc-core/ics02-client/context/src/consensus_state.rs)
   implementations
 * It is **UP TO** the chain's architecture how upgraded client and consensus
   states are committed, either through decentralized approaches, like governance
@@ -104,9 +104,9 @@ supported by `IBC-rs`:
    recommended that chains reduce the unbonding period.
 7. (P) Changing the Tendermint LightClient algorithm: Changes to the light
    client algorithm that do not change the
-   [ClientState](../../crates/ibc/src/clients/ics07_tendermint/client_state.rs#ClientState)
+   [ClientState](../../ibc-clients/ics07-tendermint/src/client_state.rs)
    or
-   [ConsensusState](../../crates/ibc/src/clients/ics07_tendermint/consensus_state.rs#ConsensusState)
+   [ConsensusState](../../ibc-clients/ics07-tendermint/src/consensus_state.rs)
    struct abstraction may be supported, provided that the counterparty is also
    upgraded to support the new light client algorithm. Changes that require
    updating the `ClientState` and `ConsensusState` structs themselves are
@@ -131,7 +131,7 @@ is entirely handled.
 
 1. Upgrade chain through governance
    1. Create a 02-client
-      [UpgradeProposal](https://github.com/cosmos/ibc-go/blob/main/docs/ibc/proto-docs.md#upgradeproposal)
+      [UpgradeProposal](https://github.com/cosmos/ibc-go/blob/main/docs/docs/01-ibc/09-proto-docs.md#upgradeproposal)
       with an `UpgradePlan` and a new IBC `ClientState` in the
       `UpgradedClientState` field with the following remarks:
         * The `UpgradePlan` must specify an upgrade height only (no upgrade
@@ -206,7 +206,7 @@ validations (SV) and lastly execution (E) steps as follows:
 
 Whenever the IBC handler receives an `MsgUpgradeClient`, it dispatches the
 decoded message to the router and triggers the
-[process](../../crates/ibc/src/core/ics02_client/handler/upgrade_client.rs#process)
+[process](../../ibc-core/ics02-client/src/handler/upgrade_client.rs)
 function of `upgrade_client` handler, which would go through the steps outlined
 in 3rd section of [Upgrade Process Step-by-Step](#upgrade-process-step-by-step).
 Just note that the `process` function will be rendered into `validate` and
@@ -419,13 +419,13 @@ Accepted
 ## References
 
 * [How to Upgrade IBC Chains and their
-  Clients](https://github.com/cosmos/ibc-go/blob/main/docs/ibc/upgrades/quick-guide.md)
+  Clients](https://github.com/cosmos/ibc-go/blob/main/docs/docs/01-ibc/05-upgrades/01-quick-guide.md)
 * [IBC Client Developer Guide to
-  Upgrades](https://github.com/cosmos/ibc-go/blob/main/docs/ibc/upgrades/developer-guide.md)
+  Upgrades](https://github.com/cosmos/ibc-go/blob/main/docs/docs/01-ibc/05-upgrades/02-developer-guide.md)
 * [cosmos/ibc-go/Issue 445: IBC upgrade plan
   summary](https://github.com/cosmos/ibc/issues/445)
 * [cosmos/cosmos-sdk/PR 7367: Upgrade
-  Client](https://github.com/cosmos/cosmos-sdk/åpull/7367)
+  Client](https://github.com/cosmos/cosmos-sdk/pull/7367)
 * [cosmos/ibc-go/Issue 2501: Create importable workflow for chains to run
   upgrade tests](https://github.com/cosmos/ibc-go/issues/2501)
 * [Hermes relayer documentation: Client
diff --git a/docs/architecture/adr-007-light-client-contexts.md b/docs/architecture/adr-007-light-client-contexts.md
index feb9b0e3c..b0caabdd5 100644
--- a/docs/architecture/adr-007-light-client-contexts.md
+++ b/docs/architecture/adr-007-light-client-contexts.md
@@ -13,7 +13,7 @@ This ADR is meant to address the main limitation of our current light client API
     + By giving the light clients access to `ValidationContext` and `ExecutionContext`, we're effectively giving them the same capabilities as the core handlers.
     + Although our current model is that all code is trusted (including light clients we didn't write), restraining the capabilities we give to light clients at the very least eliminates a class of bugs (e.g. calling the wrong method), and serves as documentation for exactly which methods the light client needs.
 
-This ADR is all about fixing this issue; namely, to enable light clients to define their own `ValidationContext` and `ExecutionContext` traits for the host to implement. 
+This ADR is all about fixing this issue; namely, to enable light clients to define their own `ValidationContext` and `ExecutionContext` traits for the host to implement.
 
 [ADR 4]: ../architecture/adr-004-light-client-crates-extraction.md
 [later improved]: https://github.com/cosmos/ibc-rs/pull/584
@@ -26,9 +26,9 @@ This ADR is all about fixing this issue; namely, to enable light clients to defi
 
 ### Changes to `ClientState`
 
-The `ClientState` functionality is split into 3 traits: 
-+ `ClientStateCommon`, 
-+ `ClientStateValidation<ClientValidationContext>`, and 
+The `ClientState` functionality is split into 3 traits:
++ `ClientStateCommon`,
++ `ClientStateValidation<ClientValidationContext>`, and
 + `ClientStateExecution<ClientExecutionContext>`
 
 Then, `ClientState` is defined as
@@ -68,7 +68,7 @@ where
         &self,
         ctx: &ClientValidationContext,
         // ...
-    ) -> Result<(), ClientError> { 
+    ) -> Result<(), ClientError> {
         // `get_resource_Y()` accessible through `ctx`
     }
 
@@ -93,7 +93,7 @@ where `ClientExecutionContext` is defined as (simplified)
 
 ```rust
 pub trait ClientExecutionContext: Sized {
-    // ... a few associated types 
+    // ... a few associated types
 
     /// Called upon successful client creation and update
     fn store_client_state(
@@ -193,10 +193,8 @@ enum AnyConsensusState {
 }
 
 #[derive(ClientState)]
-#[generics(
-    ClientValidationContext = MyClientValidationContext,
-    ClientExecutionContext  = MyClientExecutionContext
-)]
+#[validation(MyClientValidationContext)]
+#[execution(MyClientExecutionContext)]
 enum AnyClientState {
     Tendermint(TmClientState),
     Near(NearClientState),
@@ -237,7 +235,7 @@ We ended up having to write our own custom derive macros because existing crates
 
 ### Negative
 + Increased complexity.
-+ Harder to document. 
++ Harder to document.
     + Specifically, we do not write any trait bounds on the `Client{Validation, Execution}Context` generic parameters. The effective trait bounds are spread across all light client implementations that a given host uses.
 
 
diff --git a/docs/architecture/adr-008-restructure-ibc-crate.md b/docs/architecture/adr-008-restructure-ibc-crate.md
new file mode 100644
index 000000000..7e32a41ed
--- /dev/null
+++ b/docs/architecture/adr-008-restructure-ibc-crate.md
@@ -0,0 +1,190 @@
+# ADR 008: RESTRUCTURE `ibc` CRATE
+
+## Context
+
+The current state of the **`ibc`** crate exhibits a mix of different
+implementation layers. From a module-based perspective, it encompasses essential
+elements like ibc core, clients, applications, along with testing facilities.
+However, an architectural view reveals a fusion of diverse layers of type
+definitions, interfaces (APIs), and handler functions, resulting in a mix of
+dependencies and features that may lead to potential conflicts or unnecessary
+imports for users.
+
+As of [this pull request](https://github.com/cosmos/ibc-rs/pull/954), we've
+separated our mock testing kit into the standalone **`ibc-testkit`** library.
+This decoupling from the main **`ibc`** crate sets the stage for the objectives
+of this ADR.
+
+The primary goals here are twofold: firstly, to reduce interdependence within
+the codebase among various components such as ibc core, clients, and
+applications, and secondly, to improve the overall usability of the `ibc-rs`
+implementation. The overarching aim is to empower users to selectively import
+specific IBC layers, mitigating potential conflicts related to dependencies or
+features that may arise in the context of a monolithic library and letting
+`ibc-rs` be used in the following scenarios:
+
+1. **Selective Module Import**
+    - Users cannot import only the necessary components/modules for their
+      projects. For instance, importing only the **`ics07_tendermint`**
+      implementation is impractical.
+2. **Selective Types Import**
+    - Relayers, like Hermes, or any off-chain consumers cannot import their
+      desired layer of implementation like ibc types without pulling in
+      unnecessary dependencies into their project.
+3. **Smoother IBC Core Integration with Hosts**
+    - Integrating ibc core with host chains without introducing light client or
+      app dependencies is currently not straightforward, impeding smooth
+      integration.
+4. **Easier Development of CosmWasm Contracts**
+    - For developing a CosmWasm tendermint light client, we ideally should only
+      be dependent on implementation under the **`ics07_tendermint`** and also
+      be importing relevant parts from the **`ibc-core-client`** layer without
+      pulling in all the ibc codebase and dependencies.
+
+This ADR aims to enhance both the usability and practicality of `ibc-rs` by
+restructuring the codebase and organizing it under multiple sub-libraries, as
+stated in the [decision](#decision) section. This will make different parts of
+`ibc-rs` accessible to users, positioning it as a more comprehensive, one-stop
+solution catering to diverse user groups, whether for on-chain or off-chain use
+cases.
+
+## Decision
+
+For the library organization, the first stage of separation is to split the
+codebase so that each IBC application, client, and core implementation is
+decoupled from one another. The top-level libraries and the naming schema would
+look as follows:
+
+```markdown
+.
+├── ibc -> Primarily re-exports sub-libraries
+├── ibc-core 
+│   ├── ibc-core-client (contains the implementation + Re-exports types)
+│   ├── ibc-core-connection
+│   ├── ibc-core-channel
+│   ├── ibc-core-commitment
+│   └── ibc-core-host
+│       └── .
+├── ibc-clients
+│   ├── ibc-client-tendermint
+│   ├── ibc-client-tendermint-cw
+│   └── .
+├── ibc-apps
+│   ├── ibc-app-transfer
+│   ├── ibc-app-ica
+│   │   └── .
+│   └── .
+├── ibc-primitives
+├── ibc-testkit (previously mock module + `test-utils` feature)
+├── ibc-query
+└── ibc-derive
+```
+
+With this restructure, the main `ibc` crate primarily re-exports types,
+interfaces, and implementations of all the sub-libraries. Therefore, if someone
+only wants to depend on the `ibc` crate without caring about this granularity,
+they can do so.
+
+Afterward, we split off data structure (domain types) of each IBC layer into a
+separate sub-library under a `types` folder, still maintained under the
+directory of that relevant component/module. As an example, the
+`ibc-core-client` crate’s tree and the naming schema would look like this:
+
+```markdown
+ibc-core
+└── ibc-core-client (dir: ibc-core/ics02-client)
+    └── ibc-core-client-types (dir: ibc-core/ics02-client/types)
+        ├── msgs
+        ├── events
+        └── .
+```
+
+This way, the main crate of each IBC module contains all the necessary APIs and
+implementations to integrate with host chains, along with re-exporting the
+sub-library types. This allows projects to selectively import types (e.g.
+`ibc-core-client-types`), often required by off-chain users such as relayers. Or
+to pick the library containing the entire implementation of that particular
+module (e.g. `ibc-core-client`), typically more convenient for host chains or
+smart contract developers to integrate with on their end.
+
+Once the restructuring is complete, the **directory tree** of the repo would
+look as follows:
+
+```markdown
+ibc
+ibc-core
+├── ics02-client
+|   ├── src
+|   ├── types
+|   |   ├── src
+|   |   └── Cargo.toml
+|   └── Cargo.toml
+├── ics03-connection
+|   └── .
+├── ics04-channel
+|   └── .
+├── ics23-commitment
+|   └── .
+├── ics24-host
+|   └── .
+├── src
+├── Cargo.toml
+└── README.md
+ibc-clients
+├── ics07-tendermint
+├── ics08-wasm
+└── .
+ibc-apps
+├── ics20-transfer
+├── ics27-ica
+└── .
+ibc-primitives
+ibc-testkit
+ibc-query
+ibc-derive
+```
+
+In the refactored codebase, there will be several `*-types` crates that rely on
+the `ibc-proto` library. This library acts as an upstream crate, facilitating
+the conversion to and from proto types. Each `*-types` crate also re-exports
+crucial proto types for added user convenience. This approach ensures a seamless
+experience for users downstream, sparing them the necessity of directly
+including the `ibc-proto` dependency in their projects. Consequently, the
+`*-types` crates serve as comprehensive, battery-included libraries.
+
+To implement this ADR efficiently and for more organization, we use the
+workspace inheritance feature and will add a top-level README for main library
+groups like `ibc-core`, `ibc-clients`, etc serving as a guide for users to
+understand the purpose and structure of their sub libraries.
+
+Later, it is crucial to come up with a Github action to automate and simplify
+the release process as well.
+
+## **Status**
+
+Accepted
+
+## **Consequences**
+
+We should acknowledge this restructuring, while a significant step forward, will
+not completely address all existing design couplings. Subsequent improvements in
+implementation logic will be necessary to completely decouple ibc core, clients,
+and applications from each other and make the entire logic as chain-agnostic as
+possible. For instance, currently, our `IbcEvent` type depends on the Tendermint
+events in their conversion, which can only be addressed once this restructuring
+is complete. There may be other mix-ups as well, but the new repository
+structure significantly simplifies their handling and ensures `ibc-rs` evolves
+into a more adaptable, modular, and composable implementation that can serve
+various use cases.
+
+### **Positive**
+
+- Opens up a range of new use cases for `ibc-rs`
+- Facilitates moving toward more chain-agnostic and flexible design and interfaces
+- Simplifies development on top of each layer of `ibc-rs` implementation
+
+### **Negative**
+
+- Multiple libraries are more challenging to maintain
+- Enforces current users to update a large number of their import paths from
+  `ibc` crates
diff --git a/docs/architecture/adr-009-revamp-testkit.md b/docs/architecture/adr-009-revamp-testkit.md
new file mode 100644
index 000000000..9f4541638
--- /dev/null
+++ b/docs/architecture/adr-009-revamp-testkit.md
@@ -0,0 +1,349 @@
+# ADR 009: Revamp IBC integration test framework
+
+## Changelog
+
+- 04-03-2024: Initial draft
+
+## Context
+
+The current framework in the IBC testkit uses
+[existing types and injects state and/or dependencies
+manually](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/tests/core/ics02_client/update_client.rs#L574-L578).
+Sometimes, it uses
+[semantically incorrect data as mock data](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/testapp/ibc/core/types.rs#L320).
+Because of this, tests with customizable steps and fixed fixtures became ad-hoc
+and unmaintainable.
+
+To overcome this, we need to improve our test framework such that it allows:
+
+- testing different implementations and traits.
+- composition of succinct tests with useful `util` methods.
+- validating code paths that were not easily testable before, i.e. Merkle proof
+  generation.
+- simulating a more realistic IBC workflow, using real IBC and relayer
+  interfaces.
+
+## Decision
+
+The main goal of this proposal is to create a test framework that is modular and
+closer to a real blockchain environment. This should also make the existing
+tests more succinct and readable. Instead of bootstrapping the mock data that
+tests use, we should use valid steps to generate it - so that we know the exact
+steps to reach a state to reproduce in a real environment.
+
+To achieve this, we have broken down the proposal into sub-proposals:
+
+### 1. Adopt a Merkle store for the test framework
+
+The current framework uses `HashMap` and `HashSet` to store data. This works for
+many test scenarios, but it fails to test proof-sensitive scenarios. Because of
+this, we don't have any connection, channel handshake, or packet relay tests
+that cover the Tendermint light client.
+
+We generalize
+[`MockContext`](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/testapp/ibc/core/types.rs#L103)
+to use a Merkle store which is used for IBC Context's store. For concrete or
+default implementations, we can use the IAVL Merkle store implementation from
+`informalsystems/basecoin-rs`.
+
+### 2. Modularize the host environment
+
+Currently, we are using `Mock` and `SyntheticTendermint` variants of the
+[`HostType`](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/hosts/block.rs#L33-L36)
+enum as host environments. To manage these two different environments, we also
+introduced
+[`HostBlocks`](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/hosts/block.rs#L72-75)
+for encapsulating the possible host variants that need to be covered by
+`ibc-testkit`.
+
+However, this creates friction in the case when we need to add new host
+variants. It creates the same problem that the `ibc-derive` crate was designed
+to solve for `ClientState` and `ConsensusState` types, namely: dispatching
+methods to underlying variants of a top-level enum. But, a concrete
+`MockContext` will always have a unique `HostType` and its corresponding
+`HostBlocks`. So we can refactor `HostTypes` and `HockBlocks` with a generic
+`TestHost` trait that maintains its corresponding types e.g. `Block` types, via
+associated types. Finally, we generalize the `MockContext` once more to use this
+`TestHost` trait instead of a concrete enum variant.
+
+This `TestHost` trait should be responsible for generating blocks, headers,
+client, and consensus states specific to that host environment.
+
+```rs
+/// TestHost is a trait that defines the interface for a host blockchain.
+pub trait TestHost: Default + Debug + Sized {
+    /// The type of block produced by the host.
+    type Block: TestBlock;
+
+    /// The type of client state produced by the host.
+    type ClientState: Into<AnyClientState> + Debug;
+
+    /// The type of block parameters to produce a block.
+    type BlockParams: Debug + Default;
+
+    /// The type of light client parameters to produce a light client state.
+    type LightClientParams: Debug + Default;
+
+    /// The history of blocks produced by the host chain.
+    fn history(&self) -> &Vec<Self::Block>;
+
+    /// Commit a block with commitment root to the blockchain, by extending the history of blocks.
+    fn commit_block(
+        &mut self,
+        commitment_root: Vec<u8>,
+        block_time: Duration,
+        params: &Self::BlockParams,
+    );
+
+    /// Generate a block at the given height and timestamp, using the provided parameters.
+    fn generate_block(
+        &self,
+        commitment_root: Vec<u8>,
+        height: u64,
+        timestamp: Timestamp,
+        params: &Self::BlockParams,
+    ) -> Self::Block;
+
+    /// Generate a client state using the block at the given height and the provided parameters.
+    fn generate_client_state(
+        &self,
+        latest_height: &Height,
+        params: &Self::LightClientParams,
+    ) -> Self::ClientState;
+}
+
+/// TestBlock is a trait that defines the interface for a block produced by a host blockchain.
+pub trait TestBlock: Clone + Debug {
+    /// The type of header that can be extracted from the block.
+    type Header: TestHeader;
+
+    /// The height of the block.
+    fn height(&self) -> Height;
+
+    /// The timestamp of the block.
+    fn timestamp(&self) -> Timestamp;
+
+    /// Extract the header from the block.
+    fn into_header(self) -> Self::Header;
+}
+
+/// TestHeader is a trait that defines the interface for a header
+/// submitted by relayer from the host blockchain.
+pub trait TestHeader: Clone + Debug + Into<Any> {
+    /// The type of consensus state can be extracted from the header.
+    type ConsensusState: ConsensusState + Into<AnyConsensusState> + From<Self> + Clone + Debug;
+
+    /// The height of the block, as recorded in the header.
+    fn height(&self) -> Height;
+
+    /// The timestamp of the block, as recorded in the header.
+    fn timestamp(&self) -> Timestamp;
+
+    /// Extract the consensus state from the header.
+    fn into_consensus_state(self) -> Self::ConsensusState;
+}
+```
+
+### 3. Decoupling IbcContext and Host environment
+
+Currently, `MockContext` implements the top-level
+[validation](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-core/ics25-handler/src/entrypoint.rs#L45)
+and
+[execution](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-core/ics25-handler/src/entrypoint.rs#L112)
+contexts of `ibc-rs`, as opposed to the more granular contexts of each of the
+individual handlers. It contains other host-specific data e.g. `host_chain_id`,
+`block_time` - that are not directly relevant to the IBC context. If we think of
+`MockContext` as a real blockchain context, the `MockContext` represents the
+top-level runtime; it contains `MockIbcStore`, which is a more appropriate
+candidate to implement the validation and execution contexts for than the
+`MockContext` itself.
+
+With this, the `MockContext` contains two decoupled parts - the host and the IBC
+module.
+
+### 4. Chain-like interface for `MockContext`
+
+With the above changes, we can refactor the `MockContext` to have
+blockchain-like interfaces.
+
+The `MockContext` should have `end_block`, `produce_block`, and `begin_block` to
+mimic real blockchain environments, such as the Cosmos-SDK.
+
+```rs
+impl<S, H> MockContext<S, H>
+where
+    S: ProvableStore + Debug,
+    H: TestHost,
+{
+    // Access ibc module store
+    pub fn ibc_store_mut(&mut self) -> &mut MockIbcStore<S>;
+
+    // Advance the first block height.
+    pub fn advance_genesis_height(&mut self, genesis_time: Timestamp);
+    // Routine procedures at the beginning of a block
+    // Just after committing last block state.
+    pub fn begin_block(&mut self);
+    // Advance the current block height.
+    pub fn advance_block_height(&mut self, block_time: Duration);
+    // Routine procedures at the end of a block
+    // Just before committing current block state.
+    pub fn end_block(&mut self);
+}
+```
+
+### 5. ICS23 compatible proof generation
+
+With the new proof generation capabilities, we can now test the Tendermint light
+clients. But we need our proofs to be ICS23 compatible. ICS23 expects the IBC
+store root to be committed at a commitment prefix at a top-level store in the
+host environment.
+
+For this, we add an extra store in `MockContext` where the `MockIbcStore`
+commits its storage root at its
+[commitment prefix](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/testapp/ibc/core/core_ctx.rs#L127-L129)
+key.
+
+So the `MockContext` is finalized as:
+
+```rs
+pub struct MockContext<S, H>
+where
+    S: ProvableStore + Debug,
+    H: TestHost
+{
+    pub main_store: S,
+    pub host: H,
+    pub ibc_store: MockIbcStore<S>,
+}
+```
+
+Now the `MockIbcStore` can generate proofs that contain the proofs in its store
+and commitment prefix. But it has to know the proofs of its commitment prefix of
+the previous heights.
+
+So we add an extra store in `MockIbcStore` to store the proofs from previous
+heights. This is similar to storing `HostConsensusState`s of previous heights.
+
+```rs
+#[derive(Debug)]
+pub struct MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    ...
+    /// Map of host consensus states.
+    pub host_consensus_states: Arc<Mutex<BTreeMap<u64, AnyConsensusState>>>,
+    /// Map of proofs of ibc commitment prefix.
+    pub ibc_commiment_proofs: Arc<Mutex<BTreeMap<u64, CommitmentProof>>>,
+}
+```
+
+The storing of the IBC store root at the IBC commitment prefix happens in the
+`end_block` procedure. `produce_block` commits the main store, produces a block
+with its latest root, and pushes the block to the blockchain. The storing of
+proofs and host consensus states happens in the `begin_block` of the
+`MockContext`.
+
+### 6. Integration Tests via `RelayerContext`
+
+With all the above changes, we can now write an integration test that tests the
+IBC workflow - client creation, connection handshake, channel handshake, and
+packet relaying for any host environment that implements `TestHost`.
+
+This can be done by reading the
+[IBC events](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/testapp/ibc/core/types.rs#L95)
+from `MockIbcStore` and creating and sending the IBC messages via
+[`MockContext::deliver`](https://github.com/cosmos/ibc-rs/blob/v0.51.0/ibc-testkit/src/testapp/ibc/core/types.rs#L696).
+
+### Miscellaneous
+
+To achieve blockchain-like interfaces, we removed `max_history_size` and
+`host_chain_id` from `MockContext`.
+
+- `max_history_size`: We generate all the blocks till a block height. This gives
+  us reproducibility. If we need to prune some older block data, we use a
+  dedicated `prune_block_till` to prune older blocks. This makes our tests more
+  descriptive about the assumption of the test scenarios.
+- `host_chain_id`: The IBC runtime does not depend on `host_chain_id` directly.
+  The `TestHost` trait implementation is responsible for generating the blocks
+  with the necessary data.
+
+Also to minimize verbosity while writing tests (as Rust doesn't support default
+arguments to function parameters), we want to use some parameter builders. For
+that, we can use the [`TypedBuilder`](https://crates.io/crates/typed-builder)
+crate.
+
+## Status
+
+Proposed
+
+## Consequences
+
+This ADR pays the technical debt of the existing testing framework.
+
+### Positive
+
+Future tests will be more readable and maintainable. The test framework becomes
+modular and leverages Rust's trait system. `ibc-rs` users may benefit from this
+framework, which allows them to test their host implementations of `ibc-rs`
+components.
+
+### Negative
+
+This requires a significant refactoring of the existing tests. Since this may
+take some time, the parallel development on the `main` branch may conflict with
+this work.
+
+## References
+
+This work is being tracked at
+[cosmos/ibc-rs#1109](https://github.com/cosmos/ibc-rs/pull/1109).
+
+The following provides the concrete implementations of the proposed changes:
+
+#### MockIbcStore
+
+The modified `MockIbcStore` with Merkle store lives at
+[`testapp/ibc/core/types.rs`](https://github.com/cosmos/ibc-rs/blob/main/ibc-testkit/src/testapp/ibc/core/types.rs#L43-L96).
+
+#### TestHost
+
+The Rust trait lives at
+[`hosts/mod.rs`](https://github.com/cosmos/ibc-rs/blob/main/ibc-testkit/src/hosts/mod.rs#L27).
+The `Mock` and `Tendermint` host implementations live in
+[`hosts/mock.rs`](https://github.com/cosmos/ibc-rs/blob/main/ibc-testkit/src/hosts/mock.rs#L30)
+and
+[`hosts/tendermint.rs`](https://github.com/cosmos/ibc-rs/blob/main/ibc-testkit/src/hosts/tendermint.rs#L42)
+respectively.
+
+#### Renaming `MockContext` to `StoreGenericTestContext`
+
+There was confusion about what is a _Test_ component and what is a _Mock_
+component. We have `MockContext` with `MockClient` and `TendermintClient`.
+
+To avoid this confusion, we renamed `MockContext` to `StoreGenericTestContext`.
+This means that going forward all our general frameworks and traits should have
+`Test` in their name. But a dummy concrete implementation of these traits may
+have `Mock` in their name.
+
+#### StoreGenericTestContext
+
+[`StoreGenericTestContext`](https://github.com/cosmos/ibc-rs/blob/main/ibc-testkit/src/context.rs#L34-L52)
+is actually what is described as `MockContext` in the ADR. For convenience, we
+defined `TestContext` to have a concrete store implementation -
+[`MockStore`](https://github.com/cosmos/ibc-rs/blob/main/ibc-testkit/src/context.rs#L55-L56).
+
+```rs
+// A mock store type using basecoin-storage implementations.
+pub type MockStore = InMemoryStore;
+
+pub type TestContext<H> = StoreGenericTestContext<MockStore, H>;
+```
+
+With this, we can now define `MockContext` which uses `MockStore` and `MockHost`
+and `TendermintContext` which uses `MockStore` and `TendermintHost`.
+
+```rs
+pub type MockContext = TestContext<MockHost>;
+pub type TendermintContext = TestContext<TendermintHost>;
+```
diff --git a/docs/architecture/adr-010-enable-standalone-ics02-integration.md b/docs/architecture/adr-010-enable-standalone-ics02-integration.md
new file mode 100644
index 000000000..24dbe1149
--- /dev/null
+++ b/docs/architecture/adr-010-enable-standalone-ics02-integration.md
@@ -0,0 +1,380 @@
+# ADR 010: ENABLE STANDALONE ICS-02 INTEGRATION
+
+## Changelog
+
+- 2024-03-05: Draft Proposed
+
+## Status
+
+Accepted
+
+## Context
+
+In ADR-07, we previously granted light client developers the flexibility to
+introduce custom APIs to the client contexts. This decision was made to
+accommodate potential scenarios where not all methods required by every future
+light client might be present in the extensive
+[`ValidationContext`](https://github.com/cosmos/ibc-rs/blob/4421b0dcd6eab6c914b8c5a7d45817b1edb6b2ce/ibc-core/ics24-host/src/context.rs#L31)
+or
+[`ExecutionContext`](https://github.com/cosmos/ibc-rs/blob/4421b0dcd6eab6c914b8c5a7d45817b1edb6b2ce/ibc-core/ics24-host/src/context.rs#L168)
+traits.
+
+In this ADR, while retaining that capability, we propose a reorganization of
+client-related APIs by consolidating them under the ICS-02 client validation and
+execution contexts. While the main top-level context traits in ICS-24
+(`ibc-core-host` crate) will still have access to these APIs through the
+existing accessor
+[`get_client_validation_context()`](https://github.com/cosmos/ibc-rs/blob/4421b0dcd6eab6c914b8c5a7d45817b1edb6b2ce/ibc-core/ics24-host/src/context.rs#L38)
+and
+[`get_client_execution_context()`](https://github.com/cosmos/ibc-rs/blob/4421b0dcd6eab6c914b8c5a7d45817b1edb6b2ce/ibc-core/ics24-host/src/context.rs#L170)
+methods.
+
+As a result of this ADR, client relevant methods, namely **`client_state()`**
+and **`consensus_state()`**, will be extracted from the large ICS-24 validation
+and execution context traits. Instead, they will find their new home under the
+ICS-02
+[`ClientValidationContext`](https://github.com/cosmos/ibc-rs/blob/caee889ad308a4aac3f9905de9cdda76c5533cfb/ibc-core/ics02-client/context/src/context.rs#L14)
+and
+[`ClientExecutionContext`](https://github.com/cosmos/ibc-rs/blob/caee889ad308a4aac3f9905de9cdda76c5533cfb/ibc-core/ics02-client/context/src/context.rs#L32)
+traits.
+
+## Objectives
+
+The primary objective is to enhance the delineation of the APIs that connect
+ibc-rs to the host’s storage, offering a more modular approach that allows
+developers who wish to integrate only the implemented client states under the
+ibc-rs to their IBC infra. In other words, this enhancement does not mandate
+hosts to implement all the IBC layers, such as connection, channel, or any of
+the IBC applications, when only light client support is required.
+
+As a result, this ADR sets the stage for several potential use cases, including:
+
+1. **Streamlines CosmWasm light client implementation**
+    - Since the refined structure allows for the independent integration of
+      ICS-02 client traits into the storage, it becomes straightforward to
+      implement light clients living in ibc-rs as CosmWasm contracts, which
+      empowers simpler Wasm client integration with ibc-go driven chains.
+
+2. **Enables client integration with various IBC implementations**
+    - Any IBC implementation, whether it is based on ibc-rs or a fork of ibc-rs,
+      will have this capability to incorporate the latest light client
+      implementations by ibc-rs. So that even if an IBC implementation diverges
+      from the ibc-rs framework, hosts can benefit from the latest version of
+      light client implementation. This is important from the security
+      standpoint, broadens the applicability of ibc-rs, and facilitates
+      collaboration with other IBC-adjacent solutions.
+
+As part of this ADR and to minimize breaking changes later, we aim to address
+the following client-relevant API deficiencies as well:
+
+1. **Refining access to validation vs execution methods**
+    - So far, unauthorized access to client execution methods [has been
+      possible](https://github.com/cosmos/ibc-rs/blob/4421b0dcd6eab6c914b8c5a7d45817b1edb6b2ce/ibc-core/ics24-host/src/context.rs#L33)
+      under the `ValidationContext`. This will be rectified to ensure that only
+      the `ClientState` validation method is callable within the validation
+      contexts. This enhances the precision of access control, aligning it more
+      closely with the intended functionality.
+
+2. **Bringing more clarity to how context APIs are related**
+    - The ambiguous relationship between the main context APIs at ICS-24, ICS-02
+      client APIs, and client-specific APIs can get cleared. This ADR aims for a
+      more transparent relationship between these contexts, making it easier to
+      understand their interactions and roles. For instance some client relevant
+      methods are located under the client contexts, while others are under the
+      main (ICS-24) contexts.
+
+3. **Minimizing associated types’ declarations**
+    - Our current APIs pose a challenge by requiring users to introduce multiple
+      yet the same associated types like `AnyClientState`, `AnyConsensusState`,
+      etc across different layers. A more efficient solution involves
+      introducing such types in fewer places, providing better access to the
+      traits across different layers. However, it's worth acknowledging that an
+      ideal solution might entail utilizing features from forthcoming stable
+      versions of Rust. This would enable us to leverage the advantages provided
+      by either
+      [associated_type_bounds](https://rust-lang.github.io/rfcs/2289-associated-type-bounds.html),
+      [associated_type_defaults](https://rust-lang.github.io/rfcs/2532-associated-type-defaults.html),
+      or
+      [implied_bounds](https://rust-lang.github.io/rfcs/2089-implied-bounds.html)
+      capabilities.
+
+## Decision
+
+Here is a high-level diagram that illustrates the optimal boundaries for each
+context trait, specifying the scope of access by each of these contexts. In
+addition, the classification of APIs should be such that they allow the
+independent integration of light client implementations.
+
+<div style="text-align: center;">
+  <img src="./assets/adr010.png" alt="Main components" width="800" height="600">
+</div>
+
+The primary `ValidationContext` and `ExecutionContext` traits at the ICS-24 host
+level will be restructured as follows, only having sufficient access to
+respective ICS-02 client contexts, without caring about the types or methods
+associated with client or consensus states of counterparty chains. It is
+noteworthy that, to better illustrate the desired outcome from the current
+state, the code snippets below are in the `diff` format.
+
+```diff
+pub trait ValidationContext {
+    type V: ClientValidationContext;
++    type HostClientState: ClientStateValidation<Self::V>;
++    type HostConsensusState: ConsensusState;
+-    type E: ClientExecutionContext;
+-    type AnyConsensusState: ConsensusState;
+-    type AnyClientState: ClientState<Self::V, Self::E>;
+
+    /// Retrieve the context that implements all clients' `ValidationContext`.
+    fn get_client_validation_context(&self) -> &Self::V;
+
+     // This method will be removed and replaced by a `ClientStateDecoder` trait that will encapsulate the ability to decode a client state from an `Any`
+-    fn decode_client_state(&self, client_state: Any) -> Result<Self::AnyClientState, ContextError>;
+
+-    fn client_state(&self, client_id: &ClientId) -> Result<Self::AnyClientState, ContextError>;
+
+-    fn consensus_state(
+-        &self,
+-        client_cons_state_path: &ClientConsensusStatePath,
+-    ) -> Result<Self::AnyConsensusState, ContextError>;
+
+    fn host_consensus_state(
+        &self,
+        height: &Height,
+-    ) -> Result<Self::AnyConsensusState, ContextError>;
++    ) -> Result<Self::HostConsensusState, ContextError>;
+
+    fn validate_self_client(
+        &self,
+-        client_state_of_host_on_counterparty: Any,
++        client_state_of_host_on_counterparty: Self::HostClientState,
+    ) -> Result<(), ContextError>;
+
+    ... // other methods
+}
+
+pub trait ExecutionContext: ValidationContext {
++    type E: ClientExecutionContext;
+
+    /// Retrieve the context that implements all clients' `ExecutionContext`.
+    fn get_client_execution_context(&mut self) -> &mut Self::E;
+
+    ... // other methods
+
+/// Convenient type aliases
++ pub type ClientStateRef<Ctx> =
++    <<Ctx as ValidationContext>::V as ClientValidationContext>::ClientStateRef;
+
++ pub type ClientStateMut<Ctx> =
++    <<Ctx as ExecutionContext>::E as ClientExecutionContext>::ClientStateMut;
+
++ pub type ConsensusStateRef<Ctx> =
++    <<Ctx as ValidationContext>::V as ClientValidationContext>::ConsensusStateRef;
+}
+```
+
+We should also highlight that ICS-02 houses various types, APIs and
+implementations essential for enabling **light clients of counterparty chains
+operating on the host chain**. Therefore, the `host_consensus_state()` and
+`validate_self_client()` methods, though initially appearing to be ICS-02
+specific, play a crucial role in the connection handshake validating receiving
+datagrams against the client and consensus states of the host.
+
+In this ADR, these methods will continue to be housed under the main context
+traits. However, we will explicitly define the accepted types for these methods
+as `HostClientState` and `HostConsensusState`. This refinement aims for more
+clarity and will optimize the decoding process, removing an unnecessary layer of
+decoding during information retrieval. Previously, the decoding process for
+these methods involved obtaining `AnyClientState` and `AnyConsensusState` types
+and then converting them into the concrete `HostClientState` and
+`HostConsensusState` types.
+
+Following the aforementioned points, in the ICS-02 level, the
+`ClientValidationContext` and `ClientExecutionContext` traits will be
+restructured as follows, containing all the client relevant methods and types:
+
+```diff
+pub trait ClientValidationContext: Sized {
+     // Given that we will be dropping `decode_client_state()` method,
+     // the client state type introduced here should have implemented `TryFrom<Any>` and `Into<Any>` traits.
++    type ClientStateRef: ClientStateValidation<Self>;
++    type ConsensusStateRef: ConsensusState;
+
++    fn client_state(&self, client_id: &ClientId) -> Result<Self::ClientStateRef, ContextError>;
+
++    fn consensus_state(
++        &self,
++        client_cons_state_path: &ClientConsensusStatePath,
++    ) -> Result<Self::ConsensusStateRef, ContextError>;
+
+    fn client_update_meta(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<(Timestamp, Height), ContextError>;
+}
+
+pub trait ClientExecutionContext:
++    ClientValidationContext<ClientStateRef = Self::ClientStateMut>
+{
+-    type V: ClientValidationContext;
+-    type AnyClientState: ClientState<Self::V, Self>;
+-    type AnyConsensusState: ConsensusState;
++    type ClientStateMut: ClientStateExecution<Self>;
+
++    fn client_state_mut(&self, client_id: &ClientId) -> Result<Self::ClientStateMut, ContextError> {
++        self.client_state(client_id)
++    }
+
+    fn store_client_state(
+        &mut self,
+        client_state_path: ClientStatePath,
+        client_state: Self::ClientStateMut,
+    ) -> Result<(), ContextError>;
+
+    fn store_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+        consensus_state: Self::ConsensusStateRef,
+    ) -> Result<(), ContextError>;
+
+    fn delete_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+    ) -> Result<(), ContextError>;
+
+    fn store_update_meta(
+        &mut self,
+        client_id: ClientId,
+        height: Height,
+        host_timestamp: Timestamp,
+        host_height: Height,
+    ) -> Result<(), ContextError>;
+
+    fn delete_update_meta(
+        &mut self,
+        client_id: ClientId,
+        height: Height,
+    ) -> Result<(), ContextError>;
+}
+```
+
+The introduction of the `ClientStateMut` associated type in addition to the
+`ClientStateRef` became necessary to tackle the limitation that the
+`ClientState` retrieved from the regular `client_state()` method provides access
+only to validation methods. However, in `execute` handlers, there are scenarios
+(like
+[here](https://github.com/cosmos/ibc-rs/blob/f272f30e0f773d85a99fc553b75d41f9f768d5c5/ibc-core/ics02-client/src/handler/update_client.rs#L54))
+where access to the execution methods of the client state is required. We aim to
+simplify the user experience by providing a default implementation, relieving
+users from the need to implement the `client_state_mut` method.
+
+Also, the introduction of `<ClientStateRef = Self::ClientStateMut>` is prompted
+by the need to address the characteristics of concrete `ClientState`
+definitions. For instance, in the case of ICS-07, such as `TmClientState`, the
+struct definition can't be split into two fragments, one for validation and the
+other for execution. Therefore, contexts implementing `ClientExecutionContext`
+must introduce a `ClientStateMut` type the same as `ClientStateRef`.
+
+With the mentioned classification, we can now streamline ICS-07 specific APIs,
+eliminating the requirement for implementing a redundant `consensus_state()`
+method. For the sake of simplification, we can remove the `CommonContext` trait
+and consolidate everything under the `ExtClientValidationContext` as follows:
+
+```diff
++ /// Enables conversion (`TryInto` and `From`) between the consensus state type
++ /// used by the host and the one specific to the Tendermint light client, which
++ /// is `ConsensusStateType`.
++ pub trait ConsensusStateConverter:
++    TryInto<ConsensusStateType, Error = ClientError> + From<ConsensusStateType>
++ {
++ }
+
++ impl<C> ConsensusStateConverter for C where
++    C: TryInto<ConsensusStateType, Error = ClientError> + From<ConsensusStateType>
++ {
++ }
+
+- pub trait CommonContext {
+-    // methods will be moved to the below `ExtClientValidationContext`
+- }
+
+// Client's context required during validation
+pub trait ExtClientValidationContext:
++    ClientValidationContext<ConsensusStateRef = Self::AnyConsensusState>
+{
++    type ConversionError: ToString;
++    type AnyConsensusState: TryInto<TmConsensusState, Error = Self::ConversionError>;
+
++    fn host_timestamp(&self) -> Result<Timestamp, ContextError>;
+
++    fn host_height(&self) -> Result<Height, ContextError>;
+
+-    fn consensus_state(
+-        &self,
+-        client_cons_state_path: &ClientConsensusStatePath,
+-    ) -> Result<Self::AnyConsensusState, ContextError>;
+
++    fn consensus_state_heights(&self, client_id: &ClientId) -> Result<Vec<Height>, ContextError>;
+
+    fn next_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::AnyConsensusState>, ContextError>;
+
+    fn prev_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::AnyConsensusState>, ContextError>;
+}
+
+-impl<T> ExecutionContext for T where T: CommonContext + ClientExecutionContext {}
++impl<T> ExtClientExecutionContext for T where T: ExtClientValidationContext + ClientExecutionContext {}
+
+```
+
+### Remarks
+
+- We move away from the `decode_client_state()` method. Since per our design,
+  users must utilize a `ClientState` type that implements both `TryFrom<Any>`
+  and `Into<Any>`, therefore, we can offer a trait called `ClientStateDecoder`
+  as follows, making it readily available for users seeking to decode/encode a
+  client state from/into the `Any` type:
+
+    ```rust
+    pub trait ClientStateDecoder: TryFrom<Any, Error = ClientError> + Into<Any> {}
+
+    impl<T> ClientStateDecoder for T where T: TryFrom<Any, Error = ClientError> {}
+
+    ```
+
+- We will maintain the `client_counter()` and `increase_client_counter()`
+  methods within the main context traits. This stems from the fact that light
+  clients do not rely on the relative positions in their processes.
+  Additionally, these counters are globally tracked, and only IBC handlers
+  invoke these methods for setting or retrieving client identifiers.
+
+## Consequences
+
+### Positive
+
+- Enables easy light client integration without the need for integrating the
+  entire IBC stack
+- Establishes a clearer relationship between APIs (ICS-02 <> ICS-24), promoting
+  better development practices
+- Eliminates redundant methods/types, enhancing integration efficiency
+- Methods under the client contexts will align more with ibc-go client keepers,
+  improving interoperability.
+
+### Negative
+
+- Some challenges may arise in identifying trait bounds during a light client
+  implementation.
+  - Introducing user-importable type aliases helps mitigate this concern.
+- Additionally, this ADR employs significant breaking changes to the hosts.
+
+## References
+
+- [Issue link](https://github.com/cosmos/ibc-rs/issues/1114)
diff --git a/docs/architecture/assets/adr010.png b/docs/architecture/assets/adr010.png
new file mode 100644
index 000000000..c64e4c40f
Binary files /dev/null and b/docs/architecture/assets/adr010.png differ
diff --git a/docs/dev-deps-graph.png b/docs/dev-deps-graph.png
new file mode 100644
index 000000000..f5b0e05cc
Binary files /dev/null and b/docs/dev-deps-graph.png differ
diff --git a/docs/static/img/ibc-rs-cover.svg b/docs/static/img/ibc-rs-cover.svg
new file mode 100644
index 000000000..77b555cfe
--- /dev/null
+++ b/docs/static/img/ibc-rs-cover.svg
@@ -0,0 +1,42 @@
+<svg width="1284" height="644" viewBox="0 0 1284 644" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_1401_1739" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="2" y="2" width="1280" height="640">
+<path d="M1282 2H2V642H1282V2Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_1401_1739)">
+<mask id="mask1_1401_1739" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="-33" y="2" width="1724" height="985">
+<path d="M1691 2H-33V987H1691V2Z" fill="white"/>
+</mask>
+<g mask="url(#mask1_1401_1739)">
+<path d="M145.243 420.524C229.585 420.524 297.958 351.076 297.958 265.408C297.958 179.739 229.585 110.291 145.243 110.291C60.9007 110.291 -7.47217 179.739 -7.47217 265.408C-7.47217 351.076 60.9007 420.524 145.243 420.524Z" fill="#2C8A5D" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M1021.73 588.965C1106.07 588.965 1174.44 519.517 1174.44 433.849C1174.44 348.18 1106.07 278.732 1021.73 278.732C937.386 278.732 869.014 348.18 869.014 433.849C869.014 519.517 937.386 588.965 1021.73 588.965Z" fill="#2C8A5D" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M1253.45 88.0107C1284.43 88.0107 1309.54 62.503 1309.54 31.0376C1309.54 -0.427803 1284.43 -25.9355 1253.45 -25.9355C1222.47 -25.9355 1197.36 -0.427803 1197.36 31.0376C1197.36 62.503 1222.47 88.0107 1253.45 88.0107Z" fill="#2C8A5D" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M191.284 637.14C363.896 670.312 530.301 555.072 562.959 379.746" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M1067.53 31.315C1079.28 -31.7734 1038.45 -92.5935 976.34 -104.529" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M1067.53 31.3152C1079.28 -31.7732 1139.16 -73.2399 1201.27 -61.304" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M1200.81 -61.3848C1238.02 -54.2335 1262.48 -17.794 1255.44 20.0045" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M563.367 379.825C590.054 236.556 726.032 142.388 867.082 169.494" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M563.307 379.813C589.994 236.544 497.283 98.428 356.233 71.3223" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M356.22 71.3117C262.985 53.3947 201.704 -37.9011 219.344 -132.602" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M356.219 71.3197C262.985 53.4027 173.102 115.647 155.463 210.349" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M866.861 169.451C960.095 187.368 1021.38 278.664 1003.74 373.364" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M866.862 169.443C960.097 187.36 1049.98 125.115 1067.62 30.4141" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M1159.26 489.332C1283.32 529.208 1415.72 459.377 1454.98 333.361C1494.24 207.345 1425.49 72.8635 1301.42 32.9883" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M865.568 -109.047C713.86 -103.626 595.203 25.6866 600.541 179.781C605.878 333.875 733.189 454.398 884.896 448.977" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M162.996 651.822C177.874 651.822 189.935 639.571 189.935 624.46C189.935 609.348 177.874 597.098 162.996 597.098C148.119 597.098 136.058 609.348 136.058 624.46C136.058 639.571 148.119 651.822 162.996 651.822Z" fill="#2C8A5D" stroke="#2C8A5D" stroke-width="2" stroke-miterlimit="10"/>
+</g>
+</g>
+<path d="M2 1H1V2V642V643H2H1282H1283V642V2V1H1282H2Z" fill="#CCD6C4" fill-opacity="0.9" stroke="black" stroke-width="2"/>
+<g clip-path="url(#clip0_1401_1739)">
+<path d="M1031.75 421.271H1016V538.867H1031.75V421.271Z" fill="black"/>
+<path d="M1090.38 495.968H1082.27C1065.52 495.968 1051.9 482.453 1051.9 465.838V421.234H1098.5C1115.25 421.234 1128.88 434.749 1128.88 451.365V463.029H1113.13V451.365C1113.13 443.367 1106.57 436.856 1098.5 436.856H1067.65V465.838C1067.65 473.835 1074.21 480.347 1082.27 480.347H1090.38V495.968ZM1130.45 508.635V494.6C1130.45 477.985 1116.83 464.47 1100.07 464.47H1090.38V480.091H1100.07C1108.14 480.091 1114.7 486.603 1114.7 494.6V508.635C1114.7 516.633 1108.14 523.144 1100.07 523.144H1067.65V496.99H1051.9V538.766H1100.07C1116.83 538.766 1130.45 525.251 1130.45 508.635Z" fill="black"/>
+<path d="M1184.09 540.999H1181.47C1161.13 540.999 1144.57 524.575 1144.57 504.394V455.596C1144.57 435.414 1161.13 418.99 1181.47 418.99H1184.09C1204.44 418.99 1221 435.414 1221 455.596H1205.25C1205.25 444.032 1195.76 434.621 1184.1 434.621H1181.48C1169.82 434.621 1160.33 444.032 1160.33 455.596V504.394C1160.33 515.957 1169.82 525.369 1181.48 525.369H1184.1C1195.76 525.369 1205.25 515.957 1205.25 504.394H1221C1221 524.575 1204.44 540.999 1184.09 540.999Z" fill="black"/>
+<path d="M1184.09 540.999H1181.47C1161.13 540.999 1144.57 524.575 1144.57 504.394V455.596C1144.57 435.414 1161.13 418.99 1181.47 418.99H1184.09C1204.44 418.99 1221 435.414 1221 455.596H1205.25C1205.25 444.032 1195.76 434.621 1184.1 434.621H1181.48C1169.82 434.621 1160.33 444.032 1160.33 455.596V504.394C1160.33 515.957 1169.82 525.369 1181.48 525.369H1184.1C1195.76 525.369 1205.25 515.957 1205.25 504.394H1221C1221 524.575 1204.44 540.999 1184.09 540.999Z" fill="black"/>
+</g>
+<path d="M45.568 371.368V366.728H80.032V371.368H65.76V413H60.736V371.368H45.568ZM86.6825 413V365.448H91.5145V384.776C92.0905 383.837 92.8585 382.963 93.8185 382.152C94.7998 381.341 95.9732 380.691 97.3385 380.2C98.7252 379.688 100.304 379.432 102.075 379.432C104.251 379.432 106.203 379.827 107.931 380.616C109.68 381.405 111.067 382.525 112.091 383.976C113.115 385.427 113.627 387.133 113.627 389.096V413H108.635V390.216C108.635 388.125 107.92 386.504 106.491 385.352C105.061 384.179 103.173 383.592 100.827 383.592C99.2265 383.592 97.7225 383.859 96.3145 384.392C94.9278 384.904 93.8078 385.683 92.9545 386.728C92.1012 387.752 91.6745 389.064 91.6745 390.664V413H86.6825ZM126.635 397.608C126.635 399.827 126.998 401.843 127.724 403.656C128.449 405.469 129.569 406.92 131.084 408.008C132.598 409.096 134.518 409.64 136.844 409.64C139.084 409.64 141.014 409.117 142.636 408.072C144.257 407.005 145.27 405.501 145.676 403.56H150.476C150.07 405.779 149.185 407.635 147.82 409.128C146.476 410.621 144.844 411.752 142.924 412.52C141.025 413.267 139.02 413.64 136.908 413.64C133.878 413.64 131.201 412.979 128.876 411.656C126.572 410.312 124.769 408.381 123.468 405.864C122.188 403.347 121.548 400.317 121.548 396.776C121.548 393.256 122.134 390.184 123.308 387.56C124.481 384.915 126.177 382.877 128.396 381.448C130.636 379.997 133.334 379.272 136.492 379.272C139.542 379.272 142.124 379.933 144.236 381.256C146.348 382.557 147.958 384.424 149.068 386.856C150.177 389.288 150.732 392.189 150.732 395.56V397.608H126.635ZM126.668 394.056H145.868C145.868 392.008 145.526 390.163 144.844 388.52C144.161 386.877 143.126 385.576 141.74 384.616C140.353 383.656 138.593 383.176 136.46 383.176C134.198 383.176 132.342 383.72 130.892 384.808C129.462 385.875 128.396 387.24 127.692 388.904C126.988 390.568 126.646 392.285 126.668 394.056ZM207.438 413H202.094L193.39 392.488H180.11V413H175.118V366.728H192.59C195.833 366.728 198.553 367.219 200.75 368.2C202.969 369.16 204.633 370.557 205.742 372.392C206.873 374.227 207.438 376.445 207.438 379.048C207.438 381.565 206.969 383.667 206.03 385.352C205.113 387.016 203.95 388.349 202.542 389.352C201.134 390.333 199.683 391.069 198.19 391.56L207.438 413ZM190.606 388.2C194.361 388.2 197.241 387.485 199.246 386.056C201.273 384.605 202.286 382.387 202.286 379.4C202.286 376.52 201.401 374.397 199.63 373.032C197.859 371.645 195.385 370.952 192.206 370.952H180.11V388.2H190.606ZM228.405 413.64C226.634 413.619 224.981 413.373 223.445 412.904C221.909 412.413 220.554 411.699 219.381 410.76C218.229 409.8 217.322 408.616 216.661 407.208C216.021 405.779 215.701 404.125 215.701 402.248V379.912H220.693V401.8C220.693 404.125 221.397 406.013 222.805 407.464C224.213 408.893 226.378 409.608 229.301 409.608C231.904 409.608 233.994 408.936 235.573 407.592C237.152 406.227 237.941 404.168 237.941 401.416V379.912H242.901V413H238.869L238.357 406.728C237.973 408.307 237.301 409.608 236.341 410.632C235.402 411.656 234.25 412.424 232.885 412.936C231.541 413.427 230.048 413.661 228.405 413.64ZM264.012 413.64C261.708 413.64 259.585 413.288 257.644 412.584C255.724 411.859 254.135 410.76 252.876 409.288C251.639 407.795 250.86 405.896 250.54 403.592H255.18C255.479 404.915 256.023 406.035 256.812 406.952C257.601 407.869 258.604 408.573 259.82 409.064C261.057 409.533 262.455 409.768 264.012 409.768C266.359 409.768 268.247 409.32 269.676 408.424C271.105 407.507 271.82 406.109 271.82 404.232C271.82 402.931 271.447 401.885 270.7 401.096C269.975 400.307 268.865 399.731 267.372 399.368L260.236 397.544C257.633 396.883 255.564 395.891 254.028 394.568C252.492 393.224 251.713 391.357 251.692 388.968C251.692 387.069 252.14 385.395 253.036 383.944C253.953 382.493 255.319 381.352 257.132 380.52C258.945 379.688 261.217 379.272 263.948 379.272C267.425 379.272 270.231 380.051 272.364 381.608C274.497 383.165 275.628 385.491 275.756 388.584H271.212C270.999 386.899 270.273 385.565 269.036 384.584C267.799 383.581 266.092 383.08 263.916 383.08C261.676 383.08 259.852 383.539 258.444 384.456C257.057 385.373 256.364 386.792 256.364 388.712C256.364 389.992 256.844 390.995 257.804 391.72C258.764 392.424 260.161 393.011 261.996 393.48L268.972 395.304C270.423 395.688 271.617 396.2 272.556 396.84C273.516 397.459 274.273 398.163 274.828 398.952C275.404 399.72 275.809 400.541 276.044 401.416C276.3 402.291 276.428 403.133 276.428 403.944C276.428 405.928 275.948 407.645 274.988 409.096C274.028 410.547 272.62 411.667 270.764 412.456C268.929 413.245 266.679 413.64 264.012 413.64ZM300.225 383.656H292.737V405C292.737 406.28 292.854 407.219 293.089 407.816C293.345 408.392 293.782 408.765 294.401 408.936C295.041 409.085 295.926 409.16 297.057 409.16H300.449V412.616C300.044 412.765 299.436 412.893 298.625 413C297.836 413.085 296.886 413.128 295.777 413.128C293.665 413.128 292.022 412.829 290.849 412.232C289.697 411.635 288.886 410.749 288.417 409.576C287.948 408.403 287.713 406.931 287.713 405.16V383.656H282.337V379.912H287.841L289.025 370.376H292.737V379.88H300.225V383.656ZM329.845 379.912V413H324.981V379.912H329.845ZM330.005 366.76V372.264H324.757V366.76H330.005ZM341.183 413V379.912H345.983V384.744C346.857 383.272 348.073 381.992 349.631 380.904C351.209 379.816 353.279 379.272 355.839 379.272C357.076 379.272 358.324 379.475 359.583 379.88C360.841 380.285 361.993 380.893 363.039 381.704C364.084 382.515 364.884 383.517 365.439 384.712C366.463 383.048 367.849 381.725 369.599 380.744C371.348 379.763 373.332 379.272 375.551 379.272C376.703 379.272 377.897 379.443 379.135 379.784C380.393 380.125 381.567 380.733 382.655 381.608C383.743 382.461 384.617 383.688 385.279 385.288C385.961 386.867 386.303 388.904 386.303 391.4V413H381.311V391.848C381.311 389.651 380.969 387.965 380.287 386.792C379.604 385.597 378.719 384.765 377.631 384.296C376.543 383.827 375.38 383.592 374.143 383.592C373.033 383.592 371.86 383.805 370.623 384.232C369.407 384.637 368.361 385.352 367.487 386.376C366.633 387.4 366.207 388.819 366.207 390.632V413H361.215V389.864C361.215 388.477 360.841 387.325 360.095 386.408C359.369 385.469 358.463 384.765 357.375 384.296C356.287 383.827 355.199 383.592 354.111 383.592C352.916 383.592 351.7 383.827 350.463 384.296C349.247 384.765 348.223 385.523 347.391 386.568C346.58 387.613 346.175 388.968 346.175 390.632V413H341.183ZM395.995 423.304V379.912H400.955L401.051 385.96C401.371 385.299 401.819 384.584 402.395 383.816C402.992 383.048 403.739 382.323 404.635 381.64C405.531 380.936 406.587 380.371 407.803 379.944C409.04 379.496 410.459 379.272 412.059 379.272C414.747 379.272 417.115 379.869 419.163 381.064C421.211 382.259 422.8 384.093 423.931 386.568C425.083 389.043 425.659 392.179 425.659 395.976C425.659 399.688 425.115 402.867 424.027 405.512C422.96 408.136 421.392 410.152 419.323 411.56C417.254 412.947 414.726 413.64 411.739 413.64C410.139 413.64 408.742 413.416 407.547 412.968C406.352 412.52 405.328 411.933 404.475 411.208C403.622 410.483 402.918 409.736 402.363 408.968C401.808 408.179 401.36 407.432 401.019 406.728V423.304H395.995ZM410.907 409.64C413.83 409.64 416.198 408.541 418.011 406.344C419.846 404.147 420.763 400.755 420.763 396.168C420.763 392.243 419.931 389.117 418.267 386.792C416.624 384.445 414.171 383.272 410.907 383.272C407.664 383.272 405.19 384.456 403.483 386.824C401.798 389.192 400.955 392.307 400.955 396.168C400.955 398.685 401.328 400.968 402.075 403.016C402.843 405.043 403.963 406.653 405.435 407.848C406.907 409.043 408.731 409.64 410.907 409.64ZM441.552 413.352C439.973 413.352 438.672 413.128 437.648 412.68C436.645 412.211 435.856 411.571 435.28 410.76C434.725 409.949 434.341 409.021 434.128 407.976C433.914 406.931 433.808 405.832 433.808 404.68V365.448H438.736V404.264C438.736 406.077 439.077 407.411 439.76 408.264C440.442 409.096 441.338 409.544 442.448 409.608L444.304 409.64V412.904C443.834 413.053 443.354 413.16 442.864 413.224C442.373 413.309 441.936 413.352 441.552 413.352ZM455.135 397.608C455.135 399.827 455.498 401.843 456.224 403.656C456.949 405.469 458.069 406.92 459.584 408.008C461.098 409.096 463.018 409.64 465.344 409.64C467.584 409.64 469.514 409.117 471.136 408.072C472.757 407.005 473.77 405.501 474.176 403.56H478.976C478.57 405.779 477.685 407.635 476.32 409.128C474.976 410.621 473.344 411.752 471.424 412.52C469.525 413.267 467.52 413.64 465.408 413.64C462.378 413.64 459.701 412.979 457.376 411.656C455.072 410.312 453.269 408.381 451.968 405.864C450.688 403.347 450.048 400.317 450.048 396.776C450.048 393.256 450.634 390.184 451.808 387.56C452.981 384.915 454.677 382.877 456.896 381.448C459.136 379.997 461.834 379.272 464.992 379.272C468.042 379.272 470.624 379.933 472.736 381.256C474.848 382.557 476.458 384.424 477.568 386.856C478.677 389.288 479.232 392.189 479.232 395.56V397.608H455.135ZM455.168 394.056H474.368C474.368 392.008 474.026 390.163 473.344 388.52C472.661 386.877 471.626 385.576 470.24 384.616C468.853 383.656 467.093 383.176 464.96 383.176C462.698 383.176 460.842 383.72 459.392 384.808C457.962 385.875 456.896 387.24 456.192 388.904C455.488 390.568 455.146 392.285 455.168 394.056ZM487.745 413V379.912H492.545V384.744C493.42 383.272 494.636 381.992 496.193 380.904C497.772 379.816 499.841 379.272 502.401 379.272C503.638 379.272 504.886 379.475 506.145 379.88C507.404 380.285 508.556 380.893 509.601 381.704C510.646 382.515 511.446 383.517 512.001 384.712C513.025 383.048 514.412 381.725 516.161 380.744C517.91 379.763 519.894 379.272 522.113 379.272C523.265 379.272 524.46 379.443 525.697 379.784C526.956 380.125 528.129 380.733 529.217 381.608C530.305 382.461 531.18 383.688 531.841 385.288C532.524 386.867 532.865 388.904 532.865 391.4V413H527.873V391.848C527.873 389.651 527.532 387.965 526.849 386.792C526.166 385.597 525.281 384.765 524.193 384.296C523.105 383.827 521.942 383.592 520.705 383.592C519.596 383.592 518.422 383.805 517.185 384.232C515.969 384.637 514.924 385.352 514.049 386.376C513.196 387.4 512.769 388.819 512.769 390.632V413H507.777V389.864C507.777 388.477 507.404 387.325 506.657 386.408C505.932 385.469 505.025 384.765 503.937 384.296C502.849 383.827 501.761 383.592 500.673 383.592C499.478 383.592 498.262 383.827 497.025 384.296C495.809 384.765 494.785 385.523 493.953 386.568C493.142 387.613 492.737 388.968 492.737 390.632V413H487.745ZM545.885 397.608C545.885 399.827 546.248 401.843 546.974 403.656C547.699 405.469 548.819 406.92 550.334 408.008C551.848 409.096 553.768 409.64 556.094 409.64C558.334 409.64 560.264 409.117 561.886 408.072C563.507 407.005 564.52 405.501 564.926 403.56H569.726C569.32 405.779 568.435 407.635 567.07 409.128C565.726 410.621 564.094 411.752 562.174 412.52C560.275 413.267 558.27 413.64 556.158 413.64C553.128 413.64 550.451 412.979 548.126 411.656C545.822 410.312 544.019 408.381 542.718 405.864C541.438 403.347 540.798 400.317 540.798 396.776C540.798 393.256 541.384 390.184 542.558 387.56C543.731 384.915 545.427 382.877 547.646 381.448C549.886 379.997 552.584 379.272 555.742 379.272C558.792 379.272 561.374 379.933 563.486 381.256C565.598 382.557 567.208 384.424 568.318 386.856C569.427 389.288 569.982 392.189 569.982 395.56V397.608H545.885ZM545.918 394.056H565.118C565.118 392.008 564.776 390.163 564.094 388.52C563.411 386.877 562.376 385.576 560.99 384.616C559.603 383.656 557.843 383.176 555.71 383.176C553.448 383.176 551.592 383.72 550.142 384.808C548.712 385.875 547.646 387.24 546.942 388.904C546.238 390.568 545.896 392.285 545.918 394.056ZM578.495 413V379.912H583.295V384.744C583.85 383.784 584.607 382.899 585.567 382.088C586.548 381.277 587.732 380.627 589.119 380.136C590.527 379.645 592.106 379.4 593.855 379.4C595.988 379.4 597.93 379.827 599.679 380.68C601.45 381.512 602.858 382.813 603.903 384.584C604.948 386.355 605.471 388.627 605.471 391.4V413H600.479V391.848C600.479 389.032 599.764 386.952 598.335 385.608C596.906 384.264 595.018 383.592 592.671 383.592C591.071 383.592 589.567 383.848 588.159 384.36C586.751 384.872 585.62 385.651 584.767 386.696C583.914 387.741 583.487 389.053 583.487 390.632V413H578.495ZM629.413 383.656H621.925V405C621.925 406.28 622.042 407.219 622.277 407.816C622.533 408.392 622.97 408.765 623.589 408.936C624.229 409.085 625.114 409.16 626.245 409.16H629.637V412.616C629.231 412.765 628.623 412.893 627.812 413C627.023 413.085 626.074 413.128 624.965 413.128C622.853 413.128 621.21 412.829 620.037 412.232C618.885 411.635 618.074 410.749 617.605 409.576C617.135 408.403 616.901 406.931 616.901 405.16V383.656H611.525V379.912H617.029L618.213 370.376H621.925V379.88H629.413V383.656ZM647.176 413.64C645.021 413.64 643.133 413.267 641.512 412.52C639.891 411.752 638.621 410.664 637.704 409.256C636.808 407.848 636.36 406.152 636.36 404.168C636.36 400.499 637.608 397.779 640.104 396.008C642.621 394.237 646.685 393.277 652.296 393.128L658.696 392.936V390.184C658.696 388.029 658.035 386.312 656.712 385.032C655.411 383.731 653.395 383.091 650.664 383.112C648.616 383.112 646.835 383.592 645.32 384.552C643.827 385.491 642.877 387.005 642.472 389.096H637.928C638.056 387.027 638.643 385.267 639.688 383.816C640.733 382.344 642.205 381.224 644.104 380.456C646.003 379.667 648.275 379.272 650.92 379.272C653.651 379.272 655.944 379.677 657.8 380.488C659.677 381.277 661.096 382.472 662.056 384.072C663.016 385.651 663.496 387.613 663.496 389.96V413H659.208L658.856 406.632C657.533 409.256 655.848 411.08 653.8 412.104C651.773 413.128 649.565 413.64 647.176 413.64ZM648.584 409.896C649.779 409.896 650.963 409.683 652.136 409.256C653.331 408.829 654.419 408.243 655.4 407.496C656.381 406.749 657.171 405.917 657.768 405C658.365 404.083 658.675 403.144 658.696 402.184V396.296L653.352 396.392C650.557 396.435 648.264 396.712 646.472 397.224C644.701 397.736 643.379 398.525 642.504 399.592C641.651 400.637 641.224 402.013 641.224 403.72C641.224 405.661 641.907 407.176 643.272 408.264C644.637 409.352 646.408 409.896 648.584 409.896ZM688.35 383.656H680.862V405C680.862 406.28 680.979 407.219 681.214 407.816C681.47 408.392 681.907 408.765 682.526 408.936C683.166 409.085 684.051 409.16 685.182 409.16H688.574V412.616C688.169 412.765 687.561 412.893 686.75 413C685.961 413.085 685.011 413.128 683.902 413.128C681.79 413.128 680.147 412.829 678.974 412.232C677.822 411.635 677.011 410.749 676.542 409.576C676.073 408.403 675.838 406.931 675.838 405.16V383.656H670.462V379.912H675.966L677.15 370.376H680.862V379.88H688.35V383.656ZM702.908 379.912V413H698.044V379.912H702.908ZM703.068 366.76V372.264H697.82V366.76H703.068ZM726.672 413.64C723.685 413.64 721.061 413 718.8 411.72C716.56 410.419 714.821 408.499 713.584 405.96C712.346 403.421 711.728 400.296 711.728 396.584C711.728 393.128 712.293 390.099 713.424 387.496C714.576 384.893 716.261 382.877 718.48 381.448C720.698 379.997 723.44 379.272 726.704 379.272C729.69 379.272 732.282 379.933 734.48 381.256C736.698 382.557 738.416 384.499 739.632 387.08C740.869 389.64 741.488 392.808 741.488 396.584C741.488 399.955 740.933 402.92 739.824 405.48C738.714 408.04 737.061 410.045 734.864 411.496C732.688 412.925 729.957 413.64 726.672 413.64ZM726.704 409.608C728.773 409.608 730.533 409.096 731.984 408.072C733.456 407.048 734.576 405.555 735.344 403.592C736.133 401.629 736.528 399.251 736.528 396.456C736.528 393.939 736.186 391.688 735.504 389.704C734.821 387.72 733.754 386.163 732.304 385.032C730.853 383.88 728.986 383.304 726.704 383.304C724.592 383.304 722.789 383.816 721.296 384.84C719.824 385.843 718.693 387.325 717.904 389.288C717.114 391.251 716.72 393.64 716.72 396.456C716.72 398.973 717.061 401.224 717.744 403.208C718.448 405.171 719.536 406.728 721.008 407.88C722.48 409.032 724.378 409.608 726.704 409.608ZM749.62 413V379.912H754.42V384.744C754.975 383.784 755.732 382.899 756.692 382.088C757.673 381.277 758.857 380.627 760.244 380.136C761.652 379.645 763.231 379.4 764.98 379.4C767.113 379.4 769.055 379.827 770.804 380.68C772.575 381.512 773.983 382.813 775.028 384.584C776.073 386.355 776.596 388.627 776.596 391.4V413H771.604V391.848C771.604 389.032 770.889 386.952 769.46 385.608C768.031 384.264 766.143 383.592 763.796 383.592C762.196 383.592 760.692 383.848 759.284 384.36C757.876 384.872 756.745 385.651 755.892 386.696C755.039 387.741 754.612 389.053 754.612 390.632V413H749.62ZM813.234 413.64C810.247 413.64 807.623 413 805.362 411.72C803.122 410.419 801.383 408.499 800.146 405.96C798.909 403.421 798.29 400.296 798.29 396.584C798.29 393.128 798.855 390.099 799.986 387.496C801.138 384.893 802.823 382.877 805.042 381.448C807.261 379.997 810.002 379.272 813.266 379.272C816.253 379.272 818.845 379.933 821.042 381.256C823.261 382.557 824.978 384.499 826.194 387.08C827.431 389.64 828.05 392.808 828.05 396.584C828.05 399.955 827.495 402.92 826.386 405.48C825.277 408.04 823.623 410.045 821.426 411.496C819.25 412.925 816.519 413.64 813.234 413.64ZM813.266 409.608C815.335 409.608 817.095 409.096 818.546 408.072C820.018 407.048 821.138 405.555 821.906 403.592C822.695 401.629 823.09 399.251 823.09 396.456C823.09 393.939 822.749 391.688 822.066 389.704C821.383 387.72 820.317 386.163 818.866 385.032C817.415 383.88 815.549 383.304 813.266 383.304C811.154 383.304 809.351 383.816 807.858 384.84C806.386 385.843 805.255 387.325 804.466 389.288C803.677 391.251 803.282 393.64 803.282 396.456C803.282 398.973 803.623 401.224 804.306 403.208C805.01 405.171 806.098 406.728 807.57 407.88C809.042 409.032 810.941 409.608 813.266 409.608ZM853.08 379.912V383.656H844.76V413H839.768V383.656H832.536V379.912H839.768V374.664C839.768 372.061 840.408 370.088 841.688 368.744C842.968 367.4 844.92 366.728 847.544 366.728H853.4V370.376H848.312C846.904 370.376 845.944 370.76 845.432 371.528C844.941 372.275 844.696 373.405 844.696 374.92V379.912H853.08ZM65.6 447.656H58.112V469C58.112 470.28 58.2293 471.219 58.464 471.816C58.72 472.392 59.1573 472.765 59.776 472.936C60.416 473.085 61.3013 473.16 62.432 473.16H65.824V476.616C65.4187 476.765 64.8107 476.893 64 477C63.2107 477.085 62.2613 477.128 61.152 477.128C59.04 477.128 57.3973 476.829 56.224 476.232C55.072 475.635 54.2613 474.749 53.792 473.576C53.3227 472.403 53.088 470.931 53.088 469.16V447.656H47.712V443.912H53.216L54.4 434.376H58.112V443.88H65.6V447.656ZM74.5575 477V429.448H79.3895V448.776C79.9655 447.837 80.7335 446.963 81.6935 446.152C82.6748 445.341 83.8482 444.691 85.2135 444.2C86.6002 443.688 88.1788 443.432 89.9495 443.432C92.1255 443.432 94.0775 443.827 95.8055 444.616C97.5548 445.405 98.9415 446.525 99.9655 447.976C100.99 449.427 101.502 451.133 101.502 453.096V477H96.5095V454.216C96.5095 452.125 95.7948 450.504 94.3655 449.352C92.9362 448.179 91.0482 447.592 88.7015 447.592C87.1015 447.592 85.5975 447.859 84.1895 448.392C82.8028 448.904 81.6828 449.683 80.8295 450.728C79.9762 451.752 79.5495 453.064 79.5495 454.664V477H74.5575ZM114.51 461.608C114.51 463.827 114.873 465.843 115.599 467.656C116.324 469.469 117.444 470.92 118.959 472.008C120.473 473.096 122.393 473.64 124.719 473.64C126.959 473.64 128.889 473.117 130.511 472.072C132.132 471.005 133.145 469.501 133.551 467.56H138.351C137.945 469.779 137.06 471.635 135.695 473.128C134.351 474.621 132.719 475.752 130.799 476.52C128.9 477.267 126.895 477.64 124.783 477.64C121.753 477.64 119.076 476.979 116.751 475.656C114.447 474.312 112.644 472.381 111.343 469.864C110.063 467.347 109.423 464.317 109.423 460.776C109.423 457.256 110.009 454.184 111.183 451.56C112.356 448.915 114.052 446.877 116.271 445.448C118.511 443.997 121.209 443.272 124.367 443.272C127.417 443.272 129.999 443.933 132.111 445.256C134.223 446.557 135.833 448.424 136.943 450.856C138.052 453.288 138.607 456.189 138.607 459.56V461.608H114.51ZM114.543 458.056H133.743C133.743 456.008 133.401 454.163 132.719 452.52C132.036 450.877 131.001 449.576 129.615 448.616C128.228 447.656 126.468 447.176 124.335 447.176C122.073 447.176 120.217 447.72 118.767 448.808C117.337 449.875 116.271 451.24 115.567 452.904C114.863 454.568 114.521 456.285 114.543 458.056ZM162.993 430.728H167.985V477H162.993V430.728ZM179.433 477V443.912H184.233V448.744C184.787 447.784 185.545 446.899 186.505 446.088C187.486 445.277 188.67 444.627 190.057 444.136C191.465 443.645 193.043 443.4 194.793 443.4C196.926 443.4 198.867 443.827 200.617 444.68C202.387 445.512 203.795 446.813 204.841 448.584C205.886 450.355 206.409 452.627 206.409 455.4V477H201.417V455.848C201.417 453.032 200.702 450.952 199.273 449.608C197.843 448.264 195.955 447.592 193.609 447.592C192.009 447.592 190.505 447.848 189.097 448.36C187.689 448.872 186.558 449.651 185.705 450.696C184.851 451.741 184.425 453.053 184.425 454.632V477H179.433ZM230.35 447.656H222.862V469C222.862 470.28 222.979 471.219 223.214 471.816C223.47 472.392 223.907 472.765 224.526 472.936C225.166 473.085 226.051 473.16 227.182 473.16H230.574V476.616C230.169 476.765 229.561 476.893 228.75 477C227.961 477.085 227.011 477.128 225.902 477.128C223.79 477.128 222.147 476.829 220.974 476.232C219.822 475.635 219.011 474.749 218.542 473.576C218.073 472.403 217.838 470.931 217.838 469.16V447.656H212.462V443.912H217.966L219.15 434.376H222.862V443.88H230.35V447.656ZM241.823 461.608C241.823 463.827 242.186 465.843 242.911 467.656C243.636 469.469 244.756 470.92 246.271 472.008C247.786 473.096 249.706 473.64 252.031 473.64C254.271 473.64 256.202 473.117 257.823 472.072C259.444 471.005 260.458 469.501 260.863 467.56H265.663C265.258 469.779 264.372 471.635 263.007 473.128C261.663 474.621 260.031 475.752 258.111 476.52C256.212 477.267 254.207 477.64 252.095 477.64C249.066 477.64 246.388 476.979 244.063 475.656C241.759 474.312 239.956 472.381 238.655 469.864C237.375 467.347 236.735 464.317 236.735 460.776C236.735 457.256 237.322 454.184 238.495 451.56C239.668 448.915 241.364 446.877 243.583 445.448C245.823 443.997 248.522 443.272 251.679 443.272C254.73 443.272 257.311 443.933 259.423 445.256C261.535 446.557 263.146 448.424 264.255 450.856C265.364 453.288 265.919 456.189 265.919 459.56V461.608H241.823ZM241.855 458.056H261.055C261.055 456.008 260.714 454.163 260.031 452.52C259.348 450.877 258.314 449.576 256.927 448.616C255.54 447.656 253.78 447.176 251.647 447.176C249.386 447.176 247.53 447.72 246.079 448.808C244.65 449.875 243.583 451.24 242.879 452.904C242.175 454.568 241.834 456.285 241.855 458.056ZM274.433 477V443.912H279.169V449.896C279.723 448.339 280.502 447.08 281.505 446.12C282.529 445.139 283.67 444.424 284.929 443.976C286.209 443.507 287.499 443.272 288.801 443.272C289.334 443.272 289.857 443.315 290.369 443.4C290.881 443.464 291.286 443.581 291.585 443.752V448.616C291.243 448.445 290.785 448.328 290.209 448.264C289.654 448.2 289.185 448.168 288.801 448.168C287.627 448.104 286.486 448.189 285.377 448.424C284.267 448.659 283.254 449.075 282.337 449.672C281.441 450.269 280.726 451.069 280.193 452.072C279.681 453.075 279.425 454.301 279.425 455.752V477H274.433ZM310.154 458.408V462.472L294.25 462.504V458.44L310.154 458.408ZM320.493 477V430.728H334.861C340.365 430.728 344.557 431.763 347.437 433.832C350.338 435.88 351.789 438.856 351.789 442.76C351.789 445.256 351.128 447.389 349.805 449.16C348.504 450.931 346.253 452.349 343.053 453.416C344.845 453.779 346.37 454.312 347.629 455.016C348.888 455.72 349.901 456.552 350.669 457.512C351.458 458.472 352.024 459.549 352.365 460.744C352.728 461.939 352.909 463.219 352.909 464.584C352.909 468.744 351.416 471.859 348.429 473.928C345.442 475.976 341.048 477 335.245 477H320.493ZM325.485 472.68H335.117C339.277 472.68 342.445 472.029 344.621 470.728C346.797 469.405 347.885 467.325 347.885 464.488C347.885 462.397 347.341 460.712 346.253 459.432C345.186 458.152 343.746 457.224 341.933 456.648C340.12 456.072 338.104 455.784 335.885 455.784H325.485V472.68ZM325.485 451.4H335.885C337.165 451.4 338.445 451.283 339.725 451.048C341.026 450.792 342.221 450.365 343.309 449.768C344.397 449.171 345.272 448.36 345.933 447.336C346.594 446.291 346.925 444.979 346.925 443.4C346.925 440.499 345.816 438.376 343.597 437.032C341.4 435.667 338.53 434.984 334.989 434.984H325.485V451.4ZM369.614 477.352C368.035 477.352 366.734 477.128 365.71 476.68C364.707 476.211 363.918 475.571 363.342 474.76C362.787 473.949 362.403 473.021 362.19 471.976C361.977 470.931 361.87 469.832 361.87 468.68V429.448H366.798V468.264C366.798 470.077 367.139 471.411 367.822 472.264C368.505 473.096 369.401 473.544 370.51 473.608L372.366 473.64V476.904C371.897 477.053 371.417 477.16 370.926 477.224C370.435 477.309 369.998 477.352 369.614 477.352ZM392.734 477.64C389.747 477.64 387.123 477 384.862 475.72C382.622 474.419 380.883 472.499 379.646 469.96C378.409 467.421 377.79 464.296 377.79 460.584C377.79 457.128 378.355 454.099 379.486 451.496C380.638 448.893 382.323 446.877 384.542 445.448C386.761 443.997 389.502 443.272 392.766 443.272C395.753 443.272 398.345 443.933 400.542 445.256C402.761 446.557 404.478 448.499 405.694 451.08C406.931 453.64 407.55 456.808 407.55 460.584C407.55 463.955 406.995 466.92 405.886 469.48C404.777 472.04 403.123 474.045 400.926 475.496C398.75 476.925 396.019 477.64 392.734 477.64ZM392.766 473.608C394.835 473.608 396.595 473.096 398.046 472.072C399.518 471.048 400.638 469.555 401.406 467.592C402.195 465.629 402.59 463.251 402.59 460.456C402.59 457.939 402.249 455.688 401.566 453.704C400.883 451.72 399.817 450.163 398.366 449.032C396.915 447.88 395.049 447.304 392.766 447.304C390.654 447.304 388.851 447.816 387.358 448.84C385.886 449.843 384.755 451.325 383.966 453.288C383.177 455.251 382.782 457.64 382.782 460.456C382.782 462.973 383.123 465.224 383.806 467.208C384.51 469.171 385.598 470.728 387.07 471.88C388.542 473.032 390.441 473.608 392.766 473.608ZM428.611 443.272C430.893 443.272 432.963 443.699 434.819 444.552C436.675 445.405 438.211 446.632 439.427 448.232C440.643 449.811 441.421 451.72 441.763 453.96H437.187C436.973 452.723 436.493 451.613 435.747 450.632C435 449.629 434.019 448.84 432.803 448.264C431.608 447.688 430.221 447.4 428.642 447.4C425.635 447.4 423.181 448.477 421.283 450.632C419.405 452.765 418.467 456.061 418.467 460.52C418.467 464.509 419.32 467.709 421.027 470.12C422.755 472.509 425.315 473.704 428.707 473.704C430.285 473.704 431.672 473.416 432.867 472.84C434.083 472.243 435.064 471.453 435.811 470.472C436.557 469.469 437.027 468.371 437.219 467.176H441.731C441.411 469.352 440.632 471.229 439.395 472.808C438.157 474.365 436.611 475.56 434.755 476.392C432.92 477.224 430.872 477.64 428.611 477.64C425.667 477.64 423.064 477 420.803 475.72C418.541 474.44 416.771 472.531 415.491 469.992C414.232 467.453 413.603 464.307 413.603 460.552C413.603 457.117 414.179 454.109 415.331 451.528C416.483 448.925 418.168 446.899 420.387 445.448C422.627 443.997 425.368 443.272 428.611 443.272ZM478.439 477H473.031L462.279 459.752L455.143 467.08V477H450.183V429.448H455.143V461.224L471.623 443.912H477.511L465.607 456.36L478.439 477ZM497.486 443.272C499.768 443.272 501.838 443.699 503.694 444.552C505.55 445.405 507.086 446.632 508.302 448.232C509.518 449.811 510.296 451.72 510.638 453.96H506.062C505.848 452.723 505.368 451.613 504.622 450.632C503.875 449.629 502.894 448.84 501.678 448.264C500.483 447.688 499.096 447.4 497.517 447.4C494.51 447.4 492.056 448.477 490.158 450.632C488.28 452.765 487.342 456.061 487.342 460.52C487.342 464.509 488.195 467.709 489.902 470.12C491.63 472.509 494.19 473.704 497.582 473.704C499.16 473.704 500.547 473.416 501.742 472.84C502.958 472.243 503.939 471.453 504.686 470.472C505.432 469.469 505.902 468.371 506.094 467.176H510.606C510.286 469.352 509.507 471.229 508.27 472.808C507.032 474.365 505.486 475.56 503.63 476.392C501.795 477.224 499.747 477.64 497.486 477.64C494.542 477.64 491.939 477 489.678 475.72C487.416 474.44 485.646 472.531 484.366 469.992C483.107 467.453 482.478 464.307 482.478 460.552C482.478 457.117 483.054 454.109 484.206 451.528C485.358 448.925 487.043 446.899 489.262 445.448C491.502 443.997 494.243 443.272 497.486 443.272ZM519.058 477V429.448H523.89V448.776C524.466 447.837 525.234 446.963 526.194 446.152C527.175 445.341 528.348 444.691 529.714 444.2C531.1 443.688 532.679 443.432 534.45 443.432C536.626 443.432 538.578 443.827 540.306 444.616C542.055 445.405 543.442 446.525 544.466 447.976C545.49 449.427 546.002 451.133 546.002 453.096V477H541.01V454.216C541.01 452.125 540.295 450.504 538.866 449.352C537.436 448.179 535.548 447.592 533.202 447.592C531.602 447.592 530.098 447.859 528.69 448.392C527.303 448.904 526.183 449.683 525.33 450.728C524.476 451.752 524.05 453.064 524.05 454.664V477H519.058ZM564.676 477.64C562.521 477.64 560.633 477.267 559.012 476.52C557.391 475.752 556.121 474.664 555.204 473.256C554.308 471.848 553.86 470.152 553.86 468.168C553.86 464.499 555.108 461.779 557.604 460.008C560.121 458.237 564.185 457.277 569.796 457.128L576.196 456.936V454.184C576.196 452.029 575.535 450.312 574.212 449.032C572.911 447.731 570.895 447.091 568.164 447.112C566.116 447.112 564.335 447.592 562.82 448.552C561.327 449.491 560.377 451.005 559.972 453.096H555.428C555.556 451.027 556.143 449.267 557.188 447.816C558.233 446.344 559.705 445.224 561.604 444.456C563.503 443.667 565.775 443.272 568.42 443.272C571.151 443.272 573.444 443.677 575.3 444.488C577.177 445.277 578.596 446.472 579.556 448.072C580.516 449.651 580.996 451.613 580.996 453.96V477H576.708L576.356 470.632C575.033 473.256 573.348 475.08 571.3 476.104C569.273 477.128 567.065 477.64 564.676 477.64ZM566.084 473.896C567.279 473.896 568.463 473.683 569.636 473.256C570.831 472.829 571.919 472.243 572.9 471.496C573.881 470.749 574.671 469.917 575.268 469C575.865 468.083 576.175 467.144 576.196 466.184V460.296L570.852 460.392C568.057 460.435 565.764 460.712 563.972 461.224C562.201 461.736 560.879 462.525 560.004 463.592C559.151 464.637 558.724 466.013 558.724 467.72C558.724 469.661 559.407 471.176 560.772 472.264C562.137 473.352 563.908 473.896 566.084 473.896ZM597.158 443.912V477H592.294V443.912H597.158ZM597.318 430.76V436.264H592.07V430.76H597.318ZM608.495 477V443.912H613.295V448.744C613.85 447.784 614.607 446.899 615.567 446.088C616.548 445.277 617.732 444.627 619.119 444.136C620.527 443.645 622.106 443.4 623.855 443.4C625.988 443.4 627.93 443.827 629.679 444.68C631.45 445.512 632.858 446.813 633.903 448.584C634.948 450.355 635.471 452.627 635.471 455.4V477H630.479V455.848C630.479 453.032 629.764 450.952 628.335 449.608C626.906 448.264 625.018 447.592 622.671 447.592C621.071 447.592 619.567 447.848 618.159 448.36C616.751 448.872 615.62 449.651 614.767 450.696C613.914 451.741 613.487 453.053 613.487 454.632V477H608.495ZM66.88 494.088C70.08 494.088 72.9173 494.76 75.392 496.104C77.8667 497.448 79.8507 499.229 81.344 501.448C82.8373 503.667 83.7227 506.077 84 508.68H78.624C78.2613 506.824 77.5787 505.128 76.576 503.592C75.5947 502.056 74.2827 500.829 72.64 499.912C70.9973 498.995 69.0453 498.536 66.784 498.536C63.7973 498.536 61.28 499.229 59.232 500.616C57.2053 502.003 55.6693 504.125 54.624 506.984C53.6 509.821 53.088 513.437 53.088 517.832C53.088 524.445 54.24 529.32 56.544 532.456C58.8693 535.592 62.2827 537.16 66.784 537.16C69.0453 537.16 70.9973 536.691 72.64 535.752C74.2827 534.792 75.5947 533.533 76.576 531.976C77.5787 530.397 78.2613 528.68 78.624 526.824H84C83.7653 528.723 83.232 530.568 82.4 532.36C81.5893 534.131 80.4693 535.72 79.04 537.128C77.632 538.515 75.904 539.613 73.856 540.424C71.8293 541.235 69.504 541.64 66.88 541.64C62.7627 541.64 59.264 540.712 56.384 538.856C53.5253 536.979 51.3387 534.269 49.824 530.728C48.3093 527.165 47.552 522.845 47.552 517.768C47.552 512.691 48.2987 508.392 49.792 504.872C51.3067 501.352 53.504 498.675 56.384 496.84C59.264 495.005 62.7627 494.088 66.88 494.088ZM105.422 541.64C102.435 541.64 99.8108 541 97.5495 539.72C95.3095 538.419 93.5708 536.499 92.3335 533.96C91.0962 531.421 90.4775 528.296 90.4775 524.584C90.4775 521.128 91.0428 518.099 92.1735 515.496C93.3255 512.893 95.0108 510.877 97.2295 509.448C99.4482 507.997 102.19 507.272 105.454 507.272C108.44 507.272 111.032 507.933 113.23 509.256C115.448 510.557 117.166 512.499 118.382 515.08C119.619 517.64 120.238 520.808 120.238 524.584C120.238 527.955 119.683 530.92 118.574 533.48C117.464 536.04 115.811 538.045 113.614 539.496C111.438 540.925 108.707 541.64 105.422 541.64ZM105.454 537.608C107.523 537.608 109.283 537.096 110.734 536.072C112.206 535.048 113.326 533.555 114.094 531.592C114.883 529.629 115.278 527.251 115.278 524.456C115.278 521.939 114.936 519.688 114.254 517.704C113.571 515.72 112.504 514.163 111.054 513.032C109.603 511.88 107.736 511.304 105.454 511.304C103.342 511.304 101.539 511.816 100.046 512.84C98.5735 513.843 97.4428 515.325 96.6535 517.288C95.8642 519.251 95.4695 521.64 95.4695 524.456C95.4695 526.973 95.8108 529.224 96.4935 531.208C97.1975 533.171 98.2855 534.728 99.7575 535.88C101.23 537.032 103.128 537.608 105.454 537.608ZM128.37 541V507.912H133.17V512.744C134.045 511.272 135.261 509.992 136.818 508.904C138.397 507.816 140.466 507.272 143.026 507.272C144.263 507.272 145.511 507.475 146.77 507.88C148.029 508.285 149.181 508.893 150.226 509.704C151.271 510.515 152.071 511.517 152.626 512.712C153.65 511.048 155.037 509.725 156.786 508.744C158.535 507.763 160.519 507.272 162.738 507.272C163.89 507.272 165.085 507.443 166.322 507.784C167.581 508.125 168.754 508.733 169.842 509.608C170.93 510.461 171.805 511.688 172.466 513.288C173.149 514.867 173.49 516.904 173.49 519.4V541H168.498V519.848C168.498 517.651 168.157 515.965 167.474 514.792C166.791 513.597 165.906 512.765 164.818 512.296C163.73 511.827 162.567 511.592 161.33 511.592C160.221 511.592 159.047 511.805 157.81 512.232C156.594 512.637 155.549 513.352 154.674 514.376C153.821 515.4 153.394 516.819 153.394 518.632V541H148.402V517.864C148.402 516.477 148.029 515.325 147.282 514.408C146.557 513.469 145.65 512.765 144.562 512.296C143.474 511.827 142.386 511.592 141.298 511.592C140.103 511.592 138.887 511.827 137.65 512.296C136.434 512.765 135.41 513.523 134.578 514.568C133.767 515.613 133.362 516.968 133.362 518.632V541H128.37ZM183.183 541V507.912H187.983V512.744C188.857 511.272 190.073 509.992 191.631 508.904C193.209 507.816 195.279 507.272 197.839 507.272C199.076 507.272 200.324 507.475 201.583 507.88C202.841 508.285 203.993 508.893 205.039 509.704C206.084 510.515 206.884 511.517 207.439 512.712C208.463 511.048 209.849 509.725 211.599 508.744C213.348 507.763 215.332 507.272 217.551 507.272C218.703 507.272 219.897 507.443 221.135 507.784C222.393 508.125 223.567 508.733 224.655 509.608C225.743 510.461 226.617 511.688 227.279 513.288C227.961 514.867 228.303 516.904 228.303 519.4V541H223.311V519.848C223.311 517.651 222.969 515.965 222.287 514.792C221.604 513.597 220.719 512.765 219.631 512.296C218.543 511.827 217.38 511.592 216.143 511.592C215.033 511.592 213.86 511.805 212.623 512.232C211.407 512.637 210.361 513.352 209.487 514.376C208.633 515.4 208.207 516.819 208.207 518.632V541H203.215V517.864C203.215 516.477 202.841 515.325 202.095 514.408C201.369 513.469 200.463 512.765 199.375 512.296C198.287 511.827 197.199 511.592 196.111 511.592C194.916 511.592 193.7 511.827 192.463 512.296C191.247 512.765 190.223 513.523 189.391 514.568C188.58 515.613 188.175 516.968 188.175 518.632V541H183.183ZM249.593 541.64C247.822 541.619 246.169 541.373 244.633 540.904C243.097 540.413 241.742 539.699 240.569 538.76C239.417 537.8 238.51 536.616 237.849 535.208C237.209 533.779 236.889 532.125 236.889 530.248V507.912H241.881V529.8C241.881 532.125 242.585 534.013 243.993 535.464C245.401 536.893 247.566 537.608 250.489 537.608C253.091 537.608 255.182 536.936 256.761 535.592C258.339 534.227 259.129 532.168 259.129 529.416V507.912H264.089V541H260.057L259.545 534.728C259.161 536.307 258.489 537.608 257.529 538.632C256.59 539.656 255.438 540.424 254.073 540.936C252.729 541.427 251.235 541.661 249.593 541.64ZM274.245 541V507.912H279.045V512.744C279.6 511.784 280.357 510.899 281.317 510.088C282.298 509.277 283.482 508.627 284.869 508.136C286.277 507.645 287.856 507.4 289.605 507.4C291.738 507.4 293.68 507.827 295.429 508.68C297.2 509.512 298.608 510.813 299.653 512.584C300.698 514.355 301.221 516.627 301.221 519.4V541H296.229V519.848C296.229 517.032 295.514 514.952 294.085 513.608C292.656 512.264 290.768 511.592 288.421 511.592C286.821 511.592 285.317 511.848 283.909 512.36C282.501 512.872 281.37 513.651 280.517 514.696C279.664 515.741 279.237 517.053 279.237 518.632V541H274.245ZM316.47 507.912V541H311.606V507.912H316.47ZM316.63 494.76V500.264H311.382V494.76H316.63ZM340.298 507.272C342.581 507.272 344.65 507.699 346.506 508.552C348.362 509.405 349.898 510.632 351.114 512.232C352.33 513.811 353.109 515.72 353.45 517.96H348.874C348.661 516.723 348.181 515.613 347.434 514.632C346.687 513.629 345.706 512.84 344.49 512.264C343.295 511.688 341.909 511.4 340.33 511.4C337.322 511.4 334.869 512.477 332.97 514.632C331.093 516.765 330.154 520.061 330.154 524.52C330.154 528.509 331.007 531.709 332.714 534.12C334.442 536.509 337.002 537.704 340.394 537.704C341.973 537.704 343.359 537.416 344.554 536.84C345.77 536.243 346.751 535.453 347.498 534.472C348.245 533.469 348.714 532.371 348.906 531.176H353.418C353.098 533.352 352.319 535.229 351.082 536.808C349.845 538.365 348.298 539.56 346.442 540.392C344.607 541.224 342.559 541.64 340.298 541.64C337.354 541.64 334.751 541 332.49 539.72C330.229 538.44 328.458 536.531 327.178 533.992C325.919 531.453 325.29 528.307 325.29 524.552C325.29 521.117 325.866 518.109 327.018 515.528C328.17 512.925 329.855 510.899 332.074 509.448C334.314 507.997 337.055 507.272 340.298 507.272ZM370.489 541.64C368.334 541.64 366.446 541.267 364.825 540.52C363.203 539.752 361.934 538.664 361.016 537.256C360.121 535.848 359.673 534.152 359.673 532.168C359.673 528.499 360.921 525.779 363.417 524.008C365.934 522.237 369.998 521.277 375.609 521.128L382.009 520.936V518.184C382.009 516.029 381.347 514.312 380.025 513.032C378.723 511.731 376.707 511.091 373.977 511.112C371.929 511.112 370.147 511.592 368.633 512.552C367.139 513.491 366.19 515.005 365.785 517.096H361.241C361.369 515.027 361.955 513.267 363.001 511.816C364.046 510.344 365.518 509.224 367.417 508.456C369.315 507.667 371.587 507.272 374.233 507.272C376.963 507.272 379.257 507.677 381.113 508.488C382.99 509.277 384.409 510.472 385.369 512.072C386.329 513.651 386.809 515.613 386.809 517.96V541H382.521L382.169 534.632C380.846 537.256 379.161 539.08 377.113 540.104C375.086 541.128 372.878 541.64 370.489 541.64ZM371.897 537.896C373.091 537.896 374.275 537.683 375.449 537.256C376.643 536.829 377.731 536.243 378.713 535.496C379.694 534.749 380.483 533.917 381.081 533C381.678 532.083 381.987 531.144 382.009 530.184V524.296L376.665 524.392C373.87 524.435 371.577 524.712 369.785 525.224C368.014 525.736 366.691 526.525 365.817 527.592C364.963 528.637 364.536 530.013 364.536 531.72C364.536 533.661 365.219 535.176 366.585 536.264C367.95 537.352 369.721 537.896 371.897 537.896ZM411.663 511.656H404.175V533C404.175 534.28 404.292 535.219 404.527 535.816C404.783 536.392 405.22 536.765 405.839 536.936C406.479 537.085 407.364 537.16 408.495 537.16H411.887V540.616C411.481 540.765 410.873 540.893 410.062 541C409.273 541.085 408.324 541.128 407.215 541.128C405.103 541.128 403.46 540.829 402.287 540.232C401.135 539.635 400.324 538.749 399.855 537.576C399.385 536.403 399.151 534.931 399.151 533.16V511.656H393.775V507.912H399.279L400.463 498.376H404.175V507.88H411.663V511.656ZM426.22 507.912V541H421.356V507.912H426.22ZM426.38 494.76V500.264H421.132V494.76H426.38ZM449.984 541.64C446.997 541.64 444.373 541 442.112 539.72C439.872 538.419 438.133 536.499 436.896 533.96C435.659 531.421 435.04 528.296 435.04 524.584C435.04 521.128 435.605 518.099 436.736 515.496C437.888 512.893 439.573 510.877 441.792 509.448C444.011 507.997 446.752 507.272 450.016 507.272C453.003 507.272 455.595 507.933 457.792 509.256C460.011 510.557 461.728 512.499 462.944 515.08C464.181 517.64 464.8 520.808 464.8 524.584C464.8 527.955 464.245 530.92 463.136 533.48C462.027 536.04 460.373 538.045 458.176 539.496C456 540.925 453.269 541.64 449.984 541.64ZM450.016 537.608C452.085 537.608 453.845 537.096 455.296 536.072C456.768 535.048 457.888 533.555 458.656 531.592C459.445 529.629 459.84 527.251 459.84 524.456C459.84 521.939 459.499 519.688 458.816 517.704C458.133 515.72 457.067 514.163 455.616 513.032C454.165 511.88 452.299 511.304 450.016 511.304C447.904 511.304 446.101 511.816 444.608 512.84C443.136 513.843 442.005 515.325 441.216 517.288C440.427 519.251 440.032 521.64 440.032 524.456C440.032 526.973 440.373 529.224 441.056 531.208C441.76 533.171 442.848 534.728 444.32 535.88C445.792 537.032 447.691 537.608 450.016 537.608ZM472.933 541V507.912H477.733V512.744C478.287 511.784 479.045 510.899 480.005 510.088C480.986 509.277 482.17 508.627 483.557 508.136C484.965 507.645 486.543 507.4 488.293 507.4C490.426 507.4 492.367 507.827 494.117 508.68C495.887 509.512 497.295 510.813 498.341 512.584C499.386 514.355 499.909 516.627 499.909 519.4V541H494.917V519.848C494.917 517.032 494.202 514.952 492.773 513.608C491.343 512.264 489.455 511.592 487.109 511.592C485.509 511.592 484.005 511.848 482.597 512.36C481.189 512.872 480.058 513.651 479.205 514.696C478.351 515.741 477.925 517.053 477.925 518.632V541H472.933ZM525.868 541V494.728H541.132C544.417 494.728 547.34 495.283 549.9 496.392C552.481 497.48 554.497 499.101 555.948 501.256C557.42 503.389 558.156 506.035 558.156 509.192C558.156 512.285 557.463 514.92 556.076 517.096C554.689 519.251 552.769 520.893 550.316 522.024C547.884 523.155 545.057 523.72 541.836 523.72H531.052V541H525.868ZM531.02 519.336H541.74C545.132 519.336 547.884 518.408 549.996 516.552C552.129 514.696 553.196 512.147 553.196 508.904C553.196 505.619 552.108 503.155 549.932 501.512C547.756 499.869 544.908 499.048 541.388 499.048H531.02V519.336ZM565.058 541V507.912H569.794V513.896C570.348 512.339 571.127 511.08 572.13 510.12C573.154 509.139 574.295 508.424 575.554 507.976C576.834 507.507 578.124 507.272 579.426 507.272C579.959 507.272 580.482 507.315 580.994 507.4C581.506 507.464 581.911 507.581 582.21 507.752V512.616C581.868 512.445 581.41 512.328 580.834 512.264C580.279 512.2 579.81 512.168 579.426 512.168C578.252 512.104 577.111 512.189 576.002 512.424C574.892 512.659 573.879 513.075 572.962 513.672C572.066 514.269 571.351 515.069 570.818 516.072C570.306 517.075 570.05 518.301 570.05 519.752V541H565.058ZM601.547 541.64C598.56 541.64 595.936 541 593.675 539.72C591.435 538.419 589.696 536.499 588.459 533.96C587.221 531.421 586.603 528.296 586.603 524.584C586.603 521.128 587.168 518.099 588.299 515.496C589.451 512.893 591.136 510.877 593.355 509.448C595.573 507.997 598.315 507.272 601.579 507.272C604.565 507.272 607.157 507.933 609.355 509.256C611.573 510.557 613.291 512.499 614.507 515.08C615.744 517.64 616.363 520.808 616.363 524.584C616.363 527.955 615.808 530.92 614.699 533.48C613.589 536.04 611.936 538.045 609.739 539.496C607.563 540.925 604.832 541.64 601.547 541.64ZM601.579 537.608C603.648 537.608 605.408 537.096 606.859 536.072C608.331 535.048 609.451 533.555 610.219 531.592C611.008 529.629 611.403 527.251 611.403 524.456C611.403 521.939 611.061 519.688 610.379 517.704C609.696 515.72 608.629 514.163 607.179 513.032C605.728 511.88 603.861 511.304 601.579 511.304C599.467 511.304 597.664 511.816 596.171 512.84C594.699 513.843 593.568 515.325 592.779 517.288C591.989 519.251 591.595 521.64 591.595 524.456C591.595 526.973 591.936 529.224 592.619 531.208C593.323 533.171 594.411 534.728 595.883 535.88C597.355 537.032 599.253 537.608 601.579 537.608ZM639.35 511.656H631.862V533C631.862 534.28 631.979 535.219 632.214 535.816C632.47 536.392 632.907 536.765 633.526 536.936C634.166 537.085 635.051 537.16 636.182 537.16H639.574V540.616C639.169 540.765 638.561 540.893 637.75 541C636.961 541.085 636.011 541.128 634.902 541.128C632.79 541.128 631.147 540.829 629.974 540.232C628.822 539.635 628.011 538.749 627.542 537.576C627.073 536.403 626.838 534.931 626.838 533.16V511.656H621.462V507.912H626.966L628.15 498.376H631.862V507.88H639.35V511.656ZM660.359 541.64C657.372 541.64 654.748 541 652.487 539.72C650.247 538.419 648.508 536.499 647.271 533.96C646.034 531.421 645.415 528.296 645.415 524.584C645.415 521.128 645.98 518.099 647.111 515.496C648.263 512.893 649.948 510.877 652.167 509.448C654.386 507.997 657.127 507.272 660.391 507.272C663.378 507.272 665.97 507.933 668.167 509.256C670.386 510.557 672.103 512.499 673.319 515.08C674.556 517.64 675.175 520.808 675.175 524.584C675.175 527.955 674.62 530.92 673.511 533.48C672.402 536.04 670.748 538.045 668.551 539.496C666.375 540.925 663.644 541.64 660.359 541.64ZM660.391 537.608C662.46 537.608 664.22 537.096 665.671 536.072C667.143 535.048 668.263 533.555 669.031 531.592C669.82 529.629 670.215 527.251 670.215 524.456C670.215 521.939 669.874 519.688 669.191 517.704C668.508 515.72 667.442 514.163 665.991 513.032C664.54 511.88 662.674 511.304 660.391 511.304C658.279 511.304 656.476 511.816 654.983 512.84C653.511 513.843 652.38 515.325 651.591 517.288C650.802 519.251 650.407 521.64 650.407 524.456C650.407 526.973 650.748 529.224 651.431 531.208C652.135 533.171 653.223 534.728 654.695 535.88C656.167 537.032 658.066 537.608 660.391 537.608ZM696.236 507.272C698.518 507.272 700.588 507.699 702.444 508.552C704.3 509.405 705.836 510.632 707.052 512.232C708.268 513.811 709.046 515.72 709.388 517.96H704.812C704.598 516.723 704.118 515.613 703.372 514.632C702.625 513.629 701.644 512.84 700.428 512.264C699.233 511.688 697.846 511.4 696.267 511.4C693.26 511.4 690.806 512.477 688.908 514.632C687.03 516.765 686.092 520.061 686.092 524.52C686.092 528.509 686.945 531.709 688.652 534.12C690.38 536.509 692.94 537.704 696.332 537.704C697.91 537.704 699.297 537.416 700.492 536.84C701.708 536.243 702.689 535.453 703.436 534.472C704.182 533.469 704.652 532.371 704.844 531.176H709.356C709.036 533.352 708.257 535.229 707.02 536.808C705.782 538.365 704.236 539.56 702.38 540.392C700.545 541.224 698.497 541.64 696.236 541.64C693.292 541.64 690.689 541 688.428 539.72C686.166 538.44 684.396 536.531 683.116 533.992C681.857 531.453 681.228 528.307 681.228 524.552C681.228 521.117 681.804 518.109 682.956 515.528C684.108 512.925 685.793 510.899 688.012 509.448C690.252 507.997 692.993 507.272 696.236 507.272ZM730.672 541.64C727.685 541.64 725.061 541 722.8 539.72C720.56 538.419 718.821 536.499 717.584 533.96C716.346 531.421 715.728 528.296 715.728 524.584C715.728 521.128 716.293 518.099 717.424 515.496C718.576 512.893 720.261 510.877 722.48 509.448C724.698 507.997 727.44 507.272 730.704 507.272C733.69 507.272 736.282 507.933 738.48 509.256C740.698 510.557 742.416 512.499 743.632 515.08C744.869 517.64 745.488 520.808 745.488 524.584C745.488 527.955 744.933 530.92 743.824 533.48C742.714 536.04 741.061 538.045 738.864 539.496C736.688 540.925 733.957 541.64 730.672 541.64ZM730.704 537.608C732.773 537.608 734.533 537.096 735.984 536.072C737.456 535.048 738.576 533.555 739.344 531.592C740.133 529.629 740.528 527.251 740.528 524.456C740.528 521.939 740.186 519.688 739.504 517.704C738.821 515.72 737.754 514.163 736.304 513.032C734.853 511.88 732.986 511.304 730.704 511.304C728.592 511.304 726.789 511.816 725.296 512.84C723.824 513.843 722.693 515.325 721.904 517.288C721.114 519.251 720.72 521.64 720.72 524.456C720.72 526.973 721.061 529.224 721.744 531.208C722.448 533.171 723.536 534.728 725.008 535.88C726.48 537.032 728.378 537.608 730.704 537.608ZM761.364 541.352C759.785 541.352 758.484 541.128 757.46 540.68C756.457 540.211 755.668 539.571 755.092 538.76C754.537 537.949 754.153 537.021 753.94 535.976C753.727 534.931 753.62 533.832 753.62 532.68V493.448H758.548V532.264C758.548 534.077 758.889 535.411 759.572 536.264C760.255 537.096 761.151 537.544 762.26 537.608L764.116 537.64V540.904C763.647 541.053 763.167 541.16 762.676 541.224C762.185 541.309 761.748 541.352 761.364 541.352Z" fill="black"/>
+<path d="M78.5 172.6V276H63.3V172.6H78.5ZM79 131.5V148.7H62.6V131.5H79ZM153.33 278C146.996 278 141.663 277.167 137.33 275.5C133.063 273.767 129.596 271.633 126.93 269.1C124.263 266.567 122.23 264 120.83 261.4C119.43 258.8 118.43 256.6 117.83 254.8L116.23 276H103.93V127.4H119.73V189.6C120.463 188.067 121.696 186.233 123.43 184.1C125.163 181.967 127.43 179.867 130.23 177.8C133.03 175.733 136.43 174.033 140.43 172.7C144.43 171.3 149.063 170.6 154.33 170.6C167.263 170.6 177.596 175.067 185.33 184C193.063 192.933 196.93 206.233 196.93 223.9C196.93 234.767 195.296 244.267 192.03 252.4C188.83 260.467 183.996 266.767 177.53 271.3C171.13 275.767 163.063 278 153.33 278ZM150.83 265.6C159.83 265.6 167.096 262.167 172.63 255.3C178.23 248.433 181.03 237.633 181.03 222.9C181.03 210.5 178.463 200.767 173.33 193.7C168.196 186.633 160.563 183.1 150.43 183.1C143.03 183.1 137.096 184.7 132.63 187.9C128.163 191.033 124.896 195.567 122.83 201.5C120.83 207.433 119.796 214.567 119.73 222.9C119.73 237.967 122.096 248.867 126.83 255.6C131.563 262.267 139.563 265.6 150.83 265.6ZM252.884 170.6C260.018 170.6 266.484 171.933 272.284 174.6C278.084 177.267 282.884 181.1 286.684 186.1C290.484 191.033 292.918 197 293.984 204H279.684C279.018 200.133 277.518 196.667 275.184 193.6C272.851 190.467 269.784 188 265.984 186.2C262.251 184.4 257.918 183.5 252.984 183.5C243.584 183.5 235.918 186.867 229.984 193.6C224.118 200.267 221.184 210.567 221.184 224.5C221.184 236.967 223.851 246.967 229.184 254.5C234.584 261.967 242.584 265.7 253.184 265.7C258.118 265.7 262.451 264.8 266.184 263C269.984 261.133 273.051 258.667 275.384 255.6C277.718 252.467 279.184 249.033 279.784 245.3H293.884C292.884 252.1 290.451 257.967 286.584 262.9C282.718 267.767 277.884 271.5 272.084 274.1C266.351 276.7 259.951 278 252.884 278C243.684 278 235.551 276 228.484 272C221.418 268 215.884 262.033 211.884 254.1C207.951 246.167 205.984 236.333 205.984 224.6C205.984 213.867 207.784 204.467 211.384 196.4C214.984 188.267 220.251 181.933 227.184 177.4C234.184 172.867 242.751 170.6 252.884 170.6ZM358.45 217.9V230.6L308.75 230.7V218L358.45 217.9ZM376.859 276V172.6H391.659V191.3C393.393 186.433 395.826 182.5 398.959 179.5C402.159 176.433 405.726 174.2 409.659 172.8C413.659 171.333 417.693 170.6 421.759 170.6C423.426 170.6 425.059 170.733 426.659 171C428.259 171.2 429.526 171.567 430.459 172.1V187.3C429.393 186.767 427.959 186.4 426.159 186.2C424.426 186 422.959 185.9 421.759 185.9C418.093 185.7 414.526 185.967 411.059 186.7C407.593 187.433 404.426 188.733 401.559 190.6C398.759 192.467 396.526 194.967 394.859 198.1C393.259 201.233 392.459 205.067 392.459 209.6V276H376.859ZM478.241 278C471.041 278 464.407 276.9 458.341 274.7C452.341 272.433 447.374 269 443.441 264.4C439.574 259.733 437.141 253.8 436.141 246.6H450.641C451.574 250.733 453.274 254.233 455.741 257.1C458.207 259.967 461.341 262.167 465.141 263.7C469.007 265.167 473.374 265.9 478.241 265.9C485.574 265.9 491.474 264.5 495.941 261.7C500.407 258.833 502.641 254.467 502.641 248.6C502.641 244.533 501.474 241.267 499.141 238.8C496.874 236.333 493.407 234.533 488.741 233.4L466.441 227.7C458.307 225.633 451.841 222.533 447.041 218.4C442.241 214.2 439.807 208.367 439.741 200.9C439.741 194.967 441.141 189.733 443.941 185.2C446.807 180.667 451.074 177.1 456.741 174.5C462.407 171.9 469.507 170.6 478.041 170.6C488.907 170.6 497.674 173.033 504.341 177.9C511.007 182.767 514.541 190.033 514.941 199.7H500.741C500.074 194.433 497.807 190.267 493.941 187.2C490.074 184.067 484.741 182.5 477.941 182.5C470.941 182.5 465.241 183.933 460.841 186.8C456.507 189.667 454.341 194.1 454.341 200.1C454.341 204.1 455.841 207.233 458.841 209.5C461.841 211.7 466.207 213.533 471.941 215L493.741 220.7C498.274 221.9 502.007 223.5 504.941 225.5C507.941 227.433 510.307 229.633 512.041 232.1C513.841 234.5 515.107 237.067 515.841 239.8C516.641 242.533 517.041 245.167 517.041 247.7C517.041 253.9 515.541 259.267 512.541 263.8C509.541 268.333 505.141 271.833 499.341 274.3C493.607 276.767 486.574 278 478.241 278Z" fill="black"/>
+<defs>
+<clipPath id="clip0_1401_1739">
+<rect width="205" height="122" fill="white" transform="translate(1016 419)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/ibc-apps/Cargo.toml b/ibc-apps/Cargo.toml
new file mode 100644
index 000000000..56ddbf19f
--- /dev/null
+++ b/ibc-apps/Cargo.toml
@@ -0,0 +1,47 @@
+[package]
+name         = "ibc-apps"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "applications", "token-transfer" ]
+readme       = "README.md"
+
+description = """
+    Maintained by `ibc-rs`, re-exports a comprehensive set of libraries that implement various
+    IBC applications, enabling smooth integration of IBC business logic into any blockchain system.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+ibc-app-transfer     = { workspace = true }
+ibc-app-nft-transfer = { workspace = true, optional = true, features = [ "std", "serde", "schema", "borsh", "parity-scale-codec" ] }
+ibc-app-interchain-accounts = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-app-transfer/std",
+  "nft-transfer",
+]
+serde = [
+  "ibc-app-transfer/serde",
+]
+schema = [
+  "ibc-app-transfer/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-app-transfer/borsh",
+]
+parity-scale-codec = [
+  "ibc-app-transfer/parity-scale-codec",
+]
+nft-transfer = [
+  "ibc-app-nft-transfer",
+]
diff --git a/ibc-apps/README.md b/ibc-apps/README.md
new file mode 100644
index 000000000..103e68bc2
--- /dev/null
+++ b/ibc-apps/README.md
@@ -0,0 +1,42 @@
+# IBC Applications
+
+This crate is a top-level library that re-exports implementations of
+Inter-Blockchain Communication (IBC) applications. It serves as a meta-crate,
+simplifying the process of importing and integrating various IBC applications
+into your blockchain. IBC is a distributed protocol that enables communication
+between distinct sovereign blockchains. IBC applications abstract away the core
+transport, authentication, and ordering (TAO) layers, letting blockchain app
+developers focus solely on implementing business logic.
+
+The structure within the `ibc-apps` crate is designed to provide flexibility for
+external users. It allows users to either utilize the entire `ibc-apps` crate,
+or selectively import specific sub-crates, whether they need a certain IBC
+application (e.g. `ibc-app-transfer` crate) or only its associated data
+structures (e.g. `ibc-app-transfer-types`). This versatility empowers hosts,
+including chain integrators, relayers, or any IBC tooling projects, to build
+their solutions on top of the layers that best suit their requirements.
+
+## Sub-Crates
+
+The `ibc-apps` crate contains the implementation of the following IBC
+applications:
+
+### ICS-20: Fungible Token Transfer Application
+
+- [ibc-app-transfer](./../ibc-apps/ics20-transfer)
+- [ibc-app-transfer-types](./../ibc-apps/ics20-transfer/types)
+
+### ICS-721: Non-Fungible Token Transfer Application
+
+- [ibc-app-nft-transfer](./../ibc-apps/ics721-nft-transfer)
+- [ibc-app-nft-transfer-types](./../ibc-apps/ics721-nft-transfer/types)
+
+## Contributing
+
+IBC is specified in English in the [cosmos/ibc
+repo](https://github.com/cosmos/ibc). Any protocol changes or clarifications
+should be contributed there.
+
+If you're interested in contributing, please take a look at the
+[CONTRIBUTING](./../CONTRIBUTING.md) guidelines. We welcome and appreciate
+community contributions!
diff --git a/ibc-apps/ics20-transfer/Cargo.toml b/ibc-apps/ics20-transfer/Cargo.toml
new file mode 100644
index 000000000..b904e0902
--- /dev/null
+++ b/ibc-apps/ics20-transfer/Cargo.toml
@@ -0,0 +1,57 @@
+[package]
+name         = "ibc-app-transfer"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "transfer", "ics20" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of the ICS-20 Fungible Token Transfer
+    application logic and re-exports essential data structures and domain types from
+    `ibc-app-transfer-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+serde_json = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-core               = { workspace = true }
+ibc-app-transfer-types = { workspace = true }
+
+[dev-dependencies]
+subtle-encoding = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-app-transfer-types/std",
+  "ibc-core/std",
+  "serde_json/std",
+]
+serde = [
+  "ibc-app-transfer-types/serde",
+  "ibc-core/serde",
+  "serde_json",
+]
+schema = [
+  "ibc-app-transfer-types/schema",
+  "ibc-core/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-app-transfer-types/borsh",
+  "ibc-core/borsh",
+]
+parity-scale-codec = [
+  "ibc-app-transfer-types/parity-scale-codec",
+  "ibc-core/parity-scale-codec",
+]
diff --git a/ibc-apps/ics20-transfer/src/context.rs b/ibc-apps/ics20-transfer/src/context.rs
new file mode 100644
index 000000000..8c22ad386
--- /dev/null
+++ b/ibc-apps/ics20-transfer/src/context.rs
@@ -0,0 +1,110 @@
+//! Defines the main context traits and IBC module callbacks
+
+use ibc_app_transfer_types::error::TokenTransferError;
+use ibc_app_transfer_types::{Memo, PrefixedCoin, PrefixedDenom};
+use ibc_core::host::types::identifiers::{ChannelId, PortId};
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Signer;
+
+/// Methods required in token transfer validation, to be implemented by the host
+pub trait TokenTransferValidationContext {
+    type AccountId: TryFrom<Signer>;
+
+    /// get_port returns the portID for the transfer module.
+    fn get_port(&self) -> Result<PortId, TokenTransferError>;
+
+    /// Returns Ok() if the host chain supports sending coins.
+    fn can_send_coins(&self) -> Result<(), TokenTransferError>;
+
+    /// Returns Ok() if the host chain supports receiving coins.
+    fn can_receive_coins(&self) -> Result<(), TokenTransferError>;
+
+    /// Validates that the tokens can be escrowed successfully.
+    ///
+    /// `memo` field allows incorporating additional contextual details in the
+    /// escrow validation.
+    fn escrow_coins_validate(
+        &self,
+        from_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        coin: &PrefixedCoin,
+        memo: &Memo,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Validates that the tokens can be unescrowed successfully.
+    fn unescrow_coins_validate(
+        &self,
+        to_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        coin: &PrefixedCoin,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Validates the receiver account and the coin input
+    fn mint_coins_validate(
+        &self,
+        account: &Self::AccountId,
+        coin: &PrefixedCoin,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Validates the sender account and the coin input before burning.
+    ///
+    /// `memo` field allows incorporating additional contextual details in the
+    /// burn validation.
+    fn burn_coins_validate(
+        &self,
+        account: &Self::AccountId,
+        coin: &PrefixedCoin,
+        memo: &Memo,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Returns a hash of the prefixed denom.
+    /// Implement only if the host chain supports hashed denominations.
+    fn denom_hash_string(&self, _denom: &PrefixedDenom) -> Option<String> {
+        None
+    }
+}
+
+/// Methods required in token transfer execution, to be implemented by the host.
+pub trait TokenTransferExecutionContext: TokenTransferValidationContext {
+    /// Executes the escrow of the tokens in a user account.
+    ///
+    /// `memo` field allows incorporating additional contextual details in the
+    /// escrow execution.
+    fn escrow_coins_execute(
+        &mut self,
+        from_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        coin: &PrefixedCoin,
+        memo: &Memo,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Executes the unescrow of the tokens in a user account.
+    fn unescrow_coins_execute(
+        &mut self,
+        to_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        coin: &PrefixedCoin,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Executes minting of the tokens in a user account.
+    fn mint_coins_execute(
+        &mut self,
+        account: &Self::AccountId,
+        coin: &PrefixedCoin,
+    ) -> Result<(), TokenTransferError>;
+
+    /// Executes burning of the tokens in a user account.
+    ///
+    /// `memo` field allows incorporating additional contextual details in the
+    /// burn execution.
+    fn burn_coins_execute(
+        &mut self,
+        account: &Self::AccountId,
+        coin: &PrefixedCoin,
+        memo: &Memo,
+    ) -> Result<(), TokenTransferError>;
+}
diff --git a/crates/ibc/src/applications/transfer/relay.rs b/ibc-apps/ics20-transfer/src/handler/mod.rs
similarity index 60%
rename from crates/ibc/src/applications/transfer/relay.rs
rename to ibc-apps/ics20-transfer/src/handler/mod.rs
index 2d2fce7d1..39dcd373d 100644
--- a/crates/ibc/src/applications/transfer/relay.rs
+++ b/ibc-apps/ics20-transfer/src/handler/mod.rs
@@ -1,15 +1,15 @@
 //! Implements the processing logic for ICS20 (token transfer) message.
+mod on_recv_packet;
+mod send_transfer;
 
-use crate::applications::transfer::error::TokenTransferError;
-use crate::applications::transfer::is_sender_chain_source;
-use crate::applications::transfer::packet::PacketData;
-use crate::core::ics04_channel::packet::Packet;
-use crate::prelude::*;
+use ibc_app_transfer_types::error::TokenTransferError;
+use ibc_app_transfer_types::is_sender_chain_source;
+use ibc_app_transfer_types::packet::PacketData;
+use ibc_core::channel::types::packet::Packet;
+pub use on_recv_packet::*;
+pub use send_transfer::*;
 
-use super::context::{TokenTransferExecutionContext, TokenTransferValidationContext};
-
-pub mod on_recv_packet;
-pub mod send_transfer;
+use crate::context::{TokenTransferExecutionContext, TokenTransferValidationContext};
 
 pub fn refund_packet_token_execute(
     ctx_a: &mut impl TokenTransferExecutionContext,
@@ -27,11 +27,12 @@ pub fn refund_packet_token_execute(
         packet.chan_id_on_a.clone(),
         &data.token.denom,
     ) {
-        // unescrow tokens back to sender
-        let escrow_address =
-            ctx_a.get_escrow_account(&packet.port_id_on_a, &packet.chan_id_on_a)?;
-
-        ctx_a.send_coins_execute(&escrow_address, &sender, &data.token)
+        ctx_a.unescrow_coins_execute(
+            &sender,
+            &packet.port_id_on_a,
+            &packet.chan_id_on_a,
+            &data.token,
+        )
     }
     // mint vouchers back to sender
     else {
@@ -55,10 +56,12 @@ pub fn refund_packet_token_validate(
         packet.chan_id_on_a.clone(),
         &data.token.denom,
     ) {
-        let escrow_address =
-            ctx_a.get_escrow_account(&packet.port_id_on_a, &packet.chan_id_on_a)?;
-
-        ctx_a.send_coins_validate(&escrow_address, &sender, &data.token)
+        ctx_a.unescrow_coins_validate(
+            &sender,
+            &packet.port_id_on_a,
+            &packet.chan_id_on_a,
+            &data.token,
+        )
     } else {
         ctx_a.mint_coins_validate(&sender, &data.token)
     }
diff --git a/crates/ibc/src/applications/transfer/relay/on_recv_packet.rs b/ibc-apps/ics20-transfer/src/handler/on_recv_packet.rs
similarity index 82%
rename from crates/ibc/src/applications/transfer/relay/on_recv_packet.rs
rename to ibc-apps/ics20-transfer/src/handler/on_recv_packet.rs
index 9e9e70c2d..193b33196 100644
--- a/crates/ibc/src/applications/transfer/relay/on_recv_packet.rs
+++ b/ibc-apps/ics20-transfer/src/handler/on_recv_packet.rs
@@ -1,11 +1,12 @@
-use crate::applications::transfer::context::TokenTransferExecutionContext;
-use crate::applications::transfer::error::TokenTransferError;
-use crate::applications::transfer::events::DenomTraceEvent;
-use crate::applications::transfer::packet::PacketData;
-use crate::applications::transfer::{is_receiver_chain_source, TracePrefix};
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::router::ModuleExtras;
-use crate::prelude::*;
+use ibc_app_transfer_types::error::TokenTransferError;
+use ibc_app_transfer_types::events::DenomTraceEvent;
+use ibc_app_transfer_types::packet::PacketData;
+use ibc_app_transfer_types::{is_receiver_chain_source, TracePrefix};
+use ibc_core::channel::types::packet::Packet;
+use ibc_core::primitives::prelude::*;
+use ibc_core::router::types::module::ModuleExtras;
+
+use crate::context::TokenTransferExecutionContext;
 
 /// This function handles the transfer receiving logic.
 ///
@@ -42,10 +43,6 @@ pub fn process_recv_packet_execute<Ctx: TokenTransferExecutionContext>(
             c
         };
 
-        let escrow_address = ctx_b
-            .get_escrow_account(&packet.port_id_on_b, &packet.chan_id_on_b)
-            .map_err(|token_err| (ModuleExtras::empty(), token_err))?;
-
         // Note: it is correct to do the validation here because `recv_packet()`
         // works slightly differently. We do not have a
         // `on_recv_packet_validate()` callback because regardless of whether or
@@ -57,11 +54,20 @@ pub fn process_recv_packet_execute<Ctx: TokenTransferExecutionContext>(
         // gets relayed back to the sender so that the escrowed tokens
         // can be refunded.
         ctx_b
-            .send_coins_validate(&escrow_address, &receiver_account, &coin)
+            .unescrow_coins_validate(
+                &receiver_account,
+                &packet.port_id_on_b,
+                &packet.chan_id_on_b,
+                &coin,
+            )
             .map_err(|token_err| (ModuleExtras::empty(), token_err))?;
-
         ctx_b
-            .send_coins_execute(&escrow_address, &receiver_account, &coin)
+            .unescrow_coins_execute(
+                &receiver_account,
+                &packet.port_id_on_b,
+                &packet.chan_id_on_b,
+                &coin,
+            )
             .map_err(|token_err| (ModuleExtras::empty(), token_err))?;
 
         ModuleExtras::empty()
diff --git a/crates/ibc/src/applications/transfer/relay/send_transfer.rs b/ibc-apps/ics20-transfer/src/handler/send_transfer.rs
similarity index 56%
rename from crates/ibc/src/applications/transfer/relay/send_transfer.rs
rename to ibc-apps/ics20-transfer/src/handler/send_transfer.rs
index e007a50a7..439e5604c 100644
--- a/crates/ibc/src/applications/transfer/relay/send_transfer.rs
+++ b/ibc-apps/ics20-transfer/src/handler/send_transfer.rs
@@ -1,34 +1,45 @@
-use crate::applications::transfer::context::{
-    TokenTransferExecutionContext, TokenTransferValidationContext,
-};
-use crate::applications::transfer::error::TokenTransferError;
-use crate::applications::transfer::events::TransferEvent;
-use crate::applications::transfer::msgs::transfer::MsgTransfer;
-use crate::applications::transfer::{is_sender_chain_source, MODULE_ID_STR};
-use crate::core::events::{MessageEvent, ModuleEvent};
-use crate::core::ics04_channel::handler::send_packet::{send_packet_execute, send_packet_validate};
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics24_host::path::{ChannelEndPath, SeqSendPath};
-use crate::prelude::*;
+use ibc_app_transfer_types::error::TokenTransferError;
+use ibc_app_transfer_types::events::TransferEvent;
+use ibc_app_transfer_types::msgs::transfer::MsgTransfer;
+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::handler::types::events::MessageEvent;
+use ibc_core::host::types::path::{ChannelEndPath, SeqSendPath};
+use ibc_core::primitives::prelude::*;
+use ibc_core::router::types::event::ModuleEvent;
+
+use crate::context::{TokenTransferExecutionContext, TokenTransferValidationContext};
 
 /// Initiate a token transfer. Equivalent to calling [`send_transfer_validate`], followed by [`send_transfer_execute`].
-pub fn send_transfer<Ctx>(ctx_a: &mut Ctx, msg: MsgTransfer) -> Result<(), TokenTransferError>
+pub fn send_transfer<SendPacketCtx, TokenCtx>(
+    send_packet_ctx_a: &mut SendPacketCtx,
+    token_ctx_a: &mut TokenCtx,
+    msg: MsgTransfer,
+) -> Result<(), TokenTransferError>
 where
-    Ctx: TokenTransferExecutionContext,
+    SendPacketCtx: SendPacketExecutionContext,
+    TokenCtx: TokenTransferExecutionContext,
 {
-    send_transfer_validate(ctx_a, msg.clone())?;
-    send_transfer_execute(ctx_a, msg)
+    send_transfer_validate(send_packet_ctx_a, token_ctx_a, msg.clone())?;
+    send_transfer_execute(send_packet_ctx_a, token_ctx_a, msg)
 }
 
 /// Validates the token transfer. If this succeeds, then it is legal to initiate the transfer with [`send_transfer_execute`].
-pub fn send_transfer_validate<Ctx>(ctx_a: &Ctx, msg: MsgTransfer) -> Result<(), TokenTransferError>
+pub fn send_transfer_validate<SendPacketCtx, TokenCtx>(
+    send_packet_ctx_a: &SendPacketCtx,
+    token_ctx_a: &TokenCtx,
+    msg: MsgTransfer,
+) -> Result<(), TokenTransferError>
 where
-    Ctx: TokenTransferValidationContext,
+    SendPacketCtx: SendPacketValidationContext,
+    TokenCtx: TokenTransferValidationContext,
 {
-    ctx_a.can_send_coins()?;
+    token_ctx_a.can_send_coins()?;
 
     let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+    let chan_end_on_a = send_packet_ctx_a.channel_end(&chan_end_path_on_a)?;
 
     let port_id_on_b = chan_end_on_a.counterparty().port_id().clone();
     let chan_id_on_b = chan_end_on_a
@@ -41,11 +52,11 @@ where
         .clone();
 
     let seq_send_path_on_a = SeqSendPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let sequence = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
+    let sequence = send_packet_ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
 
     let token = &msg.packet_data.token;
 
-    let sender: Ctx::AccountId = msg
+    let sender: TokenCtx::AccountId = msg
         .packet_data
         .sender
         .clone()
@@ -57,10 +68,15 @@ where
         msg.chan_id_on_a.clone(),
         &token.denom,
     ) {
-        let escrow_address = ctx_a.get_escrow_account(&msg.port_id_on_a, &msg.chan_id_on_a)?;
-        ctx_a.send_coins_validate(&sender, &escrow_address, token)?;
+        token_ctx_a.escrow_coins_validate(
+            &sender,
+            &msg.port_id_on_a,
+            &msg.chan_id_on_a,
+            token,
+            &msg.packet_data.memo,
+        )?;
     } else {
-        ctx_a.burn_coins_validate(&sender, token)?;
+        token_ctx_a.burn_coins_validate(&sender, token, &msg.packet_data.memo)?;
     }
 
     let packet = {
@@ -79,21 +95,23 @@ where
         }
     };
 
-    send_packet_validate(ctx_a, &packet)?;
+    send_packet_validate(send_packet_ctx_a, &packet)?;
 
     Ok(())
 }
 
 /// Executes the token transfer. A prior call to [`send_transfer_validate`] MUST have succeeded.
-pub fn send_transfer_execute<Ctx>(
-    ctx_a: &mut Ctx,
+pub fn send_transfer_execute<SendPacketCtx, TokenCtx>(
+    send_packet_ctx_a: &mut SendPacketCtx,
+    token_ctx_a: &mut TokenCtx,
     msg: MsgTransfer,
 ) -> Result<(), TokenTransferError>
 where
-    Ctx: TokenTransferExecutionContext,
+    SendPacketCtx: SendPacketExecutionContext,
+    TokenCtx: TokenTransferExecutionContext,
 {
     let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+    let chan_end_on_a = send_packet_ctx_a.channel_end(&chan_end_path_on_a)?;
 
     let port_on_b = chan_end_on_a.counterparty().port_id().clone();
     let chan_on_b = chan_end_on_a
@@ -107,7 +125,7 @@ where
 
     // get the next sequence
     let seq_send_path_on_a = SeqSendPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
-    let sequence = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
+    let sequence = send_packet_ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
 
     let token = &msg.packet_data.token;
 
@@ -123,10 +141,15 @@ where
         msg.chan_id_on_a.clone(),
         &token.denom,
     ) {
-        let escrow_address = ctx_a.get_escrow_account(&msg.port_id_on_a, &msg.chan_id_on_a)?;
-        ctx_a.send_coins_execute(&sender, &escrow_address, token)?;
+        token_ctx_a.escrow_coins_execute(
+            &sender,
+            &msg.port_id_on_a,
+            &msg.chan_id_on_a,
+            token,
+            &msg.packet_data.memo,
+        )?;
     } else {
-        ctx_a.burn_coins_execute(&sender, token)?;
+        token_ctx_a.burn_coins_execute(&sender, token, &msg.packet_data.memo)?;
     }
 
     let packet = {
@@ -147,13 +170,13 @@ where
         }
     };
 
-    send_packet_execute(ctx_a, packet)?;
+    send_packet_execute(send_packet_ctx_a, packet)?;
 
     {
-        ctx_a.log_message(format!(
+        send_packet_ctx_a.log_message(format!(
             "IBC fungible token transfer: {} --({})--> {}",
             msg.packet_data.sender, token, msg.packet_data.receiver
-        ));
+        ))?;
 
         let transfer_event = TransferEvent {
             sender: msg.packet_data.sender,
@@ -162,9 +185,9 @@ where
             denom: msg.packet_data.token.denom,
             memo: msg.packet_data.memo,
         };
-        ctx_a.emit_ibc_event(ModuleEvent::from(transfer_event).into());
+        send_packet_ctx_a.emit_ibc_event(ModuleEvent::from(transfer_event).into())?;
 
-        ctx_a.emit_ibc_event(MessageEvent::Module(MODULE_ID_STR.to_string()).into());
+        send_packet_ctx_a.emit_ibc_event(MessageEvent::Module(MODULE_ID_STR.to_string()).into())?;
     }
 
     Ok(())
diff --git a/ibc-apps/ics20-transfer/src/lib.rs b/ibc-apps/ics20-transfer/src/lib.rs
new file mode 100644
index 000000000..2f2bec601
--- /dev/null
+++ b/ibc-apps/ics20-transfer/src/lib.rs
@@ -0,0 +1,31 @@
+//! Implementation of the IBC [fungible token transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md) (ICS-20) application logic.
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+#![allow(clippy::result_large_err)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+/// Re-exports the implementation of the IBC [fungible token
+/// transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md)
+/// (ICS-20) data structures.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_app_transfer_types::*;
+}
+
+pub mod context;
+#[cfg(feature = "serde")]
+pub mod handler;
+#[cfg(feature = "serde")]
+pub mod module;
diff --git a/ibc-apps/ics20-transfer/src/module.rs b/ibc-apps/ics20-transfer/src/module.rs
new file mode 100644
index 000000000..392ca5939
--- /dev/null
+++ b/ibc-apps/ics20-transfer/src/module.rs
@@ -0,0 +1,375 @@
+use ibc_app_transfer_types::error::TokenTransferError;
+use ibc_app_transfer_types::events::{AckEvent, AckStatusEvent, RecvEvent, TimeoutEvent};
+use ibc_app_transfer_types::packet::PacketData;
+use ibc_app_transfer_types::{ack_success_b64, VERSION};
+use ibc_core::channel::types::acknowledgement::{Acknowledgement, AcknowledgementStatus};
+use ibc_core::channel::types::channel::{Counterparty, Order};
+use ibc_core::channel::types::packet::Packet;
+use ibc_core::channel::types::Version;
+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;
+
+use crate::context::{TokenTransferExecutionContext, TokenTransferValidationContext};
+use crate::handler::{
+    process_recv_packet_execute, refund_packet_token_execute, refund_packet_token_validate,
+};
+
+pub fn on_chan_open_init_validate(
+    ctx: &impl TokenTransferValidationContext,
+    order: Order,
+    _connection_hops: &[ConnectionId],
+    port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    version: &Version,
+) -> Result<(), TokenTransferError> {
+    if order != Order::Unordered {
+        return Err(TokenTransferError::ChannelNotUnordered {
+            expect_order: Order::Unordered,
+            got_order: order,
+        });
+    }
+    let bound_port = ctx.get_port()?;
+    if port_id != &bound_port {
+        return Err(TokenTransferError::InvalidPort {
+            port_id: port_id.clone(),
+            exp_port_id: bound_port,
+        });
+    }
+
+    if !version.is_empty() {
+        version
+            .verify_is_expected(Version::new(VERSION.to_string()))
+            .map_err(ContextError::from)?;
+    }
+
+    Ok(())
+}
+
+pub fn on_chan_open_init_execute(
+    _ctx: &mut impl TokenTransferExecutionContext,
+    _order: Order,
+    _connection_hops: &[ConnectionId],
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    _version: &Version,
+) -> Result<(ModuleExtras, Version), TokenTransferError> {
+    Ok((ModuleExtras::empty(), Version::new(VERSION.to_string())))
+}
+
+pub fn on_chan_open_try_validate(
+    _ctx: &impl TokenTransferValidationContext,
+    order: Order,
+    _connection_hops: &[ConnectionId],
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    counterparty_version: &Version,
+) -> Result<(), TokenTransferError> {
+    if order != Order::Unordered {
+        return Err(TokenTransferError::ChannelNotUnordered {
+            expect_order: Order::Unordered,
+            got_order: order,
+        });
+    }
+
+    counterparty_version
+        .verify_is_expected(Version::new(VERSION.to_string()))
+        .map_err(ContextError::from)?;
+
+    Ok(())
+}
+
+pub fn on_chan_open_try_execute(
+    _ctx: &mut impl TokenTransferExecutionContext,
+    _order: Order,
+    _connection_hops: &[ConnectionId],
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    _counterparty_version: &Version,
+) -> Result<(ModuleExtras, Version), TokenTransferError> {
+    Ok((ModuleExtras::empty(), Version::new(VERSION.to_string())))
+}
+
+pub fn on_chan_open_ack_validate(
+    _ctx: &impl TokenTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    counterparty_version: &Version,
+) -> Result<(), TokenTransferError> {
+    counterparty_version
+        .verify_is_expected(Version::new(VERSION.to_string()))
+        .map_err(ContextError::from)?;
+
+    Ok(())
+}
+
+pub fn on_chan_open_ack_execute(
+    _ctx: &mut impl TokenTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty_version: &Version,
+) -> Result<ModuleExtras, TokenTransferError> {
+    Ok(ModuleExtras::empty())
+}
+
+pub fn on_chan_open_confirm_validate(
+    _ctx: &impl TokenTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<(), TokenTransferError> {
+    Ok(())
+}
+
+pub fn on_chan_open_confirm_execute(
+    _ctx: &mut impl TokenTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<ModuleExtras, TokenTransferError> {
+    Ok(ModuleExtras::empty())
+}
+
+pub fn on_chan_close_init_validate(
+    _ctx: &impl TokenTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<(), TokenTransferError> {
+    Err(TokenTransferError::CantCloseChannel)
+}
+
+pub fn on_chan_close_init_execute(
+    _ctx: &mut impl TokenTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<ModuleExtras, TokenTransferError> {
+    Err(TokenTransferError::CantCloseChannel)
+}
+
+pub fn on_chan_close_confirm_validate(
+    _ctx: &impl TokenTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<(), TokenTransferError> {
+    Ok(())
+}
+
+pub fn on_chan_close_confirm_execute(
+    _ctx: &mut impl TokenTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<ModuleExtras, TokenTransferError> {
+    Ok(ModuleExtras::empty())
+}
+
+pub fn on_recv_packet_execute(
+    ctx_b: &mut impl TokenTransferExecutionContext,
+    packet: &Packet,
+) -> (ModuleExtras, Acknowledgement) {
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        let ack =
+            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into());
+        return (ModuleExtras::empty(), ack.into());
+    };
+
+    let (mut extras, ack) = match process_recv_packet_execute(ctx_b, packet, data.clone()) {
+        Ok(extras) => (extras, AcknowledgementStatus::success(ack_success_b64())),
+        Err((extras, error)) => (extras, AcknowledgementStatus::error(error.into())),
+    };
+
+    let recv_event = RecvEvent {
+        sender: data.sender,
+        receiver: data.receiver,
+        denom: data.token.denom,
+        amount: data.token.amount,
+        memo: data.memo,
+        success: ack.is_successful(),
+    };
+    extras.events.push(recv_event.into());
+
+    (extras, ack.into())
+}
+
+pub fn on_acknowledgement_packet_validate<Ctx>(
+    ctx: &Ctx,
+    packet: &Packet,
+    acknowledgement: &Acknowledgement,
+    _relayer: &Signer,
+) -> Result<(), TokenTransferError>
+where
+    Ctx: TokenTransferValidationContext,
+{
+    let data = serde_json::from_slice::<PacketData>(&packet.data)
+        .map_err(|_| TokenTransferError::PacketDataDeserialization)?;
+
+    let acknowledgement = serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
+        .map_err(|_| TokenTransferError::AckDeserialization)?;
+
+    if !acknowledgement.is_successful() {
+        refund_packet_token_validate(ctx, packet, &data)?;
+    }
+
+    Ok(())
+}
+
+pub fn on_acknowledgement_packet_execute(
+    ctx: &mut impl TokenTransferExecutionContext,
+    packet: &Packet,
+    acknowledgement: &Acknowledgement,
+    _relayer: &Signer,
+) -> (ModuleExtras, Result<(), TokenTransferError>) {
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(TokenTransferError::PacketDataDeserialization),
+        );
+    };
+
+    let Ok(acknowledgement) =
+        serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
+    else {
+        return (
+            ModuleExtras::empty(),
+            Err(TokenTransferError::AckDeserialization),
+        );
+    };
+
+    if !acknowledgement.is_successful() {
+        if let Err(err) = refund_packet_token_execute(ctx, packet, &data) {
+            return (ModuleExtras::empty(), Err(err));
+        }
+    }
+
+    let ack_event = AckEvent {
+        sender: data.sender,
+        receiver: data.receiver,
+        denom: data.token.denom,
+        amount: data.token.amount,
+        memo: data.memo,
+        acknowledgement: acknowledgement.clone(),
+    };
+
+    let extras = ModuleExtras {
+        events: vec![ack_event.into(), AckStatusEvent { acknowledgement }.into()],
+        log: Vec::new(),
+    };
+
+    (extras, Ok(()))
+}
+
+pub fn on_timeout_packet_validate<Ctx>(
+    ctx: &Ctx,
+    packet: &Packet,
+    _relayer: &Signer,
+) -> Result<(), TokenTransferError>
+where
+    Ctx: TokenTransferValidationContext,
+{
+    let data = serde_json::from_slice::<PacketData>(&packet.data)
+        .map_err(|_| TokenTransferError::PacketDataDeserialization)?;
+
+    refund_packet_token_validate(ctx, packet, &data)?;
+
+    Ok(())
+}
+
+pub fn on_timeout_packet_execute(
+    ctx: &mut impl TokenTransferExecutionContext,
+    packet: &Packet,
+    _relayer: &Signer,
+) -> (ModuleExtras, Result<(), TokenTransferError>) {
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(TokenTransferError::PacketDataDeserialization),
+        );
+    };
+
+    if let Err(err) = refund_packet_token_execute(ctx, packet, &data) {
+        return (ModuleExtras::empty(), Err(err));
+    }
+
+    let timeout_event = TimeoutEvent {
+        refund_receiver: data.sender,
+        refund_denom: data.token.denom,
+        refund_amount: data.token.amount,
+        memo: data.memo,
+    };
+
+    let extras = ModuleExtras {
+        events: vec![timeout_event.into()],
+        log: Vec::new(),
+    };
+
+    (extras, Ok(()))
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_ack_ser() {
+        fn ser_json_assert_eq(ack: AcknowledgementStatus, json_str: &str) {
+            let ser = serde_json::to_string(&ack).unwrap();
+            assert_eq!(ser, json_str)
+        }
+
+        ser_json_assert_eq(
+            AcknowledgementStatus::success(ack_success_b64()),
+            r#"{"result":"AQ=="}"#,
+        );
+        ser_json_assert_eq(
+            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into()),
+            r#"{"error":"failed to deserialize packet data"}"#,
+        );
+    }
+
+    #[test]
+    fn test_ack_success_to_vec() {
+        let ack_success: Vec<u8> = AcknowledgementStatus::success(ack_success_b64()).into();
+
+        // Check that it's the same output as ibc-go
+        // Note: this also implicitly checks that the ack bytes are non-empty,
+        // which would make the conversion to `Acknowledgement` panic
+        assert_eq!(ack_success, br#"{"result":"AQ=="}"#);
+    }
+
+    #[test]
+    fn test_ack_error_to_vec() {
+        let ack_error: Vec<u8> =
+            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into())
+                .into();
+
+        // Check that it's the same output as ibc-go
+        // Note: this also implicitly checks that the ack bytes are non-empty,
+        // which would make the conversion to `Acknowledgement` panic
+        assert_eq!(
+            ack_error,
+            br#"{"error":"failed to deserialize packet data"}"#
+        );
+    }
+
+    #[test]
+    fn test_ack_de() {
+        fn de_json_assert_eq(json_str: &str, ack: AcknowledgementStatus) {
+            let de = serde_json::from_str::<AcknowledgementStatus>(json_str).unwrap();
+            assert_eq!(de, ack)
+        }
+
+        de_json_assert_eq(
+            r#"{"result":"AQ=="}"#,
+            AcknowledgementStatus::success(ack_success_b64()),
+        );
+        de_json_assert_eq(
+            r#"{"error":"failed to deserialize packet data"}"#,
+            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into()),
+        );
+
+        assert!(serde_json::from_str::<AcknowledgementStatus>(r#"{"success":"AQ=="}"#).is_err());
+    }
+}
diff --git a/ibc-apps/ics20-transfer/types/Cargo.toml b/ibc-apps/ics20-transfer/types/Cargo.toml
new file mode 100644
index 000000000..f967ce8f7
--- /dev/null
+++ b/ibc-apps/ics20-transfer/types/Cargo.toml
@@ -0,0 +1,76 @@
+[package]
+name         = "ibc-app-transfer-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "transfer", "ics20" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-20 Fungible Token Transfer data structures and
+    domain types, as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal
+    applicability to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+primitive-types = { version = "0.12.2", default-features = false, features = [ "serde_no_std" ] }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+uint            = { version = "0.9", default-features = false }
+
+# ibc dependencies
+ibc-core  = { workspace = true }
+ibc-proto = { workspace = true }
+
+## parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[dev-dependencies]
+serde_json = { workspace = true }
+rstest     = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "serde/std",
+  "serde_json/std",
+  "displaydoc/std",
+  "uint/std",
+  "primitive-types/std",
+  "ibc-core/std",
+  "ibc-proto/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-core/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-apps/ics20-transfer/types/src/amount.rs b/ibc-apps/ics20-transfer/types/src/amount.rs
new file mode 100644
index 000000000..7754f4723
--- /dev/null
+++ b/ibc-apps/ics20-transfer/types/src/amount.rs
@@ -0,0 +1,165 @@
+//! Contains the `Amount` type, which represents amounts of tokens transferred.
+use core::ops::Deref;
+use core::str::FromStr;
+
+use derive_more::{Display, From, Into};
+use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
+use ibc_core::primitives::serializers;
+use primitive_types::U256;
+
+use super::error::TokenTransferError;
+
+/// A type for representing token transfer amounts.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Display, From, Into)]
+pub struct Amount(
+    #[cfg_attr(feature = "schema", schemars(with = "String"))]
+    #[cfg_attr(feature = "serde", serde(serialize_with = "serializers::serialize"))]
+    #[cfg_attr(feature = "serde", serde(deserialize_with = "deserialize"))]
+    U256,
+);
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::WrapperTypeDecode for Amount {
+    type Wrapped = [u64; 4];
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::WrapperTypeEncode for Amount {}
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshSerialize for Amount {
+    fn serialize<W: borsh::maybestd::io::Write>(
+        &self,
+        writer: &mut W,
+    ) -> borsh::maybestd::io::Result<()> {
+        // Note: a "word" is 8 bytes (i.e. a u64)
+        let words = self.as_slice();
+        let bytes: Vec<u8> = words.iter().flat_map(|word| word.to_be_bytes()).collect();
+
+        writer.write_all(&bytes)
+    }
+}
+#[cfg(feature = "borsh")]
+impl borsh::BorshDeserialize for Amount {
+    fn deserialize_reader<R: borsh::maybestd::io::Read>(
+        reader: &mut R,
+    ) -> borsh::maybestd::io::Result<Self> {
+        const NUM_BYTES_IN_U64: usize = 8;
+        const NUM_WORDS_IN_U256: usize = 4;
+
+        let mut buf = [0; 32];
+        let bytes_read = reader.read(&mut buf)?;
+        if bytes_read != 32 {
+            return Err(borsh::maybestd::io::Error::new(
+                borsh::maybestd::io::ErrorKind::InvalidInput,
+                format!("Expected to read 32 bytes, read {bytes_read}"),
+            ));
+        }
+
+        let words: Vec<u64> = buf
+            .chunks_exact(NUM_BYTES_IN_U64)
+            .map(|word| {
+                let word: [u8; NUM_BYTES_IN_U64] = word
+                    .try_into()
+                    .expect("exact chunks of 8 bytes are expected to be 8 bytes");
+                u64::from_be_bytes(word)
+            })
+            .collect();
+
+        let four_words: [u64; NUM_WORDS_IN_U256] = words
+            .try_into()
+            .expect("U256 is always 4 four words, and we confirmed that we read 32 bytes");
+
+        Ok(four_words.into())
+    }
+}
+
+impl Deref for Amount {
+    type Target = [u64; 4];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0 .0
+    }
+}
+
+impl From<[u64; 4]> for Amount {
+    fn from(value: [u64; 4]) -> Self {
+        Self(U256(value))
+    }
+}
+
+impl Amount {
+    pub fn checked_add(self, rhs: Self) -> Option<Self> {
+        self.0.checked_add(rhs.0).map(Self)
+    }
+
+    pub fn checked_sub(self, rhs: Self) -> Option<Self> {
+        self.0.checked_sub(rhs.0).map(Self)
+    }
+}
+
+impl AsRef<U256> for Amount {
+    fn as_ref(&self) -> &U256 {
+        &self.0
+    }
+}
+
+impl FromStr for Amount {
+    type Err = TokenTransferError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let amount = U256::from_dec_str(s).map_err(TokenTransferError::InvalidAmount)?;
+        Ok(Self(amount))
+    }
+}
+
+impl From<u64> for Amount {
+    fn from(v: u64) -> Self {
+        Self(v.into())
+    }
+}
+
+#[cfg(feature = "serde")]
+fn deserialize<'de, D>(deserializer: D) -> Result<U256, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::Deserialize;
+    U256::from_dec_str(<String>::deserialize(deserializer)?.as_str())
+        .map_err(serde::de::Error::custom)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Amount;
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn serde_amount() {
+        let value = Amount::from(42);
+        let string = serde_json::to_string(&value).expect("can serde string");
+        assert_eq!(string, "\"42\"");
+        let binary = serde_json::to_vec(&value).expect("can serde binary");
+        let de: Amount = serde_json::from_slice(binary.as_ref()).expect("can deserialize");
+        assert_eq!(de, value);
+    }
+
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn borsh_amount() {
+        use borsh::BorshDeserialize;
+
+        let value = Amount::from(42);
+        let serialized = borsh::to_vec(&value).unwrap();
+
+        // Amount is supposed to be a U256 according to the spec, which is 32 bytes
+        assert_eq!(serialized.len(), 32);
+
+        let value_deserialized = Amount::try_from_slice(&serialized).unwrap();
+
+        assert_eq!(value, value_deserialized);
+    }
+}
diff --git a/ibc-apps/ics20-transfer/types/src/coin.rs b/ibc-apps/ics20-transfer/types/src/coin.rs
new file mode 100644
index 000000000..65a147218
--- /dev/null
+++ b/ibc-apps/ics20-transfer/types/src/coin.rs
@@ -0,0 +1,202 @@
+//! Defines coin types; the objects that are being transferred.
+use core::fmt::{Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use ibc_core::primitives::prelude::*;
+use ibc_proto::cosmos::base::v1beta1::Coin as ProtoCoin;
+
+use super::amount::Amount;
+use super::denom::{BaseDenom, PrefixedDenom};
+use super::error::TokenTransferError;
+
+/// A `Coin` type with fully qualified `PrefixedDenom`.
+pub type PrefixedCoin = Coin<PrefixedDenom>;
+
+/// A `Coin` type with an unprefixed denomination.
+pub type BaseCoin = Coin<BaseDenom>;
+
+pub type RawCoin = Coin<String>;
+
+/// Allowed characters in string representation of a denomination.
+const VALID_DENOM_CHARACTERS: &str = "/:._-";
+
+/// Coin defines a token with a denomination and an amount.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+pub struct Coin<D> {
+    /// Denomination
+    pub denom: D,
+    /// Amount
+    pub amount: Amount,
+}
+
+impl<D: FromStr> Coin<D>
+where
+    D::Err: Into<TokenTransferError>,
+{
+    pub fn from_string_list(coin_str: &str) -> Result<Vec<Self>, TokenTransferError> {
+        coin_str.split(',').map(FromStr::from_str).collect()
+    }
+}
+
+impl<D: FromStr> FromStr for Coin<D>
+where
+    D::Err: Into<TokenTransferError>,
+{
+    type Err = TokenTransferError;
+
+    #[allow(clippy::assign_op_pattern)]
+    fn from_str(coin_str: &str) -> Result<Self, TokenTransferError> {
+        // Denominations can be 3 ~ 128 characters long and support letters, followed by either
+        // a letter, a number or a separator ('/', ':', '.', '_' or '-').
+        // Loosely copy the regex from here:
+        // https://github.com/cosmos/cosmos-sdk/blob/v0.47.5/types/coin.go#L838-L840
+        //
+        // equivalent regex code in rust:
+        // let re = Regex::new(r"^(?<amount>[0-9]+)(?<denom>[a-zA-Z0-9/:._-]+)$")?;
+        // let cap = re.captures("123stake")?;
+        // let (amount, denom) = (cap.name("amount")?.as_str(), cap.name("denom")?.as_str());
+
+        let (amount, denom) = coin_str
+            .chars()
+            .position(|x| !x.is_numeric())
+            .map(|index| coin_str.split_at(index))
+            .filter(|(amount, _)| !amount.is_empty())
+            .filter(|(_, denom)| {
+                denom
+                    .chars()
+                    .all(|x| x.is_alphanumeric() || VALID_DENOM_CHARACTERS.contains(x))
+            })
+            .ok_or_else(|| TokenTransferError::InvalidCoin {
+                coin: coin_str.to_string(),
+            })?;
+
+        Ok(Coin {
+            amount: amount.parse()?,
+            denom: denom.parse().map_err(Into::into)?,
+        })
+    }
+}
+
+impl<D: FromStr> TryFrom<ProtoCoin> for Coin<D>
+where
+    D::Err: Into<TokenTransferError>,
+{
+    type Error = TokenTransferError;
+
+    fn try_from(proto: ProtoCoin) -> Result<Coin<D>, Self::Error> {
+        let denom = D::from_str(&proto.denom).map_err(Into::into)?;
+        let amount = Amount::from_str(&proto.amount)?;
+        Ok(Self { denom, amount })
+    }
+}
+
+impl<D: ToString> From<Coin<D>> for ProtoCoin {
+    fn from(coin: Coin<D>) -> ProtoCoin {
+        ProtoCoin {
+            denom: coin.denom.to_string(),
+            amount: coin.amount.to_string(),
+        }
+    }
+}
+
+impl From<BaseCoin> for PrefixedCoin {
+    fn from(coin: BaseCoin) -> PrefixedCoin {
+        PrefixedCoin {
+            denom: coin.denom.into(),
+            amount: coin.amount,
+        }
+    }
+}
+
+impl<D: Display> Display for Coin<D> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}{}", self.amount, self.denom)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use primitive_types::U256;
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case::nat("123stake", 123, "stake")]
+    #[case::zero("0stake", 0, "stake")]
+    #[case::u256_max(
+        "115792089237316195423570985008687907853269984665640564039457584007913129639935stake",
+        U256::MAX,
+        "stake"
+    )]
+    #[case::digit_in_denom("1a1", 1, "a1")]
+    #[case::chars_in_denom("0x1/:._-", 0, "x1/:._-")]
+    #[case::ibc_denom("1234ibc/a0B1C", 1234, "ibc/a0B1C")]
+    fn test_parse_raw_coin(
+        #[case] parsed: RawCoin,
+        #[case] amount: impl Into<Amount>,
+        #[case] denom: &str,
+    ) {
+        assert_eq!(
+            parsed,
+            RawCoin {
+                denom: denom.into(),
+                amount: amount.into()
+            }
+        );
+    }
+
+    #[rstest]
+    #[case::pos("+123stake")]
+    #[case::pos_zero("+0stake")]
+    #[case::neg("-123stake")]
+    #[case::neg_zero("-0stake")]
+    #[case::u256_max_plus_1(
+        "115792089237316195423570985008687907853269984665640564039457584007913129639936stake"
+    )]
+    #[case::invalid_char_in_denom("0x!")]
+    #[case::blackslash_in_denom("0x1/:.\\_-")]
+    #[should_panic]
+    fn test_failed_parse_raw_coin(#[case] _raw: RawCoin) {}
+
+    #[rstest]
+    #[case::nomal("123stake,1a1,999den0m", &[(123, "stake"), (1, "a1"), (999, "den0m")])]
+    #[case::tricky("123stake,1a1-999den0m", &[(123, "stake"), (1, "a1-999den0m")])]
+    #[case::colon_delimiter("123stake:1a1:999den0m", &[(123, "stake:1a1:999den0m")])]
+    #[case::dash_delimiter("123stake-1a1-999den0m", &[(123, "stake-1a1-999den0m")])]
+    #[case::slash_delimiter("123stake/1a1/999den0m", &[(123, "stake/1a1/999den0m")])]
+    fn test_parse_raw_coin_list(
+        #[case] coins_str: &str,
+        #[case] coins: &[(u64, &str)],
+    ) -> Result<(), TokenTransferError> {
+        assert_eq!(
+            RawCoin::from_string_list(coins_str)?,
+            coins
+                .iter()
+                .map(|&(amount, denom)| RawCoin {
+                    denom: denom.to_string(),
+                    amount: amount.into(),
+                })
+                .collect::<Vec<_>>()
+        );
+        Ok(())
+    }
+
+    #[rstest]
+    #[case::semicolon_delimiter("123stake;1a1;999den0m")]
+    #[case::mixed_delimiter("123stake,1a1;999den0m")]
+    #[should_panic(expected = "parsing failure in test")]
+    fn test_failed_parse_raw_coin_list(#[case] coins_str: &str) {
+        RawCoin::from_string_list(coins_str).expect("parsing failure in test");
+    }
+}
diff --git a/ibc-apps/ics20-transfer/types/src/denom.rs b/ibc-apps/ics20-transfer/types/src/denom.rs
new file mode 100644
index 000000000..4bd30f60c
--- /dev/null
+++ b/ibc-apps/ics20-transfer/types/src/denom.rs
@@ -0,0 +1,658 @@
+//! Defines types to represent "denominations" [as defined in ICS-20](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md#data-structures)
+use core::fmt::{Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use derive_more::{Display, From};
+use ibc_core::host::types::identifiers::{ChannelId, PortId};
+use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
+use ibc_core::primitives::serializers;
+use ibc_proto::ibc::applications::transfer::v1::DenomTrace as RawDenomTrace;
+
+use super::error::TokenTransferError;
+
+/// The "base" of a denomination.
+///
+/// For example, given the token `my_port-1/my_channel-1/my_port-2/my_channel-2/base_denom`,
+/// `base_denom` is the "base" of the denomination
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(transparent))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Display)]
+pub struct BaseDenom(String);
+
+impl BaseDenom {
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl FromStr for BaseDenom {
+    type Err = TokenTransferError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s.trim().is_empty() {
+            Err(TokenTransferError::EmptyBaseDenom)
+        } else {
+            Ok(BaseDenom(s.to_owned()))
+        }
+    }
+}
+
+/// One hop in a token's trace, which consists of the port and channel IDs of the sender
+///
+/// For example, given the token `my_port-1/my_channel-1/my_port-2/my_channel-2/base_denom`,
+/// `my_port-1/my_channel-1` is a trace prefix, and `my_port-2/my_channel-2` is another one.
+/// See [TracePath] which stitches trace prefixes together.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
+pub struct TracePrefix {
+    port_id: PortId,
+    channel_id: ChannelId,
+}
+
+impl TracePrefix {
+    pub fn new(port_id: PortId, channel_id: ChannelId) -> Self {
+        Self {
+            port_id,
+            channel_id,
+        }
+    }
+
+    /// Returns a string slice with [`TracePrefix`] removed.
+    ///
+    /// If the string starts with a [`TracePrefix`], i.e. `{port-id}/channel-{id}`,
+    /// it returns a tuple of the removed [`TracePrefix`] and the substring after the prefix.
+    ///
+    /// If the substring is empty, it returns `None`.
+    /// Otherwise, the substring starts with `/`. In that case,
+    /// the leading `/` is stripped and returned.
+    ///
+    /// If the string does not start with a [`TracePrefix`], this method returns `None`.
+    ///
+    /// This method is analogous to `strip_prefix` from the standard library.
+    pub fn strip(s: &str) -> Option<(Self, Option<&str>)> {
+        // The below two chained `split_once` calls emulate a virtual `split_twice` call,
+        // which is not available in the standard library.
+        let (port_id_s, remaining) = s.split_once('/')?;
+        let (channel_id_s, remaining) = remaining
+            .split_once('/')
+            .map(|(a, b)| (a, Some(b)))
+            .unwrap_or_else(|| (remaining, None));
+
+        let port_id = port_id_s.parse().ok()?;
+        let channel_id = channel_id_s.parse().ok()?;
+
+        Some((Self::new(port_id, channel_id), remaining))
+    }
+}
+
+impl Display for TracePrefix {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}/{}", self.port_id, self.channel_id)
+    }
+}
+
+/// A full trace path modelled as a collection of `TracePrefix`s.
+///
+/// Internally, the `TracePath` is modelled as a `Vec<TracePrefix>` but with the order reversed, i.e.
+/// "transfer/channel-0/transfer/channel-1/uatom" => `["transfer/channel-1", "transfer/channel-0"]`
+/// This is done for ease of addition/removal of prefixes.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, From)]
+pub struct TracePath(Vec<TracePrefix>);
+
+impl TracePath {
+    /// Returns true iff this path starts with the specified prefix
+    pub fn starts_with(&self, prefix: &TracePrefix) -> bool {
+        self.0.last().map(|p| p == prefix).unwrap_or(false)
+    }
+
+    /// Removes the specified prefix from the path if there is a match, otherwise does nothing.
+    pub fn remove_prefix(&mut self, prefix: &TracePrefix) {
+        if self.starts_with(prefix) {
+            self.0.pop();
+        }
+    }
+
+    /// Adds the specified prefix to the path.
+    pub fn add_prefix(&mut self, prefix: TracePrefix) {
+        self.0.push(prefix)
+    }
+
+    /// Returns true if the path is empty and false otherwise.
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Return empty trace path
+    pub fn empty() -> Self {
+        Self(vec![])
+    }
+
+    /// Returns a string slice with [`TracePath`] or all [`TracePrefix`]es repeatedly removed.
+    ///
+    /// If the string starts with a [`TracePath`], it returns a tuple of the removed
+    /// [`TracePath`] and the substring after the [`TracePath`].
+    ///
+    /// If the substring is empty, it returns `None`.
+    /// Otherwise, the substring starts with `/`. In that case,
+    /// the leading `/` is stripped and returned.
+    ///
+    /// If the string does not contain any [`TracePrefix`], it returns the original string.
+    ///
+    /// This method is analogous to `trim_start_matches` from the standard library.
+    pub fn trim(s: &str) -> (Self, Option<&str>) {
+        // We can't use `TracePrefix::empty()` with `TracePrefix::add_prefix()`.
+        // Because we are stripping prefixes in reverse order.
+        let mut trace_prefixes = vec![];
+        let mut current_remaining_opt = Some(s);
+
+        loop {
+            let Some(current_remaining_s) = current_remaining_opt else {
+                break;
+            };
+
+            let Some((trace_prefix, next_remaining_opt)) = TracePrefix::strip(current_remaining_s)
+            else {
+                break;
+            };
+
+            trace_prefixes.push(trace_prefix);
+            current_remaining_opt = next_remaining_opt;
+        }
+
+        // Reversing is needed, as [`TracePath`] requires quick addition/removal
+        // of prefixes which is more performant from the end of a [`Vec`].
+        trace_prefixes.reverse();
+        (Self(trace_prefixes), current_remaining_opt)
+    }
+}
+
+impl FromStr for TracePath {
+    type Err = TokenTransferError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s.is_empty() {
+            return Ok(TracePath::empty());
+        }
+
+        let (trace_path, remaining_parts) = TracePath::trim(s);
+        remaining_parts
+            .is_none()
+            .then_some(trace_path)
+            .ok_or_else(|| TokenTransferError::MalformedTrace(s.to_string()))
+    }
+}
+
+impl Display for TracePath {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        let path = self
+            .0
+            .iter()
+            .rev()
+            .map(|prefix| prefix.to_string())
+            .collect::<Vec<String>>()
+            .join("/");
+        write!(f, "{path}")
+    }
+}
+
+/// A type that contains the base denomination for ICS20 and the source tracing information path.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+pub struct PrefixedDenom {
+    /// A series of `{port-id}/{channel-id}`s for tracing the source of the token.
+    #[cfg_attr(feature = "serde", serde(with = "serializers"))]
+    #[cfg_attr(feature = "schema", schemars(with = "String"))]
+    pub trace_path: TracePath,
+    /// Base denomination of the relayed fungible token.
+    pub base_denom: BaseDenom,
+}
+
+impl PrefixedDenom {
+    /// Removes the specified prefix from the trace path if there is a match, otherwise does nothing.
+    pub fn remove_trace_prefix(&mut self, prefix: &TracePrefix) {
+        self.trace_path.remove_prefix(prefix)
+    }
+
+    /// Adds the specified prefix to the trace path.
+    pub fn add_trace_prefix(&mut self, prefix: TracePrefix) {
+        self.trace_path.add_prefix(prefix)
+    }
+}
+
+/// Returns true if the denomination originally came from the sender chain, and
+/// false otherwise.
+///
+/// Note: It is better to think of the "source" chain as the chain that
+/// escrows/unescrows the token, while the other chain mints/burns the tokens,
+/// respectively. A chain being the "source" of a token does NOT mean it is the
+/// original creator of the token (e.g. "uatom"), as "source" might suggest.
+///
+/// This means that in any given transfer, a chain can very well be the source
+/// of a token of which it is not the creator. For example, let
+///
+/// A: sender chain in this transfer, port "transfer" and channel "c2b" (to B)
+/// B: receiver chain in this transfer, port "transfer" and channel "c2a" (to A)
+/// token denom: "transfer/someOtherChannel/someDenom"
+///
+/// A, initiator of the transfer, needs to figure out if it should escrow the
+/// tokens, or burn them. If B had originally sent the token to A in a previous
+/// transfer, then A would have stored the token as "transfer/c2b/someDenom".
+/// Now, A is sending to B, so to check if B is the source of the token, we need
+/// to check if the token starts with "transfer/c2b". In this example, it
+/// doesn't, so the token doesn't originate from B. A is considered the source,
+/// even though it is not the creator of the token. Specifically, the token was
+/// created by the chain at the other end of A's port "transfer" and channel
+/// "someOtherChannel".
+pub fn is_sender_chain_source(
+    source_port: PortId,
+    source_channel: ChannelId,
+    denom: &PrefixedDenom,
+) -> bool {
+    !is_receiver_chain_source(source_port, source_channel, denom)
+}
+
+/// Returns true if the denomination originally came from the receiving chain, and false otherwise.
+pub fn is_receiver_chain_source(
+    source_port: PortId,
+    source_channel: ChannelId,
+    denom: &PrefixedDenom,
+) -> bool {
+    // For example, let
+    // A: sender chain in this transfer, port "transfer" and channel "c2b" (to B)
+    // B: receiver chain in this transfer, port "transfer" and channel "c2a" (to A)
+    //
+    // If B had originally sent the token in a previous transfer, then A would have stored the token as
+    // "transfer/c2b/{token_denom}". Now, A is sending to B, so to check if B is the source of the token,
+    // we need to check if the token starts with "transfer/c2b".
+    let prefix = TracePrefix::new(source_port, source_channel);
+    denom.trace_path.starts_with(&prefix)
+}
+
+impl FromStr for PrefixedDenom {
+    type Err = TokenTransferError;
+
+    /// Initializes a [`PrefixedDenom`] from a string that adheres to the format
+    /// `{nth-port-id/channel-<index>}/{(n-1)th-port-id/channel-<index>}/.../{1st-port-id/channel-<index>}/<base_denom>`.
+    /// A [`PrefixedDenom`] exhibits a sequence of `{ith-port-id/channel-<index>}` pairs.
+    /// This sequence makes up the [`TracePath`] of the [`PrefixedDenom`].
+    ///
+    /// This [`PrefixedDenom::from_str`] implementation _left-split-twice_ the argument string
+    /// using `/` delimiter. Then it peeks into the first two segments and attempts to convert
+    /// the first segment into a [`PortId`] and the second into a [`ChannelId`].
+    /// This continues on the third remaining segment in a loop until a
+    /// `{port-id/channel-id}` pair cannot be created from the top two segments.
+    /// The remaining parts of the string are then considered the [`BaseDenom`].
+    ///
+    /// For example, given the following denom trace:
+    /// "transfer/channel-75/factory/stars16da2uus9zrsy83h23ur42v3lglg5rmyrpqnju4/dust",
+    /// the first two `/`-delimited segments are `"transfer"` and `"channel-75"`. The
+    /// first is a valid [`PortId`], and the second is a valid [`ChannelId`], so that becomes
+    /// the first `{port-id/channel-id}` pair that gets added as part of the [`TracePath`]
+    /// of the [`PrefixedDenom`]. The next two segments are `"factory"`, a
+    /// valid [`PortId`], and `"stars16da2uus9zrsy83h23ur42v3lglg5rmyrpqnju4"`, an invalid [`ChannelId`].
+    /// The loop breaks at this point, resulting in a [`TracePath`] of `"transfer/channel-75"`
+    /// and a [`BaseDenom`] of `"factory/stars16da2uus9zrsy83h23ur42v3lglg5rmyrpqnju4/dust"`.
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match TracePath::trim(s) {
+            (trace_path, Some(remaining_parts)) => Ok(Self {
+                trace_path,
+                base_denom: BaseDenom::from_str(remaining_parts)?,
+            }),
+            (_, None) => Ok(Self {
+                trace_path: TracePath::empty(),
+                base_denom: BaseDenom::from_str(s)?,
+            }),
+        }
+    }
+}
+
+impl TryFrom<RawDenomTrace> for PrefixedDenom {
+    type Error = TokenTransferError;
+
+    fn try_from(value: RawDenomTrace) -> Result<Self, Self::Error> {
+        let base_denom = BaseDenom::from_str(&value.base_denom)?;
+        let trace_path = TracePath::from_str(&value.path)?;
+        Ok(Self {
+            trace_path,
+            base_denom,
+        })
+    }
+}
+
+impl From<PrefixedDenom> for RawDenomTrace {
+    fn from(value: PrefixedDenom) -> Self {
+        Self {
+            path: value.trace_path.to_string(),
+            base_denom: value.base_denom.to_string(),
+        }
+    }
+}
+
+impl From<BaseDenom> for PrefixedDenom {
+    fn from(denom: BaseDenom) -> Self {
+        Self {
+            trace_path: TracePath::empty(),
+            base_denom: denom,
+        }
+    }
+}
+
+impl Display for PrefixedDenom {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        if self.trace_path.0.is_empty() {
+            write!(f, "{}", self.base_denom)
+        } else {
+            write!(f, "{}/{}", self.trace_path, self.base_denom)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("transfer")]
+    #[case("transfer/channel-1/ica")]
+    fn test_invalid_raw_demon_trace_parsing(#[case] trace_path: &str) {
+        let raw_denom_trace = RawDenomTrace {
+            path: trace_path.to_string(),
+            base_denom: "uatom".to_string(),
+        };
+
+        PrefixedDenom::try_from(raw_denom_trace).expect_err("failure");
+    }
+
+    #[rstest]
+    #[case("uatom")]
+    #[case("atom")]
+    fn test_accepted_denom(#[case] denom_str: &str) {
+        BaseDenom::from_str(denom_str).expect("success");
+    }
+
+    #[rstest]
+    #[case("")]
+    #[case(" ")]
+    fn test_rejected_denom(#[case] denom_str: &str) {
+        BaseDenom::from_str(denom_str).expect_err("failure");
+    }
+
+    #[rstest]
+    #[case(
+        "transfer/channel-75",
+        "factory/stars16da2uus9zrsy83h23ur42v3lglg5rmyrpqnju4/dust"
+    )]
+    #[case(
+        "transfer/channel-75/transfer/channel-123/transfer/channel-1023/transfer/channel-0",
+        "factory/stars16da2uus9zrsy83h23ur42v3lglg5rmyrpqnju4/dust"
+    )]
+    #[case(
+        "transfer/channel-75/transfer/channel-123/transfer/channel-1023/transfer/channel-0",
+        "//////////////////////dust"
+    )]
+    #[case("transfer/channel-0", "uatom")]
+    #[case("transfer/channel-0/transfer/channel-1", "uatom")]
+    #[case("", "/")]
+    #[case("", "transfer/uatom")]
+    #[case("", "transfer/atom")]
+    #[case("", "transfer//uatom")]
+    #[case("", "/uatom")]
+    #[case("", "//uatom")]
+    #[case("", "transfer/")]
+    #[case("", "(transfer)/channel-0/uatom")]
+    #[case("", "transfer/(channel-0)/uatom")]
+    // https://github.com/cosmos/ibc-go/blob/e2ad31975f2ede592912b86346b5ebf055c9e05f/modules/apps/transfer/types/trace_test.go#L17-L38
+    #[case("", "uatom")]
+    #[case("", "uatom/")]
+    #[case("", "gamm/pool/1")]
+    #[case("", "gamm//pool//1")]
+    #[case("transfer/channel-1", "uatom")]
+    #[case("customtransfer/channel-1", "uatom")]
+    #[case("transfer/channel-1", "uatom/")]
+    #[case(
+        "transfer/channel-1",
+        "erc20/0x85bcBCd7e79Ec36f4fBBDc54F90C643d921151AA"
+    )]
+    #[case("transfer/channel-1", "gamm/pool/1")]
+    #[case("transfer/channel-1", "gamm//pool//1")]
+    #[case("transfer/channel-1/transfer/channel-2", "uatom")]
+    #[case("customtransfer/channel-1/alternativetransfer/channel-2", "uatom")]
+    #[case("", "transfer/uatom")]
+    #[case("", "transfer//uatom")]
+    #[case("", "channel-1/transfer/uatom")]
+    #[case("", "uatom/transfer")]
+    #[case("", "transfer/channel-1")]
+    #[case("transfer/channel-1", "transfer")]
+    #[case("", "transfer/channelToA/uatom")]
+    fn test_strange_but_accepted_prefixed_denom(
+        #[case] prefix: &str,
+        #[case] denom: &str,
+    ) -> Result<(), TokenTransferError> {
+        let pd_s = if prefix.is_empty() {
+            denom.to_owned()
+        } else {
+            format!("{prefix}/{denom}")
+        };
+        let pd = PrefixedDenom::from_str(&pd_s)?;
+
+        assert_eq!(pd.to_string(), pd_s);
+        assert_eq!(pd.trace_path.to_string(), prefix);
+        assert_eq!(pd.base_denom.to_string(), denom);
+
+        Ok(())
+    }
+
+    #[rstest]
+    #[case("")]
+    #[case("   ")]
+    #[case("transfer/channel-1/")]
+    #[case("transfer/channel-1/transfer/channel-2/")]
+    #[case("transfer/channel-21/transfer/channel-23/  ")]
+    #[case("transfer/channel-0/")]
+    #[should_panic(expected = "EmptyBaseDenom")]
+    fn test_prefixed_empty_base_denom(#[case] pd_s: &str) {
+        PrefixedDenom::from_str(pd_s).expect("error");
+    }
+
+    #[rstest]
+    fn test_trace_path_order() {
+        let mut prefixed_denom =
+            PrefixedDenom::from_str("customtransfer/channel-1/alternativetransfer/channel-2/uatom")
+                .expect("no error");
+
+        assert_eq!(
+            prefixed_denom.trace_path.to_string(),
+            "customtransfer/channel-1/alternativetransfer/channel-2"
+        );
+        assert_eq!(prefixed_denom.base_denom.to_string(), "uatom");
+
+        let trace_prefix_1 = TracePrefix::new(
+            "alternativetransfer".parse().unwrap(),
+            "channel-2".parse().unwrap(),
+        );
+
+        let trace_prefix_2 = TracePrefix::new(
+            "customtransfer".parse().unwrap(),
+            "channel-1".parse().unwrap(),
+        );
+
+        let trace_prefix_3 =
+            TracePrefix::new("transferv2".parse().unwrap(), "channel-10".parse().unwrap());
+        let trace_prefix_4 = TracePrefix::new(
+            "transferv3".parse().unwrap(),
+            "channel-101".parse().unwrap(),
+        );
+
+        prefixed_denom.trace_path.add_prefix(trace_prefix_3.clone());
+
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_1));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_2));
+        assert!(prefixed_denom.trace_path.starts_with(&trace_prefix_3));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_4));
+
+        assert_eq!(
+            prefixed_denom.to_string(),
+            "transferv2/channel-10/customtransfer/channel-1/alternativetransfer/channel-2/uatom"
+        );
+
+        prefixed_denom.trace_path.remove_prefix(&trace_prefix_4);
+
+        assert!(!prefixed_denom.trace_path.is_empty());
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_1));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_2));
+        assert!(prefixed_denom.trace_path.starts_with(&trace_prefix_3));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_4));
+        assert_eq!(
+            prefixed_denom.to_string(),
+            "transferv2/channel-10/customtransfer/channel-1/alternativetransfer/channel-2/uatom"
+        );
+
+        prefixed_denom.trace_path.remove_prefix(&trace_prefix_3);
+
+        assert!(!prefixed_denom.trace_path.is_empty());
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_1));
+        assert!(prefixed_denom.trace_path.starts_with(&trace_prefix_2));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_3));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_4));
+        assert_eq!(
+            prefixed_denom.to_string(),
+            "customtransfer/channel-1/alternativetransfer/channel-2/uatom"
+        );
+
+        prefixed_denom.trace_path.remove_prefix(&trace_prefix_2);
+
+        assert!(!prefixed_denom.trace_path.is_empty());
+        assert!(prefixed_denom.trace_path.starts_with(&trace_prefix_1));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_2));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_3));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_4));
+        assert_eq!(
+            prefixed_denom.to_string(),
+            "alternativetransfer/channel-2/uatom"
+        );
+
+        prefixed_denom.trace_path.remove_prefix(&trace_prefix_1);
+
+        assert!(prefixed_denom.trace_path.is_empty());
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_1));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_2));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_3));
+        assert!(!prefixed_denom.trace_path.starts_with(&trace_prefix_4));
+        assert_eq!(prefixed_denom.to_string(), "uatom");
+    }
+
+    #[rstest]
+    #[case("", TracePath::empty(), Some(""))]
+    #[case("transfer", TracePath::empty(), Some("transfer"))]
+    #[case("transfer/", TracePath::empty(), Some("transfer/"))]
+    #[case("transfer/channel-1", TracePath::from(vec![TracePrefix::new("transfer".parse().unwrap(), ChannelId::new(1))]), None)]
+    #[case("transfer/channel-1/", TracePath::from(vec![TracePrefix::new("transfer".parse().unwrap(), ChannelId::new(1))]), Some(""))]
+    #[case("transfer/channel-1/uatom", TracePath::from(vec![TracePrefix::new("transfer".parse().unwrap(), ChannelId::new(1))]), Some("uatom"))]
+    #[case("transfer/channel-1/uatom/", TracePath::from(vec![TracePrefix::new("transfer".parse().unwrap(), ChannelId::new(1))]), Some("uatom/"))]
+    fn test_trace_path_cases(
+        #[case] trace_path_s: &str,
+        #[case] trace_path: TracePath,
+        #[case] remaining: Option<&str>,
+    ) {
+        let (parsed_trace_path, parsed_remaining) = TracePath::trim(trace_path_s);
+
+        assert_eq!(parsed_trace_path, trace_path);
+        assert_eq!(parsed_remaining, remaining);
+    }
+
+    #[test]
+    fn test_trace_path() -> Result<(), TokenTransferError> {
+        assert!(TracePath::from_str("").is_ok(), "empty trace path");
+        assert!(
+            TracePath::from_str("transfer/uatom").is_err(),
+            "invalid trace path: bad ChannelId"
+        );
+        assert!(
+            TracePath::from_str("transfer//uatom").is_err(),
+            "malformed trace path: missing ChannelId"
+        );
+        assert!(
+            TracePath::from_str("transfer/channel-0/").is_err(),
+            "malformed trace path: trailing delimiter"
+        );
+
+        let prefix_1 = TracePrefix::new("transfer".parse().unwrap(), "channel-1".parse().unwrap());
+        let prefix_2 = TracePrefix::new("transfer".parse().unwrap(), "channel-0".parse().unwrap());
+        let mut trace_path = TracePath(vec![prefix_1.clone()]);
+
+        trace_path.add_prefix(prefix_2.clone());
+        assert_eq!(
+            TracePath::from_str("transfer/channel-0/transfer/channel-1")?,
+            trace_path
+        );
+        assert_eq!(
+            TracePath(vec![prefix_1.clone(), prefix_2.clone()]),
+            trace_path
+        );
+
+        trace_path.remove_prefix(&prefix_2);
+        assert_eq!(TracePath::from_str("transfer/channel-1")?, trace_path);
+        assert_eq!(TracePath(vec![prefix_1.clone()]), trace_path);
+
+        trace_path.remove_prefix(&prefix_1);
+        assert!(trace_path.is_empty());
+
+        Ok(())
+    }
+}
diff --git a/crates/ibc/src/applications/transfer/error.rs b/ibc-apps/ics20-transfer/types/src/error.rs
similarity index 75%
rename from crates/ibc/src/applications/transfer/error.rs
rename to ibc-apps/ics20-transfer/types/src/error.rs
index 479820bc7..a394eb77d 100644
--- a/crates/ibc/src/applications/transfer/error.rs
+++ b/ibc-apps/ics20-transfer/types/src/error.rs
@@ -1,23 +1,27 @@
 //! Defines the token transfer error type
-
 use core::convert::Infallible;
 use core::str::Utf8Error;
+
 use displaydoc::Display;
-use ibc_proto::protobuf::Error as TendermintProtoError;
+use ibc_core::channel::types::acknowledgement::StatusValue;
+use ibc_core::channel::types::channel::Order;
+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;
 
-use crate::core::ics04_channel::acknowledgement::StatusValue;
-use crate::core::ics04_channel::channel::Order;
-use crate::core::ics24_host::identifier::{ChannelId, IdentifierError, PortId};
-use crate::core::ContextError;
-use crate::prelude::*;
-
 #[derive(Display, Debug)]
 pub enum TokenTransferError {
     /// context error: `{0}`
     ContextError(ContextError),
     /// invalid identifier: `{0}`
     InvalidIdentifier(IdentifierError),
+    /// insufficient funds: tried to send `{send_attempt}`, sender only has `{available_funds}`
+    InsufficientFunds {
+        send_attempt: String,
+        available_funds: String,
+    },
     /// destination channel not found in the counterparty of port_id `{port_id}` and channel_id `{channel_id}`
     DestinationChannelNotFound {
         port_id: PortId,
@@ -27,17 +31,19 @@ pub enum TokenTransferError {
     EmptyBaseDenom,
     /// invalid prot id n trace at position: `{pos}`, validation error: `{validation_error}`
     InvalidTracePortId {
-        pos: usize,
+        pos: u64,
         validation_error: IdentifierError,
     },
     /// invalid channel id in trace at position: `{pos}`, validation error: `{validation_error}`
     InvalidTraceChannelId {
-        pos: usize,
+        pos: u64,
         validation_error: IdentifierError,
     },
+    /// malformed trace: `{0}`
+    MalformedTrace(String),
     /// trace length must be even but got: `{len}`
-    InvalidTraceLength { len: usize },
-    /// invalid amount error: `{0}`
+    InvalidTraceLength { len: u64 },
+    /// invalid amount: `{0}`
     InvalidAmount(FromDecStrErr),
     /// invalid token
     InvalidToken,
@@ -63,14 +69,16 @@ pub enum TokenTransferError {
         port_id: PortId,
         exp_port_id: PortId,
     },
-    /// decoding raw msg error: `{0}`
-    DecodeRawMsg(TendermintProtoError),
+    /// decoding raw msg error: `{reason}`
+    DecodeRawMsg { reason: String },
     /// unknown msg type: `{msg_type}`
     UnknownMsgType { msg_type: String },
     /// invalid coin string: `{coin}`
     InvalidCoin { coin: String },
-    /// decoding raw bytes as UTF8 string error: `{0}`
+    /// decoding raw bytes as UTF-8 string error: `{0}`
     Utf8Decode(Utf8Error),
+    /// other error: `{0}`
+    Other(String),
 }
 
 #[cfg(feature = "std")]
@@ -78,17 +86,16 @@ impl std::error::Error for TokenTransferError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
             Self::ContextError(e) => Some(e),
-            Self::InvalidIdentifier(e) => Some(e),
-            Self::InvalidTracePortId {
+            Self::InvalidIdentifier(e)
+            | Self::InvalidTracePortId {
                 validation_error: e,
                 ..
-            } => Some(e),
-            Self::InvalidTraceChannelId {
+            }
+            | Self::InvalidTraceChannelId {
                 validation_error: e,
                 ..
             } => Some(e),
             Self::InvalidAmount(e) => Some(e),
-            Self::DecodeRawMsg(e) => Some(e),
             Self::Utf8Decode(e) => Some(e),
             _ => None,
         }
diff --git a/crates/ibc/src/applications/transfer/events.rs b/ibc-apps/ics20-transfer/types/src/events.rs
similarity index 83%
rename from crates/ibc/src/applications/transfer/events.rs
rename to ibc-apps/ics20-transfer/types/src/events.rs
index 23476f3d2..565e14430 100644
--- a/crates/ibc/src/applications/transfer/events.rs
+++ b/ibc-apps/ics20-transfer/types/src/events.rs
@@ -1,12 +1,11 @@
 //! Defines all token transfer event types
-
-use crate::applications::transfer::{Amount, PrefixedDenom, MODULE_ID_STR};
-use crate::core::events::ModuleEvent;
-use crate::core::ics04_channel::acknowledgement::AcknowledgementStatus;
-use crate::prelude::*;
-use crate::signer::Signer;
+use ibc_core::channel::types::acknowledgement::AcknowledgementStatus;
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Signer;
+use ibc_core::router::types::event::ModuleEvent;
 
 use super::Memo;
+use crate::{Amount, PrefixedDenom, MODULE_ID_STR};
 
 const EVENT_TYPE_PACKET: &str = "fungible_token_packet";
 const EVENT_TYPE_TIMEOUT: &str = "timeout";
@@ -23,8 +22,8 @@ pub enum Event {
     Transfer(TransferEvent),
 }
 
-/// Event emitted in the [`onRecvPacket`][super::context::on_recv_packet_execute]
-/// module callback to indicate the that the `RecvPacket` message was processed
+/// Event emitted by the `onRecvPacket` module callback to indicate the that the
+/// `RecvPacket` message was processed
 pub struct RecvEvent {
     pub sender: Signer,
     pub receiver: Signer,
@@ -59,8 +58,7 @@ impl From<RecvEvent> for ModuleEvent {
     }
 }
 
-/// Event emitted in the [`onAcknowledgePacket`][super::context::on_acknowledgement_packet_execute]
-/// module callback
+/// Event emitted in the `onAcknowledgePacket` module callback
 pub struct AckEvent {
     pub sender: Signer,
     pub receiver: Signer,
@@ -95,8 +93,8 @@ impl From<AckEvent> for ModuleEvent {
     }
 }
 
-/// Event emitted in the [`onAcknowledgePacket`][super::context::on_acknowledgement_packet_execute]
-/// module callback to indicate whether the acknowledgement is a success or a failure
+/// Event emitted in the `onAcknowledgePacket` module callback to indicate
+/// whether the acknowledgement is a success or a failure
 pub struct AckStatusEvent {
     pub acknowledgement: AcknowledgementStatus,
 }
@@ -116,8 +114,7 @@ impl From<AckStatusEvent> for ModuleEvent {
     }
 }
 
-/// Event emitted in the [`onTimeoutPacket`][super::context::on_timeout_packet_execute]
-/// module callback
+/// Event emitted in the `onTimeoutPacket` module callback
 pub struct TimeoutEvent {
     pub refund_receiver: Signer,
     pub refund_denom: PrefixedDenom,
@@ -146,8 +143,7 @@ impl From<TimeoutEvent> for ModuleEvent {
     }
 }
 
-/// Event emitted in the [`onRecvPacket`][super::context::on_recv_packet_execute]
-/// module callback when new tokens are minted
+/// Event emitted in the `onRecvPacket` module callback when new tokens are minted
 pub struct DenomTraceEvent {
     pub trace_hash: Option<String>,
     pub denom: PrefixedDenom,
@@ -167,8 +163,7 @@ impl From<DenomTraceEvent> for ModuleEvent {
     }
 }
 
-/// Event emitted in [`sendTransfer`][super::send_transfer] after a successful
-/// transfer
+/// Event emitted after a successful `sendTransfer`
 pub struct TransferEvent {
     pub sender: Signer,
     pub receiver: Signer,
diff --git a/ibc-apps/ics20-transfer/types/src/lib.rs b/ibc-apps/ics20-transfer/types/src/lib.rs
new file mode 100644
index 000000000..2e5df5bf0
--- /dev/null
+++ b/ibc-apps/ics20-transfer/types/src/lib.rs
@@ -0,0 +1,58 @@
+//! Implementation of the IBC [fungible token transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md) (ICS-20) data structures.
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+mod amount;
+mod coin;
+mod denom;
+mod memo;
+
+pub use amount::*;
+pub use coin::*;
+pub use denom::*;
+pub mod error;
+pub mod events;
+pub mod msgs;
+pub mod packet;
+pub use memo::*;
+/// Re-exports `U256` from `primitive-types` crate for convenience.
+pub use primitive_types::U256;
+
+/// Re-exports ICS-20 token transfer proto types from the `ibc-proto` crate.
+pub mod proto {
+    pub use ibc_proto::ibc::apps::transfer;
+}
+
+/// Module identifier for the ICS20 application.
+pub const MODULE_ID_STR: &str = "transfer";
+
+/// The port identifier that the ICS20 applications
+/// typically bind with.
+pub const PORT_ID_STR: &str = "transfer";
+
+/// ICS20 application current version.
+pub const VERSION: &str = "ics20-1";
+
+/// The successful string, used for creating an acknowledgement status.
+/// It is equivalent to `base64::encode(0x01)`.
+pub const ACK_SUCCESS_B64: &str = "AQ==";
+
+use ibc_core::channel::types::acknowledgement::StatusValue;
+
+/// Returns a successful acknowledgement status for the token transfer application.
+pub fn ack_success_b64() -> StatusValue {
+    StatusValue::new(ACK_SUCCESS_B64).expect("ack status value is never supposed to be empty")
+}
diff --git a/crates/ibc/src/applications/transfer/memo.rs b/ibc-apps/ics20-transfer/types/src/memo.rs
similarity index 81%
rename from crates/ibc/src/applications/transfer/memo.rs
rename to ibc-apps/ics20-transfer/types/src/memo.rs
index 261828e13..a49c40beb 100644
--- a/crates/ibc/src/applications/transfer/memo.rs
+++ b/ibc-apps/ics20-transfer/types/src/memo.rs
@@ -2,10 +2,12 @@
 //! with a token transfer
 
 use core::convert::Infallible;
-use core::fmt::{self, Display};
+use core::fmt::{
+    Display, {self},
+};
 use core::str::FromStr;
 
-use crate::prelude::*;
+use ibc_core::primitives::prelude::*;
 
 /// Represents the token transfer memo
 #[cfg_attr(
@@ -21,6 +23,7 @@ use crate::prelude::*;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Memo(String);
 
@@ -42,6 +45,12 @@ impl From<String> for Memo {
     }
 }
 
+impl From<&str> for Memo {
+    fn from(memo: &str) -> Self {
+        Self(memo.to_owned())
+    }
+}
+
 impl FromStr for Memo {
     type Err = Infallible;
 
diff --git a/crates/ibc/src/applications/transfer/msgs.rs b/ibc-apps/ics20-transfer/types/src/msgs/mod.rs
similarity index 98%
rename from crates/ibc/src/applications/transfer/msgs.rs
rename to ibc-apps/ics20-transfer/types/src/msgs/mod.rs
index c019a3120..9c6780741 100644
--- a/crates/ibc/src/applications/transfer/msgs.rs
+++ b/ibc-apps/ics20-transfer/types/src/msgs/mod.rs
@@ -1,3 +1,2 @@
 //! Defines the token transfer message type
-
 pub mod transfer;
diff --git a/crates/ibc/src/applications/transfer/msgs/transfer.rs b/ibc-apps/ics20-transfer/types/src/msgs/transfer.rs
similarity index 53%
rename from crates/ibc/src/applications/transfer/msgs/transfer.rs
rename to ibc-apps/ics20-transfer/types/src/msgs/transfer.rs
index 746386f26..06bd48027 100644
--- a/crates/ibc/src/applications/transfer/msgs/transfer.rs
+++ b/ibc-apps/ics20-transfer/types/src/msgs/transfer.rs
@@ -1,18 +1,17 @@
 //! Defines the token transfer message type
 
-use crate::prelude::*;
-
+use ibc_core::channel::types::error::PacketError;
+use ibc_core::channel::types::timeout::TimeoutHeight;
+use ibc_core::handler::types::error::ContextError;
+use ibc_core::host::types::identifiers::{ChannelId, PortId};
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Timestamp;
 use ibc_proto::google::protobuf::Any;
 use ibc_proto::ibc::applications::transfer::v1::MsgTransfer as RawMsgTransfer;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
-use crate::applications::transfer::error::TokenTransferError;
-use crate::applications::transfer::packet::PacketData;
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::timeout::TimeoutHeight;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::core::timestamp::Timestamp;
-use crate::core::{ContextError, Msg};
+use crate::error::TokenTransferError;
+use crate::packet::PacketData;
 
 pub(crate) const TYPE_URL: &str = "/ibc.applications.transfer.v1.MsgTransfer";
 
@@ -29,6 +28,11 @@ pub(crate) const TYPE_URL: &str = "/ibc.applications.transfer.v1.MsgTransfer";
     feature = "parity-scale-codec",
     derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
 )]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 pub struct MsgTransfer {
     /// the port on which the packet will be sent
     pub port_id_on_a: PortId,
@@ -44,14 +48,6 @@ pub struct MsgTransfer {
     pub timeout_timestamp_on_b: Timestamp,
 }
 
-impl Msg for MsgTransfer {
-    type Raw = RawMsgTransfer;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
 impl TryFrom<RawMsgTransfer> for MsgTransfer {
     type Error = TokenTransferError;
 
@@ -67,7 +63,7 @@ impl TryFrom<RawMsgTransfer> for MsgTransfer {
 
         // Packet timeout height and packet timeout timestamp cannot both be unset.
         if !timeout_height_on_b.is_set() && !timeout_timestamp_on_b.is_set() {
-            return Err(PacketError::MissingTimeout).map_err(ContextError::from)?;
+            return Err(ContextError::from(PacketError::MissingTimeout))?;
         }
 
         Ok(MsgTransfer {
@@ -112,7 +108,9 @@ impl TryFrom<Any> for MsgTransfer {
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         match raw.type_url.as_str() {
             TYPE_URL => {
-                MsgTransfer::decode_vec(&raw.value).map_err(TokenTransferError::DecodeRawMsg)
+                MsgTransfer::decode_vec(&raw.value).map_err(|e| TokenTransferError::DecodeRawMsg {
+                    reason: e.to_string(),
+                })
             }
             _ => Err(TokenTransferError::UnknownMsgType {
                 msg_type: raw.type_url,
@@ -120,78 +118,3 @@ impl TryFrom<Any> for MsgTransfer {
         }
     }
 }
-
-#[cfg(test)]
-pub mod test_util {
-    use super::*;
-
-    use core::ops::Add;
-    use core::time::Duration;
-    use primitive_types::U256;
-
-    use super::MsgTransfer;
-    use crate::applications::transfer::packet::PacketData;
-    use crate::applications::transfer::Coin;
-    use crate::core::ics04_channel::packet::{Packet, Sequence};
-    use crate::core::ics04_channel::timeout::TimeoutHeight;
-    use crate::signer::Signer;
-    use crate::{
-        applications::transfer::BaseCoin,
-        core::ics24_host::identifier::{ChannelId, PortId},
-        test_utils::get_dummy_bech32_account,
-    };
-
-    // Returns a dummy ICS20 `MsgTransfer`. If no `timeout_timestamp` is
-    // specified, a timestamp of 10 seconds in the future is used.
-    pub fn get_dummy_msg_transfer(
-        timeout_height: TimeoutHeight,
-        timeout_timestamp: Option<Timestamp>,
-    ) -> MsgTransfer {
-        let address: Signer = get_dummy_bech32_account().into();
-        MsgTransfer {
-            port_id_on_a: PortId::default(),
-            chan_id_on_a: ChannelId::default(),
-            packet_data: PacketData {
-                token: BaseCoin {
-                    denom: "uatom".parse().unwrap(),
-                    amount: U256::from(10).into(),
-                }
-                .into(),
-                sender: address.clone(),
-                receiver: address,
-                memo: "".to_owned().into(),
-            },
-            timeout_timestamp_on_b: timeout_timestamp
-                .unwrap_or_else(|| Timestamp::now().add(Duration::from_secs(10)).unwrap()),
-            timeout_height_on_b: timeout_height,
-        }
-    }
-
-    pub fn get_dummy_transfer_packet(msg: MsgTransfer, sequence: Sequence) -> Packet {
-        let coin = Coin {
-            denom: msg.packet_data.token.denom.clone(),
-            amount: msg.packet_data.token.amount,
-        };
-
-        let data = {
-            let data = PacketData {
-                token: coin,
-                sender: msg.packet_data.sender.clone(),
-                receiver: msg.packet_data.receiver.clone(),
-                memo: msg.packet_data.memo.clone(),
-            };
-            serde_json::to_vec(&data).expect("PacketData's infallible Serialize impl failed")
-        };
-
-        Packet {
-            seq_on_a: sequence,
-            port_id_on_a: msg.port_id_on_a,
-            chan_id_on_a: msg.chan_id_on_a,
-            port_id_on_b: PortId::default(),
-            chan_id_on_b: ChannelId::default(),
-            data,
-            timeout_height_on_b: msg.timeout_height_on_b,
-            timeout_timestamp_on_b: msg.timeout_timestamp_on_b,
-        }
-    }
-}
diff --git a/ibc-apps/ics20-transfer/types/src/packet.rs b/ibc-apps/ics20-transfer/types/src/packet.rs
new file mode 100644
index 000000000..a3615a090
--- /dev/null
+++ b/ibc-apps/ics20-transfer/types/src/packet.rs
@@ -0,0 +1,121 @@
+//! Contains the `PacketData` type that defines the structure of token transfers' packet bytes
+
+use core::str::FromStr;
+
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Signer;
+use ibc_proto::ibc::applications::transfer::v2::FungibleTokenPacketData as RawPacketData;
+
+use super::error::TokenTransferError;
+use super::{Amount, Memo, PrefixedCoin, PrefixedDenom};
+
+/// Defines the structure of token transfers' packet bytes
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(
+    feature = "serde",
+    serde(try_from = "RawPacketData", into = "RawPacketData")
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PacketData {
+    pub token: PrefixedCoin,
+    pub sender: Signer,
+    pub receiver: Signer,
+    pub memo: Memo,
+}
+
+impl TryFrom<RawPacketData> for PacketData {
+    type Error = TokenTransferError;
+
+    fn try_from(raw_pkt_data: RawPacketData) -> Result<Self, Self::Error> {
+        // This denom may be prefixed or unprefixed.
+        let denom = PrefixedDenom::from_str(&raw_pkt_data.denom)?;
+        let amount = Amount::from_str(&raw_pkt_data.amount)?;
+        Ok(Self {
+            token: PrefixedCoin { denom, amount },
+            sender: raw_pkt_data.sender.into(),
+            receiver: raw_pkt_data.receiver.into(),
+            memo: raw_pkt_data.memo.into(),
+        })
+    }
+}
+
+impl From<PacketData> for RawPacketData {
+    fn from(pkt_data: PacketData) -> Self {
+        Self {
+            denom: pkt_data.token.denom.to_string(),
+            amount: pkt_data.token.amount.to_string(),
+            sender: pkt_data.sender.to_string(),
+            receiver: pkt_data.receiver.to_string(),
+            memo: pkt_data.memo.to_string(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use primitive_types::U256;
+
+    use super::*;
+    use crate::BaseCoin;
+
+    impl PacketData {
+        pub fn new_dummy() -> Self {
+            let address: Signer = "cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng"
+                .to_string()
+                .into();
+
+            Self {
+                token: BaseCoin {
+                    denom: "uatom".parse().unwrap(),
+                    amount: U256::from(10).into(),
+                }
+                .into(),
+                sender: address.clone(),
+                receiver: address,
+                memo: "".to_string().into(),
+            }
+        }
+
+        pub fn ser_json_assert_eq(&self, json: &str) {
+            let ser = serde_json::to_string(&self).unwrap();
+            assert_eq!(ser, json);
+        }
+
+        pub fn deser_json_assert_eq(&self, json: &str) {
+            let deser: Self = serde_json::from_str(json).unwrap();
+            assert_eq!(&deser, self);
+        }
+    }
+
+    pub fn dummy_json_packet_data() -> &'static str {
+        r#"{"denom":"uatom","amount":"10","sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","memo":""}"#
+    }
+
+    pub fn dummy_json_packet_data_without_memo() -> &'static str {
+        r#"{"denom":"uatom","amount":"10","sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng"}"#
+    }
+
+    /// Ensures `PacketData` properly encodes to JSON by first converting to a
+    /// `RawPacketData` and then serializing that.
+    #[test]
+    fn test_packet_data_ser() {
+        PacketData::new_dummy().ser_json_assert_eq(dummy_json_packet_data());
+    }
+
+    /// Ensures `PacketData` properly decodes from JSON by first deserializing to a
+    /// `RawPacketData` and then converting from that.
+    #[test]
+    fn test_packet_data_deser() {
+        PacketData::new_dummy().deser_json_assert_eq(dummy_json_packet_data());
+        PacketData::new_dummy().deser_json_assert_eq(dummy_json_packet_data_without_memo());
+    }
+}
diff --git a/ibc-apps/ics27-interchain-accounts/Cargo.toml b/ibc-apps/ics27-interchain-accounts/Cargo.toml
new file mode 100644
index 000000000..cefcfa758
--- /dev/null
+++ b/ibc-apps/ics27-interchain-accounts/Cargo.toml
@@ -0,0 +1,57 @@
+[package]
+name         = "ibc-app-interchain-accounts"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "transfer", "ics20" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of the ICS-20 Fungible Token Transfer
+    application logic and re-exports essential data structures and domain types from
+    `ibc-app-transfer-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+serde_json = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-core               = { workspace = true }
+ibc-app-transfer-types = { workspace = true }
+
+[dev-dependencies]
+subtle-encoding = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-app-transfer-types/std",
+  "ibc-core/std",
+  "serde_json/std",
+]
+serde = [
+  "ibc-app-transfer-types/serde",
+  "ibc-core/serde",
+  "serde_json",
+]
+schema = [
+  "ibc-app-transfer-types/schema",
+  "ibc-core/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-app-transfer-types/borsh",
+  "ibc-core/borsh",
+]
+parity-scale-codec = [
+  "ibc-app-transfer-types/parity-scale-codec",
+  "ibc-core/parity-scale-codec",
+]
diff --git a/crates/ibc/src/applications/interchain_accounts/account.rs b/ibc-apps/ics27-interchain-accounts/src/account.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/account.rs
rename to ibc-apps/ics27-interchain-accounts/src/account.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/context.rs b/ibc-apps/ics27-interchain-accounts/src/context.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/context.rs
rename to ibc-apps/ics27-interchain-accounts/src/context.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/callback.rs b/ibc-apps/ics27-interchain-accounts/src/controller/callback.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/callback.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/callback.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/handler/mod.rs b/ibc-apps/ics27-interchain-accounts/src/controller/handler/mod.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/handler/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/handler/mod.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/handler/register_interchain_account.rs b/ibc-apps/ics27-interchain-accounts/src/controller/handler/register_interchain_account.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/handler/register_interchain_account.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/handler/register_interchain_account.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/handler/send_tx.rs b/ibc-apps/ics27-interchain-accounts/src/controller/handler/send_tx.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/handler/send_tx.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/handler/send_tx.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/mod.rs b/ibc-apps/ics27-interchain-accounts/src/controller/mod.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/mod.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/msgs/mod.rs b/ibc-apps/ics27-interchain-accounts/src/controller/msgs/mod.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/msgs/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/msgs/mod.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/msgs/register_interchain_account.rs b/ibc-apps/ics27-interchain-accounts/src/controller/msgs/register_interchain_account.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/msgs/register_interchain_account.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/msgs/register_interchain_account.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/controller/msgs/send_tx.rs b/ibc-apps/ics27-interchain-accounts/src/controller/msgs/send_tx.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/controller/msgs/send_tx.rs
rename to ibc-apps/ics27-interchain-accounts/src/controller/msgs/send_tx.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/error.rs b/ibc-apps/ics27-interchain-accounts/src/error.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/error.rs
rename to ibc-apps/ics27-interchain-accounts/src/error.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/events.rs b/ibc-apps/ics27-interchain-accounts/src/events.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/events.rs
rename to ibc-apps/ics27-interchain-accounts/src/events.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/callback.rs b/ibc-apps/ics27-interchain-accounts/src/host/callback.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/callback.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/callback.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/handler/create_interchain_account.rs b/ibc-apps/ics27-interchain-accounts/src/host/handler/create_interchain_account.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/handler/create_interchain_account.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/handler/create_interchain_account.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/handler/mod.rs b/ibc-apps/ics27-interchain-accounts/src/host/handler/mod.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/handler/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/handler/mod.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/handler/on_recv_packet.rs b/ibc-apps/ics27-interchain-accounts/src/host/handler/on_recv_packet.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/handler/on_recv_packet.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/handler/on_recv_packet.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/mod.rs b/ibc-apps/ics27-interchain-accounts/src/host/mod.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/mod.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/msgs/cosmos_tx.rs b/ibc-apps/ics27-interchain-accounts/src/host/msgs/cosmos_tx.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/msgs/cosmos_tx.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/msgs/cosmos_tx.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/msgs/mod.rs b/ibc-apps/ics27-interchain-accounts/src/host/msgs/mod.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/msgs/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/msgs/mod.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/msgs/update_params.rs b/ibc-apps/ics27-interchain-accounts/src/host/msgs/update_params.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/msgs/update_params.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/msgs/update_params.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/host/params.rs b/ibc-apps/ics27-interchain-accounts/src/host/params.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/host/params.rs
rename to ibc-apps/ics27-interchain-accounts/src/host/params.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/mod.rs b/ibc-apps/ics27-interchain-accounts/src/lib.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/mod.rs
rename to ibc-apps/ics27-interchain-accounts/src/lib.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/metadata.rs b/ibc-apps/ics27-interchain-accounts/src/metadata.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/metadata.rs
rename to ibc-apps/ics27-interchain-accounts/src/metadata.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/packet.rs b/ibc-apps/ics27-interchain-accounts/src/packet.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/packet.rs
rename to ibc-apps/ics27-interchain-accounts/src/packet.rs
diff --git a/crates/ibc/src/applications/interchain_accounts/port.rs b/ibc-apps/ics27-interchain-accounts/src/port.rs
similarity index 100%
rename from crates/ibc/src/applications/interchain_accounts/port.rs
rename to ibc-apps/ics27-interchain-accounts/src/port.rs
diff --git a/ibc-apps/ics721-nft-transfer/Cargo.toml b/ibc-apps/ics721-nft-transfer/Cargo.toml
new file mode 100644
index 000000000..f1146b970
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/Cargo.toml
@@ -0,0 +1,54 @@
+[package]
+name         = "ibc-app-nft-transfer"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "cosmos", "ibc", "nft", "transfer", "ics721" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of the ICS-721 Non-Fungible Token Transfer
+    application logic and re-exports essential data structures and domain types from
+    `ibc-app-nft-transfer-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+serde_json = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-app-nft-transfer-types = { workspace = true }
+ibc-core                   = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-app-nft-transfer-types/std",
+  "ibc-core/std",
+  "serde_json/std",
+]
+serde = [
+  "ibc-app-nft-transfer-types/serde",
+  "ibc-core/serde",
+  "serde_json",
+]
+schema = [
+  "ibc-app-nft-transfer-types/schema",
+  "ibc-core/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-app-nft-transfer-types/borsh",
+  "ibc-core/borsh",
+]
+parity-scale-codec = [
+  "ibc-app-nft-transfer-types/parity-scale-codec",
+  "ibc-core/parity-scale-codec",
+]
diff --git a/ibc-apps/ics721-nft-transfer/src/context.rs b/ibc-apps/ics721-nft-transfer/src/context.rs
new file mode 100644
index 000000000..ede6ee898
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/src/context.rs
@@ -0,0 +1,199 @@
+//! Defines the required context traits for ICS-721 to interact with host
+//! machine.
+use ibc_core::host::types::identifiers::{ChannelId, PortId};
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Signer;
+
+use crate::types::error::NftTransferError;
+use crate::types::{
+    ClassData, ClassId, ClassUri, Memo, PrefixedClassId, TokenData, TokenId, TokenUri,
+};
+
+pub trait NftContext {
+    /// Get the class ID of the token
+    fn get_class_id(&self) -> &ClassId;
+
+    /// Get the token ID
+    fn get_id(&self) -> &TokenId;
+
+    /// Get the token URI
+    fn get_uri(&self) -> Option<&TokenUri>;
+
+    /// Get the token Data
+    fn get_data(&self) -> Option<&TokenData>;
+}
+
+pub trait NftClassContext {
+    /// Get the class ID
+    fn get_id(&self) -> &ClassId;
+
+    /// Get the class URI
+    fn get_uri(&self) -> Option<&ClassUri>;
+
+    /// Get the class Data
+    fn get_data(&self) -> Option<&ClassData>;
+}
+
+/// Read-only methods required in NFT transfer validation context.
+pub trait NftTransferValidationContext {
+    type AccountId: TryFrom<Signer> + PartialEq;
+    type Nft: NftContext;
+    type NftClass: NftClassContext;
+
+    /// get_port returns the portID for the transfer module.
+    fn get_port(&self) -> Result<PortId, NftTransferError>;
+
+    /// Returns Ok() if the host chain supports sending NFTs.
+    fn can_send_nft(&self) -> Result<(), NftTransferError>;
+
+    /// Returns Ok() if the host chain supports receiving NFTs.
+    fn can_receive_nft(&self) -> Result<(), NftTransferError>;
+
+    /// Validates that the NFT can be created or updated successfully.
+    ///
+    /// Note: some existing ICS-721 implementations may not strictly adhere to
+    /// the ICS-721 class data structure. The
+    /// [`ClassData`] associated with this
+    /// implementation can take any valid JSON format. If your project requires
+    /// ICS-721 format for the `ClassData`, ensure correctness by checking with
+    /// [`parse_as_ics721_data()`](crate::types::Data::parse_as_ics721_data).
+    fn create_or_update_class_validate(
+        &self,
+        class_id: &PrefixedClassId,
+        class_uri: Option<&ClassUri>,
+        class_data: Option<&ClassData>,
+    ) -> Result<(), NftTransferError>;
+
+    /// Validates that the tokens can be escrowed successfully.
+    ///
+    /// The owner of the NFT should be checked in this validation.
+    /// `memo` field allows incorporating additional contextual details in the
+    /// escrow validation.
+    fn escrow_nft_validate(
+        &self,
+        from_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+        memo: &Memo,
+    ) -> Result<(), NftTransferError>;
+
+    /// Validates that the NFT can be unescrowed successfully.
+    fn unescrow_nft_validate(
+        &self,
+        to_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+    ) -> Result<(), NftTransferError>;
+
+    /// Validates the receiver account and the NFT input
+    ///
+    /// Note: some existing ICS-721 implementations may not strictly adhere to
+    /// the ICS-721 token data structure. The
+    /// [`TokenData`] associated with this
+    /// implementation can take any valid JSON format. If your project requires
+    /// ICS-721 format for `TokenData`, ensure correctness by checking with
+    /// [`parse_as_ics721_data()`](crate::types::Data::parse_as_ics721_data).
+    fn mint_nft_validate(
+        &self,
+        account: &Self::AccountId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+        token_uri: Option<&TokenUri>,
+        token_data: Option<&TokenData>,
+    ) -> Result<(), NftTransferError>;
+
+    /// Validates the sender account and the coin input before burning.
+    ///
+    /// The owner of the NFT should be checked in this validation.
+    /// `memo` field allows incorporating additional contextual details in the
+    /// burn validation.
+    fn burn_nft_validate(
+        &self,
+        account: &Self::AccountId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+        memo: &Memo,
+    ) -> Result<(), NftTransferError>;
+
+    /// Returns a hash of the prefixed class ID and the token ID.
+    /// Implement only if the host chain supports hashed class ID and token ID.
+    fn token_hash_string(
+        &self,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+    ) -> Option<String> {
+        None
+    }
+
+    /// Returns the NFT
+    fn get_nft(
+        &self,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+    ) -> Result<Self::Nft, NftTransferError>;
+
+    /// Returns the NFT class
+    fn get_nft_class(&self, class_id: &PrefixedClassId)
+        -> Result<Self::NftClass, NftTransferError>;
+}
+
+/// Read-write methods required in NFT transfer execution context.
+pub trait NftTransferExecutionContext: NftTransferValidationContext {
+    /// Creates a new NFT Class identified by classId. If the class ID already exists, it updates the class metadata.
+    fn create_or_update_class_execute(
+        &self,
+        class_id: &PrefixedClassId,
+        class_uri: Option<&ClassUri>,
+        class_data: Option<&ClassData>,
+    ) -> Result<(), NftTransferError>;
+
+    /// Executes the escrow of the NFT in a user account.
+    ///
+    /// `memo` field allows incorporating additional contextual details in the
+    /// escrow execution.
+    fn escrow_nft_execute(
+        &mut self,
+        from_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+        memo: &Memo,
+    ) -> Result<(), NftTransferError>;
+
+    /// Executes the unescrow of the NFT in a user account.
+    fn unescrow_nft_execute(
+        &mut self,
+        to_account: &Self::AccountId,
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+    ) -> Result<(), NftTransferError>;
+
+    /// Executes minting of the NFT in a user account.
+    fn mint_nft_execute(
+        &mut self,
+        account: &Self::AccountId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+        token_uri: Option<&TokenUri>,
+        token_data: Option<&TokenData>,
+    ) -> Result<(), NftTransferError>;
+
+    /// Executes burning of the NFT in a user account.
+    ///
+    /// `memo` field allows incorporating additional contextual details in the
+    /// burn execution.
+    fn burn_nft_execute(
+        &mut self,
+        account: &Self::AccountId,
+        class_id: &PrefixedClassId,
+        token_id: &TokenId,
+        memo: &Memo,
+    ) -> Result<(), NftTransferError>;
+}
diff --git a/ibc-apps/ics721-nft-transfer/src/handler/mod.rs b/ibc-apps/ics721-nft-transfer/src/handler/mod.rs
new file mode 100644
index 000000000..2adbb47f6
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/src/handler/mod.rs
@@ -0,0 +1,85 @@
+//! Implements IBC handlers responsible for processing Non-Fungible Token
+//! Transfers (ICS-721) messages.
+mod on_recv_packet;
+mod send_transfer;
+
+use ibc_core::channel::types::packet::Packet;
+pub use on_recv_packet::*;
+pub use send_transfer::*;
+
+use crate::context::{NftTransferExecutionContext, NftTransferValidationContext};
+use crate::types::error::NftTransferError;
+use crate::types::is_sender_chain_source;
+use crate::types::packet::PacketData;
+
+pub fn refund_packet_nft_execute(
+    ctx_a: &mut impl NftTransferExecutionContext,
+    packet: &Packet,
+    data: &PacketData,
+) -> Result<(), NftTransferError> {
+    let sender = data
+        .sender
+        .clone()
+        .try_into()
+        .map_err(|_| NftTransferError::ParseAccountFailure)?;
+
+    if is_sender_chain_source(
+        packet.port_id_on_a.clone(),
+        packet.chan_id_on_a.clone(),
+        &data.class_id,
+    ) {
+        data.token_ids.as_ref().iter().try_for_each(|token_id| {
+            ctx_a.unescrow_nft_execute(
+                &sender,
+                &packet.port_id_on_a,
+                &packet.chan_id_on_a,
+                &data.class_id,
+                token_id,
+            )
+        })
+    }
+    // mint vouchers back to sender
+    else {
+        for (i, token_id) in data.token_ids.0.iter().enumerate() {
+            let token_uri = data.token_uris.as_ref().and_then(|uris| uris.get(i));
+            let token_data = data.token_data.as_ref().and_then(|data| data.get(i));
+            ctx_a.mint_nft_execute(&sender, &data.class_id, token_id, token_uri, token_data)?;
+        }
+        Ok(())
+    }
+}
+
+pub fn refund_packet_nft_validate(
+    ctx_a: &impl NftTransferValidationContext,
+    packet: &Packet,
+    data: &PacketData,
+) -> Result<(), NftTransferError> {
+    let sender = data
+        .sender
+        .clone()
+        .try_into()
+        .map_err(|_| NftTransferError::ParseAccountFailure)?;
+
+    if is_sender_chain_source(
+        packet.port_id_on_a.clone(),
+        packet.chan_id_on_a.clone(),
+        &data.class_id,
+    ) {
+        data.token_ids.0.iter().try_for_each(|token_id| {
+            ctx_a.unescrow_nft_validate(
+                &sender,
+                &packet.port_id_on_a,
+                &packet.chan_id_on_a,
+                &data.class_id,
+                token_id,
+            )
+        })
+    } else {
+        for (i, token_id) in data.token_ids.0.iter().enumerate() {
+            let token_uri = data.token_uris.as_ref().and_then(|uris| uris.get(i));
+            let token_data = data.token_data.as_ref().and_then(|data| data.get(i));
+            ctx_a.mint_nft_validate(&sender, &data.class_id, token_id, token_uri, token_data)?;
+        }
+        Ok(())
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/src/handler/on_recv_packet.rs b/ibc-apps/ics721-nft-transfer/src/handler/on_recv_packet.rs
new file mode 100644
index 000000000..8782bf7a2
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/src/handler/on_recv_packet.rs
@@ -0,0 +1,137 @@
+use ibc_core::channel::types::packet::Packet;
+use ibc_core::primitives::prelude::*;
+use ibc_core::router::types::module::ModuleExtras;
+
+use crate::context::NftTransferExecutionContext;
+use crate::types::error::NftTransferError;
+use crate::types::events::TokenTraceEvent;
+use crate::types::packet::PacketData;
+use crate::types::{is_receiver_chain_source, TracePrefix};
+
+/// This function handles the transfer receiving logic.
+///
+/// Note that `send/mint_nft_validate` steps are performed on the host chain
+/// to validate accounts and NFT info. But the result is then used for execution
+/// on the IBC side, including storing acknowledgements and emitting events.
+pub fn process_recv_packet_execute<Ctx>(
+    ctx_b: &mut Ctx,
+    packet: &Packet,
+    data: PacketData,
+) -> Result<ModuleExtras, Box<(ModuleExtras, NftTransferError)>>
+where
+    Ctx: NftTransferExecutionContext,
+{
+    ctx_b
+        .can_receive_nft()
+        .map_err(|err| (ModuleExtras::empty(), err))?;
+
+    let receiver_account = data
+        .receiver
+        .clone()
+        .try_into()
+        .map_err(|_| (ModuleExtras::empty(), NftTransferError::ParseAccountFailure))?;
+
+    let extras = if is_receiver_chain_source(
+        packet.port_id_on_a.clone(),
+        packet.chan_id_on_a.clone(),
+        &data.class_id,
+    ) {
+        // sender chain is not the source, unescrow the NFT
+        let prefix = TracePrefix::new(packet.port_id_on_a.clone(), packet.chan_id_on_a.clone());
+        let class_id = {
+            let mut c = data.class_id;
+            c.remove_trace_prefix(&prefix);
+            c
+        };
+
+        // Note: the validation is called before the execution.
+        // Refer to ICS-20 `process_recv_packet_execute()`.
+        for token_id in data.token_ids.as_ref() {
+            ctx_b
+                .unescrow_nft_validate(
+                    &receiver_account,
+                    &packet.port_id_on_b,
+                    &packet.chan_id_on_b,
+                    &class_id,
+                    token_id,
+                )
+                .map_err(|nft_error| (ModuleExtras::empty(), nft_error))?;
+            ctx_b
+                .unescrow_nft_execute(
+                    &receiver_account,
+                    &packet.port_id_on_b,
+                    &packet.chan_id_on_b,
+                    &class_id,
+                    token_id,
+                )
+                .map_err(|nft_error| (ModuleExtras::empty(), nft_error))?;
+        }
+
+        ModuleExtras::empty()
+    } else {
+        // sender chain is the source, mint vouchers
+        let prefix = TracePrefix::new(packet.port_id_on_b.clone(), packet.chan_id_on_b.clone());
+        let class_id = {
+            let mut c = data.class_id;
+            c.add_trace_prefix(prefix);
+            c
+        };
+
+        let mut extras = ModuleExtras {
+            events: vec![],
+            log: Vec::new(),
+        };
+        for (i, token_id) in data.token_ids.0.iter().enumerate() {
+            let token_uri = data.token_uris.as_ref().and_then(|uris| uris.get(i));
+            let token_data = data.token_data.as_ref().and_then(|data| data.get(i));
+
+            let trace_event = TokenTraceEvent {
+                trace_hash: ctx_b.token_hash_string(&class_id, token_id),
+                class: class_id.clone(),
+                token: token_id.clone(),
+            };
+            extras.events.push(trace_event.into());
+
+            // Note: the validation is called before the execution.
+            // Refer to ICS-20 `process_recv_packet_execute()`.
+
+            ctx_b
+                .create_or_update_class_validate(
+                    &class_id,
+                    data.class_uri.as_ref(),
+                    data.class_data.as_ref(),
+                )
+                .map_err(|nft_error| (ModuleExtras::empty(), nft_error))?;
+            ctx_b
+                .create_or_update_class_execute(
+                    &class_id,
+                    data.class_uri.as_ref(),
+                    data.class_data.as_ref(),
+                )
+                .map_err(|nft_error| (ModuleExtras::empty(), nft_error))?;
+
+            ctx_b
+                .mint_nft_validate(
+                    &receiver_account,
+                    &class_id,
+                    token_id,
+                    token_uri,
+                    token_data,
+                )
+                .map_err(|nft_error| (extras.clone(), nft_error))?;
+            ctx_b
+                .mint_nft_execute(
+                    &receiver_account,
+                    &class_id,
+                    token_id,
+                    token_uri,
+                    token_data,
+                )
+                .map_err(|nft_error| (extras.clone(), nft_error))?;
+        }
+
+        extras
+    };
+
+    Ok(extras)
+}
diff --git a/ibc-apps/ics721-nft-transfer/src/handler/send_transfer.rs b/ibc-apps/ics721-nft-transfer/src/handler/send_transfer.rs
new file mode 100644
index 000000000..4cf1a759c
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/src/handler/send_transfer.rs
@@ -0,0 +1,253 @@
+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::handler::types::events::MessageEvent;
+use ibc_core::host::types::path::{ChannelEndPath, SeqSendPath};
+use ibc_core::primitives::prelude::*;
+use ibc_core::router::types::event::ModuleEvent;
+
+use crate::context::{
+    NftClassContext, NftContext, NftTransferExecutionContext, NftTransferValidationContext,
+};
+use crate::types::error::NftTransferError;
+use crate::types::events::TransferEvent;
+use crate::types::msgs::transfer::MsgTransfer;
+use crate::types::{is_sender_chain_source, MODULE_ID_STR};
+
+/// Initiate a token transfer. Equivalent to calling [`send_nft_transfer_validate`], followed by [`send_nft_transfer_execute`].
+pub fn send_nft_transfer<SendPacketCtx, TransferCtx>(
+    send_packet_ctx_a: &mut SendPacketCtx,
+    transfer_ctx: &mut TransferCtx,
+    msg: MsgTransfer,
+) -> Result<(), NftTransferError>
+where
+    SendPacketCtx: SendPacketExecutionContext,
+    TransferCtx: NftTransferExecutionContext,
+{
+    send_nft_transfer_validate(send_packet_ctx_a, transfer_ctx, msg.clone())?;
+    send_nft_transfer_execute(send_packet_ctx_a, transfer_ctx, msg)
+}
+
+/// Validates the NFT transfer
+pub fn send_nft_transfer_validate<SendPacketCtx, TransferCtx>(
+    send_packet_ctx_a: &SendPacketCtx,
+    transfer_ctx: &TransferCtx,
+    msg: MsgTransfer,
+) -> Result<(), NftTransferError>
+where
+    SendPacketCtx: SendPacketValidationContext,
+    TransferCtx: NftTransferValidationContext,
+{
+    transfer_ctx.can_send_nft()?;
+
+    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let chan_end_on_a = send_packet_ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    let port_id_on_b = chan_end_on_a.counterparty().port_id().clone();
+    let chan_id_on_b = chan_end_on_a
+        .counterparty()
+        .channel_id()
+        .ok_or_else(|| NftTransferError::DestinationChannelNotFound {
+            port_id: msg.port_id_on_a.clone(),
+            channel_id: msg.chan_id_on_a.clone(),
+        })?
+        .clone();
+
+    let seq_send_path_on_a = SeqSendPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let sequence = send_packet_ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
+
+    let sender: TransferCtx::AccountId = msg
+        .packet_data
+        .sender
+        .clone()
+        .try_into()
+        .map_err(|_| NftTransferError::ParseAccountFailure)?;
+
+    let mut packet_data = msg.packet_data;
+    let class_id = &packet_data.class_id;
+    let token_ids = &packet_data.token_ids;
+    // overwrite even if they are set in MsgTransfer
+    if let Some(uris) = &mut packet_data.token_uris {
+        uris.clear();
+    }
+    if let Some(data) = &mut packet_data.token_data {
+        data.clear();
+    }
+    for token_id in token_ids.as_ref() {
+        if is_sender_chain_source(msg.port_id_on_a.clone(), msg.chan_id_on_a.clone(), class_id) {
+            transfer_ctx.escrow_nft_validate(
+                &sender,
+                &msg.port_id_on_a,
+                &msg.chan_id_on_a,
+                class_id,
+                token_id,
+                &packet_data.memo.clone().unwrap_or("".into()),
+            )?;
+        } else {
+            transfer_ctx.burn_nft_validate(
+                &sender,
+                class_id,
+                token_id,
+                &packet_data.memo.clone().unwrap_or("".into()),
+            )?;
+        }
+        let nft = transfer_ctx.get_nft(class_id, token_id)?;
+        // Set the URI and the data if both exists
+        if let (Some(uri), Some(data)) = (nft.get_uri(), nft.get_data()) {
+            match &mut packet_data.token_uris {
+                Some(uris) => uris.push(uri.clone()),
+                None => packet_data.token_uris = Some(vec![uri.clone()]),
+            }
+            match &mut packet_data.token_data {
+                Some(token_data) => token_data.push(data.clone()),
+                None => packet_data.token_data = Some(vec![data.clone()]),
+            }
+        }
+    }
+
+    packet_data.validate_basic()?;
+
+    let nft_class = transfer_ctx.get_nft_class(class_id)?;
+    packet_data.class_uri = nft_class.get_uri().cloned();
+    packet_data.class_data = nft_class.get_data().cloned();
+
+    let packet = {
+        let data = serde_json::to_vec(&packet_data)
+            .expect("PacketData's infallible Serialize impl failed");
+
+        Packet {
+            seq_on_a: sequence,
+            port_id_on_a: msg.port_id_on_a,
+            chan_id_on_a: msg.chan_id_on_a,
+            port_id_on_b,
+            chan_id_on_b,
+            data,
+            timeout_height_on_b: msg.timeout_height_on_b,
+            timeout_timestamp_on_b: msg.timeout_timestamp_on_b,
+        }
+    };
+
+    send_packet_validate(send_packet_ctx_a, &packet)?;
+
+    Ok(())
+}
+
+/// Executes the token transfer. A prior call to [`send_nft_transfer_validate`] MUST have succeeded.
+pub fn send_nft_transfer_execute<SendPacketCtx, TransferCtx>(
+    send_packet_ctx_a: &mut SendPacketCtx,
+    transfer_ctx: &mut TransferCtx,
+    msg: MsgTransfer,
+) -> Result<(), NftTransferError>
+where
+    SendPacketCtx: SendPacketExecutionContext,
+    TransferCtx: NftTransferExecutionContext,
+{
+    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let chan_end_on_a = send_packet_ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    let port_on_b = chan_end_on_a.counterparty().port_id().clone();
+    let chan_on_b = chan_end_on_a
+        .counterparty()
+        .channel_id()
+        .ok_or_else(|| NftTransferError::DestinationChannelNotFound {
+            port_id: msg.port_id_on_a.clone(),
+            channel_id: msg.chan_id_on_a.clone(),
+        })?
+        .clone();
+
+    // get the next sequence
+    let seq_send_path_on_a = SeqSendPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let sequence = send_packet_ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
+
+    let sender = msg
+        .packet_data
+        .sender
+        .clone()
+        .try_into()
+        .map_err(|_| NftTransferError::ParseAccountFailure)?;
+
+    let mut packet_data = msg.packet_data;
+    let class_id = &packet_data.class_id;
+    let token_ids = &packet_data.token_ids;
+    // overwrite even if they are set in MsgTransfer
+    if let Some(uris) = &mut packet_data.token_uris {
+        uris.clear();
+    }
+    if let Some(data) = &mut packet_data.token_data {
+        data.clear();
+    }
+    for token_id in token_ids.as_ref() {
+        if is_sender_chain_source(msg.port_id_on_a.clone(), msg.chan_id_on_a.clone(), class_id) {
+            transfer_ctx.escrow_nft_execute(
+                &sender,
+                &msg.port_id_on_a,
+                &msg.chan_id_on_a,
+                class_id,
+                token_id,
+                &packet_data.memo.clone().unwrap_or("".into()),
+            )?;
+        } else {
+            transfer_ctx.burn_nft_execute(
+                &sender,
+                class_id,
+                token_id,
+                &packet_data.memo.clone().unwrap_or("".into()),
+            )?;
+        }
+        let nft = transfer_ctx.get_nft(class_id, token_id)?;
+        // Set the URI and the data if both exists
+        if let (Some(uri), Some(data)) = (nft.get_uri(), nft.get_data()) {
+            match &mut packet_data.token_uris {
+                Some(uris) => uris.push(uri.clone()),
+                None => packet_data.token_uris = Some(vec![uri.clone()]),
+            }
+            match &mut packet_data.token_data {
+                Some(token_data) => token_data.push(data.clone()),
+                None => packet_data.token_data = Some(vec![data.clone()]),
+            }
+        }
+    }
+
+    let nft_class = transfer_ctx.get_nft_class(class_id)?;
+    packet_data.class_uri = nft_class.get_uri().cloned();
+    packet_data.class_data = nft_class.get_data().cloned();
+
+    let packet = {
+        let data = {
+            serde_json::to_vec(&packet_data).expect("PacketData's infallible Serialize impl failed")
+        };
+
+        Packet {
+            seq_on_a: sequence,
+            port_id_on_a: msg.port_id_on_a,
+            chan_id_on_a: msg.chan_id_on_a,
+            port_id_on_b: port_on_b,
+            chan_id_on_b: chan_on_b,
+            data,
+            timeout_height_on_b: msg.timeout_height_on_b,
+            timeout_timestamp_on_b: msg.timeout_timestamp_on_b,
+        }
+    };
+
+    send_packet_execute(send_packet_ctx_a, packet)?;
+
+    {
+        send_packet_ctx_a.log_message(format!(
+            "IBC NFT transfer: {} --({}, [{}])--> {}",
+            packet_data.sender, class_id, token_ids, packet_data.receiver
+        ))?;
+
+        let transfer_event = TransferEvent {
+            sender: packet_data.sender,
+            receiver: packet_data.receiver,
+            class: packet_data.class_id,
+            tokens: packet_data.token_ids,
+            memo: packet_data.memo.unwrap_or("".into()),
+        };
+        send_packet_ctx_a.emit_ibc_event(ModuleEvent::from(transfer_event).into())?;
+
+        send_packet_ctx_a.emit_ibc_event(MessageEvent::Module(MODULE_ID_STR.to_string()).into())?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-apps/ics721-nft-transfer/src/lib.rs b/ibc-apps/ics721-nft-transfer/src/lib.rs
new file mode 100644
index 000000000..66693ac1d
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/src/lib.rs
@@ -0,0 +1,33 @@
+//! Implementation of the IBC [Non-Fungible Token
+//! Transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-721-nft-transfer/README.md)
+//! (ICS-721) application logic.
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+#[cfg(feature = "serde")]
+pub mod context;
+#[cfg(feature = "serde")]
+pub mod handler;
+#[cfg(feature = "serde")]
+pub mod module;
+
+/// Re-exports the implementation of the IBC [Non-Fungible Token
+/// Transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md)
+/// (ICS-721) data structures.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_app_nft_transfer_types::*;
+}
diff --git a/ibc-apps/ics721-nft-transfer/src/module.rs b/ibc-apps/ics721-nft-transfer/src/module.rs
new file mode 100644
index 000000000..074e7c869
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/src/module.rs
@@ -0,0 +1,371 @@
+//! Provides IBC module callbacks implementation for the ICS-721 transfer.
+use ibc_core::channel::types::acknowledgement::{Acknowledgement, AcknowledgementStatus};
+use ibc_core::channel::types::channel::{Counterparty, Order};
+use ibc_core::channel::types::packet::Packet;
+use ibc_core::channel::types::Version;
+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;
+
+use crate::context::{NftTransferExecutionContext, NftTransferValidationContext};
+use crate::handler::{
+    process_recv_packet_execute, refund_packet_nft_execute, refund_packet_nft_validate,
+};
+use crate::types::error::NftTransferError;
+use crate::types::events::{AckEvent, AckStatusEvent, RecvEvent, TimeoutEvent};
+use crate::types::packet::PacketData;
+use crate::types::{ack_success_b64, VERSION};
+
+pub fn on_chan_open_init_validate(
+    ctx: &impl NftTransferValidationContext,
+    order: Order,
+    _connection_hops: &[ConnectionId],
+    port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    version: &Version,
+) -> Result<(), NftTransferError> {
+    if order != Order::Unordered {
+        return Err(NftTransferError::ChannelNotUnordered {
+            expect_order: Order::Unordered,
+            got_order: order,
+        });
+    }
+    let bound_port = ctx.get_port()?;
+    if port_id != &bound_port {
+        return Err(NftTransferError::InvalidPort {
+            port_id: port_id.clone(),
+            exp_port_id: bound_port,
+        });
+    }
+
+    if !version.is_empty() {
+        version
+            .verify_is_expected(Version::new(VERSION.to_string()))
+            .map_err(ContextError::from)?;
+    }
+
+    Ok(())
+}
+
+pub fn on_chan_open_init_execute(
+    _ctx: &mut impl NftTransferExecutionContext,
+    _order: Order,
+    _connection_hops: &[ConnectionId],
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    _version: &Version,
+) -> Result<(ModuleExtras, Version), NftTransferError> {
+    Ok((ModuleExtras::empty(), Version::new(VERSION.to_string())))
+}
+
+pub fn on_chan_open_try_validate(
+    _ctx: &impl NftTransferValidationContext,
+    order: Order,
+    _connection_hops: &[ConnectionId],
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    counterparty_version: &Version,
+) -> Result<(), NftTransferError> {
+    if order != Order::Unordered {
+        return Err(NftTransferError::ChannelNotUnordered {
+            expect_order: Order::Unordered,
+            got_order: order,
+        });
+    }
+
+    counterparty_version
+        .verify_is_expected(Version::new(VERSION.to_string()))
+        .map_err(ContextError::from)?;
+
+    Ok(())
+}
+
+pub fn on_chan_open_try_execute(
+    _ctx: &mut impl NftTransferExecutionContext,
+    _order: Order,
+    _connection_hops: &[ConnectionId],
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty: &Counterparty,
+    _counterparty_version: &Version,
+) -> Result<(ModuleExtras, Version), NftTransferError> {
+    Ok((ModuleExtras::empty(), Version::new(VERSION.to_string())))
+}
+
+pub fn on_chan_open_ack_validate(
+    _ctx: &impl NftTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    counterparty_version: &Version,
+) -> Result<(), NftTransferError> {
+    counterparty_version
+        .verify_is_expected(Version::new(VERSION.to_string()))
+        .map_err(ContextError::from)?;
+
+    Ok(())
+}
+
+pub fn on_chan_open_ack_execute(
+    _ctx: &mut impl NftTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+    _counterparty_version: &Version,
+) -> Result<ModuleExtras, NftTransferError> {
+    Ok(ModuleExtras::empty())
+}
+
+pub fn on_chan_open_confirm_validate(
+    _ctx: &impl NftTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<(), NftTransferError> {
+    Ok(())
+}
+
+pub fn on_chan_open_confirm_execute(
+    _ctx: &mut impl NftTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<ModuleExtras, NftTransferError> {
+    Ok(ModuleExtras::empty())
+}
+
+pub fn on_chan_close_init_validate(
+    _ctx: &impl NftTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<(), NftTransferError> {
+    Err(NftTransferError::CantCloseChannel)
+}
+
+pub fn on_chan_close_init_execute(
+    _ctx: &mut impl NftTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<ModuleExtras, NftTransferError> {
+    Err(NftTransferError::CantCloseChannel)
+}
+
+pub fn on_chan_close_confirm_validate(
+    _ctx: &impl NftTransferValidationContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<(), NftTransferError> {
+    Ok(())
+}
+
+pub fn on_chan_close_confirm_execute(
+    _ctx: &mut impl NftTransferExecutionContext,
+    _port_id: &PortId,
+    _channel_id: &ChannelId,
+) -> Result<ModuleExtras, NftTransferError> {
+    Ok(ModuleExtras::empty())
+}
+
+pub fn on_recv_packet_execute(
+    ctx_b: &mut impl NftTransferExecutionContext,
+    packet: &Packet,
+) -> (ModuleExtras, Acknowledgement) {
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        let ack = AcknowledgementStatus::error(NftTransferError::PacketDataDeserialization.into());
+        return (ModuleExtras::empty(), ack.into());
+    };
+
+    let (mut extras, ack) = match process_recv_packet_execute(ctx_b, packet, data.clone()) {
+        Ok(extras) => (extras, AcknowledgementStatus::success(ack_success_b64())),
+        Err(boxed_error) => {
+            let (extras, error) = *boxed_error;
+            (extras, AcknowledgementStatus::error(error.into()))
+        }
+    };
+
+    let recv_event = RecvEvent {
+        sender: data.sender,
+        receiver: data.receiver,
+        class: data.class_id,
+        tokens: data.token_ids,
+        memo: data.memo.unwrap_or("".into()),
+        success: ack.is_successful(),
+    };
+    extras.events.push(recv_event.into());
+
+    (extras, ack.into())
+}
+
+pub fn on_acknowledgement_packet_validate(
+    ctx: &impl NftTransferValidationContext,
+    packet: &Packet,
+    acknowledgement: &Acknowledgement,
+    _relayer: &Signer,
+) -> Result<(), NftTransferError> {
+    let data = serde_json::from_slice::<PacketData>(&packet.data)
+        .map_err(|_| NftTransferError::PacketDataDeserialization)?;
+
+    let acknowledgement = serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
+        .map_err(|_| NftTransferError::AckDeserialization)?;
+
+    if !acknowledgement.is_successful() {
+        refund_packet_nft_validate(ctx, packet, &data)?;
+    }
+
+    Ok(())
+}
+
+pub fn on_acknowledgement_packet_execute(
+    ctx: &mut impl NftTransferExecutionContext,
+    packet: &Packet,
+    acknowledgement: &Acknowledgement,
+    _relayer: &Signer,
+) -> (ModuleExtras, Result<(), NftTransferError>) {
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(NftTransferError::PacketDataDeserialization),
+        );
+    };
+
+    let Ok(acknowledgement) =
+        serde_json::from_slice::<AcknowledgementStatus>(acknowledgement.as_ref())
+    else {
+        return (
+            ModuleExtras::empty(),
+            Err(NftTransferError::AckDeserialization),
+        );
+    };
+
+    if !acknowledgement.is_successful() {
+        if let Err(err) = refund_packet_nft_execute(ctx, packet, &data) {
+            return (ModuleExtras::empty(), Err(err));
+        }
+    }
+
+    let ack_event = AckEvent {
+        sender: data.sender,
+        receiver: data.receiver,
+        class: data.class_id,
+        tokens: data.token_ids,
+        memo: data.memo.unwrap_or("".into()),
+        acknowledgement: acknowledgement.clone(),
+    };
+
+    let extras = ModuleExtras {
+        events: vec![ack_event.into(), AckStatusEvent { acknowledgement }.into()],
+        log: Vec::new(),
+    };
+
+    (extras, Ok(()))
+}
+
+pub fn on_timeout_packet_validate(
+    ctx: &impl NftTransferValidationContext,
+    packet: &Packet,
+    _relayer: &Signer,
+) -> Result<(), NftTransferError> {
+    let data = serde_json::from_slice::<PacketData>(&packet.data)
+        .map_err(|_| NftTransferError::PacketDataDeserialization)?;
+
+    refund_packet_nft_validate(ctx, packet, &data)?;
+
+    Ok(())
+}
+
+pub fn on_timeout_packet_execute(
+    ctx: &mut impl NftTransferExecutionContext,
+    packet: &Packet,
+    _relayer: &Signer,
+) -> (ModuleExtras, Result<(), NftTransferError>) {
+    let Ok(data) = serde_json::from_slice::<PacketData>(&packet.data) else {
+        return (
+            ModuleExtras::empty(),
+            Err(NftTransferError::PacketDataDeserialization),
+        );
+    };
+
+    if let Err(err) = refund_packet_nft_execute(ctx, packet, &data) {
+        return (ModuleExtras::empty(), Err(err));
+    }
+
+    let timeout_event = TimeoutEvent {
+        refund_receiver: data.sender,
+        refund_class: data.class_id,
+        refund_tokens: data.token_ids,
+        memo: data.memo.unwrap_or("".into()),
+    };
+
+    let extras = ModuleExtras {
+        events: vec![timeout_event.into()],
+        log: Vec::new(),
+    };
+
+    (extras, Ok(()))
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_ack_ser() {
+        fn ser_json_assert_eq(ack: AcknowledgementStatus, json_str: &str) {
+            let ser = serde_json::to_string(&ack).unwrap();
+            assert_eq!(ser, json_str)
+        }
+
+        ser_json_assert_eq(
+            AcknowledgementStatus::success(ack_success_b64()),
+            r#"{"result":"AQ=="}"#,
+        );
+        ser_json_assert_eq(
+            AcknowledgementStatus::error(NftTransferError::PacketDataDeserialization.into()),
+            r#"{"error":"failed to deserialize packet data"}"#,
+        );
+    }
+
+    #[test]
+    fn test_ack_success_to_vec() {
+        let ack_success: Vec<u8> = AcknowledgementStatus::success(ack_success_b64()).into();
+
+        // Check that it's the same output as ibc-go
+        // Note: this also implicitly checks that the ack bytes are non-empty,
+        // which would make the conversion to `Acknowledgement` panic
+        assert_eq!(ack_success, br#"{"result":"AQ=="}"#);
+    }
+
+    #[test]
+    fn test_ack_error_to_vec() {
+        let ack_error: Vec<u8> =
+            AcknowledgementStatus::error(NftTransferError::PacketDataDeserialization.into()).into();
+
+        // Check that it's the same output as ibc-go
+        // Note: this also implicitly checks that the ack bytes are non-empty,
+        // which would make the conversion to `Acknowledgement` panic
+        assert_eq!(
+            ack_error,
+            br#"{"error":"failed to deserialize packet data"}"#
+        );
+    }
+
+    #[test]
+    fn test_ack_de() {
+        fn de_json_assert_eq(json_str: &str, ack: AcknowledgementStatus) {
+            let de = serde_json::from_str::<AcknowledgementStatus>(json_str).unwrap();
+            assert_eq!(de, ack)
+        }
+
+        de_json_assert_eq(
+            r#"{"result":"AQ=="}"#,
+            AcknowledgementStatus::success(ack_success_b64()),
+        );
+        de_json_assert_eq(
+            r#"{"error":"failed to deserialize packet data"}"#,
+            AcknowledgementStatus::error(NftTransferError::PacketDataDeserialization.into()),
+        );
+
+        assert!(serde_json::from_str::<AcknowledgementStatus>(r#"{"success":"AQ=="}"#).is_err());
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/Cargo.toml b/ibc-apps/ics721-nft-transfer/types/Cargo.toml
new file mode 100644
index 000000000..b520aebdc
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/Cargo.toml
@@ -0,0 +1,83 @@
+[package]
+name         = "ibc-app-nft-transfer-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "cosmos", "ibc", "transfer", "nft", "ics721" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-721 Non-Fungible Token Transfer data structures and
+    domain types, as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal
+    applicability to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh       = { workspace = true, optional = true }
+base64      = { workspace = true, features = [ "alloc" ] }
+derive_more = { workspace = true }
+displaydoc  = { workspace = true }
+http        = { version = "1.0.0" }
+mime        = { version = "0.3.17" }
+schemars    = { workspace = true, optional = true }
+serde       = { workspace = true, optional = true }
+serde_json  = { workspace = true }
+
+# ibc dependencies
+ibc-core               = { workspace = true }
+ibc-proto              = { workspace = true }
+ibc-app-transfer-types = { workspace = true }
+
+## parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[dev-dependencies]
+rstest = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "serde/std",
+  "serde_json/std",
+  "base64/std",
+  "displaydoc/std",
+  "http/std",
+  "ibc-core/std",
+  "ibc-proto/std",
+  "ibc-app-transfer-types/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-core/serde",
+  "ibc-proto/serde",
+  "ibc-app-transfer-types/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+  "ibc-app-transfer-types/schema",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core/borsh",
+  "ibc-proto/borsh",
+  "ibc-app-transfer-types/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+  "ibc-app-transfer-types/parity-scale-codec",
+]
diff --git a/ibc-apps/ics721-nft-transfer/types/src/class.rs b/ibc-apps/ics721-nft-transfer/types/src/class.rs
new file mode 100644
index 000000000..4e55056d6
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/class.rs
@@ -0,0 +1,466 @@
+//! Defines Non-Fungible Token Transfer (ICS-721) class types.
+use core::fmt::{self, Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use http::Uri;
+pub use ibc_app_transfer_types::{TracePath, TracePrefix};
+use ibc_core::host::types::identifiers::{ChannelId, PortId};
+use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
+use ibc_core::primitives::serializers;
+use ibc_proto::ibc::applications::nft_transfer::v1::ClassTrace as RawClassTrace;
+
+use crate::data::Data;
+use crate::error::NftTransferError;
+
+/// Class ID for an NFT
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct ClassId(String);
+
+impl AsRef<str> for ClassId {
+    fn as_ref(&self) -> &str {
+        &self.0
+    }
+}
+
+impl Display for ClassId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for ClassId {
+    type Err = NftTransferError;
+
+    fn from_str(class_id: &str) -> Result<Self, Self::Err> {
+        if class_id.trim().is_empty() {
+            Err(NftTransferError::EmptyBaseClassId)
+        } else {
+            Ok(Self(class_id.to_string()))
+        }
+    }
+}
+
+/// Prefixed class to trace sources like ICS-20 PrefixedDenom
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
+pub struct PrefixedClassId {
+    /// A series of `{port-id}/{channel-id}`s for tracing the source of the class.
+    #[cfg_attr(feature = "serde", serde(with = "serializers"))]
+    #[cfg_attr(feature = "schema", schemars(with = "String"))]
+    pub trace_path: TracePath,
+    /// Base class of the relayed non-fungible token.
+    pub base_class_id: ClassId,
+}
+
+impl PrefixedClassId {
+    /// Removes the specified prefix from the trace path if there is a match, otherwise does nothing.
+    pub fn remove_trace_prefix(&mut self, prefix: &TracePrefix) {
+        self.trace_path.remove_prefix(prefix)
+    }
+
+    /// Adds the specified prefix to the trace path.
+    pub fn add_trace_prefix(&mut self, prefix: TracePrefix) {
+        self.trace_path.add_prefix(prefix)
+    }
+}
+
+/// Returns true if the class ID originally came from the sender chain, and false otherwise.
+pub fn is_sender_chain_source(
+    source_port: PortId,
+    source_channel: ChannelId,
+    class_id: &PrefixedClassId,
+) -> bool {
+    !is_receiver_chain_source(source_port, source_channel, class_id)
+}
+
+/// Returns true if the class ID originally came from the receiving chain, and false otherwise.
+pub fn is_receiver_chain_source(
+    source_port: PortId,
+    source_channel: ChannelId,
+    class_id: &PrefixedClassId,
+) -> bool {
+    // For example, let
+    // A: sender chain in this transfer, port "transfer" and channel "c2b" (to B)
+    // B: receiver chain in this transfer, port "transfer" and channel "c2a" (to A)
+    //
+    // If B had originally sent the token in a previous transfer, then A would have stored the token as
+    // "transfer/c2b/{token_denom}". Now, A is sending to B, so to check if B is the source of the token,
+    // we need to check if the token starts with "transfer/c2b".
+    let prefix = TracePrefix::new(source_port, source_channel);
+    class_id.trace_path.starts_with(&prefix)
+}
+
+impl FromStr for PrefixedClassId {
+    type Err = NftTransferError;
+
+    /// The parsing logic is same as [`FromStr`] impl of
+    /// [`PrefixedDenom`](ibc_app_transfer_types::PrefixedDenom) from ICS-20.
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match TracePath::trim(s) {
+            (trace_path, Some(remaining_parts)) => Ok(Self {
+                trace_path,
+                base_class_id: ClassId::from_str(remaining_parts)?,
+            }),
+            (_, None) => Ok(Self {
+                trace_path: TracePath::empty(),
+                base_class_id: ClassId::from_str(s)?,
+            }),
+        }
+    }
+}
+
+impl TryFrom<RawClassTrace> for PrefixedClassId {
+    type Error = NftTransferError;
+
+    fn try_from(value: RawClassTrace) -> Result<Self, Self::Error> {
+        let base_class_id = ClassId::from_str(&value.base_class_id)?;
+        // FIXME: separate `TracePath` error.
+        let trace_path = TracePath::from_str(&value.path)
+            .map_err(|err| NftTransferError::Other(err.to_string()))?;
+        Ok(Self {
+            trace_path,
+            base_class_id,
+        })
+    }
+}
+
+impl From<PrefixedClassId> for RawClassTrace {
+    fn from(value: PrefixedClassId) -> Self {
+        Self {
+            path: value.trace_path.to_string(),
+            base_class_id: value.base_class_id.to_string(),
+        }
+    }
+}
+
+impl From<ClassId> for PrefixedClassId {
+    fn from(class_id: ClassId) -> Self {
+        Self {
+            trace_path: TracePath::empty(),
+            base_class_id: class_id,
+        }
+    }
+}
+
+impl Display for PrefixedClassId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        if self.trace_path.is_empty() {
+            write!(f, "{}", self.base_class_id)
+        } else {
+            write!(f, "{}/{}", self.trace_path, self.base_class_id)
+        }
+    }
+}
+
+/// Class URI for an NFT
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ClassUri(
+    #[cfg_attr(feature = "serde", serde(with = "serializers"))]
+    #[cfg_attr(feature = "schema", schemars(with = "String"))]
+    Uri,
+);
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshSerialize for ClassUri {
+    fn serialize<W: borsh::maybestd::io::Write>(
+        &self,
+        writer: &mut W,
+    ) -> borsh::maybestd::io::Result<()> {
+        borsh::BorshSerialize::serialize(&self.to_string(), writer)
+    }
+}
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshDeserialize for ClassUri {
+    fn deserialize_reader<R: borsh::maybestd::io::Read>(
+        reader: &mut R,
+    ) -> borsh::maybestd::io::Result<Self> {
+        let uri = String::deserialize_reader(reader)?;
+        Ok(ClassUri::from_str(&uri).map_err(|_| borsh::maybestd::io::ErrorKind::Other)?)
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::Encode for ClassUri {
+    fn encode_to<T: parity_scale_codec::Output + ?Sized>(&self, writer: &mut T) {
+        self.to_string().encode_to(writer);
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::Decode for ClassUri {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
+        let uri = String::decode(input)?;
+        ClassUri::from_str(&uri).map_err(|_| parity_scale_codec::Error::from("from str error"))
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl scale_info::TypeInfo for ClassUri {
+    type Identity = Self;
+
+    fn type_info() -> scale_info::Type {
+        scale_info::Type::builder()
+            .path(scale_info::Path::new("ClassUri", module_path!()))
+            .composite(
+                scale_info::build::Fields::unnamed()
+                    .field(|f| f.ty::<String>().type_name("String")),
+            )
+    }
+}
+
+impl Display for ClassUri {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for ClassUri {
+    type Err = NftTransferError;
+
+    fn from_str(class_uri: &str) -> Result<Self, Self::Err> {
+        match Uri::from_str(class_uri) {
+            Ok(uri) => Ok(Self(uri)),
+            Err(err) => Err(NftTransferError::InvalidUri {
+                uri: class_uri.to_string(),
+                validation_error: err,
+            }),
+        }
+    }
+}
+
+/// Class data for an NFT
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::AsRef)]
+pub struct ClassData(Data);
+
+impl Display for ClassData {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for ClassData {
+    type Err = NftTransferError;
+
+    fn from_str(class_data: &str) -> Result<Self, Self::Err> {
+        // validate the data
+        let data = Data::from_str(class_data)?;
+        Ok(Self(data))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("myclass")]
+    #[case("transfer/channel-0/myclass")]
+    #[case("transfer/channel-0/transfer/channel-1/myclass")]
+    #[case("(transfer)/channel-0/myclass")]
+    #[case("transfer/(channel-0)/myclass")]
+    fn test_valid_class_id(#[case] class_id: &str) {
+        ClassId::from_str(class_id).expect("success");
+    }
+
+    #[rstest]
+    #[case("")]
+    #[case("")]
+    #[case("  ")]
+    fn test_invalid_class_id(#[case] class_id: &str) {
+        ClassId::from_str(class_id).expect_err("failure");
+    }
+
+    #[rstest]
+    #[case("transfer/channel-0/myclass")]
+    #[case("/myclass")]
+    #[case("//myclass")]
+    #[case("transfer/")]
+    #[case("transfer/myclass")]
+    #[case("transfer/channel-0/myclass")]
+    #[case("transfer/channel-0/transfer/channel-1/myclass")]
+    #[case("(transfer)/channel-0/myclass")]
+    #[case("transfer/(channel-0)/myclass")]
+    #[case("transfer/channel-0///")]
+    fn test_valid_prefixed_class_id(#[case] class_id: &str) {
+        PrefixedClassId::from_str(class_id).expect("success");
+    }
+
+    #[rstest]
+    #[case("")]
+    #[case("  ")]
+    #[case("transfer/channel-0/")]
+    #[case("transfer/channel-0/  ")]
+    fn test_invalid_prefixed_class_id(#[case] class_id: &str) {
+        PrefixedClassId::from_str(class_id).expect_err("failure");
+    }
+
+    #[test]
+    fn test_class_id_trace() -> Result<(), NftTransferError> {
+        assert_eq!(
+            PrefixedClassId::from_str("transfer/channel-0/myclass")?,
+            PrefixedClassId {
+                trace_path: "transfer/channel-0".parse().expect("success"),
+                base_class_id: "myclass".parse()?
+            },
+            "valid single trace info"
+        );
+        assert_eq!(
+            PrefixedClassId::from_str("transfer/channel-0/transfer/channel-1/myclass")?,
+            PrefixedClassId {
+                trace_path: "transfer/channel-0/transfer/channel-1"
+                    .parse()
+                    .expect("success"),
+                base_class_id: "myclass".parse()?
+            },
+            "valid multiple trace info"
+        );
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_class_id_serde() -> Result<(), NftTransferError> {
+        let dt_str = "transfer/channel-0/myclass";
+        let dt = PrefixedClassId::from_str(dt_str)?;
+        assert_eq!(dt.to_string(), dt_str, "valid single trace info");
+
+        let dt_str = "transfer/channel-0/transfer/channel-1/myclass";
+        let dt = PrefixedClassId::from_str(dt_str)?;
+        assert_eq!(dt.to_string(), dt_str, "valid multiple trace info");
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_trace_path() -> Result<(), NftTransferError> {
+        assert!(TracePath::from_str("").is_ok(), "empty trace path");
+        assert!(
+            TracePath::from_str("transfer/myclass").is_err(),
+            "invalid trace path: bad ChannelId"
+        );
+        assert!(
+            TracePath::from_str("transfer//myclass").is_err(),
+            "malformed trace path: missing ChannelId"
+        );
+        assert!(
+            TracePath::from_str("transfer/channel-0/").is_err(),
+            "malformed trace path: trailing delimiter"
+        );
+
+        let prefix_1 = TracePrefix::new("transfer".parse().unwrap(), "channel-1".parse().unwrap());
+        let prefix_2 = TracePrefix::new("transfer".parse().unwrap(), "channel-0".parse().unwrap());
+        let mut trace_path = TracePath::from(vec![prefix_1.clone()]);
+
+        trace_path.add_prefix(prefix_2.clone());
+        assert_eq!(
+            TracePath::from_str("transfer/channel-0/transfer/channel-1").expect("success"),
+            trace_path
+        );
+        assert_eq!(
+            TracePath::from(vec![prefix_1.clone(), prefix_2.clone()]),
+            trace_path
+        );
+
+        trace_path.remove_prefix(&prefix_2);
+        assert_eq!(
+            TracePath::from_str("transfer/channel-1").expect("success"),
+            trace_path
+        );
+        assert_eq!(TracePath::from(vec![prefix_1.clone()]), trace_path);
+
+        trace_path.remove_prefix(&prefix_1);
+        assert!(trace_path.is_empty());
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_serde_json_roundtrip() {
+        fn serde_roundtrip(class_uri: ClassUri) {
+            let serialized =
+                serde_json::to_string(&class_uri).expect("failed to serialize ClassUri");
+            let deserialized = serde_json::from_str::<ClassUri>(&serialized)
+                .expect("failed to deserialize ClassUri");
+
+            assert_eq!(deserialized, class_uri);
+        }
+
+        let uri = "/foo/bar?baz".parse::<Uri>().unwrap();
+        serde_roundtrip(ClassUri(uri));
+
+        let uri = "https://www.rust-lang.org/install.html"
+            .parse::<Uri>()
+            .unwrap();
+        serde_roundtrip(ClassUri(uri));
+    }
+
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn test_borsh_roundtrip() {
+        fn borsh_roundtrip(class_uri: ClassUri) {
+            use borsh::{BorshDeserialize, BorshSerialize};
+
+            let class_uri_bytes = class_uri.try_to_vec().unwrap();
+            let res = ClassUri::try_from_slice(&class_uri_bytes).unwrap();
+
+            assert_eq!(class_uri, res);
+        }
+
+        let uri = "/foo/bar?baz".parse::<Uri>().unwrap();
+        borsh_roundtrip(ClassUri(uri));
+
+        let uri = "https://www.rust-lang.org/install.html"
+            .parse::<Uri>()
+            .unwrap();
+        borsh_roundtrip(ClassUri(uri));
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/data.rs b/ibc-apps/ics721-nft-transfer/types/src/data.rs
new file mode 100644
index 000000000..ef4b86e55
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/data.rs
@@ -0,0 +1,315 @@
+//! Defines Non-Fungible Token Transfer (ICS-721) data types.
+use core::fmt::{self, Display, Formatter};
+use core::str::FromStr;
+
+#[cfg(feature = "serde")]
+use base64::prelude::BASE64_STANDARD;
+#[cfg(feature = "serde")]
+use base64::Engine;
+use ibc_core::primitives::prelude::*;
+use mime::Mime;
+
+use crate::error::NftTransferError;
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
+pub struct Data(String);
+
+#[cfg(feature = "serde")]
+impl Data {
+    /// Parses the data in the format specified by ICS-721.
+    pub fn parse_as_ics721_data(&self) -> Result<Ics721Data, NftTransferError> {
+        self.0.parse::<Ics721Data>()
+    }
+}
+
+impl Display for Data {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for Data {
+    type Err = NftTransferError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self(s.to_string()))
+    }
+}
+
+#[cfg(feature = "serde")]
+impl serde::Serialize for Data {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&BASE64_STANDARD.encode(&self.0))
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de> serde::Deserialize<'de> for Data {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let encoded = String::deserialize(deserializer)?;
+        let decoded = BASE64_STANDARD
+            .decode(encoded)
+            .map_err(serde::de::Error::custom)?;
+        let decoded_str = String::from_utf8(decoded).map_err(serde::de::Error::custom)?;
+        Ok(Data(decoded_str))
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Ics721Data(BTreeMap<String, DataValue>);
+
+#[cfg(feature = "serde")]
+impl FromStr for Ics721Data {
+    type Err = NftTransferError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        serde_json::from_str(s).map_err(|_| NftTransferError::InvalidIcs721Data)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct DataValue {
+    value: String,
+    mime: Option<Mime>,
+}
+
+#[cfg(feature = "serde")]
+impl serde::Serialize for DataValue {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+        let mut state = serializer.serialize_struct("DataValue", 2)?;
+        state.serialize_field("value", &self.value)?;
+        match &self.mime {
+            Some(mime) if *mime != "" => {
+                state.serialize_field("mime", &mime.to_string())?;
+            }
+            _ => {}
+        }
+        state.end()
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de> serde::Deserialize<'de> for DataValue {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        #[derive(serde::Deserialize)]
+        struct StringDataValue {
+            value: String,
+            mime: Option<String>,
+        }
+
+        let data_value = StringDataValue::deserialize(deserializer)?;
+        let mime = data_value
+            .mime
+            .map(|s| Mime::from_str(&s).map_err(serde::de::Error::custom))
+            .transpose()?;
+
+        Ok(DataValue {
+            value: data_value.value,
+            mime,
+        })
+    }
+}
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshSerialize for DataValue {
+    fn serialize<W: borsh::maybestd::io::Write>(
+        &self,
+        writer: &mut W,
+    ) -> borsh::maybestd::io::Result<()> {
+        borsh::BorshSerialize::serialize(&self.value, writer)?;
+        let mime = match &self.mime {
+            Some(mime) => mime.to_string(),
+            None => String::default(),
+        };
+        borsh::BorshSerialize::serialize(&mime, writer)?;
+        Ok(())
+    }
+}
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshDeserialize for DataValue {
+    fn deserialize_reader<R: borsh::maybestd::io::Read>(
+        reader: &mut R,
+    ) -> borsh::maybestd::io::Result<Self> {
+        let value = String::deserialize_reader(reader)?;
+        let mime = String::deserialize_reader(reader)?;
+        let mime = if mime.is_empty() {
+            None
+        } else {
+            Some(Mime::from_str(&mime).map_err(|_| borsh::maybestd::io::ErrorKind::Other)?)
+        };
+
+        Ok(Self { value, mime })
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::Encode for DataValue {
+    fn encode_to<T: parity_scale_codec::Output + ?Sized>(&self, writer: &mut T) {
+        self.value.encode_to(writer);
+        if let Some(mime) = &self.mime {
+            mime.to_string().encode_to(writer);
+        } else {
+            "".encode_to(writer);
+        }
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::Decode for DataValue {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
+        let value = String::decode(input)?;
+        let mime_str = String::decode(input)?;
+        let mime = if mime_str.is_empty() {
+            None
+        } else {
+            Some(
+                Mime::from_str(&mime_str)
+                    .map_err(|_| parity_scale_codec::Error::from("from str error"))?,
+            )
+        };
+
+        Ok(DataValue { value, mime })
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl scale_info::TypeInfo for DataValue {
+    type Identity = Self;
+
+    fn type_info() -> scale_info::Type {
+        scale_info::Type::builder()
+            .path(scale_info::Path::new("DataValue", module_path!()))
+            .composite(
+                scale_info::build::Fields::named()
+                    .field(|f| f.ty::<String>().name("value").type_name("String"))
+                    .field(|f| f.ty::<String>().name("mime").type_name("String")),
+            )
+    }
+}
+
+#[cfg(feature = "schema")]
+impl schemars::JsonSchema for DataValue {
+    fn schema_name() -> String {
+        "DataValue".to_string()
+    }
+
+    fn schema_id() -> std::borrow::Cow<'static, str> {
+        std::borrow::Cow::Borrowed(concat!(module_path!(), "::DataValue"))
+    }
+
+    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
+        gen.subschema_for::<Self>()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[cfg(feature = "serde")]
+    #[rstest]
+    #[case(r#"{"value":"foo"}"#)]
+    #[case(r#"{"value":"foo-42","mime":"multipart/form-data; boundary=ABCDEFG"}"#)]
+    fn test_valid_json_deserialization(#[case] data_value_json: &str) {
+        assert!(serde_json::from_str::<DataValue>(data_value_json).is_ok());
+    }
+
+    #[cfg(feature = "serde")]
+    #[rstest]
+    #[case(r#"{"value":"foo-42","mime":"invalid"}"#)]
+    #[case(r#"{"value":"invalid","mime":""}"#)]
+    fn test_invalid_json_deserialization(#[case] data_value_json: &str) {
+        assert!(serde_json::from_str::<DataValue>(data_value_json).is_err());
+    }
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde_json_roundtrip() {
+        fn serde_roundtrip(data_value: DataValue) {
+            let serialized =
+                serde_json::to_string(&data_value).expect("failed to serialize DataValue");
+            let deserialized = serde_json::from_str::<DataValue>(&serialized)
+                .expect("failed to deserialize DataValue");
+
+            assert_eq!(deserialized, data_value);
+        }
+
+        serde_roundtrip(DataValue {
+            value: String::from("foo"),
+            mime: None,
+        });
+
+        serde_roundtrip(DataValue {
+            value: String::from("foo"),
+            mime: Some(mime::TEXT_PLAIN_UTF_8),
+        });
+    }
+
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn test_borsh_roundtrip() {
+        fn borsh_roundtrip(data_value: DataValue) {
+            use borsh::{BorshDeserialize, BorshSerialize};
+
+            let data_value_bytes = data_value.try_to_vec().unwrap();
+            let res = DataValue::try_from_slice(&data_value_bytes).unwrap();
+
+            assert_eq!(data_value, res);
+        }
+
+        borsh_roundtrip(DataValue {
+            value: String::from("foo"),
+            mime: None,
+        });
+
+        borsh_roundtrip(DataValue {
+            value: String::from("foo"),
+            mime: Some(mime::TEXT_PLAIN_UTF_8),
+        });
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/error.rs b/ibc-apps/ics721-nft-transfer/types/src/error.rs
new file mode 100644
index 000000000..94c230add
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/error.rs
@@ -0,0 +1,140 @@
+//! Defines the Non-Fungible Token Transfer (ICS-721) error types.
+use core::convert::Infallible;
+use core::str::Utf8Error;
+
+use displaydoc::Display;
+use ibc_core::channel::types::acknowledgement::StatusValue;
+use ibc_core::channel::types::channel::Order;
+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::*;
+
+#[derive(Display, Debug)]
+pub enum NftTransferError {
+    /// context error: `{0}`
+    ContextError(ContextError),
+    /// invalid identifier: `{0}`
+    InvalidIdentifier(IdentifierError),
+    /// invalid URI: `{uri}`, validation error: `{validation_error}``
+    InvalidUri {
+        uri: String,
+        validation_error: http::uri::InvalidUri,
+    },
+    /// destination channel not found in the counterparty of port_id `{port_id}` and channel_id `{channel_id}`
+    DestinationChannelNotFound {
+        port_id: PortId,
+        channel_id: ChannelId,
+    },
+    /// base class ID is empty
+    EmptyBaseClassId,
+    /// invalid prot id n trace at position: `{pos}`, validation error: `{validation_error}`
+    InvalidTracePortId {
+        pos: u64,
+        validation_error: IdentifierError,
+    },
+    /// invalid channel id in trace at position: `{pos}`, validation error: `{validation_error}`
+    InvalidTraceChannelId {
+        pos: u64,
+        validation_error: IdentifierError,
+    },
+    /// trace length must be even but got: `{len}`
+    InvalidTraceLength { len: u64 },
+    /// no token ID
+    NoTokenId,
+    /// invalid token ID
+    InvalidTokenId,
+    /// duplicated token IDs
+    DuplicatedTokenIds,
+    /// The length of token IDs mismatched that of token URIs or token data
+    TokenMismatched,
+    /// invalid json data
+    InvalidJsonData,
+    /// the data is not in the JSON format specified by ICS-721
+    InvalidIcs721Data,
+    /// expected `{expect_order}` channel, got `{got_order}`
+    ChannelNotUnordered {
+        expect_order: Order,
+        got_order: Order,
+    },
+    /// channel cannot be closed
+    CantCloseChannel,
+    /// `{sender}` doesn't own the NFT
+    InvalidOwner { sender: String },
+    /// owner is not found
+    OwnerNotFound,
+    /// nft is not found
+    NftNotFound,
+    /// nft class is not found
+    NftClassNotFound,
+    /// failed to deserialize packet data
+    PacketDataDeserialization,
+    /// failed to deserialize acknowledgement
+    AckDeserialization,
+    /// receive is not enabled
+    ReceiveDisabled { reason: String },
+    /// send is not enabled
+    SendDisabled { reason: String },
+    /// failed to parse as AccountId
+    ParseAccountFailure,
+    /// invalid port: `{port_id}`, expected `{exp_port_id}`
+    InvalidPort {
+        port_id: PortId,
+        exp_port_id: PortId,
+    },
+    /// decoding raw msg error: `{reason}`
+    DecodeRawMsg { reason: String },
+    /// unknown msg type: `{msg_type}`
+    UnknownMsgType { msg_type: String },
+    /// decoding raw bytes as UTF-8 string error: `{0}`
+    Utf8Decode(Utf8Error),
+    /// other error: `{0}`
+    Other(String),
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for NftTransferError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match &self {
+            Self::ContextError(e) => Some(e),
+            Self::InvalidUri {
+                validation_error: e,
+                ..
+            } => Some(e),
+            Self::InvalidIdentifier(e)
+            | Self::InvalidTracePortId {
+                validation_error: e,
+                ..
+            }
+            | Self::InvalidTraceChannelId {
+                validation_error: e,
+                ..
+            } => Some(e),
+            _ => None,
+        }
+    }
+}
+
+impl From<Infallible> for NftTransferError {
+    fn from(e: Infallible) -> Self {
+        match e {}
+    }
+}
+
+impl From<ContextError> for NftTransferError {
+    fn from(err: ContextError) -> NftTransferError {
+        Self::ContextError(err)
+    }
+}
+
+impl From<IdentifierError> for NftTransferError {
+    fn from(err: IdentifierError) -> NftTransferError {
+        Self::InvalidIdentifier(err)
+    }
+}
+
+impl From<NftTransferError> for StatusValue {
+    fn from(err: NftTransferError) -> Self {
+        StatusValue::new(err.to_string()).expect("error message must not be empty")
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/events.rs b/ibc-apps/ics721-nft-transfer/types/src/events.rs
new file mode 100644
index 000000000..6f0c90579
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/events.rs
@@ -0,0 +1,214 @@
+//! Defines Non-Fungible Token Transfer (ICS-721) event types.
+use ibc_core::channel::types::acknowledgement::AcknowledgementStatus;
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Signer;
+use ibc_core::router::types::event::ModuleEvent;
+
+use super::Memo;
+use crate::{PrefixedClassId, TokenId, TokenIds, MODULE_ID_STR};
+
+const EVENT_TYPE_PACKET: &str = "non_fungible_token_packet";
+const EVENT_TYPE_TIMEOUT: &str = "timeout";
+const EVENT_TYPE_TOKEN_TRACE: &str = "token_trace";
+const EVENT_TYPE_TRANSFER: &str = "ibc_nft_transfer";
+
+/// Contains all events variants that can be emitted from the NFT transfer application
+pub enum Event {
+    Recv(RecvEvent),
+    Ack(AckEvent),
+    AckStatus(AckStatusEvent),
+    Timeout(TimeoutEvent),
+    TokenTrace(TokenTraceEvent),
+    Transfer(TransferEvent),
+}
+
+/// Event emitted by the `onRecvPacket` module callback to indicate the that the
+/// `RecvPacket` message was processed
+pub struct RecvEvent {
+    pub sender: Signer,
+    pub receiver: Signer,
+    pub class: PrefixedClassId,
+    pub tokens: TokenIds,
+    pub memo: Memo,
+    pub success: bool,
+}
+
+impl From<RecvEvent> for ModuleEvent {
+    fn from(ev: RecvEvent) -> Self {
+        let RecvEvent {
+            sender,
+            receiver,
+            class,
+            tokens,
+            memo,
+            success,
+        } = ev;
+        Self {
+            kind: EVENT_TYPE_PACKET.to_string(),
+            attributes: vec![
+                ("module", MODULE_ID_STR).into(),
+                ("sender", sender).into(),
+                ("receiver", receiver).into(),
+                ("class", class).into(),
+                ("tokens", tokens).into(),
+                ("memo", memo).into(),
+                ("success", success).into(),
+            ],
+        }
+    }
+}
+
+/// Event emitted in the `onAcknowledgePacket` module callback
+pub struct AckEvent {
+    pub sender: Signer,
+    pub receiver: Signer,
+    pub class: PrefixedClassId,
+    pub tokens: TokenIds,
+    pub memo: Memo,
+    pub acknowledgement: AcknowledgementStatus,
+}
+
+impl From<AckEvent> for ModuleEvent {
+    fn from(ev: AckEvent) -> Self {
+        let AckEvent {
+            sender,
+            receiver,
+            class,
+            tokens,
+            memo,
+            acknowledgement,
+        } = ev;
+        Self {
+            kind: EVENT_TYPE_PACKET.to_string(),
+            attributes: vec![
+                ("module", MODULE_ID_STR).into(),
+                ("sender", sender).into(),
+                ("receiver", receiver).into(),
+                ("class", class).into(),
+                ("tokens", tokens).into(),
+                ("memo", memo).into(),
+                ("acknowledgement", acknowledgement).into(),
+            ],
+        }
+    }
+}
+
+/// Event emitted in the `onAcknowledgePacket` module callback to indicate
+/// whether the acknowledgement is a success or a failure
+pub struct AckStatusEvent {
+    pub acknowledgement: AcknowledgementStatus,
+}
+
+impl From<AckStatusEvent> for ModuleEvent {
+    fn from(ev: AckStatusEvent) -> Self {
+        let AckStatusEvent { acknowledgement } = ev;
+        let attr_label = match acknowledgement {
+            AcknowledgementStatus::Success(_) => "success",
+            AcknowledgementStatus::Error(_) => "error",
+        };
+
+        Self {
+            kind: EVENT_TYPE_PACKET.to_string(),
+            attributes: vec![(attr_label, acknowledgement.to_string()).into()],
+        }
+    }
+}
+
+/// Event emitted in the `onTimeoutPacket` module callback
+pub struct TimeoutEvent {
+    pub refund_receiver: Signer,
+    pub refund_class: PrefixedClassId,
+    pub refund_tokens: TokenIds,
+    pub memo: Memo,
+}
+
+impl From<TimeoutEvent> for ModuleEvent {
+    fn from(ev: TimeoutEvent) -> Self {
+        let TimeoutEvent {
+            refund_receiver,
+            refund_class,
+            refund_tokens,
+            memo,
+        } = ev;
+        Self {
+            kind: EVENT_TYPE_TIMEOUT.to_string(),
+            attributes: vec![
+                ("module", MODULE_ID_STR).into(),
+                ("refund_receiver", refund_receiver).into(),
+                ("refund_class", refund_class).into(),
+                ("refund_tokens", refund_tokens).into(),
+                ("memo", memo).into(),
+            ],
+        }
+    }
+}
+
+/// Event emitted in the `onRecvPacket` module callback when new tokens are minted
+pub struct TokenTraceEvent {
+    pub trace_hash: Option<String>,
+    pub class: PrefixedClassId,
+    pub token: TokenId,
+}
+
+impl From<TokenTraceEvent> for ModuleEvent {
+    fn from(ev: TokenTraceEvent) -> Self {
+        let TokenTraceEvent {
+            trace_hash,
+            class,
+            token,
+        } = ev;
+        let mut ev = Self {
+            kind: EVENT_TYPE_TOKEN_TRACE.to_string(),
+            attributes: vec![("class", class).into(), ("token", token).into()],
+        };
+        if let Some(hash) = trace_hash {
+            ev.attributes.push(("trace_hash", hash).into());
+        }
+        ev
+    }
+}
+
+/// Event emitted after a successful `sendTransfer`
+pub struct TransferEvent {
+    pub sender: Signer,
+    pub receiver: Signer,
+    pub class: PrefixedClassId,
+    pub tokens: TokenIds,
+    pub memo: Memo,
+}
+
+impl From<TransferEvent> for ModuleEvent {
+    fn from(ev: TransferEvent) -> Self {
+        let TransferEvent {
+            sender,
+            receiver,
+            class,
+            tokens,
+            memo,
+        } = ev;
+
+        Self {
+            kind: EVENT_TYPE_TRANSFER.to_string(),
+            attributes: vec![
+                ("sender", sender).into(),
+                ("receiver", receiver).into(),
+                ("class", class).into(),
+                ("tokens", tokens).into(),
+                ("memo", memo).into(),
+            ],
+        }
+    }
+}
+
+impl From<Event> for ModuleEvent {
+    fn from(ev: Event) -> Self {
+        match ev {
+            Event::Recv(ev) => ev.into(),
+            Event::Ack(ev) => ev.into(),
+            Event::AckStatus(ev) => ev.into(),
+            Event::Timeout(ev) => ev.into(),
+            Event::TokenTrace(ev) => ev.into(),
+            Event::Transfer(ev) => ev.into(),
+        }
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/lib.rs b/ibc-apps/ics721-nft-transfer/types/src/lib.rs
new file mode 100644
index 000000000..6992c98f0
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/lib.rs
@@ -0,0 +1,57 @@
+//! Implementation of the IBC [Non-Fungible Token
+//! Transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-721-nft-transfer/README.md)
+//! (ICS-721) data structures.
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+mod class;
+mod data;
+mod memo;
+mod token;
+
+pub mod events;
+pub mod msgs;
+pub use class::*;
+pub use data::*;
+pub mod packet;
+pub use memo::*;
+pub use token::*;
+pub mod error;
+
+/// Re-exports ICS-721 NFT transfer proto types from the `ibc-proto` crate.
+pub mod proto {
+    pub use ibc_proto::ibc::apps::nft_transfer;
+}
+
+/// Module identifier for the ICS-721 application.
+pub const MODULE_ID_STR: &str = "nft_transfer";
+
+/// The port identifier that the ICS-721 applications typically bind with.
+pub const PORT_ID_STR: &str = "nft-transfer";
+
+/// ICS-721 application current version.
+pub const VERSION: &str = "ics721-1";
+
+/// The successful string, used for creating an acknowledgement status.
+/// It is equivalent to `base64::encode(0x01)`.
+pub const ACK_SUCCESS_B64: &str = "AQ==";
+
+use ibc_core::channel::types::acknowledgement::StatusValue;
+
+/// Returns a successful acknowledgement status for the NFT transfer application.
+pub fn ack_success_b64() -> StatusValue {
+    StatusValue::new(ACK_SUCCESS_B64).expect("ack status value is never supposed to be empty")
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/memo.rs b/ibc-apps/ics721-nft-transfer/types/src/memo.rs
new file mode 100644
index 000000000..b18f2027d
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/memo.rs
@@ -0,0 +1,60 @@
+//! Defines the memo type, which represents the string that users can include
+//! with a Non-Fungible Token Transfer
+
+use core::convert::Infallible;
+use core::fmt::{
+    Display, {self},
+};
+use core::str::FromStr;
+
+use ibc_core::primitives::prelude::*;
+
+/// Represents the token transfer memo
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Memo(String);
+
+impl AsRef<str> for Memo {
+    fn as_ref(&self) -> &str {
+        &self.0
+    }
+}
+
+impl Display for Memo {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<String> for Memo {
+    fn from(memo: String) -> Self {
+        Self(memo)
+    }
+}
+
+impl From<&str> for Memo {
+    fn from(memo: &str) -> Self {
+        Self(memo.to_owned())
+    }
+}
+
+impl FromStr for Memo {
+    type Err = Infallible;
+
+    fn from_str(memo: &str) -> Result<Self, Infallible> {
+        Ok(Self(memo.to_owned()))
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/msgs/mod.rs b/ibc-apps/ics721-nft-transfer/types/src/msgs/mod.rs
new file mode 100644
index 000000000..70f4adfef
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/msgs/mod.rs
@@ -0,0 +1,2 @@
+//! Defines the Non-Fungible Token Transfer (ICS-721) message types.
+pub mod transfer;
diff --git a/ibc-apps/ics721-nft-transfer/types/src/msgs/transfer.rs b/ibc-apps/ics721-nft-transfer/types/src/msgs/transfer.rs
new file mode 100644
index 000000000..357723f61
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/msgs/transfer.rs
@@ -0,0 +1,138 @@
+//! Defines the Non-Fungible Token Transfer message type
+
+use ibc_core::channel::types::error::PacketError;
+use ibc_core::channel::types::timeout::TimeoutHeight;
+use ibc_core::handler::types::error::ContextError;
+use ibc_core::host::types::identifiers::{ChannelId, PortId};
+use ibc_core::primitives::prelude::*;
+use ibc_core::primitives::Timestamp;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::applications::nft_transfer::v1::MsgTransfer as RawMsgTransfer;
+use ibc_proto::Protobuf;
+
+use crate::error::NftTransferError;
+use crate::packet::PacketData;
+
+pub(crate) const TYPE_URL: &str = "/ibc.applications.nft_transfer.v1.MsgTransfer";
+
+/// Message used to build an ICS-721 Non-Fungible Token Transfer packet.
+///
+/// Note that this message is not a packet yet, as it lacks the proper sequence
+/// number, and destination port/channel. This is by design. The sender of the
+/// packet, which might be the user of a command line application, should only
+/// have to specify the information related to the transfer of the token, and
+/// let the library figure out how to build the packet properly.
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct MsgTransfer {
+    /// the port on which the packet will be sent
+    pub port_id_on_a: PortId,
+    /// the channel by which the packet will be sent
+    pub chan_id_on_a: ChannelId,
+    /// NFT transfer packet data of the packet that will be sent
+    pub packet_data: PacketData,
+    /// Timeout height relative to the current block height.
+    /// The timeout is disabled when set to None.
+    pub timeout_height_on_b: TimeoutHeight,
+    /// Timeout timestamp relative to the current block timestamp.
+    /// The timeout is disabled when set to 0.
+    pub timeout_timestamp_on_b: Timestamp,
+}
+
+impl TryFrom<RawMsgTransfer> for MsgTransfer {
+    type Error = NftTransferError;
+
+    fn try_from(raw_msg: RawMsgTransfer) -> Result<Self, Self::Error> {
+        let timeout_timestamp_on_b = Timestamp::from_nanoseconds(raw_msg.timeout_timestamp)
+            .map_err(PacketError::InvalidPacketTimestamp)
+            .map_err(ContextError::from)?;
+
+        let timeout_height_on_b: TimeoutHeight = raw_msg
+            .timeout_height
+            .try_into()
+            .map_err(ContextError::from)?;
+
+        // Packet timeout height and packet timeout timestamp cannot both be unset.
+        if !timeout_height_on_b.is_set() && !timeout_timestamp_on_b.is_set() {
+            return Err(ContextError::from(PacketError::MissingTimeout))?;
+        }
+
+        let memo = if raw_msg.memo.is_empty() {
+            None
+        } else {
+            Some(raw_msg.memo.into())
+        };
+
+        Ok(MsgTransfer {
+            port_id_on_a: raw_msg.source_port.parse()?,
+            chan_id_on_a: raw_msg.source_channel.parse()?,
+            packet_data: PacketData {
+                class_id: raw_msg.class_id.parse()?,
+                class_uri: None,
+                class_data: None,
+                token_ids: raw_msg.token_ids.try_into()?,
+                token_uris: None,
+                token_data: None,
+                sender: raw_msg.sender.into(),
+                receiver: raw_msg.receiver.into(),
+                memo,
+            },
+            timeout_height_on_b,
+            timeout_timestamp_on_b,
+        })
+    }
+}
+
+impl From<MsgTransfer> for RawMsgTransfer {
+    fn from(domain_msg: MsgTransfer) -> Self {
+        RawMsgTransfer {
+            source_port: domain_msg.port_id_on_a.to_string(),
+            source_channel: domain_msg.chan_id_on_a.to_string(),
+            class_id: domain_msg.packet_data.class_id.to_string(),
+            token_ids: domain_msg
+                .packet_data
+                .token_ids
+                .as_ref()
+                .iter()
+                .map(|t| t.to_string())
+                .collect(),
+            sender: domain_msg.packet_data.sender.to_string(),
+            receiver: domain_msg.packet_data.receiver.to_string(),
+            timeout_height: domain_msg.timeout_height_on_b.into(),
+            timeout_timestamp: domain_msg.timeout_timestamp_on_b.nanoseconds(),
+            memo: domain_msg
+                .packet_data
+                .memo
+                .map(|m| m.to_string())
+                .unwrap_or_default(),
+        }
+    }
+}
+
+impl Protobuf<RawMsgTransfer> for MsgTransfer {}
+
+impl TryFrom<Any> for MsgTransfer {
+    type Error = NftTransferError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        match raw.type_url.as_str() {
+            TYPE_URL => {
+                MsgTransfer::decode_vec(&raw.value).map_err(|e| NftTransferError::DecodeRawMsg {
+                    reason: e.to_string(),
+                })
+            }
+            _ => Err(NftTransferError::UnknownMsgType {
+                msg_type: raw.type_url,
+            }),
+        }
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/packet.rs b/ibc-apps/ics721-nft-transfer/types/src/packet.rs
new file mode 100644
index 000000000..c2f9d2d2f
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/packet.rs
@@ -0,0 +1,323 @@
+//! Contains the `PacketData` type that defines the structure of NFT transfers' packet bytes
+
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
+use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
+use ibc_core::primitives::serializers;
+use ibc_core::primitives::Signer;
+use ibc_proto::ibc::applications::nft_transfer::v1::NonFungibleTokenPacketData as RawPacketData;
+
+use crate::class::{ClassData, ClassUri, PrefixedClassId};
+use crate::error::NftTransferError;
+use crate::memo::Memo;
+use crate::token::{TokenData, TokenIds, TokenUri};
+
+/// Defines the structure of token transfers' packet bytes
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PacketData {
+    #[cfg_attr(feature = "serde", serde(with = "serializers"))]
+    #[cfg_attr(feature = "schema", schemars(with = "String"))]
+    pub class_id: PrefixedClassId,
+    pub class_uri: Option<ClassUri>,
+    pub class_data: Option<ClassData>,
+    pub token_ids: TokenIds,
+    // Need `Option` to decode `null` value
+    pub token_uris: Option<Vec<TokenUri>>,
+    // Need `Option` to decode `null` value
+    pub token_data: Option<Vec<TokenData>>,
+    pub sender: Signer,
+    pub receiver: Signer,
+    pub memo: Option<Memo>,
+}
+
+impl PacketData {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        class_id: PrefixedClassId,
+        class_uri: Option<ClassUri>,
+        class_data: Option<ClassData>,
+        token_ids: TokenIds,
+        token_uris: Vec<TokenUri>,
+        token_data: Vec<TokenData>,
+        sender: Signer,
+        receiver: Signer,
+        memo: Memo,
+    ) -> Result<Self, NftTransferError> {
+        let token_uris = if token_uris.is_empty() {
+            None
+        } else {
+            Some(token_uris)
+        };
+        let token_data = if token_data.is_empty() {
+            None
+        } else {
+            Some(token_data)
+        };
+        let memo = if memo.as_ref().is_empty() {
+            None
+        } else {
+            Some(memo)
+        };
+
+        let packet_data = Self {
+            class_id,
+            class_uri,
+            class_data,
+            token_ids,
+            token_uris,
+            token_data,
+            sender,
+            receiver,
+            memo,
+        };
+
+        packet_data.validate_basic()?;
+
+        Ok(packet_data)
+    }
+
+    /// Performs the basic validation of the packet data fields.
+    pub fn validate_basic(&self) -> Result<(), NftTransferError> {
+        if self.token_ids.0.is_empty() {
+            return Err(NftTransferError::NoTokenId);
+        }
+        let num = self.token_ids.0.len();
+        let num_uri = self
+            .token_uris
+            .as_ref()
+            .map(|t| t.len())
+            .unwrap_or_default();
+        let num_data = self
+            .token_data
+            .as_ref()
+            .map(|t| t.len())
+            .unwrap_or_default();
+        if (num_uri != 0 && num_uri != num) || (num_data != 0 && num_data != num) {
+            return Err(NftTransferError::TokenMismatched);
+        }
+        Ok(())
+    }
+}
+
+impl TryFrom<RawPacketData> for PacketData {
+    type Error = NftTransferError;
+
+    fn try_from(raw_pkt_data: RawPacketData) -> Result<Self, Self::Error> {
+        let class_uri = if raw_pkt_data.class_uri.is_empty() {
+            None
+        } else {
+            Some(raw_pkt_data.class_uri.parse()?)
+        };
+        let class_data = if raw_pkt_data.class_data.is_empty() {
+            None
+        } else {
+            let decoded = BASE64_STANDARD
+                .decode(raw_pkt_data.class_data)
+                .map_err(|_| NftTransferError::InvalidJsonData)?;
+            let data_str =
+                String::from_utf8(decoded).map_err(|_| NftTransferError::InvalidJsonData)?;
+            Some(data_str.parse()?)
+        };
+
+        let token_ids = raw_pkt_data.token_ids.try_into()?;
+        let token_uris: Result<Vec<TokenUri>, _> =
+            raw_pkt_data.token_uris.iter().map(|t| t.parse()).collect();
+        let token_data: Result<Vec<TokenData>, _> = raw_pkt_data
+            .token_data
+            .iter()
+            .map(|data| {
+                let decoded = BASE64_STANDARD
+                    .decode(data)
+                    .map_err(|_| NftTransferError::InvalidJsonData)?;
+                let data_str =
+                    String::from_utf8(decoded).map_err(|_| NftTransferError::InvalidJsonData)?;
+                data_str.parse()
+            })
+            .collect();
+        Self::new(
+            raw_pkt_data.class_id.parse()?,
+            class_uri,
+            class_data,
+            token_ids,
+            token_uris?,
+            token_data?,
+            raw_pkt_data.sender.into(),
+            raw_pkt_data.receiver.into(),
+            raw_pkt_data.memo.into(),
+        )
+    }
+}
+
+impl From<PacketData> for RawPacketData {
+    fn from(pkt_data: PacketData) -> Self {
+        Self {
+            class_id: pkt_data.class_id.to_string(),
+            class_uri: pkt_data
+                .class_uri
+                .map(|c| c.to_string())
+                .unwrap_or_default(),
+            class_data: pkt_data
+                .class_data
+                .map(|c| BASE64_STANDARD.encode(c.to_string()))
+                .unwrap_or_default(),
+            token_ids: pkt_data
+                .token_ids
+                .as_ref()
+                .iter()
+                .map(|t| t.to_string())
+                .collect(),
+            token_uris: pkt_data
+                .token_uris
+                .map(|uris| uris.iter().map(|t| t.to_string()).collect())
+                .unwrap_or_default(),
+            token_data: pkt_data
+                .token_data
+                .map(|data| {
+                    data.iter()
+                        .map(|t| BASE64_STANDARD.encode(t.to_string()))
+                        .collect()
+                })
+                .unwrap_or_default(),
+            sender: pkt_data.sender.to_string(),
+            receiver: pkt_data.receiver.to_string(),
+            memo: pkt_data.memo.map(|m| m.to_string()).unwrap_or_default(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use core::str::FromStr;
+
+    use super::*;
+
+    const DUMMY_ADDRESS: &str = "cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng";
+    const DUMMY_CLASS_ID: &str = "class";
+    const DUMMY_URI: &str = "http://example.com";
+    const DUMMY_DATA: &str =
+        r#"{"image":{"value":"binary","mime":"image/png"},"name":{"value":"Crypto Creatures"}}"#;
+
+    impl PacketData {
+        pub fn new_dummy(memo: Option<&str>) -> Self {
+            let address: Signer = DUMMY_ADDRESS.to_string().into();
+
+            Self {
+                class_id: PrefixedClassId::from_str(DUMMY_CLASS_ID).unwrap(),
+                class_uri: Some(ClassUri::from_str(DUMMY_URI).unwrap()),
+                class_data: Some(ClassData::from_str(DUMMY_DATA).unwrap()),
+                token_ids: TokenIds::try_from(vec!["token_0".to_string(), "token_1".to_string()])
+                    .unwrap(),
+                token_uris: Some(vec![
+                    TokenUri::from_str(DUMMY_URI).unwrap(),
+                    TokenUri::from_str(DUMMY_URI).unwrap(),
+                ]),
+                token_data: Some(vec![
+                    TokenData::from_str(DUMMY_DATA).unwrap(),
+                    TokenData::from_str(DUMMY_DATA).unwrap(),
+                ]),
+                sender: address.clone(),
+                receiver: address,
+                memo: memo.map(|m| m.to_string().into()),
+            }
+        }
+
+        pub fn new_min_dummy() -> Self {
+            let address: Signer = DUMMY_ADDRESS.to_string().into();
+
+            Self {
+                class_id: PrefixedClassId::from_str(DUMMY_CLASS_ID).unwrap(),
+                class_uri: None,
+                class_data: None,
+                token_ids: TokenIds::try_from(vec!["token_0".to_string()]).unwrap(),
+                token_uris: None,
+                token_data: None,
+                sender: address.clone(),
+                receiver: address,
+                memo: None,
+            }
+        }
+
+        pub fn ser_json_assert_eq(&self, json: &str) {
+            let ser = serde_json::to_string(&self).unwrap();
+            assert_eq!(ser, json);
+        }
+
+        pub fn deser_json_assert_eq(&self, json: &str) {
+            let deser: Self = serde_json::from_str(json).unwrap();
+
+            if let Some(data) = &deser.class_data {
+                assert!(data.as_ref().parse_as_ics721_data().is_ok());
+            };
+
+            if let Some(token_data) = &deser.token_data {
+                for data in token_data.iter() {
+                    assert!(data.as_ref().parse_as_ics721_data().is_ok());
+                }
+            }
+
+            assert_eq!(&deser, self);
+        }
+    }
+
+    fn dummy_min_json_packet_data() -> &'static str {
+        r#"{"classId":"class","tokenIds":["token_0"],"sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng"}"#
+    }
+
+    fn dummy_min_json_packet_data_with_null() -> &'static str {
+        r#"{"classId":"class","classUri":null,"classData":null,"tokenIds":["token_0"],"tokenUris":null,"tokenData":null,"sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng"}"#
+    }
+
+    fn dummy_json_packet_data() -> &'static str {
+        r#"{"classId":"class","classUri":"http://example.com/","classData":"eyJpbWFnZSI6eyJ2YWx1ZSI6ImJpbmFyeSIsIm1pbWUiOiJpbWFnZS9wbmcifSwibmFtZSI6eyJ2YWx1ZSI6IkNyeXB0byBDcmVhdHVyZXMifX0=","tokenIds":["token_0","token_1"],"tokenUris":["http://example.com/","http://example.com/"],"tokenData":["eyJpbWFnZSI6eyJ2YWx1ZSI6ImJpbmFyeSIsIm1pbWUiOiJpbWFnZS9wbmcifSwibmFtZSI6eyJ2YWx1ZSI6IkNyeXB0byBDcmVhdHVyZXMifX0=","eyJpbWFnZSI6eyJ2YWx1ZSI6ImJpbmFyeSIsIm1pbWUiOiJpbWFnZS9wbmcifSwibmFtZSI6eyJ2YWx1ZSI6IkNyeXB0byBDcmVhdHVyZXMifX0="],"sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","memo":"memo"}"#
+    }
+
+    fn dummy_json_packet_data_without_memo() -> &'static str {
+        r#"{"classId":"class","classUri":"http://example.com/","classData":"eyJpbWFnZSI6eyJ2YWx1ZSI6ImJpbmFyeSIsIm1pbWUiOiJpbWFnZS9wbmcifSwibmFtZSI6eyJ2YWx1ZSI6IkNyeXB0byBDcmVhdHVyZXMifX0=","tokenIds":["token_0","token_1"],"tokenUris":["http://example.com/","http://example.com/"],"tokenData":["eyJpbWFnZSI6eyJ2YWx1ZSI6ImJpbmFyeSIsIm1pbWUiOiJpbWFnZS9wbmcifSwibmFtZSI6eyJ2YWx1ZSI6IkNyeXB0byBDcmVhdHVyZXMifX0=","eyJpbWFnZSI6eyJ2YWx1ZSI6ImJpbmFyeSIsIm1pbWUiOiJpbWFnZS9wbmcifSwibmFtZSI6eyJ2YWx1ZSI6IkNyeXB0byBDcmVhdHVyZXMifX0="],"sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng"}"#
+    }
+
+    /// Ensures `PacketData` properly encodes to JSON by first converting to a
+    /// `RawPacketData` and then serializing that.
+    #[test]
+    fn test_packet_data_ser() {
+        PacketData::new_dummy(Some("memo")).ser_json_assert_eq(dummy_json_packet_data());
+    }
+
+    /// Ensures `PacketData` properly decodes from JSON by first deserializing to a
+    /// `RawPacketData` and then converting from that.
+    #[test]
+    fn test_packet_data_deser() {
+        PacketData::new_dummy(Some("memo")).deser_json_assert_eq(dummy_json_packet_data());
+        PacketData::new_dummy(None).deser_json_assert_eq(dummy_json_packet_data_without_memo());
+        PacketData::new_min_dummy().deser_json_assert_eq(dummy_min_json_packet_data());
+        PacketData::new_min_dummy().deser_json_assert_eq(dummy_min_json_packet_data_with_null());
+    }
+
+    #[test]
+    fn test_invalid_packet_data() {
+        // the number of tokens is mismatched
+        let packet_data = r#"{"class_id":"class","token_ids":["token_0","token_1"],"token_uris":["http://example.com"],"token_data":["{\"image\":{\"value\":\"binary\",\"mime\":\"image/png\"},\"name\":{\"value\":\"Crypto Creatures\"}}"],"sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","memo":""}"#;
+        assert!(
+            serde_json::from_str::<PacketData>(packet_data).is_err(),
+            "num of token data is unmatched"
+        );
+
+        // No token ID
+        let packet_data = r#"{"class_id":"class","token_ids":[],"sender":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","receiver":"cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng","memo":""}"#;
+        assert!(
+            serde_json::from_str::<PacketData>(packet_data).is_err(),
+            "no token ID"
+        );
+    }
+}
diff --git a/ibc-apps/ics721-nft-transfer/types/src/token.rs b/ibc-apps/ics721-nft-transfer/types/src/token.rs
new file mode 100644
index 000000000..6128bb630
--- /dev/null
+++ b/ibc-apps/ics721-nft-transfer/types/src/token.rs
@@ -0,0 +1,269 @@
+//! Defines Non-Fungible Token Transfer (ICS-721) token types.
+use core::fmt::{self, Display};
+use core::str::FromStr;
+
+use http::Uri;
+use ibc_core::primitives::prelude::*;
+#[cfg(feature = "serde")]
+use ibc_core::primitives::serializers;
+
+use crate::data::Data;
+use crate::error::NftTransferError;
+
+/// Token ID for an NFT
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct TokenId(String);
+
+impl AsRef<str> for TokenId {
+    fn as_ref(&self) -> &str {
+        &self.0
+    }
+}
+
+impl Display for TokenId {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for TokenId {
+    type Err = NftTransferError;
+
+    fn from_str(token_id: &str) -> Result<Self, Self::Err> {
+        if token_id.trim().is_empty() {
+            Err(NftTransferError::InvalidTokenId)
+        } else {
+            Ok(Self(token_id.to_string()))
+        }
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct TokenIds(pub Vec<TokenId>);
+
+impl TokenIds {
+    pub fn as_ref(&self) -> Vec<&TokenId> {
+        self.0.iter().collect()
+    }
+}
+
+impl Display for TokenIds {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            self.0
+                .iter()
+                .map(|t| t.to_string())
+                .collect::<Vec<String>>()
+                .join(",")
+        )
+    }
+}
+
+impl TryFrom<Vec<String>> for TokenIds {
+    type Error = NftTransferError;
+
+    fn try_from(token_ids: Vec<String>) -> Result<Self, Self::Error> {
+        if token_ids.is_empty() {
+            return Err(NftTransferError::NoTokenId);
+        }
+        let ids: Result<Vec<TokenId>, _> = token_ids.iter().map(|t| t.parse()).collect();
+        let mut ids = ids?;
+        ids.sort();
+        ids.dedup();
+        if ids.len() != token_ids.len() {
+            return Err(NftTransferError::DuplicatedTokenIds);
+        }
+        Ok(Self(ids))
+    }
+}
+
+/// Token URI for an NFT
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct TokenUri(
+    #[cfg_attr(feature = "serde", serde(with = "serializers"))]
+    #[cfg_attr(feature = "schema", schemars(with = "String"))]
+    Uri,
+);
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshSerialize for TokenUri {
+    fn serialize<W: borsh::maybestd::io::Write>(
+        &self,
+        writer: &mut W,
+    ) -> borsh::maybestd::io::Result<()> {
+        borsh::BorshSerialize::serialize(&self.to_string(), writer)
+    }
+}
+
+#[cfg(feature = "borsh")]
+impl borsh::BorshDeserialize for TokenUri {
+    fn deserialize_reader<R: borsh::maybestd::io::Read>(
+        reader: &mut R,
+    ) -> borsh::maybestd::io::Result<Self> {
+        let uri = String::deserialize_reader(reader)?;
+        Ok(TokenUri::from_str(&uri).map_err(|_| borsh::maybestd::io::ErrorKind::Other)?)
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::Encode for TokenUri {
+    fn encode_to<T: parity_scale_codec::Output + ?Sized>(&self, writer: &mut T) {
+        self.to_string().encode_to(writer);
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl parity_scale_codec::Decode for TokenUri {
+    fn decode<I: parity_scale_codec::Input>(
+        input: &mut I,
+    ) -> Result<Self, parity_scale_codec::Error> {
+        let uri = String::decode(input)?;
+        TokenUri::from_str(&uri).map_err(|_| parity_scale_codec::Error::from("from str error"))
+    }
+}
+
+#[cfg(feature = "parity-scale-codec")]
+impl scale_info::TypeInfo for TokenUri {
+    type Identity = Self;
+
+    fn type_info() -> scale_info::Type {
+        scale_info::Type::builder()
+            .path(scale_info::Path::new("TokenUri", module_path!()))
+            .composite(
+                scale_info::build::Fields::unnamed()
+                    .field(|f| f.ty::<String>().type_name("String")),
+            )
+    }
+}
+
+impl Display for TokenUri {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for TokenUri {
+    type Err = NftTransferError;
+
+    fn from_str(token_uri: &str) -> Result<Self, Self::Err> {
+        match Uri::from_str(token_uri) {
+            Ok(uri) => Ok(Self(uri)),
+            Err(err) => Err(NftTransferError::InvalidUri {
+                uri: token_uri.to_string(),
+                validation_error: err,
+            }),
+        }
+    }
+}
+
+/// Token data for an NFT
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::AsRef)]
+pub struct TokenData(Data);
+
+impl Display for TokenData {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for TokenData {
+    type Err = NftTransferError;
+
+    fn from_str(token_data: &str) -> Result<Self, Self::Err> {
+        let data = Data::from_str(token_data)?;
+        Ok(Self(data))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_serde_json_roundtrip() {
+        fn serde_roundtrip(token_uri: TokenUri) {
+            let serialized =
+                serde_json::to_string(&token_uri).expect("failed to serialize TokenUri");
+            let deserialized = serde_json::from_str::<TokenUri>(&serialized)
+                .expect("failed to deserialize TokenUri");
+
+            assert_eq!(deserialized, token_uri);
+        }
+
+        let uri = "/foo/bar?baz".parse::<Uri>().unwrap();
+        serde_roundtrip(TokenUri(uri));
+
+        let uri = "https://www.rust-lang.org/install.html"
+            .parse::<Uri>()
+            .unwrap();
+        serde_roundtrip(TokenUri(uri));
+    }
+
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn test_borsh_roundtrip() {
+        fn borsh_roundtrip(token_uri: TokenUri) {
+            use borsh::{BorshDeserialize, BorshSerialize};
+
+            let token_uri_bytes = token_uri.try_to_vec().unwrap();
+            let res = TokenUri::try_from_slice(&token_uri_bytes).unwrap();
+
+            assert_eq!(token_uri, res);
+        }
+
+        let uri = "/foo/bar?baz".parse::<Uri>().unwrap();
+        borsh_roundtrip(TokenUri(uri));
+
+        let uri = "https://www.rust-lang.org/install.html"
+            .parse::<Uri>()
+            .unwrap();
+        borsh_roundtrip(TokenUri(uri));
+    }
+}
diff --git a/ibc-apps/src/lib.rs b/ibc-apps/src/lib.rs
new file mode 100644
index 000000000..306624bc0
--- /dev/null
+++ b/ibc-apps/src/lib.rs
@@ -0,0 +1,29 @@
+//! Re-exports implementations and data structures of different IBC applications.
+#![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
+)]
+
+/// Re-exports the implementation of the IBC [fungible token
+/// transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-020-fungible-token-transfer/README.md)
+/// (ICS-20) application logic.
+pub mod transfer {
+    #[doc(inline)]
+    pub use ibc_app_transfer::*;
+}
+
+/// Re-exports the implementation of the IBC [Non-Fungible Token
+/// Transfer](https://github.com/cosmos/ibc/blob/main/spec/app/ics-721-nft-transfer/README.md)
+/// (ICS-721) application logic.
+pub mod nft_transfer {
+    #[doc(inline)]
+    #[cfg(feature = "nft-transfer")]
+    pub use ibc_app_nft_transfer::*;
+}
diff --git a/ibc-clients/Cargo.toml b/ibc-clients/Cargo.toml
new file mode 100644
index 000000000..0ab910b3c
--- /dev/null
+++ b/ibc-clients/Cargo.toml
@@ -0,0 +1,45 @@
+[package]
+name         = "ibc-clients"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "applications", "tendermint" ]
+readme       = "README.md"
+
+description = """
+    Maintained by `ibc-rs`, re-exports a comprehensive set of libraries that implement
+    various IBC light clients, enabling smooth integration with IBC-enabled blockchains.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+ibc-client-tendermint = { workspace = true }
+ibc-client-wasm-types = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-client-tendermint/std",
+  "ibc-client-wasm-types/std",
+]
+serde = [
+  "ibc-client-tendermint/serde",
+  "ibc-client-wasm-types/serde",
+]
+schema = [
+  "ibc-client-tendermint/schema",
+  "ibc-client-wasm-types/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-client-tendermint/borsh",
+]
+parity-scale-codec = [
+  "ibc-client-tendermint/parity-scale-codec",
+]
diff --git a/ibc-clients/README.md b/ibc-clients/README.md
new file mode 100644
index 000000000..f65b3c7bd
--- /dev/null
+++ b/ibc-clients/README.md
@@ -0,0 +1,71 @@
+# IBC Clients
+
+This top-level crate re-exports Inter-Blockchain Communication (IBC)
+implementations of light clients. It serves as a meta-crate, simplifying the
+process of importing and integrating various IBC clients into your blockchain.
+IBC is a distributed protocol that enables communication between distinct
+sovereign blockchains and IBC light clients track the consensus states and proof
+specs of external blockchains, which are required to properly verify proofs
+against the client's consensus state.
+
+The structure within the `ibc-clients` crate is designed to provide flexibility
+for external users. It allows you to utilize the own `ibc-clients` crate or
+selectively import specific libraries, whether you need a certain IBC client
+implementation (e.g. `ibc-client-tendermint` crate) or only its associated data
+structures (e.g. `ibc-core-tendermint-types`). This versatility empowers hosts,
+including chain integrators, relayers, or any IBC tooling projects, to build
+their solutions on top of the layers that best suit their requirements.
+
+## Sub-Crates
+
+Currently, the `ibc-clients` crate contains the implementation of the following
+IBC light clients:
+
+### ICS-07: Tendermint Light Client
+
+- [ibc-client-tendermint-types](./ics07-tendermint/types): Data Structures
+- [ibc-client-tendermint](./ics07-tendermint): Implementation
+- [ibc-client-tendermint-cw](./ics07-tendermint/cw-contract): CosmWasm Contract
+
+> [!TIP]
+> The pre-compiled CosmWasm contract for `ibc-client-tendermint-cw` is available
+> as Github workflow artifacts at
+> [_Actions_](https://github.com/cosmos/ibc-rs/actions/workflows/upload-cw-clients.yaml)
+> tab. They can be downloaded
+> [during a Github workflow](https://github.com/cosmos/ibc-rs/blob/1098f252c04152812f026520e28e323f3bc0507e/.github/workflows/upload-cw-clients.yaml#L87-L96)
+> using `actions/download-artifact@v4` action.
+
+### ICS-08: WASM Proxy Light Client
+
+- [ibc-client-wasm-types](./ics08-wasm/types)
+
+### CosmWasm Integration
+
+- [ibc-client-cw](./cw-context): Types and Utilities for CosmWasm Integration
+  - To utilize the CosmWasm contracts developed with this library, hosting
+    environments must support the CosmWasm module and be using the version of
+    `ibc-go` that supports the `08-wasm` proxy light client.
+
+> [!CAUTION]
+> The `ibc-client-cw` is currently in development and should not be
+  deployed for production use. Users are advised to exercise caution and test
+  thoroughly in non-production environments.
+
+## Third-party Clients
+
+Here, we list IBC third-party clients that are compatible with `ibc-rs`. You
+should always audit the implementation of any third-party crate. If you have a
+client that you'd like to be added to this list, please open a PR!
+
+- [ICS 6: Solomachine](https://github.com/octopus-network/ics06-solomachine) by
+  Octopus Network
+
+## Contributing
+
+IBC is specified in English in the [cosmos/ibc
+repo](https://github.com/cosmos/ibc). Any protocol changes or clarifications
+should be contributed there.
+
+If you're interested in contributing, please take a look at the
+[CONTRIBUTING](./../CONTRIBUTING.md) guidelines. We welcome and appreciate
+community contributions!
diff --git a/ibc-clients/cw-context/Cargo.toml b/ibc-clients/cw-context/Cargo.toml
new file mode 100644
index 000000000..7cb2ef06f
--- /dev/null
+++ b/ibc-clients/cw-context/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name         = "ibc-client-cw"
+authors      = { workspace = true }
+edition      = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+rust-version = { workspace = true }
+version      = { workspace = true }
+keywords     = [ "ibc", "light-client", "CosmWasm", "ICS-08" ]
+readme       = "./../README.md"
+
+description = """
+    Contains types and implementations that are needed to integrate a light client, built using ibc-rs,
+    into CosmWasm contract. It functions as a library, allowing users to import the ready-made `Context`
+    object that is generic across light clients, introduce their concrete client type and integrate
+    their assembled context into the CosmWasm contract's entrypoint.
+"""
+
+[dependencies]
+# external dependencies
+derive_more = { workspace = true }
+prost       = { workspace = true }
+serde       = { workspace = true, features = [ "derive" ] }
+
+# ibc dependencies
+ibc-core              = { workspace = true }
+ibc-client-wasm-types = { workspace = true, features = [ "cosmwasm" ] }
+
+# cosmwasm dependencies
+cosmwasm-schema = { workspace = true }
+cosmwasm-std    = { workspace = true }
+cw-storage-plus = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "prost/std",
+  "serde/std",
+  "ibc-core/std",
+  "ibc-client-wasm-types/std",
+]
diff --git a/ibc-clients/cw-context/src/api.rs b/ibc-clients/cw-context/src/api.rs
new file mode 100644
index 000000000..0788520cc
--- /dev/null
+++ b/ibc-clients/cw-context/src/api.rs
@@ -0,0 +1,18 @@
+use ibc_core::client::context::client_state::ClientStateExecution;
+use ibc_core::client::context::consensus_state::ConsensusState as ConsensusStateTrait;
+use ibc_core::client::types::error::ClientError;
+use ibc_core::primitives::proto::Any;
+
+use crate::context::Context;
+
+/// Enables users to integrate their implemented light client by introducing
+/// their client state and consensus state types into the generic [`Context`]
+/// object.
+pub trait ClientType<'a>: Sized
+where
+    <Self::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <Self::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    type ClientState: ClientStateExecution<Context<'a, Self>>;
+    type ConsensusState: ConsensusStateTrait;
+}
diff --git a/ibc-clients/cw-context/src/context/client_ctx.rs b/ibc-clients/cw-context/src/context/client_ctx.rs
new file mode 100644
index 000000000..414217590
--- /dev/null
+++ b/ibc-clients/cw-context/src/context/client_ctx.rs
@@ -0,0 +1,203 @@
+//! Implementation of the `ClientValidationContext` and `ClientExecutionContext`
+//! traits for the `Context` type.
+use ibc_client_wasm_types::client_state::ClientState as WasmClientState;
+use ibc_client_wasm_types::consensus_state::ConsensusState as WasmConsensusState;
+use ibc_core::client::context::{ClientExecutionContext, ClientValidationContext};
+use ibc_core::client::types::error::ClientError;
+use ibc_core::client::types::Height;
+use ibc_core::handler::types::error::ContextError;
+use ibc_core::host::types::identifiers::ClientId;
+use ibc_core::host::types::path::{ClientConsensusStatePath, ClientStatePath};
+use ibc_core::primitives::proto::{Any, Protobuf};
+use ibc_core::primitives::Timestamp;
+
+use super::{Context, StorageMut};
+use crate::api::ClientType;
+use crate::context::CONSENSUS_STATE_HEIGHT_MAP;
+use crate::utils::AnyCodec;
+
+impl<'a, C: ClientType<'a>> ClientValidationContext for Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    type ClientStateRef = C::ClientState;
+    type ConsensusStateRef = C::ConsensusState;
+
+    fn client_state(&self, _client_id: &ClientId) -> Result<Self::ClientStateRef, ContextError> {
+        let client_state_value = self.retrieve(ClientStatePath::leaf())?;
+
+        let any_wasm: WasmClientState = Protobuf::<Any>::decode(client_state_value.as_slice())
+            .map_err(|e| ClientError::Other {
+                description: e.to_string(),
+            })?;
+
+        let sov_client_state = C::ClientState::decode_any_vec(any_wasm.data)?;
+
+        Ok(sov_client_state)
+    }
+
+    fn consensus_state(
+        &self,
+        client_cons_state_path: &ClientConsensusStatePath,
+    ) -> Result<Self::ConsensusStateRef, ContextError> {
+        let consensus_state_value = self.retrieve(client_cons_state_path.leaf())?;
+
+        let any_wasm: WasmConsensusState =
+            C::ConsensusState::decode_any_vec(consensus_state_value)?;
+
+        let consensus_state = C::ConsensusState::decode_any_vec(any_wasm.data)?;
+
+        Ok(consensus_state)
+    }
+
+    fn client_update_meta(
+        &self,
+        _client_id: &ClientId,
+        height: &Height,
+    ) -> Result<(Timestamp, Height), ContextError> {
+        let time_key = self.client_update_time_key(height);
+
+        let time_vec = self.retrieve(time_key)?;
+
+        let time = u64::from_be_bytes(time_vec.try_into().map_err(|_| ClientError::Other {
+            description: "time key cannot be converted to u64".to_string(),
+        })?);
+
+        let timestamp = Timestamp::from_nanoseconds(time).map_err(|e| ClientError::Other {
+            description: e.to_string(),
+        })?;
+
+        let height_key = self.client_update_height_key(height);
+
+        let revision_height_vec = self.retrieve(height_key)?;
+
+        let revision_height =
+            u64::from_be_bytes(
+                revision_height_vec
+                    .try_into()
+                    .map_err(|_| ClientError::Other {
+                        description: "revision height key cannot be converted to u64".to_string(),
+                    })?,
+            );
+
+        let height = Height::new(0, revision_height)?;
+
+        Ok((timestamp, height))
+    }
+}
+
+impl<'a, C: ClientType<'a>> ClientExecutionContext for Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    type ClientStateMut = C::ClientState;
+
+    fn store_client_state(
+        &mut self,
+        _client_state_path: ClientStatePath,
+        client_state: Self::ClientStateMut,
+    ) -> Result<(), ContextError> {
+        let prefixed_key = self.prefixed_key(ClientStatePath::leaf());
+
+        let encoded_client_state = self.encode_client_state(client_state)?;
+
+        self.insert(prefixed_key, encoded_client_state);
+
+        Ok(())
+    }
+
+    fn store_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+        consensus_state: Self::ConsensusStateRef,
+    ) -> Result<(), ContextError> {
+        let prefixed_key = self.prefixed_key(consensus_state_path.leaf());
+
+        let encoded_consensus_state = C::ConsensusState::encode_to_any_vec(consensus_state);
+
+        let wasm_consensus_state = WasmConsensusState {
+            data: encoded_consensus_state,
+        };
+
+        let encoded_wasm_consensus_state =
+            C::ConsensusState::encode_to_any_vec(wasm_consensus_state);
+
+        self.insert(prefixed_key, encoded_wasm_consensus_state);
+
+        Ok(())
+    }
+
+    fn delete_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+    ) -> Result<(), ContextError> {
+        let prefixed_key = self.prefixed_key(consensus_state_path.leaf());
+
+        self.remove(prefixed_key);
+
+        Ok(())
+    }
+
+    fn store_update_meta(
+        &mut self,
+        _client_id: ClientId,
+        height: Height,
+        host_timestamp: Timestamp,
+        host_height: Height,
+    ) -> Result<(), ContextError> {
+        let time_key = self.client_update_time_key(&height);
+
+        let prefixed_time_key = self.prefixed_key(time_key);
+
+        let time_vec = host_timestamp.nanoseconds().to_be_bytes();
+
+        self.insert(prefixed_time_key, time_vec);
+
+        let height_key = self.client_update_height_key(&height);
+
+        let prefixed_height_key = self.prefixed_key(height_key);
+
+        let revision_height_vec = host_height.revision_height().to_be_bytes();
+
+        self.insert(prefixed_height_key, revision_height_vec);
+
+        CONSENSUS_STATE_HEIGHT_MAP
+            .save(
+                self.storage_mut(),
+                (height.revision_number(), height.revision_height()),
+                &Default::default(),
+            )
+            .map_err(|e| ClientError::Other {
+                description: e.to_string(),
+            })?;
+
+        Ok(())
+    }
+
+    fn delete_update_meta(
+        &mut self,
+        _client_id: ClientId,
+        height: Height,
+    ) -> Result<(), ContextError> {
+        let time_key = self.client_update_time_key(&height);
+
+        let prefixed_time_key = self.prefixed_key(time_key);
+
+        self.remove(prefixed_time_key);
+
+        let height_key = self.client_update_height_key(&height);
+
+        let prefixed_height_key = self.prefixed_key(height_key);
+
+        self.remove(prefixed_height_key);
+
+        CONSENSUS_STATE_HEIGHT_MAP.remove(
+            self.storage_mut(),
+            (height.revision_number(), height.revision_height()),
+        );
+
+        Ok(())
+    }
+}
diff --git a/ibc-clients/cw-context/src/context/custom_ctx.rs b/ibc-clients/cw-context/src/context/custom_ctx.rs
new file mode 100644
index 000000000..54829d8e4
--- /dev/null
+++ b/ibc-clients/cw-context/src/context/custom_ctx.rs
@@ -0,0 +1,82 @@
+//! Implementation of the `ExtClientValidationContext` trait for the `Context`
+//! type.
+use ibc_core::client::context::prelude::*;
+use ibc_core::client::types::error::ClientError;
+use ibc_core::client::types::Height;
+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::proto::Any;
+use ibc_core::primitives::Timestamp;
+
+use super::Context;
+use crate::api::ClientType;
+use crate::types::HeightTravel;
+
+impl<'a, C: ClientType<'a>> ExtClientValidationContext for Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    fn host_timestamp(&self) -> Result<Timestamp, ContextError> {
+        let time = self.env().block.time;
+
+        let host_timestamp =
+            Timestamp::from_nanoseconds(time.nanos()).map_err(|e| ClientError::Other {
+                description: e.to_string(),
+            })?;
+
+        Ok(host_timestamp)
+    }
+
+    fn host_height(&self) -> Result<Height, ContextError> {
+        let host_height = Height::new(0, self.env().block.height)?;
+
+        Ok(host_height)
+    }
+
+    fn consensus_state_heights(&self, _client_id: &ClientId) -> Result<Vec<Height>, ContextError> {
+        let heights = self.get_heights()?;
+
+        Ok(heights)
+    }
+    fn next_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::ConsensusStateRef>, ContextError> {
+        let next_height = self.get_adjacent_height(height, HeightTravel::Next)?;
+
+        match next_height {
+            Some(h) => {
+                let cons_state_path = ClientConsensusStatePath::new(
+                    client_id.clone(),
+                    h.revision_number(),
+                    h.revision_height(),
+                );
+                self.consensus_state(&cons_state_path).map(Some)
+            }
+            None => Ok(None),
+        }
+    }
+
+    fn prev_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::ConsensusStateRef>, ContextError> {
+        let prev_height = self.get_adjacent_height(height, HeightTravel::Prev)?;
+
+        match prev_height {
+            Some(prev_height) => {
+                let cons_state_path = ClientConsensusStatePath::new(
+                    client_id.clone(),
+                    prev_height.revision_number(),
+                    prev_height.revision_height(),
+                );
+                self.consensus_state(&cons_state_path).map(Some)
+            }
+            None => Ok(None),
+        }
+    }
+}
diff --git a/ibc-clients/cw-context/src/context/mod.rs b/ibc-clients/cw-context/src/context/mod.rs
new file mode 100644
index 000000000..40a027528
--- /dev/null
+++ b/ibc-clients/cw-context/src/context/mod.rs
@@ -0,0 +1,345 @@
+pub mod client_ctx;
+pub mod custom_ctx;
+
+use std::str::FromStr;
+
+use cosmwasm_std::{Deps, DepsMut, Empty, Env, Order, Storage};
+use cw_storage_plus::{Bound, Map};
+use ibc_client_wasm_types::client_state::ClientState as WasmClientState;
+use ibc_core::client::context::client_state::ClientStateCommon;
+use ibc_core::client::types::error::ClientError;
+use ibc_core::client::types::Height;
+use ibc_core::host::types::identifiers::ClientId;
+use ibc_core::host::types::path::{
+    iteration_key, ClientStatePath, ClientUpdateHeightPath, ClientUpdateTimePath,
+    ITERATE_CONSENSUS_STATE_PREFIX,
+};
+use ibc_core::primitives::proto::{Any, Protobuf};
+use prost::Message;
+
+use crate::api::ClientType;
+use crate::types::{ContractError, GenesisMetadata, HeightTravel, MigrationPrefix};
+use crate::utils::AnyCodec;
+
+type Checksum = Vec<u8>;
+
+/// - [`Height`] cannot be used directly as keys in the map,
+/// as it doesn't implement some cw_storage specific traits.
+/// - Only a sorted set is needed. So the value type is set to
+/// [`Empty`] following
+/// ([cosmwasm-book](https://book.cosmwasm.com/cross-contract/map-storage.html#maps-as-sets)).
+pub const CONSENSUS_STATE_HEIGHT_MAP: Map<'_, (u64, u64), Empty> =
+    Map::new(ITERATE_CONSENSUS_STATE_PREFIX);
+
+/// Context is a wrapper around the deps and env that provides access
+/// to the methods under the ibc-rs Validation and Execution traits.
+pub struct Context<'a, C: ClientType<'a>>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    deps: Option<Deps<'a>>,
+    deps_mut: Option<DepsMut<'a>>,
+    env: Env,
+    client_id: ClientId,
+    checksum: Option<Checksum>,
+    migration_prefix: MigrationPrefix,
+    client_type: std::marker::PhantomData<C>,
+}
+
+impl<'a, C: ClientType<'a>> Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    /// Constructs a new Context object with the given deps and env.
+    pub fn new_ref(deps: Deps<'a>, env: Env) -> Result<Self, ContractError> {
+        let client_id = ClientId::from_str(env.contract.address.as_str())?;
+
+        Ok(Self {
+            deps: Some(deps),
+            deps_mut: None,
+            env,
+            client_id,
+            checksum: None,
+            migration_prefix: MigrationPrefix::None,
+            client_type: std::marker::PhantomData::<C>,
+        })
+    }
+
+    /// Constructs a new Context object with the given deps_mut and env.
+    pub fn new_mut(deps_mut: DepsMut<'a>, env: Env) -> Result<Self, ContractError> {
+        let client_id = ClientId::from_str(env.contract.address.as_str())?;
+
+        Ok(Self {
+            deps: None,
+            deps_mut: Some(deps_mut),
+            env,
+            client_id,
+            checksum: None,
+            migration_prefix: MigrationPrefix::None,
+            client_type: std::marker::PhantomData::<C>,
+        })
+    }
+
+    /// Returns the env of the context.
+    pub fn env(&self) -> &Env {
+        &self.env
+    }
+
+    /// Logs the given message.
+    pub fn log(&self, msg: &str) -> Option<()> {
+        self.deps.map(|deps| deps.api.debug(msg))
+    }
+
+    /// Returns the client id of the context.
+    pub fn client_id(&self) -> ClientId {
+        self.client_id.clone()
+    }
+
+    /// Sets the checksum of the context.
+    pub fn set_checksum(&mut self, checksum: Checksum) {
+        self.checksum = Some(checksum);
+    }
+
+    /// Enables the migration mode with the subject prefix.
+    pub fn set_subject_prefix(&mut self) {
+        self.migration_prefix = MigrationPrefix::Subject;
+    }
+
+    /// Enables the migration mode with the substitute prefix.
+    pub fn set_substitute_prefix(&mut self) {
+        self.migration_prefix = MigrationPrefix::Substitute;
+    }
+
+    /// Prefixes the given key with the migration prefix.
+    pub fn prefixed_key(&self, key: impl AsRef<[u8]>) -> Vec<u8> {
+        let mut prefixed_key = Vec::new();
+        prefixed_key.extend_from_slice(self.migration_prefix.key());
+        prefixed_key.extend_from_slice(key.as_ref());
+
+        prefixed_key
+    }
+
+    /// Retrieves the value of the given key.
+    pub fn retrieve(&self, key: impl AsRef<[u8]>) -> Result<Vec<u8>, ClientError> {
+        let prefixed_key = self.prefixed_key(key);
+
+        let value = self
+            .storage_ref()
+            .get(prefixed_key.as_ref())
+            .ok_or(ClientError::Other {
+                description: "key not found upon retrieval".to_string(),
+            })?;
+
+        Ok(value)
+    }
+
+    /// Inserts the given key-value pair.
+    pub fn insert(&mut self, key: impl AsRef<[u8]>, value: impl AsRef<[u8]>) {
+        self.storage_mut().set(key.as_ref(), value.as_ref());
+    }
+
+    /// Removes the value of the given key.
+    pub fn remove(&mut self, key: impl AsRef<[u8]>) {
+        self.storage_mut().remove(key.as_ref());
+    }
+
+    /// Returns the storage of the context.
+    pub fn get_heights(&self) -> Result<Vec<Height>, ClientError> {
+        CONSENSUS_STATE_HEIGHT_MAP
+            .keys(self.storage_ref(), None, None, Order::Ascending)
+            .map(|deserialized_result| {
+                let (rev_number, rev_height) =
+                    deserialized_result.map_err(|e| ClientError::Other {
+                        description: e.to_string(),
+                    })?;
+                Height::new(rev_number, rev_height)
+            })
+            .collect()
+    }
+
+    /// Searches for either the earliest next or latest previous height based on
+    /// the given height and travel direction.
+    pub fn get_adjacent_height(
+        &self,
+        height: &Height,
+        travel: HeightTravel,
+    ) -> Result<Option<Height>, ClientError> {
+        let iterator = match travel {
+            HeightTravel::Prev => CONSENSUS_STATE_HEIGHT_MAP.range(
+                self.storage_ref(),
+                None,
+                Some(Bound::exclusive((
+                    height.revision_number(),
+                    height.revision_height(),
+                ))),
+                Order::Descending,
+            ),
+            HeightTravel::Next => CONSENSUS_STATE_HEIGHT_MAP.range(
+                self.storage_ref(),
+                Some(Bound::exclusive((
+                    height.revision_number(),
+                    height.revision_height(),
+                ))),
+                None,
+                Order::Ascending,
+            ),
+        };
+
+        iterator
+            .map(|deserialized_result| {
+                let ((rev_number, rev_height), _) =
+                    deserialized_result.map_err(|e| ClientError::Other {
+                        description: e.to_string(),
+                    })?;
+                Height::new(rev_number, rev_height)
+            })
+            .next()
+            .transpose()
+    }
+
+    /// Returns the key for the client update time.
+    pub fn client_update_time_key(&self, height: &Height) -> Vec<u8> {
+        let client_update_time_path = ClientUpdateTimePath::new(
+            self.client_id(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+
+        client_update_time_path.leaf().into_bytes()
+    }
+
+    /// Returns the key for the client update height.
+    pub fn client_update_height_key(&self, height: &Height) -> Vec<u8> {
+        let client_update_height_path = ClientUpdateHeightPath::new(
+            self.client_id(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+
+        client_update_height_path.leaf().into_bytes()
+    }
+
+    /// Returns the genesis metadata by iterating over the stored consensus
+    /// state metadata.
+    pub fn get_metadata(&self) -> Result<Option<Vec<GenesisMetadata>>, ContractError> {
+        let mut metadata = Vec::<GenesisMetadata>::new();
+
+        let iterator = CONSENSUS_STATE_HEIGHT_MAP
+            .keys(self.storage_ref(), None, None, Order::Ascending)
+            .map(|deserialized_result| {
+                let (rev_number, rev_height) =
+                    deserialized_result.map_err(|e| ClientError::Other {
+                        description: e.to_string(),
+                    })?;
+                Height::new(rev_number, rev_height)
+            });
+
+        for height_result in iterator {
+            let height = height_result?;
+
+            let processed_height_key = self.client_update_height_key(&height);
+            metadata.push(GenesisMetadata {
+                key: processed_height_key.clone(),
+                value: self.retrieve(&processed_height_key)?,
+            });
+            let processed_time_key = self.client_update_time_key(&height);
+            metadata.push(GenesisMetadata {
+                key: processed_time_key.clone(),
+                value: self.retrieve(&processed_time_key)?,
+            });
+        }
+
+        let iterator = CONSENSUS_STATE_HEIGHT_MAP
+            .keys(self.storage_ref(), None, None, Order::Ascending)
+            .map(|deserialized_result| {
+                let (rev_number, rev_height) =
+                    deserialized_result.map_err(|e| ClientError::Other {
+                        description: e.to_string(),
+                    })?;
+                Height::new(rev_number, rev_height)
+            });
+
+        for height_result in iterator {
+            let height = height_result?;
+
+            metadata.push(GenesisMetadata {
+                key: iteration_key(height.revision_number(), height.revision_height()),
+                value: height.encode_vec(),
+            });
+        }
+
+        Ok(Some(metadata))
+    }
+
+    /// Returns the checksum of the current contract.
+    pub fn obtain_checksum(&self) -> Result<Checksum, ClientError> {
+        match &self.checksum {
+            Some(checksum) => Ok(checksum.clone()),
+            None => {
+                let client_state_value = self.retrieve(ClientStatePath::leaf())?;
+
+                let wasm_client_state: WasmClientState =
+                    Protobuf::<Any>::decode(client_state_value.as_slice()).map_err(|e| {
+                        ClientError::Other {
+                            description: e.to_string(),
+                        }
+                    })?;
+
+                Ok(wasm_client_state.checksum)
+            }
+        }
+    }
+
+    /// Encodes the given client state into a byte vector.
+    pub fn encode_client_state(
+        &self,
+        client_state: C::ClientState,
+    ) -> Result<Vec<u8>, ClientError> {
+        let wasm_client_state = WasmClientState {
+            checksum: self.obtain_checksum()?,
+            latest_height: client_state.latest_height(),
+            data: C::ClientState::encode_to_any_vec(client_state),
+        };
+
+        Ok(Any::from(wasm_client_state).encode_to_vec())
+    }
+}
+
+pub trait StorageRef {
+    fn storage_ref(&self) -> &dyn Storage;
+}
+
+impl<'a, C: ClientType<'a>> StorageRef for Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    fn storage_ref(&self) -> &dyn Storage {
+        match self.deps {
+            Some(ref deps) => deps.storage,
+            None => match self.deps_mut {
+                Some(ref deps) => deps.storage,
+                None => panic!("Either deps or deps_mut should be available"),
+            },
+        }
+    }
+}
+
+pub trait StorageMut: StorageRef {
+    fn storage_mut(&mut self) -> &mut dyn Storage;
+}
+
+impl<'a, C: ClientType<'a>> StorageMut for Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    fn storage_mut(&mut self) -> &mut dyn Storage {
+        match self.deps_mut {
+            Some(ref mut deps) => deps.storage,
+            None => panic!("deps_mut should be available"),
+        }
+    }
+}
diff --git a/ibc-clients/cw-context/src/handlers.rs b/ibc-clients/cw-context/src/handlers.rs
new file mode 100644
index 000000000..4b4798d1e
--- /dev/null
+++ b/ibc-clients/cw-context/src/handlers.rs
@@ -0,0 +1,203 @@
+use cosmwasm_std::{to_json_binary, Binary};
+use ibc_core::client::context::prelude::*;
+use ibc_core::client::types::error::ClientError;
+use ibc_core::host::types::path::ClientConsensusStatePath;
+use ibc_core::primitives::proto::Any;
+use prost::Message;
+
+use crate::api::ClientType;
+use crate::context::Context;
+use crate::types::{
+    CheckForMisbehaviourMsg, ContractError, ContractResult, ExportMetadataMsg, InstantiateMsg,
+    QueryMsg, QueryResponse, StatusMsg, SudoMsg, UpdateStateMsg, UpdateStateOnMisbehaviourMsg,
+    VerifyClientMessageMsg, VerifyMembershipMsg, VerifyNonMembershipMsg,
+    VerifyUpgradeAndUpdateStateMsg,
+};
+
+impl<'a, C: ClientType<'a>> Context<'a, C>
+where
+    <C::ClientState as TryFrom<Any>>::Error: Into<ClientError>,
+    <C::ConsensusState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    /// Instantiates a new client with the given [`InstantiateMsg`] message.
+    pub fn instantiate(&mut self, msg: InstantiateMsg) -> Result<Binary, ContractError> {
+        let any = Any::decode(&mut msg.client_state.as_slice())?;
+
+        let client_state = C::ClientState::try_from(any).map_err(Into::into)?;
+
+        let any_consensus_state = Any::decode(&mut msg.consensus_state.as_slice())?;
+
+        self.set_checksum(msg.checksum);
+
+        client_state.initialise(self, &self.client_id(), any_consensus_state)?;
+
+        Ok(to_json_binary(&ContractResult::success())?)
+    }
+
+    /// Executes the given [`SudoMsg`].
+    pub fn sudo(&mut self, msg: SudoMsg) -> Result<Binary, ContractError> {
+        let client_id = self.client_id();
+
+        if let SudoMsg::MigrateClientStore(_) = msg {
+            self.set_subject_prefix();
+        };
+
+        let client_state = self.client_state(&client_id)?;
+
+        let result = match msg {
+            SudoMsg::UpdateState(msg_raw) => {
+                let msg = UpdateStateMsg::try_from(msg_raw)?;
+
+                let heights = client_state.update_state(self, &client_id, msg.client_message)?;
+
+                ContractResult::success().heights(heights)
+            }
+            SudoMsg::UpdateStateOnMisbehaviour(msg_raw) => {
+                let msg = UpdateStateOnMisbehaviourMsg::try_from(msg_raw)?;
+
+                client_state.update_state_on_misbehaviour(self, &client_id, msg.client_message)?;
+
+                ContractResult::success()
+            }
+            SudoMsg::VerifyMembership(msg) => {
+                let msg = VerifyMembershipMsg::try_from(msg)?;
+
+                let client_cons_state_path = ClientConsensusStatePath::new(
+                    self.client_id(),
+                    msg.height.revision_number(),
+                    msg.height.revision_height(),
+                );
+
+                let consensus_state = self.consensus_state(&client_cons_state_path)?;
+
+                client_state.verify_membership(
+                    &msg.prefix,
+                    &msg.proof,
+                    consensus_state.root(),
+                    msg.path,
+                    msg.value,
+                )?;
+
+                ContractResult::success()
+            }
+            SudoMsg::VerifyNonMembership(msg) => {
+                let msg = VerifyNonMembershipMsg::try_from(msg)?;
+
+                let client_cons_state_path = ClientConsensusStatePath::new(
+                    client_id.clone(),
+                    msg.height.revision_number(),
+                    msg.height.revision_height(),
+                );
+
+                let consensus_state = self.consensus_state(&client_cons_state_path)?;
+
+                client_state.verify_non_membership(
+                    &msg.prefix,
+                    &msg.proof,
+                    consensus_state.root(),
+                    msg.path,
+                )?;
+
+                ContractResult::success()
+            }
+            SudoMsg::VerifyUpgradeAndUpdateState(msg) => {
+                let msg = VerifyUpgradeAndUpdateStateMsg::try_from(msg)?;
+
+                let client_cons_state_path = ClientConsensusStatePath::new(
+                    client_id.clone(),
+                    client_state.latest_height().revision_number(),
+                    client_state.latest_height().revision_height(),
+                );
+
+                let consensus_state = self.consensus_state(&client_cons_state_path)?;
+
+                client_state.verify_upgrade_client(
+                    msg.upgrade_client_state.clone(),
+                    msg.upgrade_consensus_state.clone(),
+                    msg.proof_upgrade_client,
+                    msg.proof_upgrade_consensus_state,
+                    consensus_state.root(),
+                )?;
+
+                client_state.update_state_on_upgrade(
+                    self,
+                    &client_id,
+                    msg.upgrade_client_state,
+                    msg.upgrade_consensus_state,
+                )?;
+
+                ContractResult::success()
+            }
+            SudoMsg::MigrateClientStore(_) => {
+                self.set_substitute_prefix();
+                let substitute_client_state = self.client_state(&client_id)?;
+                let substitute_consensus_state =
+                    self.consensus_state(&ClientConsensusStatePath::new(
+                        client_id.clone(),
+                        substitute_client_state.latest_height().revision_number(),
+                        substitute_client_state.latest_height().revision_height(),
+                    ))?;
+
+                let substitute_client_state_any = substitute_client_state.into();
+
+                self.set_subject_prefix();
+                client_state.check_substitute(self, substitute_client_state_any.clone())?;
+
+                client_state.update_on_recovery(
+                    self,
+                    &self.client_id(),
+                    substitute_client_state_any,
+                    substitute_consensus_state.into(),
+                )?;
+
+                ContractResult::success()
+            }
+        };
+        Ok(to_json_binary(&result)?)
+    }
+
+    /// Queries the client with the given [`QueryMsg`] message.
+    pub fn query(&self, msg: QueryMsg) -> Result<Binary, ContractError> {
+        let client_id = self.client_id();
+
+        let client_state = self.client_state(&client_id)?;
+
+        let resp = match msg {
+            QueryMsg::Status(StatusMsg {}) => match client_state.status(self, &client_id) {
+                Ok(status) => QueryResponse::success().status(status.to_string()),
+                Err(err) => QueryResponse::success().status(err.to_string()),
+            },
+            QueryMsg::ExportMetadata(ExportMetadataMsg {}) => {
+                QueryResponse::success().genesis_metadata(self.get_metadata()?)
+            }
+            QueryMsg::TimestampAtHeight(msg) => {
+                let client_cons_state_path = ClientConsensusStatePath::new(
+                    client_id,
+                    msg.height.revision_number(),
+                    msg.height.revision_height(),
+                );
+
+                let consensus_state = self.consensus_state(&client_cons_state_path)?;
+
+                QueryResponse::success().timestamp(consensus_state.timestamp().nanoseconds())
+            }
+            QueryMsg::VerifyClientMessage(msg) => {
+                let msg = VerifyClientMessageMsg::try_from(msg)?;
+
+                client_state.verify_client_message(self, &client_id, msg.client_message)?;
+
+                QueryResponse::success()
+            }
+            QueryMsg::CheckForMisbehaviour(msg) => {
+                let msg = CheckForMisbehaviourMsg::try_from(msg)?;
+
+                let result =
+                    client_state.check_for_misbehaviour(self, &client_id, msg.client_message)?;
+
+                QueryResponse::success().misbehaviour(result)
+            }
+        };
+
+        Ok(to_json_binary(&resp)?)
+    }
+}
diff --git a/ibc-clients/cw-context/src/lib.rs b/ibc-clients/cw-context/src/lib.rs
new file mode 100644
index 000000000..4db776cdf
--- /dev/null
+++ b/ibc-clients/cw-context/src/lib.rs
@@ -0,0 +1,25 @@
+//! Contains types and implementations that are needed to integrate a light
+//! client, built using ibc-rs, into a CosmWasm contract. This crate functions as
+//! a library, allowing users to import the ready-made `Context` object that is
+//! generic across light clients, introduce their concrete client type and
+//! integrate their assembled context into the CosmWasm contract's entrypoint.
+//! NOTE: To utilize the CosmWasm contract developed using this library, hosting
+//! environments must support the CosmWasm module and be using one of the versions of
+//! `ibc-go` that supports the `08-wasm` proxy light client.
+
+#![cfg_attr(not(test), deny(clippy::unwrap_used))]
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+#![forbid(unsafe_code)]
+
+pub mod api;
+pub mod context;
+pub mod handlers;
+pub mod types;
+pub mod utils;
diff --git a/ibc-clients/cw-context/src/types/error.rs b/ibc-clients/cw-context/src/types/error.rs
new file mode 100644
index 000000000..d191638ad
--- /dev/null
+++ b/ibc-clients/cw-context/src/types/error.rs
@@ -0,0 +1,36 @@
+use cosmwasm_std::StdError;
+use derive_more::{Display, From};
+use ibc_core::client::types::error::ClientError;
+use ibc_core::commitment_types::error::CommitmentError;
+use ibc_core::handler::types::error::ContextError;
+use ibc_core::host::types::error::IdentifierError;
+use ibc_core::host::types::path::PathError;
+use prost::DecodeError;
+
+#[derive(From, Display, Debug)]
+pub enum ContractError {
+    #[display(fmt = "CosmWasm standard error: {_0}")]
+    Std(StdError),
+    #[display(fmt = "IBC validation/execution context error: {_0}")]
+    Context(ContextError),
+    #[display(fmt = "IBC commitment error: {_0}")]
+    Commitment(CommitmentError),
+    #[display(fmt = "IBC identifier error: {_0}")]
+    Identifier(IdentifierError),
+    #[display(fmt = "IBC path error: {_0}")]
+    Path(PathError),
+    #[display(fmt = "Proto decoding error: {_0}")]
+    ProtoDecode(DecodeError),
+}
+
+impl From<ContractError> for StdError {
+    fn from(err: ContractError) -> StdError {
+        StdError::generic_err(err.to_string())
+    }
+}
+
+impl From<ClientError> for ContractError {
+    fn from(err: ClientError) -> ContractError {
+        ContractError::Context(ContextError::ClientError(err))
+    }
+}
diff --git a/ibc-clients/cw-context/src/types/helper.rs b/ibc-clients/cw-context/src/types/helper.rs
new file mode 100644
index 000000000..05c82de7a
--- /dev/null
+++ b/ibc-clients/cw-context/src/types/helper.rs
@@ -0,0 +1,31 @@
+use ibc_client_wasm_types::{SUBJECT_PREFIX, SUBSTITUTE_PREFIX};
+
+/// The MigrationPrefix enumerates the prefix type used during migration mode.
+/// The migration mode is activated when there is an incoming
+/// [`MigrateClientStoreMsg`](crate::types::msgs::MigrateClientStoreMsg)
+/// message. It specifies the prefix key for either the
+/// subject or substitute store, or none if the migration is not active.
+#[derive(Clone, Debug)]
+pub enum MigrationPrefix {
+    Subject,
+    Substitute,
+    None,
+}
+
+impl MigrationPrefix {
+    pub fn key(&self) -> &[u8] {
+        match self {
+            MigrationPrefix::Subject => SUBJECT_PREFIX,
+            MigrationPrefix::Substitute => SUBSTITUTE_PREFIX,
+            MigrationPrefix::None => b"",
+        }
+    }
+}
+
+/// Travel is an enum to represent the direction of travel in the context of
+/// height.
+#[derive(Clone, Debug)]
+pub enum HeightTravel {
+    Next,
+    Prev,
+}
diff --git a/ibc-clients/cw-context/src/types/mod.rs b/ibc-clients/cw-context/src/types/mod.rs
new file mode 100644
index 000000000..28b7dfd35
--- /dev/null
+++ b/ibc-clients/cw-context/src/types/mod.rs
@@ -0,0 +1,9 @@
+mod error;
+mod helper;
+mod msgs;
+mod response;
+
+pub use error::*;
+pub use helper::*;
+pub use msgs::*;
+pub use response::*;
diff --git a/ibc-clients/cw-context/src/types/msgs.rs b/ibc-clients/cw-context/src/types/msgs.rs
new file mode 100644
index 000000000..506d65695
--- /dev/null
+++ b/ibc-clients/cw-context/src/types/msgs.rs
@@ -0,0 +1,300 @@
+//! Defines the messages sent to the CosmWasm contract by the 08-wasm proxy
+//! light client.
+use std::str::FromStr;
+
+use cosmwasm_schema::{cw_serde, QueryResponses};
+use ibc_client_wasm_types::serializer::Base64;
+use ibc_client_wasm_types::Bytes;
+use ibc_core::client::types::proto::v1::Height as RawHeight;
+use ibc_core::client::types::Height;
+use ibc_core::commitment_types::commitment::{CommitmentPrefix, CommitmentProofBytes};
+use ibc_core::host::types::path::Path;
+use ibc_core::primitives::proto::Any;
+use prost::Message;
+
+use super::error::ContractError;
+
+// ------------------------------------------------------------
+// Implementation of the InstantiateMsg struct
+// ------------------------------------------------------------
+
+#[cw_serde]
+pub struct InstantiateMsg {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub client_state: Bytes,
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub consensus_state: Bytes,
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub checksum: Bytes,
+}
+
+// ------------------------------------------------------------
+// Implementation of the SudoMsg enum and its variants
+// ------------------------------------------------------------
+
+#[derive(derive_more::From)]
+#[cw_serde]
+pub enum SudoMsg {
+    UpdateState(UpdateStateMsgRaw),
+    UpdateStateOnMisbehaviour(UpdateStateOnMisbehaviourMsgRaw),
+    VerifyUpgradeAndUpdateState(VerifyUpgradeAndUpdateStateMsgRaw),
+    VerifyMembership(VerifyMembershipMsgRaw),
+    VerifyNonMembership(VerifyNonMembershipMsgRaw),
+    MigrateClientStore(MigrateClientStoreMsg),
+}
+
+#[cw_serde]
+pub struct UpdateStateOnMisbehaviourMsgRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub client_message: Bytes,
+}
+
+pub struct UpdateStateOnMisbehaviourMsg {
+    pub client_message: Any,
+}
+
+impl TryFrom<UpdateStateOnMisbehaviourMsgRaw> for UpdateStateOnMisbehaviourMsg {
+    type Error = ContractError;
+
+    fn try_from(raw: UpdateStateOnMisbehaviourMsgRaw) -> Result<Self, Self::Error> {
+        let client_message = Any::decode(&mut raw.client_message.as_slice())?;
+
+        Ok(Self { client_message })
+    }
+}
+
+#[cw_serde]
+pub struct UpdateStateMsgRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub client_message: Bytes,
+}
+
+pub struct UpdateStateMsg {
+    pub client_message: Any,
+}
+
+impl TryFrom<UpdateStateMsgRaw> for UpdateStateMsg {
+    type Error = ContractError;
+
+    fn try_from(raw: UpdateStateMsgRaw) -> Result<Self, Self::Error> {
+        let client_message = Any::decode(&mut raw.client_message.as_slice())?;
+
+        Ok(Self { client_message })
+    }
+}
+
+#[cw_serde]
+pub struct CheckSubstituteAndUpdateStateMsg {}
+
+#[cw_serde]
+pub struct VerifyUpgradeAndUpdateStateMsgRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub upgrade_client_state: Bytes,
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub upgrade_consensus_state: Bytes,
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub proof_upgrade_client: Bytes,
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub proof_upgrade_consensus_state: Bytes,
+}
+
+pub struct VerifyUpgradeAndUpdateStateMsg {
+    pub upgrade_client_state: Any,
+    pub upgrade_consensus_state: Any,
+    pub proof_upgrade_client: CommitmentProofBytes,
+    pub proof_upgrade_consensus_state: CommitmentProofBytes,
+}
+
+impl TryFrom<VerifyUpgradeAndUpdateStateMsgRaw> for VerifyUpgradeAndUpdateStateMsg {
+    type Error = ContractError;
+
+    fn try_from(raw: VerifyUpgradeAndUpdateStateMsgRaw) -> Result<Self, Self::Error> {
+        let upgrade_client_state = Any::decode(&mut raw.upgrade_client_state.as_slice())?;
+
+        let upgrade_consensus_state = Any::decode(&mut raw.upgrade_consensus_state.as_slice())?;
+
+        Ok(VerifyUpgradeAndUpdateStateMsg {
+            upgrade_client_state,
+            upgrade_consensus_state,
+            proof_upgrade_client: CommitmentProofBytes::try_from(raw.proof_upgrade_client)?,
+            proof_upgrade_consensus_state: CommitmentProofBytes::try_from(
+                raw.proof_upgrade_consensus_state,
+            )?,
+        })
+    }
+}
+
+#[cw_serde]
+pub struct MerklePath {
+    pub key_path: Vec<String>,
+}
+
+#[cw_serde]
+pub struct VerifyMembershipMsgRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub proof: Bytes,
+    pub path: MerklePath,
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub value: Bytes,
+    pub height: RawHeight,
+    pub delay_block_period: u64,
+    pub delay_time_period: u64,
+}
+
+pub struct VerifyMembershipMsg {
+    pub prefix: CommitmentPrefix,
+    pub proof: CommitmentProofBytes,
+    pub path: Path,
+    pub value: Vec<u8>,
+    pub height: Height,
+    pub delay_block_period: u64,
+    pub delay_time_period: u64,
+}
+
+impl TryFrom<VerifyMembershipMsgRaw> for VerifyMembershipMsg {
+    type Error = ContractError;
+
+    fn try_from(mut raw: VerifyMembershipMsgRaw) -> Result<Self, Self::Error> {
+        let proof = CommitmentProofBytes::try_from(raw.proof)?;
+        let prefix = raw.path.key_path.remove(0).into_bytes();
+        let path_str = raw.path.key_path.join("");
+        let path = Path::from_str(&path_str)?;
+        let height = Height::try_from(raw.height)?;
+
+        Ok(Self {
+            proof,
+            path,
+            value: raw.value,
+            height,
+            prefix: CommitmentPrefix::try_from(prefix)?,
+            delay_block_period: raw.delay_block_period,
+            delay_time_period: raw.delay_time_period,
+        })
+    }
+}
+
+#[cw_serde]
+pub struct VerifyNonMembershipMsgRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub proof: Bytes,
+    pub path: MerklePath,
+    pub height: RawHeight,
+    pub delay_block_period: u64,
+    pub delay_time_period: u64,
+}
+
+pub struct VerifyNonMembershipMsg {
+    pub prefix: CommitmentPrefix,
+    pub proof: CommitmentProofBytes,
+    pub path: Path,
+    pub height: Height,
+    pub delay_block_period: u64,
+    pub delay_time_period: u64,
+}
+
+impl TryFrom<VerifyNonMembershipMsgRaw> for VerifyNonMembershipMsg {
+    type Error = ContractError;
+
+    fn try_from(mut raw: VerifyNonMembershipMsgRaw) -> Result<Self, Self::Error> {
+        let proof = CommitmentProofBytes::try_from(raw.proof)?;
+        let prefix = raw.path.key_path.remove(0).into_bytes();
+        let path_str = raw.path.key_path.join("");
+        let path = Path::from_str(&path_str)?;
+        let height = raw.height.try_into()?;
+        Ok(Self {
+            proof,
+            path,
+            height,
+            prefix: CommitmentPrefix::try_from(prefix)?,
+            delay_block_period: raw.delay_block_period,
+            delay_time_period: raw.delay_time_period,
+        })
+    }
+}
+
+#[cw_serde]
+pub struct MigrateClientStoreMsg {}
+
+// ------------------------------------------------------------
+// Implementation of the QueryMsg enum and its variants
+// ------------------------------------------------------------
+
+#[derive(QueryResponses, derive_more::From)]
+#[cw_serde]
+pub enum QueryMsg {
+    #[returns(crate::types::response::QueryResponse)]
+    Status(StatusMsg),
+    #[returns(crate::types::response::QueryResponse)]
+    ExportMetadata(ExportMetadataMsg),
+    #[returns(crate::types::response::QueryResponse)]
+    TimestampAtHeight(TimestampAtHeightMsg),
+    #[returns(crate::types::response::QueryResponse)]
+    VerifyClientMessage(VerifyClientMessageRaw),
+    #[returns(crate::types::response::QueryResponse)]
+    CheckForMisbehaviour(CheckForMisbehaviourMsgRaw),
+}
+
+#[cw_serde]
+pub struct StatusMsg {}
+
+#[cw_serde]
+pub struct ExportMetadataMsg {}
+
+#[cw_serde]
+pub struct TimestampAtHeightMsg {
+    pub height: Height,
+}
+
+#[cw_serde]
+pub struct VerifyClientMessageRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub client_message: Bytes,
+}
+
+pub struct VerifyClientMessageMsg {
+    pub client_message: Any,
+}
+
+impl TryFrom<VerifyClientMessageRaw> for VerifyClientMessageMsg {
+    type Error = ContractError;
+
+    fn try_from(raw: VerifyClientMessageRaw) -> Result<Self, Self::Error> {
+        let client_message = Any::decode(&mut raw.client_message.as_slice())?;
+
+        Ok(Self { client_message })
+    }
+}
+
+#[cw_serde]
+pub struct CheckForMisbehaviourMsgRaw {
+    #[schemars(with = "String")]
+    #[serde(with = "Base64", default)]
+    pub client_message: Bytes,
+}
+
+pub struct CheckForMisbehaviourMsg {
+    pub client_message: Any,
+}
+
+impl TryFrom<CheckForMisbehaviourMsgRaw> for CheckForMisbehaviourMsg {
+    type Error = ContractError;
+
+    fn try_from(raw: CheckForMisbehaviourMsgRaw) -> Result<Self, Self::Error> {
+        let client_message = Any::decode(&mut raw.client_message.as_slice())?;
+
+        Ok(Self { client_message })
+    }
+}
diff --git a/ibc-clients/cw-context/src/types/response.rs b/ibc-clients/cw-context/src/types/response.rs
new file mode 100644
index 000000000..4aebdbe63
--- /dev/null
+++ b/ibc-clients/cw-context/src/types/response.rs
@@ -0,0 +1,72 @@
+//! Contains the response types for the CosmWasm contract.
+use cosmwasm_schema::cw_serde;
+use ibc_client_wasm_types::Bytes;
+use ibc_core::client::types::Height;
+
+#[cw_serde]
+pub struct GenesisMetadata {
+    pub key: Bytes,
+    pub value: Bytes,
+}
+
+#[cw_serde]
+pub struct QueryResponse {
+    pub is_valid: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub genesis_metadata: Option<Vec<GenesisMetadata>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub found_misbehaviour: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timestamp: Option<u64>,
+}
+
+impl QueryResponse {
+    pub fn success() -> Self {
+        Self {
+            is_valid: true,
+            status: None,
+            genesis_metadata: None,
+            found_misbehaviour: None,
+            timestamp: None,
+        }
+    }
+
+    pub fn status(mut self, status: String) -> Self {
+        self.status = Some(status);
+        self
+    }
+
+    pub fn genesis_metadata(mut self, genesis_metadata: Option<Vec<GenesisMetadata>>) -> Self {
+        self.genesis_metadata = genesis_metadata;
+        self
+    }
+
+    pub fn misbehaviour(mut self, found_misbehavior: bool) -> Self {
+        self.found_misbehaviour = Some(found_misbehavior);
+        self
+    }
+
+    pub fn timestamp(mut self, timestamp: u64) -> Self {
+        self.timestamp = Some(timestamp);
+        self
+    }
+}
+
+#[cw_serde]
+pub struct ContractResult {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub heights: Option<Vec<Height>>,
+}
+
+impl ContractResult {
+    pub fn success() -> Self {
+        Self { heights: None }
+    }
+
+    pub fn heights(mut self, heights: Vec<Height>) -> Self {
+        self.heights = Some(heights);
+        self
+    }
+}
diff --git a/ibc-clients/cw-context/src/utils/codec.rs b/ibc-clients/cw-context/src/utils/codec.rs
new file mode 100644
index 000000000..dc662ecff
--- /dev/null
+++ b/ibc-clients/cw-context/src/utils/codec.rs
@@ -0,0 +1,28 @@
+use ibc_core::client::types::error::ClientError;
+use ibc_core::primitives::proto::Any;
+use prost::Message;
+
+/// AnyCodec is a convenient trait that provides a generic way to encode and
+/// decode domain types through the `Any` type.
+pub trait AnyCodec {
+    fn decode_any_vec<C>(data: Vec<u8>) -> Result<C, ClientError>
+    where
+        C: TryFrom<Any>,
+        <C as TryFrom<Any>>::Error: Into<ClientError>,
+    {
+        let raw = Any::decode(&mut data.as_slice()).map_err(|e| ClientError::Other {
+            description: e.to_string(),
+        })?;
+
+        C::try_from(raw).map_err(Into::into)
+    }
+
+    fn encode_to_any_vec<C>(value: C) -> Vec<u8>
+    where
+        C: Into<Any>,
+    {
+        value.into().encode_to_vec()
+    }
+}
+
+impl<T> AnyCodec for T where T: TryFrom<Any> + Into<Any> {}
diff --git a/ibc-clients/cw-context/src/utils/mod.rs b/ibc-clients/cw-context/src/utils/mod.rs
new file mode 100644
index 000000000..38e96fd59
--- /dev/null
+++ b/ibc-clients/cw-context/src/utils/mod.rs
@@ -0,0 +1,3 @@
+mod codec;
+
+pub use codec::*;
diff --git a/ibc-clients/ics07-tendermint/Cargo.toml b/ibc-clients/ics07-tendermint/Cargo.toml
new file mode 100644
index 000000000..93cab56a6
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/Cargo.toml
@@ -0,0 +1,82 @@
+[package]
+name         = "ibc-client-tendermint"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+readme       = "./../README.md"
+keywords     = [ "blockchain", "consensus", "cosmos", "ibc", "tendermint" ]
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of the ICS-07 Tendermint Client logic
+    and re-exports essential data structures and domain types from `ibc-client-tendermint-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+derive_more = { workspace = true }
+serde       = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-client-tendermint-types = { workspace = true }
+ibc-core-client             = { workspace = true }
+ibc-core-commitment-types   = { workspace = true }
+ibc-core-host               = { workspace = true }
+ibc-core-handler-types      = { workspace = true }
+ibc-primitives              = { workspace = true }
+
+# cosmos dependencies
+tendermint                       = { workspace = true }
+tendermint-light-client-verifier = { workspace = true, features = [ "rust-crypto" ] }
+
+[features]
+default = [ "std" ]
+std = [
+  "serde/std",
+  "ibc-client-tendermint-types/std",
+  "ibc-core-client/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host/std",
+  "ibc-core-handler-types/std",
+  "ibc-primitives/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-client-tendermint-types/serde",
+  "ibc-core-client/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host/serde",
+  "ibc-core-handler-types/serde",
+  "ibc-primitives/serde",
+]
+schema = [
+  "ibc-client-tendermint-types/schema",
+  "ibc-core-client/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-client-tendermint-types/borsh",
+  "ibc-core-client/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host/borsh",
+  "ibc-core-handler-types/borsh",
+  "ibc-primitives/borsh",
+]
+parity-scale-codec = [
+  "ibc-client-tendermint-types/parity-scale-codec",
+  "ibc-core-client/parity-scale-codec",
+  "ibc-core-commitment-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/ibc-clients/ics07-tendermint/cw-contract/Cargo.toml b/ibc-clients/ics07-tendermint/cw-contract/Cargo.toml
new file mode 100644
index 000000000..8c5c35733
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/cw-contract/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name         = "ibc-client-tendermint-cw"
+authors      = { workspace = true }
+edition      = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+rust-version = { workspace = true }
+version      = { workspace = true }
+keywords     = [ "ibc", "light-client", "ics07", "tendermint", "CosmWasm" ]
+readme       = "./../../README.md"
+
+description = """
+    The ICS-08 CosmWasm contract implementation of the ICS-07 Tendermint light client.
+"""
+
+[lib]
+crate-type = [ "cdylib", "rlib" ]
+
+[dependencies]
+# ibc dependencies
+ibc-core              = { workspace = true }
+ibc-client-cw         = { workspace = true }
+ibc-client-tendermint = { workspace = true }
+
+# cosmwasm dependencies
+cosmwasm-std = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-core/std",
+  "ibc-client-cw/std",
+  "ibc-client-tendermint/std",
+]
diff --git a/ibc-clients/ics07-tendermint/cw-contract/README.md b/ibc-clients/ics07-tendermint/cw-contract/README.md
new file mode 100644
index 000000000..d306e9707
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/cw-contract/README.md
@@ -0,0 +1,71 @@
+# `ibc-client-tendermint-cw` crate
+
+This crate showcases how to reuse an `ibc-rs` light client as a
+[CosmWasm contract](https://github.com/cosmos/ibc/blob/main/spec/client/ics-008-wasm-client/README.md)
+utilizing the `ibc-client-cw` crate.
+
+The `ibc-client-cw` crate exposes the requisite types and traits needed to reuse
+the `ibc-rs` light clients. Notably, it offers a
+[`ClientType`](https://docs.rs/ibc-client-cw/latest/ibc_client_cw/api/trait.ClientType.html)
+trait, which requires two associated types: `ClientState` and `ConsensusState`.
+These types take any type that implement the
+[`ClientStateExecution`](https://docs.rs/ibc-core/latest/ibc_core/client/context/client_state/trait.ClientStateExecution.html)
+and
+[`ConsensusState`](https://docs.rs/ibc-core/latest/ibc_core/client/context/consensus_state/trait.ConsensusState.html)
+traits from the `ibc-core` crate.
+
+For example, to reuse the existing
+[`ibc-client-tendermint`](https://docs.rs/ibc-client-tendermint/latest/ibc_client_tendermint/):
+
+```rs
+use ibc_client_cw::api::ClientType;
+use ibc_client_tendermint::client_state::ClientState;
+use ibc_client_tendermint::consensus_state::ConsensusState;
+
+#[derive(Clone, Debug)]
+pub struct TendermintClient;
+
+impl<'a> ClientType<'a> for TendermintClient {
+    type ClientState = ClientState;
+    type ConsensusState = ConsensusState;
+}
+```
+
+Once the `ClientType` trait is implemented, the `ibc-client-cw` crate can be
+used to complete the entry points for the CosmWasm contract:
+
+```rs
+use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Env, MessageInfo, Response};
+use ibc_client_cw::context::Context;
+use ibc_client_cw::types::{ContractError, InstantiateMsg, QueryMsg, SudoMsg};
+
+pub type TendermintContext<'a> = Context<'a, TendermintClient>;
+
+#[entry_point]
+pub fn instantiate(
+    deps: DepsMut<'_>,
+    env: Env,
+    _info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    let mut ctx = TendermintContext::new_mut(deps, env)?;
+    let data = ctx.instantiate(msg)?;
+    Ok(Response::default().set_data(data))
+}
+
+#[entry_point]
+pub fn sudo(deps: DepsMut<'_>, env: Env, msg: SudoMsg) -> Result<Response, ContractError> {
+    let mut ctx = TendermintContext::new_mut(deps, env)?;
+    let data = ctx.sudo(msg)?;
+    Ok(Response::default().set_data(data))
+}
+
+#[entry_point]
+pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
+    let ctx = TendermintContext::new_ref(deps, env)?;
+    ctx.query(msg)
+}
+```
+
+The above snippets compile into a fully working CosmWasm contract that implements the
+Tendermint IBC light client.
diff --git a/ibc-clients/ics07-tendermint/cw-contract/src/client_type.rs b/ibc-clients/ics07-tendermint/cw-contract/src/client_type.rs
new file mode 100644
index 000000000..001657220
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/cw-contract/src/client_type.rs
@@ -0,0 +1,12 @@
+use ibc_client_cw::api::ClientType;
+use ibc_client_tendermint::client_state::ClientState;
+use ibc_client_tendermint::consensus_state::ConsensusState;
+
+/// A unit struct that represents the Tendermint client type.
+#[derive(Clone, Debug)]
+pub struct TendermintClient;
+
+impl<'a> ClientType<'a> for TendermintClient {
+    type ClientState = ClientState;
+    type ConsensusState = ConsensusState;
+}
diff --git a/ibc-clients/ics07-tendermint/cw-contract/src/entrypoint.rs b/ibc-clients/ics07-tendermint/cw-contract/src/entrypoint.rs
new file mode 100644
index 000000000..e01e796b9
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/cw-contract/src/entrypoint.rs
@@ -0,0 +1,32 @@
+use cosmwasm_std::{entry_point, Binary, Deps, DepsMut, Env, MessageInfo, Response};
+use ibc_client_cw::context::Context;
+use ibc_client_cw::types::{ContractError, InstantiateMsg, QueryMsg, SudoMsg};
+
+use crate::client_type::TendermintClient;
+
+pub type TendermintContext<'a> = Context<'a, TendermintClient>;
+
+#[entry_point]
+pub fn instantiate(
+    deps: DepsMut<'_>,
+    env: Env,
+    _info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    let mut ctx = TendermintContext::new_mut(deps, env)?;
+    let data = ctx.instantiate(msg)?;
+    Ok(Response::default().set_data(data))
+}
+
+#[entry_point]
+pub fn sudo(deps: DepsMut<'_>, env: Env, msg: SudoMsg) -> Result<Response, ContractError> {
+    let mut ctx = TendermintContext::new_mut(deps, env)?;
+    let data = ctx.sudo(msg)?;
+    Ok(Response::default().set_data(data))
+}
+
+#[entry_point]
+pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<Binary, ContractError> {
+    let ctx = TendermintContext::new_ref(deps, env)?;
+    ctx.query(msg)
+}
diff --git a/ibc-clients/ics07-tendermint/cw-contract/src/lib.rs b/ibc-clients/ics07-tendermint/cw-contract/src/lib.rs
new file mode 100644
index 000000000..4a4a642f0
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/cw-contract/src/lib.rs
@@ -0,0 +1,15 @@
+//! The CosmWasm contract implementation of the ICS-07 Tendermint light client
+//! built using `ibc-rs`.
+#![cfg_attr(not(test), deny(clippy::unwrap_used))]
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+#![forbid(unsafe_code)]
+
+pub mod client_type;
+pub mod entrypoint;
diff --git a/ibc-clients/ics07-tendermint/src/client_state.rs b/ibc-clients/ics07-tendermint/src/client_state.rs
new file mode 100644
index 000000000..0adb68f22
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/client_state.rs
@@ -0,0 +1,172 @@
+//! This module includes trait implementations for the
+//! `ibc_client_tendermint_types::ClientState` type. Implemented traits include
+//! `ClientStateCommon`, `ClientStateValidation`, and `ClientStateExecution`.
+//!
+//! Note that this crate defines a newtype wrapper around the
+//! `ibc_client_tendermint_types::ClientState` type in order to enable
+//! implementing a foreign trait on a foreign type (i.e. the orphan rule in
+//! Rust). As such, this module also includes some trait implementations that
+//! serve to pass through traits implemented on the wrapped `ClientState` type.
+
+use ibc_client_tendermint_types::error::Error;
+use ibc_client_tendermint_types::proto::v1::ClientState as RawTmClientState;
+use ibc_client_tendermint_types::ClientState as ClientStateType;
+use ibc_core_client::types::error::ClientError;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::{Any, Protobuf};
+
+mod common;
+mod execution;
+mod misbehaviour;
+mod update_client;
+mod validation;
+
+pub use common::*;
+pub use execution::*;
+pub use misbehaviour::*;
+pub use update_client::*;
+pub use validation::*;
+
+/// Newtype wrapper around the `ClientState` type, imported from the
+/// `ibc-client-tendermint-types` crate. This wrapper exists so that we can
+/// bypass Rust's orphan rules and implement traits from
+/// `ibc::core::client::context` on the `ClientState` type.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, derive_more::From)]
+pub struct ClientState(ClientStateType);
+
+impl ClientState {
+    pub fn inner(&self) -> &ClientStateType {
+        &self.0
+    }
+}
+
+impl Protobuf<RawTmClientState> for ClientState {}
+
+impl TryFrom<RawTmClientState> for ClientState {
+    type Error = Error;
+
+    fn try_from(raw: RawTmClientState) -> Result<Self, Self::Error> {
+        Ok(Self(ClientStateType::try_from(raw)?))
+    }
+}
+
+impl From<ClientState> for RawTmClientState {
+    fn from(client_state: ClientState) -> Self {
+        client_state.0.into()
+    }
+}
+
+impl Protobuf<Any> for ClientState {}
+
+impl TryFrom<Any> for ClientState {
+    type Error = ClientError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        Ok(Self(ClientStateType::try_from(raw)?))
+    }
+}
+
+impl From<ClientState> for Any {
+    fn from(client_state: ClientState) -> Self {
+        client_state.0.into()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use core::time::Duration;
+
+    use ibc_client_tendermint_types::{
+        AllowUpdate, ClientState as ClientStateType, TrustThreshold,
+    };
+    use ibc_core_client::types::Height;
+    use ibc_core_commitment_types::specs::ProofSpecs;
+    use ibc_core_host::types::identifiers::ChainId;
+
+    use super::*;
+
+    #[derive(Clone, Debug, PartialEq)]
+    pub struct ClientStateParams {
+        pub id: ChainId,
+        pub trust_level: TrustThreshold,
+        pub trusting_period: Duration,
+        pub unbonding_period: Duration,
+        pub max_clock_drift: Duration,
+        pub latest_height: Height,
+        pub proof_specs: ProofSpecs,
+        pub upgrade_path: Vec<String>,
+        pub allow_update: AllowUpdate,
+    }
+
+    #[test]
+    fn client_state_verify_height() {
+        // Define a "default" set of parameters to reuse throughout these tests.
+        let default_params: ClientStateParams = ClientStateParams {
+            id: ChainId::new("ibc-1").unwrap(),
+            trust_level: TrustThreshold::ONE_THIRD,
+            trusting_period: Duration::new(64000, 0),
+            unbonding_period: Duration::new(128_000, 0),
+            max_clock_drift: Duration::new(3, 0),
+            latest_height: Height::new(1, 10).expect("Never fails"),
+            proof_specs: ProofSpecs::cosmos(),
+            upgrade_path: Vec::new(),
+            allow_update: AllowUpdate {
+                after_expiry: false,
+                after_misbehaviour: false,
+            },
+        };
+
+        struct Test {
+            name: String,
+            height: Height,
+            setup: Option<Box<dyn FnOnce(ClientState) -> ClientState>>,
+            want_pass: bool,
+        }
+
+        let tests = vec![
+            Test {
+                name: "Successful height verification".to_string(),
+                height: Height::new(1, 8).expect("Never fails"),
+                setup: None,
+                want_pass: true,
+            },
+            Test {
+                name: "Invalid (too large)  client height".to_string(),
+                height: Height::new(1, 12).expect("Never fails"),
+                setup: None,
+                want_pass: false,
+            },
+        ];
+
+        for test in tests {
+            let p = default_params.clone();
+            let client_state = ClientStateType::new(
+                p.id,
+                p.trust_level,
+                p.trusting_period,
+                p.unbonding_period,
+                p.max_clock_drift,
+                p.latest_height,
+                p.proof_specs,
+                p.upgrade_path,
+                p.allow_update,
+            )
+            .expect("Never fails");
+            let client_state = match test.setup {
+                Some(setup) => (setup)(ClientState(client_state)),
+                _ => ClientState(client_state),
+            };
+            let res = validate_proof_height(client_state.inner(), test.height);
+
+            assert_eq!(
+                test.want_pass,
+                res.is_ok(),
+                "ClientState::validate_proof_height() failed for test {}, \nmsg{:?} with error {:?}",
+                test.name,
+                test.height,
+                res.err(),
+            );
+        }
+    }
+}
diff --git a/ibc-clients/ics07-tendermint/src/client_state/common.rs b/ibc-clients/ics07-tendermint/src/client_state/common.rs
new file mode 100644
index 000000000..b7a7daf5b
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/client_state/common.rs
@@ -0,0 +1,245 @@
+use ibc_client_tendermint_types::{client_type as tm_client_type, ClientState as ClientStateType};
+use ibc_core_client::context::client_state::ClientStateCommon;
+use ibc_core_client::context::consensus_state::ConsensusState;
+use ibc_core_client::types::error::{ClientError, UpgradeClientError};
+use ibc_core_client::types::Height;
+use ibc_core_commitment_types::commitment::{
+    CommitmentPrefix, CommitmentProofBytes, CommitmentRoot,
+};
+use ibc_core_commitment_types::merkle::{apply_prefix, MerkleProof};
+use ibc_core_commitment_types::proto::ics23::{HostFunctionsManager, HostFunctionsProvider};
+use ibc_core_commitment_types::specs::ProofSpecs;
+use ibc_core_host::types::identifiers::ClientType;
+use ibc_core_host::types::path::{Path, UpgradeClientPath};
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Any;
+use ibc_primitives::ToVec;
+
+use super::ClientState;
+use crate::consensus_state::ConsensusState as TmConsensusState;
+
+impl ClientStateCommon for ClientState {
+    fn verify_consensus_state(&self, consensus_state: Any) -> Result<(), ClientError> {
+        verify_consensus_state(consensus_state)
+    }
+
+    fn client_type(&self) -> ClientType {
+        tm_client_type()
+    }
+
+    fn latest_height(&self) -> Height {
+        self.0.latest_height
+    }
+
+    fn validate_proof_height(&self, proof_height: Height) -> Result<(), ClientError> {
+        validate_proof_height(self.inner(), proof_height)
+    }
+
+    fn verify_upgrade_client(
+        &self,
+        upgraded_client_state: Any,
+        upgraded_consensus_state: Any,
+        proof_upgrade_client: CommitmentProofBytes,
+        proof_upgrade_consensus_state: CommitmentProofBytes,
+        root: &CommitmentRoot,
+    ) -> Result<(), ClientError> {
+        verify_upgrade_client::<HostFunctionsManager>(
+            self.inner(),
+            upgraded_client_state,
+            upgraded_consensus_state,
+            proof_upgrade_client,
+            proof_upgrade_consensus_state,
+            root,
+        )
+    }
+
+    fn verify_membership(
+        &self,
+        prefix: &CommitmentPrefix,
+        proof: &CommitmentProofBytes,
+        root: &CommitmentRoot,
+        path: Path,
+        value: Vec<u8>,
+    ) -> Result<(), ClientError> {
+        verify_membership::<HostFunctionsManager>(
+            &self.inner().proof_specs,
+            prefix,
+            proof,
+            root,
+            path,
+            value,
+        )
+    }
+
+    fn verify_non_membership(
+        &self,
+        prefix: &CommitmentPrefix,
+        proof: &CommitmentProofBytes,
+        root: &CommitmentRoot,
+        path: Path,
+    ) -> Result<(), ClientError> {
+        verify_non_membership::<HostFunctionsManager>(
+            &self.inner().proof_specs,
+            prefix,
+            proof,
+            root,
+            path,
+        )
+    }
+}
+
+/// Verify an `Any` consensus state by attempting to convert it to a `TmConsensusState`.
+/// Also checks whether the converted consensus state's root is present.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateCommon`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn verify_consensus_state(consensus_state: Any) -> Result<(), ClientError> {
+    let tm_consensus_state = TmConsensusState::try_from(consensus_state)?;
+
+    if tm_consensus_state.root().is_empty() {
+        return Err(ClientError::Other {
+            description: "empty commitment root".into(),
+        });
+    };
+
+    Ok(())
+}
+
+/// Validate the given proof height against the client state's latest height, returning
+/// an error if the proof height is greater than the latest height of the client state.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateCommon`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn validate_proof_height(
+    client_state: &ClientStateType,
+    proof_height: Height,
+) -> Result<(), ClientError> {
+    let latest_height = client_state.latest_height;
+
+    if latest_height < proof_height {
+        return Err(ClientError::InvalidProofHeight {
+            latest_height,
+            proof_height,
+        });
+    }
+
+    Ok(())
+}
+
+/// Perform client-specific verifications and check all data in the new
+/// client state to be the same across all valid Tendermint clients for the
+/// new chain.
+///
+/// You can learn more about how to upgrade IBC-connected SDK chains in
+/// [this](https://ibc.cosmos.network/main/ibc/upgrades/quick-guide.html)
+/// guide.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateCommon`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn verify_upgrade_client<H: HostFunctionsProvider>(
+    client_state: &ClientStateType,
+    upgraded_client_state: Any,
+    upgraded_consensus_state: Any,
+    proof_upgrade_client: CommitmentProofBytes,
+    proof_upgrade_consensus_state: CommitmentProofBytes,
+    root: &CommitmentRoot,
+) -> Result<(), ClientError> {
+    // Make sure that the client type is of Tendermint type `ClientState`
+    let upgraded_tm_client_state = ClientState::try_from(upgraded_client_state.clone())?;
+
+    // Make sure that the consensus type is of Tendermint type `ConsensusState`
+    TmConsensusState::try_from(upgraded_consensus_state.clone())?;
+
+    let latest_height = client_state.latest_height;
+    let upgraded_tm_client_state_height = upgraded_tm_client_state.latest_height();
+
+    // Make sure the latest height of the current client is not greater then
+    // the upgrade height This condition checks both the revision number and
+    // the height
+    if latest_height >= upgraded_tm_client_state_height {
+        Err(UpgradeClientError::LowUpgradeHeight {
+            upgraded_height: latest_height,
+            client_height: upgraded_tm_client_state_height,
+        })?
+    }
+
+    // Check to see if the upgrade path is set
+    let mut upgrade_path = client_state.upgrade_path.clone();
+
+    if upgrade_path.pop().is_none() {
+        return Err(ClientError::ClientSpecific {
+            description: "cannot upgrade client as no upgrade path has been set".to_string(),
+        });
+    };
+
+    let upgrade_path_prefix = CommitmentPrefix::try_from(upgrade_path[0].clone().into_bytes())
+        .map_err(ClientError::InvalidCommitmentProof)?;
+
+    let last_height = latest_height.revision_height();
+
+    // Verify the proof of the upgraded client state
+    verify_membership::<H>(
+        &client_state.proof_specs,
+        &upgrade_path_prefix,
+        &proof_upgrade_client,
+        root,
+        Path::UpgradeClient(UpgradeClientPath::UpgradedClientState(last_height)),
+        upgraded_client_state.to_vec(),
+    )?;
+
+    // Verify the proof of the upgraded consensus state
+    verify_membership::<H>(
+        &client_state.proof_specs,
+        &upgrade_path_prefix,
+        &proof_upgrade_consensus_state,
+        root,
+        Path::UpgradeClient(UpgradeClientPath::UpgradedClientConsensusState(last_height)),
+        upgraded_consensus_state.to_vec(),
+    )?;
+
+    Ok(())
+}
+
+/// Verify membership of the given value against the client's merkle proof.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateCommon`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn verify_membership<H: HostFunctionsProvider>(
+    proof_specs: &ProofSpecs,
+    prefix: &CommitmentPrefix,
+    proof: &CommitmentProofBytes,
+    root: &CommitmentRoot,
+    path: Path,
+    value: Vec<u8>,
+) -> Result<(), ClientError> {
+    let merkle_path = apply_prefix(prefix, vec![path.to_string()]);
+    let merkle_proof = MerkleProof::try_from(proof).map_err(ClientError::InvalidCommitmentProof)?;
+
+    merkle_proof
+        .verify_membership::<H>(proof_specs, root.clone().into(), merkle_path, value, 0)
+        .map_err(ClientError::Ics23Verification)
+}
+
+/// Verify that the given value does not belong in the client's merkle proof.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateCommon`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn verify_non_membership<H: HostFunctionsProvider>(
+    proof_specs: &ProofSpecs,
+    prefix: &CommitmentPrefix,
+    proof: &CommitmentProofBytes,
+    root: &CommitmentRoot,
+    path: Path,
+) -> Result<(), ClientError> {
+    let merkle_path = apply_prefix(prefix, vec![path.to_string()]);
+    let merkle_proof = MerkleProof::try_from(proof).map_err(ClientError::InvalidCommitmentProof)?;
+
+    merkle_proof
+        .verify_non_membership::<H>(proof_specs, root.clone().into(), merkle_path)
+        .map_err(ClientError::Ics23Verification)
+}
diff --git a/ibc-clients/ics07-tendermint/src/client_state/execution.rs b/ibc-clients/ics07-tendermint/src/client_state/execution.rs
new file mode 100644
index 000000000..5d4fadde5
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/client_state/execution.rs
@@ -0,0 +1,432 @@
+use ibc_client_tendermint_types::{
+    ClientState as ClientStateType, ConsensusState as ConsensusStateType, Header as TmHeader,
+};
+use ibc_core_client::context::prelude::*;
+use ibc_core_client::types::error::ClientError;
+use ibc_core_client::types::Height;
+use ibc_core_host::types::identifiers::ClientId;
+use ibc_core_host::types::path::{ClientConsensusStatePath, ClientStatePath};
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Any;
+
+use super::ClientState;
+
+impl<E> ClientStateExecution<E> for ClientState
+where
+    E: ExtClientExecutionContext,
+    E::ClientStateRef: From<ClientStateType>,
+    ConsensusStateType: Convertible<E::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<E::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    fn initialise(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        consensus_state: Any,
+    ) -> Result<(), ClientError> {
+        initialise(self.inner(), ctx, client_id, consensus_state)
+    }
+
+    fn update_state(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        header: Any,
+    ) -> Result<Vec<Height>, ClientError> {
+        update_state(self.inner(), ctx, client_id, header)
+    }
+
+    fn update_state_on_misbehaviour(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        client_message: Any,
+    ) -> Result<(), ClientError> {
+        update_on_misbehaviour(self.inner(), ctx, client_id, client_message)
+    }
+
+    fn update_state_on_upgrade(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        upgraded_client_state: Any,
+        upgraded_consensus_state: Any,
+    ) -> Result<Height, ClientError> {
+        update_on_upgrade(
+            self.inner(),
+            ctx,
+            client_id,
+            upgraded_client_state,
+            upgraded_consensus_state,
+        )
+    }
+
+    fn update_on_recovery(
+        &self,
+        ctx: &mut E,
+        subject_client_id: &ClientId,
+        substitute_client_state: Any,
+        substitute_consensus_state: Any,
+    ) -> Result<(), ClientError> {
+        let subject_client_state = self.inner().clone();
+
+        update_on_recovery(
+            subject_client_state,
+            ctx,
+            subject_client_id,
+            substitute_client_state,
+            substitute_consensus_state,
+        )
+    }
+}
+
+/// Seed the host store with initial client and consensus states.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateExecution`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn initialise<E>(
+    client_state: &ClientStateType,
+    ctx: &mut E,
+    client_id: &ClientId,
+    consensus_state: Any,
+) -> Result<(), ClientError>
+where
+    E: ExtClientExecutionContext,
+    E::ClientStateRef: From<ClientStateType>,
+    ConsensusStateType: Convertible<E::ConsensusStateRef>,
+{
+    let host_timestamp = ExtClientValidationContext::host_timestamp(ctx)?;
+    let host_height = ExtClientValidationContext::host_height(ctx)?;
+
+    let tm_consensus_state: ConsensusStateType = consensus_state.try_into()?;
+
+    ctx.store_client_state(
+        ClientStatePath::new(client_id.clone()),
+        client_state.clone().into(),
+    )?;
+    ctx.store_consensus_state(
+        ClientConsensusStatePath::new(
+            client_id.clone(),
+            client_state.latest_height.revision_number(),
+            client_state.latest_height.revision_height(),
+        ),
+        tm_consensus_state.into(),
+    )?;
+
+    ctx.store_update_meta(
+        client_id.clone(),
+        client_state.latest_height,
+        host_timestamp,
+        host_height,
+    )?;
+
+    Ok(())
+}
+
+/// Update the host store with a new client state, pruning old states from the
+/// store if need be.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateExecution`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn update_state<E>(
+    client_state: &ClientStateType,
+    ctx: &mut E,
+    client_id: &ClientId,
+    header: Any,
+) -> Result<Vec<Height>, ClientError>
+where
+    E: ExtClientExecutionContext,
+    E::ClientStateRef: From<ClientStateType>,
+    ConsensusStateType: Convertible<E::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<E::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    let header = TmHeader::try_from(header)?;
+    let header_height = header.height();
+
+    prune_oldest_consensus_state(client_state, ctx, client_id)?;
+
+    let maybe_existing_consensus_state = {
+        let path_at_header_height = ClientConsensusStatePath::new(
+            client_id.clone(),
+            header_height.revision_number(),
+            header_height.revision_height(),
+        );
+
+        ctx.consensus_state(&path_at_header_height).ok()
+    };
+
+    if maybe_existing_consensus_state.is_some() {
+        // if we already had the header installed by a previous relayer
+        // then this is a no-op.
+        //
+        // Do nothing.
+    } else {
+        let host_timestamp = ExtClientValidationContext::host_timestamp(ctx)?;
+        let host_height = ExtClientValidationContext::host_height(ctx)?;
+
+        let new_consensus_state = ConsensusStateType::from(header.clone());
+        let new_client_state = client_state.clone().with_header(header)?;
+
+        ctx.store_consensus_state(
+            ClientConsensusStatePath::new(
+                client_id.clone(),
+                header_height.revision_number(),
+                header_height.revision_height(),
+            ),
+            new_consensus_state.into(),
+        )?;
+        ctx.store_client_state(
+            ClientStatePath::new(client_id.clone()),
+            new_client_state.into(),
+        )?;
+        ctx.store_update_meta(
+            client_id.clone(),
+            header_height,
+            host_timestamp,
+            host_height,
+        )?;
+    }
+
+    Ok(vec![header_height])
+}
+
+/// Commit a frozen client state, which was frozen as a result of having exhibited
+/// misbehaviour, to the store.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateExecution`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn update_on_misbehaviour<E>(
+    client_state: &ClientStateType,
+    ctx: &mut E,
+    client_id: &ClientId,
+    _client_message: Any,
+) -> Result<(), ClientError>
+where
+    E: ExtClientExecutionContext,
+    E::ClientStateRef: From<ClientStateType>,
+{
+    // NOTE: frozen height is  set to `Height {revision_height: 0,
+    // revision_number: 1}` and it is the same for all misbehaviour. This
+    // aligns with the
+    // [`ibc-go`](https://github.com/cosmos/ibc-go/blob/0e3f428e66d6fc0fc6b10d2f3c658aaa5000daf7/modules/light-clients/07-tendermint/misbehaviour.go#L18-L19)
+    // implementation.
+    let frozen_client_state = client_state.clone().with_frozen_height(Height::min(0));
+
+    ctx.store_client_state(
+        ClientStatePath::new(client_id.clone()),
+        frozen_client_state.into(),
+    )?;
+
+    Ok(())
+}
+
+/// Commit the new client state and consensus state to the store upon a
+/// successful client upgrade.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateExecution`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn update_on_upgrade<E>(
+    client_state: &ClientStateType,
+    ctx: &mut E,
+    client_id: &ClientId,
+    upgraded_client_state: Any,
+    upgraded_consensus_state: Any,
+) -> Result<Height, ClientError>
+where
+    E: ExtClientExecutionContext,
+    E::ClientStateRef: From<ClientStateType>,
+    ConsensusStateType: Convertible<E::ConsensusStateRef>,
+{
+    let mut upgraded_tm_client_state = ClientState::try_from(upgraded_client_state)?;
+    let upgraded_tm_cons_state: ConsensusStateType = upgraded_consensus_state.try_into()?;
+
+    upgraded_tm_client_state.0.zero_custom_fields();
+
+    // Construct new client state and consensus state relayer chosen client
+    // parameters are ignored. All chain-chosen parameters come from
+    // committed client, all client-chosen parameters come from current
+    // client.
+    let new_client_state = ClientStateType::new(
+        upgraded_tm_client_state.0.chain_id,
+        client_state.trust_level,
+        client_state.trusting_period,
+        upgraded_tm_client_state.0.unbonding_period,
+        client_state.max_clock_drift,
+        upgraded_tm_client_state.0.latest_height,
+        upgraded_tm_client_state.0.proof_specs,
+        upgraded_tm_client_state.0.upgrade_path,
+        client_state.allow_update,
+    )?;
+
+    // The new consensus state is merely used as a trusted kernel against
+    // which headers on the new chain can be verified. The root is just a
+    // stand-in sentinel value as it cannot be known in advance, thus no
+    // proof verification will pass. The timestamp and the
+    // NextValidatorsHash of the consensus state is the blocktime and
+    // NextValidatorsHash of the last block committed by the old chain. This
+    // will allow the first block of the new chain to be verified against
+    // the last validators of the old chain so long as it is submitted
+    // within the TrustingPeriod of this client.
+    // NOTE: We do not set processed time for this consensus state since
+    // this consensus state should not be used for packet verification as
+    // the root is empty. The next consensus state submitted using update
+    // will be usable for packet-verification.
+    let sentinel_root = b"sentinel_root".to_vec();
+    let new_consensus_state = ConsensusStateType::new(
+        sentinel_root.into(),
+        upgraded_tm_cons_state.timestamp(),
+        upgraded_tm_cons_state.next_validators_hash,
+    );
+
+    let latest_height = new_client_state.latest_height;
+    let host_timestamp = ExtClientValidationContext::host_timestamp(ctx)?;
+    let host_height = ExtClientValidationContext::host_height(ctx)?;
+
+    ctx.store_client_state(
+        ClientStatePath::new(client_id.clone()),
+        new_client_state.into(),
+    )?;
+    ctx.store_consensus_state(
+        ClientConsensusStatePath::new(
+            client_id.clone(),
+            latest_height.revision_number(),
+            latest_height.revision_height(),
+        ),
+        new_consensus_state.into(),
+    )?;
+    ctx.store_update_meta(
+        client_id.clone(),
+        latest_height,
+        host_timestamp,
+        host_height,
+    )?;
+
+    Ok(latest_height)
+}
+
+/// Removes consensus states from the client store whose timestamps
+/// are less than or equal to the host timestamp. This ensures that
+/// the client store does not amass a buildup of stale consensus states.
+pub fn prune_oldest_consensus_state<E>(
+    client_state: &ClientStateType,
+    ctx: &mut E,
+    client_id: &ClientId,
+) -> Result<(), ClientError>
+where
+    E: ClientExecutionContext + ExtClientValidationContext,
+    E::ClientStateRef: From<ClientStateType>,
+    ConsensusStateType: Convertible<E::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<E::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    let mut heights = ctx.consensus_state_heights(client_id)?;
+
+    heights.sort();
+
+    for height in heights {
+        let client_consensus_state_path = ClientConsensusStatePath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+        let consensus_state = ctx.consensus_state(&client_consensus_state_path)?;
+        let tm_consensus_state: ConsensusStateType =
+            consensus_state.try_into().map_err(Into::into)?;
+
+        let host_timestamp =
+            ctx.host_timestamp()?
+                .into_tm_time()
+                .ok_or_else(|| ClientError::Other {
+                    description: String::from("host timestamp is not a valid TM timestamp"),
+                })?;
+
+        let tm_consensus_state_timestamp = tm_consensus_state.timestamp();
+        let tm_consensus_state_expiry = (tm_consensus_state_timestamp
+            + client_state.trusting_period)
+            .map_err(|_| ClientError::Other {
+                description: String::from(
+                    "Timestamp overflow error occurred while attempting to parse TmConsensusState",
+                ),
+            })?;
+
+        if tm_consensus_state_expiry > host_timestamp {
+            break;
+        }
+
+        ctx.delete_consensus_state(client_consensus_state_path)?;
+        ctx.delete_update_meta(client_id.clone(), height)?;
+    }
+
+    Ok(())
+}
+
+/// Update the `client_state`'s ID, trusting period, latest height, processed height,
+/// and processed time metadata values to those values provided by a verified substitute
+/// client state in response to a successful client recovery.
+///
+/// Note that unlike the `update_on_upgrade` function, `update_on_recovery` assumes
+/// that the client being updated has already been re-initialised such that its original
+/// client and consensus states have been overwritten to their new states.
+///
+/// This function is typically implemented as part of the [`ClientStateExecution`]
+/// trait, but has been made standalone in order to enable greater flexibility
+/// of the ClientState APIs.
+pub fn update_on_recovery<E>(
+    subject_client_state: ClientStateType,
+    ctx: &mut E,
+    subject_client_id: &ClientId,
+    substitute_client_state: Any,
+    substitute_consensus_state: Any,
+) -> Result<(), ClientError>
+where
+    E: ExtClientExecutionContext,
+    E::ClientStateRef: From<ClientStateType>,
+    ConsensusStateType: Convertible<E::ConsensusStateRef>,
+{
+    let substitute_client_state = ClientState::try_from(substitute_client_state)?
+        .inner()
+        .clone();
+
+    let chain_id = substitute_client_state.chain_id;
+    let trusting_period = substitute_client_state.trusting_period;
+    let latest_height = substitute_client_state.latest_height;
+
+    let new_client_state = ClientStateType {
+        chain_id,
+        trusting_period,
+        latest_height,
+        frozen_height: None,
+        ..subject_client_state
+    };
+
+    let host_timestamp = E::host_timestamp(ctx)?;
+    let host_height = E::host_height(ctx)?;
+
+    let tm_consensus_state: ConsensusStateType = substitute_consensus_state.try_into()?;
+
+    ctx.store_consensus_state(
+        ClientConsensusStatePath::new(
+            subject_client_id.clone(),
+            new_client_state.latest_height.revision_number(),
+            new_client_state.latest_height.revision_height(),
+        ),
+        tm_consensus_state.into(),
+    )?;
+
+    ctx.store_client_state(
+        ClientStatePath::new(subject_client_id.clone()),
+        new_client_state.into(),
+    )?;
+
+    ctx.store_update_meta(
+        subject_client_id.clone(),
+        latest_height,
+        host_timestamp,
+        host_height,
+    )?;
+
+    Ok(())
+}
diff --git a/ibc-clients/ics07-tendermint/src/client_state/misbehaviour.rs b/ibc-clients/ics07-tendermint/src/client_state/misbehaviour.rs
new file mode 100644
index 000000000..65fd175c5
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/client_state/misbehaviour.rs
@@ -0,0 +1,161 @@
+use ibc_client_tendermint_types::error::{Error, IntoResult};
+use ibc_client_tendermint_types::{
+    ConsensusState as ConsensusStateType, Header as TmHeader, Misbehaviour as TmMisbehaviour,
+};
+use ibc_core_client::context::{Convertible, ExtClientValidationContext};
+use ibc_core_client::types::error::ClientError;
+use ibc_core_host::types::identifiers::{ChainId, ClientId};
+use ibc_core_host::types::path::ClientConsensusStatePath;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Timestamp;
+use tendermint::crypto::Sha256;
+use tendermint::merkle::MerkleHash;
+use tendermint::{Hash, Time};
+use tendermint_light_client_verifier::options::Options;
+use tendermint_light_client_verifier::Verifier;
+
+use crate::types::Header;
+
+/// Determines if two conflicting headers at the same height would
+/// have convinced the light client.
+pub fn verify_misbehaviour<V, H>(
+    ctx: &V,
+    misbehaviour: &TmMisbehaviour,
+    client_id: &ClientId,
+    chain_id: &ChainId,
+    options: &Options,
+    verifier: &impl Verifier,
+) -> Result<(), ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+    H: MerkleHash + Sha256 + Default,
+{
+    misbehaviour.validate_basic::<H>()?;
+
+    let header_1 = misbehaviour.header1();
+    let trusted_consensus_state_1: ConsensusStateType = {
+        let consensus_state_path = ClientConsensusStatePath::new(
+            client_id.clone(),
+            header_1.trusted_height.revision_number(),
+            header_1.trusted_height.revision_height(),
+        );
+        let consensus_state = ctx.consensus_state(&consensus_state_path)?;
+
+        consensus_state.try_into().map_err(Into::into)?
+    };
+
+    let header_2 = misbehaviour.header2();
+    let trusted_consensus_state_2: ConsensusStateType = {
+        let consensus_state_path = ClientConsensusStatePath::new(
+            client_id.clone(),
+            header_2.trusted_height.revision_number(),
+            header_2.trusted_height.revision_height(),
+        );
+        let consensus_state = ctx.consensus_state(&consensus_state_path)?;
+
+        consensus_state.try_into().map_err(Into::into)?
+    };
+
+    let current_timestamp = ctx.host_timestamp()?;
+
+    verify_misbehaviour_header::<H>(
+        header_1,
+        chain_id,
+        options,
+        trusted_consensus_state_1.timestamp(),
+        trusted_consensus_state_1.next_validators_hash,
+        current_timestamp,
+        verifier,
+    )?;
+    verify_misbehaviour_header::<H>(
+        header_2,
+        chain_id,
+        options,
+        trusted_consensus_state_2.timestamp(),
+        trusted_consensus_state_2.next_validators_hash,
+        current_timestamp,
+        verifier,
+    )
+}
+
+pub fn verify_misbehaviour_header<H>(
+    header: &TmHeader,
+    chain_id: &ChainId,
+    options: &Options,
+    trusted_timestamp: Time,
+    trusted_next_validator_hash: Hash,
+    current_timestamp: Timestamp,
+    verifier: &impl Verifier,
+) -> Result<(), ClientError>
+where
+    H: MerkleHash + Sha256 + Default,
+{
+    // ensure correctness of the trusted next validator set provided by the relayer
+    header.check_trusted_next_validator_set::<H>(&trusted_next_validator_hash)?;
+
+    // ensure trusted consensus state is within trusting period
+    {
+        let duration_since_consensus_state = current_timestamp
+            .duration_since(&trusted_timestamp.into())
+            .ok_or_else(|| ClientError::InvalidConsensusStateTimestamp {
+                time1: trusted_timestamp.into(),
+                time2: current_timestamp,
+            })?;
+
+        if duration_since_consensus_state >= options.trusting_period {
+            return Err(Error::ConsensusStateTimestampGteTrustingPeriod {
+                duration_since_consensus_state,
+                trusting_period: options.trusting_period,
+            }
+            .into());
+        }
+    }
+
+    // main header verification, delegated to the tendermint-light-client crate.
+    let untrusted_state = header.as_untrusted_block_state();
+
+    let tm_chain_id = &chain_id
+        .as_str()
+        .try_into()
+        .map_err(|e| ClientError::Other {
+            description: format!("failed to parse chain id: {e}"),
+        })?;
+
+    let trusted_state = header.as_trusted_block_state(
+        tm_chain_id,
+        trusted_timestamp,
+        trusted_next_validator_hash,
+    )?;
+
+    let current_timestamp = current_timestamp.into_tm_time().ok_or(ClientError::Other {
+        description: "host timestamp must not be zero".to_string(),
+    })?;
+
+    verifier
+        .verify_misbehaviour_header(untrusted_state, trusted_state, options, current_timestamp)
+        .into_result()?;
+
+    Ok(())
+}
+
+pub fn check_for_misbehaviour_on_misbehavior(
+    header_1: &Header,
+    header_2: &Header,
+) -> Result<bool, ClientError> {
+    if header_1.height() == header_2.height() {
+        // when the height of the 2 headers are equal, we only have evidence
+        // of misbehaviour in the case where the headers are different
+        // (otherwise, the same header was added twice in the message,
+        // and this is evidence of nothing)
+        Ok(header_1.signed_header.commit.block_id.hash
+            != header_2.signed_header.commit.block_id.hash)
+    } else {
+        // header_1 is at greater height than header_2, therefore
+        // header_1 time must be less than or equal to
+        // header_2 time in order to be valid misbehaviour (violation of
+        // monotonic time).
+        Ok(header_1.signed_header.header.time <= header_2.signed_header.header.time)
+    }
+}
diff --git a/ibc-clients/ics07-tendermint/src/client_state/update_client.rs b/ibc-clients/ics07-tendermint/src/client_state/update_client.rs
new file mode 100644
index 000000000..ec5d88c36
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/client_state/update_client.rs
@@ -0,0 +1,171 @@
+use ibc_client_tendermint_types::error::{Error, IntoResult};
+use ibc_client_tendermint_types::{ConsensusState as ConsensusStateType, Header as TmHeader};
+use ibc_core_client::context::{Convertible, ExtClientValidationContext};
+use ibc_core_client::types::error::ClientError;
+use ibc_core_client::types::Height;
+use ibc_core_host::types::identifiers::{ChainId, ClientId};
+use ibc_core_host::types::path::ClientConsensusStatePath;
+use ibc_primitives::prelude::*;
+use tendermint::crypto::Sha256;
+use tendermint::merkle::MerkleHash;
+use tendermint_light_client_verifier::options::Options;
+use tendermint_light_client_verifier::types::{TrustedBlockState, UntrustedBlockState};
+use tendermint_light_client_verifier::Verifier;
+
+pub fn verify_header<V, H>(
+    ctx: &V,
+    header: &TmHeader,
+    client_id: &ClientId,
+    chain_id: &ChainId,
+    options: &Options,
+    verifier: &impl Verifier,
+) -> Result<(), ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+    H: MerkleHash + Sha256 + Default,
+{
+    // Checks that the header fields are valid.
+    header.validate_basic::<H>()?;
+
+    // The tendermint-light-client crate though works on heights that are assumed
+    // to have the same revision number. We ensure this here.
+    header.verify_chain_id_version_matches_height(chain_id)?;
+
+    // Delegate to tendermint-light-client, which contains the required checks
+    // of the new header against the trusted consensus state.
+    {
+        let trusted_state = {
+            let trusted_client_cons_state_path = ClientConsensusStatePath::new(
+                client_id.clone(),
+                header.trusted_height.revision_number(),
+                header.trusted_height.revision_height(),
+            );
+            let trusted_consensus_state: ConsensusStateType = ctx
+                .consensus_state(&trusted_client_cons_state_path)?
+                .try_into()
+                .map_err(Into::into)?;
+
+            header.check_trusted_next_validator_set::<H>(
+                &trusted_consensus_state.next_validators_hash,
+            )?;
+
+            TrustedBlockState {
+                chain_id: &chain_id
+                    .as_str()
+                    .try_into()
+                    .map_err(|e| ClientError::Other {
+                        description: format!("failed to parse chain id: {}", e),
+                    })?,
+                header_time: trusted_consensus_state.timestamp(),
+                height: header
+                    .trusted_height
+                    .revision_height()
+                    .try_into()
+                    .map_err(|_| ClientError::ClientSpecific {
+                        description: Error::InvalidHeaderHeight {
+                            height: header.trusted_height.revision_height(),
+                        }
+                        .to_string(),
+                    })?,
+                next_validators: &header.trusted_next_validator_set,
+                next_validators_hash: trusted_consensus_state.next_validators_hash,
+            }
+        };
+
+        let untrusted_state = UntrustedBlockState {
+            signed_header: &header.signed_header,
+            validators: &header.validator_set,
+            // NB: This will skip the
+            // VerificationPredicates::next_validators_match check for the
+            // untrusted state.
+            next_validators: None,
+        };
+
+        let now =
+            ctx.host_timestamp()?
+                .into_tm_time()
+                .ok_or_else(|| ClientError::ClientSpecific {
+                    description: "host timestamp is not a valid TM timestamp".to_string(),
+                })?;
+
+        // main header verification, delegated to the tendermint-light-client crate.
+        verifier
+            .verify_update_header(untrusted_state, trusted_state, options, now)
+            .into_result()?;
+    }
+
+    Ok(())
+}
+
+/// Checks for misbehaviour upon receiving a new consensus state as part
+/// of a client update.
+pub fn check_for_misbehaviour_on_update<V>(
+    ctx: &V,
+    header: TmHeader,
+    client_id: &ClientId,
+    client_latest_height: &Height,
+) -> Result<bool, ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    let maybe_existing_consensus_state = {
+        let path_at_header_height = ClientConsensusStatePath::new(
+            client_id.clone(),
+            header.height().revision_number(),
+            header.height().revision_height(),
+        );
+
+        ctx.consensus_state(&path_at_header_height).ok()
+    };
+
+    if let Some(existing_consensus_state) = maybe_existing_consensus_state {
+        let existing_consensus_state: ConsensusStateType =
+            existing_consensus_state.try_into().map_err(Into::into)?;
+
+        let header_consensus_state = ConsensusStateType::from(header);
+
+        // There is evidence of misbehaviour if the stored consensus state
+        // is different from the new one we received.
+        Ok(existing_consensus_state != header_consensus_state)
+    } else {
+        // If no header was previously installed, we ensure the monotonicity of timestamps.
+
+        // 1. for all headers, the new header needs to have a larger timestamp than
+        //    the “previous header”
+        {
+            let maybe_prev_cs = ctx.prev_consensus_state(client_id, &header.height())?;
+
+            if let Some(prev_cs) = maybe_prev_cs {
+                // New header timestamp cannot occur *before* the
+                // previous consensus state's height
+                let prev_cs: ConsensusStateType = prev_cs.try_into().map_err(Into::into)?;
+
+                if header.signed_header.header().time <= prev_cs.timestamp() {
+                    return Ok(true);
+                }
+            }
+        }
+
+        // 2. if a header comes in and is not the “last” header, then we also ensure
+        //    that its timestamp is less than the “next header”
+        if &header.height() < client_latest_height {
+            let maybe_next_cs = ctx.next_consensus_state(client_id, &header.height())?;
+
+            if let Some(next_cs) = maybe_next_cs {
+                // New (untrusted) header timestamp cannot occur *after* next
+                // consensus state's height
+                let next_cs: ConsensusStateType = next_cs.try_into().map_err(Into::into)?;
+
+                if header.signed_header.header().time >= next_cs.timestamp() {
+                    return Ok(true);
+                }
+            }
+        }
+
+        Ok(false)
+    }
+}
diff --git a/ibc-clients/ics07-tendermint/src/client_state/validation.rs b/ibc-clients/ics07-tendermint/src/client_state/validation.rs
new file mode 100644
index 000000000..116b84dd8
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/client_state/validation.rs
@@ -0,0 +1,281 @@
+use ibc_client_tendermint_types::{
+    ClientState as ClientStateType, ConsensusState as ConsensusStateType, Header as TmHeader,
+    Misbehaviour as TmMisbehaviour, TENDERMINT_HEADER_TYPE_URL, TENDERMINT_MISBEHAVIOUR_TYPE_URL,
+};
+use ibc_core_client::context::client_state::ClientStateValidation;
+use ibc_core_client::context::{Convertible, ExtClientValidationContext};
+use ibc_core_client::types::error::ClientError;
+use ibc_core_client::types::Status;
+use ibc_core_host::types::identifiers::ClientId;
+use ibc_core_host::types::path::ClientConsensusStatePath;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Any;
+use tendermint::crypto::default::Sha256;
+use tendermint::crypto::Sha256 as Sha256Trait;
+use tendermint::merkle::MerkleHash;
+use tendermint_light_client_verifier::{ProdVerifier, Verifier};
+
+use super::{check_for_misbehaviour_on_misbehavior, check_for_misbehaviour_on_update, ClientState};
+use crate::client_state::{verify_header, verify_misbehaviour};
+
+impl<V> ClientStateValidation<V> for ClientState
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    /// The default verification logic exposed by ibc-rs simply delegates to a
+    /// standalone `verify_client_message` function. This is to make it as
+    /// simple as possible for those who merely need the default
+    /// [`ProdVerifier`] behaviour, as well as those who require custom
+    /// verification logic.
+    ///
+    /// In a situation where the Tendermint [`ProdVerifier`] doesn't provide the
+    /// desired outcome, users should define a custom verifier struct and then
+    /// implement the [`Verifier`] trait for it.
+    ///
+    /// In order to wire up the custom verifier, create a newtype `ClientState`
+    /// wrapper similar to [`ClientState`] and implement all client state traits
+    /// for it. For method implementation, the simplest way is to import and
+    /// call their analogous standalone versions under the
+    /// [`crate::client_state`] module, unless bespoke logic is desired for any
+    /// of those functions. Then, when it comes to implementing the
+    /// `verify_client_message` method, use the [`verify_client_message`]
+    /// function and pass your custom verifier object as the `verifier`
+    /// parameter.
+    fn verify_client_message(
+        &self,
+        ctx: &V,
+        client_id: &ClientId,
+        client_message: Any,
+    ) -> Result<(), ClientError> {
+        verify_client_message::<V, Sha256>(
+            self.inner(),
+            ctx,
+            client_id,
+            client_message,
+            &ProdVerifier::default(),
+        )
+    }
+
+    fn check_for_misbehaviour(
+        &self,
+        ctx: &V,
+        client_id: &ClientId,
+        client_message: Any,
+    ) -> Result<bool, ClientError> {
+        check_for_misbehaviour(self.inner(), ctx, client_id, client_message)
+    }
+
+    fn status(&self, ctx: &V, client_id: &ClientId) -> Result<Status, ClientError> {
+        status(self.inner(), ctx, client_id)
+    }
+
+    fn check_substitute(&self, _ctx: &V, substitute_client_state: Any) -> Result<(), ClientError> {
+        check_substitute::<V>(self.inner(), substitute_client_state)
+    }
+}
+
+/// Verify the client message as part of the client state validation process.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateValidation`] trait, but has been made a standalone function in
+/// order to make the ClientState APIs more flexible. It mostly adheres to the
+/// same signature as the `ClientStateValidation::verify_client_message`
+/// function, except for an additional `verifier` parameter that allows users
+/// who require custom verification logic to easily pass in their own verifier
+/// implementation.
+pub fn verify_client_message<V, H>(
+    client_state: &ClientStateType,
+    ctx: &V,
+    client_id: &ClientId,
+    client_message: Any,
+    verifier: &impl Verifier,
+) -> Result<(), ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+    H: MerkleHash + Sha256Trait + Default,
+{
+    match client_message.type_url.as_str() {
+        TENDERMINT_HEADER_TYPE_URL => {
+            let header = TmHeader::try_from(client_message)?;
+            verify_header::<V, H>(
+                ctx,
+                &header,
+                client_id,
+                client_state.chain_id(),
+                &client_state.as_light_client_options()?,
+                verifier,
+            )
+        }
+        TENDERMINT_MISBEHAVIOUR_TYPE_URL => {
+            let misbehaviour = TmMisbehaviour::try_from(client_message)?;
+            verify_misbehaviour::<V, H>(
+                ctx,
+                &misbehaviour,
+                client_id,
+                client_state.chain_id(),
+                &client_state.as_light_client_options()?,
+                verifier,
+            )
+        }
+        _ => Err(ClientError::InvalidUpdateClientMessage),
+    }
+}
+
+/// Check for misbehaviour on the client state as part of the client state
+/// validation process.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateValidation`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+///
+/// This method covers the following cases:
+///
+/// 1 - fork:
+/// Assumes at least one consensus state before the fork point exists. Let
+/// existing consensus states on chain B be: [Sn,.., Sf, Sf-1, S0] with
+/// `Sf-1` being the most recent state before the fork. Chain A is queried for
+/// a header `Hf'` at `Sf.height` and if it is different from the `Hf` in the
+/// event for the client update (the one that has generated `Sf` on chain),
+/// then the two headers are included in the evidence and submitted. Note
+/// that in this case the headers are different but have the same height.
+///
+/// 2 - BFT time violation for unavailable header (a.k.a. Future Lunatic
+/// Attack or FLA):
+/// Some header with a height that is higher than the latest height on A has
+/// been accepted and a consensus state was created on B. Note that this
+/// implies that the timestamp of this header must be within the
+/// `clock_drift` of the client. Assume the client on B has been updated
+/// with `h2`(not present on/ produced by chain A) and it has a timestamp of
+/// `t2` that is at most `clock_drift` in the future. Then the latest header
+/// from A is fetched, let it be `h1`, with a timestamp of `t1`. If `t1 >=
+/// t2` then evidence of misbehavior is submitted to A.
+///
+/// 3 - BFT time violation for existing headers:
+/// Ensure that consensus state times are monotonically increasing with
+/// height.
+pub fn check_for_misbehaviour<V>(
+    client_state: &ClientStateType,
+    ctx: &V,
+    client_id: &ClientId,
+    client_message: Any,
+) -> Result<bool, ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    match client_message.type_url.as_str() {
+        TENDERMINT_HEADER_TYPE_URL => {
+            let header = TmHeader::try_from(client_message)?;
+            check_for_misbehaviour_on_update(ctx, header, client_id, &client_state.latest_height)
+        }
+        TENDERMINT_MISBEHAVIOUR_TYPE_URL => {
+            let misbehaviour = TmMisbehaviour::try_from(client_message)?;
+            check_for_misbehaviour_on_misbehavior(misbehaviour.header1(), misbehaviour.header2())
+        }
+        _ => Err(ClientError::InvalidUpdateClientMessage),
+    }
+}
+
+/// Query the status of the client state.
+///
+/// Note that this function is typically implemented as part of the
+/// [`ClientStateValidation`] trait, but has been made a standalone function
+/// in order to make the ClientState APIs more flexible.
+pub fn status<V>(
+    client_state: &ClientStateType,
+    ctx: &V,
+    client_id: &ClientId,
+) -> Result<Status, ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+    <ConsensusStateType as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    if client_state.is_frozen() {
+        return Ok(Status::Frozen);
+    }
+
+    let latest_consensus_state: ConsensusStateType = {
+        match ctx.consensus_state(&ClientConsensusStatePath::new(
+            client_id.clone(),
+            client_state.latest_height.revision_number(),
+            client_state.latest_height.revision_height(),
+        )) {
+            Ok(cs) => cs.try_into().map_err(Into::into)?,
+            // if the client state does not have an associated consensus state for its latest height
+            // then it must be expired
+            Err(_) => return Ok(Status::Expired),
+        }
+    };
+
+    // Note: if the `duration_since()` is `None`, indicating that the latest
+    // consensus state is in the future, then we don't consider the client
+    // to be expired.
+    let now = ctx.host_timestamp()?;
+
+    if let Some(elapsed_since_latest_consensus_state) =
+        now.duration_since(&latest_consensus_state.timestamp().into())
+    {
+        if elapsed_since_latest_consensus_state > client_state.trusting_period {
+            return Ok(Status::Expired);
+        }
+    }
+
+    Ok(Status::Active)
+}
+
+/// Check that the subject and substitute client states match as part of
+/// the client recovery validation step.
+///
+/// The subject and substitute client states match if all their respective
+/// client state parameters match except for frozen height, latest height,
+/// trusting period, and chain ID.
+pub fn check_substitute<V>(
+    subject_client_state: &ClientStateType,
+    substitute_client_state: Any,
+) -> Result<(), ClientError>
+where
+    V: ExtClientValidationContext,
+    ConsensusStateType: Convertible<V::ConsensusStateRef>,
+{
+    let ClientStateType {
+        latest_height: _,
+        frozen_height: _,
+        trusting_period: _,
+        chain_id: _,
+        allow_update: _,
+        trust_level: subject_trust_level,
+        unbonding_period: subject_unbonding_period,
+        max_clock_drift: subject_max_clock_drift,
+        proof_specs: subject_proof_specs,
+        upgrade_path: subject_upgrade_path,
+    } = subject_client_state;
+
+    let substitute_client_state = ClientStateType::try_from(substitute_client_state)?;
+
+    let ClientStateType {
+        latest_height: _,
+        frozen_height: _,
+        trusting_period: _,
+        chain_id: _,
+        allow_update: _,
+        trust_level: substitute_trust_level,
+        unbonding_period: substitute_unbonding_period,
+        max_clock_drift: substitute_max_clock_drift,
+        proof_specs: substitute_proof_specs,
+        upgrade_path: substitute_upgrade_path,
+    } = substitute_client_state;
+
+    (subject_trust_level == &substitute_trust_level
+        && subject_unbonding_period == &substitute_unbonding_period
+        && subject_max_clock_drift == &substitute_max_clock_drift
+        && subject_proof_specs == &substitute_proof_specs
+        && subject_upgrade_path == &substitute_upgrade_path)
+        .then_some(())
+        .ok_or(ClientError::ClientRecoveryStateMismatch)
+}
diff --git a/ibc-clients/ics07-tendermint/src/consensus_state.rs b/ibc-clients/ics07-tendermint/src/consensus_state.rs
new file mode 100644
index 000000000..e87778f37
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/consensus_state.rs
@@ -0,0 +1,98 @@
+//! This module includes trait implementations for the
+//! `ibc_client_tendermint_types::ConsensusState` type. It implements the
+//! `ConsensusStateTrait` for `ConsensusState` by defining a newtype wrapper in
+//! order to circumvent Rust's orphan rule, which disallows foreign traits from
+//! being implemented on foreign types. This module also includes some trait
+//! implementations that serve to pass through traits implemented on the wrapped
+//! `ConsensusState` type.
+
+use ibc_client_tendermint_types::error::Error;
+use ibc_client_tendermint_types::proto::v1::ConsensusState as RawTmConsensusState;
+use ibc_client_tendermint_types::ConsensusState as ConsensusStateType;
+use ibc_core_client::context::consensus_state::ConsensusState as ConsensusStateTrait;
+use ibc_core_client::types::error::ClientError;
+use ibc_core_commitment_types::commitment::CommitmentRoot;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::{Any, Protobuf};
+use ibc_primitives::Timestamp;
+use tendermint::{Hash, Time};
+
+/// Newtype wrapper around the `ConsensusState` type imported from the
+/// `ibc-client-tendermint-types` crate. This wrapper exists so that we can
+/// bypass Rust's orphan rules and implement traits from
+/// `ibc::core::client::context` on the `ConsensusState` type.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
+pub struct ConsensusState(ConsensusStateType);
+
+impl ConsensusState {
+    pub fn inner(&self) -> &ConsensusStateType {
+        &self.0
+    }
+
+    pub fn into_inner(self) -> ConsensusStateType {
+        self.0
+    }
+
+    pub fn timestamp(&self) -> Time {
+        self.0.timestamp
+    }
+
+    pub fn next_validators_hash(&self) -> Hash {
+        self.0.next_validators_hash
+    }
+}
+
+impl From<ConsensusState> for ConsensusStateType {
+    fn from(value: ConsensusState) -> Self {
+        value.0
+    }
+}
+
+impl Protobuf<RawTmConsensusState> for ConsensusState {}
+
+impl TryFrom<RawTmConsensusState> for ConsensusState {
+    type Error = Error;
+
+    fn try_from(raw: RawTmConsensusState) -> Result<Self, Self::Error> {
+        Ok(Self(ConsensusStateType::try_from(raw)?))
+    }
+}
+
+impl From<ConsensusState> for RawTmConsensusState {
+    fn from(consensus_state: ConsensusState) -> Self {
+        consensus_state.0.into()
+    }
+}
+
+impl Protobuf<Any> for ConsensusState {}
+
+impl TryFrom<Any> for ConsensusState {
+    type Error = ClientError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        Ok(Self(ConsensusStateType::try_from(raw)?))
+    }
+}
+
+impl From<ConsensusState> for Any {
+    fn from(client_state: ConsensusState) -> Self {
+        client_state.0.into()
+    }
+}
+
+impl From<tendermint::block::Header> for ConsensusState {
+    fn from(header: tendermint::block::Header) -> Self {
+        Self(ConsensusStateType::from(header))
+    }
+}
+
+impl ConsensusStateTrait for ConsensusState {
+    fn root(&self) -> &CommitmentRoot {
+        &self.0.root
+    }
+
+    fn timestamp(&self) -> Timestamp {
+        self.0.timestamp.into()
+    }
+}
diff --git a/ibc-clients/ics07-tendermint/src/lib.rs b/ibc-clients/ics07-tendermint/src/lib.rs
new file mode 100644
index 000000000..594aa0011
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/src/lib.rs
@@ -0,0 +1,29 @@
+//! ICS 07: Tendermint light client implementation along with re-exporting the
+//! necessary types from `ibc-client-tendermint-types` crate.
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+pub mod client_state;
+pub mod consensus_state;
+
+pub const TENDERMINT_CLIENT_TYPE: &str = "07-tendermint";
+
+/// Re-exports Tendermint light client data structures from the
+/// `ibc-client-tendermint-type` crate.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_client_tendermint_types::*;
+}
diff --git a/ibc-clients/ics07-tendermint/types/Cargo.toml b/ibc-clients/ics07-tendermint/types/Cargo.toml
new file mode 100644
index 000000000..d52a1f260
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/types/Cargo.toml
@@ -0,0 +1,93 @@
+[package]
+name         = "ibc-client-tendermint-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "tendermint", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-07 Tendermint Client data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh      = { workspace = true, optional = true }
+displaydoc = { workspace = true }
+serde      = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-core-client-types     = { workspace = true }
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host-types       = { workspace = true }
+ibc-primitives            = { workspace = true }
+ibc-proto                 = { workspace = true }
+
+# cosmos dependencies
+tendermint                       = { workspace = true }
+tendermint-light-client-verifier = { workspace = true, features = [ "rust-crypto" ] }
+tendermint-proto                 = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[dev-dependencies]
+serde_json     = { workspace = true }
+tendermint-rpc = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "serde/std",
+  "serde_json/std",
+  "ibc-core-client-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-core-client-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "ibc-core-client-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core-client-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core-client-types/parity-scale-codec",
+  "ibc-core-commitment-types/parity-scale-codec",
+  "ibc-core-host-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-clients/ics07-tendermint/types/src/client_state.rs b/ibc-clients/ics07-tendermint/types/src/client_state.rs
new file mode 100644
index 000000000..bcd42a525
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/types/src/client_state.rs
@@ -0,0 +1,542 @@
+//! Contains the implementation of the Tendermint `ClientState` domain type.
+
+use core::cmp::max;
+use core::str::FromStr;
+use core::time::Duration;
+
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::proto::v1::Height as RawHeight;
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::specs::ProofSpecs;
+use ibc_core_host_types::identifiers::ChainId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::ZERO_DURATION;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::lightclients::tendermint::v1::ClientState as RawTmClientState;
+use ibc_proto::Protobuf;
+use tendermint::chain::id::MAX_LENGTH as MaxChainIdLen;
+use tendermint::trust_threshold::TrustThresholdFraction as TendermintTrustThresholdFraction;
+use tendermint_light_client_verifier::options::Options;
+
+use crate::error::Error;
+use crate::header::Header as TmHeader;
+use crate::trust_threshold::TrustThreshold;
+
+pub const TENDERMINT_CLIENT_STATE_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.ClientState";
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct AllowUpdate {
+    pub after_expiry: bool,
+    pub after_misbehaviour: bool,
+}
+
+/// Defines data structure for Tendermint client state.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+pub struct ClientState {
+    pub chain_id: ChainId,
+    pub trust_level: TrustThreshold,
+    pub trusting_period: Duration,
+    pub unbonding_period: Duration,
+    pub max_clock_drift: Duration,
+    pub latest_height: Height,
+    pub proof_specs: ProofSpecs,
+    pub upgrade_path: Vec<String>,
+    pub allow_update: AllowUpdate,
+    pub frozen_height: Option<Height>,
+}
+
+impl ClientState {
+    #[allow(clippy::too_many_arguments)]
+    fn new_without_validation(
+        chain_id: ChainId,
+        trust_level: TrustThreshold,
+        trusting_period: Duration,
+        unbonding_period: Duration,
+        max_clock_drift: Duration,
+        latest_height: Height,
+        proof_specs: ProofSpecs,
+        upgrade_path: Vec<String>,
+        frozen_height: Option<Height>,
+        allow_update: AllowUpdate,
+    ) -> Self {
+        Self {
+            chain_id,
+            trust_level,
+            trusting_period,
+            unbonding_period,
+            max_clock_drift,
+            latest_height,
+            proof_specs,
+            upgrade_path,
+            allow_update,
+            frozen_height,
+        }
+    }
+
+    /// Constructs a new Tendermint `ClientState` by given parameters and checks
+    /// if the parameters are valid.
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        chain_id: ChainId,
+        trust_level: TrustThreshold,
+        trusting_period: Duration,
+        unbonding_period: Duration,
+        max_clock_drift: Duration,
+        latest_height: Height,
+        proof_specs: ProofSpecs,
+        upgrade_path: Vec<String>,
+        allow_update: AllowUpdate,
+    ) -> Result<Self, Error> {
+        let client_state = Self::new_without_validation(
+            chain_id,
+            trust_level,
+            trusting_period,
+            unbonding_period,
+            max_clock_drift,
+            latest_height,
+            proof_specs,
+            upgrade_path,
+            None, // New valid client must not be frozen.
+            allow_update,
+        );
+        client_state.validate()?;
+        Ok(client_state)
+    }
+
+    pub fn with_header(self, header: TmHeader) -> Result<Self, Error> {
+        Ok(Self {
+            latest_height: max(header.height(), self.latest_height),
+            ..self
+        })
+    }
+
+    pub fn with_frozen_height(self, h: Height) -> Self {
+        Self {
+            frozen_height: Some(h),
+            ..self
+        }
+    }
+
+    pub fn validate(&self) -> Result<(), Error> {
+        self.chain_id.validate_length(3, MaxChainIdLen as u64)?;
+
+        // `TrustThreshold` is guaranteed to be in the range `[0, 1)`, but a `TrustThreshold::ZERO`
+        // value is invalid in this context
+        if self.trust_level == TrustThreshold::ZERO {
+            return Err(Error::InvalidTrustThreshold {
+                reason: "ClientState trust-level cannot be zero".to_string(),
+            });
+        }
+
+        TendermintTrustThresholdFraction::new(
+            self.trust_level.numerator(),
+            self.trust_level.denominator(),
+        )
+        .map_err(Error::InvalidTendermintTrustThreshold)?;
+
+        // Basic validation of trusting period and unbonding period: each should be non-zero.
+        if self.trusting_period <= Duration::new(0, 0) {
+            return Err(Error::InvalidTrustThreshold {
+                reason: format!(
+                    "ClientState trusting period ({:?}) must be greater than zero",
+                    self.trusting_period
+                ),
+            });
+        }
+
+        if self.unbonding_period <= Duration::new(0, 0) {
+            return Err(Error::InvalidTrustThreshold {
+                reason: format!(
+                    "ClientState unbonding period ({:?}) must be greater than zero",
+                    self.unbonding_period
+                ),
+            });
+        }
+
+        if self.trusting_period >= self.unbonding_period {
+            return Err(Error::InvalidTrustThreshold {
+                reason: format!(
+                "ClientState trusting period ({:?}) must be smaller than unbonding period ({:?})", self.trusting_period, self.unbonding_period
+            ),
+            });
+        }
+
+        if self.max_clock_drift <= Duration::new(0, 0) {
+            return Err(Error::InvalidMaxClockDrift {
+                reason: "ClientState max-clock-drift must be greater than zero".to_string(),
+            });
+        }
+
+        if self.latest_height.revision_number() != self.chain_id.revision_number() {
+            return Err(Error::InvalidLatestHeight {
+                reason: "ClientState latest-height revision number must match chain-id version"
+                    .to_string(),
+            });
+        }
+
+        // Sanity checks on client proof specs
+        self.proof_specs.validate()?;
+
+        // `upgrade_path` itself may be empty, but if not then each key must be non-empty
+        for (idx, key) in self.upgrade_path.iter().enumerate() {
+            if key.trim().is_empty() {
+                return Err(Error::Validation {
+                    reason: format!(
+                        "ClientState upgrade-path key at index {idx:?} cannot be empty"
+                    ),
+                });
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Get the refresh time to ensure the state does not expire
+    pub fn refresh_time(&self) -> Option<Duration> {
+        Some(2 * self.trusting_period / 3)
+    }
+
+    /// Helper method to produce a [`Options`] struct for use in
+    /// Tendermint-specific light client verification.
+    pub fn as_light_client_options(&self) -> Result<Options, Error> {
+        Ok(Options {
+            trust_threshold: self.trust_level.try_into().map_err(|e: ClientError| {
+                Error::InvalidTrustThreshold {
+                    reason: e.to_string(),
+                }
+            })?,
+            trusting_period: self.trusting_period,
+            clock_drift: self.max_clock_drift,
+        })
+    }
+
+    pub fn chain_id(&self) -> &ChainId {
+        &self.chain_id
+    }
+
+    pub fn is_frozen(&self) -> bool {
+        self.frozen_height.is_some()
+    }
+
+    // Resets custom fields to zero values (used in `update_client`)
+    pub fn zero_custom_fields(&mut self) {
+        self.trusting_period = ZERO_DURATION;
+        self.trust_level = TrustThreshold::ZERO;
+        self.allow_update.after_expiry = false;
+        self.allow_update.after_misbehaviour = false;
+        self.frozen_height = None;
+        self.max_clock_drift = ZERO_DURATION;
+    }
+}
+
+impl Protobuf<RawTmClientState> for ClientState {}
+
+impl TryFrom<RawTmClientState> for ClientState {
+    type Error = Error;
+
+    fn try_from(raw: RawTmClientState) -> Result<Self, Self::Error> {
+        let chain_id = ChainId::from_str(raw.chain_id.as_str())?;
+
+        let trust_level = {
+            let trust_level = raw
+                .trust_level
+                .clone()
+                .ok_or(Error::MissingTrustingPeriod)?;
+            trust_level
+                .try_into()
+                .map_err(|e| Error::InvalidTrustThreshold {
+                    reason: format!("{e}"),
+                })?
+        };
+
+        let trusting_period = raw
+            .trusting_period
+            .ok_or(Error::MissingTrustingPeriod)?
+            .try_into()
+            .map_err(|_| Error::MissingTrustingPeriod)?;
+
+        let unbonding_period = raw
+            .unbonding_period
+            .ok_or(Error::MissingUnbondingPeriod)?
+            .try_into()
+            .map_err(|_| Error::MissingUnbondingPeriod)?;
+
+        let max_clock_drift = raw
+            .max_clock_drift
+            .ok_or(Error::NegativeMaxClockDrift)?
+            .try_into()
+            .map_err(|_| Error::NegativeMaxClockDrift)?;
+
+        let latest_height = raw
+            .latest_height
+            .ok_or(Error::MissingLatestHeight)?
+            .try_into()
+            .map_err(|_| Error::MissingLatestHeight)?;
+
+        // NOTE: In `RawClientState`, a `frozen_height` of `0` means "not
+        // frozen". See:
+        // https://github.com/cosmos/ibc-go/blob/8422d0c4c35ef970539466c5bdec1cd27369bab3/modules/light-clients/07-tendermint/types/client_state.go#L74
+        let frozen_height =
+            Height::try_from(raw.frozen_height.ok_or(Error::MissingFrozenHeight)?).ok();
+
+        // We use set this deprecated field just so that we can properly convert
+        // it back in its raw form
+        #[allow(deprecated)]
+        let allow_update = AllowUpdate {
+            after_expiry: raw.allow_update_after_expiry,
+            after_misbehaviour: raw.allow_update_after_misbehaviour,
+        };
+
+        let client_state = Self::new_without_validation(
+            chain_id,
+            trust_level,
+            trusting_period,
+            unbonding_period,
+            max_clock_drift,
+            latest_height,
+            raw.proof_specs.try_into()?,
+            raw.upgrade_path,
+            frozen_height,
+            allow_update,
+        );
+
+        Ok(client_state)
+    }
+}
+
+impl From<ClientState> for RawTmClientState {
+    fn from(value: ClientState) -> Self {
+        #[allow(deprecated)]
+        Self {
+            chain_id: value.chain_id.to_string(),
+            trust_level: Some(value.trust_level.into()),
+            trusting_period: Some(value.trusting_period.into()),
+            unbonding_period: Some(value.unbonding_period.into()),
+            max_clock_drift: Some(value.max_clock_drift.into()),
+            // NOTE: The protobuf encoded `frozen_height` of an active client
+            // must be set to `0` so that `ibc-go` driven chains can properly
+            // decode the `ClientState` value. In `RawClientState`, a
+            // `frozen_height` of `0` means "not frozen". See:
+            // https://github.com/cosmos/ibc-go/blob/8422d0c4c35ef970539466c5bdec1cd27369bab3/modules/light-clients/07-tendermint/types/client_state.go#L74
+            frozen_height: Some(value.frozen_height.map(Into::into).unwrap_or(RawHeight {
+                revision_number: 0,
+                revision_height: 0,
+            })),
+            latest_height: Some(value.latest_height.into()),
+            proof_specs: value.proof_specs.into(),
+            upgrade_path: value.upgrade_path,
+            allow_update_after_expiry: value.allow_update.after_expiry,
+            allow_update_after_misbehaviour: value.allow_update.after_misbehaviour,
+        }
+    }
+}
+
+impl Protobuf<Any> for ClientState {}
+
+impl TryFrom<Any> for ClientState {
+    type Error = ClientError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        fn decode_client_state(value: &[u8]) -> Result<ClientState, ClientError> {
+            let client_state =
+                Protobuf::<RawTmClientState>::decode(value).map_err(|e| ClientError::Other {
+                    description: e.to_string(),
+                })?;
+            Ok(client_state)
+        }
+
+        match raw.type_url.as_str() {
+            TENDERMINT_CLIENT_STATE_TYPE_URL => decode_client_state(&raw.value),
+            _ => Err(ClientError::UnknownClientStateType {
+                client_state_type: raw.type_url,
+            }),
+        }
+    }
+}
+
+impl From<ClientState> for Any {
+    fn from(client_state: ClientState) -> Self {
+        Any {
+            type_url: TENDERMINT_CLIENT_STATE_TYPE_URL.to_string(),
+            value: Protobuf::<RawTmClientState>::encode_vec(client_state),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[derive(Clone, Debug, PartialEq)]
+    pub struct ClientStateParams {
+        pub id: ChainId,
+        pub trust_level: TrustThreshold,
+        pub trusting_period: Duration,
+        pub unbonding_period: Duration,
+        pub max_clock_drift: Duration,
+        pub latest_height: Height,
+        pub proof_specs: ProofSpecs,
+        pub upgrade_path: Vec<String>,
+        pub allow_update: AllowUpdate,
+    }
+
+    #[test]
+    fn client_state_new() {
+        // Define a "default" set of parameters to reuse throughout these tests.
+        let default_params: ClientStateParams = ClientStateParams {
+            id: ChainId::new("ibc-0").unwrap(),
+            trust_level: TrustThreshold::ONE_THIRD,
+            trusting_period: Duration::new(64000, 0),
+            unbonding_period: Duration::new(128_000, 0),
+            max_clock_drift: Duration::new(3, 0),
+            latest_height: Height::new(0, 10).expect("Never fails"),
+            proof_specs: ProofSpecs::cosmos(),
+            upgrade_path: Vec::new(),
+            allow_update: AllowUpdate {
+                after_expiry: false,
+                after_misbehaviour: false,
+            },
+        };
+
+        struct Test {
+            name: String,
+            params: ClientStateParams,
+            want_pass: bool,
+        }
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Valid parameters".to_string(),
+                params: default_params.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Valid (empty) upgrade-path".to_string(),
+                params: ClientStateParams {
+                    upgrade_path: vec![],
+                    ..default_params.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Valid upgrade-path".to_string(),
+                params: ClientStateParams {
+                    upgrade_path: vec!["upgrade".to_owned(), "upgradedIBCState".to_owned()],
+                    ..default_params.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Valid long (50 chars) chain-id that satisfies revision_number length < `u64::MAX` length".to_string(),
+                params: ClientStateParams {
+                    id: ChainId::new(&format!("{}-{}", "a".repeat(29), 0)).unwrap(),
+                    ..default_params.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Invalid too-long (51 chars) chain-id".to_string(),
+                params: ClientStateParams {
+                    id: ChainId::new(&format!("{}-{}", "a".repeat(30), 0)).unwrap(),
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid (zero) max-clock-drift period".to_string(),
+                params: ClientStateParams {
+                    max_clock_drift: ZERO_DURATION,
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid unbonding period".to_string(),
+                params: ClientStateParams {
+                    unbonding_period: ZERO_DURATION,
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid (too small) trusting period".to_string(),
+                params: ClientStateParams {
+                    trusting_period: ZERO_DURATION,
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid (too large) trusting period w.r.t. unbonding period".to_string(),
+                params: ClientStateParams {
+                    trusting_period: Duration::new(11, 0),
+                    unbonding_period: Duration::new(10, 0),
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid (equal) trusting period w.r.t. unbonding period".to_string(),
+                params: ClientStateParams {
+                    trusting_period: Duration::new(10, 0),
+                    unbonding_period: Duration::new(10, 0),
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid (zero) trusting trust threshold".to_string(),
+                params: ClientStateParams {
+                    trust_level: TrustThreshold::ZERO,
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid (too small) trusting trust threshold".to_string(),
+                params: ClientStateParams {
+                    trust_level: TrustThreshold::new(1, 4).expect("Never fails"),
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Invalid latest height revision number (doesn't match chain)".to_string(),
+                params: ClientStateParams {
+                    latest_height: Height::new(1, 1).expect("Never fails"),
+                    ..default_params.clone()
+                },
+                want_pass: false,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let p = test.params.clone();
+
+            let cs_result: Result<ClientState, Error> = ClientState::new(
+                p.id,
+                p.trust_level,
+                p.trusting_period,
+                p.unbonding_period,
+                p.max_clock_drift,
+                p.latest_height,
+                p.proof_specs,
+                p.upgrade_path,
+                p.allow_update,
+            );
+
+            assert_eq!(
+                test.want_pass,
+                cs_result.is_ok(),
+                "ClientState::new() failed for test {}, \nmsg{:?} with error {:?}",
+                test.name,
+                test.params.clone(),
+                cs_result.err(),
+            );
+        }
+    }
+}
diff --git a/crates/ibc/src/clients/ics07_tendermint/consensus_state.rs b/ibc-clients/ics07-tendermint/types/src/consensus_state.rs
similarity index 67%
rename from crates/ibc/src/clients/ics07_tendermint/consensus_state.rs
rename to ibc-clients/ics07-tendermint/types/src/consensus_state.rs
index b5b7f476e..bc4e675c8 100644
--- a/crates/ibc/src/clients/ics07_tendermint/consensus_state.rs
+++ b/ibc-clients/ics07-tendermint/types/src/consensus_state.rs
@@ -1,19 +1,18 @@
 //! Defines Tendermint's `ConsensusState` type
 
-use crate::prelude::*;
-
+use ibc_core_client_types::error::ClientError;
+use ibc_core_commitment_types::commitment::CommitmentRoot;
+use ibc_primitives::prelude::*;
 use ibc_proto::google::protobuf::Any;
 use ibc_proto::ibc::lightclients::tendermint::v1::ConsensusState as RawConsensusState;
-use ibc_proto::protobuf::Protobuf;
-use tendermint::{hash::Algorithm, time::Time, Hash};
+use ibc_proto::Protobuf;
+use tendermint::hash::Algorithm;
+use tendermint::time::Time;
+use tendermint::Hash;
 use tendermint_proto::google::protobuf as tpb;
 
-use crate::clients::ics07_tendermint::error::Error;
-use crate::clients::ics07_tendermint::header::Header;
-use crate::core::ics02_client::consensus_state::ConsensusState as ConsensusStateTrait;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics23_commitment::commitment::CommitmentRoot;
-use crate::core::timestamp::Timestamp;
+use crate::error::Error;
+use crate::header::Header;
 
 pub const TENDERMINT_CONSENSUS_STATE_TYPE_URL: &str =
     "/ibc.lightclients.tendermint.v1.ConsensusState";
@@ -35,6 +34,14 @@ impl ConsensusState {
             next_validators_hash,
         }
     }
+
+    pub fn timestamp(&self) -> Time {
+        self.timestamp
+    }
+
+    pub fn root(&self) -> CommitmentRoot {
+        self.root.clone()
+    }
 }
 
 impl Protobuf<RawConsensusState> for ConsensusState {}
@@ -99,20 +106,16 @@ impl TryFrom<Any> for ConsensusState {
     type Error = ClientError;
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        use bytes::Buf;
-        use core::ops::Deref;
-        use prost::Message;
-
-        fn decode_consensus_state<B: Buf>(buf: B) -> Result<ConsensusState, Error> {
-            RawConsensusState::decode(buf)
-                .map_err(Error::Decode)?
-                .try_into()
+        fn decode_consensus_state(value: &[u8]) -> Result<ConsensusState, ClientError> {
+            let client_state =
+                Protobuf::<RawConsensusState>::decode(value).map_err(|e| ClientError::Other {
+                    description: e.to_string(),
+                })?;
+            Ok(client_state)
         }
 
         match raw.type_url.as_str() {
-            TENDERMINT_CONSENSUS_STATE_TYPE_URL => {
-                decode_consensus_state(raw.value.deref()).map_err(Into::into)
-            }
+            TENDERMINT_CONSENSUS_STATE_TYPE_URL => decode_consensus_state(&raw.value),
             _ => Err(ClientError::UnknownConsensusStateType {
                 consensus_state_type: raw.type_url,
             }),
@@ -124,7 +127,7 @@ impl From<ConsensusState> for Any {
     fn from(consensus_state: ConsensusState) -> Self {
         Any {
             type_url: TENDERMINT_CONSENSUS_STATE_TYPE_URL.to_string(),
-            value: Protobuf::<RawConsensusState>::encode_vec(&consensus_state),
+            value: Protobuf::<RawConsensusState>::encode_vec(consensus_state),
         }
     }
 }
@@ -144,40 +147,3 @@ impl From<Header> for ConsensusState {
         Self::from(header.signed_header.header)
     }
 }
-
-impl ConsensusStateTrait for ConsensusState {
-    fn root(&self) -> &CommitmentRoot {
-        &self.root
-    }
-
-    fn timestamp(&self) -> Timestamp {
-        self.timestamp.into()
-    }
-
-    fn encode_vec(&self) -> Vec<u8> {
-        <Self as Protobuf<Any>>::encode_vec(self)
-    }
-}
-
-#[cfg(test)]
-#[cfg(feature = "serde")]
-mod tests {
-    use tendermint_rpc::endpoint::abci_query::AbciQuery;
-    use test_log::test;
-
-    use crate::test::test_serialization_roundtrip;
-
-    #[test]
-    fn serialization_roundtrip_no_proof() {
-        let json_data =
-            include_str!("../../../tests/support/query/serialization/consensus_state.json");
-        test_serialization_roundtrip::<AbciQuery>(json_data);
-    }
-
-    #[test]
-    fn serialization_roundtrip_with_proof() {
-        let json_data =
-            include_str!("../../../tests/support/query/serialization/consensus_state_proof.json");
-        test_serialization_roundtrip::<AbciQuery>(json_data);
-    }
-}
diff --git a/crates/ibc/src/clients/ics07_tendermint/error.rs b/ibc-clients/ics07-tendermint/types/src/error.rs
similarity index 72%
rename from crates/ibc/src/clients/ics07_tendermint/error.rs
rename to ibc-clients/ics07-tendermint/types/src/error.rs
index a3a9b5b18..c4e25e094 100644
--- a/crates/ibc/src/clients/ics07_tendermint/error.rs
+++ b/ibc-clients/ics07-tendermint/types/src/error.rs
@@ -1,14 +1,14 @@
 //! Defines the Tendermint light client's error type
 
-use crate::prelude::*;
-
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::{ChainId, ClientId};
-use crate::Height;
-
 use core::time::Duration;
 
 use displaydoc::Display;
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::error::CommitmentError;
+use ibc_core_host_types::error::IdentifierError;
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
 use tendermint::{Error as TendermintError, Hash};
 use tendermint_light_client_verifier::errors::VerificationErrorDetail as LightClientErrorDetail;
 use tendermint_light_client_verifier::operations::VotingPowerTally;
@@ -17,12 +17,8 @@ use tendermint_light_client_verifier::Verdict;
 /// The main error type
 #[derive(Debug, Display)]
 pub enum Error {
-    /// chain-id is (`{chain_id}`) is too long, got: `{len}`, max allowed: `{max_len}`
-    ChainIdTooLong {
-        chain_id: ChainId,
-        len: usize,
-        max_len: usize,
-    },
+    /// invalid identifier: `{0}`
+    InvalidIdentifier(IdentifierError),
     /// invalid header, failed basic validation: `{reason}`, error: `{error}`
     InvalidHeader {
         reason: String,
@@ -40,6 +36,8 @@ pub enum Error {
     MissingSignedHeader,
     /// invalid header, failed basic validation: `{reason}`
     Validation { reason: String },
+    /// invalid client proof specs: `{0}`
+    InvalidProofSpec(CommitmentError),
     /// invalid raw client state: `{reason}`
     InvalidRawClientState { reason: String },
     /// missing validator set
@@ -54,22 +52,20 @@ pub enum Error {
     MissingUnbondingPeriod,
     /// negative max clock drift
     NegativeMaxClockDrift,
-    /// missing latest height
+    /// missing the latest height
     MissingLatestHeight,
     /// invalid raw header error: `{0}`
     InvalidRawHeader(TendermintError),
     /// invalid raw misbehaviour: `{reason}`
     InvalidRawMisbehaviour { reason: String },
-    /// decode error: `{0}`
-    Decode(prost::DecodeError),
     /// given other previous updates, header timestamp should be at most `{max}`, but was `{actual}`
     HeaderTimestampTooHigh { actual: String, max: String },
     /// given other previous updates, header timestamp should be at least `{min}`, but was `{actual}`
     HeaderTimestampTooLow { actual: String, min: String },
     /// header revision height = `{height}` is invalid
     InvalidHeaderHeight { height: u64 },
-    /// Disallowed to create a new client with a frozen height
-    FrozenHeightNotAllowed,
+    /// frozen height is missing
+    MissingFrozenHeight,
     /// the header's trusted revision number (`{trusted_revision}`) and the update's revision number (`{header_revision}`) should be the same
     MismatchHeightRevisions {
         trusted_revision: u64,
@@ -80,12 +76,10 @@ pub enum Error {
     /// not enough trust because insufficient validators overlap: `{reason}`
     NotEnoughTrustedValsSigned { reason: VotingPowerTally },
     /// verification failed: `{detail}`
-    VerificationError { detail: LightClientErrorDetail },
-    /// Processed time for the client `{client_id}` at height `{height}` not found
-    ProcessedTimeNotFound { client_id: ClientId, height: Height },
-    /// Processed height for the client `{client_id}` at height `{height}` not found
-    ProcessedHeightNotFound { client_id: ClientId, height: Height },
-    /// The given hash of the validators does not matches the given hash in the signed header. Expected: `{signed_header_validators_hash}`, got: `{validators_hash}`
+    VerificationError { detail: Box<LightClientErrorDetail> },
+    /// Processed time or height for the client `{client_id}` at height `{height}` not found
+    UpdateMetaDataNotFound { client_id: ClientId, height: Height },
+    /// The given hash of the validators does not match the given hash in the signed header. Expected: `{signed_header_validators_hash}`, got: `{validators_hash}`
     MismatchValidatorsHashes {
         validators_hash: Hash,
         signed_header_validators_hash: Hash,
@@ -97,20 +91,18 @@ pub enum Error {
     },
     /// headers block hashes are equal
     MisbehaviourHeadersBlockHashesEqual,
-    /// headers are not at same height and are monotonically increasing
+    /// headers are not at the same height and are monotonically increasing
     MisbehaviourHeadersNotAtSameHeight,
-    /// invalid raw client id: `{client_id}`
-    InvalidRawClientId { client_id: String },
 }
 
 #[cfg(feature = "std")]
 impl std::error::Error for Error {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
-            Self::InvalidHeader { error: e, .. } => Some(e),
-            Self::InvalidTendermintTrustThreshold(e) => Some(e),
-            Self::InvalidRawHeader(e) => Some(e),
-            Self::Decode(e) => Some(e),
+            Self::InvalidIdentifier(e) => Some(e),
+            Self::InvalidHeader { error: e, .. }
+            | Self::InvalidTendermintTrustThreshold(e)
+            | Self::InvalidRawHeader(e) => Some(e),
             _ => None,
         }
     }
@@ -124,7 +116,19 @@ impl From<Error> for ClientError {
     }
 }
 
-pub(crate) trait IntoResult<T, E> {
+impl From<IdentifierError> for Error {
+    fn from(e: IdentifierError) -> Self {
+        Self::InvalidIdentifier(e)
+    }
+}
+
+impl From<CommitmentError> for Error {
+    fn from(e: CommitmentError) -> Self {
+        Self::InvalidProofSpec(e)
+    }
+}
+
+pub trait IntoResult<T, E> {
     fn into_result(self) -> Result<T, E>;
 }
 
@@ -133,7 +137,9 @@ impl IntoResult<(), Error> for Verdict {
         match self {
             Verdict::Success => Ok(()),
             Verdict::NotEnoughTrust(reason) => Err(Error::NotEnoughTrustedValsSigned { reason }),
-            Verdict::Invalid(detail) => Err(Error::VerificationError { detail }),
+            Verdict::Invalid(detail) => Err(Error::VerificationError {
+                detail: Box::new(detail),
+            }),
         }
     }
 }
diff --git a/crates/ibc/src/clients/ics07_tendermint/header.rs b/ibc-clients/ics07-tendermint/types/src/header.rs
similarity index 60%
rename from crates/ibc/src/clients/ics07_tendermint/header.rs
rename to ibc-clients/ics07-tendermint/types/src/header.rs
index 8fd5c3e81..97b421ff3 100644
--- a/crates/ibc/src/clients/ics07_tendermint/header.rs
+++ b/ibc-clients/ics07-tendermint/types/src/header.rs
@@ -1,29 +1,28 @@
 //! Defines the domain type for tendermint headers
 
-use crate::prelude::*;
-use alloc::string::ToString;
 use core::fmt::{Display, Error as FmtError, Formatter};
+use core::str::FromStr;
 
-use bytes::Buf;
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::Height;
+use ibc_core_host_types::identifiers::ChainId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Timestamp;
 use ibc_proto::google::protobuf::Any;
 use ibc_proto::ibc::lightclients::tendermint::v1::Header as RawHeader;
-use ibc_proto::protobuf::Protobuf;
-use prost::Message;
+use ibc_proto::Protobuf;
+use pretty::{PrettySignedHeader, PrettyValidatorSet};
 use tendermint::block::signed_header::SignedHeader;
 use tendermint::chain::Id as TmChainId;
+use tendermint::crypto::Sha256;
+use tendermint::merkle::MerkleHash;
 use tendermint::validator::Set as ValidatorSet;
+use tendermint::{Hash, Time};
 use tendermint_light_client_verifier::types::{TrustedBlockState, UntrustedBlockState};
 
-use crate::clients::ics07_tendermint::consensus_state::ConsensusState as TmConsensusState;
-use crate::clients::ics07_tendermint::error::Error;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ChainId;
-use crate::core::timestamp::Timestamp;
-use crate::Height;
-
-use pretty::{PrettySignedHeader, PrettyValidatorSet};
+use crate::error::Error;
 
-pub(crate) const TENDERMINT_HEADER_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.Header";
+pub const TENDERMINT_HEADER_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.Header";
 
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 /// Tendermint consensus header
@@ -54,13 +53,15 @@ impl Header {
 
     pub fn height(&self) -> Height {
         Height::new(
-            ChainId::chain_version(self.signed_header.header.chain_id.as_str()),
+            ChainId::from_str(self.signed_header.header.chain_id.as_str())
+                .expect("chain id")
+                .revision_number(),
             u64::from(self.signed_header.header.height),
         )
         .expect("malformed tendermint header domain type has an illegal height of 0")
     }
 
-    pub(crate) fn as_untrusted_block_state(&self) -> UntrustedBlockState<'_> {
+    pub fn as_untrusted_block_state(&self) -> UntrustedBlockState<'_> {
         UntrustedBlockState {
             signed_header: &self.signed_header,
             validators: &self.validator_set,
@@ -68,14 +69,15 @@ impl Header {
         }
     }
 
-    pub(crate) fn as_trusted_block_state<'a>(
+    pub fn as_trusted_block_state<'a>(
         &'a self,
-        consensus_state: &TmConsensusState,
         chain_id: &'a TmChainId,
+        header_time: Time,
+        next_validators_hash: Hash,
     ) -> Result<TrustedBlockState<'a>, Error> {
         Ok(TrustedBlockState {
             chain_id,
-            header_time: consensus_state.timestamp,
+            header_time,
             height: self
                 .trusted_height
                 .revision_height()
@@ -84,12 +86,12 @@ impl Header {
                     height: self.trusted_height.revision_height(),
                 })?,
             next_validators: &self.trusted_next_validator_set,
-            next_validators_hash: consensus_state.next_validators_hash,
+            next_validators_hash,
         })
     }
 
     pub fn verify_chain_id_version_matches_height(&self, chain_id: &ChainId) -> Result<(), Error> {
-        if self.height().revision_number() != chain_id.version() {
+        if self.height().revision_number() != chain_id.revision_number() {
             return Err(Error::MismatchHeaderChainId {
                 given: self.signed_header.header.chain_id.to_string(),
                 expected: chain_id.to_string(),
@@ -98,8 +100,26 @@ impl Header {
         Ok(())
     }
 
+    /// `header.trusted_next_validator_set` was given to us by the relayer.
+    /// Thus, we need to ensure that the relayer gave us the right set, i.e. by
+    /// ensuring that it matches the hash we have stored on chain.
+    pub fn check_trusted_next_validator_set<H: MerkleHash + Sha256 + Default>(
+        &self,
+        trusted_next_validator_hash: &Hash,
+    ) -> Result<(), ClientError> {
+        if &self.trusted_next_validator_set.hash_with::<H>() == trusted_next_validator_hash {
+            Ok(())
+        } else {
+            Err(ClientError::HeaderVerificationFailure {
+                reason:
+                    "header trusted next validator set hash does not match hash stored on chain"
+                        .to_string(),
+            })
+        }
+    }
+
     /// Checks if the fields of a given header are consistent with the trusted fields of this header.
-    pub fn validate_basic(&self) -> Result<(), Error> {
+    pub fn validate_basic<H: MerkleHash + Sha256 + Default>(&self) -> Result<(), Error> {
         if self.height().revision_number() != self.trusted_height.revision_number() {
             return Err(Error::MismatchHeightRevisions {
                 trusted_revision: self.trusted_height.revision_number(),
@@ -117,20 +137,15 @@ impl Header {
             });
         }
 
-        if self.validator_set.hash() != self.signed_header.header.validators_hash {
+        let validators_hash = self.validator_set.hash_with::<H>();
+
+        if validators_hash != self.signed_header.header.validators_hash {
             return Err(Error::MismatchValidatorsHashes {
                 signed_header_validators_hash: self.signed_header.header.validators_hash,
-                validators_hash: self.validator_set.hash(),
+                validators_hash,
             });
         }
 
-        if self.trusted_next_validator_set.hash() != self.signed_header.header.next_validators_hash
-        {
-            return Err(Error::MismatchValidatorsHashes {
-                signed_header_validators_hash: self.signed_header.header.next_validators_hash,
-                validators_hash: self.trusted_next_validator_set.hash(),
-            });
-        }
         Ok(())
     }
 }
@@ -176,10 +191,14 @@ impl TryFrom<Any> for Header {
     type Error = ClientError;
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        use core::ops::Deref;
-
+        fn decode_header(value: &[u8]) -> Result<Header, ClientError> {
+            let header = Protobuf::<RawHeader>::decode(value).map_err(|e| ClientError::Other {
+                description: e.to_string(),
+            })?;
+            Ok(header)
+        }
         match raw.type_url.as_str() {
-            TENDERMINT_HEADER_TYPE_URL => decode_header(raw.value.deref()).map_err(Into::into),
+            TENDERMINT_HEADER_TYPE_URL => decode_header(&raw.value),
             _ => Err(ClientError::UnknownHeaderType {
                 header_type: raw.type_url,
             }),
@@ -191,15 +210,11 @@ impl From<Header> for Any {
     fn from(header: Header) -> Self {
         Any {
             type_url: TENDERMINT_HEADER_TYPE_URL.to_string(),
-            value: Protobuf::<RawHeader>::encode_vec(&header),
+            value: Protobuf::<RawHeader>::encode_vec(header),
         }
     }
 }
 
-fn decode_header<B: Buf>(buf: B) -> Result<Header, Error> {
-    RawHeader::decode(buf).map_err(Error::Decode)?.try_into()
-}
-
 impl From<Header> for RawHeader {
     fn from(value: Header) -> Self {
         RawHeader {
@@ -212,8 +227,9 @@ impl From<Header> for RawHeader {
 }
 
 mod pretty {
+    use ibc_primitives::utils::PrettySlice;
+
     pub use super::*;
-    use crate::utils::pretty::PrettySlice;
 
     pub struct PrettySignedHeader<'a>(pub &'a SignedHeader);
 
@@ -253,85 +269,3 @@ mod pretty {
         }
     }
 }
-
-#[cfg(any(test, feature = "mocks"))]
-pub mod test_util {
-    use alloc::vec;
-
-    use subtle_encoding::hex;
-    use tendermint::block::signed_header::SignedHeader;
-    use tendermint::validator::Info as ValidatorInfo;
-    use tendermint::validator::Set as ValidatorSet;
-    use tendermint::PublicKey;
-
-    use crate::clients::ics07_tendermint::header::Header;
-    use crate::mock::host::SyntheticTmBlock;
-    use crate::Height;
-
-    pub fn get_dummy_tendermint_header() -> tendermint::block::Header {
-        serde_json::from_str::<SignedHeader>(include_str!(
-            "../../../tests/support/signed_header.json"
-        ))
-        .expect("Never fails")
-        .header
-    }
-
-    // TODO: This should be replaced with a ::default() or ::produce().
-    // The implementation of this function comprises duplicate code (code borrowed from
-    // `tendermint-rs` for assembling a Header).
-    // See https://github.com/informalsystems/tendermint-rs/issues/381.
-    //
-    // The normal flow is:
-    // - get the (trusted) signed header and the `trusted_validator_set` at a `trusted_height`
-    // - get the `signed_header` and the `validator_set` at latest height
-    // - build the ics07 Header
-    // For testing purposes this function does:
-    // - get the `signed_header` from a .json file
-    // - create the `validator_set` with a single validator that is also the proposer
-    // - assume a `trusted_height` of 1 and no change in the validator set since height 1,
-    //   i.e. `trusted_validator_set` = `validator_set`
-    pub fn get_dummy_ics07_header() -> Header {
-        // Build a SignedHeader from a JSON file.
-        let shdr = serde_json::from_str::<SignedHeader>(include_str!(
-            "../../../tests/support/signed_header.json"
-        ))
-        .expect("Never fails");
-
-        // Build a set of validators.
-        // Below are test values inspired form `test_validator_set()` in tendermint-rs.
-        let v1: ValidatorInfo = ValidatorInfo::new(
-            PublicKey::from_raw_ed25519(
-                &hex::decode_upper(
-                    "F349539C7E5EF7C49549B09C4BFC2335318AB0FE51FBFAA2433B4F13E816F4A7",
-                )
-                .expect("Never fails"),
-            )
-            .expect("Never fails"),
-            281_815_u64.try_into().expect("Never fails"),
-        );
-
-        let vs = ValidatorSet::new(vec![v1.clone()], Some(v1));
-
-        Header {
-            signed_header: shdr,
-            validator_set: vs.clone(),
-            trusted_height: Height::min(0),
-            trusted_next_validator_set: vs,
-        }
-    }
-
-    impl From<SyntheticTmBlock> for Header {
-        fn from(light_block: SyntheticTmBlock) -> Self {
-            let SyntheticTmBlock {
-                trusted_height,
-                light_block,
-            } = light_block;
-            Self {
-                signed_header: light_block.signed_header,
-                validator_set: light_block.validators,
-                trusted_height,
-                trusted_next_validator_set: light_block.next_validators,
-            }
-        }
-    }
-}
diff --git a/ibc-clients/ics07-tendermint/types/src/lib.rs b/ibc-clients/ics07-tendermint/types/src/lib.rs
new file mode 100644
index 000000000..0e9903462
--- /dev/null
+++ b/ibc-clients/ics07-tendermint/types/src/lib.rs
@@ -0,0 +1,58 @@
+//! ICS-07: Tendermint Client implements a client verification algorithm for blockchains which use
+//! the Tendermint consensus algorithm.
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+use core::str::FromStr;
+
+use ibc_core_host_types::identifiers::ClientType;
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+mod client_state;
+mod consensus_state;
+mod header;
+mod misbehaviour;
+mod trust_threshold;
+
+pub use client_state::*;
+pub use consensus_state::*;
+pub use header::*;
+pub use misbehaviour::*;
+pub use trust_threshold::*;
+
+pub mod error;
+
+/// Re-exports ICS-07 Tendermint light client from `ibc-proto` crate.
+pub mod proto {
+    pub use ibc_proto::ibc::lightclients::tendermint::*;
+}
+
+pub const TENDERMINT_CLIENT_TYPE: &str = "07-tendermint";
+
+/// Returns the tendermint `ClientType`
+pub fn client_type() -> ClientType {
+    ClientType::from_str(TENDERMINT_CLIENT_TYPE).expect("Never fails because it's valid")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // Ensures that the validation in `ClientType::from_str` doesn't fail for the tendermint client type
+    #[test]
+    pub fn test_tm_client_type() {
+        let _ = ClientType::from_str(TENDERMINT_CLIENT_TYPE).unwrap();
+    }
+}
diff --git a/crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs b/ibc-clients/ics07-tendermint/types/src/misbehaviour.rs
similarity index 70%
rename from crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs
rename to ibc-clients/ics07-tendermint/types/src/misbehaviour.rs
index daf0c12e0..c51f1892f 100644
--- a/crates/ibc/src/clients/ics07_tendermint/misbehaviour.rs
+++ b/ibc-clients/ics07-tendermint/types/src/misbehaviour.rs
@@ -1,35 +1,34 @@
 //! Defines the misbehaviour type for the tendermint light client
 
-use crate::prelude::*;
-
-use bytes::Buf;
+use ibc_core_client_types::error::ClientError;
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
 use ibc_proto::google::protobuf::Any;
 use ibc_proto::ibc::lightclients::tendermint::v1::Misbehaviour as RawMisbehaviour;
-use ibc_proto::protobuf::Protobuf;
-use prost::Message;
+use ibc_proto::Protobuf;
+use tendermint::crypto::Sha256;
+use tendermint::merkle::MerkleHash;
 
-use crate::clients::ics07_tendermint::error::Error;
-use crate::clients::ics07_tendermint::header::Header;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ClientId;
+use crate::error::Error;
+use crate::header::Header;
 
-const TENDERMINT_MISBEHAVIOUR_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.Misbehaviour";
+pub const TENDERMINT_MISBEHAVIOUR_TYPE_URL: &str = "/ibc.lightclients.tendermint.v1.Misbehaviour";
 
 /// Tendermint light client's misbehaviour type
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Misbehaviour {
     client_id: ClientId,
-    header1: Header,
-    header2: Header,
+    header1: Box<Header>,
+    header2: Box<Header>,
 }
 
 impl Misbehaviour {
     pub fn new(client_id: ClientId, header1: Header, header2: Header) -> Self {
         Self {
             client_id,
-            header1,
-            header2,
+            header1: Box::new(header1),
+            header2: Box::new(header2),
         }
     }
 
@@ -45,9 +44,9 @@ impl Misbehaviour {
         &self.header2
     }
 
-    pub fn validate_basic(&self) -> Result<(), Error> {
-        self.header1.validate_basic()?;
-        self.header2.validate_basic()?;
+    pub fn validate_basic<H: MerkleHash + Sha256 + Default>(&self) -> Result<(), Error> {
+        self.header1.validate_basic::<H>()?;
+        self.header2.validate_basic::<H>()?;
 
         if self.header1.signed_header.header.chain_id != self.header2.signed_header.header.chain_id
         {
@@ -74,20 +73,17 @@ impl Protobuf<RawMisbehaviour> for Misbehaviour {}
 
 impl TryFrom<RawMisbehaviour> for Misbehaviour {
     type Error = Error;
-
+    #[allow(deprecated)]
     fn try_from(raw: RawMisbehaviour) -> Result<Self, Self::Error> {
-        let client_id = raw
-            .client_id
-            .parse()
-            .map_err(|_| Error::InvalidRawClientId {
-                client_id: raw.client_id.clone(),
-            })?;
+        let client_id = raw.client_id.parse()?;
+
         let header1: Header = raw
             .header_1
             .ok_or_else(|| Error::InvalidRawMisbehaviour {
                 reason: "missing header1".into(),
             })?
             .try_into()?;
+
         let header2: Header = raw
             .header_2
             .ok_or_else(|| Error::InvalidRawMisbehaviour {
@@ -101,10 +97,11 @@ impl TryFrom<RawMisbehaviour> for Misbehaviour {
 
 impl From<Misbehaviour> for RawMisbehaviour {
     fn from(value: Misbehaviour) -> Self {
+        #[allow(deprecated)]
         RawMisbehaviour {
             client_id: value.client_id.to_string(),
-            header_1: Some(value.header1.into()),
-            header_2: Some(value.header2.into()),
+            header_1: Some((*value.header1).into()),
+            header_2: Some((*value.header2).into()),
         }
     }
 }
@@ -115,18 +112,15 @@ impl TryFrom<Any> for Misbehaviour {
     type Error = ClientError;
 
     fn try_from(raw: Any) -> Result<Self, ClientError> {
-        use core::ops::Deref;
-
-        fn decode_misbehaviour<B: Buf>(buf: B) -> Result<Misbehaviour, Error> {
-            RawMisbehaviour::decode(buf)
-                .map_err(Error::Decode)?
-                .try_into()
+        fn decode_misbehaviour(value: &[u8]) -> Result<Misbehaviour, ClientError> {
+            let misbehaviour =
+                Protobuf::<RawMisbehaviour>::decode(value).map_err(|e| ClientError::Other {
+                    description: e.to_string(),
+                })?;
+            Ok(misbehaviour)
         }
-
         match raw.type_url.as_str() {
-            TENDERMINT_MISBEHAVIOUR_TYPE_URL => {
-                decode_misbehaviour(raw.value.deref()).map_err(Into::into)
-            }
+            TENDERMINT_MISBEHAVIOUR_TYPE_URL => decode_misbehaviour(&raw.value),
             _ => Err(ClientError::UnknownMisbehaviourType {
                 misbehaviour_type: raw.type_url,
             }),
@@ -138,7 +132,7 @@ impl From<Misbehaviour> for Any {
     fn from(misbehaviour: Misbehaviour) -> Self {
         Any {
             type_url: TENDERMINT_MISBEHAVIOUR_TYPE_URL.to_string(),
-            value: Protobuf::<RawMisbehaviour>::encode_vec(&misbehaviour),
+            value: Protobuf::<RawMisbehaviour>::encode_vec(misbehaviour),
         }
     }
 }
diff --git a/crates/ibc/src/clients/ics07_tendermint/trust_threshold.rs b/ibc-clients/ics07-tendermint/types/src/trust_threshold.rs
similarity index 93%
rename from crates/ibc/src/clients/ics07_tendermint/trust_threshold.rs
rename to ibc-clients/ics07-tendermint/types/src/trust_threshold.rs
index 2ae58f3d6..830bba74d 100644
--- a/crates/ibc/src/clients/ics07_tendermint/trust_threshold.rs
+++ b/ibc-clients/ics07-tendermint/types/src/trust_threshold.rs
@@ -2,21 +2,17 @@
 //! represented as a fraction with valid values in the
 //! range `[0, 1)`.
 
-use core::{
-    convert::TryFrom,
-    fmt::{Display, Error as FmtError, Formatter},
-};
+use core::fmt::{Display, Error as FmtError, Formatter};
 
+use ibc_core_client_types::error::ClientError;
 use ibc_proto::ibc::lightclients::tendermint::v1::Fraction;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 use tendermint::trust_threshold::TrustThresholdFraction;
 
-use crate::core::ics02_client::error::ClientError;
-
 /// [`TrustThreshold`] defines the level of trust that a client has
 /// towards a set of validators of a chain.
 ///
-/// A trust threshold is represented as a fraction, i.e., a numerator and
+/// A trust threshold is represented as a fraction, i.e., a numerator
 /// and a denominator.
 /// A typical trust threshold is 1/3 in practice.
 /// This type accepts even a value of 0, (numerator = 0, denominator = 0),
@@ -138,12 +134,6 @@ impl TryFrom<Fraction> for TrustThreshold {
     }
 }
 
-impl Default for TrustThreshold {
-    fn default() -> Self {
-        Self::ONE_THIRD
-    }
-}
-
 impl Display for TrustThreshold {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
         write!(f, "{}/{}", self.numerator, self.denominator)
diff --git a/ibc-clients/ics08-wasm/types/Cargo.toml b/ibc-clients/ics08-wasm/types/Cargo.toml
new file mode 100644
index 000000000..57c73e78b
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/Cargo.toml
@@ -0,0 +1,63 @@
+[package]
+name         = "ibc-client-wasm-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "wasm", "ics08" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-08 Wasm Light Client data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[dependencies]
+# external dependencies
+base64          = { workspace = true, features = [ "alloc" ] }
+displaydoc      = { workspace = true }
+serde           = { workspace = true, optional = true }
+cosmwasm-schema = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-core-client     = { workspace = true }
+ibc-core-host-types = { workspace = true }
+ibc-primitives      = { workspace = true }
+ibc-proto           = { workspace = true }
+
+[dev-dependencies]
+rstest     = { workspace = true }
+serde_json = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-core-client/std",
+  "ibc-core-host-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "base64/std",
+  "serde/std",
+]
+serde = [
+  "ibc-core-client/serde",
+  "ibc-core-host-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+  "dep:serde",
+]
+schema = [
+  "ibc-core-client/schema",
+  "ibc-core-host-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+cosmwasm = [
+  "cosmwasm-schema",
+  "schema",
+]
diff --git a/ibc-clients/ics08-wasm/types/src/client_message.rs b/ibc-clients/ics08-wasm/types/src/client_message.rs
new file mode 100644
index 000000000..242dcd653
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/client_message.rs
@@ -0,0 +1,47 @@
+//! Defines the client message type for the ICS-08 Wasm light client.
+
+use ibc_primitives::proto::Protobuf;
+use ibc_proto::ibc::lightclients::wasm::v1::ClientMessage as RawClientMessage;
+
+use crate::Bytes;
+
+pub const WASM_CLIENT_MESSAGE_TYPE_URL: &str = "/ibc.lightclients.wasm.v1.ClientMessage";
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ClientMessage {
+    pub data: Bytes,
+}
+
+impl Protobuf<RawClientMessage> for ClientMessage {}
+
+impl From<RawClientMessage> for ClientMessage {
+    fn from(raw: RawClientMessage) -> Self {
+        Self { data: raw.data }
+    }
+}
+
+impl From<ClientMessage> for RawClientMessage {
+    fn from(value: ClientMessage) -> Self {
+        RawClientMessage { data: value.data }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case(b"data")]
+    fn test_roundtrip(#[case] data: &[u8]) {
+        let raw_msg = RawClientMessage {
+            data: data.to_vec(),
+        };
+        assert_eq!(
+            RawClientMessage::from(ClientMessage::from(raw_msg.clone())),
+            raw_msg,
+        )
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/client_state.rs b/ibc-clients/ics08-wasm/types/src/client_state.rs
new file mode 100644
index 000000000..4dda117a0
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/client_state.rs
@@ -0,0 +1,121 @@
+//! Defines the client state type for the ICS-08 Wasm light client.
+
+#[cfg(feature = "cosmwasm")]
+use cosmwasm_schema::cw_serde;
+use ibc_core_client::types::Height;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::{Any, Protobuf};
+use ibc_proto::ibc::lightclients::wasm::v1::ClientState as RawClientState;
+
+use crate::error::Error;
+#[cfg(feature = "cosmwasm")]
+use crate::serializer::Base64;
+use crate::Bytes;
+
+pub const WASM_CLIENT_STATE_TYPE_URL: &str = "/ibc.lightclients.wasm.v1.ClientState";
+
+#[cfg_attr(feature = "cosmwasm", cw_serde)]
+#[cfg_attr(not(feature = "cosmwasm"), derive(Clone, Debug, PartialEq))]
+#[derive(Eq)]
+pub struct ClientState {
+    #[cfg_attr(feature = "cosmwasm", schemars(with = "String"))]
+    #[cfg_attr(feature = "cosmwasm", serde(with = "Base64", default))]
+    pub data: Bytes,
+    #[cfg_attr(feature = "cosmwasm", schemars(with = "String"))]
+    #[cfg_attr(feature = "cosmwasm", serde(with = "Base64", default))]
+    pub checksum: Bytes,
+    pub latest_height: Height,
+}
+
+impl Protobuf<RawClientState> for ClientState {}
+
+impl From<ClientState> for RawClientState {
+    fn from(value: ClientState) -> Self {
+        Self {
+            data: value.data,
+            checksum: value.checksum,
+            latest_height: Some(value.latest_height.into()),
+        }
+    }
+}
+
+impl TryFrom<RawClientState> for ClientState {
+    type Error = Error;
+
+    fn try_from(raw: RawClientState) -> Result<Self, Self::Error> {
+        let latest_height = raw
+            .latest_height
+            .ok_or(Error::InvalidLatestHeight {
+                reason: "missing latest height".to_string(),
+            })?
+            .try_into()
+            .map_err(|_| Error::InvalidLatestHeight {
+                reason: "invalid protobuf latest height".to_string(),
+            })?;
+        Ok(Self {
+            data: raw.data,
+            checksum: raw.checksum,
+            latest_height,
+        })
+    }
+}
+
+impl Protobuf<Any> for ClientState {}
+
+impl From<ClientState> for Any {
+    fn from(value: ClientState) -> Self {
+        Self {
+            type_url: WASM_CLIENT_STATE_TYPE_URL.to_string(),
+            value: Protobuf::<RawClientState>::encode_vec(value),
+        }
+    }
+}
+
+impl TryFrom<Any> for ClientState {
+    type Error = Error;
+
+    fn try_from(any: Any) -> Result<Self, Self::Error> {
+        fn decode_client_state(value: &[u8]) -> Result<ClientState, Error> {
+            let client_state =
+                Protobuf::<RawClientState>::decode(value).map_err(|e| Error::DecodeError {
+                    reason: e.to_string(),
+                })?;
+
+            Ok(client_state)
+        }
+
+        match any.type_url.as_str() {
+            WASM_CLIENT_STATE_TYPE_URL => decode_client_state(&any.value),
+            _ => Err(Error::DecodeError {
+                reason: "type_url does not match".into(),
+            }),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc_proto::ibc::core::client::v1::Height as RawHeight;
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case(b"data", b"checksum", 1)]
+    fn test_roundtrip(#[case] data: &[u8], #[case] checksum: &[u8], #[case] height: u64) {
+        let raw_client_state = RawClientState {
+            data: data.to_vec(),
+            checksum: checksum.to_vec(),
+            latest_height: Some(RawHeight {
+                revision_number: 0,
+                revision_height: height,
+            }),
+        };
+        let client_state: ClientState = raw_client_state.clone().try_into().unwrap();
+        assert_eq!(RawClientState::from(client_state.clone()), raw_client_state);
+        assert_eq!(
+            ClientState::try_from(Any::from(client_state.clone())).unwrap(),
+            client_state
+        );
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/consensus_state.rs b/ibc-clients/ics08-wasm/types/src/consensus_state.rs
new file mode 100644
index 000000000..32e6476a9
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/consensus_state.rs
@@ -0,0 +1,97 @@
+//! Defines the consensus state type for the ICS-08 Wasm light client.
+
+#[cfg(feature = "cosmwasm")]
+use cosmwasm_schema::cw_serde;
+use ibc_core_client::types::error::ClientError;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::{Any, Protobuf};
+use ibc_proto::ibc::lightclients::wasm::v1::ConsensusState as RawConsensusState;
+
+#[cfg(feature = "cosmwasm")]
+use crate::serializer::Base64;
+use crate::Bytes;
+
+pub const WASM_CONSENSUS_STATE_TYPE_URL: &str = "/ibc.lightclients.wasm.v1.ConsensusState";
+
+#[cfg_attr(feature = "cosmwasm", cw_serde)]
+#[cfg_attr(not(feature = "cosmwasm"), derive(Clone, Debug, PartialEq))]
+#[derive(Eq)]
+pub struct ConsensusState {
+    #[cfg_attr(feature = "cosmwasm", schemars(with = "String"))]
+    #[cfg_attr(feature = "cosmwasm", serde(with = "Base64", default))]
+    pub data: Bytes,
+}
+
+impl ConsensusState {
+    pub fn new(data: Bytes) -> Self {
+        Self { data }
+    }
+}
+
+impl Protobuf<RawConsensusState> for ConsensusState {}
+
+impl From<ConsensusState> for RawConsensusState {
+    fn from(value: ConsensusState) -> Self {
+        Self { data: value.data }
+    }
+}
+
+impl TryFrom<RawConsensusState> for ConsensusState {
+    type Error = ClientError;
+
+    fn try_from(value: RawConsensusState) -> Result<Self, Self::Error> {
+        Ok(Self { data: value.data })
+    }
+}
+
+impl Protobuf<Any> for ConsensusState {}
+
+impl From<ConsensusState> for Any {
+    fn from(value: ConsensusState) -> Self {
+        Self {
+            type_url: WASM_CONSENSUS_STATE_TYPE_URL.to_string(),
+            value: Protobuf::<RawConsensusState>::encode_vec(value),
+        }
+    }
+}
+
+impl TryFrom<Any> for ConsensusState {
+    type Error = ClientError;
+
+    fn try_from(any: Any) -> Result<Self, Self::Error> {
+        fn decode_consensus_state(value: &[u8]) -> Result<ConsensusState, ClientError> {
+            let consensus_state =
+                Protobuf::<RawConsensusState>::decode(value).map_err(|e| ClientError::Other {
+                    description: e.to_string(),
+                })?;
+            Ok(consensus_state)
+        }
+        match any.type_url.as_str() {
+            WASM_CONSENSUS_STATE_TYPE_URL => decode_consensus_state(&any.value),
+            _ => Err(ClientError::Other {
+                description: "type_url does not match".into(),
+            }),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case(b"data")]
+    fn test_roundtrip(#[case] data: &[u8]) {
+        let raw_msg = RawConsensusState {
+            data: data.to_vec(),
+        };
+        let msg = ConsensusState::try_from(raw_msg.clone()).unwrap();
+        assert_eq!(RawConsensusState::from(msg.clone()), raw_msg);
+        assert_eq!(
+            ConsensusState::try_from(Any::from(msg.clone())).unwrap(),
+            msg
+        );
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/error.rs b/ibc-clients/ics08-wasm/types/src/error.rs
new file mode 100644
index 000000000..eb48a2855
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/error.rs
@@ -0,0 +1,32 @@
+//! Defines the error type for the ICS-08 Wasm light client.
+
+use displaydoc::Display;
+use ibc_core_host_types::error::IdentifierError;
+use ibc_primitives::prelude::*;
+
+/// The main error type
+#[derive(Debug, Display)]
+pub enum Error {
+    /// invalid identifier: `{0}`
+    InvalidIdentifier(IdentifierError),
+    /// decoding error: `{reason}`
+    DecodeError { reason: String },
+    /// invalid client state latest height: `{reason}`
+    InvalidLatestHeight { reason: String },
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            Error::InvalidIdentifier(err) => Some(err),
+            _ => None,
+        }
+    }
+}
+
+impl From<IdentifierError> for Error {
+    fn from(e: IdentifierError) -> Self {
+        Self::InvalidIdentifier(e)
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/lib.rs b/ibc-clients/ics08-wasm/types/src/lib.rs
new file mode 100644
index 000000000..98bd27915
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/lib.rs
@@ -0,0 +1,56 @@
+//! Definitions of domain types used in the ICS-08 Wasm light client implementation.
+#![forbid(unsafe_code)]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(test), deny(clippy::unwrap_used))]
+#![cfg_attr(not(test), deny(clippy::disallowed_methods, clippy::disallowed_types))]
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+pub mod client_message;
+pub mod client_state;
+pub mod consensus_state;
+pub mod error;
+pub mod msgs;
+
+#[cfg(feature = "cosmwasm")]
+pub mod serializer;
+
+use core::str::FromStr;
+
+use ibc_core_host_types::identifiers::ClientType;
+#[cfg(not(feature = "std"))]
+use ibc_primitives::prelude::Vec;
+
+pub type Bytes = Vec<u8>;
+
+/// Re-exports ICS-08 Wasm light client proto types from `ibc-proto` crate.
+pub mod proto {
+    pub use ibc_proto::ibc::lightclients::wasm::*;
+}
+
+pub static SUBJECT_PREFIX: &[u8] = b"subject/";
+pub static SUBSTITUTE_PREFIX: &[u8] = b"substitute/";
+
+pub const WASM_CLIENT_TYPE: &str = "08-wasm";
+
+/// Returns the wasm `ClientType`
+pub fn client_type() -> ClientType {
+    ClientType::from_str(WASM_CLIENT_TYPE).expect("Never fails because it's valid")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // Ensures that the validation in `ClientType::from_str` doesn't fail for the wasm client type
+    #[test]
+    pub fn test_wasm_client_type() {
+        let _ = ClientType::from_str(WASM_CLIENT_TYPE).unwrap();
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/msgs/migrate_contract.rs b/ibc-clients/ics08-wasm/types/src/msgs/migrate_contract.rs
new file mode 100644
index 000000000..40c737457
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/msgs/migrate_contract.rs
@@ -0,0 +1,74 @@
+use core::str::FromStr;
+
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::lightclients::wasm::v1::MsgMigrateContract as RawMsgMigrateContract;
+use ibc_proto::Protobuf;
+
+use crate::error::Error;
+use crate::Bytes;
+
+pub const MIGRATE_CONTRACT_TYPE_URL: &str = "/ibc.lightclients.wasm.v1.MsgMigrateContract";
+
+/// Defines the message type for migrating a Wasm contract on the chain.
+#[derive(Clone, PartialEq, Debug, Eq)]
+pub struct MsgMigrateContract {
+    pub signer: Signer,
+    pub client_id: ClientId,
+    pub checksum: Bytes,
+    pub msg: Bytes,
+}
+
+impl Protobuf<RawMsgMigrateContract> for MsgMigrateContract {}
+
+impl From<MsgMigrateContract> for RawMsgMigrateContract {
+    fn from(value: MsgMigrateContract) -> Self {
+        Self {
+            signer: value.signer.to_string(),
+            client_id: value.client_id.to_string(),
+            checksum: value.checksum,
+            msg: value.msg,
+        }
+    }
+}
+
+impl TryFrom<RawMsgMigrateContract> for MsgMigrateContract {
+    type Error = Error;
+
+    fn try_from(value: RawMsgMigrateContract) -> Result<Self, Self::Error> {
+        Ok(Self {
+            signer: Signer::from(value.signer),
+            client_id: ClientId::from_str(&value.client_id)?,
+            checksum: value.checksum,
+            msg: value.msg,
+        })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("signer", "08-wasm-2", b"checksum", b"msg")]
+    fn test_roundtrip(
+        #[case] signer: &str,
+        #[case] client_id: &str,
+        #[case] checksum: &[u8],
+        #[case] msg: &[u8],
+    ) {
+        let raw_msg = RawMsgMigrateContract {
+            signer: signer.to_string(),
+            client_id: client_id.to_string(),
+            checksum: checksum.to_vec(),
+            msg: msg.to_vec(),
+        };
+        assert_eq!(
+            RawMsgMigrateContract::from(MsgMigrateContract::try_from(raw_msg.clone()).unwrap()),
+            raw_msg,
+        )
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/msgs/mod.rs b/ibc-clients/ics08-wasm/types/src/msgs/mod.rs
new file mode 100644
index 000000000..d58ab8201
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/msgs/mod.rs
@@ -0,0 +1,4 @@
+//! Contains definitions of message types for the ICS-08 Wasm light client.
+pub mod migrate_contract;
+pub mod remove_checksum;
+pub mod store_code;
diff --git a/ibc-clients/ics08-wasm/types/src/msgs/remove_checksum.rs b/ibc-clients/ics08-wasm/types/src/msgs/remove_checksum.rs
new file mode 100644
index 000000000..9b84aac87
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/msgs/remove_checksum.rs
@@ -0,0 +1,55 @@
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::lightclients::wasm::v1::MsgRemoveChecksum as RawMsgRemoveChecksum;
+use ibc_proto::Protobuf;
+
+use crate::Bytes;
+
+pub const REMOVE_CHECKSUM_TYPE_URL: &str = "/ibc.lightclients.wasm.v1.MsgRemoveChecksum";
+
+/// Defines the message type for removing a checksum from the chain.
+#[derive(Clone, PartialEq, Debug, Eq)]
+pub struct MsgRemoveChecksum {
+    pub signer: Signer,
+    pub checksum: Bytes,
+}
+
+impl Protobuf<RawMsgRemoveChecksum> for MsgRemoveChecksum {}
+
+impl From<MsgRemoveChecksum> for RawMsgRemoveChecksum {
+    fn from(value: MsgRemoveChecksum) -> Self {
+        Self {
+            signer: value.signer.to_string(),
+            checksum: value.checksum,
+        }
+    }
+}
+
+impl From<RawMsgRemoveChecksum> for MsgRemoveChecksum {
+    fn from(value: RawMsgRemoveChecksum) -> Self {
+        Self {
+            signer: Signer::from(value.signer),
+            checksum: value.checksum,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("signer", b"checksum")]
+    fn test_roundtrip(#[case] signer: &str, #[case] checksum: &[u8]) {
+        let raw_msg = RawMsgRemoveChecksum {
+            signer: signer.to_string(),
+            checksum: checksum.to_vec(),
+        };
+        assert_eq!(
+            RawMsgRemoveChecksum::from(MsgRemoveChecksum::from(raw_msg.clone())),
+            raw_msg,
+        )
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/msgs/store_code.rs b/ibc-clients/ics08-wasm/types/src/msgs/store_code.rs
new file mode 100644
index 000000000..ca7818eac
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/msgs/store_code.rs
@@ -0,0 +1,55 @@
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::lightclients::wasm::v1::MsgStoreCode as RawMsgStoreCode;
+use ibc_proto::Protobuf;
+
+use crate::Bytes;
+
+pub const STORE_CODE_TYPE_URL: &str = "/ibc.lightclients.wasm.v1.MsgStoreCode";
+
+/// Defines the message type for storing the Wasm byte code on the chain.
+#[derive(Clone, PartialEq, Debug, Eq)]
+pub struct MsgStoreCode {
+    pub signer: Signer,
+    pub wasm_byte_code: Bytes,
+}
+
+impl Protobuf<RawMsgStoreCode> for MsgStoreCode {}
+
+impl From<MsgStoreCode> for RawMsgStoreCode {
+    fn from(value: MsgStoreCode) -> Self {
+        Self {
+            signer: value.signer.to_string(),
+            wasm_byte_code: value.wasm_byte_code,
+        }
+    }
+}
+
+impl From<RawMsgStoreCode> for MsgStoreCode {
+    fn from(value: RawMsgStoreCode) -> Self {
+        Self {
+            signer: Signer::from(value.signer),
+            wasm_byte_code: value.wasm_byte_code,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("signer", b"wasm_data")]
+    fn test_roundtrip(#[case] signer: &str, #[case] wasm_byte_code: &[u8]) {
+        let raw_msg = RawMsgStoreCode {
+            signer: signer.to_string(),
+            wasm_byte_code: wasm_byte_code.to_vec(),
+        };
+        assert_eq!(
+            RawMsgStoreCode::from(MsgStoreCode::from(raw_msg.clone())),
+            raw_msg,
+        )
+    }
+}
diff --git a/ibc-clients/ics08-wasm/types/src/serializer.rs b/ibc-clients/ics08-wasm/types/src/serializer.rs
new file mode 100644
index 000000000..c44dc7325
--- /dev/null
+++ b/ibc-clients/ics08-wasm/types/src/serializer.rs
@@ -0,0 +1,46 @@
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
+use ibc_primitives::prelude::*;
+use serde::de::Error;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+pub struct Base64;
+
+impl Base64 {
+    pub fn serialize<S: Serializer>(bytes: &[u8], serializer: S) -> Result<S::Ok, S::Error> {
+        let encoded = BASE64_STANDARD.encode(bytes);
+        String::serialize(&encoded, serializer)
+    }
+
+    pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<u8>, D::Error> {
+        let base64 = String::deserialize(deserializer)?;
+        let bytes = BASE64_STANDARD
+            .decode(base64.as_bytes())
+            .map_err(Error::custom)?;
+
+        Ok(bytes)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[derive(Serialize, Deserialize, PartialEq, Eq, Debug)]
+    struct Foo(#[serde(with = "Base64")] crate::Bytes);
+
+    // Ensures Base64 serialize and deserialize work as expected
+    #[rstest]
+    #[case(b"", "")]
+    #[case(&[118], "dg==")]
+    #[case(&[0x1, 0x2, 0x3, 0x4, 0x5], "AQIDBAU=")]
+    #[case(b"hello world", "aGVsbG8gd29ybGQ=")]
+    pub fn test_ser_and_deser(#[case] bytes: &[u8], #[case] hash: &str) {
+        let foo = Foo(bytes.to_vec());
+        let json = format!("\"{hash}\"");
+        assert_eq!(serde_json::to_string(&foo).unwrap(), json);
+        assert_eq!(serde_json::from_str::<Foo>(&json).unwrap(), foo);
+    }
+}
diff --git a/ibc-clients/src/lib.rs b/ibc-clients/src/lib.rs
new file mode 100644
index 000000000..da992dffe
--- /dev/null
+++ b/ibc-clients/src/lib.rs
@@ -0,0 +1,24 @@
+//! Exports data structures and implementations of different IBC applications.
+#![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
+)]
+
+/// Re-exports implementations of ICS-07 Tendermint light client.
+pub mod tendermint {
+    #[doc(inline)]
+    pub use ibc_client_tendermint::*;
+}
+
+/// Re-exports implementations of ICS-08 Wasm light client types.
+pub mod wasm_types {
+    #[doc(inline)]
+    pub use ibc_client_wasm_types::*;
+}
diff --git a/ibc-core/Cargo.toml b/ibc-core/Cargo.toml
new file mode 100644
index 000000000..eebb12318
--- /dev/null
+++ b/ibc-core/Cargo.toml
@@ -0,0 +1,84 @@
+[package]
+name         = "ibc-core"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "core" ]
+readme       = "README.md"
+
+description = """
+    Maintained by `ibc-rs`, re-exports a comprehensive set of libraries that implement IBC core (TAO)
+    modules, facilitating seamless integration of IBC core business logic into any blockchain system.
+"""
+
+[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-host             = { workspace = true }
+ibc-core-router           = { workspace = true }
+ibc-core-handler          = { workspace = true }
+ibc-derive                = { 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/std",
+  "ibc-primitives/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/serde",
+  "ibc-primitives/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/borsh",
+  "ibc-primitives/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/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+parity-scale-codec = [
+  "ibc-core-client/parity-scale-codec",
+  "ibc-core-connection/parity-scale-codec",
+  "ibc-core-channel/parity-scale-codec",
+  "ibc-core-commitment-types/parity-scale-codec",
+  "ibc-core-host/parity-scale-codec",
+  "ibc-core-router/parity-scale-codec",
+  "ibc-core-handler/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+]
diff --git a/ibc-core/README.md b/ibc-core/README.md
new file mode 100644
index 000000000..d8460a5b5
--- /dev/null
+++ b/ibc-core/README.md
@@ -0,0 +1,128 @@
+# IBC Core
+
+This is the top-level library that re-exports the Inter-Blockchain Communication
+(IBC) core modules as a meta-crate. It serves to simplify the process of
+importing and integrating various IBC core modules into your blockchain.
+
+IBC is a distributed protocol that enables communication between distinct
+sovereign blockchains and IBC core is the part of the protocol that handles the
+transport, authentication, and ordering (TAO) of data packets.
+
+The structure within the `ibc-core` crate is designed to provide flexibility for
+external users. You can choose to utilize the entire `ibc-core` crate, or
+selectively import specific libraries. From there, you also have the flexibility
+of bringing in an entire sub-module (e.g. the `ibc-core-client` crate), or only
+a module's associated data structures (e.g. `ibc-core-client-types`).
+
+This versatility empowers hosts, including chain integrators, relayers, or any
+IBC tooling projects, to build their solution on top of the layers that best
+suit their particular requirements.
+
+## Sub-Crates
+
+Currently, the `ibc-core` crate contains the implementation of the following IBC
+core specifications:
+
+### ICS-02: Client Semantics
+
+- [ibc-core-client](./../ibc-core/ics02-client)
+- [ibc-core-client-context](./../ibc-core/ics02-client/context)
+- [ibc-core-client-types](./../ibc-core/ics02-client/types)
+
+### ICS-03: Connection Semantics
+
+- [ibc-core-connection](./../ibc-core/ics03-connection)
+- [ibc-core-connection-types](./../ibc-core/ics03-connection/types)
+
+### ICS-04: Channel and Packet Semantics
+
+- [ibc-core-channel](./../ibc-core/ics04-channel)
+- [ibc-core-channel-types](./../ibc-core/ics04-channel/types)
+
+### ICS-24: Host Requirements
+
+- [ibc-core-host](./../ibc-core/ics24-host)
+- [ibc-core-host-cosmos](./../ibc-core/ics24-host/cosmos)
+- [ibc-core-host-types](./../ibc-core/ics24-host/types)
+
+### ICS-25: Handler Interface
+
+- [ibc-core-handler](./../ibc-core/ics25-handler)
+- [ibc-core-handler-types](./../ibc-core/ics25-handler/types)
+
+### ICS-26: Routing Module
+
+- [ibc-core-routing](./../ibc-core/ics26-routing)
+- [ibc-core-routing-types](./../ibc-core/ics26-routing/types)
+
+## Divergence from the Interchain Standards (ICS)
+
+This crate diverges from the [ICS specification](https://github.com/cosmos/ibc)
+in a number of ways. See below for more details.
+
+### Module system: no support for untrusted modules
+
+ICS-24 (Host Requirements) gives the [following
+requirement](https://github.com/cosmos/ibc/blob/master/spec/core/ics-024-host-requirements/README.md#module-system)
+about the module system that the host state machine must support:
+
+> The host state machine must support a module system, whereby self-contained,
+> potentially mutually distrusted packages of code can safely execute on the
+> same ledger [...].
+
+**This crate currently does not support mutually distrusted packages**. That is,
+modules on the host state machine are assumed to be fully trusted. In practice,
+this means that every module has either been written by the host state machine
+developers, or fully vetted by them.
+
+### Port system: No object capability system
+
+ICS-05 (Port Allocation) requires the host system to support either
+object-capability reference or source authentication for modules.
+
+> In the former object-capability case, the IBC handler must have the ability to
+> generate object-capabilities, unique, opaque references which can be passed to
+> a module and will not be duplicable by other modules. [...] In the latter
+> source authentication case, the IBC handler must have the ability to securely
+> read the source identifier of the calling module, a unique string for each
+> module in the host state machine, which cannot be altered by the module or
+> faked by another module.
+
+**This crate currently requires neither of the host system**. Since modules are
+assumed to be trusted, there is no need for this object capability system that
+protects resources for potentially malicious modules.
+
+For more background on this, see [this issue](https://github.com/informalsystems/ibc-rs/issues/2159).
+
+### Port system: transferring and releasing a port
+
+ICS-05 (Port Allocation) requires the IBC handler to permit [transferring
+ownership of a
+port](https://github.com/cosmos/ibc/tree/master/spec/core/ics-005-port-allocation#transferring-ownership-of-a-port)
+and [releasing a
+port](https://github.com/cosmos/ibc/tree/master/spec/core/ics-005-port-allocation#releasing-a-port).
+
+We currently support neither.
+
+### Asynchronous acknowledgements
+
+The standard gives the ability for modules to [acknowledge packets
+asynchronously](https://github.com/cosmos/ibc/tree/main/spec/core/ics-004-channel-and-packet-semantics#writing-acknowledgements).
+This allows modules to receive the packet, but only applying the changes at a
+later time (after which they would write the acknowledgement).
+
+We currently force applications to process the packets as part of
+`onRecvPacket()`. If you need asynchronous acknowledgements for your
+application, please open an issue.
+
+Note that this still makes us 100% compatible with `ibc-go`.
+
+## Contributing
+
+IBC is specified in English in the [cosmos/ibc
+repo](https://github.com/cosmos/ibc). Any protocol changes or clarifications
+should be contributed there.
+
+If you're interested in contributing, please take a look at the
+[CONTRIBUTING](./../CONTRIBUTING.md) guidelines. We welcome and appreciate
+community contributions!
diff --git a/ibc-core/ics02-client/Cargo.toml b/ibc-core/ics02-client/Cargo.toml
new file mode 100644
index 000000000..7502b6a25
--- /dev/null
+++ b/ibc-core/ics02-client/Cargo.toml
@@ -0,0 +1,71 @@
+[package]
+name         = "ibc-core-client"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "light-client" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of ICS-02 Client Semantics and
+    re-exports essential data structures and domain types from `ibc-core-client-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+ibc-core-client-types     = { workspace = true }
+ibc-core-client-context   = { workspace = true }
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host             = { workspace = true }
+ibc-core-handler-types    = { workspace = true }
+ibc-primitives            = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-core-client-types/std",
+  "ibc-core-client-context/std",
+  "ibc-core-commitment-types/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/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/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/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+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-host/parity-scale-codec",
+  "ibc-core-handler-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+]
diff --git a/ibc-core/ics02-client/context/Cargo.toml b/ibc-core/ics02-client/context/Cargo.toml
new file mode 100644
index 000000000..9085da29e
--- /dev/null
+++ b/ibc-core/ics02-client/context/Cargo.toml
@@ -0,0 +1,77 @@
+[package]
+name         = "ibc-core-client-context"
+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 = """
+    Maintaind by `ibc-rs`, contains essential APIs to interface with the host chain's store,
+    enabling smooth client state transitions. Additionally, provides necessary traits for
+    implementing custom IBC light clients.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-client-types     = { workspace = true }
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host-types       = { workspace = true }
+ibc-core-handler-types    = { workspace = true }
+ibc-primitives            = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "subtle-encoding/std",
+  "ibc-core-client-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-handler-types/std",
+  "ibc-primitives/std",
+  "tendermint/std",
+]
+serde = [
+  "ibc-core-client-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-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-handler-types/borsh",
+  "ibc-primitives/borsh",
+]
+schema = [
+  "ibc-core-client-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+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-handler-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+]
diff --git a/crates/ibc/src/core/ics02_client/client_state.rs b/ibc-core/ics02-client/context/src/client_state.rs
similarity index 60%
rename from crates/ibc/src/core/ics02_client/client_state.rs
rename to ibc-core/ics02-client/context/src/client_state.rs
index bc79de426..974d9b43b 100644
--- a/crates/ibc/src/core/ics02_client/client_state.rs
+++ b/ibc-core/ics02-client/context/src/client_state.rs
@@ -1,40 +1,23 @@
 //! Defines `ClientState`, the core type to be implemented by light clients
 
-use core::fmt::Debug;
-use core::marker::{Send, Sync};
-use core::time::Duration;
-
-use ibc_proto::google::protobuf::Any;
-
-use crate::core::ics02_client::client_type::ClientType;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics02_client::ClientExecutionContext;
-use crate::core::ics23_commitment::commitment::{
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::{Height, Status};
+use ibc_core_commitment_types::commitment::{
     CommitmentPrefix, CommitmentProofBytes, CommitmentRoot,
 };
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::path::Path;
-use crate::prelude::*;
-use crate::Height;
-
-/// `UpdateKind` represents the 2 ways that a client can be updated
-/// in IBC: either through a `MsgUpdateClient`, or a `MsgSubmitMisbehaviour`.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum UpdateKind {
-    /// this is the typical scenario where a new header is submitted to the client
-    /// to update the client. Note that light clients are free to define the type
-    /// of the object used to update them (e.g. could be a list of headers).
-    UpdateClient,
-    /// this is the scenario where misbehaviour is submitted to the client
-    /// (e.g 2 headers with the same height in Tendermint)
-    SubmitMisbehaviour,
-}
+use ibc_core_host_types::identifiers::{ClientId, ClientType};
+use ibc_core_host_types::path::Path;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Any;
+
+use crate::context::{ClientExecutionContext, ClientValidationContext};
+use crate::Convertible;
 
 /// `ClientState` methods needed in both validation and execution.
 ///
 /// They do not require access to a client `ValidationContext` nor
 /// `ExecutionContext`.
-pub trait ClientStateCommon {
+pub trait ClientStateCommon: Convertible<Any> {
     /// Performs basic validation on the `consensus_state`.
     ///
     /// Notably, an implementation should verify that it can properly
@@ -44,23 +27,16 @@ pub trait ClientStateCommon {
     /// Type of client associated with this state (eg. Tendermint)
     fn client_type(&self) -> ClientType;
 
-    /// Latest height the client was updated to
+    /// The latest height the client was updated to
     fn latest_height(&self) -> Height;
 
     /// Validate that the client is at a sufficient height
     fn validate_proof_height(&self, proof_height: Height) -> Result<(), ClientError>;
 
-    /// Assert that the client is not frozen
-    fn confirm_not_frozen(&self) -> Result<(), ClientError>;
-
-    /// Check if the state is expired when `elapsed` time has passed since the latest consensus
-    /// state timestamp
-    fn expired(&self, elapsed: Duration) -> bool;
-
     /// Verify the upgraded client and consensus states and validate proofs
     /// against the given root.
     ///
-    /// NOTE: proof heights are not included as upgrade to a new revision is
+    /// NOTE: proof heights are not included, as upgrade to a new revision is
     /// expected to pass only on the last height committed by the current
     /// revision. Clients are responsible for ensuring that the planned last
     /// height of the current revision is somehow encoded in the proof
@@ -98,16 +74,17 @@ pub trait ClientStateCommon {
     ) -> Result<(), ClientError>;
 }
 
-/// `ClientState` methods which require access to the client's
-/// `ValidationContext`.
+/// `ClientState` methods which require access to the client's validation
+/// context
 ///
-/// The `ClientValidationContext` enables the light client implementation to
-/// define its own `ValidationContext` trait and use it in its implementation.
+/// The generic type `V` enables light client developers to expand the set of
+/// methods available under the [`ClientValidationContext`] trait and use them in
+/// their implementation for validating a client state transition.
 ///
 /// ```ignore
-/// impl<ClientValidationContext> ClientStateValidation<ClientValidationContext> for MyClientState
+/// impl<V> ClientStateValidation<V> for MyClientState
 /// where
-///     ClientValidationContext: MyValidationContext,
+///     V: ClientValidationContext + MyValidationContext,
 /// {
 ///   // `MyValidationContext` methods available
 /// }
@@ -116,7 +93,10 @@ pub trait ClientStateCommon {
 ///   // My Context methods
 /// }
 /// ```
-pub trait ClientStateValidation<ClientValidationContext> {
+pub trait ClientStateValidation<V>: ClientStateCommon
+where
+    V: ClientValidationContext,
+{
     /// verify_client_message must verify a client_message. A client_message
     /// could be a Header, Misbehaviour. It must handle each type of
     /// client_message appropriately. Calls to check_for_misbehaviour,
@@ -125,32 +105,45 @@ pub trait ClientStateValidation<ClientValidationContext> {
     /// error should be returned if the client_message fails to verify.
     fn verify_client_message(
         &self,
-        ctx: &ClientValidationContext,
+        ctx: &V,
         client_id: &ClientId,
         client_message: Any,
-        update_kind: &UpdateKind,
     ) -> Result<(), ClientError>;
 
     /// Checks for evidence of a misbehaviour in Header or Misbehaviour type. It
     /// assumes the client_message has already been verified.
     fn check_for_misbehaviour(
         &self,
-        ctx: &ClientValidationContext,
+        ctx: &V,
         client_id: &ClientId,
         client_message: Any,
-        update_kind: &UpdateKind,
     ) -> Result<bool, ClientError>;
+
+    /// Returns the status of the client. Only Active clients are allowed to process packets.
+    fn status(&self, ctx: &V, client_id: &ClientId) -> Result<Status, ClientError>;
+
+    /// Verifies whether the calling (subject) client state matches the substitute
+    /// client state for the purposes of client recovery.
+    ///
+    /// Note that this validation function does not need to perform *all* of the
+    /// validation steps necessary to confirm client recovery. Some checks, such
+    /// as checking that the subject client state's latest height < the substitute
+    /// client's latest height, as well as checking that the subject client is
+    /// inactive and that the substitute client is active, are performed by the
+    /// `validate` function in the `recover_client` module at the ics02-client
+    /// level.
+    ///
+    /// Returns `Ok` if the subject and substitute client states match, `Err` otherwise.
+    fn check_substitute(&self, ctx: &V, substitute_client_state: Any) -> Result<(), ClientError>;
 }
 
 /// `ClientState` methods which require access to the client's
 /// `ExecutionContext`.
 ///
-/// A client can define its own `ExecutionContext` in a manner analogous to how
-/// it can define a `ValidationContext` in [`ClientStateValidation`]. The one
-/// difference is every client's `ExecutionContext` must have
-/// [`ClientExecutionContext`] as a supertrait, which provides a set of common
-/// methods to store a client state and consensus state.
-pub trait ClientStateExecution<E>
+/// The generic type `E` enables light client developers to expand the set of
+/// methods available under the [`ClientExecutionContext`] trait and use them in
+/// their implementation for executing a client state transition.
+pub trait ClientStateExecution<E>: ClientStateValidation<E>
 where
     E: ClientExecutionContext,
 {
@@ -188,10 +181,9 @@ where
         ctx: &mut E,
         client_id: &ClientId,
         client_message: Any,
-        update_kind: &UpdateKind,
     ) -> Result<(), ClientError>;
 
-    // Update the client state and consensus state in the store with the upgraded ones.
+    /// Update the client state and consensus state in the store with the upgraded ones.
     fn update_state_on_upgrade(
         &self,
         ctx: &mut E,
@@ -199,22 +191,21 @@ where
         upgraded_client_state: Any,
         upgraded_consensus_state: Any,
     ) -> Result<Height, ClientError>;
-}
 
-/// Derive macro that implements [`ClientState`] for enums containing variants
-/// that implement [`ClientState`].
-///
-/// The macro expects the attribute `#[generics(ClientValidationContext = <...>,
-/// ClientExecutionContext = <...>)]` which specifies [`ClientState`]'s generic
-/// arguments to be defined.
-///
-/// The macro does not support generic types for `ClientValidationContext` and
-/// `ClientExecutionContext` (e.g. `MyType<T>` would not be supported).
-pub use ibc_derive::ClientState;
+    /// Update the subject client using the `substitute_client_state` in response
+    /// to a successful client recovery.
+    fn update_on_recovery(
+        &self,
+        ctx: &mut E,
+        subject_client_id: &ClientId,
+        substitute_client_state: Any,
+        substitute_consensus_state: Any,
+    ) -> Result<(), ClientError>;
+}
 
 /// Primary client trait. Defines all the methods that clients must implement.
 ///
-/// `ClientState` is broken up in 3 separate traits to avoid needing to use
+/// `ClientState` is broken up into 3 separate traits to avoid needing to use
 /// fully qualified syntax for every method call (see ADR 7 for more details).
 /// One only needs to implement [`ClientStateCommon`], [`ClientStateValidation`]
 /// and [`ClientStateExecution`]; a blanket implementation will automatically
@@ -222,22 +213,12 @@ pub use ibc_derive::ClientState;
 ///
 /// Refer to [`ClientStateValidation`] and [`ClientStateExecution`] to learn
 /// more about what both generic parameters represent.
-pub trait ClientState<ClientValidationContext, E: ClientExecutionContext>:
-    Send
-    + Sync
-    + ClientStateCommon
-    + ClientStateValidation<ClientValidationContext>
-    + ClientStateExecution<E>
+pub trait ClientState<V: ClientValidationContext, E: ClientExecutionContext>:
+    Send + Sync + ClientStateCommon + ClientStateValidation<V> + ClientStateExecution<E>
 {
 }
 
-impl<ClientValidationContext, E: ClientExecutionContext, T> ClientState<ClientValidationContext, E>
-    for T
-where
-    T: Send
-        + Sync
-        + ClientStateCommon
-        + ClientStateValidation<ClientValidationContext>
-        + ClientStateExecution<E>,
+impl<V: ClientValidationContext, E: ClientExecutionContext, T> ClientState<V, E> for T where
+    T: Send + Sync + ClientStateCommon + ClientStateValidation<V> + ClientStateExecution<E>
 {
 }
diff --git a/ibc-core/ics02-client/context/src/consensus_state.rs b/ibc-core/ics02-client/context/src/consensus_state.rs
new file mode 100644
index 000000000..556486c67
--- /dev/null
+++ b/ibc-core/ics02-client/context/src/consensus_state.rs
@@ -0,0 +1,20 @@
+//! Defines the trait to be implemented by all concrete consensus state types
+
+use ibc_core_commitment_types::commitment::CommitmentRoot;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Any;
+use ibc_primitives::Timestamp;
+
+use crate::Convertible;
+
+/// Defines methods that all `ConsensusState`s should provide.
+///
+/// One can think of a "consensus state" as a pruned header, to be stored on chain. In other words,
+/// a consensus state only contains the header's information needed by IBC message handlers.
+pub trait ConsensusState: Send + Sync + Convertible<Any> {
+    /// Commitment root of the consensus state, which is used for key-value pair verification.
+    fn root(&self) -> &CommitmentRoot;
+
+    /// The timestamp of the consensus state
+    fn timestamp(&self) -> Timestamp;
+}
diff --git a/ibc-core/ics02-client/context/src/context.rs b/ibc-core/ics02-client/context/src/context.rs
new file mode 100644
index 000000000..972ec547e
--- /dev/null
+++ b/ibc-core/ics02-client/context/src/context.rs
@@ -0,0 +1,163 @@
+use ibc_core_client_types::Height;
+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::prelude::*;
+use ibc_primitives::Timestamp;
+
+use crate::client_state::{ClientStateExecution, ClientStateValidation};
+use crate::consensus_state::ConsensusState;
+
+/// Defines the methods available to clients for validating client state
+/// transitions. The generic `V` parameter in
+/// [crate::client_state::ClientStateValidation] must
+/// inherit from this trait.
+pub trait ClientValidationContext: Sized {
+    type ClientStateRef: ClientStateValidation<Self>;
+    type ConsensusStateRef: ConsensusState;
+
+    /// Returns the ClientState for the given identifier `client_id`.
+    ///
+    /// Note: Clients have the responsibility to store client states on client creation and update.
+    fn client_state(&self, client_id: &ClientId) -> Result<Self::ClientStateRef, ContextError>;
+
+    /// Retrieve the consensus state for the given client ID at the specified
+    /// height.
+    ///
+    /// Returns an error if no such state exists.
+    ///
+    /// Note: Clients have the responsibility to store consensus states on client creation and update.
+    fn consensus_state(
+        &self,
+        client_cons_state_path: &ClientConsensusStatePath,
+    ) -> Result<Self::ConsensusStateRef, ContextError>;
+
+    /// Returns the timestamp and height of the host when it processed a client
+    /// update request at the specified height.
+    fn client_update_meta(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<(Timestamp, Height), ContextError>;
+}
+
+/// Defines the methods that all client `ExecutionContext`s (precisely the
+/// generic parameter of
+/// [`crate::client_state::ClientStateExecution`] ) must
+/// implement.
+///
+/// Specifically, clients have the responsibility to store their client state
+/// and consensus states. This trait defines a uniform interface to do that for
+/// all clients.
+pub trait ClientExecutionContext:
+    ClientValidationContext<ClientStateRef = Self::ClientStateMut>
+{
+    type ClientStateMut: ClientStateExecution<Self>;
+
+    fn client_state_mut(&self, client_id: &ClientId) -> Result<Self::ClientStateMut, ContextError> {
+        self.client_state(client_id)
+    }
+
+    /// Called upon successful client creation and update
+    fn store_client_state(
+        &mut self,
+        client_state_path: ClientStatePath,
+        client_state: Self::ClientStateRef,
+    ) -> Result<(), ContextError>;
+
+    /// Called upon successful client creation and update
+    fn store_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+        consensus_state: Self::ConsensusStateRef,
+    ) -> Result<(), ContextError>;
+
+    /// Delete the consensus state from the store located at the given `ClientConsensusStatePath`
+    fn delete_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+    ) -> Result<(), ContextError>;
+
+    /// Called upon successful client update.
+    ///
+    /// Implementations are expected to use this to record the specified time
+    /// and height as the time at which this update (or header) was processed.
+    fn store_update_meta(
+        &mut self,
+        client_id: ClientId,
+        height: Height,
+        host_timestamp: Timestamp,
+        host_height: Height,
+    ) -> Result<(), ContextError>;
+
+    /// Delete the update time and height associated with the client at the
+    /// specified height.
+    ///
+    /// This update time should be associated with a consensus state through the
+    /// specified height.
+    ///
+    /// Note that this timestamp is determined by the host.
+    fn delete_update_meta(
+        &mut self,
+        client_id: ClientId,
+        height: Height,
+    ) -> Result<(), ContextError>;
+}
+
+/// An optional trait that extends the client validation context capabilities by
+/// providing additional methods for validating a client state. Mainly
+/// benefiting ICS-07 Tendermint clients by granting access to essential
+/// information from hosts.
+///
+/// Categorized under ICS-02, as it may also be utilized by other types of light
+/// clients. Developers may view this trait as an example of a custom context
+/// definition that expands client validation capabilities, according to their
+/// specific light client requirements.
+pub trait ExtClientValidationContext: ClientValidationContext {
+    /// Returns the current timestamp of the local chain.
+    fn host_timestamp(&self) -> Result<Timestamp, ContextError>;
+
+    /// Returns the current height of the local chain.
+    fn host_height(&self) -> Result<Height, ContextError>;
+
+    /// Returns all the heights at which a consensus state is stored.
+    fn consensus_state_heights(&self, client_id: &ClientId) -> Result<Vec<Height>, ContextError>;
+
+    /// Search for the lowest consensus state higher than `height`.
+    fn next_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::ConsensusStateRef>, ContextError>;
+
+    /// Search for the highest consensus state lower than `height`.
+    fn prev_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::ConsensusStateRef>, ContextError>;
+}
+
+/// An optional trait that extends the client context required during execution.
+///
+/// This trait, as it stands right now, serves as a trait alias for types that
+/// implement both [`ExtClientValidationContext`] and
+/// [`ClientExecutionContext`], and it is auto-implemented for such types.
+///
+/// Light client developers who wish to define and utilize their own custom
+/// client contexts may choose to introduce execution methods within a similar
+/// trait, which would allow them to store additional client-specific data and
+/// conduct execution operations more efficiently, tailored to their light
+/// client implementation.
+pub trait ExtClientExecutionContext: ExtClientValidationContext + ClientExecutionContext {}
+
+impl<T> ExtClientExecutionContext for T where T: ExtClientValidationContext + ClientExecutionContext {}
+
+/// General-purpose helper converter enabling `TryFrom` and `Into` conversions
+/// primarily intended between an enum and its variants. This usually used by
+/// standalone functions as a trait bound allowing them to obtain the concrete
+/// local type from the enum containing that concrete type as its variant, like
+/// when enum `AnyConsensusState` contains the Tendermint `ConsensusState`.
+pub trait Convertible<C>: TryFrom<C> + Into<C> {}
+
+impl<T, C> Convertible<C> for T where T: TryFrom<C> + Into<C> {}
diff --git a/ibc-core/ics02-client/context/src/lib.rs b/ibc-core/ics02-client/context/src/lib.rs
new file mode 100644
index 000000000..7b873f38f
--- /dev/null
+++ b/ibc-core/ics02-client/context/src/lib.rs
@@ -0,0 +1,37 @@
+//! This crate functions as an intermediary layer between the storage of host
+//! chains and an IBC client implementation, providing developers with necessary
+//! traits to craft their custom light clients. It streamlines the process of
+//! integrating light clients with the host, enabling interaction with the store
+//! for pertinent client state transitions.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod client_state;
+pub mod consensus_state;
+
+mod context;
+pub use context::*;
+
+/// Trait preludes for the ICS-02 client implementation.
+pub mod prelude {
+    pub use crate::client_state::*;
+    pub use crate::consensus_state::*;
+    pub use crate::context::*;
+}
+
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_client_types::*;
+}
diff --git a/ibc-core/ics02-client/src/handler/create_client.rs b/ibc-core/ics02-client/src/handler/create_client.rs
new file mode 100644
index 000000000..4cb3d34f2
--- /dev/null
+++ b/ibc-core/ics02-client/src/handler/create_client.rs
@@ -0,0 +1,91 @@
+//! Protocol logic specific to processing ICS2 messages of type `MsgCreateClient`.
+
+use ibc_core_client_context::prelude::*;
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::events::CreateClient;
+use ibc_core_client_types::msgs::MsgCreateClient;
+use ibc_core_handler_types::error::ContextError;
+use ibc_core_handler_types::events::{IbcEvent, MessageEvent};
+use ibc_core_host::{ClientStateMut, ClientStateRef, ExecutionContext, ValidationContext};
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Any;
+
+pub fn validate<Ctx>(ctx: &Ctx, msg: MsgCreateClient) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+    <ClientStateRef<Ctx> as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    let MsgCreateClient {
+        client_state,
+        consensus_state,
+        signer,
+    } = msg;
+
+    ctx.validate_message_signer(&signer)?;
+
+    // Construct this client's identifier
+    let id_counter = ctx.client_counter()?;
+
+    let client_val_ctx = ctx.get_client_validation_context();
+
+    let client_state = ClientStateRef::<Ctx>::try_from(client_state).map_err(Into::into)?;
+
+    let client_id = client_state.client_type().build_client_id(id_counter);
+
+    let status = client_state.status(client_val_ctx, &client_id)?;
+
+    if status.is_frozen() {
+        return Err(ClientError::ClientFrozen {
+            description: "the client is frozen".to_string(),
+        }
+        .into());
+    };
+
+    client_state.verify_consensus_state(consensus_state)?;
+
+    if client_val_ctx.client_state(&client_id).is_ok() {
+        return Err(ClientError::ClientStateAlreadyExists { client_id }.into());
+    };
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx: &mut Ctx, msg: MsgCreateClient) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+    <ClientStateMut<Ctx> as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    let MsgCreateClient {
+        client_state,
+        consensus_state,
+        signer: _,
+    } = msg;
+
+    // Construct this client's identifier
+    let id_counter = ctx.client_counter()?;
+
+    let client_exec_ctx = ctx.get_client_execution_context();
+
+    let client_state = ClientStateMut::<Ctx>::try_from(client_state).map_err(Into::into)?;
+
+    let client_type = client_state.client_type();
+    let client_id = client_type.build_client_id(id_counter);
+
+    client_state.initialise(client_exec_ctx, &client_id, consensus_state)?;
+
+    ctx.increase_client_counter()?;
+
+    let event = IbcEvent::CreateClient(CreateClient::new(
+        client_id.clone(),
+        client_type,
+        client_state.latest_height(),
+    ));
+    ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client))?;
+    ctx.emit_ibc_event(event)?;
+
+    ctx.log_message(format!(
+        "success: generated new client identifier: {client_id}"
+    ))?;
+
+    Ok(())
+}
diff --git a/crates/ibc/src/core/ics02_client/handler.rs b/ibc-core/ics02-client/src/handler/mod.rs
similarity index 87%
rename from crates/ibc/src/core/ics02_client/handler.rs
rename to ibc-core/ics02-client/src/handler/mod.rs
index 65c5e59c8..791b5ce39 100644
--- a/crates/ibc/src/core/ics02_client/handler.rs
+++ b/ibc-core/ics02-client/src/handler/mod.rs
@@ -1,5 +1,6 @@
 //! This module implements the processing logic for ICS2 (client abstractions and functions) msgs.
 
 pub mod create_client;
+pub mod recover_client;
 pub mod update_client;
 pub mod upgrade_client;
diff --git a/ibc-core/ics02-client/src/handler/recover_client.rs b/ibc-core/ics02-client/src/handler/recover_client.rs
new file mode 100644
index 000000000..1676c6e80
--- /dev/null
+++ b/ibc-core/ics02-client/src/handler/recover_client.rs
@@ -0,0 +1,91 @@
+//! Protocol logic for processing ICS02 messages of type `MsgRecoverClient`.
+
+use ibc_core_client_context::prelude::*;
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::msgs::MsgRecoverClient;
+use ibc_core_handler_types::error::ContextError;
+use ibc_core_host::types::path::ClientConsensusStatePath;
+use ibc_core_host::{ExecutionContext, ValidationContext};
+
+/// Performs the validation steps associated with the client recovery process. This
+/// includes validating that the parameters of the subject and substitute clients match,
+/// as well as validating that the substitute client *is* active and that the subject
+/// client is *not* active.
+pub fn validate<Ctx>(ctx: &Ctx, msg: MsgRecoverClient) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    let signer = msg.signer;
+    let subject_client_id = msg.subject_client_id.clone();
+    let substitute_client_id = msg.substitute_client_id.clone();
+
+    ctx.validate_message_signer(&signer)?;
+
+    let client_val_ctx = ctx.get_client_validation_context();
+
+    let subject_client_state = client_val_ctx.client_state(&subject_client_id)?;
+    let substitute_client_state = client_val_ctx.client_state(&substitute_client_id)?;
+
+    let subject_height = subject_client_state.latest_height();
+    let substitute_height = substitute_client_state.latest_height();
+
+    if subject_height >= substitute_height {
+        return Err(ClientError::ClientRecoveryHeightMismatch {
+            subject_height,
+            substitute_height,
+        }
+        .into());
+    }
+
+    substitute_client_state
+        .status(ctx.get_client_validation_context(), &substitute_client_id)?
+        .verify_is_active()?;
+
+    // Verify that the subject client is inactive, i.e., that it is either frozen or expired
+    subject_client_state
+        .status(ctx.get_client_validation_context(), &subject_client_id)?
+        .verify_is_inactive()?;
+
+    // Check that the subject client state and substitute client states match, i.e., that
+    // all their respective client state parameters match except for frozen height, latest
+    // height, trusting period, and chain ID
+    subject_client_state.check_substitute(
+        ctx.get_client_validation_context(),
+        substitute_client_state.into(),
+    )?;
+
+    Ok(())
+}
+
+/// Executes the steps needed to recover the subject client, namely:
+///  - setting the subject's status from either `frozen` or `expired` to `active`
+///  - copying the substitute client's consensus state as the subject's consensus state
+///  - setting the subject client's processed height and processed time values to match the substitute client's
+///  - setting the subject client's latest height, trusting period, and chain ID values to match the substitute client's
+pub fn execute<Ctx>(ctx: &mut Ctx, msg: MsgRecoverClient) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let subject_client_id = msg.subject_client_id.clone();
+    let substitute_client_id = msg.substitute_client_id.clone();
+
+    let client_exec_ctx = ctx.get_client_execution_context();
+
+    let subject_client_state = client_exec_ctx.client_state(&subject_client_id)?;
+    let substitute_client_state = client_exec_ctx.client_state(&substitute_client_id)?;
+    let substitute_consensus_state =
+        client_exec_ctx.consensus_state(&ClientConsensusStatePath::new(
+            substitute_client_id.clone(),
+            substitute_client_state.latest_height().revision_number(),
+            substitute_client_state.latest_height().revision_height(),
+        ))?;
+
+    subject_client_state.update_on_recovery(
+        ctx.get_client_execution_context(),
+        &subject_client_id,
+        substitute_client_state.into(),
+        substitute_consensus_state.into(),
+    )?;
+
+    Ok(())
+}
diff --git a/ibc-core/ics02-client/src/handler/update_client.rs b/ibc-core/ics02-client/src/handler/update_client.rs
new file mode 100644
index 000000000..81e140b8a
--- /dev/null
+++ b/ibc-core/ics02-client/src/handler/update_client.rs
@@ -0,0 +1,98 @@
+//! Protocol logic specific to processing ICS2 messages of type `MsgUpdateAnyClient`.
+
+use ibc_core_client_context::prelude::*;
+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_handler_types::error::ContextError;
+use ibc_core_handler_types::events::{IbcEvent, MessageEvent};
+use ibc_core_host::{ExecutionContext, ValidationContext};
+use ibc_primitives::prelude::*;
+use ibc_primitives::ToVec;
+
+pub fn validate<Ctx>(ctx: &Ctx, msg: MsgUpdateOrMisbehaviour) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx.validate_message_signer(msg.signer())?;
+
+    let client_id = msg.client_id().clone();
+
+    let client_val_ctx = ctx.get_client_validation_context();
+
+    // Read client state from the host chain store. The client should already exist.
+    let client_state = client_val_ctx.client_state(&client_id)?;
+
+    client_state
+        .status(client_val_ctx, &client_id)?
+        .verify_is_active()?;
+
+    let client_message = msg.client_message();
+
+    client_state.verify_client_message(client_val_ctx, &client_id, client_message)?;
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx: &mut Ctx, msg: MsgUpdateOrMisbehaviour) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let client_id = msg.client_id().clone();
+    let update_kind = match msg {
+        MsgUpdateOrMisbehaviour::UpdateClient(_) => UpdateKind::UpdateClient,
+        MsgUpdateOrMisbehaviour::Misbehaviour(_) => UpdateKind::SubmitMisbehaviour,
+    };
+    let client_message = msg.client_message();
+
+    let client_exec_ctx = ctx.get_client_execution_context();
+
+    let client_state = client_exec_ctx.client_state(&client_id)?;
+
+    let found_misbehaviour =
+        client_state.check_for_misbehaviour(client_exec_ctx, &client_id, client_message.clone())?;
+
+    if found_misbehaviour {
+        client_state.update_state_on_misbehaviour(client_exec_ctx, &client_id, client_message)?;
+
+        let event = IbcEvent::ClientMisbehaviour(ClientMisbehaviour::new(
+            client_id,
+            client_state.client_type(),
+        ));
+        ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client))?;
+        ctx.emit_ibc_event(event)?;
+    } else {
+        if !matches!(update_kind, UpdateKind::UpdateClient) {
+            return Err(ClientError::MisbehaviourHandlingFailure {
+                reason: "misbehaviour submitted, but none found".to_string(),
+            }
+            .into());
+        }
+
+        let header = client_message;
+
+        let consensus_heights =
+            client_state.update_state(client_exec_ctx, &client_id, header.clone())?;
+
+        {
+            let event = {
+                let consensus_height = consensus_heights.first().ok_or(ClientError::Other {
+                    description: "client update state returned no updated height".to_string(),
+                })?;
+
+                IbcEvent::UpdateClient(UpdateClient::new(
+                    client_id,
+                    client_state.client_type(),
+                    *consensus_height,
+                    consensus_heights,
+                    header.to_vec(),
+                ))
+            };
+            ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client))?;
+            ctx.emit_ibc_event(event)?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics02-client/src/handler/upgrade_client.rs b/ibc-core/ics02-client/src/handler/upgrade_client.rs
new file mode 100644
index 000000000..a072988a2
--- /dev/null
+++ b/ibc-core/ics02-client/src/handler/upgrade_client.rs
@@ -0,0 +1,84 @@
+//! Protocol logic specific to processing ICS2 messages of type `MsgUpgradeAnyClient`.
+//!
+use ibc_core_client_context::prelude::*;
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::events::UpgradeClient;
+use ibc_core_client_types::msgs::MsgUpgradeClient;
+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: &Ctx, msg: MsgUpgradeClient) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    let MsgUpgradeClient {
+        client_id, signer, ..
+    } = msg;
+
+    ctx.validate_message_signer(&signer)?;
+
+    let client_val_ctx = ctx.get_client_validation_context();
+
+    // Read the current latest client state from the host chain store.
+    let old_client_state = client_val_ctx.client_state(&client_id)?;
+
+    // Check if the client is active.
+    old_client_state
+        .status(client_val_ctx, &client_id)?
+        .verify_is_active()?;
+
+    // Read the latest consensus state from the host chain store.
+    let old_client_cons_state_path = ClientConsensusStatePath::new(
+        client_id.clone(),
+        old_client_state.latest_height().revision_number(),
+        old_client_state.latest_height().revision_height(),
+    );
+    let old_consensus_state = client_val_ctx
+        .consensus_state(&old_client_cons_state_path)
+        .map_err(|_| ClientError::ConsensusStateNotFound {
+            client_id,
+            height: old_client_state.latest_height(),
+        })?;
+
+    // Validate the upgraded client state and consensus state and verify proofs against the root
+    old_client_state.verify_upgrade_client(
+        msg.upgraded_client_state.clone(),
+        msg.upgraded_consensus_state,
+        msg.proof_upgrade_client,
+        msg.proof_upgrade_consensus_state,
+        old_consensus_state.root(),
+    )?;
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx: &mut Ctx, msg: MsgUpgradeClient) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let MsgUpgradeClient { client_id, .. } = msg;
+
+    let client_exec_ctx = ctx.get_client_execution_context();
+
+    let old_client_state = client_exec_ctx.client_state(&client_id)?;
+
+    let latest_height = old_client_state.update_state_on_upgrade(
+        client_exec_ctx,
+        &client_id,
+        msg.upgraded_client_state.clone(),
+        msg.upgraded_consensus_state,
+    )?;
+
+    let event = IbcEvent::UpgradeClient(UpgradeClient::new(
+        client_id,
+        old_client_state.client_type(),
+        latest_height,
+    ));
+    ctx.emit_ibc_event(IbcEvent::Message(MessageEvent::Client))?;
+    ctx.emit_ibc_event(event)?;
+
+    Ok(())
+}
diff --git a/ibc-core/ics02-client/src/lib.rs b/ibc-core/ics02-client/src/lib.rs
new file mode 100644
index 000000000..b692624c8
--- /dev/null
+++ b/ibc-core/ics02-client/src/lib.rs
@@ -0,0 +1,31 @@
+//! ICS-02: Client Semantics implementation for verifying remote IBC-enabled chains,
+//! along with re-exporting data structures from `ibc-core-client-types` crate.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod handler;
+
+/// Re-exports ICS-02 traits from `ibc-core-client-context` for custom IBC
+/// client implementation.
+pub mod context {
+    #[doc(inline)]
+    pub use ibc_core_client_context::*;
+}
+
+/// Re-exports ICS-02 data structures from the `ibc-core-client-types` crate.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_client_types::*;
+}
diff --git a/ibc-core/ics02-client/types/Cargo.toml b/ibc-core/ics02-client/types/Cargo.toml
new file mode 100644
index 000000000..bc11d449c
--- /dev/null
+++ b/ibc-core/ics02-client/types/Cargo.toml
@@ -0,0 +1,85 @@
+[package]
+name         = "ibc-core-client-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "client", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-02 Client Semantics data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host-types       = { workspace = true }
+ibc-primitives            = { workspace = true }
+ibc-proto                 = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "serde/std",
+  "subtle-encoding/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "ibc-core-host-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+  "dep:serde",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core-host-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core-host-types/parity-scale-codec",
+  "ibc-core-commitment-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/crates/ibc/src/core/ics02_client/error.rs b/ibc-core/ics02-client/types/src/error.rs
similarity index 67%
rename from crates/ibc/src/core/ics02_client/error.rs
rename to ibc-core/ics02-client/types/src/error.rs
index efda51a0f..08c6d2114 100644
--- a/crates/ibc/src/core/ics02_client/error.rs
+++ b/ibc-core/ics02-client/types/src/error.rs
@@ -1,38 +1,43 @@
 //! Defines the client error type
 
-use crate::prelude::*;
+use core::convert::Infallible;
 
 use displaydoc::Display;
-use ibc_proto::protobuf::Error as TendermintProtoError;
+use ibc_core_commitment_types::error::CommitmentError;
+use ibc_core_host_types::error::IdentifierError;
+use ibc_core_host_types::identifiers::{ClientId, ClientType};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Timestamp;
 
-use crate::core::ics02_client::client_type::ClientType;
-use crate::core::ics23_commitment::error::CommitmentError;
-use crate::core::ics24_host::identifier::{ClientId, IdentifierError};
-use crate::core::timestamp::Timestamp;
-use crate::core::ContextError;
-use crate::Height;
+use super::status::Status;
+use crate::height::Height;
 
 /// Encodes all the possible client errors
 #[derive(Debug, Display)]
 pub enum ClientError {
     /// upgrade client error: `{0}`
     Upgrade(UpgradeClientError),
-    /// Client identifier constructor failed for type `{client_type}` with counter `{counter}`, validation error: `{validation_error}`
-    ClientIdentifierConstructor {
-        client_type: ClientType,
-        counter: u64,
-        validation_error: IdentifierError,
-    },
     /// client is frozen with description: `{description}`
     ClientFrozen { description: String },
+    /// client is not active. Status=`{status}`
+    ClientNotActive { status: Status },
+    /// client is not frozen or expired. Status=`{status}`
+    ClientNotInactive { status: Status },
     /// client state not found: `{client_id}`
     ClientStateNotFound { client_id: ClientId },
     /// client state already exists: `{client_id}`
     ClientStateAlreadyExists { client_id: ClientId },
+    /// Substitute client height `{substitute_height}` is not greater than subject client height `{subject_height}` during client recovery
+    ClientRecoveryHeightMismatch {
+        subject_height: Height,
+        substitute_height: Height,
+    },
+    /// Subject and substitute client state mismatch during client recovery
+    ClientRecoveryStateMismatch,
     /// consensus state not found at: `{client_id}` at height `{height}`
     ConsensusStateNotFound { client_id: ClientId, height: Height },
-    /// implementation specific error
-    ImplementationSpecific,
+    /// Processed time or height for the client `{client_id}` at height `{height}` not found
+    UpdateMetaDataNotFound { client_id: ClientId, height: Height },
     /// header verification failed with reason: `{reason}`
     HeaderVerificationFailure { reason: String },
     /// failed to build trust threshold from fraction: `{numerator}`/`{denominator}`
@@ -55,16 +60,14 @@ pub enum ClientError {
     MissingRawConsensusState,
     /// invalid client id in the update client message: `{0}`
     InvalidMsgUpdateClientId(IdentifierError),
-    /// encode error: `{0}`
-    Encode(prost::EncodeError),
-    /// decode error: `{0}`
-    Decode(prost::DecodeError),
+    /// invalid client id in recover client message: `{0}`
+    InvalidMsgRecoverClientId(IdentifierError),
     /// invalid client identifier error: `{0}`
     InvalidClientIdentifier(IdentifierError),
-    /// invalid raw header error: `{0}`
-    InvalidRawHeader(TendermintProtoError),
-    /// missing raw header
-    MissingRawHeader,
+    /// invalid raw header error: `{reason}`
+    InvalidRawHeader { reason: String },
+    /// missing raw client message
+    MissingClientMessage,
     /// invalid raw misbehaviour error: `{0}`
     InvalidRawMisbehaviour(IdentifierError),
     /// missing raw misbehaviour
@@ -81,21 +84,11 @@ pub enum ClientError {
     /// invalid commitment proof bytes error: `{0}`
     InvalidCommitmentProof(CommitmentError),
     /// invalid packet timeout timestamp value error: `{0}`
-    InvalidPacketTimestamp(crate::core::timestamp::ParseTimestampError),
+    InvalidPacketTimestamp(ibc_primitives::ParseTimestampError),
     /// mismatch between client and arguments types
     ClientArgsTypeMismatch { client_type: ClientType },
-    /// received header height (`{header_height}`) is lower than (or equal to) client latest height (`{latest_height}`)
-    LowHeaderHeight {
-        header_height: Height,
-        latest_height: Height,
-    },
     /// timestamp is invalid or missing, timestamp=`{time1}`,  now=`{time2}`
     InvalidConsensusStateTimestamp { time1: Timestamp, time2: Timestamp },
-    /// header not within trusting period: expires_at=`{latest_time}` now=`{update_time}`
-    HeaderNotWithinTrustPeriod {
-        latest_time: Timestamp,
-        update_time: Timestamp,
-    },
     /// the local consensus state could not be retrieved for height `{height}`
     MissingLocalConsensusState { height: Height },
     /// invalid signer error: `{reason}`
@@ -104,38 +97,39 @@ pub enum ClientError {
     Ics23Verification(CommitmentError),
     /// misbehaviour handling failed with reason: `{reason}`
     MisbehaviourHandlingFailure { reason: String },
-    /// client specific error: `{description}`
+    /// client-specific error: `{description}`
     ClientSpecific { description: String },
+    /// client counter overflow error
+    CounterOverflow,
+    /// update client message did not contain valid header or misbehaviour
+    InvalidUpdateClientMessage,
     /// other error: `{description}`
     Other { description: String },
 }
 
-impl From<ContextError> for ClientError {
-    fn from(context_error: ContextError) -> Self {
-        match context_error {
-            ContextError::ClientError(e) => e,
-            _ => ClientError::Other {
-                description: context_error.to_string(),
-            },
+impl From<&'static str> for ClientError {
+    fn from(s: &'static str) -> Self {
+        Self::Other {
+            description: s.to_string(),
         }
     }
 }
 
+impl From<Infallible> for ClientError {
+    fn from(value: Infallible) -> Self {
+        match value {}
+    }
+}
+
 #[cfg(feature = "std")]
 impl std::error::Error for ClientError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
-            Self::ClientIdentifierConstructor {
-                validation_error: e,
-                ..
-            } => Some(e),
-            Self::InvalidMsgUpdateClientId(e) => Some(e),
-            Self::InvalidClientIdentifier(e) => Some(e),
-            Self::InvalidRawHeader(e) => Some(e),
-            Self::InvalidRawMisbehaviour(e) => Some(e),
-            Self::InvalidCommitmentProof(e) => Some(e),
+            Self::InvalidMsgUpdateClientId(e)
+            | Self::InvalidClientIdentifier(e)
+            | Self::InvalidRawMisbehaviour(e) => Some(e),
+            Self::InvalidCommitmentProof(e) | Self::Ics23Verification(e) => Some(e),
             Self::InvalidPacketTimestamp(e) => Some(e),
-            Self::Ics23Verification(e) => Some(e),
             _ => None,
         }
     }
@@ -171,8 +165,9 @@ impl From<UpgradeClientError> for ClientError {
 impl std::error::Error for UpgradeClientError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
-            Self::InvalidUpgradeClientProof(e) => Some(e),
-            Self::InvalidUpgradeConsensusStateProof(e) => Some(e),
+            Self::InvalidUpgradeClientProof(e) | Self::InvalidUpgradeConsensusStateProof(e) => {
+                Some(e)
+            }
             _ => None,
         }
     }
diff --git a/crates/ibc/src/core/ics02_client/events.rs b/ibc-core/ics02-client/types/src/events.rs
similarity index 73%
rename from crates/ibc/src/core/ics02_client/events.rs
rename to ibc-core/ics02-client/types/src/events.rs
index c216521b1..d7c7545c1 100644
--- a/crates/ibc/src/core/ics02_client/events.rs
+++ b/ibc-core/ics02-client/types/src/events.rs
@@ -1,20 +1,17 @@
 //! Types for the IBC events emitted from Tendermint Websocket by the client module.
-use crate::prelude::*;
-
 use derive_more::From;
-use ibc_proto::google::protobuf::Any;
+use ibc_core_host_types::identifiers::{ClientId, ClientType};
+use ibc_primitives::prelude::*;
 use subtle_encoding::hex;
 use tendermint::abci;
 
-use crate::core::ics02_client::client_type::ClientType;
-use crate::core::ics02_client::height::Height;
-use crate::core::ics24_host::identifier::ClientId;
+use crate::height::Height;
 
 /// Client event types
-const CREATE_CLIENT_EVENT: &str = "create_client";
-const UPDATE_CLIENT_EVENT: &str = "update_client";
-const CLIENT_MISBEHAVIOUR_EVENT: &str = "client_misbehaviour";
-const UPGRADE_CLIENT_EVENT: &str = "upgrade_client";
+pub const CREATE_CLIENT_EVENT: &str = "create_client";
+pub const UPDATE_CLIENT_EVENT: &str = "update_client";
+pub const CLIENT_MISBEHAVIOUR_EVENT: &str = "client_misbehaviour";
+pub const UPGRADE_CLIENT_EVENT: &str = "upgrade_client";
 
 /// The content of the `key` field for the attribute containing the client identifier.
 pub const CLIENT_ID_ATTRIBUTE_KEY: &str = "client_id";
@@ -147,14 +144,16 @@ impl From<ConsensusHeightsAttribute> for abci::EventAttribute {
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, From, PartialEq, Eq)]
 struct HeaderAttribute {
-    header: Any,
+    /// NOTE: The header is encoded as bytes of the
+    /// [`Any`](ibc_proto::google::protobuf::Any) type.
+    header: Vec<u8>,
 }
 
 impl From<HeaderAttribute> for abci::EventAttribute {
     fn from(attr: HeaderAttribute) -> Self {
         (
             HEADER_ATTRIBUTE_KEY,
-            String::from_utf8(hex::encode(attr.header.value))
+            str::from_utf8(&hex::encode(attr.header))
                 .expect("Never fails because hexadecimal is valid UTF-8"),
         )
             .into()
@@ -247,12 +246,16 @@ pub struct UpdateClient {
 }
 
 impl UpdateClient {
+    /// Constructs a new UpdateClient event.
+    ///
+    /// NOTE: the `header` is the encoded bytes of the
+    /// [`Any`](ibc_proto::google::protobuf::Any) type.
     pub fn new(
         client_id: ClientId,
         client_type: ClientType,
         consensus_height: Height,
         consensus_heights: Vec<Height>,
-        header: Any,
+        header: Vec<u8>,
     ) -> Self {
         Self {
             client_id: ClientIdAttribute::from(client_id),
@@ -279,7 +282,7 @@ impl UpdateClient {
         self.consensus_heights.consensus_heights.as_ref()
     }
 
-    pub fn header(&self) -> &Any {
+    pub fn header(&self) -> &Vec<u8> {
         &self.header.header
     }
 
@@ -413,102 +416,3 @@ impl From<UpgradeClient> for abci::Event {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::core::timestamp::Timestamp;
-    use crate::mock::header::MockHeader;
-    use ibc_proto::google::protobuf::Any;
-    use std::str::FromStr;
-    use tendermint::abci::Event as AbciEvent;
-
-    #[test]
-    fn ibc_to_abci_client_events() {
-        struct Test {
-            event_kind: &'static str,
-            event: AbciEvent,
-            expected_keys: Vec<&'static str>,
-            expected_values: Vec<&'static str>,
-        }
-
-        let client_type = ClientType::from_str("07-tendermint")
-            .expect("never fails because it's a valid client type");
-        let client_id = ClientId::new(client_type.clone(), 0).unwrap();
-        let consensus_height = Height::new(0, 5).unwrap();
-        let consensus_heights = vec![Height::new(0, 5).unwrap(), Height::new(0, 7).unwrap()];
-        let header: Any = MockHeader::new(consensus_height)
-            .with_timestamp(Timestamp::none())
-            .into();
-        let expected_keys = vec![
-            "client_id",
-            "client_type",
-            "consensus_height",
-            "consensus_heights",
-            "header",
-        ];
-
-        let expected_values = vec![
-            "07-tendermint-0",
-            "07-tendermint",
-            "0-5",
-            "0-5,0-7",
-            "0a021005",
-        ];
-
-        let tests: Vec<Test> = vec![
-            Test {
-                event_kind: CREATE_CLIENT_EVENT,
-                event: CreateClient::new(client_id.clone(), client_type.clone(), consensus_height)
-                    .into(),
-                expected_keys: expected_keys[0..3].to_vec(),
-                expected_values: expected_values[0..3].to_vec(),
-            },
-            Test {
-                event_kind: UPDATE_CLIENT_EVENT,
-                event: UpdateClient::new(
-                    client_id.clone(),
-                    client_type.clone(),
-                    consensus_height,
-                    consensus_heights,
-                    header,
-                )
-                .into(),
-                expected_keys: expected_keys.clone(),
-                expected_values: expected_values.clone(),
-            },
-            Test {
-                event_kind: UPGRADE_CLIENT_EVENT,
-                event: UpgradeClient::new(client_id.clone(), client_type.clone(), consensus_height)
-                    .into(),
-                expected_keys: expected_keys[0..3].to_vec(),
-                expected_values: expected_values[0..3].to_vec(),
-            },
-            Test {
-                event_kind: CLIENT_MISBEHAVIOUR_EVENT,
-                event: ClientMisbehaviour::new(client_id, client_type).into(),
-                expected_keys: expected_keys[0..2].to_vec(),
-                expected_values: expected_values[0..2].to_vec(),
-            },
-        ];
-
-        for t in tests {
-            assert_eq!(t.event.kind, t.event_kind);
-            assert_eq!(t.expected_keys.len(), t.event.attributes.len());
-            for (i, e) in t.event.attributes.iter().enumerate() {
-                assert_eq!(
-                    e.key, t.expected_keys[i],
-                    "key mismatch for {:?}",
-                    t.event_kind
-                );
-            }
-            for (i, e) in t.event.attributes.iter().enumerate() {
-                assert_eq!(
-                    e.value, t.expected_values[i],
-                    "value mismatch for {:?}",
-                    t.event_kind
-                );
-            }
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics02_client/height.rs b/ibc-core/ics02-client/types/src/height.rs
similarity index 90%
rename from crates/ibc/src/core/ics02_client/height.rs
rename to ibc-core/ics02-client/types/src/height.rs
index 3adced7a9..96eda4c92 100644
--- a/crates/ibc/src/core/ics02_client/height.rs
+++ b/ibc-core/ics02-client/types/src/height.rs
@@ -1,17 +1,15 @@
 //! Defines the core `Height` type used throughout the library
 
-use crate::prelude::*;
 use core::cmp::Ordering;
-
 use core::num::ParseIntError;
 use core::str::FromStr;
 
 use displaydoc::Display;
-use ibc_proto::protobuf::Protobuf;
-
+use ibc_primitives::prelude::*;
 use ibc_proto::ibc::core::client::v1::Height as RawHeight;
+use ibc_proto::Protobuf;
 
-use crate::core::ics02_client::error::ClientError;
+use crate::error::ClientError;
 
 /// The core IBC height type, which represents the height of a chain,
 /// which typically is the number of blocks since genesis
@@ -29,6 +27,7 @@ use crate::core::ics02_client::error::ClientError;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]
 pub struct Height {
     /// Previously known as "epoch"
@@ -150,7 +149,7 @@ impl core::fmt::Display for Height {
 }
 
 /// Encodes all errors related to chain heights
-#[derive(Debug, Display, PartialEq)]
+#[derive(Debug, Display, PartialEq, Eq)]
 pub enum HeightError {
     /// cannot convert into a `Height` type from string `{height}`
     HeightConversion {
@@ -159,7 +158,7 @@ pub enum HeightError {
     },
     /// attempted to parse an invalid zero height
     ZeroHeight,
-    /// the height(`{raw_height}`) is not valid format, this format must be used: \[revision_number\]-\[revision_height\]
+    /// the height(`{raw_height}`) is not a valid format, this format must be used: \[revision_number\]-\[revision_height\]
     InvalidFormat { raw_height: String },
 }
 
@@ -168,8 +167,7 @@ impl std::error::Error for HeightError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
             HeightError::HeightConversion { error: e, .. } => Some(e),
-            HeightError::ZeroHeight => None,
-            HeightError::InvalidFormat { .. } => None,
+            HeightError::ZeroHeight | HeightError::InvalidFormat { .. } => None,
         }
     }
 }
@@ -178,14 +176,12 @@ impl TryFrom<&str> for Height {
     type Error = HeightError;
 
     fn try_from(value: &str) -> Result<Self, Self::Error> {
-        let (rev_number_str, rev_height_str) = match value.split_once('-') {
-            Some((rev_number_str, rev_height_str)) => (rev_number_str, rev_height_str),
-            None => {
-                return Err(HeightError::InvalidFormat {
+        let (rev_number_str, rev_height_str) =
+            value
+                .split_once('-')
+                .ok_or_else(|| HeightError::InvalidFormat {
                     raw_height: value.to_owned(),
-                })
-            }
-        };
+                })?;
 
         let revision_number =
             rev_number_str
diff --git a/ibc-core/ics02-client/types/src/lib.rs b/ibc-core/ics02-client/types/src/lib.rs
new file mode 100644
index 000000000..f7c1f9593
--- /dev/null
+++ b/ibc-core/ics02-client/types/src/lib.rs
@@ -0,0 +1,29 @@
+//! Implementation of the Client Semantics (ICS-02) data structures.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod error;
+pub mod events;
+mod height;
+pub mod msgs;
+mod status;
+
+pub use height::*;
+pub use status::*;
+
+/// Re-exports ICS-02 proto types from the `ibc-proto` crate for added convenience.
+pub mod proto {
+    pub use ibc_proto::ibc::core::client::*;
+}
diff --git a/ibc-core/ics02-client/types/src/msgs/create_client.rs b/ibc-core/ics02-client/types/src/msgs/create_client.rs
new file mode 100644
index 000000000..fe6944b3d
--- /dev/null
+++ b/ibc-core/ics02-client/types/src/msgs/create_client.rs
@@ -0,0 +1,64 @@
+//! Definition of domain type message `MsgCreateClient`.
+
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::client::v1::MsgCreateClient as RawMsgCreateClient;
+use ibc_proto::Protobuf;
+
+use crate::error::ClientError;
+
+pub const CREATE_CLIENT_TYPE_URL: &str = "/ibc.core.client.v1.MsgCreateClient";
+
+/// A type of message that triggers the creation of a new on-chain (IBC) client.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgCreateClient {
+    pub client_state: Any,
+    pub consensus_state: Any,
+    pub signer: Signer,
+}
+
+impl MsgCreateClient {
+    pub fn new(client_state: Any, consensus_state: Any, signer: Signer) -> Self {
+        MsgCreateClient {
+            client_state,
+            consensus_state,
+            signer,
+        }
+    }
+}
+
+impl Protobuf<RawMsgCreateClient> for MsgCreateClient {}
+
+impl TryFrom<RawMsgCreateClient> for MsgCreateClient {
+    type Error = ClientError;
+
+    fn try_from(raw: RawMsgCreateClient) -> Result<Self, Self::Error> {
+        let raw_client_state = raw.client_state.ok_or(ClientError::MissingRawClientState)?;
+
+        let raw_consensus_state = raw
+            .consensus_state
+            .ok_or(ClientError::MissingRawConsensusState)?;
+
+        Ok(MsgCreateClient::new(
+            raw_client_state,
+            raw_consensus_state,
+            raw.signer.into(),
+        ))
+    }
+}
+
+impl From<MsgCreateClient> for RawMsgCreateClient {
+    fn from(ics_msg: MsgCreateClient) -> Self {
+        RawMsgCreateClient {
+            client_state: Some(ics_msg.client_state),
+            consensus_state: Some(ics_msg.consensus_state),
+            signer: ics_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/crates/ibc/src/core/ics02_client/msgs/misbehaviour.rs b/ibc-core/ics02-client/types/src/msgs/misbehaviour.rs
similarity index 65%
rename from crates/ibc/src/core/ics02_client/msgs/misbehaviour.rs
rename to ibc-core/ics02-client/types/src/msgs/misbehaviour.rs
index 011db59dd..0b4031fe5 100644
--- a/crates/ibc/src/core/ics02_client/msgs/misbehaviour.rs
+++ b/ibc-core/ics02-client/types/src/msgs/misbehaviour.rs
@@ -1,37 +1,39 @@
 //! Definition of domain type message `MsgSubmitMisbehaviour`.
 
-use crate::prelude::*;
-
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
 use ibc_proto::google::protobuf::Any as ProtoAny;
 use ibc_proto::ibc::core::client::v1::MsgSubmitMisbehaviour as RawMsgSubmitMisbehaviour;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::Msg;
-use crate::signer::Signer;
+use crate::error::ClientError;
 
-pub(crate) const TYPE_URL: &str = "/ibc.core.client.v1.MsgSubmitMisbehaviour";
+pub const SUBMIT_MISBEHAVIOUR_TYPE_URL: &str = "/ibc.core.client.v1.MsgSubmitMisbehaviour";
 
 /// A type of message that submits client misbehaviour proof.
+///
+/// Deprecated since v0.51.0. Misbehaviour reports should be submitted via the `MsgUpdateClient`
+/// type through its `client_message` field.
+#[deprecated(
+    since = "0.51.0",
+    note = "Misbehaviour reports should be submitted via `MsgUpdateClient` through its `client_message` field"
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct MsgSubmitMisbehaviour {
     /// client unique identifier
     pub client_id: ClientId,
-    /// misbehaviour used for freezing the light client
+    /// misbehaviour, used for freezing the light client
     pub misbehaviour: ProtoAny,
     /// signer address
     pub signer: Signer,
 }
 
-impl Msg for MsgSubmitMisbehaviour {
-    type Raw = RawMsgSubmitMisbehaviour;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
 impl Protobuf<RawMsgSubmitMisbehaviour> for MsgSubmitMisbehaviour {}
 
 impl TryFrom<RawMsgSubmitMisbehaviour> for MsgSubmitMisbehaviour {
diff --git a/crates/ibc/src/core/ics02_client/msgs.rs b/ibc-core/ics02-client/types/src/msgs/mod.rs
similarity index 52%
rename from crates/ibc/src/core/ics02_client/msgs.rs
rename to ibc-core/ics02-client/types/src/msgs/mod.rs
index 87f81fde0..fbb76a821 100644
--- a/crates/ibc/src/core/ics02_client/msgs.rs
+++ b/ibc-core/ics02-client/types/src/msgs/mod.rs
@@ -1,50 +1,61 @@
+#![allow(deprecated)]
+
 //! Defines the client message types that are sent to the chain by the relayer.
 
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
 use ibc_proto::google::protobuf::Any;
 
-use crate::core::ics02_client::msgs::create_client::MsgCreateClient;
-use crate::core::ics02_client::msgs::misbehaviour::MsgSubmitMisbehaviour;
-use crate::core::ics02_client::msgs::update_client::MsgUpdateClient;
-use crate::core::ics02_client::msgs::upgrade_client::MsgUpgradeClient;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::signer::Signer;
+mod create_client;
+mod misbehaviour;
+mod recover_client;
+mod update_client;
+mod upgrade_client;
 
-pub mod create_client;
-pub mod misbehaviour;
-pub mod update_client;
-pub mod upgrade_client;
+pub use create_client::*;
+pub use misbehaviour::*;
+pub use recover_client::*;
+pub use update_client::*;
+pub use upgrade_client::*;
 
 /// Encodes all the different client messages
 #[allow(dead_code)]
-#[derive(Clone, Debug)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
 pub enum ClientMsg {
     CreateClient(MsgCreateClient),
     UpdateClient(MsgUpdateClient),
     Misbehaviour(MsgSubmitMisbehaviour),
     UpgradeClient(MsgUpgradeClient),
+    RecoverClient(MsgRecoverClient),
 }
 
-pub(crate) enum MsgUpdateOrMisbehaviour {
+pub enum MsgUpdateOrMisbehaviour {
     UpdateClient(MsgUpdateClient),
     Misbehaviour(MsgSubmitMisbehaviour),
 }
 
 impl MsgUpdateOrMisbehaviour {
-    pub(crate) fn client_id(&self) -> &ClientId {
+    pub fn client_id(&self) -> &ClientId {
         match self {
             MsgUpdateOrMisbehaviour::UpdateClient(msg) => &msg.client_id,
             MsgUpdateOrMisbehaviour::Misbehaviour(msg) => &msg.client_id,
         }
     }
 
-    pub(crate) fn client_message(self) -> Any {
+    pub fn client_message(self) -> Any {
         match self {
-            MsgUpdateOrMisbehaviour::UpdateClient(msg) => msg.header,
+            MsgUpdateOrMisbehaviour::UpdateClient(msg) => msg.client_message,
             MsgUpdateOrMisbehaviour::Misbehaviour(msg) => msg.misbehaviour,
         }
     }
 
-    pub(crate) fn signer(&self) -> &Signer {
+    pub fn signer(&self) -> &Signer {
         match self {
             MsgUpdateOrMisbehaviour::UpdateClient(msg) => &msg.signer,
             MsgUpdateOrMisbehaviour::Misbehaviour(msg) => &msg.signer,
diff --git a/ibc-core/ics02-client/types/src/msgs/recover_client.rs b/ibc-core/ics02-client/types/src/msgs/recover_client.rs
new file mode 100644
index 000000000..5bc6c0594
--- /dev/null
+++ b/ibc-core/ics02-client/types/src/msgs/recover_client.rs
@@ -0,0 +1,66 @@
+//! Definition of domain type message `MsgRecoverClient`.
+
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::client::v1::MsgRecoverClient as RawMsgRecoverClient;
+use ibc_proto::Protobuf;
+
+use crate::error::ClientError;
+
+pub const RECOVER_CLIENT_TYPE_URL: &str = "/ibc.core.client.v1.MsgRecoverClient";
+
+/// Defines the message used to recover a frozen or expired client.
+///
+/// Note that a frozen or expired client can only be recovered by passing
+/// a governance proposal. For this reason, ibc-rs does not export dispatching
+/// a `MsgRecoverClient` via the `dispatch` function. In other words, the
+/// client recovery functionality is not part of ibc-rs's public API. The
+/// intended usage of this message type is to be integrated with hosts'
+/// governance modules, not to be called directly via `dispatch`.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgRecoverClient {
+    /// Client identifier of the client to be updated if the proposal passes.
+    pub subject_client_id: ClientId,
+    /// Client identifier of the client that will replace the subject client
+    /// if the proposal passes.
+    pub substitute_client_id: ClientId,
+    /// The address of the signer who serves as the authority for the IBC
+    /// module.
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgRecoverClient> for MsgRecoverClient {}
+
+impl TryFrom<RawMsgRecoverClient> for MsgRecoverClient {
+    type Error = ClientError;
+
+    fn try_from(raw: RawMsgRecoverClient) -> Result<Self, Self::Error> {
+        Ok(MsgRecoverClient {
+            subject_client_id: raw
+                .subject_client_id
+                .parse()
+                .map_err(ClientError::InvalidMsgRecoverClientId)?,
+            substitute_client_id: raw
+                .substitute_client_id
+                .parse()
+                .map_err(ClientError::InvalidMsgRecoverClientId)?,
+            signer: raw.signer.into(),
+        })
+    }
+}
+
+impl From<MsgRecoverClient> for RawMsgRecoverClient {
+    fn from(ics_msg: MsgRecoverClient) -> Self {
+        RawMsgRecoverClient {
+            subject_client_id: ics_msg.subject_client_id.to_string(),
+            substitute_client_id: ics_msg.substitute_client_id.to_string(),
+            signer: ics_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics02-client/types/src/msgs/update_client.rs b/ibc-core/ics02-client/types/src/msgs/update_client.rs
new file mode 100644
index 000000000..df79446ef
--- /dev/null
+++ b/ibc-core/ics02-client/types/src/msgs/update_client.rs
@@ -0,0 +1,57 @@
+//! Definition of domain type message `MsgUpdateClient`.
+
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::client::v1::MsgUpdateClient as RawMsgUpdateClient;
+use ibc_proto::Protobuf;
+
+use crate::error::ClientError;
+
+pub const UPDATE_CLIENT_TYPE_URL: &str = "/ibc.core.client.v1.MsgUpdateClient";
+
+/// Represents the message that triggers the update of an on-chain (IBC) client
+/// either with new headers, or evidence of misbehaviour.
+/// Note that some types of misbehaviour can be detected when the headers
+/// are updated (`UpdateKind::UpdateClient`).
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgUpdateClient {
+    pub client_id: ClientId,
+    pub client_message: Any,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgUpdateClient> for MsgUpdateClient {}
+
+impl TryFrom<RawMsgUpdateClient> for MsgUpdateClient {
+    type Error = ClientError;
+
+    fn try_from(raw: RawMsgUpdateClient) -> Result<Self, Self::Error> {
+        Ok(MsgUpdateClient {
+            client_id: raw
+                .client_id
+                .parse()
+                .map_err(ClientError::InvalidMsgUpdateClientId)?,
+            client_message: raw
+                .client_message
+                .ok_or(ClientError::MissingClientMessage)?,
+            signer: raw.signer.into(),
+        })
+    }
+}
+
+impl From<MsgUpdateClient> for RawMsgUpdateClient {
+    fn from(ics_msg: MsgUpdateClient) -> Self {
+        RawMsgUpdateClient {
+            client_id: ics_msg.client_id.to_string(),
+            client_message: Some(ics_msg.client_message),
+            signer: ics_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics02-client/types/src/msgs/upgrade_client.rs b/ibc-core/ics02-client/types/src/msgs/upgrade_client.rs
new file mode 100644
index 000000000..c3d9a956b
--- /dev/null
+++ b/ibc-core/ics02-client/types/src/msgs/upgrade_client.rs
@@ -0,0 +1,89 @@
+//! Definition of domain type msg `MsgUpgradeClient`.
+
+use core::str::FromStr;
+
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_commitment_types::error::CommitmentError;
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::client::v1::MsgUpgradeClient as RawMsgUpgradeClient;
+use ibc_proto::Protobuf;
+
+use crate::error::{ClientError, UpgradeClientError};
+
+pub const UPGRADE_CLIENT_TYPE_URL: &str = "/ibc.core.client.v1.MsgUpgradeClient";
+
+/// A type of message that triggers the upgrade of an on-chain (IBC) client.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgUpgradeClient {
+    // client unique identifier
+    pub client_id: ClientId,
+    // Upgraded client state
+    pub upgraded_client_state: Any,
+    // Upgraded consensus state, only contains enough information
+    // to serve as a basis of trust in update logic
+    pub upgraded_consensus_state: Any,
+    // proof that old chain committed to new client
+    pub proof_upgrade_client: CommitmentProofBytes,
+    // proof that old chain committed to new consensus state
+    pub proof_upgrade_consensus_state: CommitmentProofBytes,
+    // signer address
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgUpgradeClient> for MsgUpgradeClient {}
+
+impl From<MsgUpgradeClient> for RawMsgUpgradeClient {
+    fn from(dm_msg: MsgUpgradeClient) -> RawMsgUpgradeClient {
+        RawMsgUpgradeClient {
+            client_id: dm_msg.client_id.to_string(),
+            client_state: Some(dm_msg.upgraded_client_state),
+            consensus_state: Some(dm_msg.upgraded_consensus_state),
+            proof_upgrade_client: dm_msg.proof_upgrade_client.into(),
+            proof_upgrade_consensus_state: dm_msg.proof_upgrade_consensus_state.into(),
+            signer: dm_msg.signer.to_string(),
+        }
+    }
+}
+
+impl TryFrom<RawMsgUpgradeClient> for MsgUpgradeClient {
+    type Error = ClientError;
+
+    fn try_from(proto_msg: RawMsgUpgradeClient) -> Result<Self, Self::Error> {
+        let raw_client_state = proto_msg
+            .client_state
+            .ok_or(ClientError::MissingRawClientState)?;
+
+        let raw_consensus_state = proto_msg
+            .consensus_state
+            .ok_or(ClientError::MissingRawConsensusState)?;
+
+        let c_bytes =
+            CommitmentProofBytes::try_from(proto_msg.proof_upgrade_client).map_err(|_| {
+                UpgradeClientError::InvalidUpgradeClientProof(CommitmentError::EmptyMerkleProof)
+            })?;
+        let cs_bytes = CommitmentProofBytes::try_from(proto_msg.proof_upgrade_consensus_state)
+            .map_err(|_| {
+                UpgradeClientError::InvalidUpgradeConsensusStateProof(
+                    CommitmentError::EmptyMerkleProof,
+                )
+            })?;
+
+        Ok(MsgUpgradeClient {
+            client_id: ClientId::from_str(&proto_msg.client_id)
+                .map_err(ClientError::InvalidClientIdentifier)?,
+            upgraded_client_state: raw_client_state,
+            upgraded_consensus_state: raw_consensus_state,
+            proof_upgrade_client: c_bytes,
+            proof_upgrade_consensus_state: cs_bytes,
+            signer: proto_msg.signer.into(),
+        })
+    }
+}
diff --git a/ibc-core/ics02-client/types/src/status.rs b/ibc-core/ics02-client/types/src/status.rs
new file mode 100644
index 000000000..d77a7bbe6
--- /dev/null
+++ b/ibc-core/ics02-client/types/src/status.rs
@@ -0,0 +1,86 @@
+use core::fmt::{Debug, Display, Formatter};
+use core::str::FromStr;
+
+use ibc_primitives::prelude::*;
+
+use crate::error::ClientError;
+
+/// `UpdateKind` represents the 2 ways that a client can be updated
+/// in IBC: either through a `MsgUpdateClient`, or a `MsgSubmitMisbehaviour`.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum UpdateKind {
+    /// this is the typical scenario where a new header is submitted to the client
+    /// to update the client. Note that light clients are free to define the type
+    /// of the object used to update them (e.g. could be a list of headers).
+    UpdateClient,
+    /// this is the scenario where misbehaviour is submitted to the client
+    /// (e.g 2 headers with the same height in Tendermint)
+    SubmitMisbehaviour,
+}
+
+/// Represents the status of a client
+#[derive(Clone, Debug, PartialEq, Eq, Copy)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub enum Status {
+    /// The client is active and allowed to be used
+    Active,
+    /// The client is frozen and not allowed to be used
+    Frozen,
+    /// The client is expired and not allowed to be used
+    Expired,
+    /// Unauthorized indicates that the client type is not registered as an allowed client type.
+    Unauthorized,
+}
+
+impl Status {
+    pub fn is_active(&self) -> bool {
+        *self == Status::Active
+    }
+
+    pub fn is_frozen(&self) -> bool {
+        *self == Status::Frozen
+    }
+
+    pub fn is_expired(&self) -> bool {
+        *self == Status::Expired
+    }
+
+    /// Checks whether the status is active; returns `Err` if not.
+    pub fn verify_is_active(&self) -> Result<(), ClientError> {
+        match self {
+            Self::Active => Ok(()),
+            &status => Err(ClientError::ClientNotActive { status }),
+        }
+    }
+
+    /// Checks whether the client is either frozen or expired; returns `Err` if not.
+    pub fn verify_is_inactive(&self) -> Result<(), ClientError> {
+        match self {
+            Self::Frozen | Self::Expired => Ok(()),
+            &status => Err(ClientError::ClientNotInactive { status }),
+        }
+    }
+}
+
+impl Display for Status {
+    fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
+        write!(f, "{self:?}")
+    }
+}
+
+impl FromStr for Status {
+    type Err = ClientError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "ACTIVE" => Ok(Status::Active),
+            "FROZEN" => Ok(Status::Frozen),
+            "EXPIRED" => Ok(Status::Expired),
+            "UNAUTHORIZED" => Ok(Status::Unauthorized),
+            _ => Err(ClientError::Other {
+                description: format!("invalid status string: {s}"),
+            }),
+        }
+    }
+}
diff --git a/ibc-core/ics03-connection/Cargo.toml b/ibc-core/ics03-connection/Cargo.toml
new file mode 100644
index 000000000..7cea316c2
--- /dev/null
+++ b/ibc-core/ics03-connection/Cargo.toml
@@ -0,0 +1,65 @@
+[package]
+name         = "ibc-core-connection"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "connection" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of the ICS-03 Connection Semantics and
+    re-exports essential data structures and domain types from `ibc-core-connection-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+ibc-core-client           = { workspace = true }
+ibc-core-connection-types = { workspace = true }
+ibc-core-host             = { workspace = true }
+ibc-core-handler-types    = { workspace = true }
+ibc-primitives            = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-core-client/std",
+  "ibc-core-connection-types/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/serde",
+  "ibc-core-handler-types/serde",
+  "ibc-primitives/serde",
+]
+schema = [
+  "ibc-core-client/schema",
+  "ibc-core-connection-types/schema",
+  "ibc-core-host/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-core-client/borsh",
+  "ibc-core-connection-types/borsh",
+  "ibc-core-host/borsh",
+  "ibc-core-handler-types/borsh",
+  "ibc-primitives/borsh",
+]
+parity-scale-codec = [
+  "ibc-core-client/parity-scale-codec",
+  "ibc-core-connection-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/src/core/ics03_connection/delay.rs b/ibc-core/ics03-connection/src/delay.rs
similarity index 51%
rename from crates/ibc/src/core/ics03_connection/delay.rs
rename to ibc-core/ics03-connection/src/delay.rs
index 4536a6d2b..06fb03098 100644
--- a/crates/ibc/src/core/ics03_connection/delay.rs
+++ b/ibc-core/ics03-connection/src/delay.rs
@@ -1,6 +1,9 @@
-use crate::core::{ics02_client::height::Height, ContextError, ValidationContext};
-
-use super::{connection::ConnectionEnd, error::ConnectionError};
+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_handler_types::error::ContextError;
+use ibc_core_host::ValidationContext;
 
 pub fn verify_conn_delay_passed<Ctx>(
     ctx: &Ctx,
@@ -16,32 +19,35 @@ where
 
     // Fetch the latest time and height that the counterparty client was updated on the host chain.
     let client_id = connection_end.client_id();
-    let last_client_update_time = ctx.client_update_time(client_id, &packet_proof_height)?;
-    let last_client_update_height = ctx.client_update_height(client_id, &packet_proof_height)?;
+    let last_client_update = ctx
+        .get_client_validation_context()
+        .client_update_meta(client_id, &packet_proof_height)?;
 
     // Fetch the connection delay time and height periods.
     let conn_delay_time_period = connection_end.delay_period();
     let conn_delay_height_period = ctx.block_delay(&conn_delay_time_period);
 
     // Verify that the current host chain time is later than the last client update time
-    let earliest_valid_time = (last_client_update_time + conn_delay_time_period)
+    let earliest_valid_time = (last_client_update.0 + conn_delay_time_period)
         .map_err(ConnectionError::TimestampOverflow)?;
     if current_host_time < earliest_valid_time {
-        return Err(ConnectionError::NotEnoughTimeElapsed {
-            current_host_time,
-            earliest_valid_time,
-        })
-        .map_err(ContextError::ConnectionError);
+        return Err(ContextError::ConnectionError(
+            ConnectionError::NotEnoughTimeElapsed {
+                current_host_time,
+                earliest_valid_time,
+            },
+        ));
     }
 
     // Verify that the current host chain height is later than the last client update height
-    let earliest_valid_height = last_client_update_height.add(conn_delay_height_period);
+    let earliest_valid_height = last_client_update.1.add(conn_delay_height_period);
     if current_host_height < earliest_valid_height {
-        return Err(ConnectionError::NotEnoughBlocksElapsed {
-            current_host_height,
-            earliest_valid_height,
-        })
-        .map_err(ContextError::ConnectionError);
+        return Err(ContextError::ConnectionError(
+            ConnectionError::NotEnoughBlocksElapsed {
+                current_host_height,
+                earliest_valid_height,
+            },
+        ));
     };
 
     Ok(())
diff --git a/ibc-core/ics03-connection/src/handler/conn_open_ack.rs b/ibc-core/ics03-connection/src/handler/conn_open_ack.rs
new file mode 100644
index 000000000..a0630ef33
--- /dev/null
+++ b/ibc-core/ics03-connection/src/handler/conn_open_ack.rs
@@ -0,0 +1,211 @@
+//! Protocol logic specific to processing ICS3 messages of type `MsgConnectionOpenAck`.
+
+use ibc_core_client::context::prelude::*;
+use ibc_core_client::types::error::ClientError;
+use ibc_core_connection_types::error::ConnectionError;
+use ibc_core_connection_types::events::OpenAck;
+use ibc_core_connection_types::msgs::MsgConnectionOpenAck;
+use ibc_core_connection_types::{ConnectionEnd, Counterparty, State};
+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 ibc_primitives::proto::{Any, Protobuf};
+use ibc_primitives::ToVec;
+
+pub fn validate<Ctx>(ctx_a: &Ctx, msg: MsgConnectionOpenAck) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+    <Ctx::HostClientState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    let vars = LocalVars::new(ctx_a, &msg)?;
+    validate_impl(ctx_a, &msg, &vars)
+}
+
+fn validate_impl<Ctx>(
+    ctx_a: &Ctx,
+    msg: &MsgConnectionOpenAck,
+    vars: &LocalVars,
+) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+    <Ctx::HostClientState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let host_height = ctx_a.host_height().map_err(|_| ConnectionError::Other {
+        description: "failed to get host height".to_string(),
+    })?;
+    if msg.consensus_height_of_a_on_b > host_height {
+        return Err(ConnectionError::InvalidConsensusHeight {
+            target_height: msg.consensus_height_of_a_on_b,
+            current_height: host_height,
+        }
+        .into());
+    }
+
+    let client_val_ctx_a = ctx_a.get_client_validation_context();
+
+    let client_state_of_a_on_b =
+        Ctx::HostClientState::try_from(msg.client_state_of_a_on_b.clone()).map_err(Into::into)?;
+
+    ctx_a.validate_self_client(client_state_of_a_on_b)?;
+
+    msg.version
+        .verify_is_supported(vars.conn_end_on_a.versions())?;
+
+    vars.conn_end_on_a.verify_state_matches(&State::Init)?;
+
+    // Proof verification.
+    {
+        let client_state_of_b_on_a = client_val_ctx_a.client_state(vars.client_id_on_a())?;
+
+        client_state_of_b_on_a
+            .status(client_val_ctx_a, vars.client_id_on_a())?
+            .verify_is_active()?;
+        client_state_of_b_on_a.validate_proof_height(msg.proofs_height_on_b)?;
+
+        let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+            vars.client_id_on_a().clone(),
+            msg.proofs_height_on_b.revision_number(),
+            msg.proofs_height_on_b.revision_height(),
+        );
+
+        let consensus_state_of_b_on_a =
+            client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+
+        let prefix_on_a = ctx_a.commitment_prefix();
+        let prefix_on_b = vars.conn_end_on_a.counterparty().prefix();
+
+        {
+            let expected_conn_end_on_b = ConnectionEnd::new(
+                State::TryOpen,
+                vars.client_id_on_b().clone(),
+                Counterparty::new(
+                    vars.client_id_on_a().clone(),
+                    Some(msg.conn_id_on_a.clone()),
+                    prefix_on_a,
+                ),
+                vec![msg.version.clone()],
+                vars.conn_end_on_a.delay_period(),
+            )?;
+
+            client_state_of_b_on_a
+                .verify_membership(
+                    prefix_on_b,
+                    &msg.proof_conn_end_on_b,
+                    consensus_state_of_b_on_a.root(),
+                    Path::Connection(ConnectionPath::new(&msg.conn_id_on_b)),
+                    expected_conn_end_on_b.encode_vec(),
+                )
+                .map_err(ConnectionError::VerifyConnectionState)?;
+        }
+
+        client_state_of_b_on_a
+            .verify_membership(
+                prefix_on_b,
+                &msg.proof_client_state_of_a_on_b,
+                consensus_state_of_b_on_a.root(),
+                Path::ClientState(ClientStatePath::new(vars.client_id_on_b().clone())),
+                msg.client_state_of_a_on_b.to_vec(),
+            )
+            .map_err(|e| ConnectionError::ClientStateVerificationFailure {
+                client_id: vars.client_id_on_b().clone(),
+                client_error: e,
+            })?;
+
+        let expected_consensus_state_of_a_on_b =
+            ctx_a.host_consensus_state(&msg.consensus_height_of_a_on_b)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            vars.client_id_on_b().clone(),
+            msg.consensus_height_of_a_on_b.revision_number(),
+            msg.consensus_height_of_a_on_b.revision_height(),
+        );
+
+        client_state_of_b_on_a
+            .verify_membership(
+                prefix_on_b,
+                &msg.proof_consensus_state_of_a_on_b,
+                consensus_state_of_b_on_a.root(),
+                Path::ClientConsensusState(client_cons_state_path_on_b),
+                expected_consensus_state_of_a_on_b.into().to_vec(),
+            )
+            .map_err(|e| ConnectionError::ConsensusStateVerificationFailure {
+                height: msg.proofs_height_on_b,
+                client_error: e,
+            })?;
+    }
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx_a: &mut Ctx, msg: MsgConnectionOpenAck) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let vars = LocalVars::new(ctx_a, &msg)?;
+    execute_impl(ctx_a, msg, vars)
+}
+
+fn execute_impl<Ctx>(
+    ctx_a: &mut Ctx,
+    msg: MsgConnectionOpenAck,
+    vars: LocalVars,
+) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let event = IbcEvent::OpenAckConnection(OpenAck::new(
+        msg.conn_id_on_a.clone(),
+        vars.client_id_on_a().clone(),
+        msg.conn_id_on_b.clone(),
+        vars.client_id_on_b().clone(),
+    ));
+    ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection))?;
+    ctx_a.emit_ibc_event(event)?;
+
+    ctx_a.log_message("success: conn_open_ack verification passed".to_string())?;
+
+    {
+        let new_conn_end_on_a = {
+            let mut counterparty = vars.conn_end_on_a.counterparty().clone();
+            counterparty.connection_id = Some(msg.conn_id_on_b.clone());
+
+            let mut new_conn_end_on_a = vars.conn_end_on_a;
+            new_conn_end_on_a.set_state(State::Open);
+            new_conn_end_on_a.set_version(msg.version.clone());
+            new_conn_end_on_a.set_counterparty(counterparty);
+            new_conn_end_on_a
+        };
+
+        ctx_a.store_connection(&ConnectionPath::new(&msg.conn_id_on_a), new_conn_end_on_a)?;
+    }
+
+    Ok(())
+}
+
+struct LocalVars {
+    conn_end_on_a: ConnectionEnd,
+}
+
+impl LocalVars {
+    fn new<Ctx>(ctx_a: &Ctx, msg: &MsgConnectionOpenAck) -> Result<Self, ContextError>
+    where
+        Ctx: ValidationContext,
+    {
+        Ok(LocalVars {
+            conn_end_on_a: ctx_a.connection_end(&msg.conn_id_on_a)?,
+        })
+    }
+
+    fn client_id_on_a(&self) -> &ClientId {
+        self.conn_end_on_a.client_id()
+    }
+
+    fn client_id_on_b(&self) -> &ClientId {
+        self.conn_end_on_a.counterparty().client_id()
+    }
+}
diff --git a/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs b/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs
new file mode 100644
index 000000000..f9ef4eb61
--- /dev/null
+++ b/ibc-core/ics03-connection/src/handler/conn_open_confirm.rs
@@ -0,0 +1,166 @@
+//! Protocol logic specific to processing ICS3 messages of type `MsgConnectionOpenConfirm`.
+
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection_types::error::ConnectionError;
+use ibc_core_connection_types::events::OpenConfirm;
+use ibc_core_connection_types::msgs::MsgConnectionOpenConfirm;
+use ibc_core_connection_types::{ConnectionEnd, Counterparty, State};
+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::*;
+use ibc_primitives::proto::Protobuf;
+
+pub fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgConnectionOpenConfirm) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    let vars = LocalVars::new(ctx_b, msg)?;
+    validate_impl(ctx_b, msg, &vars)
+}
+
+fn validate_impl<Ctx>(
+    ctx_b: &Ctx,
+    msg: &MsgConnectionOpenConfirm,
+    vars: &LocalVars,
+) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_b.validate_message_signer(&msg.signer)?;
+
+    let conn_end_on_b = vars.conn_end_on_b();
+
+    conn_end_on_b.verify_state_matches(&State::TryOpen)?;
+
+    let client_id_on_a = vars.client_id_on_a();
+    let client_id_on_b = vars.client_id_on_b();
+    let conn_id_on_a = vars.conn_id_on_a()?;
+
+    // Verify proofs
+    {
+        let client_val_ctx_b = ctx_b.get_client_validation_context();
+
+        let client_state_of_a_on_b = client_val_ctx_b.client_state(client_id_on_b)?;
+
+        client_state_of_a_on_b
+            .status(client_val_ctx_b, client_id_on_b)?
+            .verify_is_active()?;
+        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            client_id_on_b.clone(),
+            msg.proof_height_on_a.revision_number(),
+            msg.proof_height_on_a.revision_height(),
+        );
+        let consensus_state_of_a_on_b =
+            client_val_ctx_b.consensus_state(&client_cons_state_path_on_b)?;
+
+        let prefix_on_a = conn_end_on_b.counterparty().prefix();
+        let prefix_on_b = ctx_b.commitment_prefix();
+
+        let expected_conn_end_on_a = ConnectionEnd::new(
+            State::Open,
+            client_id_on_a.clone(),
+            Counterparty::new(
+                client_id_on_b.clone(),
+                Some(msg.conn_id_on_b.clone()),
+                prefix_on_b,
+            ),
+            conn_end_on_b.versions().to_vec(),
+            conn_end_on_b.delay_period(),
+        )?;
+
+        client_state_of_a_on_b
+            .verify_membership(
+                prefix_on_a,
+                &msg.proof_conn_end_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::Connection(ConnectionPath::new(conn_id_on_a)),
+                expected_conn_end_on_a.encode_vec(),
+            )
+            .map_err(ConnectionError::VerifyConnectionState)?;
+    }
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx_b: &mut Ctx, msg: &MsgConnectionOpenConfirm) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let vars = LocalVars::new(ctx_b, msg)?;
+    execute_impl(ctx_b, msg, vars)
+}
+
+fn execute_impl<Ctx>(
+    ctx_b: &mut Ctx,
+    msg: &MsgConnectionOpenConfirm,
+    vars: LocalVars,
+) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let client_id_on_a = vars.client_id_on_a();
+    let client_id_on_b = vars.client_id_on_b();
+    let conn_id_on_a = vars.conn_id_on_a()?;
+
+    let event = IbcEvent::OpenConfirmConnection(OpenConfirm::new(
+        msg.conn_id_on_b.clone(),
+        client_id_on_b.clone(),
+        conn_id_on_a.clone(),
+        client_id_on_a.clone(),
+    ));
+    ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection))?;
+    ctx_b.emit_ibc_event(event)?;
+    ctx_b.log_message("success: conn_open_confirm verification passed".to_string())?;
+
+    {
+        let new_conn_end_on_b = {
+            let mut new_conn_end_on_b = vars.conn_end_on_b;
+
+            new_conn_end_on_b.set_state(State::Open);
+            new_conn_end_on_b
+        };
+
+        ctx_b.store_connection(&ConnectionPath(msg.conn_id_on_b.clone()), new_conn_end_on_b)?;
+    }
+
+    Ok(())
+}
+
+struct LocalVars {
+    conn_end_on_b: ConnectionEnd,
+}
+
+impl LocalVars {
+    fn new<Ctx>(ctx_b: &Ctx, msg: &MsgConnectionOpenConfirm) -> Result<Self, ContextError>
+    where
+        Ctx: ValidationContext,
+    {
+        Ok(Self {
+            conn_end_on_b: ctx_b.connection_end(&msg.conn_id_on_b)?,
+        })
+    }
+
+    fn conn_end_on_b(&self) -> &ConnectionEnd {
+        &self.conn_end_on_b
+    }
+
+    fn client_id_on_a(&self) -> &ClientId {
+        self.conn_end_on_b.counterparty().client_id()
+    }
+
+    fn client_id_on_b(&self) -> &ClientId {
+        self.conn_end_on_b.client_id()
+    }
+
+    fn conn_id_on_a(&self) -> Result<&ConnectionId, ConnectionError> {
+        self.conn_end_on_b
+            .counterparty()
+            .connection_id()
+            .ok_or(ConnectionError::InvalidCounterparty)
+    }
+}
diff --git a/ibc-core/ics03-connection/src/handler/conn_open_init.rs b/ibc-core/ics03-connection/src/handler/conn_open_init.rs
new file mode 100644
index 000000000..8d4286616
--- /dev/null
+++ b/ibc-core/ics03-connection/src/handler/conn_open_init.rs
@@ -0,0 +1,85 @@
+//! Protocol logic specific to ICS3 messages of type `MsgConnectionOpenInit`.
+use ibc_core_client::context::prelude::*;
+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_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>(ctx_a: &Ctx, msg: MsgConnectionOpenInit) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let client_val_ctx_a = ctx_a.get_client_validation_context();
+
+    // An IBC client running on the local (host) chain should exist.
+    let client_state_of_b_on_a = client_val_ctx_a.client_state(&msg.client_id_on_a)?;
+
+    client_state_of_b_on_a
+        .status(client_val_ctx_a, &msg.client_id_on_a)?
+        .verify_is_active()?;
+
+    if let Some(version) = msg.version {
+        version.verify_is_supported(&ctx_a.get_compatible_versions())?;
+    }
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx_a: &mut Ctx, msg: MsgConnectionOpenInit) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let versions = if let Some(version) = msg.version {
+        version.verify_is_supported(&ctx_a.get_compatible_versions())?;
+        vec![version]
+    } else {
+        ctx_a.get_compatible_versions()
+    };
+
+    let conn_end_on_a = ConnectionEnd::new(
+        State::Init,
+        msg.client_id_on_a.clone(),
+        Counterparty::new(
+            msg.counterparty.client_id().clone(),
+            None,
+            msg.counterparty.prefix().clone(),
+        ),
+        versions,
+        msg.delay_period,
+    )?;
+
+    // Construct the identifier for the new connection.
+    let conn_id_on_a = ConnectionId::new(ctx_a.connection_counter()?);
+
+    ctx_a.log_message(format!(
+        "success: conn_open_init: generated new connection identifier: {conn_id_on_a}"
+    ))?;
+
+    {
+        let client_id_on_b = msg.counterparty.client_id().clone();
+
+        let event = IbcEvent::OpenInitConnection(OpenInit::new(
+            conn_id_on_a.clone(),
+            msg.client_id_on_a.clone(),
+            client_id_on_b,
+        ));
+        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection))?;
+        ctx_a.emit_ibc_event(event)?;
+    }
+
+    ctx_a.increase_connection_counter()?;
+    ctx_a.store_connection_to_client(
+        &ClientConnectionPath::new(msg.client_id_on_a),
+        conn_id_on_a.clone(),
+    )?;
+    ctx_a.store_connection(&ConnectionPath::new(&conn_id_on_a), conn_end_on_a)?;
+
+    Ok(())
+}
diff --git a/ibc-core/ics03-connection/src/handler/conn_open_try.rs b/ibc-core/ics03-connection/src/handler/conn_open_try.rs
new file mode 100644
index 000000000..e85828e7e
--- /dev/null
+++ b/ibc-core/ics03-connection/src/handler/conn_open_try.rs
@@ -0,0 +1,213 @@
+//! Protocol logic specific to processing ICS3 messages of type `MsgConnectionOpenTry`.;
+use ibc_core_client::context::prelude::*;
+use ibc_core_client::types::error::ClientError;
+use ibc_core_connection_types::error::ConnectionError;
+use ibc_core_connection_types::events::OpenTry;
+use ibc_core_connection_types::msgs::MsgConnectionOpenTry;
+use ibc_core_connection_types::{ConnectionEnd, Counterparty, State};
+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 ibc_primitives::proto::{Any, Protobuf};
+use ibc_primitives::ToVec;
+
+pub fn validate<Ctx>(ctx_b: &Ctx, msg: MsgConnectionOpenTry) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+    <Ctx::HostClientState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    let vars = LocalVars::new(ctx_b, &msg)?;
+    validate_impl(ctx_b, &msg, &vars)
+}
+
+fn validate_impl<Ctx>(
+    ctx_b: &Ctx,
+    msg: &MsgConnectionOpenTry,
+    vars: &LocalVars,
+) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+    <Ctx::HostClientState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    ctx_b.validate_message_signer(&msg.signer)?;
+
+    let client_val_ctx_b = ctx_b.get_client_validation_context();
+
+    let client_state_of_b_on_a =
+        Ctx::HostClientState::try_from(msg.client_state_of_b_on_a.clone()).map_err(Into::into)?;
+
+    ctx_b.validate_self_client(client_state_of_b_on_a)?;
+
+    let host_height = ctx_b.host_height().map_err(|_| ConnectionError::Other {
+        description: "failed to get host height".to_string(),
+    })?;
+    if msg.consensus_height_of_b_on_a > host_height {
+        // Fail if the consensus height is too advanced.
+        return Err(ConnectionError::InvalidConsensusHeight {
+            target_height: msg.consensus_height_of_b_on_a,
+            current_height: host_height,
+        }
+        .into());
+    }
+
+    let client_id_on_a = msg.counterparty.client_id();
+
+    // Verify proofs
+    {
+        let client_state_of_a_on_b =
+            client_val_ctx_b.client_state(vars.conn_end_on_b.client_id())?;
+
+        client_state_of_a_on_b
+            .status(client_val_ctx_b, &msg.client_id_on_b)?
+            .verify_is_active()?;
+        client_state_of_a_on_b.validate_proof_height(msg.proofs_height_on_a)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            msg.client_id_on_b.clone(),
+            msg.proofs_height_on_a.revision_number(),
+            msg.proofs_height_on_a.revision_height(),
+        );
+
+        let consensus_state_of_a_on_b =
+            client_val_ctx_b.consensus_state(&client_cons_state_path_on_b)?;
+
+        let prefix_on_a = vars.conn_end_on_b.counterparty().prefix();
+        let prefix_on_b = ctx_b.commitment_prefix();
+
+        {
+            let expected_conn_end_on_a = ConnectionEnd::new(
+                State::Init,
+                client_id_on_a.clone(),
+                Counterparty::new(msg.client_id_on_b.clone(), None, prefix_on_b),
+                msg.versions_on_a.clone(),
+                msg.delay_period,
+            )?;
+
+            client_state_of_a_on_b
+                .verify_membership(
+                    prefix_on_a,
+                    &msg.proof_conn_end_on_a,
+                    consensus_state_of_a_on_b.root(),
+                    Path::Connection(ConnectionPath::new(&vars.conn_id_on_a)),
+                    expected_conn_end_on_a.encode_vec(),
+                )
+                .map_err(ConnectionError::VerifyConnectionState)?;
+        }
+
+        client_state_of_a_on_b
+            .verify_membership(
+                prefix_on_a,
+                &msg.proof_client_state_of_b_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::ClientState(ClientStatePath::new(client_id_on_a.clone())),
+                msg.client_state_of_b_on_a.to_vec(),
+            )
+            .map_err(|e| ConnectionError::ClientStateVerificationFailure {
+                client_id: msg.client_id_on_b.clone(),
+                client_error: e,
+            })?;
+
+        let expected_consensus_state_of_b_on_a =
+            ctx_b.host_consensus_state(&msg.consensus_height_of_b_on_a)?;
+
+        let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+            client_id_on_a.clone(),
+            msg.consensus_height_of_b_on_a.revision_number(),
+            msg.consensus_height_of_b_on_a.revision_height(),
+        );
+
+        client_state_of_a_on_b
+            .verify_membership(
+                prefix_on_a,
+                &msg.proof_consensus_state_of_b_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::ClientConsensusState(client_cons_state_path_on_a),
+                expected_consensus_state_of_b_on_a.into().to_vec(),
+            )
+            .map_err(|e| ConnectionError::ConsensusStateVerificationFailure {
+                height: msg.proofs_height_on_a,
+                client_error: e,
+            })?;
+    }
+
+    Ok(())
+}
+
+pub fn execute<Ctx>(ctx_b: &mut Ctx, msg: MsgConnectionOpenTry) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let vars = LocalVars::new(ctx_b, &msg)?;
+    execute_impl(ctx_b, msg, vars)
+}
+
+fn execute_impl<Ctx>(
+    ctx_b: &mut Ctx,
+    msg: MsgConnectionOpenTry,
+    vars: LocalVars,
+) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+{
+    let conn_id_on_a = vars
+        .conn_end_on_b
+        .counterparty()
+        .connection_id()
+        .ok_or(ConnectionError::InvalidCounterparty)?;
+    let event = IbcEvent::OpenTryConnection(OpenTry::new(
+        vars.conn_id_on_b.clone(),
+        msg.client_id_on_b.clone(),
+        conn_id_on_a.clone(),
+        vars.client_id_on_a.clone(),
+    ));
+    ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Connection))?;
+    ctx_b.emit_ibc_event(event)?;
+    ctx_b.log_message("success: conn_open_try verification passed".to_string())?;
+
+    ctx_b.increase_connection_counter()?;
+    ctx_b.store_connection_to_client(
+        &ClientConnectionPath::new(msg.client_id_on_b),
+        vars.conn_id_on_b.clone(),
+    )?;
+    ctx_b.store_connection(&ConnectionPath::new(&vars.conn_id_on_b), vars.conn_end_on_b)?;
+
+    Ok(())
+}
+
+struct LocalVars {
+    conn_id_on_b: ConnectionId,
+    conn_end_on_b: ConnectionEnd,
+    client_id_on_a: ClientId,
+    conn_id_on_a: ConnectionId,
+}
+
+impl LocalVars {
+    fn new<Ctx>(ctx_b: &Ctx, msg: &MsgConnectionOpenTry) -> Result<Self, ContextError>
+    where
+        Ctx: ValidationContext,
+    {
+        let version_on_b = ctx_b.pick_version(&msg.versions_on_a)?;
+
+        Ok(Self {
+            conn_id_on_b: ConnectionId::new(ctx_b.connection_counter()?),
+            conn_end_on_b: ConnectionEnd::new(
+                State::TryOpen,
+                msg.client_id_on_b.clone(),
+                msg.counterparty.clone(),
+                vec![version_on_b],
+                msg.delay_period,
+            )?,
+            client_id_on_a: msg.counterparty.client_id().clone(),
+            conn_id_on_a: msg
+                .counterparty
+                .connection_id()
+                .ok_or(ConnectionError::InvalidCounterparty)?
+                .clone(),
+        })
+    }
+}
diff --git a/ibc-core/ics03-connection/src/handler/mod.rs b/ibc-core/ics03-connection/src/handler/mod.rs
new file mode 100644
index 000000000..c504edc00
--- /dev/null
+++ b/ibc-core/ics03-connection/src/handler/mod.rs
@@ -0,0 +1,4 @@
+pub mod conn_open_ack;
+pub mod conn_open_confirm;
+pub mod conn_open_init;
+pub mod conn_open_try;
diff --git a/ibc-core/ics03-connection/src/lib.rs b/ibc-core/ics03-connection/src/lib.rs
new file mode 100644
index 000000000..0892189d1
--- /dev/null
+++ b/ibc-core/ics03-connection/src/lib.rs
@@ -0,0 +1,26 @@
+//! ICS-03: Connection Semantics implementation to process connection open
+//! handshake. Exports data structures and implementations of IBC core
+//! connection module.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod delay;
+pub mod handler;
+
+/// Re-exports ICS-03 data structures from the `ibc-core-connection-types` crate
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_connection_types::*;
+}
diff --git a/ibc-core/ics03-connection/types/Cargo.toml b/ibc-core/ics03-connection/types/Cargo.toml
new file mode 100644
index 000000000..39ecc8485
--- /dev/null
+++ b/ibc-core/ics03-connection/types/Cargo.toml
@@ -0,0 +1,91 @@
+[package]
+name         = "ibc-core-connection-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "connection", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-03 Connection Semantics data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-client-types     = { workspace = true }
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host-types       = { workspace = true }
+ibc-primitives            = { workspace = true }
+ibc-proto                 = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "subtle-encoding/std",
+  "serde/std",
+  "ibc-core-client-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-core-client-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core-client-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core-client-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core-client-types/parity-scale-codec",
+  "ibc-core-commitment-types/parity-scale-codec",
+  "ibc-core-host-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/crates/ibc/src/core/ics03_connection/connection.rs b/ibc-core/ics03-connection/types/src/connection.rs
similarity index 92%
rename from crates/ibc/src/core/ics03_connection/connection.rs
rename to ibc-core/ics03-connection/types/src/connection.rs
index e70ae400c..e2c027dbd 100644
--- a/crates/ibc/src/core/ics03_connection/connection.rs
+++ b/ibc-core/ics03-connection/types/src/connection.rs
@@ -1,25 +1,21 @@
 //! Defines the types that define a connection
 
-use crate::prelude::*;
-use ibc_proto::protobuf::Protobuf;
-
+use core::fmt::{Display, Error as FmtError, Formatter};
 use core::time::Duration;
-use core::{
-    fmt::{Display, Error as FmtError, Formatter},
-    u64,
-};
+use core::u64;
 
+use ibc_core_client_types::error::ClientError;
+use ibc_core_commitment_types::commitment::CommitmentPrefix;
+use ibc_core_host_types::identifiers::{ClientId, ConnectionId};
+use ibc_primitives::prelude::*;
 use ibc_proto::ibc::core::connection::v1::{
     ConnectionEnd as RawConnectionEnd, Counterparty as RawCounterparty,
     IdentifiedConnection as RawIdentifiedConnection,
 };
+use ibc_proto::Protobuf;
 
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::version::Version;
-use crate::core::ics23_commitment::commitment::CommitmentPrefix;
-use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-use crate::core::timestamp::ZERO_DURATION;
+use crate::error::ConnectionError;
+use crate::version::Version;
 
 #[cfg_attr(
     feature = "parity-scale-codec",
@@ -34,6 +30,7 @@ use crate::core::timestamp::ZERO_DURATION;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct IdentifiedConnectionEnd {
     pub connection_id: ConnectionId,
@@ -104,6 +101,7 @@ impl From<IdentifiedConnectionEnd> for RawIdentifiedConnection {
     derive(parity_scale_codec::Encode, parity_scale_codec::Decode,)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct ConnectionEnd {
     pub state: State,
@@ -167,8 +165,10 @@ mod sealed {
 
     #[cfg(feature = "borsh")]
     impl borsh::BorshDeserialize for ConnectionEnd {
-        fn deserialize(reader: &mut &[u8]) -> borsh::maybestd::io::Result<Self> {
-            let inner_conn_end = InnerConnectionEnd::deserialize(reader)?;
+        fn deserialize_reader<R: borsh::maybestd::io::Read>(
+            reader: &mut R,
+        ) -> borsh::maybestd::io::Result<Self> {
+            let inner_conn_end = InnerConnectionEnd::deserialize_reader(reader)?;
             Ok(ConnectionEnd::from(inner_conn_end))
         }
     }
@@ -201,18 +201,6 @@ mod sealed {
     }
 }
 
-impl Default for ConnectionEnd {
-    fn default() -> Self {
-        Self {
-            state: State::Uninitialized,
-            client_id: Default::default(),
-            counterparty: Default::default(),
-            versions: Vec::new(),
-            delay_period: ZERO_DURATION,
-        }
-    }
-}
-
 impl Protobuf<RawConnectionEnd> for ConnectionEnd {}
 
 impl TryFrom<RawConnectionEnd> for ConnectionEnd {
@@ -220,10 +208,6 @@ impl TryFrom<RawConnectionEnd> for ConnectionEnd {
     fn try_from(value: RawConnectionEnd) -> Result<Self, Self::Error> {
         let state = value.state.try_into()?;
 
-        if state == State::Uninitialized {
-            return Ok(ConnectionEnd::default());
-        }
-
         if value.client_id.is_empty() {
             return Err(ConnectionError::EmptyProtoConnectionEnd);
         }
@@ -378,11 +362,12 @@ impl ConnectionEnd {
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, Default, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Counterparty {
-    client_id: ClientId,
+    pub client_id: ClientId,
     pub connection_id: Option<ConnectionId>,
-    prefix: CommitmentPrefix,
+    pub prefix: CommitmentPrefix,
 }
 
 impl Protobuf<RawCounterparty> for Counterparty {}
@@ -483,6 +468,7 @@ impl Counterparty {
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum State {
     Uninitialized = 0isize,
@@ -502,7 +488,7 @@ impl State {
         }
     }
 
-    /// Parses the State out from a i32.
+    /// Parses the State out from an i32.
     pub fn from_i32(s: i32) -> Result<Self, ConnectionError> {
         match s {
             0 => Ok(Self::Uninitialized),
@@ -516,13 +502,13 @@ impl State {
         }
     }
 
-    /// Returns whether or not this connection state is `Open`.
+    /// Returns if this connection state is `Open`.
     pub fn is_open(self) -> bool {
         self == State::Open
     }
 
-    /// Returns whether or not this connection with this state
-    /// has progressed less or the same than the argument.
+    /// Returns if this connection with this state
+    /// has progressed less than or the same as the argument.
     ///
     /// # Example
     /// ```rust,ignore
@@ -559,6 +545,6 @@ impl TryFrom<i32> for State {
 
 impl From<State> for i32 {
     fn from(value: State) -> Self {
-        value.into()
+        value as i32
     }
 }
diff --git a/crates/ibc/src/core/ics03_connection/error.rs b/ibc-core/ics03-connection/types/src/error.rs
similarity index 80%
rename from crates/ibc/src/core/ics03_connection/error.rs
rename to ibc-core/ics03-connection/types/src/error.rs
index 28512f9dd..478b2d537 100644
--- a/crates/ibc/src/core/ics03_connection/error.rs
+++ b/ibc-core/ics03-connection/types/src/error.rs
@@ -1,14 +1,13 @@
 //! Defines the connection error type
 
-use crate::core::ics02_client::error as client_error;
-use crate::core::ics03_connection::version::Version;
-use crate::core::ics24_host::identifier::{ClientId, ConnectionId, IdentifierError};
-use crate::core::timestamp::{Timestamp, TimestampOverflowError};
-use crate::Height;
-
-use alloc::string::String;
 use displaydoc::Display;
-use ibc_proto::protobuf::Error as ProtoError;
+use ibc_core_client_types::{error as client_error, Height};
+use ibc_core_host_types::error::IdentifierError;
+use ibc_core_host_types::identifiers::{ClientId, ConnectionId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::{Timestamp, TimestampOverflowError};
+
+use crate::version::Version;
 
 #[derive(Debug, Display)]
 pub enum ConnectionError {
@@ -16,8 +15,6 @@ pub enum ConnectionError {
     Client(client_error::ClientError),
     /// invalid connection state: expected `{expected}`, actual `{actual}`
     InvalidState { expected: String, actual: String },
-    /// invalid connection end error: `{0}`
-    InvalidConnectionEnd(ProtoError),
     /// consensus height claimed by the client on the other party is too advanced: `{target_height}` (host chain current height: `{current_height}`)
     InvalidConsensusHeight {
         target_height: Height,
@@ -72,18 +69,20 @@ pub enum ConnectionError {
     },
     /// invalid client state: `{reason}`
     InvalidClientState { reason: String },
-    /// not enough blocks elapsed, current height `{current_host_height}` is still less than earliest acceptable height `{earliest_valid_height}`
+    /// not enough blocks elapsed, current height `{current_host_height}` is still less than the earliest acceptable height `{earliest_valid_height}`
     NotEnoughBlocksElapsed {
         current_host_height: Height,
         earliest_valid_height: Height,
     },
-    /// not enough time elapsed, current timestamp `{current_host_time}` is still less than earliest acceptable timestamp `{earliest_valid_time}`
+    /// not enough time elapsed, current timestamp `{current_host_time}` is still less than the earliest acceptable timestamp `{earliest_valid_time}`
     NotEnoughTimeElapsed {
         current_host_time: Timestamp,
         earliest_valid_time: Timestamp,
     },
     /// timestamp overflowed error: `{0}`
     TimestampOverflow(TimestampOverflowError),
+    /// connection counter overflow error
+    CounterOverflow,
     /// other error: `{description}`
     Other { description: String },
 }
@@ -92,15 +91,15 @@ pub enum ConnectionError {
 impl std::error::Error for ConnectionError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
-            Self::Client(e) => Some(e),
-            Self::InvalidIdentifier(e) => Some(e),
-            Self::VerifyConnectionState(e) => Some(e),
-            Self::ConsensusStateVerificationFailure {
+            Self::Client(e)
+            | Self::VerifyConnectionState(e)
+            | Self::ConsensusStateVerificationFailure {
                 client_error: e, ..
-            } => Some(e),
-            Self::ClientStateVerificationFailure {
+            }
+            | Self::ClientStateVerificationFailure {
                 client_error: e, ..
             } => Some(e),
+            Self::InvalidIdentifier(e) => Some(e),
             Self::TimestampOverflow(e) => Some(e),
             _ => None,
         }
diff --git a/crates/ibc/src/core/ics03_connection/events.rs b/ibc-core/ics03-connection/types/src/events.rs
similarity index 92%
rename from crates/ibc/src/core/ics03_connection/events.rs
rename to ibc-core/ics03-connection/types/src/events.rs
index ed8dcd2c9..08f64d9e1 100644
--- a/crates/ibc/src/core/ics03_connection/events.rs
+++ b/ibc-core/ics03-connection/types/src/events.rs
@@ -1,10 +1,9 @@
 //! Types for the IBC events emitted from Tendermint Websocket by the connection module.
 
-use crate::prelude::*;
+use ibc_core_host_types::identifiers::{ClientId, ConnectionId};
+use ibc_primitives::prelude::*;
 use tendermint::abci;
 
-use crate::core::ics24_host::identifier::{ClientId, ConnectionId};
-
 /// Connection event types
 const CONNECTION_OPEN_INIT_EVENT: &str = "connection_open_init";
 const CONNECTION_OPEN_TRY_EVENT: &str = "connection_open_try";
@@ -30,7 +29,7 @@ pub const COUNTERPARTY_CLIENT_ID_ATTRIBUTE_KEY: &str = "counterparty_client_id";
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 struct Attributes {
     pub connection_id: ConnectionId,
     pub client_id: ClientId,
@@ -306,11 +305,13 @@ impl From<OpenConfirm> for abci::Event {
 #[cfg(test)]
 mod tests {
 
-    use super::*;
-    use crate::core::ics02_client::client_type::ClientType;
-    use std::str::FromStr;
+    use core::str::FromStr;
+
+    use ibc_core_host_types::identifiers::ClientType;
     use tendermint::abci::Event as AbciEvent;
 
+    use super::*;
+
     #[test]
     fn ibc_to_abci_connection_events() {
         struct Test {
@@ -322,10 +323,10 @@ mod tests {
 
         let client_type = ClientType::from_str("07-tendermint")
             .expect("never fails because it's a valid client type");
-        let conn_id_on_a = ConnectionId::default();
-        let client_id_on_a = ClientId::new(client_type.clone(), 0).unwrap();
+        let conn_id_on_a = ConnectionId::zero();
+        let client_id_on_a = client_type.build_client_id(0);
         let conn_id_on_b = ConnectionId::new(1);
-        let client_id_on_b = ClientId::new(client_type, 1).unwrap();
+        let client_id_on_b = client_type.build_client_id(1);
         let expected_keys = vec![
             "connection_id",
             "client_id",
@@ -365,7 +366,7 @@ mod tests {
                 )
                 .into(),
                 expected_keys: expected_keys.clone(),
-                expected_values: expected_values.iter().rev().cloned().collect(),
+                expected_values: expected_values.iter().rev().copied().collect(),
             },
             Test {
                 kind: CONNECTION_OPEN_ACK_EVENT,
@@ -384,7 +385,7 @@ mod tests {
                 event: OpenConfirm::new(conn_id_on_b, client_id_on_b, conn_id_on_a, client_id_on_a)
                     .into(),
                 expected_keys: expected_keys.clone(),
-                expected_values: expected_values.iter().rev().cloned().collect(),
+                expected_values: expected_values.iter().rev().copied().collect(),
             },
         ];
 
@@ -392,11 +393,17 @@ mod tests {
             assert_eq!(t.kind, t.event.kind);
             assert_eq!(t.expected_keys.len(), t.event.attributes.len());
             for (i, e) in t.event.attributes.iter().enumerate() {
-                assert_eq!(e.key, t.expected_keys[i], "key mismatch for {:?}", t.kind);
+                assert_eq!(
+                    e.key_str().unwrap(),
+                    t.expected_keys[i],
+                    "key mismatch for {:?}",
+                    t.kind
+                );
             }
             for (i, e) in t.event.attributes.iter().enumerate() {
                 assert_eq!(
-                    e.value, t.expected_values[i],
+                    e.value_str().unwrap(),
+                    t.expected_values[i],
                     "value mismatch for {:?}",
                     t.kind
                 );
diff --git a/ibc-core/ics03-connection/types/src/lib.rs b/ibc-core/ics03-connection/types/src/lib.rs
new file mode 100644
index 000000000..345e7eee1
--- /dev/null
+++ b/ibc-core/ics03-connection/types/src/lib.rs
@@ -0,0 +1,29 @@
+//! Implementation of the Connection Semantics (ICS-03) data structures.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+mod connection;
+pub use connection::*;
+
+pub mod error;
+pub mod events;
+pub mod msgs;
+pub mod version;
+
+/// Re-exports ICS-03 proto types from the `ibc-proto` crate for added
+/// convenience
+pub mod proto {
+    pub use ibc_proto::ibc::core::connection::*;
+}
diff --git a/ibc-core/ics03-connection/types/src/msgs/conn_open_ack.rs b/ibc-core/ics03-connection/types/src/msgs/conn_open_ack.rs
new file mode 100644
index 000000000..dc3056b2a
--- /dev/null
+++ b/ibc-core/ics03-connection/types/src/msgs/conn_open_ack.rs
@@ -0,0 +1,122 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::ConnectionId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenAck as RawMsgConnectionOpenAck;
+use ibc_proto::Protobuf;
+
+use crate::error::ConnectionError;
+use crate::version::Version;
+
+pub const CONN_OPEN_ACK_TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenAck";
+
+/// Per our convention, this message is sent to chain A.
+/// The handler will check proofs of chain B.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgConnectionOpenAck {
+    /// ConnectionId that chain A has chosen for its ConnectionEnd
+    pub conn_id_on_a: ConnectionId,
+    /// ConnectionId that chain B has chosen for its ConnectionEnd
+    pub conn_id_on_b: ConnectionId,
+    /// ClientState of client tracking chain A on chain B
+    pub client_state_of_a_on_b: Any,
+    /// proof of ConnectionEnd stored on Chain B during ConnOpenTry
+    pub proof_conn_end_on_b: CommitmentProofBytes,
+    /// proof of ClientState tracking chain A on chain B
+    pub proof_client_state_of_a_on_b: CommitmentProofBytes,
+    /// proof that chain B has stored ConsensusState of chain A on its client
+    pub proof_consensus_state_of_a_on_b: CommitmentProofBytes,
+    /// Height at which all proofs in this message were taken
+    pub proofs_height_on_b: Height,
+    /// height of latest header of chain A that updated the client on chain B
+    pub consensus_height_of_a_on_b: Height,
+    pub version: Version,
+    pub signer: Signer,
+    /// optional proof of host state machines (chain A) that are unable to
+    /// introspect their own consensus state
+    pub proof_consensus_state_of_a: Option<CommitmentProofBytes>,
+}
+
+impl Protobuf<RawMsgConnectionOpenAck> for MsgConnectionOpenAck {}
+
+impl TryFrom<RawMsgConnectionOpenAck> for MsgConnectionOpenAck {
+    type Error = ConnectionError;
+
+    fn try_from(msg: RawMsgConnectionOpenAck) -> Result<Self, Self::Error> {
+        Ok(Self {
+            conn_id_on_a: msg
+                .connection_id
+                .parse()
+                .map_err(ConnectionError::InvalidIdentifier)?,
+            conn_id_on_b: msg
+                .counterparty_connection_id
+                .parse()
+                .map_err(ConnectionError::InvalidIdentifier)?,
+            client_state_of_a_on_b: msg
+                .client_state
+                .ok_or(ConnectionError::MissingClientState)?,
+            version: msg
+                .version
+                .ok_or(ConnectionError::EmptyVersions)?
+                .try_into()?,
+            proof_conn_end_on_b: msg
+                .proof_try
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proof_client_state_of_a_on_b: msg
+                .proof_client
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proof_consensus_state_of_a_on_b: msg
+                .proof_consensus
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proofs_height_on_b: msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ConnectionError::MissingProofHeight)?,
+            consensus_height_of_a_on_b: msg
+                .consensus_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ConnectionError::MissingConsensusHeight)?,
+            signer: msg.signer.into(),
+            proof_consensus_state_of_a: if msg.host_consensus_state_proof.is_empty() {
+                None
+            } else {
+                Some(
+                    msg.host_consensus_state_proof
+                        .try_into()
+                        .map_err(|_| ConnectionError::InvalidProof)?,
+                )
+            },
+        })
+    }
+}
+
+impl From<MsgConnectionOpenAck> for RawMsgConnectionOpenAck {
+    fn from(msg: MsgConnectionOpenAck) -> Self {
+        RawMsgConnectionOpenAck {
+            connection_id: msg.conn_id_on_a.as_str().to_string(),
+            counterparty_connection_id: msg.conn_id_on_b.as_str().to_string(),
+            client_state: Some(msg.client_state_of_a_on_b),
+            proof_height: Some(msg.proofs_height_on_b.into()),
+            proof_try: msg.proof_conn_end_on_b.into(),
+            proof_client: msg.proof_client_state_of_a_on_b.into(),
+            proof_consensus: msg.proof_consensus_state_of_a_on_b.into(),
+            consensus_height: Some(msg.consensus_height_of_a_on_b.into()),
+            version: Some(msg.version.into()),
+            signer: msg.signer.to_string(),
+            host_consensus_state_proof: match msg.proof_consensus_state_of_a {
+                Some(proof) => proof.into(),
+                None => vec![],
+            },
+        }
+    }
+}
diff --git a/ibc-core/ics03-connection/types/src/msgs/conn_open_confirm.rs b/ibc-core/ics03-connection/types/src/msgs/conn_open_confirm.rs
new file mode 100644
index 000000000..e18821d57
--- /dev/null
+++ b/ibc-core/ics03-connection/types/src/msgs/conn_open_confirm.rs
@@ -0,0 +1,64 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::ConnectionId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenConfirm as RawMsgConnectionOpenConfirm;
+use ibc_proto::Protobuf;
+
+use crate::error::ConnectionError;
+
+pub const CONN_OPEN_CONFIRM_TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenConfirm";
+
+/// Per our convention, this message is sent to chain B.
+/// The handler will check proofs of chain A.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgConnectionOpenConfirm {
+    /// ConnectionId that chain B has chosen for its ConnectionEnd
+    pub conn_id_on_b: ConnectionId,
+    /// proof of ConnectionEnd stored on Chain A during ConnOpenInit
+    pub proof_conn_end_on_a: CommitmentProofBytes,
+    /// Height at which `proof_conn_end_on_a` in this message was taken
+    pub proof_height_on_a: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgConnectionOpenConfirm> for MsgConnectionOpenConfirm {}
+
+impl TryFrom<RawMsgConnectionOpenConfirm> for MsgConnectionOpenConfirm {
+    type Error = ConnectionError;
+
+    fn try_from(msg: RawMsgConnectionOpenConfirm) -> Result<Self, Self::Error> {
+        Ok(Self {
+            conn_id_on_b: msg
+                .connection_id
+                .parse()
+                .map_err(ConnectionError::InvalidIdentifier)?,
+            proof_conn_end_on_a: msg
+                .proof_ack
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proof_height_on_a: msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ConnectionError::MissingProofHeight)?,
+            signer: msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgConnectionOpenConfirm> for RawMsgConnectionOpenConfirm {
+    fn from(msg: MsgConnectionOpenConfirm) -> Self {
+        RawMsgConnectionOpenConfirm {
+            connection_id: msg.conn_id_on_b.as_str().to_string(),
+            proof_ack: msg.proof_conn_end_on_a.into(),
+            proof_height: Some(msg.proof_height_on_a.into()),
+            signer: msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics03-connection/types/src/msgs/conn_open_init.rs b/ibc-core/ics03-connection/types/src/msgs/conn_open_init.rs
new file mode 100644
index 000000000..2a93b1bd3
--- /dev/null
+++ b/ibc-core/ics03-connection/types/src/msgs/conn_open_init.rs
@@ -0,0 +1,120 @@
+use core::time::Duration;
+
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenInit as RawMsgConnectionOpenInit;
+use ibc_proto::Protobuf;
+
+use crate::connection::Counterparty;
+use crate::error::ConnectionError;
+use crate::version::Version;
+
+pub const CONN_OPEN_INIT_TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenInit";
+
+/// Per our convention, this message is sent to chain A.
+/// The handler will check proofs of chain B.
+#[derive(Clone, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct MsgConnectionOpenInit {
+    /// ClientId on chain A that the connection is being opened for
+    pub client_id_on_a: ClientId,
+    pub counterparty: Counterparty,
+    pub version: Option<Version>,
+    pub delay_period: Duration,
+    pub signer: Signer,
+}
+
+/// This module encapsulates the workarounds we need to do to implement
+/// `BorshSerialize` and `BorshDeserialize` on `MsgConnectionOpenInit`
+#[cfg(feature = "borsh")]
+mod borsh_impls {
+    use borsh::maybestd::io::{self, Read};
+    use borsh::{BorshDeserialize, BorshSerialize};
+
+    use super::*;
+
+    #[derive(BorshSerialize, BorshDeserialize)]
+    pub struct InnerMsgConnectionOpenInit {
+        /// ClientId on chain A that the connection is being opened for
+        pub client_id_on_a: ClientId,
+        pub counterparty: Counterparty,
+        pub version: Option<Version>,
+        pub delay_period_nanos: u64,
+        pub signer: Signer,
+    }
+
+    impl BorshSerialize for MsgConnectionOpenInit {
+        fn serialize<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
+            let delay_period_nanos: u64 =
+                self.delay_period.as_nanos().try_into().map_err(|_| {
+                    io::Error::new(
+                        io::ErrorKind::Other,
+                        format!("Duration too long: {} nanos", self.delay_period.as_nanos()),
+                    )
+                })?;
+
+            let inner = InnerMsgConnectionOpenInit {
+                client_id_on_a: self.client_id_on_a.clone(),
+                counterparty: self.counterparty.clone(),
+                version: self.version.clone(),
+                delay_period_nanos,
+                signer: self.signer.clone(),
+            };
+
+            inner.serialize(writer)
+        }
+    }
+
+    impl BorshDeserialize for MsgConnectionOpenInit {
+        fn deserialize_reader<R: Read>(reader: &mut R) -> io::Result<Self> {
+            let inner = InnerMsgConnectionOpenInit::deserialize_reader(reader)?;
+
+            Ok(MsgConnectionOpenInit {
+                client_id_on_a: inner.client_id_on_a,
+                counterparty: inner.counterparty,
+                version: inner.version,
+                delay_period: Duration::from_nanos(inner.delay_period_nanos),
+                signer: inner.signer,
+            })
+        }
+    }
+}
+
+impl Protobuf<RawMsgConnectionOpenInit> for MsgConnectionOpenInit {}
+
+impl TryFrom<RawMsgConnectionOpenInit> for MsgConnectionOpenInit {
+    type Error = ConnectionError;
+
+    fn try_from(msg: RawMsgConnectionOpenInit) -> Result<Self, Self::Error> {
+        let counterparty: Counterparty = msg
+            .counterparty
+            .ok_or(ConnectionError::MissingCounterparty)?
+            .try_into()?;
+
+        counterparty.verify_empty_connection_id()?;
+
+        Ok(Self {
+            client_id_on_a: msg
+                .client_id
+                .parse()
+                .map_err(ConnectionError::InvalidIdentifier)?,
+            counterparty,
+            version: msg.version.map(TryInto::try_into).transpose()?,
+            delay_period: Duration::from_nanos(msg.delay_period),
+            signer: msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgConnectionOpenInit> for RawMsgConnectionOpenInit {
+    fn from(ics_msg: MsgConnectionOpenInit) -> Self {
+        RawMsgConnectionOpenInit {
+            client_id: ics_msg.client_id_on_a.as_str().to_string(),
+            counterparty: Some(ics_msg.counterparty.into()),
+            version: ics_msg.version.map(Into::into),
+            delay_period: ics_msg.delay_period.as_nanos() as u64,
+            signer: ics_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics03-connection/types/src/msgs/conn_open_try.rs b/ibc-core/ics03-connection/types/src/msgs/conn_open_try.rs
new file mode 100644
index 000000000..eb8bd4cef
--- /dev/null
+++ b/ibc-core/ics03-connection/types/src/msgs/conn_open_try.rs
@@ -0,0 +1,234 @@
+use core::time::Duration;
+
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::ClientId;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::connection::v1::MsgConnectionOpenTry as RawMsgConnectionOpenTry;
+use ibc_proto::Protobuf;
+
+use crate::connection::Counterparty;
+use crate::error::ConnectionError;
+use crate::version::Version;
+
+pub const CONN_OPEN_TRY_TYPE_URL: &str = "/ibc.core.connection.v1.MsgConnectionOpenTry";
+
+/// Per our convention, this message is sent to chain B.
+/// The handler will check proofs of chain A.
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgConnectionOpenTry {
+    /// ClientId on B that the connection is being opened for
+    pub client_id_on_b: ClientId,
+    /// ClientState of client tracking chain B on chain A
+    pub client_state_of_b_on_a: Any,
+    /// ClientId, ConnectionId and prefix of chain A
+    pub counterparty: Counterparty,
+    /// Versions supported by chain A
+    pub versions_on_a: Vec<Version>,
+    /// proof of ConnectionEnd stored on Chain A during ConnOpenInit
+    pub proof_conn_end_on_a: CommitmentProofBytes,
+    /// proof that chain A has stored ClientState of chain B on its client
+    pub proof_client_state_of_b_on_a: CommitmentProofBytes,
+    /// proof that chain A has stored ConsensusState of chain B on its client
+    pub proof_consensus_state_of_b_on_a: CommitmentProofBytes,
+    /// Height at which all proofs in this message were taken
+    pub proofs_height_on_a: Height,
+    /// height of latest header of chain A that updated the client on chain B
+    pub consensus_height_of_b_on_a: Height,
+    pub delay_period: Duration,
+    pub signer: Signer,
+    /// optional proof of host state machines (chain B) that are unable to
+    /// introspect their own consensus state
+    pub proof_consensus_state_of_b: Option<CommitmentProofBytes>,
+
+    #[deprecated(since = "0.22.0")]
+    /// Only kept here for proper conversion to/from the raw type
+    pub previous_connection_id: String,
+}
+
+#[allow(deprecated)]
+#[cfg(feature = "borsh")]
+mod borsh_impls {
+    use borsh::maybestd::io::{self, Read};
+    use borsh::{BorshDeserialize, BorshSerialize};
+
+    use super::*;
+
+    #[derive(BorshSerialize, BorshDeserialize)]
+    pub struct InnerMsgConnectionOpenTry {
+        /// ClientId on B that the connection is being opened for
+        pub client_id_on_b: ClientId,
+        /// ClientState of client tracking chain B on chain A
+        pub client_state_of_b_on_a: Any,
+        /// ClientId, ConnectionId and prefix of chain A
+        pub counterparty: Counterparty,
+        /// Versions supported by chain A
+        pub versions_on_a: Vec<Version>,
+        /// proof of ConnectionEnd stored on Chain A during ConnOpenInit
+        pub proof_conn_end_on_a: CommitmentProofBytes,
+        /// proof that chain A has stored ClientState of chain B on its client
+        pub proof_client_state_of_b_on_a: CommitmentProofBytes,
+        /// proof that chain A has stored ConsensusState of chain B on its client
+        pub proof_consensus_state_of_b_on_a: CommitmentProofBytes,
+        /// Height at which all proofs in this message were taken
+        pub proofs_height_on_a: Height,
+        /// height of latest header of chain A that updated the client on chain B
+        pub consensus_height_of_b_on_a: Height,
+        pub delay_period_nanos: u64,
+        pub signer: Signer,
+        /// optional proof of host state machines (chain B) that are unable to
+        /// introspect their own consensus state
+        pub proof_consensus_state_of_b: Option<CommitmentProofBytes>,
+
+        #[deprecated(since = "0.22.0")]
+        /// Only kept here for proper conversion to/from the raw type
+        previous_connection_id: String,
+    }
+
+    impl BorshSerialize for MsgConnectionOpenTry {
+        fn serialize<W: io::Write>(&self, writer: &mut W) -> io::Result<()> {
+            let delay_period_nanos: u64 =
+                self.delay_period.as_nanos().try_into().map_err(|_| {
+                    io::Error::new(
+                        io::ErrorKind::Other,
+                        format!("Duration too long: {} nanos", self.delay_period.as_nanos()),
+                    )
+                })?;
+
+            let inner = InnerMsgConnectionOpenTry {
+                client_id_on_b: self.client_id_on_b.clone(),
+                client_state_of_b_on_a: self.client_state_of_b_on_a.clone(),
+                counterparty: self.counterparty.clone(),
+                versions_on_a: self.versions_on_a.clone(),
+                proof_conn_end_on_a: self.proof_conn_end_on_a.clone(),
+                proof_client_state_of_b_on_a: self.proof_client_state_of_b_on_a.clone(),
+                proof_consensus_state_of_b_on_a: self.proof_consensus_state_of_b_on_a.clone(),
+                proofs_height_on_a: self.proofs_height_on_a,
+                consensus_height_of_b_on_a: self.consensus_height_of_b_on_a,
+                delay_period_nanos,
+                signer: self.signer.clone(),
+                proof_consensus_state_of_b: self.proof_consensus_state_of_b.clone(),
+                previous_connection_id: self.previous_connection_id.clone(),
+            };
+
+            inner.serialize(writer)
+        }
+    }
+
+    impl BorshDeserialize for MsgConnectionOpenTry {
+        fn deserialize_reader<R: Read>(reader: &mut R) -> io::Result<Self> {
+            let inner = InnerMsgConnectionOpenTry::deserialize_reader(reader)?;
+
+            Ok(MsgConnectionOpenTry {
+                client_id_on_b: inner.client_id_on_b,
+                client_state_of_b_on_a: inner.client_state_of_b_on_a,
+                counterparty: inner.counterparty,
+                versions_on_a: inner.versions_on_a,
+                proof_conn_end_on_a: inner.proof_conn_end_on_a,
+                proof_client_state_of_b_on_a: inner.proof_client_state_of_b_on_a,
+                proof_consensus_state_of_b_on_a: inner.proof_consensus_state_of_b_on_a,
+                proofs_height_on_a: inner.proofs_height_on_a,
+                consensus_height_of_b_on_a: inner.consensus_height_of_b_on_a,
+                delay_period: Duration::from_nanos(inner.delay_period_nanos),
+                signer: inner.signer,
+                proof_consensus_state_of_b: inner.proof_consensus_state_of_b,
+                previous_connection_id: inner.previous_connection_id,
+            })
+        }
+    }
+}
+
+impl Protobuf<RawMsgConnectionOpenTry> for MsgConnectionOpenTry {}
+
+impl TryFrom<RawMsgConnectionOpenTry> for MsgConnectionOpenTry {
+    type Error = ConnectionError;
+
+    fn try_from(msg: RawMsgConnectionOpenTry) -> Result<Self, Self::Error> {
+        let counterparty_versions = msg
+            .counterparty_versions
+            .into_iter()
+            .map(Version::try_from)
+            .collect::<Result<Vec<_>, _>>()?;
+
+        if counterparty_versions.is_empty() {
+            return Err(ConnectionError::EmptyVersions);
+        }
+
+        // We set the deprecated `previous_connection_id` field so that we can
+        // properly convert `MsgConnectionOpenTry` into its raw form
+        #[allow(deprecated)]
+        Ok(Self {
+            previous_connection_id: msg.previous_connection_id,
+            client_id_on_b: msg
+                .client_id
+                .parse()
+                .map_err(ConnectionError::InvalidIdentifier)?,
+            client_state_of_b_on_a: msg
+                .client_state
+                .ok_or(ConnectionError::MissingClientState)?,
+            counterparty: msg
+                .counterparty
+                .ok_or(ConnectionError::MissingCounterparty)?
+                .try_into()?,
+            versions_on_a: counterparty_versions,
+            proof_conn_end_on_a: msg
+                .proof_init
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proof_client_state_of_b_on_a: msg
+                .proof_client
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proof_consensus_state_of_b_on_a: msg
+                .proof_consensus
+                .try_into()
+                .map_err(|_| ConnectionError::InvalidProof)?,
+            proofs_height_on_a: msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ConnectionError::MissingProofHeight)?,
+            consensus_height_of_b_on_a: msg
+                .consensus_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ConnectionError::MissingConsensusHeight)?,
+            delay_period: Duration::from_nanos(msg.delay_period),
+            signer: msg.signer.into(),
+            proof_consensus_state_of_b: if msg.host_consensus_state_proof.is_empty() {
+                None
+            } else {
+                Some(
+                    msg.host_consensus_state_proof
+                        .try_into()
+                        .map_err(|_| ConnectionError::InvalidProof)?,
+                )
+            },
+        })
+    }
+}
+
+impl From<MsgConnectionOpenTry> for RawMsgConnectionOpenTry {
+    fn from(msg: MsgConnectionOpenTry) -> Self {
+        #[allow(deprecated)]
+        RawMsgConnectionOpenTry {
+            client_id: msg.client_id_on_b.as_str().to_string(),
+            previous_connection_id: msg.previous_connection_id,
+            client_state: Some(msg.client_state_of_b_on_a),
+            counterparty: Some(msg.counterparty.into()),
+            delay_period: msg.delay_period.as_nanos() as u64,
+            counterparty_versions: msg.versions_on_a.iter().map(|v| v.clone().into()).collect(),
+            proof_height: Some(msg.proofs_height_on_a.into()),
+            proof_init: msg.proof_conn_end_on_a.into(),
+            proof_client: msg.proof_client_state_of_b_on_a.into(),
+            proof_consensus: msg.proof_consensus_state_of_b_on_a.into(),
+            consensus_height: Some(msg.consensus_height_of_b_on_a.into()),
+            signer: msg.signer.to_string(),
+            host_consensus_state_proof: match msg.proof_consensus_state_of_b {
+                Some(proof) => proof.into(),
+                None => vec![],
+            },
+        }
+    }
+}
diff --git a/ibc-core/ics03-connection/types/src/msgs/mod.rs b/ibc-core/ics03-connection/types/src/msgs/mod.rs
new file mode 100644
index 000000000..d3be3dcf6
--- /dev/null
+++ b/ibc-core/ics03-connection/types/src/msgs/mod.rs
@@ -0,0 +1,39 @@
+//! Message definitions for the connection handshake datagrams.
+//!
+//! We define each of the four messages in the connection handshake protocol as a `struct`.
+//! Each such message comprises the same fields as the datagrams defined in ICS3 English spec:
+//! <https://github.com/cosmos/ibc/tree/master/spec/core/ics-003-connection-semantics>.
+//!
+//! One departure from ICS3 is that we abstract the three counterparty fields (connection id,
+//! prefix, and client id) into a single field of type `Counterparty`; this applies to messages
+//! `MsgConnectionOpenInit` and `MsgConnectionOpenTry`. One other difference with regard to
+//! abstraction is that all proof-related attributes in a message are encapsulated in `Proofs` type.
+//!
+//! Another difference to ICS3 specs is that each message comprises an additional field called
+//! `signer` which is specific to Cosmos-SDK.
+
+use ibc_primitives::prelude::*;
+
+mod conn_open_ack;
+mod conn_open_confirm;
+mod conn_open_init;
+mod conn_open_try;
+
+pub use conn_open_ack::*;
+pub use conn_open_confirm::*;
+pub use conn_open_init::*;
+pub use conn_open_try::*;
+
+/// Enumeration of all possible messages that the ICS3 protocol processes.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
+pub enum ConnectionMsg {
+    OpenInit(MsgConnectionOpenInit),
+    OpenTry(MsgConnectionOpenTry),
+    OpenAck(MsgConnectionOpenAck),
+    OpenConfirm(MsgConnectionOpenConfirm),
+}
diff --git a/crates/ibc/src/core/ics03_connection/version.rs b/ibc-core/ics03-connection/types/src/version.rs
similarity index 86%
rename from crates/ibc/src/core/ics03_connection/version.rs
rename to ibc-core/ics03-connection/types/src/version.rs
index ba6fdb9a6..a4446d113 100644
--- a/crates/ibc/src/core/ics03_connection/version.rs
+++ b/ibc-core/ics03-connection/types/src/version.rs
@@ -2,14 +2,12 @@
 
 use core::fmt::Display;
 
-use crate::prelude::*;
-use crate::utils::pretty::PrettySlice;
-
+use ibc_primitives::prelude::*;
+use ibc_primitives::utils::PrettySlice;
 use ibc_proto::ibc::core::connection::v1::Version as RawVersion;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics04_channel::channel::Order;
+use crate::error::ConnectionError;
 
 /// Stores the identifier and the features supported by a version
 #[cfg_attr(
@@ -25,6 +23,7 @@ use crate::core::ics04_channel::channel::Order;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Version {
     /// unique version identifier
@@ -59,6 +58,14 @@ impl Version {
         }
         Ok(())
     }
+
+    /// Returns the lists of supported versions
+    pub fn compatibles() -> Vec<Self> {
+        vec![Self {
+            identifier: "1".to_string(),
+            features: vec!["ORDER_ORDERED".to_string(), "ORDER_UNORDERED".to_string()],
+        }]
+    }
 }
 
 impl Protobuf<RawVersion> for Version {}
@@ -90,18 +97,6 @@ impl From<Version> for RawVersion {
     }
 }
 
-impl Default for Version {
-    fn default() -> Self {
-        Version {
-            identifier: "1".to_string(),
-            features: vec![
-                Order::Ordered.as_str().to_owned(),
-                Order::Unordered.as_str().to_owned(),
-            ],
-        }
-    }
-}
-
 impl Display for Version {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         write!(
@@ -113,16 +108,11 @@ impl Display for Version {
     }
 }
 
-/// Returns the lists of supported versions
-pub fn get_compatible_versions() -> Vec<Version> {
-    vec![Version::default()]
-}
-
 /// Iterates over the descending ordered set of compatible IBC versions and
 /// selects the first version with a version identifier that is supported by the
 /// counterparty. The returned version contains a feature set with the
 /// intersection of the features supported by the source and counterparty
-/// chains. If the feature set intersection is nil then the search for a
+/// chains. If the feature set intersection is nil, the search for a
 /// compatible version continues. This function is called in the `conn_open_try`
 /// handshake procedure.
 ///
@@ -189,14 +179,11 @@ fn get_feature_set_intersection(
 
 #[cfg(test)]
 mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
+    use ibc_primitives::prelude::*;
     use ibc_proto::ibc::core::connection::v1::Version as RawVersion;
 
-    use crate::core::ics03_connection::error::ConnectionError;
-    use crate::core::ics03_connection::version::{get_compatible_versions, pick_version, Version};
+    use crate::error::ConnectionError;
+    use crate::version::{pick_version, Version};
 
     fn get_dummy_features() -> Vec<String> {
         vec!["ORDER_RANDOM".to_string(), "ORDER_UNORDERED".to_string()]
@@ -204,7 +191,11 @@ mod tests {
 
     fn good_versions() -> Vec<RawVersion> {
         vec![
-            Version::default().into(),
+            Version {
+                identifier: "1".to_string(),
+                features: vec!["ORDER_ORDERED".to_string(), "ORDER_UNORDERED".to_string()],
+            }
+            .into(),
             RawVersion {
                 identifier: "2".to_string(),
                 features: get_dummy_features(),
@@ -235,7 +226,10 @@ mod tests {
     fn overlapping() -> (Vec<Version>, Vec<Version>, Version) {
         (
             vec![
-                Version::default(),
+                Version {
+                    identifier: "1".to_string(),
+                    features: vec!["ORDER_ORDERED".to_string(), "ORDER_UNORDERED".to_string()],
+                },
                 Version {
                     identifier: "3".to_string(),
                     features: get_dummy_features(),
@@ -298,7 +292,11 @@ mod tests {
         let tests: Vec<Test> = vec![
             Test {
                 name: "Compatible versions".to_string(),
-                versions: vec![Version::default().into()],
+                versions: vec![Version {
+                    identifier: "1".to_string(),
+                    features: get_dummy_features(),
+                }
+                .into()],
                 want_pass: true,
             },
             Test {
@@ -351,9 +349,12 @@ mod tests {
         let tests: Vec<Test> = vec![
             Test {
                 name: "Compatible versions".to_string(),
-                supported: get_compatible_versions(),
-                counterparty: get_compatible_versions(),
-                picked: Ok(Version::default()),
+                supported: Version::compatibles(),
+                counterparty: Version::compatibles(),
+                picked: Ok(Version {
+                    identifier: "1".to_string(),
+                    features: vec!["ORDER_ORDERED".to_string(), "ORDER_UNORDERED".to_string()],
+                }),
                 want_pass: true,
             },
             Test {
@@ -389,7 +390,10 @@ mod tests {
     }
     #[test]
     fn serialize() {
-        let def = Version::default();
+        let def = Version {
+            identifier: "1".to_string(),
+            features: vec!["ORDER_ORDERED".to_string(), "ORDER_UNORDERED".to_string()],
+        };
         let def_raw: RawVersion = def.clone().into();
         let def_back = def_raw.try_into().unwrap();
         assert_eq!(def, def_back);
diff --git a/ibc-core/ics04-channel/Cargo.toml b/ibc-core/ics04-channel/Cargo.toml
new file mode 100644
index 000000000..1ad973cc1
--- /dev/null
+++ b/ibc-core/ics04-channel/Cargo.toml
@@ -0,0 +1,83 @@
+[package]
+name         = "ibc-core-channel"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "channel" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains the implementation of the ICS-04 Channel & Packet Semantics and
+    re-exports essential data structures and domain types from `ibc-core-channel-types` crate.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+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             = { workspace = true }
+ibc-core-handler-types    = { workspace = true }
+ibc-core-router           = { workspace = true }
+ibc-primitives            = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-core-client/std",
+  "ibc-core-connection/std",
+  "ibc-core-channel-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host/std",
+  "ibc-core-handler-types/std",
+  "ibc-core-router/std",
+  "ibc-primitives/std",
+]
+serde = [
+  "ibc-core-client/serde",
+  "ibc-core-connection/serde",
+  "ibc-core-channel-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host/serde",
+  "ibc-core-handler-types/serde",
+  "ibc-core-router/serde",
+  "ibc-primitives/serde",
+]
+schema = [
+  "ibc-core-client/schema",
+  "ibc-core-connection/schema",
+  "ibc-core-channel-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-core-router/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-core-client/borsh",
+  "ibc-core-connection/borsh",
+  "ibc-core-channel-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host/borsh",
+  "ibc-core-handler-types/borsh",
+  "ibc-core-router/borsh",
+  "ibc-primitives/borsh",
+]
+parity-scale-codec = [
+  "ibc-core-client/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/parity-scale-codec",
+  "ibc-core-handler-types/parity-scale-codec",
+  "ibc-core-router/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+]
diff --git a/ibc-core/ics04-channel/src/context.rs b/ibc-core/ics04-channel/src/context.rs
new file mode 100644
index 000000000..1fba1de8f
--- /dev/null
+++ b/ibc-core/ics04-channel/src/context.rs
@@ -0,0 +1,105 @@
+//! ICS4 (channel) context.
+
+use ibc_core_channel_types::channel::ChannelEnd;
+use ibc_core_channel_types::commitment::PacketCommitment;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::types::ConnectionEnd;
+use ibc_core_handler_types::error::ContextError;
+use ibc_core_handler_types::events::IbcEvent;
+use ibc_core_host::types::identifiers::{ConnectionId, Sequence};
+use ibc_core_host::types::path::{ChannelEndPath, CommitmentPath, SeqSendPath};
+use ibc_core_host::{ExecutionContext, ValidationContext};
+use ibc_primitives::prelude::*;
+
+/// Methods required in send packet validation, to be implemented by the host
+pub trait SendPacketValidationContext {
+    type V: ClientValidationContext;
+
+    /// Retrieve the context that implements all clients' `ValidationContext`.
+    fn get_client_validation_context(&self) -> &Self::V;
+
+    /// Returns the ChannelEnd for the given `port_id` and `chan_id`.
+    fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError>;
+
+    /// Returns the ConnectionState for the given identifier `connection_id`.
+    fn connection_end(&self, connection_id: &ConnectionId) -> Result<ConnectionEnd, ContextError>;
+
+    fn get_next_sequence_send(&self, seq_send_path: &SeqSendPath)
+        -> Result<Sequence, ContextError>;
+}
+
+impl<T> SendPacketValidationContext for T
+where
+    T: ValidationContext,
+{
+    type V = T::V;
+
+    fn get_client_validation_context(&self) -> &Self::V {
+        self.get_client_validation_context()
+    }
+
+    fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError> {
+        self.channel_end(channel_end_path)
+    }
+
+    fn connection_end(&self, connection_id: &ConnectionId) -> Result<ConnectionEnd, ContextError> {
+        self.connection_end(connection_id)
+    }
+
+    fn get_next_sequence_send(
+        &self,
+        seq_send_path: &SeqSendPath,
+    ) -> Result<Sequence, ContextError> {
+        self.get_next_sequence_send(seq_send_path)
+    }
+}
+
+/// Methods required in send packet execution, to be implemented by the host
+pub trait SendPacketExecutionContext: SendPacketValidationContext {
+    fn store_next_sequence_send(
+        &mut self,
+        seq_send_path: &SeqSendPath,
+        seq: Sequence,
+    ) -> Result<(), ContextError>;
+
+    fn store_packet_commitment(
+        &mut self,
+        commitment_path: &CommitmentPath,
+        commitment: PacketCommitment,
+    ) -> Result<(), ContextError>;
+
+    /// Ibc events
+    fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), ContextError>;
+
+    /// Logging facility
+    fn log_message(&mut self, message: String) -> Result<(), ContextError>;
+}
+
+impl<T> SendPacketExecutionContext for T
+where
+    T: ExecutionContext,
+{
+    fn store_next_sequence_send(
+        &mut self,
+        seq_send_path: &SeqSendPath,
+        seq: Sequence,
+    ) -> Result<(), ContextError> {
+        self.store_next_sequence_send(seq_send_path, seq)
+    }
+
+    fn store_packet_commitment(
+        &mut self,
+        commitment_path: &CommitmentPath,
+        commitment: PacketCommitment,
+    ) -> Result<(), ContextError> {
+        self.store_packet_commitment(commitment_path, commitment)
+    }
+
+    fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), ContextError> {
+        self.emit_ibc_event(event)
+    }
+
+    fn log_message(&mut self, message: String) -> Result<(), ContextError> {
+        self.log_message(message)
+    }
+}
diff --git a/ibc-core/ics04-channel/src/handler/acknowledgement.rs b/ibc-core/ics04-channel/src/handler/acknowledgement.rs
new file mode 100644
index 000000000..c58edc74a
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/acknowledgement.rs
@@ -0,0 +1,210 @@
+use ibc_core_channel_types::channel::{Counterparty, Order, State as ChannelState};
+use ibc_core_channel_types::commitment::{compute_ack_commitment, compute_packet_commitment};
+use ibc_core_channel_types::error::{ChannelError, PacketError};
+use ibc_core_channel_types::events::AcknowledgePacket;
+use ibc_core_channel_types::msgs::MsgAcknowledgement;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::delay::verify_conn_delay_passed;
+use ibc_core_connection::types::State as ConnectionState;
+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::*;
+
+pub fn acknowledgement_packet_validate<ValCtx>(
+    ctx_a: &ValCtx,
+    module: &dyn Module,
+    msg: MsgAcknowledgement,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_a, &msg)?;
+
+    module
+        .on_acknowledgement_packet_validate(&msg.packet, &msg.acknowledgement, &msg.signer)
+        .map_err(ContextError::PacketError)
+}
+
+pub fn acknowledgement_packet_execute<ExecCtx>(
+    ctx_a: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgAcknowledgement,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let chan_end_path_on_a =
+        ChannelEndPath::new(&msg.packet.port_id_on_a, &msg.packet.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+    let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
+
+    // In all cases, this event is emitted
+    let event = IbcEvent::AcknowledgePacket(AcknowledgePacket::new(
+        msg.packet.clone(),
+        chan_end_on_a.ordering,
+        conn_id_on_a.clone(),
+    ));
+    ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+    ctx_a.emit_ibc_event(event)?;
+
+    let commitment_path_on_a = CommitmentPath::new(
+        &msg.packet.port_id_on_a,
+        &msg.packet.chan_id_on_a,
+        msg.packet.seq_on_a,
+    );
+
+    // check if we're in the NO-OP case
+    if ctx_a.get_packet_commitment(&commitment_path_on_a).is_err() {
+        // This error indicates that the timeout has already been relayed
+        // or there is a misconfigured relayer attempting to prove a timeout
+        // for a packet never sent. Core IBC will treat this error as a no-op in order to
+        // prevent an entire relay transaction from failing and consuming unnecessary fees.
+        return Ok(());
+    };
+
+    let (extras, cb_result) =
+        module.on_acknowledgement_packet_execute(&msg.packet, &msg.acknowledgement, &msg.signer);
+
+    cb_result?;
+
+    // apply state changes
+    {
+        ctx_a.delete_packet_commitment(&commitment_path_on_a)?;
+
+        if let Order::Ordered = chan_end_on_a.ordering {
+            // Note: in validation, we verified that `msg.packet.sequence == nextSeqRecv`
+            // (where `nextSeqRecv` is the value in the store)
+            let seq_ack_path_on_a =
+                SeqAckPath::new(&msg.packet.port_id_on_a, &msg.packet.chan_id_on_a);
+            ctx_a.store_next_sequence_ack(&seq_ack_path_on_a, msg.packet.seq_on_a.increment())?;
+        }
+    }
+
+    // emit events and logs
+    {
+        ctx_a.log_message("success: packet acknowledgement".to_string())?;
+
+        // Note: Acknowledgement event was emitted at the beginning
+
+        for module_event in extras.events {
+            ctx_a.emit_ibc_event(IbcEvent::Module(module_event))?
+        }
+
+        for log_message in extras.log {
+            ctx_a.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgAcknowledgement) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let packet = &msg.packet;
+    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    chan_end_on_a.verify_state_matches(&ChannelState::Open)?;
+
+    let counterparty = Counterparty::new(
+        packet.port_id_on_b.clone(),
+        Some(packet.chan_id_on_b.clone()),
+    );
+
+    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
+
+    let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
+    let conn_end_on_a = ctx_a.connection_end(conn_id_on_a)?;
+
+    conn_end_on_a.verify_state_matches(&ConnectionState::Open)?;
+
+    let commitment_path_on_a =
+        CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a);
+
+    // Verify packet commitment
+    let Ok(commitment_on_a) = ctx_a.get_packet_commitment(&commitment_path_on_a) else {
+        // This error indicates that the timeout has already been relayed
+        // or there is a misconfigured relayer attempting to prove a timeout
+        // for a packet never sent. Core IBC will treat this error as a no-op in order to
+        // prevent an entire relay transaction from failing and consuming unnecessary fees.
+        return Ok(());
+    };
+
+    if commitment_on_a
+        != compute_packet_commitment(
+            &packet.data,
+            &packet.timeout_height_on_b,
+            &packet.timeout_timestamp_on_b,
+        )
+    {
+        return Err(PacketError::IncorrectPacketCommitment {
+            sequence: packet.seq_on_a,
+        }
+        .into());
+    }
+
+    if let Order::Ordered = chan_end_on_a.ordering {
+        let seq_ack_path_on_a = SeqAckPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+        let next_seq_ack = ctx_a.get_next_sequence_ack(&seq_ack_path_on_a)?;
+        if packet.seq_on_a != next_seq_ack {
+            return Err(PacketError::InvalidPacketSequence {
+                given_sequence: packet.seq_on_a,
+                next_sequence: next_seq_ack,
+            }
+            .into());
+        }
+    }
+
+    // Verify proofs
+    {
+        let client_id_on_a = conn_end_on_a.client_id();
+
+        let client_val_ctx_a = ctx_a.get_client_validation_context();
+
+        let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+
+        client_state_of_b_on_a
+            .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+            .verify_is_active()?;
+        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
+
+        let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+            client_id_on_a.clone(),
+            msg.proof_height_on_b.revision_number(),
+            msg.proof_height_on_b.revision_height(),
+        );
+        let consensus_state_of_b_on_a =
+            client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+        let ack_commitment = compute_ack_commitment(&msg.acknowledgement);
+        let ack_path_on_b =
+            AckPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a);
+
+        verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
+
+        // Verify the proof for the packet against the chain store.
+        client_state_of_b_on_a
+            .verify_membership(
+                conn_end_on_a.counterparty().prefix(),
+                &msg.proof_acked_on_b,
+                consensus_state_of_b_on_a.root(),
+                Path::Ack(ack_path_on_b),
+                ack_commitment.into_vec(),
+            )
+            .map_err(|e| ChannelError::PacketVerificationFailed {
+                sequence: packet.seq_on_a,
+                client_error: e,
+            })
+            .map_err(PacketError::Channel)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs b/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs
new file mode 100644
index 000000000..5385d18c3
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/chan_close_confirm.rs
@@ -0,0 +1,166 @@
+//! Protocol logic specific to ICS4 messages of type `MsgChannelCloseConfirm`.
+
+use ibc_core_channel_types::channel::{ChannelEnd, Counterparty, State, State as ChannelState};
+use ibc_core_channel_types::error::ChannelError;
+use ibc_core_channel_types::events::CloseConfirm;
+use ibc_core_channel_types::msgs::MsgChannelCloseConfirm;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::types::State as ConnectionState;
+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::*;
+use ibc_primitives::proto::Protobuf;
+
+pub fn chan_close_confirm_validate<ValCtx>(
+    ctx_b: &ValCtx,
+    module: &dyn Module,
+    msg: MsgChannelCloseConfirm,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_b, &msg)?;
+
+    module.on_chan_close_confirm_validate(&msg.port_id_on_b, &msg.chan_id_on_b)?;
+
+    Ok(())
+}
+
+pub fn chan_close_confirm_execute<ExecCtx>(
+    ctx_b: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgChannelCloseConfirm,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let extras = module.on_chan_close_confirm_execute(&msg.port_id_on_b, &msg.chan_id_on_b)?;
+    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
+    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
+
+    // state changes
+    {
+        let chan_end_on_b = {
+            let mut chan_end_on_b = chan_end_on_b.clone();
+            chan_end_on_b.set_state(State::Closed);
+            chan_end_on_b
+        };
+        ctx_b.store_channel(&chan_end_path_on_b, chan_end_on_b)?;
+    }
+
+    // emit events and logs
+    {
+        ctx_b.log_message("success: channel close confirm".to_string())?;
+
+        let core_event = {
+            let port_id_on_a = chan_end_on_b.counterparty().port_id.clone();
+            let chan_id_on_a = chan_end_on_b
+                .counterparty()
+                .channel_id
+                .clone()
+                .ok_or(ContextError::ChannelError(ChannelError::Other {
+                description:
+                    "internal error: ChannelEnd doesn't have a counterparty channel id in CloseInit"
+                        .to_string(),
+            }))?;
+            let conn_id_on_b = chan_end_on_b.connection_hops[0].clone();
+
+            IbcEvent::CloseConfirmChannel(CloseConfirm::new(
+                msg.port_id_on_b.clone(),
+                msg.chan_id_on_b.clone(),
+                port_id_on_a,
+                chan_id_on_a,
+                conn_id_on_b,
+            ))
+        };
+        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_b.emit_ibc_event(core_event)?;
+
+        for module_event in extras.events {
+            ctx_b.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_b.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgChannelCloseConfirm) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_b.validate_message_signer(&msg.signer)?;
+
+    // Retrieve the old channel end and validate it against the message.
+    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
+    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
+
+    // Validate that the channel end is in a state where it can be closed.
+    chan_end_on_b.verify_not_closed()?;
+
+    let conn_end_on_b = ctx_b.connection_end(&chan_end_on_b.connection_hops()[0])?;
+
+    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
+
+    // Verify proofs
+    {
+        let client_id_on_b = conn_end_on_b.client_id();
+
+        let client_val_ctx_b = ctx_b.get_client_validation_context();
+
+        let client_state_of_a_on_b = client_val_ctx_b.client_state(client_id_on_b)?;
+
+        client_state_of_a_on_b
+            .status(ctx_b.get_client_validation_context(), client_id_on_b)?
+            .verify_is_active()?;
+        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            client_id_on_b.clone(),
+            msg.proof_height_on_a.revision_number(),
+            msg.proof_height_on_a.revision_height(),
+        );
+        let consensus_state_of_a_on_b =
+            client_val_ctx_b.consensus_state(&client_cons_state_path_on_b)?;
+        let prefix_on_a = conn_end_on_b.counterparty().prefix();
+        let port_id_on_a = &chan_end_on_b.counterparty().port_id;
+        let chan_id_on_a = chan_end_on_b
+            .counterparty()
+            .channel_id()
+            .ok_or(ChannelError::MissingCounterparty)?;
+        let conn_id_on_a = conn_end_on_b.counterparty().connection_id().ok_or(
+            ChannelError::UndefinedConnectionCounterparty {
+                connection_id: chan_end_on_b.connection_hops()[0].clone(),
+            },
+        )?;
+
+        let expected_chan_end_on_a = ChannelEnd::new(
+            ChannelState::Closed,
+            *chan_end_on_b.ordering(),
+            Counterparty::new(msg.port_id_on_b.clone(), Some(msg.chan_id_on_b.clone())),
+            vec![conn_id_on_a.clone()],
+            chan_end_on_b.version().clone(),
+        )?;
+        let chan_end_path_on_a = ChannelEndPath::new(port_id_on_a, chan_id_on_a);
+
+        // Verify the proof for the channel state against the expected channel end.
+        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
+        client_state_of_a_on_b
+            .verify_membership(
+                prefix_on_a,
+                &msg.proof_chan_end_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::ChannelEnd(chan_end_path_on_a),
+                expected_chan_end_on_a.encode_vec(),
+            )
+            .map_err(ChannelError::VerifyChannelFailed)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/chan_close_init.rs b/ibc-core/ics04-channel/src/handler/chan_close_init.rs
new file mode 100644
index 000000000..15c38c9f5
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/chan_close_init.rs
@@ -0,0 +1,122 @@
+//! Protocol logic specific to ICS4 messages of type `MsgChannelCloseInit`.
+use ibc_core_channel_types::channel::State;
+use ibc_core_channel_types::error::ChannelError;
+use ibc_core_channel_types::events::CloseInit;
+use ibc_core_channel_types::msgs::MsgChannelCloseInit;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::types::State as ConnectionState;
+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::*;
+
+pub fn chan_close_init_validate<ValCtx>(
+    ctx_a: &ValCtx,
+    module: &dyn Module,
+    msg: MsgChannelCloseInit,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_a, &msg)?;
+
+    module.on_chan_close_init_validate(&msg.port_id_on_a, &msg.chan_id_on_a)?;
+
+    Ok(())
+}
+
+pub fn chan_close_init_execute<ExecCtx>(
+    ctx_a: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgChannelCloseInit,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let extras = module.on_chan_close_init_execute(&msg.port_id_on_a, &msg.chan_id_on_a)?;
+    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    // state changes
+    {
+        let chan_end_on_a = {
+            let mut chan_end_on_a = chan_end_on_a.clone();
+            chan_end_on_a.set_state(State::Closed);
+            chan_end_on_a
+        };
+
+        ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a)?;
+    }
+
+    // emit events and logs
+    {
+        ctx_a.log_message("success: channel close init".to_string())?;
+
+        let core_event = {
+            let port_id_on_b = chan_end_on_a.counterparty().port_id.clone();
+            let chan_id_on_b = chan_end_on_a
+                .counterparty()
+                .channel_id
+                .clone()
+                .ok_or(ContextError::ChannelError(ChannelError::Other {
+                description:
+                    "internal error: ChannelEnd doesn't have a counterparty channel id in CloseInit"
+                        .to_string(),
+            }))?;
+            let conn_id_on_a = chan_end_on_a.connection_hops[0].clone();
+
+            IbcEvent::CloseInitChannel(CloseInit::new(
+                msg.port_id_on_a.clone(),
+                msg.chan_id_on_a.clone(),
+                port_id_on_b,
+                chan_id_on_b,
+                conn_id_on_a,
+            ))
+        };
+        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_a.emit_ibc_event(core_event)?;
+
+        for module_event in extras.events {
+            ctx_a.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_a.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgChannelCloseInit) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    // Validate that the channel end is in a state where it can be closed.
+    chan_end_on_a.verify_not_closed()?;
+
+    // An OPEN IBC connection running on the local (host) chain should exist.
+    chan_end_on_a.verify_connection_hops_length()?;
+
+    let conn_end_on_a = ctx_a.connection_end(&chan_end_on_a.connection_hops()[0])?;
+
+    conn_end_on_a.verify_state_matches(&ConnectionState::Open)?;
+
+    let client_id_on_a = conn_end_on_a.client_id();
+
+    let client_val_ctx_a = ctx_a.get_client_validation_context();
+
+    let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+    client_state_of_b_on_a
+        .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+        .verify_is_active()?;
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/chan_open_ack.rs b/ibc-core/ics04-channel/src/handler/chan_open_ack.rs
new file mode 100644
index 000000000..7e5b6b240
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/chan_open_ack.rs
@@ -0,0 +1,159 @@
+//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenAck`.
+use ibc_core_channel_types::channel::{ChannelEnd, Counterparty, State, State as ChannelState};
+use ibc_core_channel_types::error::ChannelError;
+use ibc_core_channel_types::events::OpenAck;
+use ibc_core_channel_types::msgs::MsgChannelOpenAck;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::types::State as ConnectionState;
+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::*;
+use ibc_primitives::proto::Protobuf;
+
+pub fn chan_open_ack_validate<ValCtx>(
+    ctx_a: &ValCtx,
+    module: &dyn Module,
+    msg: MsgChannelOpenAck,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_a, &msg)?;
+
+    module.on_chan_open_ack_validate(&msg.port_id_on_a, &msg.chan_id_on_a, &msg.version_on_b)?;
+
+    Ok(())
+}
+
+pub fn chan_open_ack_execute<ExecCtx>(
+    ctx_a: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgChannelOpenAck,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let extras =
+        module.on_chan_open_ack_execute(&msg.port_id_on_a, &msg.chan_id_on_a, &msg.version_on_b)?;
+    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    // state changes
+    {
+        let chan_end_on_a = {
+            let mut chan_end_on_a = chan_end_on_a.clone();
+
+            chan_end_on_a.set_state(State::Open);
+            chan_end_on_a.set_version(msg.version_on_b.clone());
+            chan_end_on_a.set_counterparty_channel_id(msg.chan_id_on_b.clone());
+
+            chan_end_on_a
+        };
+        ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a)?;
+    }
+
+    // emit events and logs
+    {
+        ctx_a.log_message("success: channel open ack".to_string())?;
+
+        let core_event = {
+            let port_id_on_b = chan_end_on_a.counterparty().port_id.clone();
+            let conn_id_on_a = chan_end_on_a.connection_hops[0].clone();
+
+            IbcEvent::OpenAckChannel(OpenAck::new(
+                msg.port_id_on_a.clone(),
+                msg.chan_id_on_a.clone(),
+                port_id_on_b,
+                msg.chan_id_on_b,
+                conn_id_on_a,
+            ))
+        };
+        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_a.emit_ibc_event(core_event)?;
+
+        for module_event in extras.events {
+            ctx_a.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_a.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgChannelOpenAck) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &msg.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    // Validate that the channel end is in a state where it can be ack.
+    chan_end_on_a.verify_state_matches(&ChannelState::Init)?;
+
+    // An OPEN IBC connection running on the local (host) chain should exist.
+    chan_end_on_a.verify_connection_hops_length()?;
+
+    let conn_end_on_a = ctx_a.connection_end(&chan_end_on_a.connection_hops()[0])?;
+
+    conn_end_on_a.verify_state_matches(&ConnectionState::Open)?;
+
+    // Verify proofs
+    {
+        let client_id_on_a = conn_end_on_a.client_id();
+        let client_val_ctx_a = ctx_a.get_client_validation_context();
+        let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+
+        client_state_of_b_on_a
+            .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+            .verify_is_active()?;
+        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
+
+        let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+            client_id_on_a.clone(),
+            msg.proof_height_on_b.revision_number(),
+            msg.proof_height_on_b.revision_height(),
+        );
+        let consensus_state_of_b_on_a =
+            client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+        let prefix_on_b = conn_end_on_a.counterparty().prefix();
+        let port_id_on_b = &chan_end_on_a.counterparty().port_id;
+        let conn_id_on_b = conn_end_on_a.counterparty().connection_id().ok_or(
+            ChannelError::UndefinedConnectionCounterparty {
+                connection_id: chan_end_on_a.connection_hops()[0].clone(),
+            },
+        )?;
+
+        let expected_chan_end_on_b = ChannelEnd::new(
+            ChannelState::TryOpen,
+            // Note: Both ends of a channel must have the same ordering, so it's
+            // fine to use A's ordering here
+            *chan_end_on_a.ordering(),
+            Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
+            vec![conn_id_on_b.clone()],
+            msg.version_on_b.clone(),
+        )?;
+        let chan_end_path_on_b = ChannelEndPath::new(port_id_on_b, &msg.chan_id_on_b);
+
+        // Verify the proof for the channel state against the expected channel end.
+        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
+        client_state_of_b_on_a
+            .verify_membership(
+                prefix_on_b,
+                &msg.proof_chan_end_on_b,
+                consensus_state_of_b_on_a.root(),
+                Path::ChannelEnd(chan_end_path_on_b),
+                expected_chan_end_on_b.encode_vec(),
+            )
+            .map_err(ChannelError::VerifyChannelFailed)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs b/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs
new file mode 100644
index 000000000..dfbc777c1
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/chan_open_confirm.rs
@@ -0,0 +1,166 @@
+//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenConfirm`.
+
+use ibc_core_channel_types::channel::{ChannelEnd, Counterparty, State, State as ChannelState};
+use ibc_core_channel_types::error::ChannelError;
+use ibc_core_channel_types::events::OpenConfirm;
+use ibc_core_channel_types::msgs::MsgChannelOpenConfirm;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::types::State as ConnectionState;
+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::*;
+use ibc_primitives::proto::Protobuf;
+
+pub fn chan_open_confirm_validate<ValCtx>(
+    ctx_b: &ValCtx,
+    module: &dyn Module,
+    msg: MsgChannelOpenConfirm,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_b, &msg)?;
+
+    module.on_chan_open_confirm_validate(&msg.port_id_on_b, &msg.chan_id_on_b)?;
+
+    Ok(())
+}
+
+pub fn chan_open_confirm_execute<ExecCtx>(
+    ctx_b: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgChannelOpenConfirm,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let extras = module.on_chan_open_confirm_execute(&msg.port_id_on_b, &msg.chan_id_on_b)?;
+    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
+    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
+
+    // state changes
+    {
+        let chan_end_on_b = {
+            let mut chan_end_on_b = chan_end_on_b.clone();
+            chan_end_on_b.set_state(State::Open);
+
+            chan_end_on_b
+        };
+        ctx_b.store_channel(&chan_end_path_on_b, chan_end_on_b)?;
+    }
+
+    // emit events and logs
+    {
+        ctx_b.log_message("success: channel open confirm".to_string())?;
+
+        let conn_id_on_b = chan_end_on_b.connection_hops[0].clone();
+        let port_id_on_a = chan_end_on_b.counterparty().port_id.clone();
+        let chan_id_on_a = chan_end_on_b
+            .counterparty()
+            .channel_id
+            .clone()
+            .ok_or(ContextError::ChannelError(ChannelError::Other {
+            description:
+                "internal error: ChannelEnd doesn't have a counterparty channel id in OpenConfirm"
+                    .to_string(),
+        }))?;
+
+        let core_event = IbcEvent::OpenConfirmChannel(OpenConfirm::new(
+            msg.port_id_on_b.clone(),
+            msg.chan_id_on_b.clone(),
+            port_id_on_a,
+            chan_id_on_a,
+            conn_id_on_b,
+        ));
+        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_b.emit_ibc_event(core_event)?;
+
+        for module_event in extras.events {
+            ctx_b.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_b.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgChannelOpenConfirm) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_b.validate_message_signer(&msg.signer)?;
+
+    // Unwrap the old channel end and validate it against the message.
+    let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &msg.chan_id_on_b);
+    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
+
+    // Validate that the channel end is in a state where it can be confirmed.
+    chan_end_on_b.verify_state_matches(&ChannelState::TryOpen)?;
+
+    // An OPEN IBC connection running on the local (host) chain should exist.
+    chan_end_on_b.verify_connection_hops_length()?;
+
+    let conn_end_on_b = ctx_b.connection_end(&chan_end_on_b.connection_hops()[0])?;
+
+    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
+
+    // Verify proofs
+    {
+        let client_id_on_b = conn_end_on_b.client_id();
+        let client_val_ctx_b = ctx_b.get_client_validation_context();
+        let client_state_of_a_on_b = client_val_ctx_b.client_state(client_id_on_b)?;
+
+        client_state_of_a_on_b
+            .status(ctx_b.get_client_validation_context(), client_id_on_b)?
+            .verify_is_active()?;
+        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            client_id_on_b.clone(),
+            msg.proof_height_on_a.revision_number(),
+            msg.proof_height_on_a.revision_height(),
+        );
+        let consensus_state_of_a_on_b =
+            client_val_ctx_b.consensus_state(&client_cons_state_path_on_b)?;
+        let prefix_on_a = conn_end_on_b.counterparty().prefix();
+        let port_id_on_a = &chan_end_on_b.counterparty().port_id;
+        let chan_id_on_a = chan_end_on_b
+            .counterparty()
+            .channel_id()
+            .ok_or(ChannelError::MissingCounterparty)?;
+        let conn_id_on_a = conn_end_on_b.counterparty().connection_id().ok_or(
+            ChannelError::UndefinedConnectionCounterparty {
+                connection_id: chan_end_on_b.connection_hops()[0].clone(),
+            },
+        )?;
+
+        let expected_chan_end_on_a = ChannelEnd::new(
+            ChannelState::Open,
+            *chan_end_on_b.ordering(),
+            Counterparty::new(msg.port_id_on_b.clone(), Some(msg.chan_id_on_b.clone())),
+            vec![conn_id_on_a.clone()],
+            chan_end_on_b.version.clone(),
+        )?;
+        let chan_end_path_on_a = ChannelEndPath::new(port_id_on_a, chan_id_on_a);
+
+        // Verify the proof for the channel state against the expected channel end.
+        // A counterparty channel id of None in not possible, and is checked in msg.
+        client_state_of_a_on_b
+            .verify_membership(
+                prefix_on_a,
+                &msg.proof_chan_end_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::ChannelEnd(chan_end_path_on_a),
+                expected_chan_end_on_a.encode_vec(),
+            )
+            .map_err(ChannelError::VerifyChannelFailed)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/chan_open_init.rs b/ibc-core/ics04-channel/src/handler/chan_open_init.rs
new file mode 100644
index 000000000..58a161d0b
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/chan_open_init.rs
@@ -0,0 +1,135 @@
+//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenInit`.
+
+use ibc_core_channel_types::channel::{ChannelEnd, Counterparty, State};
+use ibc_core_channel_types::events::OpenInit;
+use ibc_core_channel_types::msgs::MsgChannelOpenInit;
+use ibc_core_client::context::prelude::*;
+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::*;
+
+pub fn chan_open_init_validate<ValCtx>(
+    ctx_a: &ValCtx,
+    module: &dyn Module,
+    msg: MsgChannelOpenInit,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_a, &msg)?;
+    let chan_id_on_a = ChannelId::new(ctx_a.channel_counter()?);
+
+    module.on_chan_open_init_validate(
+        msg.ordering,
+        &msg.connection_hops_on_a,
+        &msg.port_id_on_a,
+        &chan_id_on_a,
+        &Counterparty::new(msg.port_id_on_b.clone(), None),
+        &msg.version_proposal,
+    )?;
+
+    Ok(())
+}
+
+pub fn chan_open_init_execute<ExecCtx>(
+    ctx_a: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgChannelOpenInit,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let chan_id_on_a = ChannelId::new(ctx_a.channel_counter()?);
+    let (extras, version) = module.on_chan_open_init_execute(
+        msg.ordering,
+        &msg.connection_hops_on_a,
+        &msg.port_id_on_a,
+        &chan_id_on_a,
+        &Counterparty::new(msg.port_id_on_b.clone(), None),
+        &msg.version_proposal,
+    )?;
+
+    let conn_id_on_a = msg.connection_hops_on_a[0].clone();
+
+    // state changes
+    {
+        let chan_end_on_a = ChannelEnd::new(
+            State::Init,
+            msg.ordering,
+            Counterparty::new(msg.port_id_on_b.clone(), None),
+            msg.connection_hops_on_a.clone(),
+            msg.version_proposal.clone(),
+        )?;
+        let chan_end_path_on_a = ChannelEndPath::new(&msg.port_id_on_a, &chan_id_on_a);
+        ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a)?;
+
+        ctx_a.increase_channel_counter()?;
+
+        // Initialize send, recv, and ack sequence numbers.
+        let seq_send_path = SeqSendPath::new(&msg.port_id_on_a, &chan_id_on_a);
+        ctx_a.store_next_sequence_send(&seq_send_path, 1.into())?;
+
+        let seq_recv_path = SeqRecvPath::new(&msg.port_id_on_a, &chan_id_on_a);
+        ctx_a.store_next_sequence_recv(&seq_recv_path, 1.into())?;
+
+        let seq_ack_path = SeqAckPath::new(&msg.port_id_on_a, &chan_id_on_a);
+        ctx_a.store_next_sequence_ack(&seq_ack_path, 1.into())?;
+    }
+
+    // emit events and logs
+    {
+        ctx_a.log_message(format!(
+            "success: channel open init with channel identifier: {chan_id_on_a}"
+        ))?;
+        let core_event = IbcEvent::OpenInitChannel(OpenInit::new(
+            msg.port_id_on_a.clone(),
+            chan_id_on_a.clone(),
+            msg.port_id_on_b,
+            conn_id_on_a,
+            version,
+        ));
+        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_a.emit_ibc_event(core_event)?;
+
+        for module_event in extras.events {
+            ctx_a.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_a.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgChannelOpenInit) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    msg.verify_connection_hops_length()?;
+    // An IBC connection running on the local (host) chain should exist.
+    let conn_end_on_a = ctx_a.connection_end(&msg.connection_hops_on_a[0])?;
+
+    // Note: Not needed check if the connection end is OPEN. Optimistic channel handshake is allowed.
+
+    let client_id_on_a = conn_end_on_a.client_id();
+    let client_val_ctx_a = ctx_a.get_client_validation_context();
+    let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+
+    client_state_of_b_on_a
+        .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+        .verify_is_active()?;
+
+    let conn_version = conn_end_on_a.versions();
+
+    conn_version[0].verify_feature_supported(msg.ordering.to_string())?;
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/chan_open_try.rs b/ibc-core/ics04-channel/src/handler/chan_open_try.rs
new file mode 100644
index 000000000..08c82deac
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/chan_open_try.rs
@@ -0,0 +1,185 @@
+//! Protocol logic specific to ICS4 messages of type `MsgChannelOpenTry`.
+
+use ibc_core_channel_types::channel::{ChannelEnd, Counterparty, State as ChannelState};
+use ibc_core_channel_types::error::ChannelError;
+use ibc_core_channel_types::events::OpenTry;
+use ibc_core_channel_types::msgs::MsgChannelOpenTry;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::types::State as ConnectionState;
+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::*;
+use ibc_primitives::proto::Protobuf;
+
+pub fn chan_open_try_validate<ValCtx>(
+    ctx_b: &ValCtx,
+    module: &dyn Module,
+    msg: MsgChannelOpenTry,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    validate(ctx_b, &msg)?;
+
+    let chan_id_on_b = ChannelId::new(ctx_b.channel_counter()?);
+
+    module.on_chan_open_try_validate(
+        msg.ordering,
+        &msg.connection_hops_on_b,
+        &msg.port_id_on_b,
+        &chan_id_on_b,
+        &Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
+        &msg.version_supported_on_a,
+    )?;
+
+    Ok(())
+}
+
+pub fn chan_open_try_execute<ExecCtx>(
+    ctx_b: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgChannelOpenTry,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let chan_id_on_b = ChannelId::new(ctx_b.channel_counter()?);
+    let (extras, version) = module.on_chan_open_try_execute(
+        msg.ordering,
+        &msg.connection_hops_on_b,
+        &msg.port_id_on_b,
+        &chan_id_on_b,
+        &Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
+        &msg.version_supported_on_a,
+    )?;
+
+    let conn_id_on_b = msg.connection_hops_on_b[0].clone();
+
+    // state changes
+    {
+        let chan_end_on_b = ChannelEnd::new(
+            ChannelState::TryOpen,
+            msg.ordering,
+            Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_a.clone())),
+            msg.connection_hops_on_b.clone(),
+            version.clone(),
+        )?;
+
+        let chan_end_path_on_b = ChannelEndPath::new(&msg.port_id_on_b, &chan_id_on_b);
+        ctx_b.store_channel(&chan_end_path_on_b, chan_end_on_b)?;
+        ctx_b.increase_channel_counter()?;
+
+        // Initialize send, recv, and ack sequence numbers.
+        let seq_send_path = SeqSendPath::new(&msg.port_id_on_b, &chan_id_on_b);
+        ctx_b.store_next_sequence_send(&seq_send_path, 1.into())?;
+
+        let seq_recv_path = SeqRecvPath::new(&msg.port_id_on_b, &chan_id_on_b);
+        ctx_b.store_next_sequence_recv(&seq_recv_path, 1.into())?;
+
+        let seq_ack_path = SeqAckPath::new(&msg.port_id_on_b, &chan_id_on_b);
+        ctx_b.store_next_sequence_ack(&seq_ack_path, 1.into())?;
+    }
+
+    // emit events and logs
+    {
+        ctx_b.log_message(format!(
+            "success: channel open try with channel identifier: {chan_id_on_b}"
+        ))?;
+
+        let core_event = IbcEvent::OpenTryChannel(OpenTry::new(
+            msg.port_id_on_b.clone(),
+            chan_id_on_b.clone(),
+            msg.port_id_on_a.clone(),
+            msg.chan_id_on_a.clone(),
+            conn_id_on_b,
+            version,
+        ));
+        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_b.emit_ibc_event(core_event)?;
+
+        for module_event in extras.events {
+            ctx_b.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_b.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgChannelOpenTry) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_b.validate_message_signer(&msg.signer)?;
+
+    msg.verify_connection_hops_length()?;
+
+    let conn_end_on_b = ctx_b.connection_end(&msg.connection_hops_on_b[0])?;
+
+    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
+
+    let conn_version = conn_end_on_b.versions();
+
+    conn_version[0].verify_feature_supported(msg.ordering.to_string())?;
+
+    // Verify proofs
+    {
+        let client_id_on_b = conn_end_on_b.client_id();
+        let client_val_ctx_b = ctx_b.get_client_validation_context();
+        let client_state_of_a_on_b = client_val_ctx_b.client_state(client_id_on_b)?;
+
+        client_state_of_a_on_b
+            .status(ctx_b.get_client_validation_context(), client_id_on_b)?
+            .verify_is_active()?;
+
+        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            client_id_on_b.clone(),
+            msg.proof_height_on_a.revision_number(),
+            msg.proof_height_on_a.revision_height(),
+        );
+        let consensus_state_of_a_on_b =
+            client_val_ctx_b.consensus_state(&client_cons_state_path_on_b)?;
+        let prefix_on_a = conn_end_on_b.counterparty().prefix();
+        let port_id_on_a = msg.port_id_on_a.clone();
+        let chan_id_on_a = msg.chan_id_on_a.clone();
+        let conn_id_on_a = conn_end_on_b.counterparty().connection_id().ok_or(
+            ChannelError::UndefinedConnectionCounterparty {
+                connection_id: msg.connection_hops_on_b[0].clone(),
+            },
+        )?;
+
+        let expected_chan_end_on_a = ChannelEnd::new(
+            ChannelState::Init,
+            msg.ordering,
+            Counterparty::new(msg.port_id_on_b.clone(), None),
+            vec![conn_id_on_a.clone()],
+            msg.version_supported_on_a.clone(),
+        )?;
+        let chan_end_path_on_a = ChannelEndPath::new(&port_id_on_a, &chan_id_on_a);
+
+        // Verify the proof for the channel state against the expected channel end.
+        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
+        client_state_of_a_on_b
+            .verify_membership(
+                prefix_on_a,
+                &msg.proof_chan_end_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::ChannelEnd(chan_end_path_on_a),
+                expected_chan_end_on_a.encode_vec(),
+            )
+            .map_err(ChannelError::VerifyChannelFailed)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/mod.rs b/ibc-core/ics04-channel/src/handler/mod.rs
new file mode 100644
index 000000000..b1ea237a1
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/mod.rs
@@ -0,0 +1,24 @@
+//! This module implements the processing logic for ICS4 (channel) messages.
+mod acknowledgement;
+mod chan_close_confirm;
+mod chan_close_init;
+mod chan_open_ack;
+mod chan_open_confirm;
+mod chan_open_init;
+mod chan_open_try;
+mod recv_packet;
+mod send_packet;
+mod timeout;
+mod timeout_on_close;
+
+pub use acknowledgement::*;
+pub use chan_close_confirm::*;
+pub use chan_close_init::*;
+pub use chan_open_ack::*;
+pub use chan_open_confirm::*;
+pub use chan_open_init::*;
+pub use chan_open_try::*;
+pub use recv_packet::*;
+pub use send_packet::*;
+pub use timeout::*;
+pub use timeout_on_close::*;
diff --git a/ibc-core/ics04-channel/src/handler/recv_packet.rs b/ibc-core/ics04-channel/src/handler/recv_packet.rs
new file mode 100644
index 000000000..8c0cd25a1
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/recv_packet.rs
@@ -0,0 +1,289 @@
+use ibc_core_channel_types::channel::{Counterparty, Order, State as ChannelState};
+use ibc_core_channel_types::commitment::{compute_ack_commitment, compute_packet_commitment};
+use ibc_core_channel_types::error::{ChannelError, PacketError};
+use ibc_core_channel_types::events::{ReceivePacket, WriteAcknowledgement};
+use ibc_core_channel_types::msgs::MsgRecvPacket;
+use ibc_core_channel_types::packet::Receipt;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::delay::verify_conn_delay_passed;
+use ibc_core_connection::types::State as ConnectionState;
+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;
+
+pub fn recv_packet_validate<ValCtx>(ctx_b: &ValCtx, msg: MsgRecvPacket) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    // Note: this contains the validation for `write_acknowledgement` as well.
+    validate(ctx_b, &msg)
+
+    // nothing to validate with the module, since `onRecvPacket` cannot fail.
+    // If any error occurs, then an "error acknowledgement" must be returned.
+}
+
+pub fn recv_packet_execute<ExecCtx>(
+    ctx_b: &mut ExecCtx,
+    module: &mut dyn Module,
+    msg: MsgRecvPacket,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let chan_end_path_on_b =
+        ChannelEndPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
+    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
+
+    // Check if another relayer already relayed the packet.
+    // We don't want to fail the transaction in this case.
+    {
+        let packet_already_received = match chan_end_on_b.ordering {
+            // Note: ibc-go doesn't make the check for `Order::None` channels
+            Order::None => false,
+            Order::Unordered => {
+                let packet = &msg.packet;
+                let receipt_path_on_b =
+                    ReceiptPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a);
+                ctx_b.get_packet_receipt(&receipt_path_on_b).is_ok()
+            }
+            Order::Ordered => {
+                let seq_recv_path_on_b =
+                    SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
+                let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
+
+                // the sequence number has already been incremented, so
+                // another relayer already relayed the packet
+                msg.packet.seq_on_a < next_seq_recv
+            }
+        };
+
+        if packet_already_received {
+            return Ok(());
+        }
+    }
+
+    let (extras, acknowledgement) = module.on_recv_packet_execute(&msg.packet, &msg.signer);
+
+    // state changes
+    {
+        // `recvPacket` core handler state changes
+        match chan_end_on_b.ordering {
+            Order::Unordered => {
+                let receipt_path_on_b = ReceiptPath {
+                    port_id: msg.packet.port_id_on_b.clone(),
+                    channel_id: msg.packet.chan_id_on_b.clone(),
+                    sequence: msg.packet.seq_on_a,
+                };
+
+                ctx_b.store_packet_receipt(&receipt_path_on_b, Receipt::Ok)?;
+            }
+            Order::Ordered => {
+                let seq_recv_path_on_b =
+                    SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
+                let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
+                ctx_b.store_next_sequence_recv(&seq_recv_path_on_b, next_seq_recv.increment())?;
+            }
+            _ => {}
+        }
+        let ack_path_on_b = AckPath::new(
+            &msg.packet.port_id_on_b,
+            &msg.packet.chan_id_on_b,
+            msg.packet.seq_on_a,
+        );
+        // `writeAcknowledgement` handler state changes
+        ctx_b.store_packet_acknowledgement(
+            &ack_path_on_b,
+            compute_ack_commitment(&acknowledgement),
+        )?;
+    }
+
+    // emit events and logs
+    {
+        ctx_b.log_message("success: packet receive".to_string())?;
+        ctx_b.log_message("success: packet write acknowledgement".to_string())?;
+
+        let conn_id_on_b = &chan_end_on_b.connection_hops()[0];
+        let event = IbcEvent::ReceivePacket(ReceivePacket::new(
+            msg.packet.clone(),
+            chan_end_on_b.ordering,
+            conn_id_on_b.clone(),
+        ));
+        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_b.emit_ibc_event(event)?;
+        let event = IbcEvent::WriteAcknowledgement(WriteAcknowledgement::new(
+            msg.packet,
+            acknowledgement,
+            conn_id_on_b.clone(),
+        ));
+        ctx_b.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_b.emit_ibc_event(event)?;
+
+        for module_event in extras.events {
+            ctx_b.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_b.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_b: &Ctx, msg: &MsgRecvPacket) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_b.validate_message_signer(&msg.signer)?;
+
+    let chan_end_path_on_b =
+        ChannelEndPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
+    let chan_end_on_b = ctx_b.channel_end(&chan_end_path_on_b)?;
+
+    chan_end_on_b.verify_state_matches(&ChannelState::Open)?;
+
+    let counterparty = Counterparty::new(
+        msg.packet.port_id_on_a.clone(),
+        Some(msg.packet.chan_id_on_a.clone()),
+    );
+
+    chan_end_on_b.verify_counterparty_matches(&counterparty)?;
+
+    let conn_id_on_b = &chan_end_on_b.connection_hops()[0];
+    let conn_end_on_b = ctx_b.connection_end(conn_id_on_b)?;
+
+    conn_end_on_b.verify_state_matches(&ConnectionState::Open)?;
+
+    let latest_height = ctx_b.host_height()?;
+    if msg.packet.timeout_height_on_b.has_expired(latest_height) {
+        return Err(PacketError::LowPacketHeight {
+            chain_height: latest_height,
+            timeout_height: msg.packet.timeout_height_on_b,
+        }
+        .into());
+    }
+
+    let latest_timestamp = ctx_b.host_timestamp()?;
+    if let Expiry::Expired = latest_timestamp.check_expiry(&msg.packet.timeout_timestamp_on_b) {
+        return Err(PacketError::LowPacketTimestamp.into());
+    }
+
+    // Verify proofs
+    {
+        let client_id_on_b = conn_end_on_b.client_id();
+        let client_val_ctx_b = ctx_b.get_client_validation_context();
+        let client_state_of_a_on_b = client_val_ctx_b.client_state(client_id_on_b)?;
+
+        client_state_of_a_on_b
+            .status(ctx_b.get_client_validation_context(), client_id_on_b)?
+            .verify_is_active()?;
+
+        client_state_of_a_on_b.validate_proof_height(msg.proof_height_on_a)?;
+
+        let client_cons_state_path_on_b = ClientConsensusStatePath::new(
+            client_id_on_b.clone(),
+            msg.proof_height_on_a.revision_number(),
+            msg.proof_height_on_a.revision_height(),
+        );
+
+        let consensus_state_of_a_on_b =
+            client_val_ctx_b.consensus_state(&client_cons_state_path_on_b)?;
+
+        let expected_commitment_on_a = compute_packet_commitment(
+            &msg.packet.data,
+            &msg.packet.timeout_height_on_b,
+            &msg.packet.timeout_timestamp_on_b,
+        );
+        let commitment_path_on_a = CommitmentPath::new(
+            &msg.packet.port_id_on_a,
+            &msg.packet.chan_id_on_a,
+            msg.packet.seq_on_a,
+        );
+
+        verify_conn_delay_passed(ctx_b, msg.proof_height_on_a, &conn_end_on_b)?;
+
+        // Verify the proof for the packet against the chain store.
+        client_state_of_a_on_b
+            .verify_membership(
+                conn_end_on_b.counterparty().prefix(),
+                &msg.proof_commitment_on_a,
+                consensus_state_of_a_on_b.root(),
+                Path::Commitment(commitment_path_on_a),
+                expected_commitment_on_a.into_vec(),
+            )
+            .map_err(|e| ChannelError::PacketVerificationFailed {
+                sequence: msg.packet.seq_on_a,
+                client_error: e,
+            })
+            .map_err(PacketError::Channel)?;
+    }
+
+    match chan_end_on_b.ordering {
+        Order::Ordered => {
+            let seq_recv_path_on_b =
+                SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
+            let next_seq_recv = ctx_b.get_next_sequence_recv(&seq_recv_path_on_b)?;
+            if msg.packet.seq_on_a > next_seq_recv {
+                return Err(PacketError::InvalidPacketSequence {
+                    given_sequence: msg.packet.seq_on_a,
+                    next_sequence: next_seq_recv,
+                }
+                .into());
+            }
+
+            if msg.packet.seq_on_a == next_seq_recv {
+                // Case where the recvPacket is successful and an
+                // acknowledgement will be written (not a no-op)
+                validate_write_acknowledgement(ctx_b, msg)?;
+            }
+        }
+        Order::Unordered => {
+            let receipt_path_on_b = ReceiptPath::new(
+                &msg.packet.port_id_on_a,
+                &msg.packet.chan_id_on_a,
+                msg.packet.seq_on_a,
+            );
+            let packet_rec = ctx_b.get_packet_receipt(&receipt_path_on_b);
+            match packet_rec {
+                Ok(_receipt) => {}
+                Err(ContextError::PacketError(PacketError::PacketReceiptNotFound { sequence }))
+                    if sequence == msg.packet.seq_on_a => {}
+                Err(e) => return Err(e),
+            }
+            // Case where the recvPacket is successful and an
+            // acknowledgement will be written (not a no-op)
+            validate_write_acknowledgement(ctx_b, msg)?;
+        }
+        Order::None => {
+            return Err(ContextError::ChannelError(ChannelError::InvalidOrderType {
+                expected: "Channel ordering cannot be None".to_string(),
+                actual: chan_end_on_b.ordering.to_string(),
+            }))
+        }
+    }
+
+    Ok(())
+}
+
+fn validate_write_acknowledgement<Ctx>(ctx_b: &Ctx, msg: &MsgRecvPacket) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    let packet = msg.packet.clone();
+    let ack_path_on_b = AckPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a);
+    if ctx_b.get_packet_acknowledgement(&ack_path_on_b).is_ok() {
+        return Err(PacketError::AcknowledgementExists {
+            sequence: msg.packet.seq_on_a,
+        }
+        .into());
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/send_packet.rs b/ibc-core/ics04-channel/src/handler/send_packet.rs
new file mode 100644
index 000000000..895ad9457
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/send_packet.rs
@@ -0,0 +1,142 @@
+use ibc_core_channel_types::channel::Counterparty;
+use ibc_core_channel_types::commitment::compute_packet_commitment;
+use ibc_core_channel_types::error::PacketError;
+use ibc_core_channel_types::events::SendPacket;
+use ibc_core_channel_types::packet::Packet;
+use ibc_core_client::context::prelude::*;
+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::*;
+use ibc_primitives::Expiry;
+
+use crate::context::{SendPacketExecutionContext, SendPacketValidationContext};
+
+/// Send the given packet, including all necessary validation.
+///
+/// Equivalent to calling [`send_packet_validate`], followed by [`send_packet_execute`]
+pub fn send_packet(
+    ctx_a: &mut impl SendPacketExecutionContext,
+    packet: Packet,
+) -> Result<(), ContextError> {
+    send_packet_validate(ctx_a, &packet)?;
+    send_packet_execute(ctx_a, packet)
+}
+
+/// Validate that sending the given packet would succeed.
+pub fn send_packet_validate(
+    ctx_a: &impl SendPacketValidationContext,
+    packet: &Packet,
+) -> Result<(), ContextError> {
+    if !packet.timeout_height_on_b.is_set() && !packet.timeout_timestamp_on_b.is_set() {
+        return Err(ContextError::PacketError(PacketError::MissingTimeout));
+    }
+
+    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    // Checks the channel end not be `Closed`.
+    // This allows for optimistic packet processing before a channel opens
+    chan_end_on_a.verify_not_closed()?;
+
+    let counterparty = Counterparty::new(
+        packet.port_id_on_b.clone(),
+        Some(packet.chan_id_on_b.clone()),
+    );
+
+    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
+
+    let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
+
+    let conn_end_on_a = ctx_a.connection_end(conn_id_on_a)?;
+
+    let client_id_on_a = conn_end_on_a.client_id();
+
+    let client_val_ctx_a = ctx_a.get_client_validation_context();
+
+    let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+
+    client_state_of_b_on_a
+        .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+        .verify_is_active()?;
+
+    let latest_height_on_a = client_state_of_b_on_a.latest_height();
+
+    if packet.timeout_height_on_b.has_expired(latest_height_on_a) {
+        return Err(PacketError::LowPacketHeight {
+            chain_height: latest_height_on_a,
+            timeout_height: packet.timeout_height_on_b,
+        }
+        .into());
+    }
+
+    let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+        client_id_on_a.clone(),
+        latest_height_on_a.revision_number(),
+        latest_height_on_a.revision_height(),
+    );
+    let consensus_state_of_b_on_a =
+        client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+    let latest_timestamp = consensus_state_of_b_on_a.timestamp();
+    let packet_timestamp = packet.timeout_timestamp_on_b;
+    if let Expiry::Expired = latest_timestamp.check_expiry(&packet_timestamp) {
+        return Err(PacketError::LowPacketTimestamp.into());
+    }
+
+    let seq_send_path_on_a = SeqSendPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+    let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
+
+    if packet.seq_on_a != next_seq_send_on_a {
+        return Err(PacketError::InvalidPacketSequence {
+            given_sequence: packet.seq_on_a,
+            next_sequence: next_seq_send_on_a,
+        }
+        .into());
+    }
+
+    Ok(())
+}
+
+/// Send the packet without any validation.
+///
+/// A prior call to [`send_packet_validate`] MUST have succeeded.
+pub fn send_packet_execute(
+    ctx_a: &mut impl SendPacketExecutionContext,
+    packet: Packet,
+) -> Result<(), ContextError> {
+    {
+        let seq_send_path_on_a = SeqSendPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+        let next_seq_send_on_a = ctx_a.get_next_sequence_send(&seq_send_path_on_a)?;
+
+        ctx_a.store_next_sequence_send(&seq_send_path_on_a, next_seq_send_on_a.increment())?;
+    }
+
+    ctx_a.store_packet_commitment(
+        &CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a),
+        compute_packet_commitment(
+            &packet.data,
+            &packet.timeout_height_on_b,
+            &packet.timeout_timestamp_on_b,
+        ),
+    )?;
+
+    // emit events and logs
+    {
+        let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+        let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+        let conn_id_on_a = &chan_end_on_a.connection_hops()[0];
+
+        ctx_a.log_message("success: packet send".to_string())?;
+        let event = IbcEvent::SendPacket(SendPacket::new(
+            packet,
+            chan_end_on_a.ordering,
+            conn_id_on_a.clone(),
+        ));
+        ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+        ctx_a.emit_ibc_event(event)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/timeout.rs b/ibc-core/ics04-channel/src/handler/timeout.rs
new file mode 100644
index 000000000..ef478ed4e
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/timeout.rs
@@ -0,0 +1,263 @@
+use ibc_core_channel_types::channel::{Counterparty, Order, State};
+use ibc_core_channel_types::commitment::compute_packet_commitment;
+use ibc_core_channel_types::error::{ChannelError, PacketError};
+use ibc_core_channel_types::events::{ChannelClosed, TimeoutPacket};
+use ibc_core_channel_types::msgs::{MsgTimeout, MsgTimeoutOnClose};
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::delay::verify_conn_delay_passed;
+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 super::timeout_on_close;
+
+pub enum TimeoutMsgType {
+    Timeout(MsgTimeout),
+    TimeoutOnClose(MsgTimeoutOnClose),
+}
+
+pub fn timeout_packet_validate<ValCtx>(
+    ctx_a: &ValCtx,
+    module: &dyn Module,
+    timeout_msg_type: TimeoutMsgType,
+) -> Result<(), ContextError>
+where
+    ValCtx: ValidationContext,
+{
+    match &timeout_msg_type {
+        TimeoutMsgType::Timeout(msg) => validate(ctx_a, msg),
+        TimeoutMsgType::TimeoutOnClose(msg) => timeout_on_close::validate(ctx_a, msg),
+    }?;
+
+    let (packet, signer) = match timeout_msg_type {
+        TimeoutMsgType::Timeout(msg) => (msg.packet, msg.signer),
+        TimeoutMsgType::TimeoutOnClose(msg) => (msg.packet, msg.signer),
+    };
+
+    module
+        .on_timeout_packet_validate(&packet, &signer)
+        .map_err(ContextError::PacketError)
+}
+
+pub fn timeout_packet_execute<ExecCtx>(
+    ctx_a: &mut ExecCtx,
+    module: &mut dyn Module,
+    timeout_msg_type: TimeoutMsgType,
+) -> Result<(), ContextError>
+where
+    ExecCtx: ExecutionContext,
+{
+    let (packet, signer) = match timeout_msg_type {
+        TimeoutMsgType::Timeout(msg) => (msg.packet, msg.signer),
+        TimeoutMsgType::TimeoutOnClose(msg) => (msg.packet, msg.signer),
+    };
+    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    // In all cases, this event is emitted
+    let event = IbcEvent::TimeoutPacket(TimeoutPacket::new(packet.clone(), chan_end_on_a.ordering));
+    ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+    ctx_a.emit_ibc_event(event)?;
+
+    let commitment_path_on_a =
+        CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a);
+
+    // check if we're in the NO-OP case
+    if ctx_a.get_packet_commitment(&commitment_path_on_a).is_err() {
+        // This error indicates that the timeout has already been relayed
+        // or there is a misconfigured relayer attempting to prove a timeout
+        // for a packet never sent. Core IBC will treat this error as a no-op in order to
+        // prevent an entire relay transaction from failing and consuming unnecessary fees.
+        return Ok(());
+    };
+
+    let (extras, cb_result) = module.on_timeout_packet_execute(&packet, &signer);
+
+    cb_result?;
+
+    // apply state changes
+    let chan_end_on_a = {
+        ctx_a.delete_packet_commitment(&commitment_path_on_a)?;
+
+        if let Order::Ordered = chan_end_on_a.ordering {
+            let mut chan_end_on_a = chan_end_on_a;
+            chan_end_on_a.state = State::Closed;
+            ctx_a.store_channel(&chan_end_path_on_a, chan_end_on_a.clone())?;
+
+            chan_end_on_a
+        } else {
+            chan_end_on_a
+        }
+    };
+
+    // emit events and logs
+    {
+        ctx_a.log_message("success: packet timeout".to_string())?;
+
+        if let Order::Ordered = chan_end_on_a.ordering {
+            let conn_id_on_a = chan_end_on_a.connection_hops()[0].clone();
+
+            let event = IbcEvent::ChannelClosed(ChannelClosed::new(
+                packet.port_id_on_a.clone(),
+                packet.chan_id_on_a.clone(),
+                chan_end_on_a.counterparty().port_id.clone(),
+                chan_end_on_a.counterparty().channel_id.clone(),
+                conn_id_on_a,
+                chan_end_on_a.ordering,
+            ));
+            ctx_a.emit_ibc_event(IbcEvent::Message(MessageEvent::Channel))?;
+            ctx_a.emit_ibc_event(event)?;
+        }
+
+        for module_event in extras.events {
+            ctx_a.emit_ibc_event(IbcEvent::Module(module_event))?;
+        }
+
+        for log_message in extras.log {
+            ctx_a.log_message(log_message)?;
+        }
+    }
+
+    Ok(())
+}
+
+fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgTimeout) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let chan_end_on_a = ctx_a.channel_end(&ChannelEndPath::new(
+        &msg.packet.port_id_on_a,
+        &msg.packet.chan_id_on_a,
+    ))?;
+
+    chan_end_on_a.verify_state_matches(&State::Open)?;
+
+    let counterparty = Counterparty::new(
+        msg.packet.port_id_on_b.clone(),
+        Some(msg.packet.chan_id_on_b.clone()),
+    );
+
+    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
+
+    let conn_id_on_a = chan_end_on_a.connection_hops()[0].clone();
+    let conn_end_on_a = ctx_a.connection_end(&conn_id_on_a)?;
+
+    //verify packet commitment
+    let commitment_path_on_a = CommitmentPath::new(
+        &msg.packet.port_id_on_a,
+        &msg.packet.chan_id_on_a,
+        msg.packet.seq_on_a,
+    );
+    let Ok(commitment_on_a) = ctx_a.get_packet_commitment(&commitment_path_on_a) else {
+        // This error indicates that the timeout has already been relayed
+        // or there is a misconfigured relayer attempting to prove a timeout
+        // for a packet never sent. Core IBC will treat this error as a no-op in order to
+        // prevent an entire relay transaction from failing and consuming unnecessary fees.
+        return Ok(());
+    };
+
+    let expected_commitment_on_a = compute_packet_commitment(
+        &msg.packet.data,
+        &msg.packet.timeout_height_on_b,
+        &msg.packet.timeout_timestamp_on_b,
+    );
+    if commitment_on_a != expected_commitment_on_a {
+        return Err(PacketError::IncorrectPacketCommitment {
+            sequence: msg.packet.seq_on_a,
+        }
+        .into());
+    }
+
+    // Verify proofs
+    {
+        let client_id_on_a = conn_end_on_a.client_id();
+        let client_val_ctx_a = ctx_a.get_client_validation_context();
+        let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+
+        client_state_of_b_on_a
+            .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+            .verify_is_active()?;
+
+        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
+
+        // check that timeout height or timeout timestamp has passed on the other end
+        let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+            client_id_on_a.clone(),
+            msg.proof_height_on_b.revision_number(),
+            msg.proof_height_on_b.revision_height(),
+        );
+        let consensus_state_of_b_on_a =
+            client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+        let timestamp_of_b = consensus_state_of_b_on_a.timestamp();
+
+        if !msg.packet.timed_out(&timestamp_of_b, msg.proof_height_on_b) {
+            return Err(PacketError::PacketTimeoutNotReached {
+                timeout_height: msg.packet.timeout_height_on_b,
+                chain_height: msg.proof_height_on_b,
+                timeout_timestamp: msg.packet.timeout_timestamp_on_b,
+                chain_timestamp: timestamp_of_b,
+            }
+            .into());
+        }
+
+        verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
+
+        let next_seq_recv_verification_result = match chan_end_on_a.ordering {
+            Order::Ordered => {
+                if msg.packet.seq_on_a < msg.next_seq_recv_on_b {
+                    return Err(PacketError::InvalidPacketSequence {
+                        given_sequence: msg.packet.seq_on_a,
+                        next_sequence: msg.next_seq_recv_on_b,
+                    }
+                    .into());
+                }
+                let seq_recv_path_on_b =
+                    SeqRecvPath::new(&msg.packet.port_id_on_b, &msg.packet.chan_id_on_b);
+
+                client_state_of_b_on_a.verify_membership(
+                    conn_end_on_a.counterparty().prefix(),
+                    &msg.proof_unreceived_on_b,
+                    consensus_state_of_b_on_a.root(),
+                    Path::SeqRecv(seq_recv_path_on_b),
+                    msg.packet.seq_on_a.to_vec(),
+                )
+            }
+            Order::Unordered => {
+                let receipt_path_on_b = ReceiptPath::new(
+                    &msg.packet.port_id_on_b,
+                    &msg.packet.chan_id_on_b,
+                    msg.packet.seq_on_a,
+                );
+
+                client_state_of_b_on_a.verify_non_membership(
+                    conn_end_on_a.counterparty().prefix(),
+                    &msg.proof_unreceived_on_b,
+                    consensus_state_of_b_on_a.root(),
+                    Path::Receipt(receipt_path_on_b),
+                )
+            }
+            Order::None => {
+                return Err(ContextError::ChannelError(ChannelError::InvalidOrderType {
+                    expected: "Channel ordering cannot be None".to_string(),
+                    actual: chan_end_on_a.ordering.to_string(),
+                }))
+            }
+        };
+
+        next_seq_recv_verification_result
+            .map_err(|e| ChannelError::PacketVerificationFailed {
+                sequence: msg.next_seq_recv_on_b,
+                client_error: e,
+            })
+            .map_err(PacketError::Channel)?;
+    }
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/handler/timeout_on_close.rs b/ibc-core/ics04-channel/src/handler/timeout_on_close.rs
new file mode 100644
index 000000000..8366a5d26
--- /dev/null
+++ b/ibc-core/ics04-channel/src/handler/timeout_on_close.rs
@@ -0,0 +1,173 @@
+use ibc_core_channel_types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc_core_channel_types::commitment::compute_packet_commitment;
+use ibc_core_channel_types::error::{ChannelError, PacketError};
+use ibc_core_channel_types::msgs::MsgTimeoutOnClose;
+use ibc_core_client::context::prelude::*;
+use ibc_core_connection::delay::verify_conn_delay_passed;
+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 ibc_primitives::proto::Protobuf;
+
+pub fn validate<Ctx>(ctx_a: &Ctx, msg: &MsgTimeoutOnClose) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+{
+    ctx_a.validate_message_signer(&msg.signer)?;
+
+    let packet = &msg.packet;
+    let chan_end_path_on_a = ChannelEndPath::new(&packet.port_id_on_a, &packet.chan_id_on_a);
+    let chan_end_on_a = ctx_a.channel_end(&chan_end_path_on_a)?;
+
+    let counterparty = Counterparty::new(
+        packet.port_id_on_b.clone(),
+        Some(packet.chan_id_on_b.clone()),
+    );
+
+    chan_end_on_a.verify_counterparty_matches(&counterparty)?;
+
+    let commitment_path_on_a = CommitmentPath::new(
+        &msg.packet.port_id_on_a,
+        &msg.packet.chan_id_on_a,
+        msg.packet.seq_on_a,
+    );
+
+    //verify the packet was sent, check the store
+    let Ok(commitment_on_a) = ctx_a.get_packet_commitment(&commitment_path_on_a) else {
+        // This error indicates that the timeout has already been relayed
+        // or there is a misconfigured relayer attempting to prove a timeout
+        // for a packet never sent. Core IBC will treat this error as a no-op in order to
+        // prevent an entire relay transaction from failing and consuming unnecessary fees.
+        return Ok(());
+    };
+
+    let expected_commitment_on_a = compute_packet_commitment(
+        &packet.data,
+        &packet.timeout_height_on_b,
+        &packet.timeout_timestamp_on_b,
+    );
+    if commitment_on_a != expected_commitment_on_a {
+        return Err(PacketError::IncorrectPacketCommitment {
+            sequence: packet.seq_on_a,
+        }
+        .into());
+    }
+
+    let conn_id_on_a = chan_end_on_a.connection_hops()[0].clone();
+    let conn_end_on_a = ctx_a.connection_end(&conn_id_on_a)?;
+
+    // Verify proofs
+    {
+        let client_id_on_a = conn_end_on_a.client_id();
+        let client_val_ctx_a = ctx_a.get_client_validation_context();
+        let client_state_of_b_on_a = client_val_ctx_a.client_state(client_id_on_a)?;
+
+        client_state_of_b_on_a
+            .status(ctx_a.get_client_validation_context(), client_id_on_a)?
+            .verify_is_active()?;
+
+        client_state_of_b_on_a.validate_proof_height(msg.proof_height_on_b)?;
+
+        let client_cons_state_path_on_a = ClientConsensusStatePath::new(
+            client_id_on_a.clone(),
+            msg.proof_height_on_b.revision_number(),
+            msg.proof_height_on_b.revision_height(),
+        );
+        let consensus_state_of_b_on_a =
+            client_val_ctx_a.consensus_state(&client_cons_state_path_on_a)?;
+        let prefix_on_b = conn_end_on_a.counterparty().prefix();
+        let port_id_on_b = chan_end_on_a.counterparty().port_id.clone();
+        let chan_id_on_b = chan_end_on_a
+            .counterparty()
+            .channel_id()
+            .ok_or(PacketError::Channel(ChannelError::MissingCounterparty))?;
+        let conn_id_on_b = conn_end_on_a.counterparty().connection_id().ok_or(
+            PacketError::UndefinedConnectionCounterparty {
+                connection_id: chan_end_on_a.connection_hops()[0].clone(),
+            },
+        )?;
+        let expected_conn_hops_on_b = vec![conn_id_on_b.clone()];
+        let expected_counterparty = Counterparty::new(
+            packet.port_id_on_a.clone(),
+            Some(packet.chan_id_on_a.clone()),
+        );
+        let expected_chan_end_on_b = ChannelEnd::new(
+            State::Closed,
+            *chan_end_on_a.ordering(),
+            expected_counterparty,
+            expected_conn_hops_on_b,
+            chan_end_on_a.version().clone(),
+        )?;
+
+        let chan_end_path_on_b = ChannelEndPath(port_id_on_b, chan_id_on_b.clone());
+
+        // Verify the proof for the channel state against the expected channel end.
+        // A counterparty channel id of None in not possible, and is checked by validate_basic in msg.
+        client_state_of_b_on_a
+            .verify_membership(
+                prefix_on_b,
+                &msg.proof_close_on_b,
+                consensus_state_of_b_on_a.root(),
+                Path::ChannelEnd(chan_end_path_on_b),
+                expected_chan_end_on_b.encode_vec(),
+            )
+            .map_err(ChannelError::VerifyChannelFailed)
+            .map_err(PacketError::Channel)?;
+
+        verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
+
+        let next_seq_recv_verification_result = match chan_end_on_a.ordering {
+            Order::Ordered => {
+                if packet.seq_on_a < msg.next_seq_recv_on_b {
+                    return Err(PacketError::InvalidPacketSequence {
+                        given_sequence: packet.seq_on_a,
+                        next_sequence: msg.next_seq_recv_on_b,
+                    }
+                    .into());
+                }
+                let seq_recv_path_on_b =
+                    SeqRecvPath::new(&packet.port_id_on_b, &packet.chan_id_on_b);
+
+                client_state_of_b_on_a.verify_membership(
+                    conn_end_on_a.counterparty().prefix(),
+                    &msg.proof_unreceived_on_b,
+                    consensus_state_of_b_on_a.root(),
+                    Path::SeqRecv(seq_recv_path_on_b),
+                    packet.seq_on_a.to_vec(),
+                )
+            }
+            Order::Unordered => {
+                let receipt_path_on_b = ReceiptPath::new(
+                    &msg.packet.port_id_on_b,
+                    &msg.packet.chan_id_on_b,
+                    msg.packet.seq_on_a,
+                );
+
+                client_state_of_b_on_a.verify_non_membership(
+                    conn_end_on_a.counterparty().prefix(),
+                    &msg.proof_unreceived_on_b,
+                    consensus_state_of_b_on_a.root(),
+                    Path::Receipt(receipt_path_on_b),
+                )
+            }
+            Order::None => {
+                return Err(ContextError::ChannelError(ChannelError::InvalidOrderType {
+                    expected: "Channel ordering cannot be None".to_string(),
+                    actual: chan_end_on_a.ordering.to_string(),
+                }))
+            }
+        };
+
+        next_seq_recv_verification_result
+            .map_err(|e| ChannelError::PacketVerificationFailed {
+                sequence: msg.next_seq_recv_on_b,
+                client_error: e,
+            })
+            .map_err(PacketError::Channel)?;
+    };
+
+    Ok(())
+}
diff --git a/ibc-core/ics04-channel/src/lib.rs b/ibc-core/ics04-channel/src/lib.rs
new file mode 100644
index 000000000..1ccb4f25c
--- /dev/null
+++ b/ibc-core/ics04-channel/src/lib.rs
@@ -0,0 +1,26 @@
+//! ICS-04: Channel and Packet Semantics implementation to process channel open
+//! handshake and incoming data packets. Exports data structures and
+//! implementations of IBC core channel module.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod context;
+pub mod handler;
+
+/// Re-exports ICS-04 data structures from the `ibc-core-channel-types` crate.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_channel_types::*;
+}
diff --git a/ibc-core/ics04-channel/types/Cargo.toml b/ibc-core/ics04-channel/types/Cargo.toml
new file mode 100644
index 000000000..0ee9080c9
--- /dev/null
+++ b/ibc-core/ics04-channel/types/Cargo.toml
@@ -0,0 +1,99 @@
+[package]
+name         = "ibc-core-channel-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "channel", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-4 Channel Semantics data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+sha2            = { workspace = true }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-client-types     = { workspace = true }
+ibc-core-connection-types = { workspace = true }
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host-types       = { workspace = true }
+ibc-primitives            = { workspace = true }
+ibc-proto                 = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "sha2/std",
+  "serde/std",
+  "subtle-encoding/std",
+  "ibc-core-client-types/std",
+  "ibc-core-connection-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-core-client-types/serde",
+  "ibc-core-connection-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core-client-types/schema",
+  "ibc-core-connection-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core-client-types/borsh",
+  "ibc-core-connection-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core-client-types/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-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/crates/ibc/src/core/ics04_channel/acknowledgement.rs b/ibc-core/ics04-channel/types/src/acknowledgement.rs
similarity index 60%
rename from crates/ibc/src/core/ics04_channel/acknowledgement.rs
rename to ibc-core/ics04-channel/types/src/acknowledgement.rs
index 3b3ebb844..7364857d1 100644
--- a/crates/ibc/src/core/ics04_channel/acknowledgement.rs
+++ b/ibc-core/ics04-channel/types/src/acknowledgement.rs
@@ -1,10 +1,11 @@
 //! Defines acknowledgment types used by various IBC messages and applications.
 
 use core::fmt::{Display, Error as FmtError, Formatter};
+
 use derive_more::Into;
+use ibc_primitives::prelude::*;
 
 use super::error::PacketError;
-use crate::prelude::*;
 
 /// A generic Acknowledgement type that modules may interpret as they like.
 ///
@@ -22,6 +23,7 @@ use crate::prelude::*;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq, Into)]
 pub struct Acknowledgement(Vec<u8>);
 
@@ -51,7 +53,7 @@ impl TryFrom<Vec<u8>> for Acknowledgement {
 }
 
 /// Defines a convenience type for IBC applications to construct an
-/// [`Acknowledgement`](super::acknowledgement::Acknowledgement) based on the
+/// [`Acknowledgement`] based on the
 /// success or failure of processing a received packet.
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -67,7 +69,7 @@ pub enum AcknowledgementStatus {
 }
 
 /// A wrapper type that guards variants of
-/// [`AcknowledgementStatus`](crate::core::ics04_channel::acknowledgement::AcknowledgementStatus)
+/// [`AcknowledgementStatus`]
 /// against being constructed with an empty value.
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -112,8 +114,7 @@ impl AcknowledgementStatus {
 impl Display for AcknowledgementStatus {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
         match self {
-            AcknowledgementStatus::Success(v) => write!(f, "{v}"),
-            AcknowledgementStatus::Error(v) => write!(f, "{v}"),
+            AcknowledgementStatus::Success(v) | AcknowledgementStatus::Error(v) => write!(f, "{v}"),
         }
     }
 }
@@ -138,72 +139,3 @@ impl From<AcknowledgementStatus> for Acknowledgement {
             .expect("token transfer internal error: ack is never supposed to be empty")
     }
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::applications::transfer::{ack_success_b64, error::TokenTransferError};
-
-    #[test]
-    fn test_ack_ser() {
-        fn ser_json_assert_eq(ack: AcknowledgementStatus, json_str: &str) {
-            let ser = serde_json::to_string(&ack).unwrap();
-            assert_eq!(ser, json_str)
-        }
-
-        ser_json_assert_eq(
-            AcknowledgementStatus::success(ack_success_b64()),
-            r#"{"result":"AQ=="}"#,
-        );
-        ser_json_assert_eq(
-            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into()),
-            r#"{"error":"failed to deserialize packet data"}"#,
-        );
-    }
-
-    #[test]
-    fn test_ack_success_to_vec() {
-        let ack_success: Vec<u8> = AcknowledgementStatus::success(ack_success_b64()).into();
-
-        // Check that it's the same output as ibc-go
-        // Note: this also implicitly checks that the ack bytes are non-empty,
-        // which would make the conversion to `Acknowledgement` panic
-        assert_eq!(ack_success, r#"{"result":"AQ=="}"#.as_bytes());
-    }
-
-    #[test]
-    fn test_ack_error_to_vec() {
-        let ack_error: Vec<u8> =
-            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into())
-                .into();
-
-        // Check that it's the same output as ibc-go
-        // Note: this also implicitly checks that the ack bytes are non-empty,
-        // which would make the conversion to `Acknowledgement` panic
-        assert_eq!(
-            ack_error,
-            r#"{"error":"failed to deserialize packet data"}"#.as_bytes()
-        );
-    }
-
-    #[test]
-    fn test_ack_de() {
-        fn de_json_assert_eq(json_str: &str, ack: AcknowledgementStatus) {
-            let de = serde_json::from_str::<AcknowledgementStatus>(json_str).unwrap();
-            std::println!("de: {:?}", de);
-            std::println!("ack: {:?}", ack);
-            assert_eq!(de, ack)
-        }
-
-        de_json_assert_eq(
-            r#"{"result":"AQ=="}"#,
-            AcknowledgementStatus::success(ack_success_b64()),
-        );
-        de_json_assert_eq(
-            r#"{"error":"failed to deserialize packet data"}"#,
-            AcknowledgementStatus::error(TokenTransferError::PacketDataDeserialization.into()),
-        );
-
-        assert!(serde_json::from_str::<AcknowledgementStatus>(r#"{"success":"AQ=="}"#).is_err());
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/channel.rs b/ibc-core/ics04-channel/types/src/channel.rs
similarity index 71%
rename from crates/ibc/src/core/ics04_channel/channel.rs
rename to ibc-core/ics04-channel/types/src/channel.rs
index 2455750f7..d7d0319fd 100644
--- a/crates/ibc/src/core/ics04_channel/channel.rs
+++ b/ibc-core/ics04-channel/types/src/channel.rs
@@ -1,20 +1,19 @@
-//! Implementation of IBC channels, as described in ICS 4.
-
-use crate::prelude::*;
-use crate::utils::pretty::PrettySlice;
+//! Implementation of IBC channels, as described in ICS-04.
 
 use core::fmt::{Display, Error as FmtError, Formatter};
 use core::str::FromStr;
 
-use ibc_proto::protobuf::Protobuf;
-
+use ibc_core_host_types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::utils::PrettySlice;
 use ibc_proto::ibc::core::channel::v1::{
     Channel as RawChannel, Counterparty as RawCounterparty,
     IdentifiedChannel as RawIdentifiedChannel,
 };
+use ibc_proto::Protobuf;
 
-use crate::core::ics04_channel::{error::ChannelError, Version};
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
+use crate::error::ChannelError;
+use crate::Version;
 
 /// A [`ChannelEnd`] along with its ID and the port it is bound to
 #[cfg_attr(
@@ -30,6 +29,7 @@ use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct IdentifiedChannelEnd {
     pub port_id: PortId,
@@ -53,12 +53,17 @@ impl TryFrom<RawIdentifiedChannel> for IdentifiedChannelEnd {
     type Error = ChannelError;
 
     fn try_from(value: RawIdentifiedChannel) -> Result<Self, Self::Error> {
+        if value.upgrade_sequence != 0 {
+            return Err(ChannelError::UnsupportedChannelUpgradeSequence);
+        }
+
         let raw_channel_end = RawChannel {
             state: value.state,
             ordering: value.ordering,
             counterparty: value.counterparty,
             connection_hops: value.connection_hops,
             version: value.version,
+            upgrade_sequence: value.upgrade_sequence,
         };
 
         Ok(IdentifiedChannelEnd {
@@ -84,6 +89,7 @@ impl From<IdentifiedChannelEnd> for RawIdentifiedChannel {
             version: value.channel_end.version.to_string(),
             port_id: value.port_id.to_string(),
             channel_id: value.channel_id.to_string(),
+            upgrade_sequence: 0,
         }
     }
 }
@@ -102,6 +108,7 @@ impl From<IdentifiedChannelEnd> for RawIdentifiedChannel {
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ChannelEnd {
     pub state: State,
@@ -162,6 +169,7 @@ impl From<ChannelEnd> for RawChannel {
                 .map(|v| v.as_str().to_string())
                 .collect(),
             version: value.version.to_string(),
+            upgrade_sequence: 0,
         }
     }
 }
@@ -285,6 +293,10 @@ impl ChannelEnd {
     }
 
     /// Helper function to compare the order of this end with another order.
+    #[deprecated(
+        since = "0.50.1",
+        note = "Use `Eq` or `match` directly on the `Order` enum instead"
+    )]
     pub fn order_matches(&self, other: &Order) -> bool {
         self.ordering.eq(other)
     }
@@ -306,7 +318,7 @@ impl ChannelEnd {
 
     /// Checks if the `connection_hops` has a length of `expected`.
     ///
-    /// Note: Current IBC version only supports one connection hop.
+    /// Note: The current IBC version only supports one connection hop.
     pub fn verify_connection_hops_length(&self) -> Result<(), ChannelError> {
         verify_connection_hops_length(&self.connection_hops, 1)
     }
@@ -318,13 +330,13 @@ impl ChannelEnd {
 
 /// Checks if the `connection_hops` has a length of `expected`.
 pub(crate) fn verify_connection_hops_length(
-    connection_hops: &Vec<ConnectionId>,
-    expected: usize,
+    connection_hops: &[ConnectionId],
+    expected: u64,
 ) -> Result<(), ChannelError> {
-    if connection_hops.len() != expected {
+    if connection_hops.len() as u64 != expected {
         return Err(ChannelError::InvalidConnectionHopsLength {
             expected,
-            actual: connection_hops.len(),
+            actual: connection_hops.len() as u64,
         });
     }
     Ok(())
@@ -343,7 +355,8 @@ pub(crate) fn verify_connection_hops_length(
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Counterparty {
     pub port_id: PortId,
     pub channel_id: Option<ChannelId>,
@@ -439,6 +452,7 @@ impl From<Counterparty> for RawCounterparty {
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Order {
     None = 0isize,
@@ -446,12 +460,6 @@ pub enum Order {
     Ordered = 2isize,
 }
 
-impl Default for Order {
-    fn default() -> Self {
-        Order::Unordered
-    }
-}
-
 impl Display for Order {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
         write!(f, "{}", self.as_str())
@@ -513,6 +521,7 @@ impl FromStr for Order {
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum State {
     Uninitialized = 0isize,
@@ -549,13 +558,13 @@ impl State {
         }
     }
 
-    /// Returns whether or not this channel state is `Open`.
+    /// Returns if this channel state is `Open`.
     pub fn is_open(self) -> bool {
         self == State::Open
     }
 
-    /// Returns whether or not the channel with this state
-    /// has progressed less or the same than the argument.
+    /// Returns if the channel with this state
+    /// has progressed less than or the same as the argument.
     ///
     /// # Example
     /// ```rust,ignore
@@ -574,182 +583,3 @@ impl Display for State {
         write!(f, "{}", self.as_string())
     }
 }
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::Channel as RawChannel;
-    use ibc_proto::ibc::core::channel::v1::Counterparty as RawCounterparty;
-
-    /// Returns a dummy `RawCounterparty`, for testing only!
-    /// Can be optionally parametrized with a specific channel identifier.
-    pub fn get_dummy_raw_counterparty(channel_id: String) -> RawCounterparty {
-        RawCounterparty {
-            port_id: PortId::default().to_string(),
-            channel_id,
-        }
-    }
-
-    /// Returns a dummy `RawChannel`, for testing only!
-    pub fn get_dummy_raw_channel_end(state: i32, channel_id: Option<u64>) -> RawChannel {
-        let channel_id = match channel_id {
-            Some(id) => ChannelId::new(id).to_string(),
-            None => "".to_string(),
-        };
-        RawChannel {
-            state,
-            ordering: 2,
-            counterparty: Some(get_dummy_raw_counterparty(channel_id)),
-            connection_hops: vec![ConnectionId::default().to_string()],
-            version: "".to_string(), // The version is not validated.
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::prelude::*;
-
-    use core::str::FromStr;
-    use test_log::test;
-
-    use ibc_proto::ibc::core::channel::v1::Channel as RawChannel;
-
-    use crate::core::ics04_channel::channel::test_util::get_dummy_raw_channel_end;
-    use crate::core::ics04_channel::channel::ChannelEnd;
-
-    #[test]
-    fn channel_end_try_from_raw() {
-        let raw_channel_end = get_dummy_raw_channel_end(2, Some(0));
-
-        let empty_raw_channel_end = RawChannel {
-            counterparty: None,
-            ..raw_channel_end.clone()
-        };
-
-        struct Test {
-            name: String,
-            params: RawChannel,
-            want_pass: bool,
-        }
-
-        let tests: Vec<Test> = vec![
-            Test {
-                name: "Raw channel end with missing counterparty".to_string(),
-                params: empty_raw_channel_end,
-                want_pass: false,
-            },
-            Test {
-                name: "Raw channel end with incorrect state".to_string(),
-                params: RawChannel {
-                    state: -1,
-                    ..raw_channel_end.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Raw channel end with incorrect ordering".to_string(),
-                params: RawChannel {
-                    ordering: -1,
-                    ..raw_channel_end.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Raw channel end with incorrect connection id in connection hops".to_string(),
-                params: RawChannel {
-                    connection_hops: vec!["connection*".to_string()].into_iter().collect(),
-                    ..raw_channel_end.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Raw channel end with incorrect connection id (has blank space)".to_string(),
-                params: RawChannel {
-                    connection_hops: vec!["con nection".to_string()].into_iter().collect(),
-                    ..raw_channel_end.clone()
-                },
-                want_pass: false,
-            },
-            Test {
-                name: "Raw channel end with two correct connection ids in connection hops"
-                    .to_string(),
-                params: RawChannel {
-                    connection_hops: vec!["connection-1".to_string(), "connection-2".to_string()]
-                        .into_iter()
-                        .collect(),
-                    ..raw_channel_end.clone()
-                },
-                want_pass: true,
-            },
-            Test {
-                name: "Raw channel end with correct params".to_string(),
-                params: raw_channel_end,
-                want_pass: true,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            let p = test.params.clone();
-
-            let ce_result = ChannelEnd::try_from(p);
-
-            assert_eq!(
-                test.want_pass,
-                ce_result.is_ok(),
-                "ChannelEnd::try_from() failed for test {}, \nmsg{:?} with error {:?}",
-                test.name,
-                test.params.clone(),
-                ce_result.err(),
-            );
-        }
-    }
-
-    #[test]
-    fn parse_channel_ordering_type() {
-        use super::Order;
-
-        struct Test {
-            ordering: &'static str,
-            want_res: Order,
-            want_err: bool,
-        }
-        let tests: Vec<Test> = vec![
-            Test {
-                ordering: "UNINITIALIZED",
-                want_res: Order::None,
-                want_err: false,
-            },
-            Test {
-                ordering: "UNORDERED",
-                want_res: Order::Unordered,
-                want_err: false,
-            },
-            Test {
-                ordering: "ORDERED",
-                want_res: Order::Ordered,
-                want_err: false,
-            },
-            Test {
-                ordering: "UNKNOWN_ORDER",
-                want_res: Order::None,
-                want_err: true,
-            },
-        ]
-        .into_iter()
-        .collect();
-
-        for test in tests {
-            match Order::from_str(test.ordering) {
-                Ok(res) => {
-                    assert!(!test.want_err);
-                    assert_eq!(test.want_res, res);
-                }
-                Err(_) => assert!(test.want_err, "parse failed"),
-            }
-        }
-    }
-}
diff --git a/crates/ibc/src/core/ics04_channel/commitment.rs b/ibc-core/ics04-channel/types/src/commitment.rs
similarity index 51%
rename from crates/ibc/src/core/ics04_channel/commitment.rs
rename to ibc-core/ics04-channel/types/src/commitment.rs
index f389673e6..8066b13b6 100644
--- a/crates/ibc/src/core/ics04_channel/commitment.rs
+++ b/ibc-core/ics04-channel/types/src/commitment.rs
@@ -1,10 +1,10 @@
 //! Types and utilities related to packet commitments.
 
-use crate::core::ics04_channel::timeout::TimeoutHeight;
-use crate::core::timestamp::Timestamp;
-use crate::prelude::*;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Timestamp;
 
 use super::acknowledgement::Acknowledgement;
+use crate::timeout::TimeoutHeight;
 
 /// Packet commitment
 #[cfg_attr(
@@ -20,6 +20,7 @@ use super::acknowledgement::Acknowledgement;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PacketCommitment(Vec<u8>);
 
@@ -41,7 +42,7 @@ impl From<Vec<u8>> for PacketCommitment {
     }
 }
 
-/// Acknowledgement commitment to be stored
+/// Acknowledgement of commitment to be stored
 #[cfg_attr(
     feature = "parity-scale-codec",
     derive(
@@ -55,6 +56,7 @@ impl From<Vec<u8>> for PacketCommitment {
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct AcknowledgementCommitment(Vec<u8>);
 
@@ -82,36 +84,64 @@ impl From<Vec<u8>> for AcknowledgementCommitment {
 /// `{revision_number: 0, revision_height: 0}` to be consistent with ibc-go,
 /// where this value is used to mean "no timeout height":
 /// <https://github.com/cosmos/ibc-go/blob/04791984b3d6c83f704c4f058e6ca0038d155d91/modules/core/04-channel/keeper/packet.go#L206>
-pub(crate) fn compute_packet_commitment(
+pub fn compute_packet_commitment(
     packet_data: &[u8],
     timeout_height: &TimeoutHeight,
     timeout_timestamp: &Timestamp,
 ) -> PacketCommitment {
-    let mut hash_input = timeout_timestamp.nanoseconds().to_be_bytes().to_vec();
+    let mut hash_input = [0; 8 * 3 + 32];
 
-    let revision_number = timeout_height.commitment_revision_number().to_be_bytes();
-    hash_input.append(&mut revision_number.to_vec());
+    hash_input[..8].copy_from_slice(&timeout_timestamp.nanoseconds().to_be_bytes());
+    hash_input[8..16].copy_from_slice(&timeout_height.commitment_revision_number().to_be_bytes());
+    hash_input[16..24].copy_from_slice(&timeout_height.commitment_revision_height().to_be_bytes());
+    hash_input[24..].copy_from_slice(&hash(packet_data));
 
-    let revision_height = timeout_height.commitment_revision_height().to_be_bytes();
-    hash_input.append(&mut revision_height.to_vec());
-
-    let packet_data_hash = hash(packet_data);
-    hash_input.append(&mut packet_data_hash.to_vec());
-
-    hash(&hash_input).into()
+    hash(&hash_input).to_vec().into()
 }
 
 /// Compute the commitment for an acknowledgement.
-pub(crate) fn compute_ack_commitment(ack: &Acknowledgement) -> AcknowledgementCommitment {
-    hash(ack.as_ref()).into()
+pub fn compute_ack_commitment(ack: &Acknowledgement) -> AcknowledgementCommitment {
+    hash(ack.as_ref()).to_vec().into()
 }
 
 /// Helper function to hash a byte slice using SHA256.
 ///
-/// Note that computing commitments with anything other than SHA256 will
+/// Note that computing commitments with anything apart from SHA256 will
 /// break the Merkle proofs of the IBC provable store.
-fn hash(data: impl AsRef<[u8]>) -> Vec<u8> {
+fn hash(data: &[u8]) -> [u8; 32] {
     use sha2::Digest;
 
-    sha2::Sha256::digest(&data).to_vec()
+    sha2::Sha256::digest(data).into()
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_compute_packet_commitment() {
+        let expected: [u8; 32] = [
+            0xa9, 0x28, 0xb5, 0x1f, 0x62, 0xbd, 0x54, 0x00, 0x91, 0xec, 0x45, 0x1f, 0x4e, 0xf3,
+            0x45, 0x79, 0x4f, 0x05, 0x9e, 0x65, 0x91, 0x08, 0x16, 0x86, 0x61, 0x26, 0xdc, 0x36,
+            0x4f, 0x84, 0xcc, 0x15,
+        ];
+        let actual = compute_packet_commitment(
+            b"packet data",
+            &TimeoutHeight::At(ibc_core_client_types::Height::new(42, 24).unwrap()),
+            &Timestamp::from_nanoseconds(0x42).unwrap(),
+        );
+        assert_eq!(&expected[..], actual.as_ref());
+    }
+
+    #[test]
+    fn test_compute_ack_commitment() {
+        let expected: [u8; 32] = [
+            0x05, 0x4e, 0xde, 0xc1, 0xd0, 0x21, 0x1f, 0x62, 0x4f, 0xed, 0x0c, 0xbc, 0xa9, 0xd4,
+            0xf9, 0x40, 0x0b, 0x0e, 0x49, 0x1c, 0x43, 0x74, 0x2a, 0xf2, 0xc5, 0xb0, 0xab, 0xeb,
+            0xf0, 0xc9, 0x90, 0xd8,
+        ];
+        let ack = Acknowledgement::try_from(vec![0, 1, 2, 3]).unwrap();
+        let actual = compute_ack_commitment(&ack);
+        assert_eq!(&expected[..], actual.as_ref())
+    }
 }
diff --git a/crates/ibc/src/core/ics04_channel/error.rs b/ibc-core/ics04-channel/types/src/error.rs
similarity index 83%
rename from crates/ibc/src/core/ics04_channel/error.rs
rename to ibc-core/ics04-channel/types/src/error.rs
index 905e37722..2b7b760ef 100644
--- a/crates/ibc/src/core/ics04_channel/error.rs
+++ b/ibc-core/ics04-channel/types/src/error.rs
@@ -1,36 +1,20 @@
-//! Defines the main channel, port and packet error types
-
-use super::channel::Counterparty;
-use super::packet::Sequence;
-use super::timeout::TimeoutHeight;
-use crate::core::ics02_client::error as client_error;
-use crate::core::ics03_connection::error as connection_error;
-use crate::core::ics04_channel::channel::State;
-use crate::core::ics04_channel::Version;
-use crate::core::ics24_host::identifier::{
-    ChannelId, ClientId, ConnectionId, IdentifierError, PortId,
-};
-use crate::core::timestamp::{ParseTimestampError, Timestamp};
-use crate::prelude::*;
-use crate::Height;
+//! Defines the main channel, port, and packet error types
 
 use displaydoc::Display;
+use ibc_core_client_types::{error as client_error, Height};
+use ibc_core_connection_types::error as connection_error;
+use ibc_core_host_types::error::IdentifierError;
+use ibc_core_host_types::identifiers::{ChannelId, ConnectionId, PortId, Sequence};
+use ibc_primitives::prelude::*;
+use ibc_primitives::{ParseTimestampError, Timestamp};
 
-#[derive(Debug, Display)]
-pub enum PortError {
-    /// port `{port_id}` is unknown
-    UnknownPort { port_id: PortId },
-    /// implementation specific error
-    ImplementationSpecific,
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for PortError {}
+use super::channel::Counterparty;
+use super::timeout::TimeoutHeight;
+use crate::channel::State;
+use crate::Version;
 
 #[derive(Debug, Display)]
 pub enum ChannelError {
-    /// port error: `{0}`
-    Port(PortError),
     /// invalid channel end: `{channel_end}`
     InvalidChannelEnd { channel_end: String },
     /// invalid channel id: expected `{expected}`, actual `{actual}`
@@ -40,7 +24,7 @@ pub enum ChannelError {
     /// invalid channel order type: expected `{expected}`, actual `{actual}`
     InvalidOrderType { expected: String, actual: String },
     /// invalid connection hops length: expected `{expected}`; actual `{actual}`
-    InvalidConnectionHopsLength { expected: usize, actual: usize },
+    InvalidConnectionHopsLength { expected: u64, actual: u64 },
     /// invalid signer error: `{reason}`
     InvalidSigner { reason: String },
     /// invalid proof: missing height
@@ -49,6 +33,8 @@ pub enum ChannelError {
     NonUtf8PacketData,
     /// missing counterparty
     MissingCounterparty,
+    /// unsupported channel upgrade sequence
+    UnsupportedChannelUpgradeSequence,
     /// version not supported: expected `{expected}`, actual `{actual}`
     VersionNotSupported { expected: Version, actual: Version },
     /// missing channel end
@@ -75,22 +61,18 @@ pub enum ChannelError {
         expected: Counterparty,
         actual: Counterparty,
     },
-    /// Processed time for the client `{client_id}` at height `{height}` not found
-    ProcessedTimeNotFound { client_id: ClientId, height: Height },
-    /// Processed height for the client `{client_id}` at height `{height}` not found
-    ProcessedHeightNotFound { client_id: ClientId, height: Height },
-    /// route not found
-    RouteNotFound,
     /// application module error: `{description}`
     AppModule { description: String },
-    /// other error: `{description}`
-    Other { description: String },
     /// Undefined counterparty connection for `{connection_id}`
     UndefinedConnectionCounterparty { connection_id: ConnectionId },
     /// invalid proof: empty proof
     InvalidProof,
     /// identifier error: `{0}`
     InvalidIdentifier(IdentifierError),
+    /// channel counter overflow error
+    CounterOverflow,
+    /// other error: `{description}`
+    Other { description: String },
 }
 
 #[derive(Debug, Display)]
@@ -119,7 +101,7 @@ pub enum PacketError {
     PacketReceiptNotFound { sequence: Sequence },
     /// The stored commitment of the packet `{sequence}` is incorrect
     IncorrectPacketCommitment { sequence: Sequence },
-    /// implementation specific error
+    /// implementation-specific error
     ImplementationSpecific,
     /// Undefined counterparty connection for `{connection_id}`
     UndefinedConnectionCounterparty { connection_id: ConnectionId },
@@ -184,8 +166,8 @@ pub enum PacketError {
         port_id: PortId,
         channel_id: ChannelId,
     },
-    /// Cannot encode sequence `{sequence}`
-    CannotEncodeSequence { sequence: Sequence },
+    /// other error: `{description}`
+    Other { description: String },
 }
 
 impl From<IdentifierError> for ChannelError {
@@ -216,7 +198,6 @@ impl std::error::Error for PacketError {
 impl std::error::Error for ChannelError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
-            Self::Port(e) => Some(e),
             Self::InvalidIdentifier(e) => Some(e),
             Self::PacketVerificationFailed {
                 client_error: e, ..
diff --git a/crates/ibc/src/core/ics04_channel/events/channel_attributes.rs b/ibc-core/ics04-channel/types/src/events/channel_attributes.rs
similarity index 97%
rename from crates/ibc/src/core/ics04_channel/events/channel_attributes.rs
rename to ibc-core/ics04-channel/types/src/events/channel_attributes.rs
index dad056755..8032fb44d 100644
--- a/crates/ibc/src/core/ics04_channel/events/channel_attributes.rs
+++ b/ibc-core/ics04-channel/types/src/events/channel_attributes.rs
@@ -1,12 +1,10 @@
 //! This module holds all the abci event attributes for IBC events emitted
 //! during the channel handshake.
 use derive_more::From;
+use ibc_core_host_types::identifiers::{ChannelId, ConnectionId, PortId};
 use tendermint::abci;
 
-use crate::core::{
-    ics04_channel::Version,
-    ics24_host::identifier::{ChannelId, ConnectionId, PortId},
-};
+use crate::Version;
 
 const CONNECTION_ID_ATTRIBUTE_KEY: &str = "connection_id";
 const CHANNEL_ID_ATTRIBUTE_KEY: &str = "channel_id";
diff --git a/crates/ibc/src/core/ics04_channel/events.rs b/ibc-core/ics04-channel/types/src/events/mod.rs
similarity index 97%
rename from crates/ibc/src/core/ics04_channel/events.rs
rename to ibc-core/ics04-channel/types/src/events/mod.rs
index 86b360734..ee83a4028 100644
--- a/crates/ibc/src/core/ics04_channel/events.rs
+++ b/ibc-core/ics04-channel/types/src/events/mod.rs
@@ -3,14 +3,11 @@
 mod channel_attributes;
 mod packet_attributes;
 
+use ibc_core_host_types::identifiers::{ChannelId, ConnectionId, PortId, Sequence};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Timestamp;
 use tendermint::abci;
 
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-use crate::core::timestamp::Timestamp;
-use crate::prelude::*;
-
 use self::channel_attributes::{
     ChannelIdAttribute, ConnectionIdAttribute, CounterpartyChannelIdAttribute,
     CounterpartyPortIdAttribute, PortIdAttribute, VersionAttribute,
@@ -21,27 +18,29 @@ use self::packet_attributes::{
     PacketConnectionIdAttribute, PacketDataAttribute, SequenceAttribute, SrcChannelIdAttribute,
     SrcPortIdAttribute, TimeoutHeightAttribute, TimeoutTimestampAttribute,
 };
-
 use super::acknowledgement::Acknowledgement;
 use super::channel::Order;
-use super::packet::Sequence;
 use super::timeout::TimeoutHeight;
 use super::Version;
+use crate::error::ChannelError;
+use crate::packet::Packet;
 
-/// Channel event types
+/// Channel event types corresponding to ibc-go's channel events:
+/// https://github.com/cosmos/ibc-go/blob/c4413c5877f9ef883494da1721cb18caaba7f7f5/modules/core/04-channel/types/events.go#L52-L72
 const CHANNEL_OPEN_INIT_EVENT: &str = "channel_open_init";
 const CHANNEL_OPEN_TRY_EVENT: &str = "channel_open_try";
 const CHANNEL_OPEN_ACK_EVENT: &str = "channel_open_ack";
 const CHANNEL_OPEN_CONFIRM_EVENT: &str = "channel_open_confirm";
 const CHANNEL_CLOSE_INIT_EVENT: &str = "channel_close_init";
 const CHANNEL_CLOSE_CONFIRM_EVENT: &str = "channel_close_confirm";
+const CHANNEL_CLOSED_EVENT: &str = "channel_close";
+
 /// Packet event types
 const SEND_PACKET_EVENT: &str = "send_packet";
-const RECEIVE_PACKET_EVENT: &str = "receive_packet";
+const RECEIVE_PACKET_EVENT: &str = "recv_packet";
 const WRITE_ACK_EVENT: &str = "write_acknowledgement";
 const ACK_PACKET_EVENT: &str = "acknowledge_packet";
 const TIMEOUT_EVENT: &str = "timeout_packet";
-const CHANNEL_CLOSED_EVENT: &str = "channel_close";
 
 #[cfg_attr(
     feature = "parity-scale-codec",
@@ -535,7 +534,7 @@ impl ChannelClosed {
             port_id_attr_on_a: port_id_on_a.into(),
             chan_id_attr_on_a: chan_id_on_a.into(),
             port_id_attr_on_b: port_id_on_b.into(),
-            maybe_chan_id_attr_on_b: maybe_chan_id_on_b.map(|c| c.into()),
+            maybe_chan_id_attr_on_b: maybe_chan_id_on_b.map(Into::into),
             conn_id_attr_on_a: conn_id_on_a.into(),
             channel_ordering_attr: channel_ordering.into(),
         }
@@ -550,7 +549,7 @@ impl ChannelClosed {
         &self.port_id_attr_on_b.counterparty_port_id
     }
     pub fn chan_id_on_a(&self) -> Option<&ChannelId> {
-        self.maybe_chan_id_attr_on_b.as_ref().map(|c| c.as_ref())
+        self.maybe_chan_id_attr_on_b.as_ref().map(AsRef::as_ref)
     }
     pub fn conn_id_on_b(&self) -> &ConnectionId {
         &self.conn_id_attr_on_a.connection_id
@@ -574,7 +573,7 @@ impl From<ChannelClosed> for abci::Event {
                 ev.port_id_attr_on_b.into(),
                 ev.maybe_chan_id_attr_on_b.map_or_else(
                     || (COUNTERPARTY_CHANNEL_ID_ATTRIBUTE_KEY, "").into(),
-                    |c| c.into(),
+                    Into::into,
                 ),
                 ev.conn_id_attr_on_a.into(),
                 ev.channel_ordering_attr.into(),
@@ -1121,9 +1120,10 @@ impl TryFrom<TimeoutPacket> for abci::Event {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use tendermint::abci::Event as AbciEvent;
 
+    use super::*;
+
     #[test]
     fn ibc_to_abci_channel_events() {
         struct Test {
@@ -1134,8 +1134,8 @@ mod tests {
         }
 
         let port_id = PortId::transfer();
-        let channel_id = ChannelId::new(0);
-        let connection_id = ConnectionId::new(0);
+        let channel_id = ChannelId::zero();
+        let connection_id = ConnectionId::zero();
         let counterparty_port_id = PortId::transfer();
         let counterparty_channel_id = ChannelId::new(1);
         let version = Version::new("ics20-1".to_string());
@@ -1246,12 +1246,18 @@ mod tests {
             assert_eq!(t.kind, t.event.kind);
             assert_eq!(t.expected_keys.len(), t.event.attributes.len());
             for (i, e) in t.event.attributes.iter().enumerate() {
-                assert_eq!(e.key, t.expected_keys[i], "key mismatch for {:?}", t.kind);
+                assert_eq!(
+                    e.key_str().unwrap(),
+                    t.expected_keys[i],
+                    "key mismatch for {:?}",
+                    t.kind
+                );
             }
             assert_eq!(t.expected_values.len(), t.event.attributes.len());
             for (i, e) in t.event.attributes.iter().enumerate() {
                 assert_eq!(
-                    e.value, t.expected_values[i],
+                    e.value_str().unwrap(),
+                    t.expected_values[i],
                     "value mismatch for {:?}",
                     t.kind
                 );
diff --git a/crates/ibc/src/core/ics04_channel/events/packet_attributes.rs b/ibc-core/ics04-channel/types/src/events/packet_attributes.rs
similarity index 94%
rename from crates/ibc/src/core/ics04_channel/events/packet_attributes.rs
rename to ibc-core/ics04-channel/types/src/events/packet_attributes.rs
index 8e53ebfdc..2366ae71e 100644
--- a/crates/ibc/src/core/ics04_channel/events/packet_attributes.rs
+++ b/ibc-core/ics04-channel/types/src/events/packet_attributes.rs
@@ -2,19 +2,18 @@
 //! during packet-related datagrams.
 //!
 use core::str;
+
 use derive_more::From;
+use ibc_core_host_types::identifiers::{ChannelId, ConnectionId, PortId, Sequence};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Timestamp;
 use subtle_encoding::hex;
 use tendermint::abci;
 
-use crate::prelude::*;
-
-use crate::core::ics04_channel::acknowledgement::Acknowledgement;
-use crate::core::ics04_channel::channel::Order;
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::packet::Sequence;
-use crate::core::ics04_channel::timeout::TimeoutHeight;
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-use crate::core::timestamp::Timestamp;
+use crate::acknowledgement::Acknowledgement;
+use crate::channel::Order;
+use crate::error::ChannelError;
+use crate::timeout::TimeoutHeight;
 
 const PKT_SEQ_ATTRIBUTE_KEY: &str = "packet_sequence";
 const PKT_DATA_ATTRIBUTE_KEY: &str = "packet_data";
@@ -60,7 +59,7 @@ impl TryFrom<PacketDataAttribute> for Vec<abci::EventAttribute> {
                 .into(),
             (
                 PKT_DATA_HEX_ATTRIBUTE_KEY,
-                String::from_utf8(hex::encode(attr.packet_data))
+                str::from_utf8(&hex::encode(attr.packet_data))
                     .expect("Never fails because hexadecimal is valid UTF8"),
             )
                 .into(),
@@ -330,7 +329,7 @@ impl TryFrom<AcknowledgementAttribute> for Vec<abci::EventAttribute> {
                 .into(),
             (
                 PKT_ACK_HEX_ATTRIBUTE_KEY,
-                String::from_utf8(hex::encode(attr.acknowledgement))
+                str::from_utf8(&hex::encode(attr.acknowledgement))
                     .expect("Never fails because hexadecimal is always valid UTF-8"),
             )
                 .into(),
diff --git a/ibc-core/ics04-channel/types/src/lib.rs b/ibc-core/ics04-channel/types/src/lib.rs
new file mode 100644
index 000000000..6e7a0b3c6
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/lib.rs
@@ -0,0 +1,35 @@
+//! Implementation of the Channel and Packet Semantics (ICS-04) data structures.
+#![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
+)]
+
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod channel;
+pub mod error;
+pub mod events;
+
+pub mod msgs;
+pub mod packet;
+pub mod timeout;
+
+pub mod acknowledgement;
+pub mod commitment;
+mod version;
+pub use version::Version;
+
+/// Re-exports ICS-04 proto types from the `ibc-proto` crate
+pub mod proto {
+    pub use ibc_proto::ibc::core::channel::*;
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/acknowledgement.rs b/ibc-core/ics04-channel/types/src/msgs/acknowledgement.rs
new file mode 100644
index 000000000..a93f7a622
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/acknowledgement.rs
@@ -0,0 +1,68 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgAcknowledgement as RawMsgAcknowledgement;
+use ibc_proto::Protobuf;
+
+use crate::acknowledgement::Acknowledgement;
+use crate::error::PacketError;
+use crate::packet::Packet;
+
+pub const ACKNOWLEDGEMENT_TYPE_URL: &str = "/ibc.core.channel.v1.MsgAcknowledgement";
+
+///
+/// Message definition for packet acknowledgements.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgAcknowledgement {
+    pub packet: Packet,
+    pub acknowledgement: Acknowledgement,
+    /// Proof of packet acknowledgement on the receiving chain
+    pub proof_acked_on_b: CommitmentProofBytes,
+    /// Height at which the commitment proof in this message was taken
+    pub proof_height_on_b: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgAcknowledgement> for MsgAcknowledgement {}
+
+impl TryFrom<RawMsgAcknowledgement> for MsgAcknowledgement {
+    type Error = PacketError;
+
+    fn try_from(raw_msg: RawMsgAcknowledgement) -> Result<Self, Self::Error> {
+        Ok(MsgAcknowledgement {
+            packet: raw_msg
+                .packet
+                .ok_or(PacketError::MissingPacket)?
+                .try_into()?,
+            acknowledgement: raw_msg.acknowledgement.try_into()?,
+            proof_acked_on_b: raw_msg
+                .proof_acked
+                .try_into()
+                .map_err(|_| PacketError::InvalidProof)?,
+            proof_height_on_b: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(PacketError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgAcknowledgement> for RawMsgAcknowledgement {
+    fn from(domain_msg: MsgAcknowledgement) -> Self {
+        RawMsgAcknowledgement {
+            packet: Some(domain_msg.packet.into()),
+            acknowledgement: domain_msg.acknowledgement.into(),
+            signer: domain_msg.signer.to_string(),
+            proof_height: Some(domain_msg.proof_height_on_b.into()),
+            proof_acked: domain_msg.proof_acked_on_b.into(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/chan_close_confirm.rs b/ibc-core/ics04-channel/types/src/msgs/chan_close_confirm.rs
new file mode 100644
index 000000000..c533fc59c
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/chan_close_confirm.rs
@@ -0,0 +1,69 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::{ChannelId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgChannelCloseConfirm as RawMsgChannelCloseConfirm;
+use ibc_proto::Protobuf;
+
+use crate::error::ChannelError;
+
+pub const CHAN_CLOSE_CONFIRM_TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelCloseConfirm";
+
+///
+/// Message definition for the second step in the channel close handshake (the `ChanCloseConfirm`
+/// datagram).
+/// Per our convention, this message is sent to chain B.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgChannelCloseConfirm {
+    pub port_id_on_b: PortId,
+    pub chan_id_on_b: ChannelId,
+    pub proof_chan_end_on_a: CommitmentProofBytes,
+    pub proof_height_on_a: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgChannelCloseConfirm> for MsgChannelCloseConfirm {}
+
+impl TryFrom<RawMsgChannelCloseConfirm> for MsgChannelCloseConfirm {
+    type Error = ChannelError;
+
+    fn try_from(raw_msg: RawMsgChannelCloseConfirm) -> Result<Self, Self::Error> {
+        if raw_msg.counterparty_upgrade_sequence != 0 {
+            return Err(ChannelError::UnsupportedChannelUpgradeSequence);
+        }
+
+        Ok(MsgChannelCloseConfirm {
+            port_id_on_b: raw_msg.port_id.parse()?,
+            chan_id_on_b: raw_msg.channel_id.parse()?,
+            proof_chan_end_on_a: raw_msg
+                .proof_init
+                .try_into()
+                .map_err(|_| ChannelError::InvalidProof)?,
+            proof_height_on_a: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ChannelError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgChannelCloseConfirm> for RawMsgChannelCloseConfirm {
+    fn from(domain_msg: MsgChannelCloseConfirm) -> Self {
+        RawMsgChannelCloseConfirm {
+            port_id: domain_msg.port_id_on_b.to_string(),
+            channel_id: domain_msg.chan_id_on_b.to_string(),
+            proof_init: domain_msg.proof_chan_end_on_a.clone().into(),
+            proof_height: Some(domain_msg.proof_height_on_a.into()),
+            signer: domain_msg.signer.to_string(),
+            counterparty_upgrade_sequence: 0,
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/chan_close_init.rs b/ibc-core/ics04-channel/types/src/msgs/chan_close_init.rs
new file mode 100644
index 000000000..2663b4186
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/chan_close_init.rs
@@ -0,0 +1,49 @@
+use ibc_core_host_types::identifiers::{ChannelId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgChannelCloseInit as RawMsgChannelCloseInit;
+use ibc_proto::Protobuf;
+
+use crate::error::ChannelError;
+
+pub const CHAN_CLOSE_INIT_TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelCloseInit";
+
+///
+/// Message definition for the first step in the channel close handshake (`ChanCloseInit` datagram).
+/// Per our convention, this message is sent to chain A.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgChannelCloseInit {
+    pub port_id_on_a: PortId,
+    pub chan_id_on_a: ChannelId,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgChannelCloseInit> for MsgChannelCloseInit {}
+
+impl TryFrom<RawMsgChannelCloseInit> for MsgChannelCloseInit {
+    type Error = ChannelError;
+
+    fn try_from(raw_msg: RawMsgChannelCloseInit) -> Result<Self, Self::Error> {
+        Ok(MsgChannelCloseInit {
+            port_id_on_a: raw_msg.port_id.parse()?,
+            chan_id_on_a: raw_msg.channel_id.parse()?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgChannelCloseInit> for RawMsgChannelCloseInit {
+    fn from(domain_msg: MsgChannelCloseInit) -> Self {
+        RawMsgChannelCloseInit {
+            port_id: domain_msg.port_id_on_a.to_string(),
+            channel_id: domain_msg.chan_id_on_a.to_string(),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/chan_open_ack.rs b/ibc-core/ics04-channel/types/src/msgs/chan_open_ack.rs
new file mode 100644
index 000000000..432ca92fe
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/chan_open_ack.rs
@@ -0,0 +1,69 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::{ChannelId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgChannelOpenAck as RawMsgChannelOpenAck;
+use ibc_proto::Protobuf;
+
+use crate::error::ChannelError;
+use crate::Version;
+
+pub const CHAN_OPEN_ACK_TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenAck";
+
+/// Message definition for the third step in the channel open handshake (`ChanOpenAck` datagram).
+///
+/// Per our convention, this message is sent to chain A.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgChannelOpenAck {
+    pub port_id_on_a: PortId,
+    pub chan_id_on_a: ChannelId,
+    pub chan_id_on_b: ChannelId,
+    pub version_on_b: Version,
+    pub proof_chan_end_on_b: CommitmentProofBytes,
+    pub proof_height_on_b: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgChannelOpenAck> for MsgChannelOpenAck {}
+
+impl TryFrom<RawMsgChannelOpenAck> for MsgChannelOpenAck {
+    type Error = ChannelError;
+
+    fn try_from(raw_msg: RawMsgChannelOpenAck) -> Result<Self, Self::Error> {
+        Ok(MsgChannelOpenAck {
+            port_id_on_a: raw_msg.port_id.parse()?,
+            chan_id_on_a: raw_msg.channel_id.parse()?,
+            chan_id_on_b: raw_msg.counterparty_channel_id.parse()?,
+            version_on_b: raw_msg.counterparty_version.into(),
+            proof_chan_end_on_b: raw_msg
+                .proof_try
+                .try_into()
+                .map_err(|_| ChannelError::InvalidProof)?,
+            proof_height_on_b: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ChannelError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgChannelOpenAck> for RawMsgChannelOpenAck {
+    fn from(domain_msg: MsgChannelOpenAck) -> Self {
+        RawMsgChannelOpenAck {
+            port_id: domain_msg.port_id_on_a.to_string(),
+            channel_id: domain_msg.chan_id_on_a.to_string(),
+            counterparty_channel_id: domain_msg.chan_id_on_b.to_string(),
+            counterparty_version: domain_msg.version_on_b.to_string(),
+            proof_try: domain_msg.proof_chan_end_on_b.into(),
+            proof_height: Some(domain_msg.proof_height_on_b.into()),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/chan_open_confirm.rs b/ibc-core/ics04-channel/types/src/msgs/chan_open_confirm.rs
new file mode 100644
index 000000000..6070eb1a2
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/chan_open_confirm.rs
@@ -0,0 +1,64 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::{ChannelId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgChannelOpenConfirm as RawMsgChannelOpenConfirm;
+use ibc_proto::Protobuf;
+
+use crate::error::ChannelError;
+
+pub const CHAN_OPEN_CONFIRM_TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenConfirm";
+
+///
+/// Message definition for the fourth step in the channel open handshake (`ChanOpenConfirm`
+/// datagram).
+/// Per our convention, this message is sent to chain B.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgChannelOpenConfirm {
+    pub port_id_on_b: PortId,
+    pub chan_id_on_b: ChannelId,
+    pub proof_chan_end_on_a: CommitmentProofBytes,
+    pub proof_height_on_a: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgChannelOpenConfirm> for MsgChannelOpenConfirm {}
+
+impl TryFrom<RawMsgChannelOpenConfirm> for MsgChannelOpenConfirm {
+    type Error = ChannelError;
+
+    fn try_from(raw_msg: RawMsgChannelOpenConfirm) -> Result<Self, Self::Error> {
+        Ok(MsgChannelOpenConfirm {
+            port_id_on_b: raw_msg.port_id.parse()?,
+            chan_id_on_b: raw_msg.channel_id.parse()?,
+            proof_chan_end_on_a: raw_msg
+                .proof_ack
+                .try_into()
+                .map_err(|_| ChannelError::InvalidProof)?,
+            proof_height_on_a: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ChannelError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgChannelOpenConfirm> for RawMsgChannelOpenConfirm {
+    fn from(domain_msg: MsgChannelOpenConfirm) -> Self {
+        RawMsgChannelOpenConfirm {
+            port_id: domain_msg.port_id_on_b.to_string(),
+            channel_id: domain_msg.chan_id_on_b.to_string(),
+            proof_ack: domain_msg.proof_chan_end_on_a.into(),
+            proof_height: Some(domain_msg.proof_height_on_a.into()),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/chan_open_init.rs b/ibc-core/ics04-channel/types/src/msgs/chan_open_init.rs
new file mode 100644
index 000000000..00344ac79
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/chan_open_init.rs
@@ -0,0 +1,99 @@
+use ibc_core_host_types::identifiers::{ConnectionId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgChannelOpenInit as RawMsgChannelOpenInit;
+use ibc_proto::Protobuf;
+
+use crate::channel::{verify_connection_hops_length, ChannelEnd, Counterparty, Order, State};
+use crate::error::ChannelError;
+use crate::Version;
+
+pub const CHAN_OPEN_INIT_TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenInit";
+
+///
+/// Message definition for the first step in the channel open handshake (`ChanOpenInit` datagram).
+/// Per our convention, this message is sent to chain A.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgChannelOpenInit {
+    pub port_id_on_a: PortId,
+    pub connection_hops_on_a: Vec<ConnectionId>,
+    pub port_id_on_b: PortId,
+    pub ordering: Order,
+    pub signer: Signer,
+    /// Allow a relayer to specify a particular version by providing a non-empty version string
+    pub version_proposal: Version,
+}
+
+impl MsgChannelOpenInit {
+    pub fn new(
+        port_id_on_a: PortId,
+        connection_hops_on_a: Vec<ConnectionId>,
+        port_id_on_b: PortId,
+        ordering: Order,
+        signer: Signer,
+        version_proposal: Version,
+    ) -> Self {
+        Self {
+            port_id_on_a,
+            connection_hops_on_a,
+            port_id_on_b,
+            ordering,
+            signer,
+            version_proposal,
+        }
+    }
+
+    /// Checks if the `connection_hops` has a length of `expected`.
+    ///
+    /// Note: Current IBC version only supports one connection hop.
+    pub fn verify_connection_hops_length(&self) -> Result<(), ChannelError> {
+        verify_connection_hops_length(&self.connection_hops_on_a, 1)
+    }
+}
+
+impl Protobuf<RawMsgChannelOpenInit> for MsgChannelOpenInit {}
+
+impl TryFrom<RawMsgChannelOpenInit> for MsgChannelOpenInit {
+    type Error = ChannelError;
+
+    fn try_from(raw_msg: RawMsgChannelOpenInit) -> Result<Self, Self::Error> {
+        let chan_end_on_a: ChannelEnd = raw_msg
+            .channel
+            .ok_or(ChannelError::MissingChannel)?
+            .try_into()?;
+        chan_end_on_a.verify_state_matches(&State::Init)?;
+        chan_end_on_a.counterparty().verify_empty_channel_id()?;
+
+        Ok(MsgChannelOpenInit {
+            port_id_on_a: raw_msg.port_id.parse()?,
+            connection_hops_on_a: chan_end_on_a.connection_hops,
+            port_id_on_b: chan_end_on_a.remote.port_id,
+            ordering: chan_end_on_a.ordering,
+            signer: raw_msg.signer.into(),
+            version_proposal: chan_end_on_a.version,
+        })
+    }
+}
+
+impl From<MsgChannelOpenInit> for RawMsgChannelOpenInit {
+    fn from(domain_msg: MsgChannelOpenInit) -> Self {
+        let chan_end_on_a = ChannelEnd::new_without_validation(
+            State::Init,
+            domain_msg.ordering,
+            Counterparty::new(domain_msg.port_id_on_b, None),
+            domain_msg.connection_hops_on_a,
+            domain_msg.version_proposal,
+        );
+        RawMsgChannelOpenInit {
+            port_id: domain_msg.port_id_on_a.to_string(),
+            channel: Some(chan_end_on_a.into()),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/chan_open_try.rs b/ibc-core/ics04-channel/types/src/msgs/chan_open_try.rs
new file mode 100644
index 000000000..c6cbd918b
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/chan_open_try.rs
@@ -0,0 +1,118 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgChannelOpenTry as RawMsgChannelOpenTry;
+use ibc_proto::Protobuf;
+
+use crate::channel::{verify_connection_hops_length, ChannelEnd, Counterparty, Order, State};
+use crate::error::ChannelError;
+use crate::Version;
+
+pub const CHAN_OPEN_TRY_TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenTry";
+
+///
+/// Message definition for the second step in the channel open handshake (`ChanOpenTry` datagram).
+/// Per our convention, this message is sent to chain B.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgChannelOpenTry {
+    pub port_id_on_b: PortId,
+    pub connection_hops_on_b: Vec<ConnectionId>,
+    pub port_id_on_a: PortId,
+    pub chan_id_on_a: ChannelId,
+    pub version_supported_on_a: Version,
+    pub proof_chan_end_on_a: CommitmentProofBytes,
+    pub proof_height_on_a: Height,
+    pub ordering: Order,
+    pub signer: Signer,
+
+    #[deprecated(since = "0.22.0")]
+    /// Only kept here for proper conversion to/from the raw type
+    pub version_proposal: Version,
+}
+
+impl MsgChannelOpenTry {
+    /// Checks if the `connection_hops` has a length of `expected`.
+    ///
+    /// Note: The current IBC version only supports one connection hop.
+    pub fn verify_connection_hops_length(&self) -> Result<(), ChannelError> {
+        verify_connection_hops_length(&self.connection_hops_on_b, 1)
+    }
+}
+
+impl Protobuf<RawMsgChannelOpenTry> for MsgChannelOpenTry {}
+
+impl TryFrom<RawMsgChannelOpenTry> for MsgChannelOpenTry {
+    type Error = ChannelError;
+
+    fn try_from(raw_msg: RawMsgChannelOpenTry) -> Result<Self, Self::Error> {
+        let chan_end_on_b: ChannelEnd = raw_msg
+            .channel
+            .ok_or(ChannelError::MissingChannel)?
+            .try_into()?;
+
+        chan_end_on_b.verify_state_matches(&State::TryOpen)?;
+
+        #[allow(deprecated)]
+        if !raw_msg.previous_channel_id.is_empty() {
+            return Err(ChannelError::InvalidChannelId {
+                expected: "previous channel id must be empty. It has been deprecated as crossing hellos are no longer supported".to_string(),
+                actual: raw_msg.previous_channel_id,
+            });
+        }
+
+        #[allow(deprecated)]
+        let msg = MsgChannelOpenTry {
+            port_id_on_b: raw_msg.port_id.parse()?,
+            ordering: chan_end_on_b.ordering,
+            connection_hops_on_b: chan_end_on_b.connection_hops,
+            port_id_on_a: chan_end_on_b.remote.port_id,
+            chan_id_on_a: chan_end_on_b
+                .remote
+                .channel_id
+                .ok_or(ChannelError::MissingCounterparty)?,
+            version_supported_on_a: raw_msg.counterparty_version.into(),
+            proof_chan_end_on_a: raw_msg
+                .proof_init
+                .try_into()
+                .map_err(|_| ChannelError::InvalidProof)?,
+            proof_height_on_a: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(ChannelError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+            version_proposal: chan_end_on_b.version,
+        };
+
+        Ok(msg)
+    }
+}
+
+impl From<MsgChannelOpenTry> for RawMsgChannelOpenTry {
+    fn from(domain_msg: MsgChannelOpenTry) -> Self {
+        let chan_end_on_b = ChannelEnd::new_without_validation(
+            State::TryOpen,
+            domain_msg.ordering,
+            Counterparty::new(domain_msg.port_id_on_a, Some(domain_msg.chan_id_on_a)),
+            domain_msg.connection_hops_on_b,
+            Version::empty(), // Excessive field to satisfy the type conversion
+        );
+        #[allow(deprecated)]
+        RawMsgChannelOpenTry {
+            port_id: domain_msg.port_id_on_b.to_string(),
+            previous_channel_id: "".to_string(), // Excessive field to satisfy the type conversion",
+            channel: Some(chan_end_on_b.into()),
+            counterparty_version: domain_msg.version_supported_on_a.to_string(),
+            proof_init: domain_msg.proof_chan_end_on_a.clone().into(),
+            proof_height: Some(domain_msg.proof_height_on_a.into()),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/mod.rs b/ibc-core/ics04-channel/types/src/msgs/mod.rs
new file mode 100644
index 000000000..8e518591c
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/mod.rs
@@ -0,0 +1,79 @@
+//! Message definitions for all ICS4 domain types: channel open & close handshake datagrams, as well
+//! as packets.
+
+mod acknowledgement;
+mod chan_close_confirm;
+mod chan_close_init;
+mod chan_open_ack;
+mod chan_open_confirm;
+mod chan_open_init;
+mod chan_open_try;
+mod recv_packet;
+mod timeout;
+mod timeout_on_close;
+
+// Opening handshake messages.
+// Packet specific messages.
+pub use acknowledgement::*;
+// Closing handshake messages.
+pub use chan_close_confirm::*;
+pub use chan_close_init::*;
+pub use chan_open_ack::*;
+pub use chan_open_confirm::*;
+pub use chan_open_init::*;
+pub use chan_open_try::*;
+use ibc_core_host_types::identifiers::*;
+use ibc_primitives::prelude::*;
+pub use recv_packet::*;
+pub use timeout::*;
+pub use timeout_on_close::*;
+
+/// All channel messages
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
+pub enum ChannelMsg {
+    OpenInit(MsgChannelOpenInit),
+    OpenTry(MsgChannelOpenTry),
+    OpenAck(MsgChannelOpenAck),
+    OpenConfirm(MsgChannelOpenConfirm),
+    CloseInit(MsgChannelCloseInit),
+    CloseConfirm(MsgChannelCloseConfirm),
+}
+
+/// All packet messages
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
+pub enum PacketMsg {
+    Recv(MsgRecvPacket),
+    Ack(MsgAcknowledgement),
+    Timeout(MsgTimeout),
+    TimeoutOnClose(MsgTimeoutOnClose),
+}
+
+pub fn channel_msg_to_port_id(msg: &ChannelMsg) -> &PortId {
+    match msg {
+        ChannelMsg::OpenInit(msg) => &msg.port_id_on_a,
+        ChannelMsg::OpenTry(msg) => &msg.port_id_on_b,
+        ChannelMsg::OpenAck(msg) => &msg.port_id_on_a,
+        ChannelMsg::OpenConfirm(msg) => &msg.port_id_on_b,
+        ChannelMsg::CloseInit(msg) => &msg.port_id_on_a,
+        ChannelMsg::CloseConfirm(msg) => &msg.port_id_on_b,
+    }
+}
+
+pub fn packet_msg_to_port_id(msg: &PacketMsg) -> &PortId {
+    match msg {
+        PacketMsg::Recv(msg) => &msg.packet.port_id_on_b,
+        PacketMsg::Ack(msg) => &msg.packet.port_id_on_a,
+        PacketMsg::Timeout(msg) => &msg.packet.port_id_on_a,
+        PacketMsg::TimeoutOnClose(msg) => &msg.packet.port_id_on_a,
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/recv_packet.rs b/ibc-core/ics04-channel/types/src/msgs/recv_packet.rs
new file mode 100644
index 000000000..5295e1807
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/recv_packet.rs
@@ -0,0 +1,66 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgRecvPacket as RawMsgRecvPacket;
+use ibc_proto::Protobuf;
+
+use crate::error::PacketError;
+use crate::packet::Packet;
+
+pub const RECV_PACKET_TYPE_URL: &str = "/ibc.core.channel.v1.MsgRecvPacket";
+
+///
+/// Message definition for the "packet receiving" datagram.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgRecvPacket {
+    /// The packet to be received
+    pub packet: Packet,
+    /// Proof of packet commitment on the sending chain
+    pub proof_commitment_on_a: CommitmentProofBytes,
+    /// Height at which the commitment proof in this message were taken
+    pub proof_height_on_a: Height,
+    /// The signer of the message
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgRecvPacket> for MsgRecvPacket {}
+
+impl TryFrom<RawMsgRecvPacket> for MsgRecvPacket {
+    type Error = PacketError;
+
+    fn try_from(raw_msg: RawMsgRecvPacket) -> Result<Self, Self::Error> {
+        Ok(MsgRecvPacket {
+            packet: raw_msg
+                .packet
+                .ok_or(PacketError::MissingPacket)?
+                .try_into()?,
+            proof_commitment_on_a: raw_msg
+                .proof_commitment
+                .try_into()
+                .map_err(|_| PacketError::InvalidProof)?,
+            proof_height_on_a: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(PacketError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgRecvPacket> for RawMsgRecvPacket {
+    fn from(domain_msg: MsgRecvPacket) -> Self {
+        RawMsgRecvPacket {
+            packet: Some(domain_msg.packet.into()),
+            proof_commitment: domain_msg.proof_commitment_on_a.into(),
+            proof_height: Some(domain_msg.proof_height_on_a.into()),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/timeout.rs b/ibc-core/ics04-channel/types/src/msgs/timeout.rs
new file mode 100644
index 000000000..362630ff0
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/timeout.rs
@@ -0,0 +1,70 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::Sequence;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgTimeout as RawMsgTimeout;
+use ibc_proto::Protobuf;
+
+use crate::error::PacketError;
+use crate::packet::Packet;
+
+pub const TIMEOUT_TYPE_URL: &str = "/ibc.core.channel.v1.MsgTimeout";
+
+///
+/// Message definition for packet timeout domain type,
+/// which is sent on chain A and needs to prove that a previously sent packet was not received on chain B
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgTimeout {
+    pub packet: Packet,
+    pub next_seq_recv_on_b: Sequence,
+    pub proof_unreceived_on_b: CommitmentProofBytes,
+    pub proof_height_on_b: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgTimeout> for MsgTimeout {}
+
+impl TryFrom<RawMsgTimeout> for MsgTimeout {
+    type Error = PacketError;
+
+    fn try_from(raw_msg: RawMsgTimeout) -> Result<Self, Self::Error> {
+        if raw_msg.next_sequence_recv == 0 {
+            return Err(PacketError::ZeroPacketSequence);
+        }
+        Ok(MsgTimeout {
+            packet: raw_msg
+                .packet
+                .ok_or(PacketError::MissingPacket)?
+                .try_into()?,
+            next_seq_recv_on_b: Sequence::from(raw_msg.next_sequence_recv),
+            proof_unreceived_on_b: raw_msg
+                .proof_unreceived
+                .try_into()
+                .map_err(|_| PacketError::InvalidProof)?,
+            proof_height_on_b: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(PacketError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgTimeout> for RawMsgTimeout {
+    fn from(domain_msg: MsgTimeout) -> Self {
+        RawMsgTimeout {
+            packet: Some(domain_msg.packet.into()),
+            proof_unreceived: domain_msg.proof_unreceived_on_b.into(),
+            proof_height: Some(domain_msg.proof_height_on_b.into()),
+            next_sequence_recv: domain_msg.next_seq_recv_on_b.into(),
+            signer: domain_msg.signer.to_string(),
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/msgs/timeout_on_close.rs b/ibc-core/ics04-channel/types/src/msgs/timeout_on_close.rs
new file mode 100644
index 000000000..7673d5f33
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/msgs/timeout_on_close.rs
@@ -0,0 +1,83 @@
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentProofBytes;
+use ibc_core_host_types::identifiers::Sequence;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+use ibc_proto::ibc::core::channel::v1::MsgTimeoutOnClose as RawMsgTimeoutOnClose;
+use ibc_proto::Protobuf;
+
+use crate::error::{ChannelError, PacketError};
+use crate::packet::Packet;
+
+pub const TIMEOUT_ON_CLOSE_TYPE_URL: &str = "/ibc.core.channel.v1.MsgTimeoutOnClose";
+
+///
+/// Message definition for packet timeout domain type.
+///
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct MsgTimeoutOnClose {
+    pub packet: Packet,
+    pub next_seq_recv_on_b: Sequence,
+    pub proof_unreceived_on_b: CommitmentProofBytes,
+    pub proof_close_on_b: CommitmentProofBytes,
+    pub proof_height_on_b: Height,
+    pub signer: Signer,
+}
+
+impl Protobuf<RawMsgTimeoutOnClose> for MsgTimeoutOnClose {}
+
+impl TryFrom<RawMsgTimeoutOnClose> for MsgTimeoutOnClose {
+    type Error = PacketError;
+
+    fn try_from(raw_msg: RawMsgTimeoutOnClose) -> Result<Self, Self::Error> {
+        if raw_msg.next_sequence_recv == 0 {
+            return Err(PacketError::ZeroPacketSequence);
+        }
+
+        if raw_msg.counterparty_upgrade_sequence != 0 {
+            return Err(PacketError::Channel(
+                ChannelError::UnsupportedChannelUpgradeSequence,
+            ));
+        }
+
+        Ok(MsgTimeoutOnClose {
+            packet: raw_msg
+                .packet
+                .ok_or(PacketError::MissingPacket)?
+                .try_into()?,
+            next_seq_recv_on_b: Sequence::from(raw_msg.next_sequence_recv),
+            proof_unreceived_on_b: raw_msg
+                .proof_unreceived
+                .try_into()
+                .map_err(|_| PacketError::InvalidProof)?,
+            proof_close_on_b: raw_msg
+                .proof_close
+                .try_into()
+                .map_err(|_| PacketError::InvalidProof)?,
+            proof_height_on_b: raw_msg
+                .proof_height
+                .and_then(|raw_height| raw_height.try_into().ok())
+                .ok_or(PacketError::MissingHeight)?,
+            signer: raw_msg.signer.into(),
+        })
+    }
+}
+
+impl From<MsgTimeoutOnClose> for RawMsgTimeoutOnClose {
+    fn from(domain_msg: MsgTimeoutOnClose) -> Self {
+        RawMsgTimeoutOnClose {
+            packet: Some(domain_msg.packet.into()),
+            proof_unreceived: domain_msg.proof_unreceived_on_b.into(),
+            proof_close: domain_msg.proof_close_on_b.into(),
+            proof_height: Some(domain_msg.proof_height_on_b.into()),
+            next_sequence_recv: domain_msg.next_seq_recv_on_b.into(),
+            signer: domain_msg.signer.to_string(),
+            counterparty_upgrade_sequence: 0,
+        }
+    }
+}
diff --git a/ibc-core/ics04-channel/types/src/packet.rs b/ibc-core/ics04-channel/types/src/packet.rs
new file mode 100644
index 000000000..5caeb4eb3
--- /dev/null
+++ b/ibc-core/ics04-channel/types/src/packet.rs
@@ -0,0 +1,311 @@
+//! Defines the packet type
+use ibc_core_client_types::Height;
+use ibc_core_host_types::identifiers::{ChannelId, PortId, Sequence};
+use ibc_primitives::prelude::*;
+use ibc_primitives::Expiry::Expired;
+use ibc_primitives::Timestamp;
+use ibc_proto::ibc::core::channel::v1::{Packet as RawPacket, PacketState as RawPacketState};
+
+use super::timeout::TimeoutHeight;
+use crate::error::PacketError;
+
+/// Enumeration of proof carrying ICS4 message, helper for relayer.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum PacketMsgType {
+    Recv,
+    Ack,
+    TimeoutUnordered,
+    TimeoutOrdered,
+    TimeoutOnClose,
+}
+
+/// Packet receipt, used over unordered channels.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug)]
+pub enum Receipt {
+    Ok,
+}
+
+impl core::fmt::Display for PacketMsgType {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match self {
+            PacketMsgType::Recv => write!(f, "(PacketMsgType::Recv)"),
+            PacketMsgType::Ack => write!(f, "(PacketMsgType::Ack)"),
+            PacketMsgType::TimeoutUnordered => write!(f, "(PacketMsgType::TimeoutUnordered)"),
+            PacketMsgType::TimeoutOrdered => write!(f, "(PacketMsgType::TimeoutOrdered)"),
+            PacketMsgType::TimeoutOnClose => write!(f, "(PacketMsgType::TimeoutOnClose)"),
+        }
+    }
+}
+
+/// The packet type; this is what applications send to one another.
+///
+/// Each application defines the structure of the `data` field.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Hash, PartialEq, Eq)]
+pub struct Packet {
+    pub seq_on_a: Sequence,
+    pub port_id_on_a: PortId,
+    pub chan_id_on_a: ChannelId,
+    pub port_id_on_b: PortId,
+    pub chan_id_on_b: ChannelId,
+    #[cfg_attr(
+        feature = "serde",
+        serde(serialize_with = "ibc_core_commitment_types::serializer::ser_hex_upper")
+    )]
+    pub data: Vec<u8>,
+    pub timeout_height_on_b: TimeoutHeight,
+    pub timeout_timestamp_on_b: Timestamp,
+}
+
+struct PacketData<'a>(&'a [u8]);
+
+impl<'a> core::fmt::Debug for PacketData<'a> {
+    fn fmt(&self, formatter: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        write!(formatter, "{:?}", self.0)
+    }
+}
+
+impl core::fmt::Debug for Packet {
+    fn fmt(&self, formatter: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        // Remember: if you alter the definition of `Packet`,
+        // 1. update the formatter debug struct builder calls (return object of
+        //    this function)
+        // 2. update this destructuring assignment accordingly
+        let Packet {
+            seq_on_a: _,
+            port_id_on_a: _,
+            chan_id_on_a: _,
+            port_id_on_b: _,
+            chan_id_on_b: _,
+            data,
+            timeout_height_on_b: _,
+            timeout_timestamp_on_b: _,
+        } = self;
+        let data_wrapper = PacketData(data);
+
+        formatter
+            .debug_struct("Packet")
+            .field("sequence", &self.seq_on_a)
+            .field("source_port", &self.port_id_on_a)
+            .field("source_channel", &self.chan_id_on_a)
+            .field("destination_port", &self.port_id_on_b)
+            .field("destination_channel", &self.chan_id_on_b)
+            .field("data", &data_wrapper)
+            .field("timeout_height", &self.timeout_height_on_b)
+            .field("timeout_timestamp", &self.timeout_timestamp_on_b)
+            .finish()
+    }
+}
+
+impl Packet {
+    /// Checks whether a packet from a
+    /// [`SendPacket`](crate::events::SendPacket)
+    /// event is timed-out relative to the current state of the
+    /// destination chain.
+    ///
+    /// Checks for time-out relative to the destination chain's
+    /// current timestamp `dst_chain_ts` as well as relative to
+    /// the height `dst_chain_height`.
+    ///
+    /// Note: a timed-out packet should result in a
+    /// [`MsgTimeout`](crate::msgs::MsgTimeout),
+    /// instead of the common-case where it results in
+    /// [`MsgRecvPacket`](crate::msgs::MsgRecvPacket).
+    pub fn timed_out(&self, dst_chain_ts: &Timestamp, dst_chain_height: Height) -> bool {
+        let height_timed_out = self.timeout_height_on_b.has_expired(dst_chain_height);
+
+        let timestamp_timed_out = self.timeout_timestamp_on_b.is_set()
+            && dst_chain_ts.check_expiry(&self.timeout_timestamp_on_b) == Expired;
+
+        height_timed_out || timestamp_timed_out
+    }
+}
+
+/// Custom debug output to omit the packet data
+impl core::fmt::Display for Packet {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        write!(
+            f,
+            "seq:{}, path:{}/{}->{}/{}, toh:{}, tos:{})",
+            self.seq_on_a,
+            self.chan_id_on_a,
+            self.port_id_on_a,
+            self.chan_id_on_b,
+            self.port_id_on_b,
+            self.timeout_height_on_b,
+            self.timeout_timestamp_on_b
+        )
+    }
+}
+
+impl TryFrom<RawPacket> for Packet {
+    type Error = PacketError;
+
+    fn try_from(raw_pkt: RawPacket) -> Result<Self, Self::Error> {
+        if Sequence::from(raw_pkt.sequence).is_zero() {
+            return Err(PacketError::ZeroPacketSequence);
+        }
+
+        if raw_pkt.data.is_empty() {
+            return Err(PacketError::ZeroPacketData);
+        }
+
+        // Note: ibc-go currently (July 2022) incorrectly treats the timeout
+        // heights `{revision_number : >0, revision_height: 0}` as valid
+        // timeouts. However, heights with `revision_height == 0` are invalid in
+        // Tendermint. We explicitly reject these values because they go against
+        // the Tendermint spec, and shouldn't be used. To timeout on the next
+        // revision_number as soon as the chain starts,
+        // `{revision_number: old_rev + 1, revision_height: 1}`
+        // should be used.
+        let packet_timeout_height: TimeoutHeight = raw_pkt
+            .timeout_height
+            .try_into()
+            .map_err(|_| PacketError::InvalidTimeoutHeight)?;
+
+        let timeout_timestamp_on_b = Timestamp::from_nanoseconds(raw_pkt.timeout_timestamp)
+            .map_err(PacketError::InvalidPacketTimestamp)?;
+
+        // Packet timeout height and packet timeout timestamp cannot both be unset.
+        if !packet_timeout_height.is_set() && !timeout_timestamp_on_b.is_set() {
+            return Err(PacketError::MissingTimeout);
+        }
+
+        Ok(Packet {
+            seq_on_a: Sequence::from(raw_pkt.sequence),
+            port_id_on_a: raw_pkt.source_port.parse()?,
+            chan_id_on_a: raw_pkt.source_channel.parse()?,
+            port_id_on_b: raw_pkt.destination_port.parse()?,
+            chan_id_on_b: raw_pkt.destination_channel.parse()?,
+            data: raw_pkt.data,
+            timeout_height_on_b: packet_timeout_height,
+            timeout_timestamp_on_b,
+        })
+    }
+}
+
+impl From<Packet> for RawPacket {
+    fn from(packet: Packet) -> Self {
+        RawPacket {
+            sequence: packet.seq_on_a.value(),
+            source_port: packet.port_id_on_a.to_string(),
+            source_channel: packet.chan_id_on_a.to_string(),
+            destination_port: packet.port_id_on_b.to_string(),
+            destination_channel: packet.chan_id_on_b.to_string(),
+            data: packet.data,
+            timeout_height: packet.timeout_height_on_b.into(),
+            timeout_timestamp: packet.timeout_timestamp_on_b.nanoseconds(),
+        }
+    }
+}
+
+/// The packet state type.
+///
+/// Each application defines the structure of the `data` field.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Hash, PartialEq, Eq)]
+pub struct PacketState {
+    pub port_id: PortId,
+    pub chan_id: ChannelId,
+    pub seq: Sequence,
+    #[cfg_attr(
+        feature = "serde",
+        serde(serialize_with = "ibc_core_commitment_types::serializer::ser_hex_upper")
+    )]
+    pub data: Vec<u8>,
+}
+impl core::fmt::Debug for PacketState {
+    fn fmt(&self, formatter: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        let data_wrapper = PacketData(&self.data);
+
+        formatter
+            .debug_struct("PacketState")
+            .field("port", &self.port_id)
+            .field("channel", &self.chan_id)
+            .field("sequence", &self.seq)
+            .field("data", &data_wrapper)
+            .finish()
+    }
+}
+
+/// Custom debug output to omit the packet data
+impl core::fmt::Display for PacketState {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        write!(
+            f,
+            "seq:{}, path:{}/{}",
+            self.seq, self.chan_id, self.port_id,
+        )
+    }
+}
+
+impl TryFrom<RawPacketState> for PacketState {
+    type Error = PacketError;
+
+    fn try_from(raw_pkt: RawPacketState) -> Result<Self, Self::Error> {
+        if Sequence::from(raw_pkt.sequence).is_zero() {
+            return Err(PacketError::ZeroPacketSequence);
+        }
+
+        if raw_pkt.data.is_empty() {
+            return Err(PacketError::ZeroPacketData);
+        }
+
+        Ok(PacketState {
+            seq: Sequence::from(raw_pkt.sequence),
+            port_id: raw_pkt.port_id.parse()?,
+            chan_id: raw_pkt.channel_id.parse()?,
+            data: raw_pkt.data,
+        })
+    }
+}
+
+impl From<PacketState> for RawPacketState {
+    fn from(packet: PacketState) -> Self {
+        Self {
+            sequence: packet.seq.value(),
+            port_id: packet.port_id.to_string(),
+            channel_id: packet.chan_id.to_string(),
+            data: packet.data,
+        }
+    }
+}
diff --git a/crates/ibc/src/core/ics04_channel/timeout.rs b/ibc-core/ics04-channel/types/src/timeout.rs
similarity index 96%
rename from crates/ibc/src/core/ics04_channel/timeout.rs
rename to ibc-core/ics04-channel/types/src/timeout.rs
index f215dc7fe..e20ccf0d8 100644
--- a/crates/ibc/src/core/ics04_channel/timeout.rs
+++ b/ibc-core/ics04-channel/types/src/timeout.rs
@@ -2,11 +2,11 @@
 
 use core::fmt::{Display, Error as FmtError, Formatter};
 
+use ibc_core_client_types::error::ClientError;
+use ibc_core_client_types::Height;
+use ibc_primitives::prelude::*;
 use ibc_proto::ibc::core::client::v1::Height as RawHeight;
 
-use crate::core::ics02_client::{error::ClientError, height::Height};
-use crate::prelude::*;
-
 /// Indicates a consensus height on the destination chain after which the packet
 /// will no longer be processed, and will instead count as having timed-out.
 ///
@@ -29,6 +29,7 @@ use crate::prelude::*;
     feature = "borsh",
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
 pub enum TimeoutHeight {
     Never,
@@ -83,12 +84,6 @@ impl TimeoutHeight {
     }
 }
 
-impl Default for TimeoutHeight {
-    fn default() -> Self {
-        Self::Never
-    }
-}
-
 impl TryFrom<RawHeight> for TimeoutHeight {
     type Error = ClientError;
 
@@ -148,10 +143,11 @@ impl Display for TimeoutHeight {
 }
 
 #[cfg(feature = "serde")]
-mod serde {
-    use super::TimeoutHeight;
+mod tests {
     use serde::{Deserialize, Serialize};
 
+    use super::TimeoutHeight;
+
     impl Serialize for TimeoutHeight {
         fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
         where
@@ -187,7 +183,7 @@ mod serde {
         where
             D: serde::Deserializer<'de>,
         {
-            use crate::core::ics02_client::height::Height as Ics02Height;
+            use ibc_core_client_types::Height as Ics02Height;
 
             // Here we have to use a bespoke struct as well in order to deserialize
             // a height which may have a revision height equal to zero.
diff --git a/crates/ibc/src/core/ics04_channel/version.rs b/ibc-core/ics04-channel/types/src/version.rs
similarity index 91%
rename from crates/ibc/src/core/ics04_channel/version.rs
rename to ibc-core/ics04-channel/types/src/version.rs
index 164c32859..6d42b24df 100644
--- a/crates/ibc/src/core/ics04_channel/version.rs
+++ b/ibc-core/ics04-channel/types/src/version.rs
@@ -6,7 +6,7 @@ use core::convert::Infallible;
 use core::fmt::{Display, Error as FmtError, Formatter};
 use core::str::FromStr;
 
-use crate::prelude::*;
+use ibc_primitives::prelude::*;
 
 use super::error::ChannelError;
 
@@ -28,6 +28,7 @@ use super::error::ChannelError;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Version(String);
 
@@ -73,13 +74,6 @@ impl FromStr for Version {
     }
 }
 
-/// The default version is empty (unspecified).
-impl Default for Version {
-    fn default() -> Self {
-        Version::empty()
-    }
-}
-
 impl Display for Version {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
         write!(f, "{}", self.0)
diff --git a/ibc-core/ics23-commitment/types/Cargo.toml b/ibc-core/ics23-commitment/types/Cargo.toml
new file mode 100644
index 000000000..27ce743c6
--- /dev/null
+++ b/ibc-core/ics23-commitment/types/Cargo.toml
@@ -0,0 +1,75 @@
+[package]
+name         = "ibc-core-commitment-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "commitment", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-23 Vector Commitments data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true, features = [ "as_ref" ] }
+displaydoc      = { workspace = true }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-proto      = { workspace = true }
+ibc-primitives = { workspace = true }
+ics23          = { version = "0.11", default-features = false, features = [ "host-functions" ] }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[dev-dependencies]
+rstest = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "serde/std",
+  "subtle-encoding/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "ics23/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+  "ics23/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-proto/json-schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-proto/borsh",
+  "ibc-primitives/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/crates/ibc/src/core/ics23_commitment/commitment.rs b/ibc-core/ics23-commitment/types/src/commitment.rs
similarity index 68%
rename from crates/ibc/src/core/ics23_commitment/commitment.rs
rename to ibc-core/ics23-commitment/types/src/commitment.rs
index 98a4d5d9a..bc0707d9c 100644
--- a/crates/ibc/src/core/ics23_commitment/commitment.rs
+++ b/ibc-core/ics23-commitment/types/src/commitment.rs
@@ -1,13 +1,15 @@
 //! Defines core commitment types
 
-use crate::core::ics23_commitment::error::CommitmentError;
-use crate::prelude::*;
+use core::fmt;
 
-use core::{convert::TryFrom, fmt};
+use ibc_primitives::prelude::*;
+use ibc_primitives::ToVec;
 use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
+use ibc_proto::Protobuf;
 use subtle_encoding::{Encoding, Hex};
 
 use super::merkle::MerkleProof;
+use crate::error::CommitmentError;
 
 /// Encodes a commitment root; most often a Merkle tree root hash.
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -16,7 +18,7 @@ use super::merkle::MerkleProof;
 pub struct CommitmentRoot {
     #[cfg_attr(
         feature = "serde",
-        serde(serialize_with = "crate::serializers::ser_hex_upper")
+        serde(serialize_with = "crate::serializer::ser_hex_upper")
     )]
     bytes: Vec<u8>,
 }
@@ -61,13 +63,19 @@ impl From<Vec<u8>> for CommitmentRoot {
 ///
 /// For example, in the case of a proof of membership in a Merkle tree,
 /// this encodes a Merkle proof.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "serde", serde(transparent))]
-#[derive(Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, PartialEq, Eq, derive_more::AsRef, derive_more::Into)]
+#[as_ref(forward)]
 pub struct CommitmentProofBytes {
     #[cfg_attr(
         feature = "serde",
-        serde(serialize_with = "crate::serializers::ser_hex_upper")
+        serde(serialize_with = "crate::serializer::ser_hex_upper")
     )]
     bytes: Vec<u8>,
 }
@@ -93,20 +101,11 @@ impl TryFrom<Vec<u8>> for CommitmentProofBytes {
     }
 }
 
-impl From<CommitmentProofBytes> for Vec<u8> {
-    fn from(p: CommitmentProofBytes) -> Vec<u8> {
-        p.bytes
-    }
-}
-
 impl TryFrom<RawMerkleProof> for CommitmentProofBytes {
     type Error = CommitmentError;
 
     fn try_from(proof: RawMerkleProof) -> Result<Self, Self::Error> {
-        let mut buf = Vec::new();
-        prost::Message::encode(&proof, &mut buf)
-            .map_err(|e| Self::Error::EncodingFailure(e.to_string()))?;
-        buf.try_into()
+        proof.to_vec().try_into()
     }
 }
 
@@ -118,14 +117,12 @@ impl TryFrom<MerkleProof> for CommitmentProofBytes {
     }
 }
 
-impl TryFrom<CommitmentProofBytes> for RawMerkleProof {
+impl<'a> TryFrom<&'a CommitmentProofBytes> for MerkleProof {
     type Error = CommitmentError;
 
-    fn try_from(value: CommitmentProofBytes) -> Result<Self, Self::Error> {
-        let value: Vec<u8> = value.into();
-        let res: RawMerkleProof = prost::Message::decode(value.as_ref())
-            .map_err(CommitmentError::InvalidRawMerkleProof)?;
-        Ok(res)
+    fn try_from(value: &'a CommitmentProofBytes) -> Result<Self, Self::Error> {
+        Protobuf::<RawMerkleProof>::decode(value.as_ref())
+            .map_err(|e| CommitmentError::DecodingFailure(e.to_string()))
     }
 }
 
@@ -144,8 +141,9 @@ impl TryFrom<CommitmentProofBytes> for RawMerkleProof {
     feature = "borsh",
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize))]
-#[derive(Clone, PartialEq, Eq, Hash, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, PartialEq, Eq, Hash)]
 pub struct CommitmentPrefix {
     bytes: Vec<u8>,
 }
@@ -158,6 +156,10 @@ impl CommitmentPrefix {
     pub fn into_vec(self) -> Vec<u8> {
         self.bytes
     }
+
+    pub fn empty() -> Self {
+        Self { bytes: Vec::new() }
+    }
 }
 
 impl TryFrom<Vec<u8>> for CommitmentPrefix {
@@ -181,29 +183,3 @@ impl fmt::Debug for CommitmentPrefix {
         }
     }
 }
-
-#[cfg(feature = "serde")]
-impl serde::Serialize for CommitmentPrefix {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        format!("{self:?}").serialize(serializer)
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use super::CommitmentProofBytes;
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
-    use ibc_proto::ics23::CommitmentProof;
-
-    /// Returns a dummy `CommitmentProofBytes`, for testing only!
-    pub fn get_dummy_commitment_proof_bytes() -> CommitmentProofBytes {
-        let parsed = CommitmentProof { proof: None };
-        let mproofs: Vec<CommitmentProof> = vec![parsed];
-        let raw_mp = RawMerkleProof { proofs: mproofs };
-        raw_mp.try_into().unwrap()
-    }
-}
diff --git a/crates/ibc/src/core/ics23_commitment/error.rs b/ibc-core/ics23-commitment/types/src/error.rs
similarity index 57%
rename from crates/ibc/src/core/ics23_commitment/error.rs
rename to ibc-core/ics23-commitment/types/src/error.rs
index 5d70fac03..fdbdd24c7 100644
--- a/crates/ibc/src/core/ics23_commitment/error.rs
+++ b/ibc-core/ics23-commitment/types/src/error.rs
@@ -1,15 +1,10 @@
 //! Defines the commitment error type
 
-use alloc::string::String;
 use displaydoc::Display;
-use prost::DecodeError;
+use ibc_primitives::prelude::*;
 
 #[derive(Debug, Display)]
 pub enum CommitmentError {
-    /// invalid raw merkle proof error: `{0}`
-    InvalidRawMerkleProof(DecodeError),
-    /// failed to decode commitment proof error: `{0}`
-    CommitmentProofDecodingFailed(DecodeError),
     /// empty commitment prefix
     EmptyCommitmentPrefix,
     /// empty merkle proof
@@ -18,6 +13,10 @@ pub enum CommitmentError {
     EmptyMerkleRoot,
     /// empty verified value
     EmptyVerifiedValue,
+    /// empty proof specs
+    EmptyProofSpecs,
+    /// invalid depth range: [{0}, {1}]
+    InvalidDepthRange(i32, i32),
     /// mismatch between the number of proofs with that of specs
     NumberOfSpecsMismatch,
     /// mismatch between the number of proofs with that of keys
@@ -28,15 +27,17 @@ pub enum CommitmentError {
     VerificationFailure,
     /// encoded commitment prefix is not a valid hex string: `{0}`
     EncodingFailure(String),
+    /// decoding commitment proof bytes failed: `{0}`
+    DecodingFailure(String),
+    /// invalid prefix length range: `[{0}, {1}]`
+    InvalidPrefixLengthRange(i32, i32),
+    /// invalid child size: `{0}`
+    InvalidChildSize(i32),
+    /// invalid hash operation: `{0}`
+    InvalidHashOp(i32),
+    /// invalid length operation: `{0}`
+    InvalidLengthOp(i32),
 }
 
 #[cfg(feature = "std")]
-impl std::error::Error for CommitmentError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match &self {
-            Self::InvalidRawMerkleProof(e) => Some(e),
-            Self::CommitmentProofDecodingFailed(e) => Some(e),
-            _ => None,
-        }
-    }
-}
+impl std::error::Error for CommitmentError {}
diff --git a/ibc-core/ics23-commitment/types/src/lib.rs b/ibc-core/ics23-commitment/types/src/lib.rs
new file mode 100644
index 000000000..a4cb15890
--- /dev/null
+++ b/ibc-core/ics23-commitment/types/src/lib.rs
@@ -0,0 +1,31 @@
+//! ICS-23: Commitment implementation of a cryptographic scheme that verifies
+//! state transitions between chains.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod commitment;
+pub mod error;
+pub mod merkle;
+pub mod specs;
+
+#[cfg(feature = "serde")]
+pub mod serializer;
+
+/// Re-exports ICS-23 proto types from the `ibc-proto` crate, which are
+/// used in the implementation of dependent IBC crates.
+pub mod proto {
+    pub use ibc_proto::ibc::core::commitment::*;
+    pub use ibc_proto::ics23;
+}
diff --git a/crates/ibc/src/core/ics23_commitment/merkle.rs b/ibc-core/ics23-commitment/types/src/merkle.rs
similarity index 65%
rename from crates/ibc/src/core/ics23_commitment/merkle.rs
rename to ibc-core/ics23-commitment/types/src/merkle.rs
index 81f679851..cb36590ca 100644
--- a/crates/ibc/src/core/ics23_commitment/merkle.rs
+++ b/ibc-core/ics23-commitment/types/src/merkle.rs
@@ -1,19 +1,17 @@
 //! Merkle proof utilities
 
-use crate::prelude::*;
-
-use ibc_proto::ibc::core::commitment::v1::MerklePath;
-use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
-use ibc_proto::ibc::core::commitment::v1::MerkleRoot;
+use ibc_primitives::prelude::*;
+use ibc_primitives::proto::Protobuf;
+use ibc_proto::ibc::core::commitment::v1::{MerklePath, MerkleProof as RawMerkleProof, MerkleRoot};
 use ibc_proto::ics23::commitment_proof::Proof;
 use ibc_proto::ics23::{
     calculate_existence_root, verify_membership, verify_non_membership, CommitmentProof,
-    NonExistenceProof,
+    HostFunctionsProvider, NonExistenceProof,
 };
 
-use crate::core::ics23_commitment::commitment::{CommitmentPrefix, CommitmentRoot};
-use crate::core::ics23_commitment::error::CommitmentError;
-use crate::core::ics23_commitment::specs::ProofSpecs;
+use crate::commitment::{CommitmentPrefix, CommitmentRoot};
+use crate::error::CommitmentError;
+use crate::specs::ProofSpecs;
 
 pub fn apply_prefix(prefix: &CommitmentPrefix, mut path: Vec<String>) -> MerklePath {
     let mut key_path: Vec<String> = vec![format!("{prefix:?}")];
@@ -34,14 +32,15 @@ pub struct MerkleProof {
     pub proofs: Vec<CommitmentProof>,
 }
 
-/// Convert to ics23::CommitmentProof
-/// The encoding and decoding shouldn't fail since ics23::CommitmentProof and ibc_proto::ics23::CommitmentProof should be the same
-/// Ref. <https://github.com/informalsystems/ibc-rs/issues/853>
-impl From<RawMerkleProof> for MerkleProof {
-    fn from(proof: RawMerkleProof) -> Self {
-        Self {
+impl Protobuf<RawMerkleProof> for MerkleProof {}
+
+impl TryFrom<RawMerkleProof> for MerkleProof {
+    type Error = CommitmentError;
+
+    fn try_from(proof: RawMerkleProof) -> Result<Self, Self::Error> {
+        Ok(Self {
             proofs: proof.proofs,
-        }
+        })
     }
 }
 
@@ -54,13 +53,13 @@ impl From<MerkleProof> for RawMerkleProof {
 }
 
 impl MerkleProof {
-    pub fn verify_membership(
+    pub fn verify_membership<H: HostFunctionsProvider>(
         &self,
         specs: &ProofSpecs,
         root: MerkleRoot,
         keys: MerklePath,
         value: Vec<u8>,
-        start_index: usize,
+        start_index: u64,
     ) -> Result<(), CommitmentError> {
         // validate arguments
         if self.proofs.is_empty() {
@@ -89,24 +88,21 @@ impl MerkleProof {
             .iter()
             .zip(ics23_specs.iter())
             .zip(keys.key_path.iter().rev())
-            .skip(start_index)
+            .skip(
+                start_index
+                    .try_into()
+                    .expect("safe because if u64 is more than usize it will skip all anyway"),
+            )
         {
             match &proof.proof {
                 Some(Proof::Exist(existence_proof)) => {
-                    subroot =
-                        calculate_existence_root::<ics23::HostFunctionsManager>(existence_proof)
-                            .map_err(|_| CommitmentError::InvalidMerkleProof)?;
-
-                    if !verify_membership::<ics23::HostFunctionsManager>(
-                        proof,
-                        spec,
-                        &subroot,
-                        key.as_bytes(),
-                        &value,
-                    ) {
+                    subroot = calculate_existence_root::<H>(existence_proof)
+                        .map_err(|_| CommitmentError::InvalidMerkleProof)?;
+
+                    if !verify_membership::<H>(proof, spec, &subroot, key.as_bytes(), &value) {
                         return Err(CommitmentError::VerificationFailure);
                     }
-                    value = subroot.clone();
+                    value.clone_from(&subroot);
                 }
                 _ => return Err(CommitmentError::InvalidMerkleProof),
             }
@@ -119,7 +115,7 @@ impl MerkleProof {
         Ok(())
     }
 
-    pub fn verify_non_membership(
+    pub fn verify_non_membership<H: HostFunctionsProvider>(
         &self,
         specs: &ProofSpecs,
         root: MerkleRoot,
@@ -144,10 +140,10 @@ impl MerkleProof {
         // verify the absence of key in lowest subtree
         let proof = self
             .proofs
-            .get(0)
+            .first()
             .ok_or(CommitmentError::InvalidMerkleProof)?;
         let spec = ics23_specs
-            .get(0)
+            .first()
             .ok_or(CommitmentError::InvalidMerkleProof)?;
         // keys are represented from root-to-leaf
         let key = keys
@@ -156,19 +152,14 @@ impl MerkleProof {
             .ok_or(CommitmentError::InvalidMerkleProof)?;
         match &proof.proof {
             Some(Proof::Nonexist(non_existence_proof)) => {
-                let subroot = calculate_non_existence_root(non_existence_proof)?;
-
-                if !verify_non_membership::<ics23::HostFunctionsManager>(
-                    proof,
-                    spec,
-                    &subroot,
-                    key.as_bytes(),
-                ) {
+                let subroot = calculate_non_existence_root::<H>(non_existence_proof)?;
+
+                if !verify_non_membership::<H>(proof, spec, &subroot, key.as_bytes()) {
                     return Err(CommitmentError::VerificationFailure);
                 }
 
                 // verify membership proofs starting from index 1 with value = subroot
-                self.verify_membership(specs, root, keys, subroot, 1)
+                self.verify_membership::<H>(specs, root, keys, subroot, 1)
             }
             _ => Err(CommitmentError::InvalidMerkleProof),
         }
@@ -176,13 +167,13 @@ impl MerkleProof {
 }
 
 // TODO move to ics23
-fn calculate_non_existence_root(proof: &NonExistenceProof) -> Result<Vec<u8>, CommitmentError> {
+fn calculate_non_existence_root<H: HostFunctionsProvider>(
+    proof: &NonExistenceProof,
+) -> Result<Vec<u8>, CommitmentError> {
     if let Some(left) = &proof.left {
-        calculate_existence_root::<ics23::HostFunctionsManager>(left)
-            .map_err(|_| CommitmentError::InvalidMerkleProof)
+        calculate_existence_root::<H>(left).map_err(|_| CommitmentError::InvalidMerkleProof)
     } else if let Some(right) = &proof.right {
-        calculate_existence_root::<ics23::HostFunctionsManager>(right)
-            .map_err(|_| CommitmentError::InvalidMerkleProof)
+        calculate_existence_root::<H>(right).map_err(|_| CommitmentError::InvalidMerkleProof)
     } else {
         Err(CommitmentError::InvalidMerkleProof)
     }
diff --git a/ibc-core/ics23-commitment/types/src/serializer.rs b/ibc-core/ics23-commitment/types/src/serializer.rs
new file mode 100644
index 000000000..b3950b218
--- /dev/null
+++ b/ibc-core/ics23-commitment/types/src/serializer.rs
@@ -0,0 +1,14 @@
+use ibc_primitives::prelude::*;
+use serde::ser::{Serialize, Serializer};
+use subtle_encoding::{Encoding, Hex};
+
+pub fn ser_hex_upper<S, T>(data: T, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+    T: AsRef<[u8]>,
+{
+    let hex = Hex::upper_case()
+        .encode_to_string(data)
+        .map_err(|e| serde::ser::Error::custom(format!("failed to serialize hex: {}", e)))?;
+    hex.serialize(serializer)
+}
diff --git a/ibc-core/ics23-commitment/types/src/specs.rs b/ibc-core/ics23-commitment/types/src/specs.rs
new file mode 100644
index 000000000..46bf79a95
--- /dev/null
+++ b/ibc-core/ics23-commitment/types/src/specs.rs
@@ -0,0 +1,284 @@
+//! Defines proof specs, which encode the structure of proofs
+
+use ibc_primitives::prelude::*;
+use ibc_proto::ics23::{InnerSpec as RawInnerSpec, LeafOp as RawLeafOp, ProofSpec as RawProofSpec};
+use ics23::{HashOp, LengthOp};
+
+use crate::error::CommitmentError;
+/// An array of proof specifications.
+///
+/// This type encapsulates different types of proof specifications, mostly predefined, e.g., for
+/// Cosmos-SDK.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+pub struct ProofSpecs(Vec<ProofSpec>);
+
+impl ProofSpecs {
+    /// Returns the specification for Cosmos-SDK proofs
+    pub fn cosmos() -> Self {
+        vec![
+            ics23::iavl_spec(),       // Format of proofs-iavl (iavl merkle proofs)
+            ics23::tendermint_spec(), // Format of proofs-tendermint (crypto/ merkle SimpleProof)
+        ]
+        .try_into()
+        .expect("should convert successfully")
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn validate(&self) -> Result<(), CommitmentError> {
+        if self.is_empty() {
+            return Err(CommitmentError::EmptyProofSpecs);
+        }
+        for proof_spec in &self.0 {
+            // A non-positive `min_depth` or `max_depth` indicates no limit on the respective bound.
+            // For simplicity, negative values for `min_depth` and `max_depth` are not allowed
+            // and only `0` is used to indicate no limit. When `min_depth` and `max_depth` are both positive,
+            // `max_depth` must be greater than or equal to `min_depth` to ensure a valid range.
+            if proof_spec.0.max_depth < 0
+                || proof_spec.0.min_depth < 0
+                || (0 < proof_spec.0.min_depth
+                    && 0 < proof_spec.0.max_depth
+                    && proof_spec.0.max_depth < proof_spec.0.min_depth)
+            {
+                return Err(CommitmentError::InvalidDepthRange(
+                    proof_spec.0.min_depth,
+                    proof_spec.0.max_depth,
+                ));
+            }
+        }
+        Ok(())
+    }
+}
+
+impl TryFrom<Vec<RawProofSpec>> for ProofSpecs {
+    type Error = CommitmentError;
+    fn try_from(ics23_specs: Vec<RawProofSpec>) -> Result<Self, CommitmentError> {
+        // no proof specs provided
+        if ics23_specs.is_empty() {
+            return Err(CommitmentError::EmptyProofSpecs);
+        }
+
+        ics23_specs
+            .into_iter()
+            .map(ProofSpec::try_from)
+            .collect::<Result<_, _>>()
+            .map(Self)
+    }
+}
+
+impl From<ProofSpecs> for Vec<RawProofSpec> {
+    fn from(specs: ProofSpecs) -> Self {
+        specs.0.into_iter().map(Into::into).collect()
+    }
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+struct ProofSpec(RawProofSpec);
+
+impl TryFrom<RawProofSpec> for ProofSpec {
+    type Error = CommitmentError;
+    fn try_from(spec: RawProofSpec) -> Result<Self, CommitmentError> {
+        // A non-positive `min_depth` or `max_depth` indicates no limit on the respective bound.
+        // For simplicity, negative values for `min_depth` and `max_depth` are not allowed
+        // and only `0` is used to indicate no limit. When `min_depth` and `max_depth` are both positive,
+        // `max_depth` must be greater than or equal to `min_depth` to ensure a valid range.
+        if spec.max_depth < 0
+            || spec.min_depth < 0
+            || (0 < spec.min_depth && 0 < spec.max_depth && spec.max_depth < spec.min_depth)
+        {
+            return Err(CommitmentError::InvalidDepthRange(
+                spec.min_depth,
+                spec.max_depth,
+            ));
+        }
+
+        let leaf_spec = spec
+            .leaf_spec
+            .map(LeafOp::try_from)
+            .transpose()?
+            .map(|lop| lop.0);
+        let inner_spec = spec
+            .inner_spec
+            .map(InnerSpec::try_from)
+            .transpose()?
+            .map(|ispec| ispec.0);
+
+        Ok(Self(RawProofSpec {
+            leaf_spec,
+            inner_spec,
+            max_depth: spec.max_depth,
+            min_depth: spec.min_depth,
+            prehash_key_before_comparison: spec.prehash_key_before_comparison,
+        }))
+    }
+}
+
+impl From<ProofSpec> for RawProofSpec {
+    fn from(spec: ProofSpec) -> Self {
+        spec.0
+    }
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+struct LeafOp(RawLeafOp);
+
+impl TryFrom<RawLeafOp> for LeafOp {
+    type Error = CommitmentError;
+    fn try_from(leaf_op: RawLeafOp) -> Result<Self, Self::Error> {
+        let _ = HashOp::try_from(leaf_op.hash)
+            .map_err(|_| CommitmentError::InvalidHashOp(leaf_op.hash))?;
+        let _ = HashOp::try_from(leaf_op.prehash_key)
+            .map_err(|_| CommitmentError::InvalidHashOp(leaf_op.prehash_key))?;
+        let _ = HashOp::try_from(leaf_op.prehash_value)
+            .map_err(|_| CommitmentError::InvalidHashOp(leaf_op.prehash_value))?;
+        let _ = LengthOp::try_from(leaf_op.length)
+            .map_err(|_| CommitmentError::InvalidLengthOp(leaf_op.length))?;
+
+        Ok(Self(leaf_op))
+    }
+}
+
+impl From<LeafOp> for RawLeafOp {
+    fn from(leaf_op: LeafOp) -> Self {
+        leaf_op.0
+    }
+}
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq)]
+struct InnerSpec(RawInnerSpec);
+
+impl TryFrom<RawInnerSpec> for InnerSpec {
+    type Error = CommitmentError;
+    fn try_from(inner_spec: RawInnerSpec) -> Result<Self, CommitmentError> {
+        if inner_spec.child_size <= 0 {
+            return Err(CommitmentError::InvalidChildSize(inner_spec.child_size));
+        }
+
+        // Negative prefix lengths are not allowed and the maximum prefix length must
+        // be greater than or equal to the minimum prefix length.
+        if inner_spec.min_prefix_length < 0
+            || inner_spec.max_prefix_length < 0
+            || inner_spec.max_prefix_length < inner_spec.min_prefix_length
+        {
+            return Err(CommitmentError::InvalidPrefixLengthRange(
+                inner_spec.min_prefix_length,
+                inner_spec.max_prefix_length,
+            ));
+        }
+
+        Ok(Self(RawInnerSpec {
+            child_order: inner_spec.child_order,
+            child_size: inner_spec.child_size,
+            min_prefix_length: inner_spec.min_prefix_length,
+            max_prefix_length: inner_spec.max_prefix_length,
+            empty_child: inner_spec.empty_child,
+            hash: inner_spec.hash,
+        }))
+    }
+}
+
+impl From<InnerSpec> for RawInnerSpec {
+    fn from(inner_spec: InnerSpec) -> Self {
+        inner_spec.0
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc_proto::ics23::{InnerSpec as RawInnerSpec, ProofSpec as RawProofSpec};
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case(0, 0)]
+    #[case(2, 2)]
+    #[case(5, 6)]
+    #[should_panic(expected = "InvalidDepthRange")]
+    #[case(-3,3)]
+    #[should_panic(expected = "InvalidDepthRange")]
+    #[case(2,-6)]
+    #[should_panic(expected = "InvalidDepthRange")]
+    #[case(-2,-6)]
+    #[should_panic(expected = "InvalidDepthRange")]
+    #[case(-6,-2)]
+    #[should_panic(expected = "InvalidDepthRange")]
+    #[case(5, 3)]
+    fn test_proof_specs_try_from(#[case] min_depth: i32, #[case] max_depth: i32) {
+        let raw_proof_spec = RawProofSpec {
+            leaf_spec: None,
+            inner_spec: None,
+            max_depth,
+            min_depth,
+            prehash_key_before_comparison: false,
+        };
+        ProofSpec::try_from(raw_proof_spec).unwrap();
+    }
+
+    #[rstest]
+    #[case(0, 0)]
+    #[case(1, 2)]
+    #[case(2, 2)]
+    #[should_panic(expected = "InvalidPrefixLengthRange")]
+    #[case(2, 1)]
+    #[should_panic(expected = "InvalidPrefixLengthRange")]
+    #[case(-2,1)]
+    #[should_panic(expected = "InvalidPrefixLengthRange")]
+    #[case(2,-1)]
+    #[should_panic(expected = "InvalidPrefixLengthRange")]
+    #[case(-2,-1)]
+    #[should_panic(expected = "InvalidPrefixLengthRange")]
+    #[case(-1,-2)]
+    fn test_inner_specs_try_from(#[case] min_prefix_length: i32, #[case] max_prefix_length: i32) {
+        let raw_inner_spec = RawInnerSpec {
+            child_order: vec![1],
+            child_size: 2,
+            min_prefix_length,
+            max_prefix_length,
+            empty_child: vec![],
+            hash: 1,
+        };
+        InnerSpec::try_from(raw_inner_spec).unwrap();
+    }
+
+    #[rstest]
+    #[case(0, 0, 0, 0)]
+    #[case(9, 9, 9, 8)]
+    #[should_panic(expected = "InvalidHashOp")]
+    #[case(-1, 4, 4, 4)]
+    #[should_panic(expected = "InvalidHashOp")]
+    #[case(10, 4, 4, 4)]
+    #[should_panic(expected = "InvalidHashOp")]
+    #[case(4, -1, 4, 4)]
+    #[should_panic(expected = "InvalidHashOp")]
+    #[case(4, 10, 4, 4)]
+    #[should_panic(expected = "InvalidHashOp")]
+    #[case(4, 4, -1, 4)]
+    #[should_panic(expected = "InvalidHashOp")]
+    #[case(4, 4, 10, 4)]
+    #[should_panic(expected = "InvalidLengthOp")]
+    #[case(4, 4, 4, -1)]
+    #[should_panic(expected = "InvalidLengthOp")]
+    #[case(4, 4, 4, 9)]
+    fn test_leaf_op_try_from(
+        #[case] hash: i32,
+        #[case] prehash_key: i32,
+        #[case] prehash_value: i32,
+        #[case] length: i32,
+    ) {
+        let raw_leaf_op = RawLeafOp {
+            hash,
+            prehash_key,
+            prehash_value,
+            length,
+            prefix: vec![],
+        };
+        LeafOp::try_from(raw_leaf_op).unwrap();
+    }
+}
diff --git a/ibc-core/ics24-host/Cargo.toml b/ibc-core/ics24-host/Cargo.toml
new file mode 100644
index 000000000..c97fb7324
--- /dev/null
+++ b/ibc-core/ics24-host/Cargo.toml
@@ -0,0 +1,94 @@
+[package]
+name         = "ibc-core-host"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "host" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains essential top-level traits designed for the seamless integration
+    of host chains, facilitating access to the host's storage, the efficient retrieval of states and
+    metadata crucial for the execution of any IBC datagrams.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-client-types     = { workspace = true }
+ibc-core-client-context   = { workspace = true }
+ibc-core-connection-types = { workspace = true }
+ibc-core-channel-types    = { workspace = true }
+ibc-core-commitment-types = { workspace = true }
+ibc-core-host-types       = { workspace = true }
+ibc-core-handler-types    = { workspace = true }
+ibc-primitives            = { workspace = true }
+
+[dev-dependencies]
+rstest = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "subtle-encoding/std",
+  "ibc-core-client-types/std",
+  "ibc-core-client-context/std",
+  "ibc-core-connection-types/std",
+  "ibc-core-channel-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-handler-types/std",
+  "ibc-primitives/std",
+]
+serde = [
+  "ibc-core-client-types/serde",
+  "ibc-core-client-context/serde",
+  "ibc-core-connection-types/serde",
+  "ibc-core-channel-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-core-handler-types/serde",
+  "ibc-primitives/serde",
+]
+schema = [
+  "ibc-core-client-types/schema",
+  "ibc-core-client-context/schema",
+  "ibc-core-connection-types/schema",
+  "ibc-core-channel-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "ibc-core-client-types/borsh",
+  "ibc-core-client-context/borsh",
+  "ibc-core-connection-types/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 = [
+  "ibc-core-client-types/parity-scale-codec",
+  "ibc-core-connection-types/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",
+]
diff --git a/ibc-core/ics24-host/cosmos/Cargo.toml b/ibc-core/ics24-host/cosmos/Cargo.toml
new file mode 100644
index 000000000..50e06f273
--- /dev/null
+++ b/ibc-core/ics24-host/cosmos/Cargo.toml
@@ -0,0 +1,112 @@
+[package]
+name         = "ibc-core-host-cosmos"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "tendermint" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains Cosmos-specific helper traits and implementations
+    to facilitate IBC integration, ensuring proper interaction with modules/components
+    beyond the IBC modules on host chains.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+serde           = { workspace = true, optional = true }
+sha2            = { workspace = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-client-tendermint     = { workspace = true }
+ibc-app-transfer-types    = { workspace = true }
+ibc-core-client-types     = { workspace = true }
+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-handler-types    = { workspace = true }
+ibc-primitives            = { workspace = true }
+ibc-proto                 = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "serde/std",
+  "sha2/std",
+  "subtle-encoding/std",
+  "ibc-core-client-types/std",
+  "ibc-core-client-context/std",
+  "ibc-core-connection-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-handler-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-client-tendermint/serde",
+  "ibc-core-client-types/serde",
+  "ibc-core-client-context/serde",
+  "ibc-core-connection-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-core-handler-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "ibc-client-tendermint/schema",
+  "ibc-core-client-types/schema",
+  "ibc-core-client-context/schema",
+  "ibc-core-connection-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-client-tendermint/borsh",
+  "ibc-core-client-types/borsh",
+  "ibc-core-client-context/borsh",
+  "ibc-core-connection-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-client-tendermint/parity-scale-codec",
+  "ibc-core-client-types/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-handler-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-core/ics24-host/cosmos/src/lib.rs b/ibc-core/ics24-host/cosmos/src/lib.rs
new file mode 100644
index 000000000..7225534a9
--- /dev/null
+++ b/ibc-core/ics24-host/cosmos/src/lib.rs
@@ -0,0 +1,30 @@
+//! Provides convenience traits and implementations for Tendermint-based hosts
+#![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 upgrade_proposal;
+
+pub mod utils;
+
+mod validate_self_client;
+pub use validate_self_client::ValidateSelfClientContext;
+
+/// Re-exports necessary proto types for implementing the tendermint client
+/// upgradeability feature.
+pub mod proto {
+    pub use ibc_proto::cosmos::upgrade::*;
+}
+
+/// ABCI store/query path for the IBC sub-store
+pub const IBC_QUERY_PATH: &str = "store/ibc/key";
+
+/// ABCI store/query path for the upgrade sub-store
+pub const SDK_UPGRADE_QUERY_PATH: &str = "store/upgrade/key";
diff --git a/crates/ibc/src/hosts/tendermint/upgrade_proposal/context.rs b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/context.rs
similarity index 71%
rename from crates/ibc/src/hosts/tendermint/upgrade_proposal/context.rs
rename to ibc-core/ics24-host/cosmos/src/upgrade_proposal/context.rs
index bb6e014b0..056bd4e46 100644
--- a/crates/ibc/src/hosts/tendermint/upgrade_proposal/context.rs
+++ b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/context.rs
@@ -5,35 +5,37 @@
 //! [Basecoin-rs](https://github.com/informalsystems/basecoin-rs) repository.
 //! If it proves to be generic enough, we may move it to the ICS02 section.
 
+use ibc_core_client_context::ClientValidationContext;
+use ibc_core_client_types::error::UpgradeClientError;
+use ibc_core_host_types::path::UpgradeClientPath;
+
 use super::Plan;
-use crate::core::ics02_client::client_state::ClientState;
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics02_client::error::UpgradeClientError;
-use crate::core::ics02_client::ClientExecutionContext;
-use crate::core::ics24_host::path::UpgradeClientPath;
+
+pub type UpgradedClientStateRef<T> =
+    <<T as UpgradeValidationContext>::V as ClientValidationContext>::ClientStateRef;
+
+pub type UpgradedConsensusStateRef<T> =
+    <<T as UpgradeValidationContext>::V as ClientValidationContext>::ConsensusStateRef;
 
 /// Helper context to validate client upgrades, providing methods to retrieve
 /// an upgrade plan and related upgraded client and consensus states.
 pub trait UpgradeValidationContext {
-    type ClientValidationContext;
-    type E: ClientExecutionContext;
-    type AnyConsensusState: ConsensusState;
-    type AnyClientState: ClientState<Self::ClientValidationContext, Self::E>;
+    type V: ClientValidationContext;
 
-    /// Returns the upgrade plan that is scheduled and not have been executed yet.
+    /// Returns the upgrade plan that is scheduled and has not been executed yet.
     fn upgrade_plan(&self) -> Result<Plan, UpgradeClientError>;
 
     /// Returns the upgraded client state at the specified upgrade path.
     fn upgraded_client_state(
         &self,
         upgrade_path: &UpgradeClientPath,
-    ) -> Result<Self::AnyClientState, UpgradeClientError>;
+    ) -> Result<UpgradedClientStateRef<Self>, UpgradeClientError>;
 
     /// Returns the upgraded consensus state at the specified upgrade path.
     fn upgraded_consensus_state(
         &self,
         upgrade_path: &UpgradeClientPath,
-    ) -> Result<Self::AnyConsensusState, UpgradeClientError>;
+    ) -> Result<UpgradedConsensusStateRef<Self>, UpgradeClientError>;
 }
 
 /// Helper context to execute client upgrades, providing methods to schedule
@@ -49,13 +51,13 @@ pub trait UpgradeExecutionContext: UpgradeValidationContext {
     fn store_upgraded_client_state(
         &mut self,
         upgrade_path: UpgradeClientPath,
-        client_state: Self::AnyClientState,
+        client_state: UpgradedClientStateRef<Self>,
     ) -> Result<(), UpgradeClientError>;
 
     /// Stores the upgraded consensus state at the specified upgrade path.
     fn store_upgraded_consensus_state(
         &mut self,
         upgrade_path: UpgradeClientPath,
-        consensus_state: Self::AnyConsensusState,
+        consensus_state: UpgradedConsensusStateRef<Self>,
     ) -> Result<(), UpgradeClientError>;
 }
diff --git a/crates/ibc/src/hosts/tendermint/upgrade_proposal/events.rs b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/events.rs
similarity index 98%
rename from crates/ibc/src/hosts/tendermint/upgrade_proposal/events.rs
rename to ibc-core/ics24-host/cosmos/src/upgrade_proposal/events.rs
index 2a2a835be..b4e3550c9 100644
--- a/crates/ibc/src/hosts/tendermint/upgrade_proposal/events.rs
+++ b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/events.rs
@@ -1,9 +1,7 @@
 //! Definitions of events emitted when an upgrade client is proposed or executed.
 
-use alloc::borrow::ToOwned;
-use alloc::string::{String, ToString};
-use alloc::vec;
 use derive_more::From;
+use ibc_primitives::prelude::*;
 use tendermint::abci;
 
 const UPGRADE_CHAIN_EVENT: &str = "upgrade_chain";
diff --git a/crates/ibc/src/hosts/tendermint/upgrade_proposal/handler.rs b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/handler.rs
similarity index 53%
rename from crates/ibc/src/hosts/tendermint/upgrade_proposal/handler.rs
rename to ibc-core/ics24-host/cosmos/src/upgrade_proposal/handler.rs
index 9b6026f5c..8c7ee72cf 100644
--- a/crates/ibc/src/hosts/tendermint/upgrade_proposal/handler.rs
+++ b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/handler.rs
@@ -1,28 +1,24 @@
-use core::convert::Infallible;
-
-use alloc::string::ToString;
+use ibc_client_tendermint::types::ClientState as TmClientState;
+use ibc_core_client_types::error::UpgradeClientError;
+use ibc_core_host_types::path::UpgradeClientPath;
+use ibc_primitives::prelude::*;
 use tendermint::abci::Event as TmEvent;
-use tendermint_proto::abci::Event as ProtoEvent;
 
-use crate::clients::ics07_tendermint::client_state::ClientState as TmClientState;
-use crate::core::ics02_client::error::UpgradeClientError;
-use crate::core::ics24_host::path::UpgradeClientPath;
-use crate::hosts::tendermint::upgrade_proposal::UpgradeClientProposal;
-use crate::hosts::tendermint::upgrade_proposal::UpgradeExecutionContext;
-use crate::hosts::tendermint::upgrade_proposal::UpgradeProposal;
+use super::UpgradedClientStateRef;
+use crate::upgrade_proposal::{UpgradeClientProposal, UpgradeExecutionContext, UpgradeProposal};
 
-/// Handles an upgrade client proposal
+/// Executes an upgrade client proposal.
 ///
 /// It clears both IBC client and consensus states if a previous plan was set.
 /// Then it will schedule an upgrade and finally set the upgraded client state
-/// in upgrade store.
-pub fn upgrade_client_proposal_handler<Ctx>(
+/// in the upgrade store.
+pub fn execute_upgrade_client_proposal<Ctx>(
     ctx: &mut Ctx,
     proposal: UpgradeProposal,
-) -> Result<ProtoEvent, UpgradeClientError>
+) -> Result<TmEvent, UpgradeClientError>
 where
     Ctx: UpgradeExecutionContext,
-    Ctx::AnyClientState: From<TmClientState>,
+    UpgradedClientStateRef<Ctx>: From<TmClientState>,
 {
     let plan = proposal.plan;
 
@@ -45,11 +41,7 @@ where
 
     ctx.store_upgraded_client_state(upgraded_client_state_path, client_state.into())?;
 
-    let event = TmEvent::from(UpgradeClientProposal::new(proposal.title, plan.height))
-        .try_into()
-        .map_err(|e: Infallible| UpgradeClientError::Other {
-            reason: e.to_string(),
-        })?;
+    let event = TmEvent::from(UpgradeClientProposal::new(proposal.title, plan.height));
 
     Ok(event)
 }
diff --git a/crates/ibc/src/hosts/tendermint/upgrade_proposal/mod.rs b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/mod.rs
similarity index 54%
rename from crates/ibc/src/hosts/tendermint/upgrade_proposal/mod.rs
rename to ibc-core/ics24-host/cosmos/src/upgrade_proposal/mod.rs
index cd1500402..dbeb53074 100644
--- a/crates/ibc/src/hosts/tendermint/upgrade_proposal/mod.rs
+++ b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/mod.rs
@@ -6,8 +6,8 @@ mod handler;
 mod plan;
 mod proposal;
 
-pub use context::{UpgradeExecutionContext, UpgradeValidationContext};
+pub use context::*;
 pub use events::{UpgradeChain, UpgradeClientProposal};
-pub use handler::upgrade_client_proposal_handler;
+pub use handler::execute_upgrade_client_proposal;
 pub use plan::Plan;
-pub use proposal::UpgradeProposal;
+pub use proposal::*;
diff --git a/crates/ibc/src/hosts/tendermint/upgrade_proposal/plan.rs b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/plan.rs
similarity index 91%
rename from crates/ibc/src/hosts/tendermint/upgrade_proposal/plan.rs
rename to ibc-core/ics24-host/cosmos/src/upgrade_proposal/plan.rs
index 1a1308f97..d1a25adcc 100644
--- a/crates/ibc/src/hosts/tendermint/upgrade_proposal/plan.rs
+++ b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/plan.rs
@@ -1,14 +1,12 @@
 //! Definition of domain `Plan` type.
 
-use alloc::format;
-use alloc::string::{String, ToString};
+use ibc_core_client_types::error::UpgradeClientError;
+use ibc_primitives::prelude::*;
 use ibc_proto::cosmos::upgrade::v1beta1::Plan as RawPlan;
 use ibc_proto::google::protobuf::Any;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
-use crate::core::ics02_client::error::UpgradeClientError;
-
-pub(crate) const TYPE_URL: &str = "/cosmos.upgrade.v1beta1.Plan";
+pub const TYPE_URL: &str = "/cosmos.upgrade.v1beta1.Plan";
 
 /// Specifies information about a planned upgrade and at which height it should
 /// be performed.
@@ -107,7 +105,7 @@ impl From<Plan> for Any {
     fn from(value: Plan) -> Self {
         Any {
             type_url: TYPE_URL.to_string(),
-            value: Protobuf::<RawPlan>::encode_vec(&value),
+            value: Protobuf::<RawPlan>::encode_vec(value),
         }
     }
 }
diff --git a/crates/ibc/src/hosts/tendermint/upgrade_proposal/proposal.rs b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/proposal.rs
similarity index 85%
rename from crates/ibc/src/hosts/tendermint/upgrade_proposal/proposal.rs
rename to ibc-core/ics24-host/cosmos/src/upgrade_proposal/proposal.rs
index 4ef667b1c..a12f4fab4 100644
--- a/crates/ibc/src/hosts/tendermint/upgrade_proposal/proposal.rs
+++ b/ibc-core/ics24-host/cosmos/src/upgrade_proposal/proposal.rs
@@ -1,12 +1,14 @@
 //! Definition of domain `UpgradeProposal` type for handling upgrade client proposal
 
-use alloc::string::{String, ToString};
+use ibc_core_client_types::error::UpgradeClientError;
+use ibc_primitives::prelude::*;
 use ibc_proto::google::protobuf::Any;
 use ibc_proto::ibc::core::client::v1::UpgradeProposal as RawUpgradeProposal;
-use ibc_proto::protobuf::Protobuf;
+use ibc_proto::Protobuf;
 
 use super::Plan;
-use crate::core::ics02_client::error::UpgradeClientError;
+
+pub const UPGRADE_PROPOSAL_TYPE_URL: &str = "/ibc.core.client.v1.UpgradeProposal";
 
 /// Defines a governance proposal of type `Content` that enables the initiation
 /// of an IBC breaking upgrade and specifies the new client state that should be
@@ -49,13 +51,11 @@ impl TryFrom<RawUpgradeProposal> for UpgradeProposal {
             });
         };
 
-        let upgraded_client_state = if let Some(upgraded_client_state) = raw.upgraded_client_state {
-            upgraded_client_state
-        } else {
-            return Err(UpgradeClientError::InvalidUpgradeProposal {
+        let upgraded_client_state = raw.upgraded_client_state.ok_or_else(|| {
+            UpgradeClientError::InvalidUpgradeProposal {
                 reason: "upgraded client state cannot be empty".to_string(),
-            });
-        };
+            }
+        })?;
 
         Ok(Self {
             title: raw.title,
diff --git a/ibc-core/ics24-host/cosmos/src/utils.rs b/ibc-core/ics24-host/cosmos/src/utils.rs
new file mode 100644
index 000000000..613a48f36
--- /dev/null
+++ b/ibc-core/ics24-host/cosmos/src/utils.rs
@@ -0,0 +1,57 @@
+use ibc_app_transfer_types::VERSION;
+use ibc_core_host_types::identifiers::{ChannelId, PortId};
+use ibc_primitives::prelude::*;
+use sha2::{Digest, Sha256};
+
+/// Helper function to generate an escrow address for a given port and channel
+/// ids according to the format specified in the Cosmos SDK
+/// [`ADR-028`](https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-028-public-key-addresses.md)
+pub fn cosmos_adr028_escrow_address(port_id: &PortId, channel_id: &ChannelId) -> Vec<u8> {
+    let contents = format!("{port_id}/{channel_id}");
+
+    let mut hasher = Sha256::new();
+    hasher.update(VERSION.as_bytes());
+    hasher.update([0]);
+    hasher.update(contents.as_bytes());
+
+    let mut hash = hasher.finalize().to_vec();
+    hash.truncate(20);
+    hash
+}
+
+#[cfg(test)]
+mod tests {
+    use subtle_encoding::bech32;
+
+    use super::*;
+
+    #[test]
+    fn test_cosmos_escrow_address() {
+        fn assert_eq_escrow_address(port_id: &str, channel_id: &str, address: &str) {
+            let port_id = port_id.parse().unwrap();
+            let channel_id = channel_id.parse().unwrap();
+            let gen_address = {
+                let addr = cosmos_adr028_escrow_address(&port_id, &channel_id);
+                bech32::encode("cosmos", addr)
+            };
+            assert_eq!(gen_address, address.to_owned())
+        }
+
+        // addresses obtained using `gaiad query ibc-transfer escrow-address [port-id] [channel-id]`
+        assert_eq_escrow_address(
+            "transfer",
+            "channel-141",
+            "cosmos1x54ltnyg88k0ejmk8ytwrhd3ltm84xehrnlslf",
+        );
+        assert_eq_escrow_address(
+            "transfer",
+            "channel-207",
+            "cosmos1ju6tlfclulxumtt2kglvnxduj5d93a64r5czge",
+        );
+        assert_eq_escrow_address(
+            "transfer",
+            "channel-187",
+            "cosmos177x69sver58mcfs74x6dg0tv6ls4s3xmmcaw53",
+        );
+    }
+}
diff --git a/ibc-core/ics24-host/cosmos/src/validate_self_client.rs b/ibc-core/ics24-host/cosmos/src/validate_self_client.rs
new file mode 100644
index 000000000..7064fdcd8
--- /dev/null
+++ b/ibc-core/ics24-host/cosmos/src/validate_self_client.rs
@@ -0,0 +1,149 @@
+use core::time::Duration;
+
+use ibc_client_tendermint::types::ClientState as TmClientState;
+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_handler_types::error::ContextError;
+use ibc_core_host_types::identifiers::ChainId;
+use ibc_primitives::prelude::*;
+use tendermint::trust_threshold::TrustThresholdFraction as TendermintTrustThresholdFraction;
+
+/// Provides a default implementation intended for implementing the
+/// `ValidationContext::validate_self_client` API.
+///
+/// This validation logic tailored for Tendermint client states of a host chain
+/// operating across various counterparty chains.
+pub trait ValidateSelfClientContext {
+    fn validate_self_tendermint_client(
+        &self,
+        client_state_of_host_on_counterparty: TmClientState,
+    ) -> Result<(), ContextError> {
+        client_state_of_host_on_counterparty
+            .validate()
+            .map_err(ClientError::from)?;
+
+        if client_state_of_host_on_counterparty.is_frozen() {
+            return Err(ClientError::ClientFrozen {
+                description: String::new(),
+            }
+            .into());
+        }
+
+        let self_chain_id = self.chain_id();
+        if self_chain_id != &client_state_of_host_on_counterparty.chain_id {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "invalid chain-id. expected: {}, got: {}",
+                        self_chain_id, client_state_of_host_on_counterparty.chain_id
+                    ),
+                },
+            ));
+        }
+
+        let latest_height = client_state_of_host_on_counterparty.latest_height;
+        let self_revision_number = self_chain_id.revision_number();
+        if self_revision_number != latest_height.revision_number() {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "client is not in the same revision as the chain. expected: {}, got: {}",
+                        self_revision_number,
+                        latest_height.revision_number()
+                    ),
+                },
+            ));
+        }
+
+        if latest_height >= self.host_current_height() {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "client has latest height {} greater than or equal to chain height {}",
+                        latest_height,
+                        self.host_current_height()
+                    ),
+                },
+            ));
+        }
+
+        if self.proof_specs() != &client_state_of_host_on_counterparty.proof_specs {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "client has invalid proof specs. expected: {:?}, got: {:?}",
+                        self.proof_specs(),
+                        client_state_of_host_on_counterparty.proof_specs
+                    ),
+                },
+            ));
+        }
+
+        let _ = {
+            let trust_level = client_state_of_host_on_counterparty.trust_level;
+
+            TendermintTrustThresholdFraction::new(
+                trust_level.numerator(),
+                trust_level.denominator(),
+            )
+            .map_err(|_| ConnectionError::InvalidClientState {
+                reason: "invalid trust level".to_string(),
+            })?
+        };
+
+        if self.unbonding_period() != client_state_of_host_on_counterparty.unbonding_period {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "invalid unbonding period. expected: {:?}, got: {:?}",
+                        self.unbonding_period(),
+                        client_state_of_host_on_counterparty.unbonding_period,
+                    ),
+                },
+            ));
+        }
+
+        if client_state_of_host_on_counterparty.unbonding_period
+            < client_state_of_host_on_counterparty.trusting_period
+        {
+            return Err(ContextError::ConnectionError(ConnectionError::InvalidClientState{ reason: format!(
+                "unbonding period must be greater than trusting period. unbonding period ({:?}) < trusting period ({:?})",
+                client_state_of_host_on_counterparty.unbonding_period,
+                client_state_of_host_on_counterparty.trusting_period
+            )}));
+        }
+
+        if !client_state_of_host_on_counterparty.upgrade_path.is_empty()
+            && self.upgrade_path() != client_state_of_host_on_counterparty.upgrade_path
+        {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "invalid upgrade path. expected: {:?}, got: {:?}",
+                        self.upgrade_path(),
+                        client_state_of_host_on_counterparty.upgrade_path
+                    ),
+                },
+            ));
+        }
+
+        Ok(())
+    }
+
+    /// Returns the chain id of the host
+    fn chain_id(&self) -> &ChainId;
+
+    /// Returns the host current height
+    fn host_current_height(&self) -> Height;
+
+    /// Returns the proof specs of the host
+    fn proof_specs(&self) -> &ProofSpecs;
+
+    /// Returns the unbonding period of the host
+    fn unbonding_period(&self) -> Duration;
+
+    /// Returns the host upgrade path. May be empty.
+    fn upgrade_path(&self) -> &[String];
+}
diff --git a/crates/ibc/src/core/context.rs b/ibc-core/ics24-host/src/context.rs
similarity index 53%
rename from crates/ibc/src/core/context.rs
rename to ibc-core/ics24-host/src/context.rs
index c1409449f..da858968d 100644
--- a/crates/ibc/src/core/context.rs
+++ b/ibc-core/ics24-host/src/context.rs
@@ -1,138 +1,37 @@
-use crate::prelude::*;
-
-use crate::signer::Signer;
-use alloc::string::String;
 use core::time::Duration;
-use derive_more::From;
-use displaydoc::Display;
-use ibc_proto::google::protobuf::Any;
-
-use crate::core::events::IbcEvent;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics03_connection::connection::ConnectionEnd;
-use crate::core::ics03_connection::error::ConnectionError;
-use crate::core::ics03_connection::version::{
-    get_compatible_versions, pick_version, Version as ConnectionVersion,
-};
-use crate::core::ics04_channel::channel::ChannelEnd;
-use crate::core::ics04_channel::commitment::{AcknowledgementCommitment, PacketCommitment};
-use crate::core::ics04_channel::context::calculate_block_delay;
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::error::PacketError;
-use crate::core::ics04_channel::packet::{Receipt, Sequence};
-use crate::core::ics23_commitment::commitment::CommitmentPrefix;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::ics24_host::identifier::ConnectionId;
-use crate::core::ics24_host::path::{
-    AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, CommitmentPath,
-    ConnectionPath, ReceiptPath, SeqAckPath, SeqRecvPath, SeqSendPath,
-};
-use crate::core::router::Router;
-use crate::core::timestamp::Timestamp;
-use crate::Height;
-
-use super::ics02_client::client_state::ClientState;
-use super::ics02_client::consensus_state::ConsensusState;
-use super::ics02_client::ClientExecutionContext;
-
-/// Top-level error
-#[derive(Debug, Display, From)]
-pub enum ContextError {
-    /// ICS02 Client error: {0}
-    ClientError(ClientError),
-    /// ICS03 Connection error: {0}
-    ConnectionError(ConnectionError),
-    /// ICS04 Channel error: {0}
-    ChannelError(ChannelError),
-    /// ICS04 Packet error: {0}
-    PacketError(PacketError),
-}
-
-#[cfg(feature = "std")]
-impl std::error::Error for ContextError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match &self {
-            Self::ClientError(e) => Some(e),
-            Self::ConnectionError(e) => Some(e),
-            Self::ChannelError(e) => Some(e),
-            Self::PacketError(e) => Some(e),
-        }
-    }
-}
 
-/// Error returned from entrypoint functions [`dispatch`][super::dispatch], [`validate`][super::validate] and
-/// [`execute`][super::execute].
-#[derive(Debug, Display)]
-pub enum RouterError {
-    /// context error: `{0}`
-    ContextError(ContextError),
-    /// unknown type URL `{url}`
-    UnknownMessageTypeUrl { url: String },
-    /// the message is malformed and cannot be decoded error: `{0}`
-    MalformedMessageBytes(ibc_proto::protobuf::Error),
-}
-
-impl From<ContextError> for RouterError {
-    fn from(error: ContextError) -> Self {
-        Self::ContextError(error)
-    }
-}
+use ibc_core_channel_types::channel::ChannelEnd;
+use ibc_core_channel_types::commitment::{AcknowledgementCommitment, PacketCommitment};
+use ibc_core_channel_types::packet::Receipt;
+use ibc_core_client_context::prelude::*;
+use ibc_core_client_types::Height;
+use ibc_core_commitment_types::commitment::CommitmentPrefix;
+use ibc_core_connection_types::version::{pick_version, Version as ConnectionVersion};
+use ibc_core_connection_types::ConnectionEnd;
+use ibc_core_handler_types::error::ContextError;
+use ibc_core_handler_types::events::IbcEvent;
+use ibc_core_host_types::identifiers::{ConnectionId, Sequence};
+use ibc_core_host_types::path::{
+    AckPath, ChannelEndPath, ClientConnectionPath, CommitmentPath, ConnectionPath, ReceiptPath,
+    SeqAckPath, SeqRecvPath, SeqSendPath,
+};
+use ibc_primitives::prelude::*;
+use ibc_primitives::{Signer, Timestamp};
 
-#[cfg(feature = "std")]
-impl std::error::Error for RouterError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match &self {
-            Self::ContextError(e) => Some(e),
-            Self::UnknownMessageTypeUrl { .. } => None,
-            Self::MalformedMessageBytes(e) => Some(e),
-        }
-    }
-}
+use crate::utils::calculate_block_delay;
 
 /// Context to be implemented by the host that provides all "read-only" methods.
 ///
-/// Trait used for the top-level [`validate`](crate::core::validate)
-pub trait ValidationContext: Router {
-    type ClientValidationContext;
-    type E: ClientExecutionContext;
-    type AnyConsensusState: ConsensusState;
-    type AnyClientState: ClientState<Self::ClientValidationContext, Self::E>;
+/// Trait used for the top-level `validate` entrypoint in the `ibc-core` crate.
+pub trait ValidationContext {
+    type V: ClientValidationContext;
+    /// The client state type for the host chain.
+    type HostClientState: ClientStateValidation<Self::V>;
+    /// The consensus state type for the host chain.
+    type HostConsensusState: ConsensusState;
 
     /// Retrieve the context that implements all clients' `ValidationContext`.
-    fn get_client_validation_context(&self) -> &Self::ClientValidationContext;
-
-    /// Returns the ClientState for the given identifier `client_id`.
-    ///
-    /// Note: Clients have the responsibility to store client states on client creation and update.
-    fn client_state(&self, client_id: &ClientId) -> Result<Self::AnyClientState, ContextError>;
-
-    /// Tries to decode the given `client_state` into a concrete light client state.
-    fn decode_client_state(&self, client_state: Any) -> Result<Self::AnyClientState, ContextError>;
-
-    /// Retrieve the consensus state for the given client ID at the specified
-    /// height.
-    ///
-    /// Returns an error if no such state exists.
-    ///
-    /// Note: Clients have the responsibility to store consensus states on client creation and update.
-    fn consensus_state(
-        &self,
-        client_cons_state_path: &ClientConsensusStatePath,
-    ) -> Result<Self::AnyConsensusState, ContextError>;
-
-    /// Returns the time when the client state for the given [`ClientId`] was updated with a header for the given [`Height`]
-    fn client_update_time(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Timestamp, ContextError>;
-
-    /// Returns the height when the client state for the given [`ClientId`] was updated with a header for the given [`Height`]
-    fn client_update_height(
-        &self,
-        client_id: &ClientId,
-        height: &Height,
-    ) -> Result<Height, ContextError>;
+    fn get_client_validation_context(&self) -> &Self::V;
 
     /// Returns the current height of the local chain.
     fn host_height(&self) -> Result<Height, ContextError>;
@@ -144,7 +43,7 @@ pub trait ValidationContext: Router {
     fn host_consensus_state(
         &self,
         height: &Height,
-    ) -> Result<Self::AnyConsensusState, ContextError>;
+    ) -> Result<Self::HostConsensusState, ContextError>;
 
     /// Returns a natural number, counting how many clients have been created
     /// thus far. The value of this counter should increase only via method
@@ -154,17 +53,18 @@ pub trait ValidationContext: Router {
     /// Returns the ConnectionEnd for the given identifier `conn_id`.
     fn connection_end(&self, conn_id: &ConnectionId) -> Result<ConnectionEnd, ContextError>;
 
-    /// Validates the `ClientState` of the client (a client referring to host) stored on the counterparty chain against the host's internal state.
+    /// Validates the `ClientState` of the host chain stored on the counterparty
+    /// chain against the host's internal state.
     ///
     /// For more information on the specific requirements for validating the
     /// client state of a host chain, please refer to the [ICS24 host
     /// 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 [hosts](crate::hosts) module.
+    /// in the `ibc-core/ics24-host` module.
     fn validate_self_client(
         &self,
-        client_state_of_host_on_counterparty: Any,
+        client_state_of_host_on_counterparty: Self::HostClientState,
     ) -> Result<(), ContextError>;
 
     /// Returns the prefix that the local chain uses in the KV store.
@@ -173,13 +73,13 @@ pub trait ValidationContext: Router {
     /// Returns a counter on how many connections have been created thus far.
     fn connection_counter(&self) -> Result<u64, ContextError>;
 
-    /// Function required by ICS 03. Returns the list of all possible versions that the connection
+    /// Function required by ICS-03. Returns the list of all possible versions that the connection
     /// handshake protocol supports.
     fn get_compatible_versions(&self) -> Vec<ConnectionVersion> {
-        get_compatible_versions()
+        ConnectionVersion::compatibles()
     }
 
-    /// Function required by ICS 03. Returns one version out of the supplied list of versions, which the
+    /// Function required by ICS-03. Returns one version out of the supplied list of versions, which the
     /// connection handshake protocol prefers.
     fn pick_version(
         &self,
@@ -242,35 +142,16 @@ pub trait ValidationContext: Router {
 
 /// Context to be implemented by the host that provides all "write-only" methods.
 ///
-/// Trait used for the top-level [`execute`](crate::core::execute) and [`dispatch`](crate::core::dispatch)
+/// Trait used for the top-level `execute` and `dispatch` entrypoints in the `ibc-core` crate.
 pub trait ExecutionContext: ValidationContext {
+    type E: ClientExecutionContext;
+
     /// Retrieve the context that implements all clients' `ExecutionContext`.
     fn get_client_execution_context(&mut self) -> &mut Self::E;
 
     /// Called upon client creation.
-    /// Increases the counter which keeps track of how many clients have been created.
-    /// Should never fail.
-    fn increase_client_counter(&mut self);
-
-    /// Called upon successful client update.
-    /// Implementations are expected to use this to record the specified time as the time at which
-    /// this update (or header) was processed.
-    fn store_update_time(
-        &mut self,
-        client_id: ClientId,
-        height: Height,
-        timestamp: Timestamp,
-    ) -> Result<(), ContextError>;
-
-    /// Called upon successful client update.
-    /// Implementations are expected to use this to record the specified height as the height at
-    /// at which this update (or header) was processed.
-    fn store_update_height(
-        &mut self,
-        client_id: ClientId,
-        height: Height,
-        host_height: Height,
-    ) -> Result<(), ContextError>;
+    /// Increases the counter, that keeps track of how many clients have been created.
+    fn increase_client_counter(&mut self) -> Result<(), ContextError>;
 
     /// Stores the given connection_end at path
     fn store_connection(
@@ -288,8 +169,7 @@ pub trait ExecutionContext: ValidationContext {
 
     /// Called upon connection identifier creation (Init or Try process).
     /// Increases the counter which keeps track of how many connections have been created.
-    /// Should never fail.
-    fn increase_connection_counter(&mut self);
+    fn increase_connection_counter(&mut self) -> Result<(), ContextError>;
 
     /// Stores the given packet commitment at the given store path
     fn store_packet_commitment(
@@ -350,13 +230,27 @@ pub trait ExecutionContext: ValidationContext {
     ) -> Result<(), ContextError>;
 
     /// Called upon channel identifier creation (Init or Try message processing).
-    /// Increases the counter which keeps track of how many channels have been created.
-    /// Should never fail.
-    fn increase_channel_counter(&mut self);
+    /// Increases the counter, that keeps track of how many channels have been created.
+    fn increase_channel_counter(&mut self) -> Result<(), ContextError>;
 
     /// Emit the given IBC event
-    fn emit_ibc_event(&mut self, event: IbcEvent);
+    fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), ContextError>;
 
     /// Log the given message.
-    fn log_message(&mut self, message: String);
+    fn log_message(&mut self, message: String) -> Result<(), ContextError>;
 }
+
+/// Convenient type alias for `ClientStateRef`, providing access to client
+/// validation methods within the context.
+pub type ClientStateRef<Ctx> =
+    <<Ctx as ValidationContext>::V as ClientValidationContext>::ClientStateRef;
+
+/// Convenient type alias for `ClientStateMut`, providing access to client
+/// execution methods within the context.
+pub type ClientStateMut<Ctx> =
+    <<Ctx as ExecutionContext>::E as ClientExecutionContext>::ClientStateMut;
+
+/// Convenient type alias for `ConsensusStateRef`, providing access to client
+/// validation methods within the context.
+pub type ConsensusStateRef<Ctx> =
+    <<Ctx as ValidationContext>::V as ClientValidationContext>::ConsensusStateRef;
diff --git a/ibc-core/ics24-host/src/lib.rs b/ibc-core/ics24-host/src/lib.rs
new file mode 100644
index 000000000..7d64b4e38
--- /dev/null
+++ b/ibc-core/ics24-host/src/lib.rs
@@ -0,0 +1,29 @@
+//! Provides essential top-level traits designed for the seamless integration of
+//! host chains with ibc-rs. It streamlines access to the host's storage,
+//! facilitating the efficient retrieval of states and metadata crucial for the
+//! execution of IBC logics.
+#![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
+)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+pub(crate) mod utils;
+
+mod context;
+pub use context::*;
+
+/// Re-exports ICS-24 data structures from `ibc-core-host-types` crate.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_host_types::*;
+}
diff --git a/ibc-core/ics24-host/src/utils.rs b/ibc-core/ics24-host/src/utils.rs
new file mode 100644
index 000000000..9ba2cbe08
--- /dev/null
+++ b/ibc-core/ics24-host/src/utils.rs
@@ -0,0 +1,47 @@
+use core::time::Duration;
+
+pub fn calculate_block_delay(
+    delay_period_time: &Duration,
+    max_expected_time_per_block: &Duration,
+) -> u64 {
+    let delay_period_time = delay_period_time.as_secs();
+    let max_expected_time_per_block = max_expected_time_per_block.as_secs();
+    if max_expected_time_per_block == 0 {
+        return 0;
+    }
+    if delay_period_time % max_expected_time_per_block == 0 {
+        return delay_period_time / max_expected_time_per_block;
+    }
+
+    // TODO: Use `u64::div_ceil` here instead
+    (delay_period_time / max_expected_time_per_block) + 1
+}
+
+#[cfg(test)]
+mod tests {
+
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case::remainder_zero(10, 2, 5)]
+    #[case::remainder_not_zero(10, 3, 4)]
+    #[case::max_expected_zero(10, 0, 0)]
+    #[case::delay_period_zero(0, 2, 0)]
+    #[case::both_zero(0, 0, 0)]
+    #[case::delay_less_than_max(10, 11, 1)]
+    fn test_calculate_block_delay_zero(
+        #[case] delay_period_time: u64,
+        #[case] max_expected_time_per_block: u64,
+        #[case] expected: u64,
+    ) {
+        assert_eq!(
+            calculate_block_delay(
+                &Duration::from_secs(delay_period_time),
+                &Duration::from_secs(max_expected_time_per_block)
+            ),
+            expected
+        );
+    }
+}
diff --git a/ibc-core/ics24-host/types/Cargo.toml b/ibc-core/ics24-host/types/Cargo.toml
new file mode 100644
index 000000000..80c1efb2b
--- /dev/null
+++ b/ibc-core/ics24-host/types/Cargo.toml
@@ -0,0 +1,64 @@
+[package]
+name         = "ibc-core-host-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "host", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-24 Host Requirements data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh       = { workspace = true, optional = true }
+derive_more = { workspace = true }
+displaydoc  = { workspace = true }
+schemars    = { workspace = true, optional = true }
+serde       = { workspace = true, optional = true }
+
+# ibc dependencies
+ibc-primitives = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[dev-dependencies]
+rstest     = { workspace = true }
+serde_json = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "ibc-primitives/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-primitives/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-primitives/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-primitives/parity-scale-codec",
+]
diff --git a/ibc-core/ics24-host/types/src/error.rs b/ibc-core/ics24-host/types/src/error.rs
new file mode 100644
index 000000000..4df4c4dd9
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/error.rs
@@ -0,0 +1,22 @@
+use displaydoc::Display;
+use ibc_primitives::prelude::*;
+
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
+#[derive(Debug, Display)]
+pub enum IdentifierError {
+    /// identifier `{id}` has invalid length; must be between `{min}` and `{max}` characters
+    InvalidLength { id: String, min: u64, max: u64 },
+    /// identifier `{id}` must only contain alphanumeric characters or `.`, `_`, `+`, `-`, `#`, - `[`, `]`, `<`, `>`
+    InvalidCharacter { id: String },
+    /// identifier prefix `{prefix}` is invalid
+    InvalidPrefix { prefix: String },
+    /// chain identifier is not formatted with revision number
+    UnformattedRevisionNumber { chain_id: String },
+    /// revision number overflowed
+    RevisionNumberOverflow,
+    /// String `{value}` cannot be converted to packet sequence, error: `{reason}`
+    InvalidStringAsSequence { value: String, reason: String },
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for IdentifierError {}
diff --git a/ibc-core/ics24-host/types/src/identifiers/chain_id.rs b/ibc-core/ics24-host/types/src/identifiers/chain_id.rs
new file mode 100644
index 000000000..ecd2702cf
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/chain_id.rs
@@ -0,0 +1,463 @@
+use core::fmt::{Debug, Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use ibc_primitives::prelude::*;
+#[cfg(feature = "serde")]
+use serde::de::{Deserialize, Deserializer, Error, MapAccess, Visitor};
+
+use crate::error::IdentifierError;
+use crate::validate::{
+    validate_identifier_chars, validate_identifier_length, validate_prefix_length,
+};
+
+/// Defines the domain type for chain identifiers.
+///
+/// A valid `ChainId` follows the format {chain name}-{revision number} where
+/// the revision number indicates how many times the chain has been upgraded.
+/// Creating `ChainId`s not in this format will result in an error.
+///
+/// It should be noted this format is not standardized yet, though it is widely
+/// accepted and compatible with Cosmos SDK driven chains.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(feature = "borsh", derive(borsh::BorshSerialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct ChainId {
+    id: String,
+    revision_number: u64,
+}
+
+impl ChainId {
+    /// Creates a new `ChainId` with the given chain identifier.
+    ///
+    /// It checks the identifier for valid characters according to `ICS-24`
+    /// specification and returns a `ChainId` successfully.
+    /// Stricter checks beyond `ICS-24` rests with the users,
+    /// based on their requirements.
+    ///
+    /// If the chain identifier is in the {chain name}-{revision number} format,
+    /// the revision number is parsed. Otherwise, the revision number is set to 0.
+    ///
+    /// ```
+    /// use ibc_core_host_types::identifiers::ChainId;
+    ///
+    /// let chain_id = "chainA";
+    /// let id = ChainId::new(chain_id).unwrap();
+    /// assert_eq!(id.revision_number(), 0);
+    /// assert_eq!(id.as_str(), chain_id);
+    ///
+    /// let chain_id = "chainA-12";
+    /// let id = ChainId::new(chain_id).unwrap();
+    /// assert_eq!(id.revision_number(), 12);
+    /// assert_eq!(id.as_str(), chain_id);
+    /// ```
+    pub fn new(chain_id: &str) -> Result<Self, IdentifierError> {
+        Self::from_str(chain_id)
+    }
+
+    /// Get a reference to the underlying string.
+    pub fn as_str(&self) -> &str {
+        &self.id
+    }
+
+    pub fn split_chain_id(&self) -> Result<(&str, u64), IdentifierError> {
+        parse_chain_id_string(self.as_str())
+    }
+
+    /// Extract the revision number from the chain identifier
+    pub fn revision_number(&self) -> u64 {
+        self.revision_number
+    }
+
+    /// Increases `ChainId`s revision number by one.
+    /// Fails if the chain identifier is not in
+    /// `{chain_name}-{revision_number}` format or
+    /// the revision number overflows.
+    ///
+    /// ```
+    /// use ibc_core_host_types::identifiers::ChainId;
+    ///
+    /// let mut chain_id = ChainId::new("chainA-1").unwrap();
+    /// assert!(chain_id.increment_revision_number().is_ok());
+    /// assert_eq!(chain_id.revision_number(), 2);
+    ///
+    /// let mut chain_id = ChainId::new(&format!("chainA-{}", u64::MAX)).unwrap();
+    /// assert!(chain_id.increment_revision_number().is_err());
+    /// assert_eq!(chain_id.revision_number(), u64::MAX);
+    /// ```
+    pub fn increment_revision_number(&mut self) -> Result<(), IdentifierError> {
+        let (chain_name, _) = self.split_chain_id()?;
+        let inc_revision_number = self
+            .revision_number
+            .checked_add(1)
+            .ok_or(IdentifierError::RevisionNumberOverflow)?;
+        self.id = format!("{}-{}", chain_name, inc_revision_number);
+        self.revision_number = inc_revision_number;
+        Ok(())
+    }
+
+    /// A convenient method to check if the `ChainId` forms a valid identifier
+    /// with the desired min/max length. However, ICS-24 does not specify a
+    /// certain min or max lengths for chain identifiers.
+    pub fn validate_length(&self, min_length: u64, max_length: u64) -> Result<(), IdentifierError> {
+        match self.split_chain_id() {
+            Ok((chain_name, _)) => validate_prefix_length(chain_name, min_length, max_length),
+            _ => validate_identifier_length(&self.id, min_length, max_length),
+        }
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de> Deserialize<'de> for ChainId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        const FIELDS: &[&str] = &["id", "revision_number"];
+
+        enum Field {
+            Id,
+            RevisionNumber,
+        }
+
+        impl<'de> Deserialize<'de> for Field {
+            fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+            where
+                D: Deserializer<'de>,
+            {
+                struct FieldVisitor;
+
+                impl<'de> Visitor<'de> for FieldVisitor {
+                    type Value = Field;
+
+                    fn expecting(&self, formatter: &mut Formatter<'_>) -> core::fmt::Result {
+                        write!(formatter, "expected one of: {:?}", &FIELDS)
+                    }
+
+                    fn visit_str<E>(self, value: &str) -> Result<Field, E>
+                    where
+                        E: Error,
+                    {
+                        match value {
+                            "id" => Ok(Field::Id),
+                            "revisionNumber" | "revision_number" => Ok(Field::RevisionNumber),
+                            _ => Err(Error::unknown_field(value, FIELDS)),
+                        }
+                    }
+                }
+
+                deserializer.deserialize_identifier(FieldVisitor)
+            }
+        }
+
+        struct ChainIdVisitor;
+
+        impl<'de> Visitor<'de> for ChainIdVisitor {
+            type Value = ChainId;
+
+            fn expecting(&self, formatter: &mut Formatter<'_>) -> core::fmt::Result {
+                formatter.write_str("struct ChainId")
+            }
+
+            fn visit_map<V>(self, mut map: V) -> Result<Self::Value, V::Error>
+            where
+                V: MapAccess<'de>,
+            {
+                let mut id = None;
+                let mut revision_number = None;
+
+                while let Some(key) = map.next_key()? {
+                    match key {
+                        Field::Id => {
+                            if id.is_some() {
+                                return Err(Error::duplicate_field("id"));
+                            }
+
+                            let next_value = map.next_value::<&str>()?;
+
+                            let chain_id = ChainId::from_str(next_value)
+                                .map_err(|_| Error::custom("failed to parse ChainId `id` field"))?;
+
+                            id = Some(chain_id.id);
+                            revision_number = Some(chain_id.revision_number);
+                        }
+                        Field::RevisionNumber => {
+                            let next_value = map.next_value::<&str>()?;
+                            let rev = u64::from_str(next_value).unwrap_or(0);
+
+                            if let Some(rn) = revision_number {
+                                if rev != 0 && rn != rev {
+                                    return Err(Error::custom(format_args!(
+                                        "chain ID revision numbers do not match; got `{}` and `{}`",
+                                        rn, rev,
+                                    )));
+                                }
+                            } else {
+                                revision_number = Some(rev);
+                            }
+                        }
+                    }
+                }
+
+                let id = id.ok_or_else(|| Error::missing_field("id"))?;
+
+                Ok(ChainId {
+                    id,
+                    revision_number: revision_number.unwrap_or(0),
+                })
+            }
+        }
+
+        deserializer.deserialize_struct("ChainId", FIELDS, ChainIdVisitor)
+    }
+}
+
+#[cfg(feature = "borsh")]
+mod borsh_impls {
+    use borsh::maybestd::io::{self, Error, ErrorKind, Read};
+    use borsh::BorshDeserialize;
+
+    use super::*;
+
+    impl BorshDeserialize for ChainId {
+        fn deserialize_reader<R: Read>(reader: &mut R) -> io::Result<Self> {
+            let (id, revision_number) = <(String, u64)>::deserialize_reader(reader)?;
+
+            match parse_chain_id_string(&id) {
+                Ok((_, rn)) => {
+                    if revision_number != 0 && rn != revision_number {
+                        return Err(Error::new(
+                            ErrorKind::Other,
+                            "chain ID revision numbers do not match",
+                        ));
+                    }
+                }
+                _ => {
+                    if revision_number != 0 {
+                        return Err(Error::new(ErrorKind::Other, "failed to parse chain ID"));
+                    }
+                }
+            }
+
+            Ok(ChainId {
+                id,
+                revision_number,
+            })
+        }
+    }
+}
+
+/// Construct a `ChainId` from a string literal only if it forms a valid
+/// identifier.
+impl FromStr for ChainId {
+    type Err = IdentifierError;
+
+    fn from_str(id: &str) -> Result<Self, Self::Err> {
+        // Identifier string must have a maximum length of 64 characters.
+
+        // Validates the chain name for allowed characters according to ICS-24.
+        validate_identifier_chars(id)?;
+        if let Ok((chain_name, revision_number)) = parse_chain_id_string(id) {
+            // Validate if the chain name with revision number has a valid length.
+            validate_prefix_length(chain_name, 1, 64)?;
+            Ok(Self {
+                id: id.into(),
+                revision_number,
+            })
+        } else {
+            // Validate if the identifier has a valid length.
+            validate_identifier_length(id, 1, 64)?;
+            Ok(Self {
+                id: id.into(),
+                revision_number: 0,
+            })
+        }
+    }
+}
+
+impl From<ChainId> for String {
+    fn from(chain_id: ChainId) -> String {
+        chain_id.id
+    }
+}
+
+impl Display for ChainId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}", self.id)
+    }
+}
+
+/// Parses a string intended to represent a `ChainId` and, if successful,
+/// returns a tuple containing the chain name and revision number.
+fn parse_chain_id_string(chain_id_str: &str) -> Result<(&str, u64), IdentifierError> {
+    chain_id_str
+        .rsplit_once('-')
+        .filter(|(_, rev_number_str)| {
+            // Validates the revision number not to start with leading zeros, like "01".
+            // Zero is the only allowed revision number with leading zero.
+            rev_number_str.as_bytes().first() != Some(&b'0') || rev_number_str.len() == 1
+        })
+        .and_then(|(chain_name, rev_number_str)| {
+            // Parses the revision number string into a `u64` and checks its validity.
+            rev_number_str
+                .parse()
+                .ok()
+                .map(|revision_number| (chain_name, revision_number))
+        })
+        .ok_or(IdentifierError::UnformattedRevisionNumber {
+            chain_id: chain_id_str.to_string(),
+        })
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("chainA-0", "chainA", 0)]
+    #[case("chainA-1", "chainA", 1)]
+    #[case("chainA--1", "chainA-", 1)]
+    #[case("chainA-1-2", "chainA-1", 2)]
+    #[case("111-2", "111", 2)]
+    #[case("----1", "---", 1)]
+    #[case("._+-1", "._+", 1)]
+    #[case(&("A".repeat(43) + "-3"), &("A".repeat(43)), 3)]
+    fn test_valid_chain_id_with_rev(
+        #[case] raw_chain_id: &str,
+        #[case] chain_name: &str,
+        #[case] revision_number: u64,
+    ) {
+        let chain_id = ChainId::new(raw_chain_id).unwrap();
+        assert!(chain_id.validate_length(1, 64).is_ok());
+        assert_eq!(
+            chain_id,
+            ChainId {
+                id: format!("{chain_name}-{revision_number}"),
+                revision_number
+            }
+        );
+    }
+
+    #[rstest]
+    #[case("chainA")]
+    #[case("chainA.2")]
+    #[case("123")]
+    #[case("._+")]
+    #[case("chainA-")]
+    #[case("chainA-a")]
+    #[case("chainA-01")]
+    #[case("chainA-1-")]
+    #[case(&"A".repeat(64))]
+    #[case::special_case("chainA-0")]
+    fn test_valid_chain_id_without_rev(#[case] chain_name: &str) {
+        let chain_id = ChainId::new(chain_name).unwrap();
+        assert!(chain_id.validate_length(1, 64).is_ok());
+        assert_eq!(
+            chain_id,
+            ChainId {
+                id: chain_name.into(),
+                revision_number: 0
+            }
+        );
+    }
+
+    #[rstest]
+    #[case(&"A".repeat(65))]
+    #[case(&("A".repeat(44) + "-123"))]
+    #[case("-1")]
+    #[case(" ----1")]
+    #[case(" ")]
+    #[case(" chainA")]
+    #[case("chain A")]
+    #[case(" chainA.2")]
+    #[case(" chainA.2-1")]
+    #[case(" 1")]
+    #[case(" -")]
+    #[case("   -1")]
+    #[case("/chainA-1")]
+    fn test_invalid_chain_id_from_str(#[case] chain_id_str: &str) {
+        assert!(ChainId::new(chain_id_str).is_err());
+    }
+
+    #[test]
+    fn test_inc_revision_number() {
+        let mut chain_id = ChainId::new("chainA-1").unwrap();
+
+        assert!(chain_id.increment_revision_number().is_ok());
+        assert_eq!(chain_id.revision_number(), 2);
+        assert_eq!(chain_id.as_str(), "chainA-2");
+
+        assert!(chain_id.increment_revision_number().is_ok());
+        assert_eq!(chain_id.revision_number(), 3);
+        assert_eq!(chain_id.as_str(), "chainA-3");
+    }
+
+    #[test]
+    fn test_failed_inc_revision_number() {
+        let mut chain_id = ChainId::new("chainA").unwrap();
+
+        assert!(chain_id.increment_revision_number().is_err());
+        assert_eq!(chain_id.revision_number(), 0);
+        assert_eq!(chain_id.as_str(), "chainA");
+    }
+
+    #[cfg(feature = "serde")]
+    #[rstest]
+    #[case(r#"{"id":"foo-42","revision_number":"42"}"#)]
+    #[case(r#"{"id":"foo-42","revision_number":"0"}"#)]
+    #[case(r#"{"id":"foo-bar-42","revision_number":"0"}"#)]
+    fn test_valid_chain_id_json_deserialization(#[case] chain_id_json: &str) {
+        let chain_id = serde_json::from_str::<ChainId>(chain_id_json);
+        assert!(chain_id.is_ok());
+
+        let chain_id = chain_id.unwrap();
+
+        let (_id, rev_num) = chain_id.split_chain_id().unwrap();
+
+        assert_eq!(rev_num, chain_id.revision_number());
+    }
+
+    #[cfg(feature = "serde")]
+    #[rstest]
+    #[case(r#"{"id":"foo-42","revision_number":"69"}"#)]
+    #[case(r#"{"id":"foo-0","revision_number":"69"}"#)]
+    #[case(r#"{"id":"/foo-42","revision_number":"0"}"#)]
+    fn test_invalid_chain_id_json_deserialization(#[case] chain_id_json: &str) {
+        assert!(serde_json::from_str::<ChainId>(chain_id_json).is_err())
+    }
+
+    #[cfg(feature = "borsh")]
+    #[rstest]
+    #[case(b"\x06\0\0\0foo-42\x45\0\0\0\0\0\0\0")]
+    fn test_invalid_chain_id_borsh_deserialization(#[case] chain_id_bytes: &[u8]) {
+        use borsh::BorshDeserialize;
+
+        assert!(ChainId::try_from_slice(chain_id_bytes).is_err())
+    }
+
+    #[cfg(feature = "borsh")]
+    fn borsh_ser_de_roundtrip(chain_id: ChainId) {
+        use borsh::{BorshDeserialize, BorshSerialize};
+
+        let chain_id_bytes = chain_id.try_to_vec().unwrap();
+        let res = ChainId::try_from_slice(&chain_id_bytes).unwrap();
+        assert_eq!(chain_id, res);
+    }
+
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn test_valid_borsh_ser_de_roundtrip() {
+        borsh_ser_de_roundtrip(ChainId::new("foo-42").unwrap());
+        borsh_ser_de_roundtrip(ChainId::new("foo").unwrap());
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/identifiers/channel_id.rs b/ibc-core/ics24-host/types/src/identifiers/channel_id.rs
new file mode 100644
index 000000000..c8f9e30d7
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/channel_id.rs
@@ -0,0 +1,99 @@
+use core::fmt::{Debug, Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use derive_more::Into;
+use ibc_primitives::prelude::*;
+
+use crate::error::IdentifierError;
+use crate::validate::validate_channel_identifier;
+
+const CHANNEL_ID_PREFIX: &str = "channel";
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
+pub struct ChannelId(String);
+
+impl ChannelId {
+    /// Builds a new channel identifier. Like client and connection identifiers, channel ids are
+    /// deterministically formed from two elements: a prefix `prefix`, and a monotonically
+    /// increasing `counter`, separated by a dash "-".
+    /// The prefix is currently determined statically (see `ChannelId::prefix()`) so this method
+    /// accepts a single argument, the `counter`.
+    ///
+    /// ```
+    /// # use ibc_core_host_types::identifiers::ChannelId;
+    /// let chan_id = ChannelId::new(27);
+    /// assert_eq!(chan_id.to_string(), "channel-27");
+    /// ```
+    pub fn new(identifier: u64) -> Self {
+        let id = format!("{}-{}", Self::prefix(), identifier);
+        Self(id)
+    }
+
+    /// Returns the static prefix to be used across all channel identifiers.
+    pub fn prefix() -> &'static str {
+        CHANNEL_ID_PREFIX
+    }
+
+    /// Get this identifier as a borrowed `&str`
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Get this identifier as a borrowed byte slice
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+
+    pub fn zero() -> Self {
+        Self::new(0)
+    }
+}
+
+/// This implementation provides a `to_string` method.
+impl Display for ChannelId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for ChannelId {
+    type Err = IdentifierError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        validate_channel_identifier(s).map(|_| Self(s.to_string()))
+    }
+}
+
+impl AsRef<str> for ChannelId {
+    fn as_ref(&self) -> &str {
+        &self.0
+    }
+}
+
+/// Equality check against string literal (satisfies &ChannelId == &str).
+/// ```
+/// use core::str::FromStr;
+/// use ibc_core_host_types::identifiers::ChannelId;
+/// let channel_id = ChannelId::from_str("channel-0");
+/// assert!(channel_id.is_ok());
+/// channel_id.map(|id| {assert_eq!(&id, "channel-0")});
+/// ```
+impl PartialEq<str> for ChannelId {
+    fn eq(&self, other: &str) -> bool {
+        self.as_str().eq(other)
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/identifiers/client_id.rs b/ibc-core/ics24-host/types/src/identifiers/client_id.rs
new file mode 100644
index 000000000..ecbfe1cca
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/client_id.rs
@@ -0,0 +1,91 @@
+use core::str::FromStr;
+
+use derive_more::Into;
+use ibc_primitives::prelude::*;
+
+use crate::error::IdentifierError;
+use crate::validate::{validate_client_identifier, validate_client_type};
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into, derive_more::Display)]
+pub struct ClientId(String);
+
+impl ClientId {
+    /// Builds a new client identifier.
+    ///
+    /// Client identifiers are deterministically formed from two elements:
+    /// a prefix derived from the client type `ctype`, and a monotonically
+    /// increasing `counter`; these are separated by a dash "-".
+    ///
+    /// See also [`ClientType::build_client_id`](super::ClientType::build_client_id)
+    /// method.
+    ///
+    /// # Example
+    ///
+    /// ```
+    /// # use ibc_core_host_types::identifiers::ClientId;
+    /// # use ibc_core_host_types::identifiers::ClientType;
+    /// # use std::str::FromStr;
+    /// let client_type = ClientType::from_str("07-tendermint").unwrap();
+    /// let client_id = &client_type.build_client_id(0);
+    /// assert_eq!(client_id.as_str(), "07-tendermint-0");
+    /// ```
+    pub fn new(client_type: &str, counter: u64) -> Result<Self, IdentifierError> {
+        let client_type = client_type.trim();
+        validate_client_type(client_type).map(|()| Self::format(client_type, counter))
+    }
+
+    pub(super) fn format(client_type: &str, counter: u64) -> Self {
+        let client_id = format!("{client_type}-{counter}");
+        if cfg!(debug_assertions) {
+            validate_client_type(client_type).expect("valid client type");
+            validate_client_identifier(&client_id).expect("valid client id");
+        }
+        Self(client_id)
+    }
+
+    /// Get this identifier as a borrowed `&str`
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Get this identifier as a borrowed byte slice
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+}
+
+impl FromStr for ClientId {
+    type Err = IdentifierError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        validate_client_identifier(s).map(|_| Self(s.to_string()))
+    }
+}
+
+/// Equality check against string literal (satisfies &ClientId == &str).
+/// ```
+/// use core::str::FromStr;
+/// use ibc_core_host_types::identifiers::ClientId;
+/// let client_id = ClientId::from_str("clientidtwo");
+/// assert!(client_id.is_ok());
+/// client_id.map(|id| {assert_eq!(&id, "clientidtwo")});
+/// ```
+impl PartialEq<str> for ClientId {
+    fn eq(&self, other: &str) -> bool {
+        self.as_str().eq(other)
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/identifiers/client_type.rs b/ibc-core/ics24-host/types/src/identifiers/client_type.rs
new file mode 100644
index 000000000..8f0547aa4
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/client_type.rs
@@ -0,0 +1,101 @@
+//! Defines the `ClientType` format, typically used in chain IDs.
+
+use core::str::FromStr;
+
+use ibc_primitives::prelude::*;
+
+use super::ClientId;
+use crate::error::IdentifierError;
+use crate::validate::validate_client_type;
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+/// Type of the client, depending on the specific consensus algorithm.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, derive_more::Display)]
+pub struct ClientType(String);
+
+impl ClientType {
+    /// Constructs a new `ClientType` from the given `String` if it ends with a valid client identifier.
+    pub fn new(client_type: &str) -> Result<Self, IdentifierError> {
+        let client_type = client_type.trim();
+        validate_client_type(client_type).map(|()| Self(client_type.into()))
+    }
+
+    /// Constructs a new [`ClientId`] with this type of client type and given
+    /// `counter`.
+    ///
+    /// This is equivalent to `ClientId::new(self.as_str(), counter)` but
+    /// infallible since client type is assumed to be correct.
+    ///
+    /// ```
+    /// # use ibc_core_host_types::identifiers::ClientId;
+    /// # use ibc_core_host_types::identifiers::ClientType;
+    /// # use std::str::FromStr;
+    /// let client_type = ClientType::from_str("07-tendermint").unwrap();
+    /// let client_id = client_type.build_client_id(14);
+    /// assert_eq!(client_id.as_str(), "07-tendermint-14");
+    /// ```
+    pub fn build_client_id(&self, counter: u64) -> ClientId {
+        ClientId::format(self.as_str(), counter)
+    }
+
+    /// Yields this identifier as a borrowed `&str`
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl FromStr for ClientType {
+    type Err = IdentifierError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Self::new(s)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case::tendermint("07-tendermint")]
+    #[case::wasm("08-wasm")]
+    #[case::zero_double_digits("00-dummy")]
+    #[case::zero_single_digit("0-dummy")]
+    #[case::length_seven("1234567")]
+    fn client_type_from_str(#[case] client_str: &str) {
+        let client_type = ClientType::from_str(client_str).unwrap();
+        assert_eq!(client_type.as_str(), client_str);
+    }
+
+    #[rstest]
+    #[case::length_less_than_seven("00-foo")]
+    #[case::length_six("123456")]
+    fn client_type_from_str_fails(#[case] client_str: &str) {
+        let client_type = ClientType::from_str(client_str);
+        assert!(client_type.is_err());
+    }
+
+    #[rstest]
+    #[case::tendermint("07-tendermint", 118)]
+    #[case::wasm("08-wasm", 2)]
+    #[case::zero_counter("01-dummy", 0)]
+    fn client_type_build_client_id(#[case] client_str: &str, #[case] counter: u64) {
+        let client_type = ClientType::from_str(client_str).unwrap();
+        let client_id = client_type.build_client_id(counter);
+        assert_eq!(client_id.as_str(), format!("{}-{}", client_str, counter));
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/identifiers/connection_id.rs b/ibc-core/ics24-host/types/src/identifiers/connection_id.rs
new file mode 100644
index 000000000..9fe9657cc
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/connection_id.rs
@@ -0,0 +1,93 @@
+use core::fmt::{Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use derive_more::Into;
+use ibc_primitives::prelude::*;
+
+use crate::error::IdentifierError;
+use crate::validate::validate_connection_identifier;
+
+const CONNECTION_ID_PREFIX: &str = "connection";
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
+pub struct ConnectionId(String);
+
+impl ConnectionId {
+    /// Builds a new connection identifier. Connection identifiers are deterministically formed from
+    /// two elements: a prefix `prefix`, and a monotonically increasing `counter`; these are
+    /// separated by a dash "-". The prefix is currently determined statically (see
+    /// `ConnectionId::prefix()`) so this method accepts a single argument, the `counter`.
+    ///
+    /// ```
+    /// # use ibc_core_host_types::identifiers::ConnectionId;
+    /// let conn_id = ConnectionId::new(11);
+    /// assert_eq!(&conn_id, "connection-11");
+    /// ```
+    pub fn new(identifier: u64) -> Self {
+        let id = format!("{}-{}", Self::prefix(), identifier);
+        Self(id)
+    }
+
+    /// Returns the static prefix to be used across all connection identifiers.
+    pub fn prefix() -> &'static str {
+        CONNECTION_ID_PREFIX
+    }
+
+    /// Get this identifier as a borrowed `&str`
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Get this identifier as a borrowed byte slice
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+
+    /// Return ConnectionId with identifier 0
+    pub fn zero() -> Self {
+        Self::new(0)
+    }
+}
+
+/// This implementation provides a `to_string` method.
+impl Display for ConnectionId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for ConnectionId {
+    type Err = IdentifierError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        validate_connection_identifier(s).map(|_| Self(s.to_string()))
+    }
+}
+
+/// Equality check against string literal (satisfies &ConnectionId == &str).
+/// ```
+/// use core::str::FromStr;
+/// use ibc_core_host_types::identifiers::ConnectionId;
+/// let conn_id = ConnectionId::from_str("connection-0");
+/// assert!(conn_id.is_ok());
+/// conn_id.map(|id| {assert_eq!(&id, "connection-0")});
+/// ```
+impl PartialEq<str> for ConnectionId {
+    fn eq(&self, other: &str) -> bool {
+        self.as_str().eq(other)
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/identifiers/mod.rs b/ibc-core/ics24-host/types/src/identifiers/mod.rs
new file mode 100644
index 000000000..9ae79f673
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/mod.rs
@@ -0,0 +1,17 @@
+//! Defines identifier types
+
+mod chain_id;
+mod channel_id;
+mod client_id;
+mod client_type;
+mod connection_id;
+mod port_id;
+mod sequence;
+
+pub use chain_id::ChainId;
+pub use channel_id::ChannelId;
+pub use client_id::ClientId;
+pub use client_type::ClientType;
+pub use connection_id::ConnectionId;
+pub use port_id::PortId;
+pub use sequence::Sequence;
diff --git a/ibc-core/ics24-host/types/src/identifiers/port_id.rs b/ibc-core/ics24-host/types/src/identifiers/port_id.rs
new file mode 100644
index 000000000..e1a0e062d
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/port_id.rs
@@ -0,0 +1,73 @@
+use core::fmt::{Display, Error as FmtError, Formatter};
+use core::str::FromStr;
+
+use derive_more::Into;
+use ibc_primitives::prelude::*;
+
+use crate::error::IdentifierError;
+use crate::validate::validate_port_identifier;
+
+const TRANSFER_PORT_ID: &str = "transfer";
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Into)]
+pub struct PortId(String);
+
+impl PortId {
+    pub fn new(id: String) -> Result<Self, IdentifierError> {
+        Self::from_str(&id)
+    }
+
+    /// Infallible creation of the well-known transfer port
+    pub fn transfer() -> Self {
+        Self(TRANSFER_PORT_ID.to_string())
+    }
+
+    /// Get this identifier as a borrowed `&str`
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+
+    /// Get this identifier as a borrowed byte slice
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+
+    pub fn validate(&self) -> Result<(), IdentifierError> {
+        validate_port_identifier(self.as_str())
+    }
+}
+
+/// This implementation provides a `to_string` method.
+impl Display for PortId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl FromStr for PortId {
+    type Err = IdentifierError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        validate_port_identifier(s).map(|_| Self(s.to_string()))
+    }
+}
+
+impl AsRef<str> for PortId {
+    fn as_ref(&self) -> &str {
+        self.0.as_str()
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/identifiers/sequence.rs b/ibc-core/ics24-host/types/src/identifiers/sequence.rs
new file mode 100644
index 000000000..9e8b2ccbc
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/identifiers/sequence.rs
@@ -0,0 +1,74 @@
+use ibc_primitives::prelude::*;
+
+use crate::error::IdentifierError;
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+/// The sequence number of a packet enforces ordering among packets from the same source.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Sequence(u64);
+
+impl core::str::FromStr for Sequence {
+    type Err = IdentifierError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self::from(s.parse::<u64>().map_err(|e| {
+            IdentifierError::InvalidStringAsSequence {
+                value: s.to_string(),
+                reason: e.to_string(),
+            }
+        })?))
+    }
+}
+
+impl Sequence {
+    /// Gives the sequence number.
+    pub fn value(&self) -> u64 {
+        self.0
+    }
+
+    /// Returns `true` if the sequence number is zero.
+    pub fn is_zero(&self) -> bool {
+        self.0 == 0
+    }
+
+    /// Increments the sequence number by one.
+    pub fn increment(&self) -> Sequence {
+        Sequence(self.0 + 1)
+    }
+
+    /// Encodes the sequence number into a byte array in big endian.
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.0.to_be_bytes().to_vec()
+    }
+}
+
+impl From<u64> for Sequence {
+    fn from(seq: u64) -> Self {
+        Sequence(seq)
+    }
+}
+
+impl From<Sequence> for u64 {
+    fn from(s: Sequence) -> u64 {
+        s.0
+    }
+}
+
+impl core::fmt::Display for Sequence {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> Result<(), core::fmt::Error> {
+        write!(f, "{}", self.0)
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/lib.rs b/ibc-core/ics24-host/types/src/lib.rs
new file mode 100644
index 000000000..f466de4c2
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/lib.rs
@@ -0,0 +1,21 @@
+//! ICS-24: Host defines the minimal set of interfaces that a state machine
+//! hosting an IBC-enabled chain must implement.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod error;
+pub mod identifiers;
+pub mod path;
+pub(crate) mod validate;
diff --git a/ibc-core/ics24-host/types/src/path.rs b/ibc-core/ics24-host/types/src/path.rs
new file mode 100644
index 000000000..43e99347e
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/path.rs
@@ -0,0 +1,1406 @@
+//! Defines all store paths used by IBC
+
+/// Path-space as listed in ICS-024
+/// https://github.com/cosmos/ibc/tree/master/spec/core/ics-024-host-requirements#path-space
+/// Some of these are implemented in other ICSs, but ICS-024 has a nice summary table.
+///
+use core::str::FromStr;
+
+use derive_more::{Display, From};
+use ibc_primitives::prelude::*;
+
+use crate::identifiers::{ChannelId, ClientId, ConnectionId, PortId, Sequence};
+
+pub const NEXT_CLIENT_SEQUENCE: &str = "nextClientSequence";
+pub const NEXT_CONNECTION_SEQUENCE: &str = "nextConnectionSequence";
+pub const NEXT_CHANNEL_SEQUENCE: &str = "nextChannelSequence";
+
+pub const CLIENT_PREFIX: &str = "clients";
+pub const CLIENT_STATE: &str = "clientState";
+pub const CONSENSUS_STATE_PREFIX: &str = "consensusStates";
+pub const CONNECTION_PREFIX: &str = "connections";
+pub const CHANNEL_PREFIX: &str = "channels";
+pub const CHANNEL_END_PREFIX: &str = "channelEnds";
+pub const PORT_PREFIX: &str = "ports";
+pub const SEQUENCE_PREFIX: &str = "sequences";
+pub const NEXT_SEQ_SEND_PREFIX: &str = "nextSequenceSend";
+pub const NEXT_SEQ_RECV_PREFIX: &str = "nextSequenceRecv";
+pub const NEXT_SEQ_ACK_PREFIX: &str = "nextSequenceAck";
+pub const PACKET_COMMITMENT_PREFIX: &str = "commitments";
+pub const PACKET_ACK_PREFIX: &str = "acks";
+pub const PACKET_RECEIPT_PREFIX: &str = "receipts";
+
+pub const ITERATE_CONSENSUS_STATE_PREFIX: &str = "iterateConsensusStates";
+pub const PROCESSED_TIME: &str = "processedTime";
+pub const PROCESSED_HEIGHT: &str = "processedHeight";
+
+/// ABCI client upgrade keys
+/// - The key identifying the upgraded IBC state within the upgrade sub-store
+pub const UPGRADED_IBC_STATE: &str = "upgradedIBCState";
+/// - The key identifying the upgraded client state
+pub const UPGRADED_CLIENT_STATE: &str = "upgradedClient";
+/// - The key identifying the upgraded consensus state
+pub const UPGRADED_CLIENT_CONSENSUS_STATE: &str = "upgradedConsState";
+
+/// The Path enum abstracts out the different sub-paths.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, From, Display)]
+pub enum Path {
+    NextClientSequence(NextClientSequencePath),
+    NextConnectionSequence(NextConnectionSequencePath),
+    NextChannelSequence(NextChannelSequencePath),
+    ClientState(ClientStatePath),
+    ClientConsensusState(ClientConsensusStatePath),
+    ClientUpdateTime(ClientUpdateTimePath),
+    ClientUpdateHeight(ClientUpdateHeightPath),
+    ClientConnection(ClientConnectionPath),
+    Connection(ConnectionPath),
+    Ports(PortPath),
+    ChannelEnd(ChannelEndPath),
+    SeqSend(SeqSendPath),
+    SeqRecv(SeqRecvPath),
+    SeqAck(SeqAckPath),
+    Commitment(CommitmentPath),
+    Ack(AckPath),
+    Receipt(ReceiptPath),
+    UpgradeClient(UpgradeClientPath),
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{NEXT_CLIENT_SEQUENCE}")]
+pub struct NextClientSequencePath;
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{NEXT_CONNECTION_SEQUENCE}")]
+pub struct NextConnectionSequencePath;
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{NEXT_CHANNEL_SEQUENCE}")]
+pub struct NextChannelSequencePath;
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display, From)]
+#[display(fmt = "{CLIENT_PREFIX}/{_0}/{CLIENT_STATE}")]
+pub struct ClientStatePath(pub ClientId);
+
+impl ClientStatePath {
+    pub fn new(client_id: ClientId) -> ClientStatePath {
+        ClientStatePath(client_id)
+    }
+
+    /// Returns the client store prefix under which all the client states are
+    /// stored: "clients".
+    pub fn prefix() -> String {
+        CLIENT_PREFIX.to_string()
+    }
+
+    /// Returns the final part (leaf) of the path under which an individual
+    /// client state is stored: "clientState".
+    pub fn leaf() -> String {
+        CLIENT_STATE.to_string()
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(
+    fmt = "{CLIENT_PREFIX}/{client_id}/{CONSENSUS_STATE_PREFIX}/{revision_number}-{revision_height}"
+)]
+pub struct ClientConsensusStatePath {
+    pub client_id: ClientId,
+    pub revision_number: u64,
+    pub revision_height: u64,
+}
+
+// Returns the full consensus state path of specific client in the format:
+// "clients/{client_id}/consensusStates" as a string.
+pub fn full_consensus_state_path(client_id: &ClientId) -> String {
+    format!("{CLIENT_PREFIX}/{client_id}/{CONSENSUS_STATE_PREFIX}")
+}
+
+impl ClientConsensusStatePath {
+    /// Constructs a new `ClientConsensusStatePath`.
+    pub fn new(
+        client_id: ClientId,
+        revision_number: u64,
+        revision_height: u64,
+    ) -> ClientConsensusStatePath {
+        ClientConsensusStatePath {
+            client_id,
+            revision_number,
+            revision_height,
+        }
+    }
+
+    /// Returns the path representing the parent group under which all consensus
+    /// states are stored: "clients/{client_id}/consensusStates".
+    pub fn parent(&self) -> String {
+        full_consensus_state_path(&self.client_id)
+    }
+
+    /// Returns the final part (leaf) of the path under which an individual
+    /// consensus state is stored:
+    /// "consensusStates/{revision_number}-{revision_height}".
+    pub fn leaf(&self) -> String {
+        format!(
+            "{CONSENSUS_STATE_PREFIX}/{}-{}",
+            self.revision_number, self.revision_height
+        )
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(
+    fmt = "{CLIENT_PREFIX}/{client_id}/{CONSENSUS_STATE_PREFIX}/{revision_number}-{revision_height}/{PROCESSED_TIME}"
+)]
+pub struct ClientUpdateTimePath {
+    pub client_id: ClientId,
+    pub revision_number: u64,
+    pub revision_height: u64,
+}
+
+impl ClientUpdateTimePath {
+    /// Constructs a new `ClientUpdateTimePath`.
+    pub fn new(client_id: ClientId, revision_number: u64, revision_height: u64) -> Self {
+        Self {
+            client_id,
+            revision_number,
+            revision_height,
+        }
+    }
+
+    /// Returns the path representing the parent group under which all the
+    /// processed times are stored: "clients/{client_id}/consensusStates".
+    pub fn parent(&self) -> String {
+        full_consensus_state_path(&self.client_id)
+    }
+
+    /// Returns the final part (leaf) of the path under which an individual
+    /// processed time is stored:
+    /// "consensusStates/{revision_number}-{revision_height}/processedTime".
+    pub fn leaf(&self) -> String {
+        format!(
+            "{CONSENSUS_STATE_PREFIX}/{}-{}/{PROCESSED_TIME}",
+            self.revision_number, self.revision_height
+        )
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(
+    fmt = "{CLIENT_PREFIX}/{client_id}/{CONSENSUS_STATE_PREFIX}/{revision_number}-{revision_height}/{PROCESSED_HEIGHT}"
+)]
+pub struct ClientUpdateHeightPath {
+    pub client_id: ClientId,
+    pub revision_number: u64,
+    pub revision_height: u64,
+}
+
+impl ClientUpdateHeightPath {
+    pub fn new(client_id: ClientId, revision_number: u64, revision_height: u64) -> Self {
+        Self {
+            client_id,
+            revision_number,
+            revision_height,
+        }
+    }
+
+    /// Returns the path representing the parent group under which all the
+    /// processed heights are stored: "clients/{client_id}/consensusStates".
+    pub fn parent(&self) -> String {
+        full_consensus_state_path(&self.client_id)
+    }
+
+    /// Returns the final part (leaf) of the path under which an individual
+    /// processed height is stored:
+    /// "consensusStates/{revision_number}-{revision_height}/processedHeight".
+    pub fn leaf(&self) -> String {
+        format!(
+            "{CONSENSUS_STATE_PREFIX}/{}-{}/{PROCESSED_HEIGHT}",
+            self.revision_number, self.revision_height
+        )
+    }
+}
+
+/// This iteration key is namely used by the `ibc-go` implementation as an
+/// efficient approach for iterating over consensus states. This is specifically
+/// incorporated to facilitate cross-compatibility with `ibc-go` when developing
+/// CosmWasm-driven light clients with `ibc-rs`.
+///
+/// The key is formatted like so:
+/// `iterateConsensusStates{BigEndianRevisionBytes}{BigEndianHeightBytes}`
+/// to ensure that the lexicographic order of iteration keys match the
+/// height order of the consensus states.
+///
+/// See `ibc-go`
+/// [documentation](https://github.com/cosmos/ibc-go/blob/016a6095b577ecb9323edad508cff19d017636a1/modules/light-clients/07-tendermint/store.go#L19-L34)
+/// for more details.
+pub fn iteration_key(revision_number: u64, revision_height: u64) -> Vec<u8> {
+    let mut path = Vec::new();
+    path.extend_from_slice(ITERATE_CONSENSUS_STATE_PREFIX.as_bytes());
+    path.extend(revision_number.to_be_bytes());
+    path.extend(revision_height.to_be_bytes());
+    path
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{CLIENT_PREFIX}/{_0}/{CONNECTION_PREFIX}")]
+pub struct ClientConnectionPath(pub ClientId);
+
+impl ClientConnectionPath {
+    pub fn new(client_id: ClientId) -> ClientConnectionPath {
+        ClientConnectionPath(client_id)
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{CONNECTION_PREFIX}/{_0}")]
+pub struct ConnectionPath(pub ConnectionId);
+
+impl ConnectionPath {
+    pub fn new(connection_id: &ConnectionId) -> ConnectionPath {
+        ConnectionPath(connection_id.clone())
+    }
+
+    /// Returns the connection store prefix under which all the connections are
+    /// stored: "connections".
+    pub fn prefix() -> String {
+        CONNECTION_PREFIX.to_string()
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{PORT_PREFIX}/{_0}")]
+pub struct PortPath(pub PortId);
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{CHANNEL_END_PREFIX}/{PORT_PREFIX}/{_0}/{CHANNEL_PREFIX}/{_1}")]
+pub struct ChannelEndPath(pub PortId, pub ChannelId);
+
+impl ChannelEndPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> ChannelEndPath {
+        ChannelEndPath(port_id.clone(), channel_id.clone())
+    }
+
+    /// Returns the channel end store prefix under which all the channel ends
+    /// are stored: "channelEnds".
+    pub fn prefix() -> String {
+        CHANNEL_END_PREFIX.to_string()
+    }
+
+    /// Returns the parent group path under which all the sequences of a channel are
+    /// stored with the format:
+    /// "{prefix}/ports/{port_id}/channels/{channel_id}/sequences"
+    fn full_sequences_path(&self, prefix: &str) -> String {
+        format!(
+            "{prefix}/{PORT_PREFIX}/{}/{CHANNEL_PREFIX}/{}/{SEQUENCE_PREFIX}",
+            self.0, self.1,
+        )
+    }
+
+    /// Returns the parent group path under which all the commitment packets of
+    /// a channel are stored.
+    pub fn commitments_path(&self) -> String {
+        self.full_sequences_path(PACKET_COMMITMENT_PREFIX)
+    }
+
+    /// Returns the parent group path under which all the ack packets of a
+    /// channel are stored.
+    pub fn acks_path(&self) -> String {
+        self.full_sequences_path(PACKET_ACK_PREFIX)
+    }
+
+    /// Returns the parent group path under which all the receipt packets of a
+    /// channel are stored.
+    pub fn receipts_path(&self) -> String {
+        self.full_sequences_path(PACKET_RECEIPT_PREFIX)
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{NEXT_SEQ_SEND_PREFIX}/{PORT_PREFIX}/{_0}/{CHANNEL_PREFIX}/{_1}")]
+pub struct SeqSendPath(pub PortId, pub ChannelId);
+
+impl SeqSendPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> SeqSendPath {
+        SeqSendPath(port_id.clone(), channel_id.clone())
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{NEXT_SEQ_RECV_PREFIX}/{PORT_PREFIX}/{_0}/{CHANNEL_PREFIX}/{_1}")]
+pub struct SeqRecvPath(pub PortId, pub ChannelId);
+
+impl SeqRecvPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> SeqRecvPath {
+        SeqRecvPath(port_id.clone(), channel_id.clone())
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(fmt = "{NEXT_SEQ_ACK_PREFIX}/{PORT_PREFIX}/{_0}/{CHANNEL_PREFIX}/{_1}")]
+pub struct SeqAckPath(pub PortId, pub ChannelId);
+
+impl SeqAckPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId) -> SeqAckPath {
+        SeqAckPath(port_id.clone(), channel_id.clone())
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(
+    fmt = "{PACKET_COMMITMENT_PREFIX}/{PORT_PREFIX}/{port_id}/{CHANNEL_PREFIX}/{channel_id}/{SEQUENCE_PREFIX}/{sequence}"
+)]
+pub struct CommitmentPath {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub sequence: Sequence,
+}
+
+impl CommitmentPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId, sequence: Sequence) -> CommitmentPath {
+        CommitmentPath {
+            port_id: port_id.clone(),
+            channel_id: channel_id.clone(),
+            sequence,
+        }
+    }
+
+    /// Returns the commitment store prefix under which all the packet
+    /// commitments are stored: "commitments"
+    pub fn prefix() -> String {
+        PACKET_COMMITMENT_PREFIX.to_string()
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(
+    fmt = "{PACKET_ACK_PREFIX}/{PORT_PREFIX}/{port_id}/{CHANNEL_PREFIX}/{channel_id}/{SEQUENCE_PREFIX}/{sequence}"
+)]
+pub struct AckPath {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub sequence: Sequence,
+}
+
+impl AckPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId, sequence: Sequence) -> AckPath {
+        AckPath {
+            port_id: port_id.clone(),
+            channel_id: channel_id.clone(),
+            sequence,
+        }
+    }
+
+    /// Returns the ack store prefix under which all the packet acks are stored:
+    /// "acks"
+    pub fn prefix() -> String {
+        PACKET_ACK_PREFIX.to_string()
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+#[display(
+    fmt = "{PACKET_RECEIPT_PREFIX}/{PORT_PREFIX}/{port_id}/{CHANNEL_PREFIX}/{channel_id}/{SEQUENCE_PREFIX}/{sequence}"
+)]
+pub struct ReceiptPath {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub sequence: Sequence,
+}
+
+impl ReceiptPath {
+    pub fn new(port_id: &PortId, channel_id: &ChannelId, sequence: Sequence) -> ReceiptPath {
+        ReceiptPath {
+            port_id: port_id.clone(),
+            channel_id: channel_id.clone(),
+            sequence,
+        }
+    }
+
+    /// Returns the receipt store prefix under which all the packet receipts are
+    /// stored: "receipts"
+    pub fn prefix() -> String {
+        PACKET_RECEIPT_PREFIX.to_string()
+    }
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+/// Paths that are specific for client upgrades.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
+pub enum UpgradeClientPath {
+    #[display(fmt = "{UPGRADED_IBC_STATE}/{_0}/{UPGRADED_CLIENT_STATE}")]
+    UpgradedClientState(u64),
+    #[display(fmt = "{UPGRADED_IBC_STATE}/{_0}/{UPGRADED_CLIENT_CONSENSUS_STATE}")]
+    UpgradedClientConsensusState(u64),
+}
+
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+/// Sub-paths which are not part of the specification, but are still
+/// useful to represent for parsing purposes.
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+enum SubPath {
+    Channels(ChannelId),
+    Sequences(Sequence),
+}
+
+impl Path {
+    /// Indication if the path is provable.
+    pub fn is_provable(&self) -> bool {
+        !matches!(&self, Path::ClientConnection(_) | Path::Ports(_))
+    }
+
+    /// into_bytes implementation
+    pub fn into_bytes(self) -> Vec<u8> {
+        self.to_string().into_bytes()
+    }
+}
+
+#[derive(Debug, displaydoc::Display)]
+pub enum PathError {
+    /// `{path}` could not be parsed into a Path
+    ParseFailure { path: String },
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for PathError {}
+
+/// The FromStr trait allows paths encoded as strings to be parsed into Paths.
+impl FromStr for Path {
+    type Err = PathError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let components: Vec<&str> = s.split('/').collect();
+
+        parse_next_sequence(&components)
+            .or_else(|| parse_client_paths(&components))
+            .or_else(|| parse_connections(&components))
+            .or_else(|| parse_ports(&components))
+            .or_else(|| parse_channel_ends(&components))
+            .or_else(|| parse_seqs(&components))
+            .or_else(|| parse_commitments(&components))
+            .or_else(|| parse_acks(&components))
+            .or_else(|| parse_receipts(&components))
+            .or_else(|| parse_upgrades(&components))
+            .ok_or(PathError::ParseFailure {
+                path: s.to_string(),
+            })
+    }
+}
+
+fn parse_next_sequence(components: &[&str]) -> Option<Path> {
+    if components.len() != 1 {
+        return None;
+    }
+
+    match *components.first()? {
+        NEXT_CLIENT_SEQUENCE => Some(NextClientSequencePath.into()),
+        NEXT_CONNECTION_SEQUENCE => Some(NextConnectionSequencePath.into()),
+        NEXT_CHANNEL_SEQUENCE => Some(NextChannelSequencePath.into()),
+        _ => None,
+    }
+}
+
+fn parse_client_paths(components: &[&str]) -> Option<Path> {
+    let first = *components.first()?;
+
+    if first != CLIENT_PREFIX {
+        return None;
+    }
+
+    let client_id = ClientId::from_str(components[1]).ok()?;
+
+    if components.len() == 3 {
+        match components[2] {
+            CLIENT_STATE => Some(ClientStatePath(client_id).into()),
+            CONNECTION_PREFIX => Some(ClientConnectionPath(client_id).into()),
+            _ => None,
+        }
+    } else if components.len() == 4 || components.len() == 5 {
+        match components[2] {
+            CONSENSUS_STATE_PREFIX => {}
+            _ => return None,
+        }
+
+        let epoch_height: Vec<&str> = components[3].split('-').collect();
+
+        if epoch_height.len() != 2 {
+            return None;
+        }
+
+        let revision_number = epoch_height[0];
+        let revision_height = epoch_height[1];
+
+        let revision_number = revision_number.parse::<u64>().ok()?;
+
+        let revision_height = revision_height.parse::<u64>().ok()?;
+
+        match components.len() {
+            4 => Some(
+                ClientConsensusStatePath {
+                    client_id,
+                    revision_number,
+                    revision_height,
+                }
+                .into(),
+            ),
+            5 => match components[4] {
+                PROCESSED_TIME => Some(
+                    ClientUpdateTimePath {
+                        client_id,
+                        revision_number,
+                        revision_height,
+                    }
+                    .into(),
+                ),
+                PROCESSED_HEIGHT => Some(
+                    ClientUpdateHeightPath {
+                        client_id,
+                        revision_number,
+                        revision_height,
+                    }
+                    .into(),
+                ),
+                _ => None,
+            },
+            _ => None,
+        }
+    } else {
+        None
+    }
+}
+
+fn parse_connections(components: &[&str]) -> Option<Path> {
+    if components.len() != 2 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != CONNECTION_PREFIX {
+        return None;
+    }
+
+    let connection_id = *components.last()?;
+
+    let connection_id = ConnectionId::from_str(connection_id).ok()?;
+
+    Some(ConnectionPath(connection_id).into())
+}
+
+fn parse_ports(components: &[&str]) -> Option<Path> {
+    if components.len() != 2 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != PORT_PREFIX {
+        return None;
+    }
+
+    let port_id = *components.last()?;
+
+    let port_id = PortId::from_str(port_id).ok()?;
+
+    Some(PortPath(port_id).into())
+}
+
+fn parse_channels(components: &[&str]) -> Option<SubPath> {
+    if components.len() != 2 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != CHANNEL_PREFIX {
+        return None;
+    }
+
+    let channel_id = *components.last()?;
+
+    let channel_id = ChannelId::from_str(channel_id).ok()?;
+
+    Some(SubPath::Channels(channel_id))
+}
+
+fn parse_sequences(components: &[&str]) -> Option<SubPath> {
+    if components.len() != 2 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != SEQUENCE_PREFIX {
+        return None;
+    }
+
+    let sequence_number = *components.last()?;
+
+    match Sequence::from_str(sequence_number) {
+        Ok(seq) => Some(SubPath::Sequences(seq)),
+        Err(_) => None,
+    }
+}
+
+fn parse_channel_ends(components: &[&str]) -> Option<Path> {
+    if components.len() != 5 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != CHANNEL_END_PREFIX {
+        return None;
+    }
+
+    let port = parse_ports(&components[1..=2]);
+    let channel = parse_channels(&components[3..=4]);
+
+    let Some(Path::Ports(PortPath(port_id))) = port else {
+        return None;
+    };
+
+    let Some(SubPath::Channels(channel_id)) = channel else {
+        return None;
+    };
+
+    Some(ChannelEndPath(port_id, channel_id).into())
+}
+
+fn parse_seqs(components: &[&str]) -> Option<Path> {
+    if components.len() != 5 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    let port = parse_ports(&components[1..=2]);
+    let channel = parse_channels(&components[3..=4]);
+
+    let Some(Path::Ports(PortPath(port_id))) = port else {
+        return None;
+    };
+
+    let Some(SubPath::Channels(channel_id)) = channel else {
+        return None;
+    };
+
+    match first {
+        NEXT_SEQ_SEND_PREFIX => Some(SeqSendPath(port_id, channel_id).into()),
+        NEXT_SEQ_RECV_PREFIX => Some(SeqRecvPath(port_id, channel_id).into()),
+        NEXT_SEQ_ACK_PREFIX => Some(SeqAckPath(port_id, channel_id).into()),
+        _ => None,
+    }
+}
+
+fn parse_commitments(components: &[&str]) -> Option<Path> {
+    if components.len() != 7 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != PACKET_COMMITMENT_PREFIX {
+        return None;
+    }
+
+    let port = parse_ports(&components[1..=2]);
+    let channel = parse_channels(&components[3..=4]);
+    let sequence = parse_sequences(&components[5..]);
+
+    let Some(Path::Ports(PortPath(port_id))) = port else {
+        return None;
+    };
+
+    let Some(SubPath::Channels(channel_id)) = channel else {
+        return None;
+    };
+
+    let Some(SubPath::Sequences(sequence)) = sequence else {
+        return None;
+    };
+
+    Some(
+        CommitmentPath {
+            port_id,
+            channel_id,
+            sequence,
+        }
+        .into(),
+    )
+}
+
+fn parse_acks(components: &[&str]) -> Option<Path> {
+    if components.len() != 7 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != PACKET_ACK_PREFIX {
+        return None;
+    }
+
+    let port = parse_ports(&components[1..=2]);
+    let channel = parse_channels(&components[3..=4]);
+    let sequence = parse_sequences(&components[5..]);
+
+    let Some(Path::Ports(PortPath(port_id))) = port else {
+        return None;
+    };
+
+    let Some(SubPath::Channels(channel_id)) = channel else {
+        return None;
+    };
+
+    let Some(SubPath::Sequences(sequence)) = sequence else {
+        return None;
+    };
+
+    Some(
+        AckPath {
+            port_id,
+            channel_id,
+            sequence,
+        }
+        .into(),
+    )
+}
+
+fn parse_receipts(components: &[&str]) -> Option<Path> {
+    if components.len() != 7 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != PACKET_RECEIPT_PREFIX {
+        return None;
+    }
+
+    let port = parse_ports(&components[1..=2]);
+    let channel = parse_channels(&components[3..=4]);
+    let sequence = parse_sequences(&components[5..]);
+
+    let Some(Path::Ports(PortPath(port_id))) = port else {
+        return None;
+    };
+
+    let Some(SubPath::Channels(channel_id)) = channel else {
+        return None;
+    };
+
+    let Some(SubPath::Sequences(sequence)) = sequence else {
+        return None;
+    };
+
+    Some(
+        ReceiptPath {
+            port_id,
+            channel_id,
+            sequence,
+        }
+        .into(),
+    )
+}
+
+fn parse_upgrades(components: &[&str]) -> Option<Path> {
+    if components.len() != 3 {
+        return None;
+    }
+
+    let first = *components.first()?;
+
+    if first != UPGRADED_IBC_STATE {
+        return None;
+    }
+
+    let last = *components.last()?;
+
+    let height = components[1].parse::<u64>().ok()?;
+
+    match last {
+        UPGRADED_CLIENT_STATE => Some(UpgradeClientPath::UpgradedClientState(height).into()),
+        UPGRADED_CLIENT_CONSENSUS_STATE => {
+            Some(UpgradeClientPath::UpgradedClientConsensusState(height).into())
+        }
+        _ => None,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    const DEFAULT_CLIENT_ID_STR: &str = "07-tendermint-0";
+    impl ClientId {
+        pub fn new_dummy() -> Self {
+            ClientId::from_str(DEFAULT_CLIENT_ID_STR)
+                .expect("should not fail since we use a valid client id")
+        }
+    }
+    #[rstest::rstest]
+    #[case(NEXT_CLIENT_SEQUENCE, Path::NextClientSequence(NextClientSequencePath))]
+    #[case(
+        NEXT_CONNECTION_SEQUENCE,
+        Path::NextConnectionSequence(NextConnectionSequencePath)
+    )]
+    #[case(
+        NEXT_CHANNEL_SEQUENCE,
+        Path::NextChannelSequence(NextChannelSequencePath)
+    )]
+    #[case(
+        "clients/07-tendermint-0/clientState",
+        Path::ClientState(ClientStatePath(ClientId::new_dummy()))
+    )]
+    #[case(
+        "clients/07-tendermint-0/consensusStates/15-31",
+        Path::ClientConsensusState(ClientConsensusStatePath {
+            client_id: ClientId::new_dummy(),
+            revision_number: 15,
+            revision_height: 31,
+        })
+    )]
+    #[case(
+        "clients/07-tendermint-0/consensusStates/15-31/processedTime",
+        Path::ClientUpdateTime(ClientUpdateTimePath {
+            client_id: ClientId::new_dummy(),
+            revision_number: 15,
+            revision_height: 31,
+        })
+    )]
+    #[case(
+        "clients/07-tendermint-0/consensusStates/15-31/processedHeight",
+        Path::ClientUpdateHeight(ClientUpdateHeightPath {
+            client_id: ClientId::new_dummy(),
+            revision_number: 15,
+            revision_height: 31,
+        })
+    )]
+    #[case(
+        "clients/07-tendermint-0/connections",
+        Path::ClientConnection(ClientConnectionPath(ClientId::new_dummy()))
+    )]
+    #[case(
+        "connections/connection-0",
+        Path::Connection(ConnectionPath(ConnectionId::zero()))
+    )]
+    #[case("ports/transfer", Path::Ports(PortPath(PortId::transfer())))]
+    #[case(
+        "channelEnds/ports/transfer/channels/channel-0",
+        Path::ChannelEnd(ChannelEndPath(PortId::transfer(), ChannelId::zero()))
+    )]
+    #[case(
+        "nextSequenceSend/ports/transfer/channels/channel-0",
+        Path::SeqSend(SeqSendPath(PortId::transfer(), ChannelId::zero()))
+    )]
+    #[case(
+        "nextSequenceRecv/ports/transfer/channels/channel-0",
+        Path::SeqRecv(SeqRecvPath(PortId::transfer(), ChannelId::zero()))
+    )]
+    #[case(
+        "nextSequenceAck/ports/transfer/channels/channel-0",
+        Path::SeqAck(SeqAckPath(PortId::transfer(), ChannelId::zero()))
+    )]
+    #[case(
+        "commitments/ports/transfer/channels/channel-0/sequences/0",
+        Path::Commitment(CommitmentPath {
+            port_id: PortId::transfer(),
+            channel_id: ChannelId::zero(),
+            sequence: Sequence::from(0),
+        })
+    )]
+    #[case(
+        "acks/ports/transfer/channels/channel-0/sequences/0",
+        Path::Ack(AckPath {
+            port_id: PortId::transfer(),
+            channel_id: ChannelId::zero(),
+            sequence: Sequence::from(0),
+        })
+    )]
+    #[case(
+        "receipts/ports/transfer/channels/channel-0/sequences/0",
+        Path::Receipt(ReceiptPath {
+            port_id: PortId::transfer(),
+            channel_id: ChannelId::zero(),
+            sequence: Sequence::from(0),
+        })
+    )]
+    #[case(
+        "upgradedIBCState/0/upgradedClient",
+        Path::UpgradeClient(UpgradeClientPath::UpgradedClientState(0))
+    )]
+    #[case(
+        "upgradedIBCState/0/upgradedConsState",
+        Path::UpgradeClient(UpgradeClientPath::UpgradedClientConsensusState(0))
+    )]
+    fn test_successful_parsing(#[case] path_str: &str, #[case] path: Path) {
+        // can be parsed into Path
+        assert_eq!(Path::from_str(path_str).expect("no error"), path);
+        // can be converted back to string
+        assert_eq!(path_str, path.to_string());
+    }
+
+    #[rstest::rstest]
+    #[case("clients/clientType")]
+    #[case("channels/channel-0")]
+    #[case("sequences/0")]
+    fn test_failure_parsing(#[case] path_str: &str) {
+        // cannot be parsed into Path
+        assert!(Path::from_str(path_str).is_err());
+    }
+
+    #[test]
+    fn test_parse_client_paths_fn() {
+        let path = "clients/07-tendermint-0/clientState";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_client_paths(&components),
+            Some(Path::ClientState(ClientStatePath(ClientId::new_dummy())))
+        );
+
+        let path = "clients/07-tendermint-0/consensusStates/15-31";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_client_paths(&components),
+            Some(Path::ClientConsensusState(ClientConsensusStatePath {
+                client_id: ClientId::new_dummy(),
+                revision_number: 15,
+                revision_height: 31,
+            }))
+        );
+    }
+
+    #[test]
+    fn test_parse_client_update_paths_fn() {
+        let path = "clients/07-tendermint-0/consensusStates/15-31/processedTime";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_client_paths(&components),
+            Some(Path::ClientUpdateTime(ClientUpdateTimePath {
+                client_id: ClientId::new_dummy(),
+                revision_number: 15,
+                revision_height: 31,
+            }))
+        );
+
+        let path = "clients/07-tendermint-0/consensusStates/15-31/processedHeight";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_client_paths(&components),
+            Some(Path::ClientUpdateHeight(ClientUpdateHeightPath {
+                client_id: ClientId::new_dummy(),
+                revision_number: 15,
+                revision_height: 31,
+            }))
+        );
+    }
+
+    #[test]
+    fn test_parse_connections_fn() {
+        let path = "connections/connection-0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_connections(&components),
+            Some(Path::Connection(ConnectionPath(ConnectionId::zero()))),
+        );
+    }
+
+    #[test]
+    fn test_parse_ports_fn() {
+        let path = "ports/transfer";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_ports(&components),
+            Some(Path::Ports(PortPath(PortId::transfer()))),
+        );
+    }
+
+    #[test]
+    fn test_parse_channels_fn() {
+        let path = "channels/channel-0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_channels(&components),
+            Some(SubPath::Channels(ChannelId::zero())),
+        );
+    }
+
+    #[test]
+    fn test_parse_sequences_fn() {
+        let path = "sequences/0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_sequences(&components),
+            Some(SubPath::Sequences(Sequence::from(0)))
+        );
+    }
+
+    #[test]
+    fn test_parse_channel_ends_fn() {
+        let path = "channelEnds/ports/transfer/channels/channel-0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_channel_ends(&components),
+            Some(Path::ChannelEnd(ChannelEndPath(
+                PortId::transfer(),
+                ChannelId::zero()
+            ))),
+        );
+    }
+
+    #[test]
+    fn test_parse_seqs_fn() {
+        let path = "nextSequenceSend/ports/transfer/channels/channel-0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_seqs(&components),
+            Some(Path::SeqSend(SeqSendPath(
+                PortId::transfer(),
+                ChannelId::zero()
+            ))),
+        );
+
+        let path = "nextSequenceRecv/ports/transfer/channels/channel-0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_seqs(&components),
+            Some(Path::SeqRecv(SeqRecvPath(
+                PortId::transfer(),
+                ChannelId::zero()
+            ))),
+        );
+
+        let path = "nextSequenceAck/ports/transfer/channels/channel-0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_seqs(&components),
+            Some(Path::SeqAck(SeqAckPath(
+                PortId::transfer(),
+                ChannelId::zero()
+            ))),
+        );
+    }
+
+    #[test]
+    fn test_parse_commitments_fn() {
+        let path = "commitments/ports/transfer/channels/channel-0/sequences/0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_commitments(&components),
+            Some(Path::Commitment(CommitmentPath {
+                port_id: PortId::transfer(),
+                channel_id: ChannelId::zero(),
+                sequence: Sequence::from(0),
+            })),
+        );
+    }
+
+    #[test]
+    fn test_parse_acks_fn() {
+        let path = "acks/ports/transfer/channels/channel-0/sequences/0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_acks(&components),
+            Some(Path::Ack(AckPath {
+                port_id: PortId::transfer(),
+                channel_id: ChannelId::zero(),
+                sequence: Sequence::from(0),
+            })),
+        );
+    }
+
+    #[test]
+    fn test_parse_receipts_fn() {
+        let path = "receipts/ports/transfer/channels/channel-0/sequences/0";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_receipts(&components),
+            Some(Path::Receipt(ReceiptPath {
+                port_id: PortId::transfer(),
+                channel_id: ChannelId::zero(),
+                sequence: Sequence::from(0),
+            })),
+        );
+    }
+
+    #[test]
+    fn test_parse_upgrades_fn() {
+        let path = "upgradedIBCState/0/upgradedClient";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_upgrades(&components),
+            Some(Path::UpgradeClient(UpgradeClientPath::UpgradedClientState(
+                0
+            ))),
+        );
+
+        let path = "upgradedIBCState/0/upgradedConsState";
+        let components: Vec<&str> = path.split('/').collect();
+
+        assert_eq!(
+            parse_upgrades(&components),
+            Some(Path::UpgradeClient(
+                UpgradeClientPath::UpgradedClientConsensusState(0)
+            )),
+        )
+    }
+}
diff --git a/ibc-core/ics24-host/types/src/validate.rs b/ibc-core/ics24-host/types/src/validate.rs
new file mode 100644
index 000000000..75e3494ef
--- /dev/null
+++ b/ibc-core/ics24-host/types/src/validate.rs
@@ -0,0 +1,319 @@
+use ibc_primitives::prelude::*;
+
+use crate::error::IdentifierError as Error;
+use crate::identifiers::{ChannelId, ConnectionId};
+
+const VALID_SPECIAL_CHARS: &str = "._+-#[]<>";
+
+/// Checks if the identifier only contains valid characters as specified in the
+/// [`ICS-24`](https://github.com/cosmos/ibc/tree/main/spec/core/ics-024-host-requirements#paths-identifiers-separators)]
+/// spec.
+pub fn validate_identifier_chars(id: &str) -> Result<(), Error> {
+    // Check that the identifier comprises only valid characters:
+    // - Alphanumeric
+    // - `.`, `_`, `+`, `-`, `#`
+    // - `[`, `]`, `<`, `>`
+    if !id
+        .chars()
+        .all(|c| c.is_alphanumeric() || VALID_SPECIAL_CHARS.contains(c))
+    {
+        return Err(Error::InvalidCharacter { id: id.into() });
+    }
+
+    // All good!
+    Ok(())
+}
+
+/// Checks if the identifier forms a valid identifier with the given min/max length as specified in the
+/// [`ICS-24`](https://github.com/cosmos/ibc/tree/main/spec/core/ics-024-host-requirements#paths-identifiers-separators)]
+/// spec.
+pub fn validate_identifier_length(id: &str, min: u64, max: u64) -> Result<(), Error> {
+    // Make sure min is at least one so we reject empty identifiers.
+    let min = min.max(1);
+    let length = id.len() as u64;
+    if (min..=max).contains(&length) {
+        Ok(())
+    } else {
+        Err(Error::InvalidLength {
+            id: id.into(),
+            min,
+            max,
+        })
+    }
+}
+
+/// Checks if a prefix forms a valid identifier with the given min/max identifier's length.
+/// The prefix must be between `min_id_length - 2`, considering `u64::MIN` (1 char) and "-"
+/// and `max_id_length - 21` characters, considering `u64::MAX` (20 chars) and "-".
+pub fn validate_prefix_length(
+    prefix: &str,
+    min_id_length: u64,
+    max_id_length: u64,
+) -> Result<(), Error> {
+    // Prefix must be at least `min_id_length - 2` characters long since the
+    // shortest identifier we can construct is `{prefix}-0` which extends prefix
+    // by 2 characters.
+    let min = min_id_length.saturating_sub(2);
+    // Prefix must be at most `max_id_length - 21` characters long since the
+    // longest identifier we can construct is `{prefix}-{u64::MAX}` which
+    // extends prefix by 21 characters.
+    let max = max_id_length.saturating_sub(21);
+
+    validate_identifier_length(prefix, min, max)
+}
+
+/// Checks if the identifier is a valid named u64 index: {name}-{u64}.
+/// Example: "connection-0", "connection-100", "channel-0", "channel-100".
+pub fn validate_named_u64_index(id: &str, name: &str) -> Result<(), Error> {
+    let number_s = id
+        .strip_prefix(name)
+        .ok_or_else(|| Error::InvalidPrefix { prefix: id.into() })?
+        .strip_prefix('-')
+        .ok_or_else(|| Error::InvalidPrefix { prefix: id.into() })?;
+
+    if number_s.starts_with('0') && number_s.len() > 1 {
+        return Err(Error::InvalidPrefix { prefix: id.into() });
+    }
+
+    _ = number_s
+        .parse::<u64>()
+        .map_err(|_| Error::InvalidPrefix { prefix: id.into() })?;
+
+    Ok(())
+}
+
+/// Default validator function for the Client types.
+pub fn validate_client_type(id: &str) -> Result<(), Error> {
+    validate_identifier_chars(id)?;
+    validate_prefix_length(id, 9, 64)
+}
+
+/// Default validator function for Client identifiers.
+///
+/// A valid client identifier must be between 9-64 characters, as specified in
+/// the ICS-24 spec.
+pub fn validate_client_identifier(id: &str) -> Result<(), Error> {
+    validate_identifier_chars(id)?;
+    validate_identifier_length(id, 9, 64)
+}
+
+/// Default validator function for Connection identifiers.
+///
+/// A valid connection identifier must be between 10-64 characters, as specified
+/// in the ICS-24 spec.
+pub fn validate_connection_identifier(id: &str) -> Result<(), Error> {
+    validate_identifier_chars(id)?;
+    validate_identifier_length(id, 10, 64)?;
+    validate_named_u64_index(id, ConnectionId::prefix())?;
+    Ok(())
+}
+
+/// Default validator function for Port identifiers.
+///
+/// A valid port identifier must be between 2-128 characters, as specified in the
+/// ICS-24 spec.
+pub fn validate_port_identifier(id: &str) -> Result<(), Error> {
+    validate_identifier_chars(id)?;
+    validate_identifier_length(id, 2, 128)
+}
+
+/// Default validator function for Channel identifiers.
+///
+/// A valid channel identifier must be between 8-64 characters, as specified in
+/// the ICS-24 spec.
+pub fn validate_channel_identifier(id: &str) -> Result<(), Error> {
+    validate_identifier_chars(id)?;
+    validate_identifier_length(id, 8, 64)?;
+    validate_named_u64_index(id, ChannelId::prefix())?;
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[test]
+    fn parse_invalid_port_id_min() {
+        // invalid min port id
+        let id = validate_port_identifier("p");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_invalid_port_id_max() {
+        // invalid max port id (test string length is 130 chars)
+        let id = validate_port_identifier(
+            "9anxkcme6je544d5lnj46zqiiiygfqzf8w4bjecbnyj4lj6s7zlpst67yln64tixp9anxkcme6je544d5lnj46zqiiiygfqzf8w4bjecbnyj4lj6s7zlpst67yln64tixp",
+        );
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_invalid_connection_id_min() {
+        // invalid min connection id
+        let id = validate_connection_identifier("connect01");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_connection_id_max() {
+        // invalid max connection id (test string length is 65)
+        let id = validate_connection_identifier(
+            "ihhankr30iy4nna65hjl2wjod7182io1t2s7u3ip3wqtbbn1sl0rgcntqc540r36r",
+        );
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_invalid_connection_id_indexed() {
+        // valid connection id with index
+        validate_connection_identifier("connection-0").expect("success");
+        validate_connection_identifier("connection-123").expect("success");
+        validate_connection_identifier("connection-18446744073709551615").expect("success");
+    }
+
+    #[test]
+    fn parse_invalid_connection_id_non_indexed() {
+        // invalid indexing for connection id
+        validate_connection_identifier("connection-0123").expect_err("failure");
+        validate_connection_identifier("connection0123").expect_err("failure");
+        validate_connection_identifier("connection000").expect_err("failure");
+        // 1 << 64 = 18446744073709551616
+        validate_connection_identifier("connection-18446744073709551616").expect_err("failure");
+    }
+
+    #[test]
+    fn parse_invalid_channel_id_min() {
+        // invalid channel id, must be at least 8 characters
+        let id = validate_channel_identifier("channel");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_channel_id_max() {
+        // invalid channel id (test string length is 65)
+        let id = validate_channel_identifier(
+            "ihhankr30iy4nna65hjl2wjod7182io1t2s7u3ip3wqtbbn1sl0rgcntqc540r36r",
+        );
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_invalid_channel_id_indexed() {
+        // valid channel id with index
+        validate_channel_identifier("channel-0").expect("success");
+        validate_channel_identifier("channel-123").expect("success");
+        validate_channel_identifier("channel-18446744073709551615").expect("success");
+    }
+
+    #[test]
+    fn parse_invalid_channel_id_non_indexed() {
+        // invalid indexing for channel id
+        validate_channel_identifier("channel-0123").expect_err("failure");
+        validate_channel_identifier("channel0123").expect_err("failure");
+        validate_channel_identifier("channel000").expect_err("failure");
+        // 1 << 64 = 18446744073709551616
+        validate_channel_identifier("channel-18446744073709551616").expect_err("failure");
+    }
+
+    #[test]
+    fn parse_invalid_client_id_min() {
+        // invalid min client id
+        let id = validate_client_identifier("client");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_client_id_max() {
+        // invalid max client id (test string length is 65)
+        let id = validate_client_identifier(
+            "f0isrs5enif9e4td3r2jcbxoevhz6u1fthn4aforq7ams52jn5m48eiesfht9ckpn",
+        );
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_invalid_id_chars() {
+        // invalid id chars
+        let id = validate_identifier_chars("channel@01");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn validate_chars_empty_id() {
+        // validate_identifier_chars allows empty identifiers
+        assert!(validate_identifier_chars("").is_ok());
+    }
+
+    #[test]
+    fn validate_length_empty_id() {
+        // validate_identifier_length does not allow empty identifiers
+        assert!(validate_identifier_length("", 0, 64).is_err());
+    }
+
+    #[test]
+    fn validate_min_gt_max_constraints() {
+        // validate_identifier_length rejects the id if min > max.
+        assert!(validate_identifier_length("foobar", 5, 3).is_err());
+    }
+
+    #[test]
+    fn parse_invalid_id_path_separator() {
+        // invalid id with path separator
+        let id = validate_identifier_chars("id/1");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_healthy_client_type() {
+        let id = validate_client_type("07-tendermint");
+        assert!(id.is_ok())
+    }
+
+    #[test]
+    fn parse_invalid_short_client_type() {
+        let id = validate_client_type("<7Char");
+        assert!(id.is_err())
+    }
+
+    #[test]
+    fn parse_invalid_lengthy_client_type() {
+        let id = validate_client_type("InvalidClientTypeWithLengthOfClientId>65Char");
+        assert!(id.is_err())
+    }
+
+    #[rstest]
+    #[case::zero_min_length("", 0, 64, false)]
+    #[case::empty_prefix("", 1, 64, false)]
+    #[case::max_is_low("a", 1, 10, false)]
+    #[case::min_greater_than_max("foobar", 5, 3, false)]
+    #[case::u64_max_is_too_big("a", 3, 21, false)]
+    #[case::u64_min_is_too_small("a", 4, 22, false)]
+    #[case::u64_min_max_boundary("a", 3, 22, true)]
+    #[case("chainA", 1, 32, true)]
+    #[case("chainA", 1, 64, true)]
+    fn test_prefix_length_validation(
+        #[case] prefix: &str,
+        #[case] min: u64,
+        #[case] max: u64,
+        #[case] success: bool,
+    ) {
+        let result = validate_prefix_length(prefix, min, max);
+        assert_eq!(result.is_ok(), success);
+    }
+
+    #[rstest]
+    #[case::zero_padded("channel", "001", false)]
+    #[case::only_zero("connection", "000", false)]
+    #[case::zero("channel", "0", true)]
+    #[case::one("connection", "1", true)]
+    #[case::n1234("channel", "1234", true)]
+    #[case::u64_max("chan", "18446744073709551615", true)]
+    #[case::u64_max_plus_1("chan", "18446744073709551616", false)]
+    fn test_named_index_validation(#[case] name: &str, #[case] id: &str, #[case] success: bool) {
+        let result = validate_named_u64_index(format!("{name}-{id}").as_str(), name);
+        assert_eq!(result.is_ok(), success, "{result:?}");
+    }
+}
diff --git a/ibc-core/ics25-handler/Cargo.toml b/ibc-core/ics25-handler/Cargo.toml
new file mode 100644
index 000000000..43dcf44ed
--- /dev/null
+++ b/ibc-core/ics25-handler/Cargo.toml
@@ -0,0 +1,83 @@
+[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", "handler" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, exposes IBC handler entry points for an integrated IBC core modules.
+    These entry points are responsible for processing incoming IBC messages, performing validation,
+    and execution logic by invoking the appropriate module handler.
+"""
+
+[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",
+  "ibc-primitives/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",
+  "ibc-primitives/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",
+  "ibc-primitives/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",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+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/ibc-core/ics25-handler/src/entrypoint.rs b/ibc-core/ics25-handler/src/entrypoint.rs
new file mode 100644
index 000000000..3c271a9bb
--- /dev/null
+++ b/ibc-core/ics25-handler/src/entrypoint.rs
@@ -0,0 +1,199 @@
+use ibc_core_channel::handler::{
+    acknowledgement_packet_execute, acknowledgement_packet_validate, chan_close_confirm_execute,
+    chan_close_confirm_validate, chan_close_init_execute, chan_close_init_validate,
+    chan_open_ack_execute, chan_open_ack_validate, chan_open_confirm_execute,
+    chan_open_confirm_validate, chan_open_init_execute, chan_open_init_validate,
+    chan_open_try_execute, chan_open_try_validate, recv_packet_execute, recv_packet_validate,
+    timeout_packet_execute, timeout_packet_validate, TimeoutMsgType,
+};
+use ibc_core_channel::types::msgs::{
+    channel_msg_to_port_id, packet_msg_to_port_id, ChannelMsg, PacketMsg,
+};
+use ibc_core_client::context::{ClientExecutionContext, ClientValidationContext};
+use ibc_core_client::handler::{create_client, update_client, upgrade_client};
+use ibc_core_client::types::error::ClientError;
+use ibc_core_client::types::msgs::{ClientMsg, MsgUpdateOrMisbehaviour};
+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_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;
+use ibc_primitives::proto::Any;
+
+/// Entrypoint which performs both validation and message execution
+pub fn dispatch<Ctx>(
+    ctx: &mut Ctx,
+    router: &mut impl Router,
+    msg: MsgEnvelope,
+) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+    <<Ctx::V as ClientValidationContext>::ClientStateRef as TryFrom<Any>>::Error: Into<ClientError>,
+    <<Ctx::E as ClientExecutionContext>::ClientStateMut as TryFrom<Any>>::Error: Into<ClientError>,
+    <Ctx::HostClientState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    validate(ctx, router, msg.clone())?;
+    execute(ctx, router, msg)
+}
+
+/// Entrypoint which only performs message validation
+///
+/// If a transaction contains `n` messages `m_1` ... `m_n`, then
+/// they MUST be processed as follows:
+///     validate(m_1), execute(m_1), ..., validate(m_n), execute(m_n)
+/// That is, the state transition of message `i` must be applied before
+/// message `i+1` is validated. This is equivalent to calling
+/// `dispatch()` on each successively.
+pub fn validate<Ctx>(ctx: &Ctx, router: &impl Router, msg: MsgEnvelope) -> Result<(), ContextError>
+where
+    Ctx: ValidationContext,
+    <<Ctx::V as ClientValidationContext>::ClientStateRef as TryFrom<Any>>::Error: Into<ClientError>,
+    <Ctx::HostClientState as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    match msg {
+        MsgEnvelope::Client(msg) => match msg {
+            ClientMsg::CreateClient(msg) => create_client::validate(ctx, msg),
+            ClientMsg::UpdateClient(msg) => {
+                update_client::validate(ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg))
+            }
+            ClientMsg::Misbehaviour(msg) => {
+                update_client::validate(ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg))
+            }
+            ClientMsg::UpgradeClient(msg) => upgrade_client::validate(ctx, msg),
+            ClientMsg::RecoverClient(_msg) => {
+                // Recover client messages are not dispatched by ibc-rs as they can only be
+                // authorized via a passing governance proposal
+                Ok(())
+            }
+        },
+        MsgEnvelope::Connection(msg) => match msg {
+            ConnectionMsg::OpenInit(msg) => conn_open_init::validate(ctx, msg),
+            ConnectionMsg::OpenTry(msg) => conn_open_try::validate(ctx, msg),
+            ConnectionMsg::OpenAck(msg) => conn_open_ack::validate(ctx, msg),
+            ConnectionMsg::OpenConfirm(msg) => conn_open_confirm::validate(ctx, &msg),
+        },
+        MsgEnvelope::Channel(msg) => {
+            let port_id = channel_msg_to_port_id(&msg);
+            let module_id = router
+                .lookup_module(port_id)
+                .ok_or(RouterError::UnknownPort {
+                    port_id: port_id.clone(),
+                })?;
+            let module = router
+                .get_route(&module_id)
+                .ok_or(RouterError::ModuleNotFound)?;
+
+            match msg {
+                ChannelMsg::OpenInit(msg) => chan_open_init_validate(ctx, module, msg),
+                ChannelMsg::OpenTry(msg) => chan_open_try_validate(ctx, module, msg),
+                ChannelMsg::OpenAck(msg) => chan_open_ack_validate(ctx, module, msg),
+                ChannelMsg::OpenConfirm(msg) => chan_open_confirm_validate(ctx, module, msg),
+                ChannelMsg::CloseInit(msg) => chan_close_init_validate(ctx, module, msg),
+                ChannelMsg::CloseConfirm(msg) => chan_close_confirm_validate(ctx, module, msg),
+            }
+        }
+        MsgEnvelope::Packet(msg) => {
+            let port_id = packet_msg_to_port_id(&msg);
+            let module_id = router
+                .lookup_module(port_id)
+                .ok_or(RouterError::UnknownPort {
+                    port_id: port_id.clone(),
+                })?;
+            let module = router
+                .get_route(&module_id)
+                .ok_or(RouterError::ModuleNotFound)?;
+
+            match msg {
+                PacketMsg::Recv(msg) => recv_packet_validate(ctx, msg),
+                PacketMsg::Ack(msg) => acknowledgement_packet_validate(ctx, module, msg),
+                PacketMsg::Timeout(msg) => {
+                    timeout_packet_validate(ctx, module, TimeoutMsgType::Timeout(msg))
+                }
+                PacketMsg::TimeoutOnClose(msg) => {
+                    timeout_packet_validate(ctx, module, TimeoutMsgType::TimeoutOnClose(msg))
+                }
+            }
+        }
+    }
+}
+
+/// Entrypoint which only performs message execution
+pub fn execute<Ctx>(
+    ctx: &mut Ctx,
+    router: &mut impl Router,
+    msg: MsgEnvelope,
+) -> Result<(), ContextError>
+where
+    Ctx: ExecutionContext,
+    <<Ctx::E as ClientExecutionContext>::ClientStateMut as TryFrom<Any>>::Error: Into<ClientError>,
+{
+    match msg {
+        MsgEnvelope::Client(msg) => match msg {
+            ClientMsg::CreateClient(msg) => create_client::execute(ctx, msg),
+            ClientMsg::UpdateClient(msg) => {
+                update_client::execute(ctx, MsgUpdateOrMisbehaviour::UpdateClient(msg))
+            }
+            ClientMsg::Misbehaviour(msg) => {
+                update_client::execute(ctx, MsgUpdateOrMisbehaviour::Misbehaviour(msg))
+            }
+            ClientMsg::UpgradeClient(msg) => upgrade_client::execute(ctx, msg),
+            ClientMsg::RecoverClient(_msg) => {
+                // Recover client messages are not dispatched by ibc-rs as they can only be
+                // authorized via a passing governance proposal
+                Ok(())
+            }
+        },
+        MsgEnvelope::Connection(msg) => match msg {
+            ConnectionMsg::OpenInit(msg) => conn_open_init::execute(ctx, msg),
+            ConnectionMsg::OpenTry(msg) => conn_open_try::execute(ctx, msg),
+            ConnectionMsg::OpenAck(msg) => conn_open_ack::execute(ctx, msg),
+            ConnectionMsg::OpenConfirm(msg) => conn_open_confirm::execute(ctx, &msg),
+        },
+        MsgEnvelope::Channel(msg) => {
+            let port_id = channel_msg_to_port_id(&msg);
+            let module_id = router
+                .lookup_module(port_id)
+                .ok_or(RouterError::UnknownPort {
+                    port_id: port_id.clone(),
+                })?;
+            let module = router
+                .get_route_mut(&module_id)
+                .ok_or(RouterError::ModuleNotFound)?;
+
+            match msg {
+                ChannelMsg::OpenInit(msg) => chan_open_init_execute(ctx, module, msg),
+                ChannelMsg::OpenTry(msg) => chan_open_try_execute(ctx, module, msg),
+                ChannelMsg::OpenAck(msg) => chan_open_ack_execute(ctx, module, msg),
+                ChannelMsg::OpenConfirm(msg) => chan_open_confirm_execute(ctx, module, msg),
+                ChannelMsg::CloseInit(msg) => chan_close_init_execute(ctx, module, msg),
+                ChannelMsg::CloseConfirm(msg) => chan_close_confirm_execute(ctx, module, msg),
+            }
+        }
+        MsgEnvelope::Packet(msg) => {
+            let port_id = packet_msg_to_port_id(&msg);
+            let module_id = router
+                .lookup_module(port_id)
+                .ok_or(RouterError::UnknownPort {
+                    port_id: port_id.clone(),
+                })?;
+            let module = router
+                .get_route_mut(&module_id)
+                .ok_or(RouterError::ModuleNotFound)?;
+
+            match msg {
+                PacketMsg::Recv(msg) => recv_packet_execute(ctx, module, msg),
+                PacketMsg::Ack(msg) => acknowledgement_packet_execute(ctx, module, msg),
+                PacketMsg::Timeout(msg) => {
+                    timeout_packet_execute(ctx, module, TimeoutMsgType::Timeout(msg))
+                }
+                PacketMsg::TimeoutOnClose(msg) => {
+                    timeout_packet_execute(ctx, module, TimeoutMsgType::TimeoutOnClose(msg))
+                }
+            }
+        }
+    }
+}
diff --git a/ibc-core/ics25-handler/src/lib.rs b/ibc-core/ics25-handler/src/lib.rs
new file mode 100644
index 000000000..783e8e628
--- /dev/null
+++ b/ibc-core/ics25-handler/src/lib.rs
@@ -0,0 +1,33 @@
+//! Exposes IBC handler entry points for an integrated IBC core modules. These
+//! entry points are responsible for processing incoming IBC messages,
+//! performing validation, and execution logics by invoking the appropriate
+//! module handler.
+//!
+//! When processing a given message `M`, if any method in this library returns
+//! an error, the runtime is expected to rollback all state modifications made
+//! to the context (e.g. [`ExecutionContext`](ibc_core_host::ExecutionContext))
+//! while processing `M`. If the transaction containing `M` consists of multiple
+//! messages, then typically the state modifications from all messages are
+//! expected to be rolled back as well.
+#![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
+)]
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+pub mod entrypoint;
+
+/// Re-export IBC handler types from `ibc-core-handler-types` crate.
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_handler_types::*;
+}
diff --git a/ibc-core/ics25-handler/types/Cargo.toml b/ibc-core/ics25-handler/types/Cargo.toml
new file mode 100644
index 000000000..8e5154493
--- /dev/null
+++ b/ibc-core/ics25-handler/types/Cargo.toml
@@ -0,0 +1,109 @@
+[package]
+name         = "ibc-core-handler-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "handler", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-25 Handler Interface data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+serde           = { workspace = true, optional = true }
+schemars        = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-client-types     = { workspace = true }
+ibc-core-connection-types = { workspace = true }
+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-primitives            = { workspace = true }
+ibc-proto                 = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "serde/std",
+  "subtle-encoding/std",
+  "ibc-core-client-types/std",
+  "ibc-core-connection-types/std",
+  "ibc-core-channel-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-router-types/std",
+  "ibc-primitives/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-core-client-types/serde",
+  "ibc-core-connection-types/serde",
+  "ibc-core-channel-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-core-router-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core-client-types/schema",
+  "ibc-core-connection-types/schema",
+  "ibc-core-channel-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-router-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core-client-types/borsh",
+  "ibc-core-connection-types/borsh",
+  "ibc-core-channel-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-core-router-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core-client-types/parity-scale-codec",
+  "ibc-core-connection-types/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-router-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-core/ics25-handler/types/src/error.rs b/ibc-core/ics25-handler/types/src/error.rs
new file mode 100644
index 000000000..5bea4b54d
--- /dev/null
+++ b/ibc-core/ics25-handler/types/src/error.rs
@@ -0,0 +1,48 @@
+//! Defines the context error type
+
+use derive_more::From;
+use displaydoc::Display;
+use ibc_core_channel_types::error::{ChannelError, PacketError};
+use ibc_core_client_types::error::ClientError;
+use ibc_core_connection_types::error::ConnectionError;
+use ibc_core_router_types::error::RouterError;
+use ibc_primitives::prelude::*;
+
+/// Top-level error
+#[derive(Debug, Display, From)]
+pub enum ContextError {
+    /// ICS02 Client error: {0}
+    ClientError(ClientError),
+    /// ICS03 Connection error: {0}
+    ConnectionError(ConnectionError),
+    /// ICS04 Channel error: {0}
+    ChannelError(ChannelError),
+    /// ICS04 Packet error: {0}
+    PacketError(PacketError),
+    /// ICS26 Routing error: {0}
+    RouterError(RouterError),
+}
+
+impl From<ContextError> for ClientError {
+    fn from(context_error: ContextError) -> Self {
+        match context_error {
+            ContextError::ClientError(e) => e,
+            _ => ClientError::Other {
+                description: context_error.to_string(),
+            },
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for ContextError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            Self::ClientError(e) => Some(e),
+            Self::ConnectionError(e) => Some(e),
+            Self::ChannelError(e) => Some(e),
+            Self::PacketError(e) => Some(e),
+            Self::RouterError(e) => Some(e),
+        }
+    }
+}
diff --git a/crates/ibc/src/core/events.rs b/ibc-core/ics25-handler/types/src/events.rs
similarity index 69%
rename from crates/ibc/src/core/events.rs
rename to ibc-core/ics25-handler/types/src/events.rs
index 0d8d654a9..d6a72140b 100644
--- a/crates/ibc/src/core/events.rs
+++ b/ibc-core/ics25-handler/types/src/events.rs
@@ -1,21 +1,16 @@
-//! Events emitted during message handling
+//! Defines events emitted during handling of IBC messages
 
-use crate::prelude::*;
-
-use core::convert::{TryFrom, TryInto};
 use displaydoc::Display;
+use ibc_core_channel_types::{error as channel_error, events as ChannelEvents};
+use ibc_core_client_types::error as client_error;
+use ibc_core_client_types::events::{self as ClientEvents};
+use ibc_core_connection_types::{error as connection_error, events as ConnectionEvents};
+use ibc_core_host_types::error::IdentifierError;
+use ibc_core_router_types::event::ModuleEvent;
+use ibc_primitives::prelude::*;
+use ibc_primitives::ParseTimestampError;
 use tendermint::abci;
 
-use crate::core::ics02_client::error as client_error;
-use crate::core::ics02_client::events::{self as ClientEvents};
-use crate::core::ics03_connection::error as connection_error;
-use crate::core::ics03_connection::events as ConnectionEvents;
-use crate::core::ics04_channel::error as channel_error;
-use crate::core::ics04_channel::events as ChannelEvents;
-use crate::core::timestamp::ParseTimestampError;
-
-use super::ics24_host::identifier::IdentifierError;
-
 /// All error variants related to IBC events
 #[derive(Debug, Display)]
 pub enum Error {
@@ -31,8 +26,6 @@ pub enum Error {
     Channel(channel_error::ChannelError),
     /// parsing timestamp error: `{0}`
     Timestamp(ParseTimestampError),
-    /// decoding protobuf error: `{0}`
-    Decode(prost::DecodeError),
     /// incorrect event type: `{event}`
     IncorrectEventType { event: String },
     /// module event cannot use core event types: `{event:?}`
@@ -48,7 +41,6 @@ impl std::error::Error for Error {
             Self::Connection(e) => Some(e),
             Self::Channel(e) => Some(e),
             Self::Timestamp(e) => Some(e),
-            Self::Decode(e) => Some(e),
             _ => None,
         }
     }
@@ -125,7 +117,7 @@ impl TryFrom<IbcEvent> for abci::Event {
             IbcEvent::AcknowledgePacket(event) => event.try_into().map_err(Error::Channel)?,
             IbcEvent::TimeoutPacket(event) => event.try_into().map_err(Error::Channel)?,
             IbcEvent::ChannelClosed(event) => event.into(),
-            IbcEvent::Module(event) => event.try_into()?,
+            IbcEvent::Module(event) => event.into(),
             IbcEvent::Message(event) => abci::Event {
                 kind: MESSAGE_EVENT.to_string(),
                 attributes: vec![("module", event.module_attribute(), true).into()],
@@ -163,79 +155,6 @@ impl IbcEvent {
     }
 }
 
-/// The event type emitted by IBC applications
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ModuleEvent {
-    pub kind: String,
-    pub attributes: Vec<ModuleEventAttribute>,
-}
-
-impl TryFrom<ModuleEvent> for abci::Event {
-    type Error = Error;
-
-    fn try_from(event: ModuleEvent) -> Result<Self, Self::Error> {
-        let attributes = event.attributes.into_iter().map(Into::into).collect();
-        Ok(abci::Event {
-            kind: event.kind,
-            attributes,
-        })
-    }
-}
-
-impl From<ModuleEvent> for IbcEvent {
-    fn from(e: ModuleEvent) -> Self {
-        IbcEvent::Module(e)
-    }
-}
-
-///  A single key/value pair in a [`ModuleEvent`]
-#[cfg_attr(
-    feature = "parity-scale-codec",
-    derive(
-        parity_scale_codec::Encode,
-        parity_scale_codec::Decode,
-        scale_info::TypeInfo
-    )
-)]
-#[cfg_attr(
-    feature = "borsh",
-    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
-)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ModuleEventAttribute {
-    pub key: String,
-    pub value: String,
-}
-
-impl<K: ToString, V: ToString> From<(K, V)> for ModuleEventAttribute {
-    fn from((k, v): (K, V)) -> Self {
-        Self {
-            key: k.to_string(),
-            value: v.to_string(),
-        }
-    }
-}
-
-impl From<ModuleEventAttribute> for abci::EventAttribute {
-    fn from(attr: ModuleEventAttribute) -> Self {
-        (attr.key, attr.value).into()
-    }
-}
-
 /// An event type that is emitted by the Cosmos SDK.
 ///
 /// We need to emit it as well, as currently [hermes] relies on it.
@@ -282,32 +201,8 @@ impl From<MessageEvent> for IbcEvent {
     }
 }
 
-#[cfg(test)]
-pub mod tests {
-    use super::*;
-    use alloc::vec;
-
-    use crate::core::{
-        ics04_channel::{
-            channel::Order,
-            events::SendPacket,
-            packet::{test_utils::get_dummy_raw_packet, Packet},
-        },
-        ics24_host::identifier::ConnectionId,
-    };
-
-    #[test]
-    /// Ensures that we don't panic when packet data is not valid UTF-8.
-    /// See issue [#199](https://github.com/cosmos/ibc-rs/issues/199)
-    pub fn test_packet_data_non_utf8() {
-        let mut packet = Packet::try_from(get_dummy_raw_packet(1, 1)).unwrap();
-        packet.data = vec![128];
-
-        let ibc_event = IbcEvent::SendPacket(SendPacket::new(
-            packet,
-            Order::Unordered,
-            ConnectionId::default(),
-        ));
-        let _ = abci::Event::try_from(ibc_event);
+impl From<ModuleEvent> for IbcEvent {
+    fn from(e: ModuleEvent) -> Self {
+        IbcEvent::Module(e)
     }
 }
diff --git a/ibc-core/ics25-handler/types/src/lib.rs b/ibc-core/ics25-handler/types/src/lib.rs
new file mode 100644
index 000000000..c30845afc
--- /dev/null
+++ b/ibc-core/ics25-handler/types/src/lib.rs
@@ -0,0 +1,21 @@
+//! Encapsulates essential data structures, facilitating the seamless
+//! interaction between an implemented IBC module using ibc-rs and the
+//! underlying host blockchain.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod error;
+pub mod events;
+pub mod msgs;
diff --git a/ibc-core/ics25-handler/types/src/msgs.rs b/ibc-core/ics25-handler/types/src/msgs.rs
new file mode 100644
index 000000000..645d01f90
--- /dev/null
+++ b/ibc-core/ics25-handler/types/src/msgs.rs
@@ -0,0 +1,272 @@
+use ibc_core_channel_types::msgs::{
+    ChannelMsg, MsgAcknowledgement, MsgChannelCloseConfirm, MsgChannelCloseInit, MsgChannelOpenAck,
+    MsgChannelOpenConfirm, MsgChannelOpenInit, MsgChannelOpenTry, MsgRecvPacket, MsgTimeout,
+    MsgTimeoutOnClose, PacketMsg, ACKNOWLEDGEMENT_TYPE_URL, CHAN_CLOSE_CONFIRM_TYPE_URL,
+    CHAN_CLOSE_INIT_TYPE_URL, CHAN_OPEN_ACK_TYPE_URL, CHAN_OPEN_CONFIRM_TYPE_URL,
+    CHAN_OPEN_INIT_TYPE_URL, CHAN_OPEN_TRY_TYPE_URL, RECV_PACKET_TYPE_URL,
+    TIMEOUT_ON_CLOSE_TYPE_URL, TIMEOUT_TYPE_URL,
+};
+#[allow(deprecated)]
+use ibc_core_client_types::msgs::{
+    ClientMsg, MsgCreateClient, MsgSubmitMisbehaviour, MsgUpdateClient, MsgUpgradeClient,
+    CREATE_CLIENT_TYPE_URL, SUBMIT_MISBEHAVIOUR_TYPE_URL, UPDATE_CLIENT_TYPE_URL,
+    UPGRADE_CLIENT_TYPE_URL,
+};
+use ibc_core_connection_types::msgs::{
+    ConnectionMsg, MsgConnectionOpenAck, MsgConnectionOpenConfirm, MsgConnectionOpenInit,
+    MsgConnectionOpenTry, CONN_OPEN_ACK_TYPE_URL, CONN_OPEN_CONFIRM_TYPE_URL,
+    CONN_OPEN_INIT_TYPE_URL, CONN_OPEN_TRY_TYPE_URL,
+};
+use ibc_core_router_types::error::RouterError;
+use ibc_primitives::prelude::*;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::Protobuf;
+
+/// Enumeration of all messages that the local ICS26 module is capable of routing.
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, PartialEq, Eq, derive_more::From)]
+pub enum MsgEnvelope {
+    Client(ClientMsg),
+    Connection(ConnectionMsg),
+    Channel(ChannelMsg),
+    Packet(PacketMsg),
+}
+
+impl MsgEnvelope {
+    pub fn signer(&self) -> Signer {
+        match self {
+            MsgEnvelope::Client(msg) => match msg {
+                ClientMsg::CreateClient(msg) => msg.signer(),
+                ClientMsg::UpdateClient(msg) => msg.signer(),
+                ClientMsg::UpgradeClient(msg) => msg.signer(),
+                ClientMsg::Misbehaviour(msg) => msg.signer(),
+            },
+            MsgEnvelope::Connection(msg) => match msg {
+                ConnectionMsg::OpenInit(msg) => msg.signer(),
+                ConnectionMsg::OpenTry(msg) => msg.signer(),
+                ConnectionMsg::OpenAck(msg) => msg.signer(),
+                ConnectionMsg::OpenConfirm(msg) => msg.signer(),
+            },
+            MsgEnvelope::Channel(msg) => match msg {
+                ChannelMsg::OpenInit(msg) => msg.signer(),
+                ChannelMsg::OpenTry(msg) => msg.signer(),
+                ChannelMsg::OpenAck(msg) => msg.signer(),
+                ChannelMsg::OpenConfirm(msg) => msg.signer(),
+                ChannelMsg::CloseInit(msg) => msg.signer(),
+                ChannelMsg::CloseConfirm(msg) => msg.signer(),
+            },
+            MsgEnvelope::Packet(msg) => match msg {
+                PacketMsg::Recv(msg) => msg.signer(),
+                PacketMsg::Ack(msg) => msg.signer(),
+                PacketMsg::Timeout(msg) => msg.signer(),
+                PacketMsg::TimeoutOnClose(msg) => msg.signer(),
+            },
+        }
+    }
+
+    pub fn type_url(&self) -> String {
+        match self {
+            MsgEnvelope::Client(msg) => match msg {
+                ClientMsg::CreateClient(msg) => msg.type_url(),
+                ClientMsg::UpdateClient(msg) => msg.type_url(),
+                ClientMsg::UpgradeClient(msg) => msg.type_url(),
+                ClientMsg::Misbehaviour(msg) => msg.type_url(),
+            },
+            MsgEnvelope::Connection(msg) => match msg {
+                ConnectionMsg::OpenInit(msg) => msg.type_url(),
+                ConnectionMsg::OpenTry(msg) => msg.type_url(),
+                ConnectionMsg::OpenAck(msg) => msg.type_url(),
+                ConnectionMsg::OpenConfirm(msg) => msg.type_url(),
+            },
+            MsgEnvelope::Channel(msg) => match msg {
+                ChannelMsg::OpenInit(msg) => msg.type_url(),
+                ChannelMsg::OpenTry(msg) => msg.type_url(),
+                ChannelMsg::OpenAck(msg) => msg.type_url(),
+                ChannelMsg::OpenConfirm(msg) => msg.type_url(),
+                ChannelMsg::CloseInit(msg) => msg.type_url(),
+                ChannelMsg::CloseConfirm(msg) => msg.type_url(),
+            },
+            MsgEnvelope::Packet(msg) => match msg {
+                PacketMsg::Recv(msg) => msg.type_url(),
+                PacketMsg::Ack(msg) => msg.type_url(),
+                PacketMsg::Timeout(msg) => msg.type_url(),
+                PacketMsg::TimeoutOnClose(msg) => msg.type_url(),
+            },
+        }
+    }
+}
+
+#[allow(deprecated)]
+impl TryFrom<Any> for MsgEnvelope {
+    type Error = RouterError;
+
+    fn try_from(any_msg: Any) -> Result<Self, Self::Error> {
+        match any_msg.type_url.as_str() {
+            // ICS2 messages
+            CREATE_CLIENT_TYPE_URL => {
+                // Pop out the message and then wrap it in the corresponding type.
+                let domain_msg = MsgCreateClient::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Client(ClientMsg::CreateClient(domain_msg)))
+            }
+            UPDATE_CLIENT_TYPE_URL => {
+                let domain_msg = MsgUpdateClient::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Client(ClientMsg::UpdateClient(domain_msg)))
+            }
+            UPGRADE_CLIENT_TYPE_URL => {
+                let domain_msg = MsgUpgradeClient::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Client(ClientMsg::UpgradeClient(domain_msg)))
+            }
+            SUBMIT_MISBEHAVIOUR_TYPE_URL => {
+                let domain_msg =
+                    MsgSubmitMisbehaviour::decode_vec(&any_msg.value).map_err(|e| {
+                        RouterError::MalformedMessageBytes {
+                            reason: e.to_string(),
+                        }
+                    })?;
+                Ok(MsgEnvelope::Client(ClientMsg::Misbehaviour(domain_msg)))
+            }
+
+            // ICS03
+            CONN_OPEN_INIT_TYPE_URL => {
+                let domain_msg =
+                    MsgConnectionOpenInit::decode_vec(&any_msg.value).map_err(|e| {
+                        RouterError::MalformedMessageBytes {
+                            reason: e.to_string(),
+                        }
+                    })?;
+                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenInit(domain_msg)))
+            }
+            CONN_OPEN_TRY_TYPE_URL => {
+                let domain_msg = MsgConnectionOpenTry::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenTry(domain_msg)))
+            }
+            CONN_OPEN_ACK_TYPE_URL => {
+                let domain_msg = MsgConnectionOpenAck::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenAck(domain_msg)))
+            }
+            CONN_OPEN_CONFIRM_TYPE_URL => {
+                let domain_msg =
+                    MsgConnectionOpenConfirm::decode_vec(&any_msg.value).map_err(|e| {
+                        RouterError::MalformedMessageBytes {
+                            reason: e.to_string(),
+                        }
+                    })?;
+                Ok(MsgEnvelope::Connection(ConnectionMsg::OpenConfirm(
+                    domain_msg,
+                )))
+            }
+
+            // ICS04 channel messages
+            CHAN_OPEN_INIT_TYPE_URL => {
+                let domain_msg = MsgChannelOpenInit::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Channel(ChannelMsg::OpenInit(domain_msg)))
+            }
+            CHAN_OPEN_TRY_TYPE_URL => {
+                let domain_msg = MsgChannelOpenTry::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Channel(ChannelMsg::OpenTry(domain_msg)))
+            }
+            CHAN_OPEN_ACK_TYPE_URL => {
+                let domain_msg = MsgChannelOpenAck::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Channel(ChannelMsg::OpenAck(domain_msg)))
+            }
+            CHAN_OPEN_CONFIRM_TYPE_URL => {
+                let domain_msg =
+                    MsgChannelOpenConfirm::decode_vec(&any_msg.value).map_err(|e| {
+                        RouterError::MalformedMessageBytes {
+                            reason: e.to_string(),
+                        }
+                    })?;
+                Ok(MsgEnvelope::Channel(ChannelMsg::OpenConfirm(domain_msg)))
+            }
+            CHAN_CLOSE_INIT_TYPE_URL => {
+                let domain_msg = MsgChannelCloseInit::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Channel(ChannelMsg::CloseInit(domain_msg)))
+            }
+            CHAN_CLOSE_CONFIRM_TYPE_URL => {
+                let domain_msg =
+                    MsgChannelCloseConfirm::decode_vec(&any_msg.value).map_err(|e| {
+                        RouterError::MalformedMessageBytes {
+                            reason: e.to_string(),
+                        }
+                    })?;
+                Ok(MsgEnvelope::Channel(ChannelMsg::CloseConfirm(domain_msg)))
+            }
+            // ICS04 packet messages
+            RECV_PACKET_TYPE_URL => {
+                let domain_msg = MsgRecvPacket::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Packet(PacketMsg::Recv(domain_msg)))
+            }
+            ACKNOWLEDGEMENT_TYPE_URL => {
+                let domain_msg = MsgAcknowledgement::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Packet(PacketMsg::Ack(domain_msg)))
+            }
+            TIMEOUT_TYPE_URL => {
+                let domain_msg = MsgTimeout::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Packet(PacketMsg::Timeout(domain_msg)))
+            }
+            TIMEOUT_ON_CLOSE_TYPE_URL => {
+                let domain_msg = MsgTimeoutOnClose::decode_vec(&any_msg.value).map_err(|e| {
+                    RouterError::MalformedMessageBytes {
+                        reason: e.to_string(),
+                    }
+                })?;
+                Ok(MsgEnvelope::Packet(PacketMsg::TimeoutOnClose(domain_msg)))
+            }
+            _ => Err(RouterError::UnknownMessageTypeUrl {
+                url: any_msg.type_url,
+            }),
+        }
+    }
+}
diff --git a/ibc-core/ics26-routing/Cargo.toml b/ibc-core/ics26-routing/Cargo.toml
new file mode 100644
index 000000000..cf809acf1
--- /dev/null
+++ b/ibc-core/ics26-routing/Cargo.toml
@@ -0,0 +1,67 @@
+[package]
+name         = "ibc-core-router"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "routing" ]
+readme       = "./../README.md"
+
+description = """
+    Maintained by `ibc-rs`, contains necessary traits to implement the routing and callback functionality
+    (IBC router module) used for connecting the application layer to the transport layer of an IBC enabled chain.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-primitives         = { workspace = true }
+ibc-core-channel-types = { workspace = true }
+ibc-core-host-types    = { workspace = true }
+ibc-core-router-types  = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "subtle-encoding/std",
+  "ibc-primitives/std",
+  "ibc-core-channel-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-router-types/std",
+]
+serde = [
+  "ibc-primitives/serde",
+  "ibc-core-channel-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-core-router-types/serde",
+]
+borsh = [
+  "ibc-primitives/borsh",
+  "ibc-core-channel-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-core-router-types/borsh",
+]
+schema = [
+  "ibc-core-channel-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-router-types/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+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-primitives/parity-scale-codec",
+]
diff --git a/ibc-core/ics26-routing/src/lib.rs b/ibc-core/ics26-routing/src/lib.rs
new file mode 100644
index 000000000..b5b585ee5
--- /dev/null
+++ b/ibc-core/ics26-routing/src/lib.rs
@@ -0,0 +1,24 @@
+//! This library contains necessary traits to implement an IBC router module when integrating with `ibc-rs`.
+#![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
+)]
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod module;
+pub mod router;
+
+/// Re-exports router data structures from the `ibc-core-router-types` crate
+pub mod types {
+    #[doc(inline)]
+    pub use ibc_core_router_types::*;
+}
diff --git a/ibc-core/ics26-routing/src/module.rs b/ibc-core/ics26-routing/src/module.rs
new file mode 100644
index 000000000..26b296713
--- /dev/null
+++ b/ibc-core/ics26-routing/src/module.rs
@@ -0,0 +1,161 @@
+/// The trait that defines an IBC application
+use core::fmt::Debug;
+
+use ibc_core_channel_types::acknowledgement::Acknowledgement;
+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_types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc_core_router_types::module::ModuleExtras;
+use ibc_primitives::prelude::*;
+use ibc_primitives::Signer;
+
+pub trait Module: Debug {
+    fn on_chan_open_init_validate(
+        &self,
+        order: Order,
+        connection_hops: &[ConnectionId],
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        counterparty: &Counterparty,
+        version: &Version,
+    ) -> Result<Version, ChannelError>;
+
+    fn on_chan_open_init_execute(
+        &mut self,
+        order: Order,
+        connection_hops: &[ConnectionId],
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        counterparty: &Counterparty,
+        version: &Version,
+    ) -> Result<(ModuleExtras, Version), ChannelError>;
+
+    fn on_chan_open_try_validate(
+        &self,
+        order: Order,
+        connection_hops: &[ConnectionId],
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        counterparty: &Counterparty,
+        counterparty_version: &Version,
+    ) -> Result<Version, ChannelError>;
+
+    fn on_chan_open_try_execute(
+        &mut self,
+        order: Order,
+        connection_hops: &[ConnectionId],
+        port_id: &PortId,
+        channel_id: &ChannelId,
+        counterparty: &Counterparty,
+        counterparty_version: &Version,
+    ) -> Result<(ModuleExtras, Version), ChannelError>;
+
+    fn on_chan_open_ack_validate(
+        &self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _counterparty_version: &Version,
+    ) -> Result<(), ChannelError> {
+        Ok(())
+    }
+
+    fn on_chan_open_ack_execute(
+        &mut self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _counterparty_version: &Version,
+    ) -> Result<ModuleExtras, ChannelError> {
+        Ok(ModuleExtras::empty())
+    }
+
+    fn on_chan_open_confirm_validate(
+        &self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+    ) -> Result<(), ChannelError> {
+        Ok(())
+    }
+
+    fn on_chan_open_confirm_execute(
+        &mut self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+    ) -> Result<ModuleExtras, ChannelError> {
+        Ok(ModuleExtras::empty())
+    }
+
+    fn on_chan_close_init_validate(
+        &self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+    ) -> Result<(), ChannelError> {
+        Ok(())
+    }
+
+    fn on_chan_close_init_execute(
+        &mut self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+    ) -> Result<ModuleExtras, ChannelError> {
+        Ok(ModuleExtras::empty())
+    }
+
+    fn on_chan_close_confirm_validate(
+        &self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+    ) -> Result<(), ChannelError> {
+        Ok(())
+    }
+
+    fn on_chan_close_confirm_execute(
+        &mut self,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+    ) -> Result<ModuleExtras, ChannelError> {
+        Ok(ModuleExtras::empty())
+    }
+
+    // Note: no `on_recv_packet_validate()`
+    // the `onRecvPacket` callback always succeeds
+    // if any error occurs, than an "error acknowledgement"
+    // must be returned
+
+    fn on_recv_packet_execute(
+        &mut self,
+        packet: &Packet,
+        relayer: &Signer,
+    ) -> (ModuleExtras, Acknowledgement);
+
+    fn on_acknowledgement_packet_validate(
+        &self,
+        _packet: &Packet,
+        _acknowledgement: &Acknowledgement,
+        _relayer: &Signer,
+    ) -> Result<(), PacketError>;
+
+    fn on_acknowledgement_packet_execute(
+        &mut self,
+        _packet: &Packet,
+        _acknowledgement: &Acknowledgement,
+        _relayer: &Signer,
+    ) -> (ModuleExtras, Result<(), PacketError>);
+
+    /// Note: `MsgTimeout` and `MsgTimeoutOnClose` use the same callback
+
+    fn on_timeout_packet_validate(
+        &self,
+        packet: &Packet,
+        relayer: &Signer,
+    ) -> Result<(), PacketError>;
+
+    /// Note: `MsgTimeout` and `MsgTimeoutOnClose` use the same callback
+
+    fn on_timeout_packet_execute(
+        &mut self,
+        packet: &Packet,
+        relayer: &Signer,
+    ) -> (ModuleExtras, Result<(), PacketError>);
+}
diff --git a/ibc-core/ics26-routing/src/router.rs b/ibc-core/ics26-routing/src/router.rs
new file mode 100644
index 000000000..b73d16d5c
--- /dev/null
+++ b/ibc-core/ics26-routing/src/router.rs
@@ -0,0 +1,18 @@
+//! Defines the `Router`, which binds modules to ports
+
+use ibc_core_host_types::identifiers::PortId;
+use ibc_core_router_types::module::ModuleId;
+
+use crate::module::Module;
+
+/// Router as defined in ICS-26, which binds modules to ports.
+pub trait Router {
+    /// Returns a reference to a `Module` registered against the specified `ModuleId`
+    fn get_route(&self, module_id: &ModuleId) -> Option<&dyn Module>;
+
+    /// Returns a mutable reference to a `Module` registered against the specified `ModuleId`
+    fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn Module>;
+
+    /// Return the module_id associated with a given port_id
+    fn lookup_module(&self, port_id: &PortId) -> Option<ModuleId>;
+}
diff --git a/ibc-core/ics26-routing/types/Cargo.toml b/ibc-core/ics26-routing/types/Cargo.toml
new file mode 100644
index 000000000..71acf4bee
--- /dev/null
+++ b/ibc-core/ics26-routing/types/Cargo.toml
@@ -0,0 +1,80 @@
+[package]
+name         = "ibc-core-router-types"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "cosmos", "ibc", "routing", "types" ]
+readme       = "./../../README.md"
+
+description = """
+    Maintained by `ibc-rs`, encapsulates essential ICS-26 Routing Module data structures and domain types,
+    as specified in the Inter-Blockchain Communication (IBC) protocol. Designed for universal applicability
+    to facilitate development and integration across diverse IBC-enabled projects.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+
+# ibc dependencies
+ibc-core-host-types = { workspace = true }
+ibc-primitives      = { workspace = true }
+ibc-proto           = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "serde/std",
+  "subtle-encoding/std",
+  "ibc-primitives/std",
+  "ibc-core-host-types/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-primitives/serde",
+  "ibc-core-host-types/serde",
+  "ibc-primitives/serde",
+  "ibc-proto/serde",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-primitives/borsh",
+  "ibc-proto/borsh",
+]
+schema = [
+  "dep:schemars",
+  "ibc-core-host-types/schema",
+  "ibc-primitives/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-core-host-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-core/ics26-routing/types/src/error.rs b/ibc-core/ics26-routing/types/src/error.rs
new file mode 100644
index 000000000..01fb3c6c6
--- /dev/null
+++ b/ibc-core/ics26-routing/types/src/error.rs
@@ -0,0 +1,19 @@
+use displaydoc::Display;
+use ibc_core_host_types::identifiers::PortId;
+use ibc_primitives::prelude::*;
+
+/// Error type for the router module.
+#[derive(Debug, Display)]
+pub enum RouterError {
+    /// unknown type URL `{url}`
+    UnknownMessageTypeUrl { url: String },
+    /// the message is malformed and cannot be decoded error: `{reason}`
+    MalformedMessageBytes { reason: String },
+    /// port `{port_id}` is unknown
+    UnknownPort { port_id: PortId },
+    /// module not found
+    ModuleNotFound,
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for RouterError {}
diff --git a/ibc-core/ics26-routing/types/src/event.rs b/ibc-core/ics26-routing/types/src/event.rs
new file mode 100644
index 000000000..b3754b2d7
--- /dev/null
+++ b/ibc-core/ics26-routing/types/src/event.rs
@@ -0,0 +1,67 @@
+use ibc_primitives::prelude::*;
+use tendermint::abci;
+
+/// The event type emitted by IBC applications
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ModuleEvent {
+    pub kind: String,
+    pub attributes: Vec<ModuleEventAttribute>,
+}
+
+impl From<ModuleEvent> for abci::Event {
+    fn from(event: ModuleEvent) -> Self {
+        let attributes = event.attributes.into_iter().map(Into::into).collect();
+        abci::Event {
+            kind: event.kind,
+            attributes,
+        }
+    }
+}
+
+///  A single key/value pair in a [`ModuleEvent`]
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ModuleEventAttribute {
+    pub key: String,
+    pub value: String,
+}
+
+impl<K: ToString, V: ToString> From<(K, V)> for ModuleEventAttribute {
+    fn from((k, v): (K, V)) -> Self {
+        Self {
+            key: k.to_string(),
+            value: v.to_string(),
+        }
+    }
+}
+
+impl From<ModuleEventAttribute> for abci::EventAttribute {
+    fn from(attr: ModuleEventAttribute) -> Self {
+        (attr.key, attr.value).into()
+    }
+}
diff --git a/ibc-core/ics26-routing/types/src/lib.rs b/ibc-core/ics26-routing/types/src/lib.rs
new file mode 100644
index 000000000..78d5fd12b
--- /dev/null
+++ b/ibc-core/ics26-routing/types/src/lib.rs
@@ -0,0 +1,20 @@
+#![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
+)]
+
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod error;
+pub mod event;
+pub mod module;
diff --git a/ibc-core/ics26-routing/types/src/module.rs b/ibc-core/ics26-routing/types/src/module.rs
new file mode 100644
index 000000000..82867fde0
--- /dev/null
+++ b/ibc-core/ics26-routing/types/src/module.rs
@@ -0,0 +1,74 @@
+use alloc::borrow::Borrow;
+use core::fmt::{Debug, Display, Error as FmtError, Formatter};
+
+use ibc_primitives::prelude::*;
+
+use crate::event::ModuleEvent;
+
+/// Module name, internal to the chain.
+///
+/// That is, the IBC protocol never exposes this name. Note that this is
+/// different from IBC host [identifiers][ibc_core_host_types::identifiers],
+/// which are exposed to other chains by the protocol.
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct ModuleId(String);
+
+impl ModuleId {
+    pub fn new(s: String) -> Self {
+        Self(s)
+    }
+}
+
+impl Display for ModuleId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl Borrow<str> for ModuleId {
+    fn borrow(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
+/// Logs and events produced during module callbacks
+#[cfg_attr(
+    feature = "parity-scale-codec",
+    derive(
+        parity_scale_codec::Encode,
+        parity_scale_codec::Decode,
+        scale_info::TypeInfo
+    )
+)]
+#[cfg_attr(
+    feature = "borsh",
+    derive(borsh::BorshSerialize, borsh::BorshDeserialize)
+)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Debug)]
+pub struct ModuleExtras {
+    pub events: Vec<ModuleEvent>,
+    pub log: Vec<String>,
+}
+
+impl ModuleExtras {
+    pub fn empty() -> Self {
+        ModuleExtras {
+            events: Vec::new(),
+            log: Vec::new(),
+        }
+    }
+}
diff --git a/ibc-core/src/lib.rs b/ibc-core/src/lib.rs
new file mode 100644
index 000000000..30d04e384
--- /dev/null
+++ b/ibc-core/src/lib.rs
@@ -0,0 +1,91 @@
+//! Re-exports data structures and implementations of all the IBC core (TAO) modules/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
+)]
+
+/// Re-exports IBC handler entrypoints from the `ibc-core-handler` crate for
+/// added convenience.
+pub mod entrypoint {
+    #[doc(inline)]
+    pub use ibc_core_handler::entrypoint::*;
+}
+
+/// Re-exports IBC primitive types from the `ibc-primitives` crate
+pub mod primitives {
+    #[doc(inline)]
+    pub use ibc_primitives::*;
+}
+
+/// Re-exports ICS-02 implementation from the `ibc-core-client` crate
+pub mod client {
+    #[doc(inline)]
+    pub use ibc_core_client::*;
+}
+
+/// Re-exports ICS-03 implementation from the `ibc-core-connection` crate
+pub mod connection {
+    #[doc(inline)]
+    pub use ibc_core_connection::*;
+}
+
+/// Re-exports ICS-04 implementation from the `ibc-core-channel` crate
+pub mod channel {
+    #[doc(inline)]
+    pub use ibc_core_channel::*;
+}
+
+/// Re-exports ICS-23 data structures from the `ibc-core-commitment-types` crate
+pub mod commitment_types {
+    #[doc(inline)]
+    pub use ibc_core_commitment_types::*;
+}
+
+/// Re-exports ICS-24 implementation from the `ibc-core-host` crate
+pub mod host {
+    #[doc(inline)]
+    pub use ibc_core_host::*;
+}
+
+/// Re-exports ICS-25 implementation from the `ibc-core-handler` crate
+pub mod handler {
+    #[doc(inline)]
+    pub use ibc_core_handler::*;
+}
+
+/// Re-exports ICS-26 implementation from the `ibc-core-router` crate
+pub mod router {
+    #[doc(inline)]
+    pub use ibc_core_router::*;
+}
+
+/// Re-exports convenient derive macros from `ibc-derive` crate.
+pub mod derive {
+    /// To specify the generic arguments for `ClientState`, use the following
+    /// attributes:
+    ///
+    /// - `#[validation(<YourClientValidationContext>)]`
+    /// - `#[execution(<YourClientExecutionContext>)]`
+    ///
+    /// The argument to the `validation` or `execution` attributes may contain
+    /// lifetimes or generic types, and even that types might be bounded by
+    /// traits. For instance:
+    ///
+    /// - `#[validation(Context<S>)]`
+    /// - `#[validation(Context<'a, S>)]`
+    /// - `#[validation(Context<'a, S: Clone>)]`
+    pub use ibc_derive::IbcCoreClientState as ClientState;
+    /// A derive macro for implementing the
+    /// [`ConsensusState`](crate::client::context::consensus_state::ConsensusState) trait for
+    /// enums. Enums with variants that also implement the
+    /// [`ConsensusState`](crate::client::context::consensus_state::ConsensusState) trait can
+    /// leverage this macro for automatic implementation.
+    pub use ibc_derive::IbcCoreConsensusState as ConsensusState;
+}
diff --git a/ibc-data-types/Cargo.toml b/ibc-data-types/Cargo.toml
new file mode 100644
index 000000000..da618570d
--- /dev/null
+++ b/ibc-data-types/Cargo.toml
@@ -0,0 +1,100 @@
+[package]
+name         = "ibc-data-types"
+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 = """
+    Maintained by `ibc-rs`, delineates standard data structures and domain types of the Inter-Blockchain Communication (IBC) protocol.
+    Designed for universal application, enabling diverse projects across IBC ecosystem to build using a shared language.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+ibc-app-transfer-types      = { workspace = true }
+ibc-core-client-types       = { workspace = true }
+ibc-core-connection-types   = { workspace = true }
+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-handler-types      = { workspace = true }
+ibc-client-tendermint-types = { workspace = true }
+ibc-client-wasm-types       = { workspace = true }
+ibc-primitives              = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-app-transfer-types/std",
+  "ibc-core-client-types/std",
+  "ibc-core-connection-types/std",
+  "ibc-core-channel-types/std",
+  "ibc-core-commitment-types/std",
+  "ibc-core-host-types/std",
+  "ibc-core-router-types/std",
+  "ibc-core-handler-types/std",
+  "ibc-client-tendermint-types/std",
+  "ibc-client-wasm-types/std",
+  "ibc-primitives/std",
+]
+serde = [
+  "ibc-app-transfer-types/serde",
+  "ibc-core-client-types/serde",
+  "ibc-core-connection-types/serde",
+  "ibc-core-channel-types/serde",
+  "ibc-core-commitment-types/serde",
+  "ibc-core-host-types/serde",
+  "ibc-core-router-types/serde",
+  "ibc-core-handler-types/serde",
+  "ibc-client-tendermint-types/serde",
+  "ibc-client-wasm-types/serde",
+  "ibc-primitives/serde",
+]
+borsh = [
+  "ibc-app-transfer-types/borsh",
+  "ibc-core-client-types/borsh",
+  "ibc-core-connection-types/borsh",
+  "ibc-core-channel-types/borsh",
+  "ibc-core-commitment-types/borsh",
+  "ibc-core-host-types/borsh",
+  "ibc-core-router-types/borsh",
+  "ibc-core-handler-types/borsh",
+  "ibc-client-tendermint-types/borsh",
+  "ibc-primitives/borsh",
+]
+schema = [
+  "ibc-app-transfer-types/schema",
+  "ibc-core-client-types/schema",
+  "ibc-core-connection-types/schema",
+  "ibc-core-channel-types/schema",
+  "ibc-core-commitment-types/schema",
+  "ibc-core-host-types/schema",
+  "ibc-core-router-types/schema",
+  "ibc-core-handler-types/schema",
+  "ibc-client-tendermint-types/schema",
+  "ibc-client-wasm-types/schema",
+  "ibc-primitives/schema",
+]
+parity-scale-codec = [
+  "ibc-app-transfer-types/parity-scale-codec",
+  "ibc-core-client-types/parity-scale-codec",
+  "ibc-core-connection-types/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-router-types/parity-scale-codec",
+  "ibc-core-handler-types/parity-scale-codec",
+  "ibc-client-tendermint-types/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+]
+cosmwasm = [
+  "ibc-client-wasm-types/cosmwasm",
+]
diff --git a/ibc-data-types/README.md b/ibc-data-types/README.md
new file mode 100644
index 000000000..90671b8cb
--- /dev/null
+++ b/ibc-data-types/README.md
@@ -0,0 +1,50 @@
+# IBC Types
+
+This crate serves as a central hub for re-exporting the implemented
+Inter-Blockchain Communication (IBC) data structures. It simplifies the
+integration of various IBC domain types into your project. IBC is a distributed
+protocol facilitating communication between independent sovereign blockchains
+and The IBC data structures within this crate abstract various IBC
+specifications, offering a convenient means to encode and decode IBC messages to
+and from proto types exposed by
+[`ibc-proto`](https://github.com/cosmos/ibc-proto-rs) crate. Additionally, it
+supports parsing events to and from ABCI event types.
+
+## Sub-Crates
+
+This crate organizes data structures into three main modules: `core`, `clients`,
+and `apps`. Each category further re-exports its respective sub data structures,
+providing a clear and modular path for easy navigation and usage:
+
+### Core
+
+| <div style="width:300px">Specification</div> | Crate |
+| -------------------------------------------- | ------ |
+| ICS-02: Client Semantics                     | [ibc-core-client-types](./../ibc-core/ics02-client/types) |
+| ICS-03: Connection Semantics                 | [ibc-core-connection-types](./../ibc-core/ics03-connection/types) |
+| ICS-04: Channel and Packet Semantics         | [ibc-core-channel-types](./../ibc-core/ics04-channel/types) |
+| ICS-24: Host Requirements                    | [ibc-core-host-types](./../ibc-core/ics24-host/types) |
+| ICS-25: Handler Interface                    | [ibc-core-handler-types](./../ibc-core/ics25-handler/types) |
+| ICS-26: Routing Module                       | [ibc-core-routing-types](./../ibc-core/ics26-routing/types) |
+
+### Clients
+
+| <div style="width:300px">Specification</div> | Crate |
+| -------------------------------------------- | ------ |
+| ICS-07: Tendermint Client                    | [ibc-client-tendermint-types](./../ibc-clients/ics07-tendermint/types) |
+
+### Apps
+
+| <div style="width:300px">Specification</div> | Crate |
+| -------------------------------------------- | ------ |
+| ICS-20: Fungible Token Transfer              | [ibc-app-transfer-types](./../ibc-apps/ics20-transfer/types) |
+
+## Contributing
+
+IBC is specified in English in the [cosmos/ibc
+repo](https://github.com/cosmos/ibc). Any protocol changes or clarifications
+should be contributed there.
+
+If you're interested in contributing, please take a look at the
+[CONTRIBUTING](./../CONTRIBUTING.md) guidelines. We welcome and appreciate
+community contributions!
diff --git a/ibc-data-types/src/lib.rs b/ibc-data-types/src/lib.rs
new file mode 100644
index 000000000..ab9ffd8b2
--- /dev/null
+++ b/ibc-data-types/src/lib.rs
@@ -0,0 +1,92 @@
+//! Re-exports data structures of various specifications within the
+//! Inter-Blockchain Communication (IBC) protocol. Designed for universal
+//! application, enabling diverse projects across the IBC ecosystem to
+//! build using a shared language.
+#![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
+)]
+
+/// Re-exports IBC primitive types from the `ibc-primitives` crate
+pub mod primitives {
+    #[doc(inline)]
+    pub use ibc_primitives::*;
+}
+
+/// Re-exports data structures of all IBC core specifications
+pub mod core {
+    /// Re-exports ICS-02 client data structures from the
+    /// `ibc-core-client-types` crate
+    pub mod client {
+        #[doc(inline)]
+        pub use ibc_core_client_types::*;
+    }
+    /// Re-exports ICS-03 connection data structures from the
+    /// `ibc-core-connection-types` crate
+    pub mod connection {
+        #[doc(inline)]
+        pub use ibc_core_connection_types::*;
+    }
+    /// Re-exports ICS-04 channel data structures from the
+    /// `ibc-core-channel-types` crate
+    pub mod channel {
+        #[doc(inline)]
+        pub use ibc_core_channel_types::*;
+    }
+    /// Re-exports ICS-23 commitment data structures from the
+    /// `ibc-core-commitment-types` crate
+    pub mod commitment {
+        #[doc(inline)]
+        pub use ibc_core_commitment_types::*;
+    }
+    /// Re-exports ICS-24 host data structures from the `ibc-core-host-types`
+    /// crate
+    pub mod host {
+        #[doc(inline)]
+        pub use ibc_core_host_types::*;
+    }
+    /// Re-exports ICS-25 handler data structures from the
+    /// `ibc-core-handler-types` crate
+    pub mod handler {
+        #[doc(inline)]
+        pub use ibc_core_handler_types::*;
+    }
+    /// Re-exports ICS-26 routing data structures from the
+    /// `ibc-core-router-types` crate
+    pub mod router {
+        #[doc(inline)]
+        pub use ibc_core_router_types::*;
+    }
+}
+
+pub mod clients {
+    /// Re-exports ICS-07 tendermint client data structures from the
+    /// `ibc-client-tendermint-types` crate
+    pub mod tendermint {
+        #[doc(inline)]
+        pub use ibc_client_tendermint_types::*;
+    }
+    /// Re-exports ICS-08 wasm client data structures from the
+    /// `ibc-client-wasm-types` crate
+    pub mod wasm {
+        #[doc(inline)]
+        pub use ibc_client_wasm_types::*;
+    }
+}
+
+/// Re-exports data structures of various IBC applications
+pub mod apps {
+    /// Re-exports ICS-27 client update data structures from the
+    /// `ibc-core-client-types` crate
+    pub mod transfer {
+        #[doc(inline)]
+        pub use ibc_app_transfer_types::*;
+    }
+}
diff --git a/ibc-derive/Cargo.toml b/ibc-derive/Cargo.toml
new file mode 100644
index 000000000..cf7ce7cbf
--- /dev/null
+++ b/ibc-derive/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name        = "ibc-derive"
+version     = "0.7.0"
+license     = { workspace = true }
+repository  = { workspace = true }
+edition     = { workspace = true }
+readme      = "README.md"
+description = "Maintained by `ibc-rs`, macros implementations of #[derive(ClientState)] and #[derive(ConsensusState)]"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn         = { version = "2" }
+proc-macro2 = { version = "1" }
+quote       = { version = "1" }
diff --git a/crates/ibc-derive/LICENSE b/ibc-derive/LICENSE
similarity index 100%
rename from crates/ibc-derive/LICENSE
rename to ibc-derive/LICENSE
diff --git a/ibc-derive/README.md b/ibc-derive/README.md
new file mode 100644
index 000000000..2742cb6ea
--- /dev/null
+++ b/ibc-derive/README.md
@@ -0,0 +1,9 @@
+# IBC Derive
+
+This crate provides a set of procedural macros for deriving IBC-related traits
+defined in the [`ibc-rs`](https://github.com/cosmos/ibc-rs) repository, reducing
+the amount of boilerplate code required to implement them. It contains macro
+implementations for the following traits:
+
+- [ClientState](./../ibc-core/ics02-client/context/src/client_state.rs)
+- [ConsensusState](./../ibc-core/ics02-client/context/src/consensus_state.rs)
diff --git a/ibc-derive/src/client_state.rs b/ibc-derive/src/client_state.rs
new file mode 100644
index 000000000..4e3055199
--- /dev/null
+++ b/ibc-derive/src/client_state.rs
@@ -0,0 +1,169 @@
+mod traits;
+
+use proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
+use syn::{DeriveInput, Error, GenericArgument, Ident, WherePredicate};
+use traits::client_state_common::impl_ClientStateCommon;
+use traits::client_state_execution::impl_ClientStateExecution;
+use traits::client_state_validation::impl_ClientStateValidation;
+
+use crate::utils::Imports;
+
+const MISSING_ATTR: &str = "must be annotated with #[validation(<your ClientValidationContext>) and #[execution(<your ClientExecutionContext>)]";
+const MISSING_VALIDATION_ATTR: &str = "missing #[validation(<your ClientValidationContext>)]";
+const MISSING_EXECUTION_ATTR: &str = "missing #[execution(<your ClientExecutionContext>)]";
+const INVALID_ATTR: &str = "invalid attribute annotation";
+const INVALID_ARGS: &str = "invalid context argument";
+
+#[derive(Clone)]
+pub(crate) struct ClientCtx {
+    ident: Ident,
+    generics: Vec<GenericArgument>,
+    predicates: Vec<WherePredicate>,
+}
+
+impl ClientCtx {
+    fn new(ident: Ident, generics: Vec<GenericArgument>, predicates: Vec<WherePredicate>) -> Self {
+        Self {
+            ident,
+            generics,
+            predicates,
+        }
+    }
+
+    /// Returns the `impl` quote block for the given context type, used for
+    /// implementing ClientValidation/ExecutionContext on the given enum.
+    fn impl_ts(&self) -> TokenStream {
+        let gens = self.generics.clone();
+
+        quote! { impl<#(#gens),*> }
+    }
+
+    /// Returns the `where` clause quote block for the given context type, used
+    /// for implementing ClientValidation/ExecutionContext on the given enum.
+    fn where_clause_ts(&self) -> TokenStream {
+        let predicates = self.predicates.clone();
+
+        quote! { where #(#predicates),* }
+    }
+}
+
+impl ToTokens for ClientCtx {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let ident = &self.ident;
+
+        let generics = self.generics.iter().map(|g| g.to_token_stream());
+
+        tokens.extend(quote! { #ident<#(#generics),*> });
+    }
+}
+
+pub(crate) struct Opts {
+    client_validation_context: ClientCtx,
+    client_execution_context: ClientCtx,
+}
+
+impl Opts {
+    /// Returns the `Opts` struct from the given `DeriveInput` AST.
+    fn from_derive_input(ast: &DeriveInput) -> Result<Self, Error> {
+        let mut client_validation_context = None;
+        let mut client_execution_context = None;
+
+        if ast.attrs.is_empty() {
+            return Err(Error::new_spanned(ast, MISSING_ATTR));
+        }
+
+        for attr in &ast.attrs {
+            if let syn::Meta::List(meta_list) = &attr.meta {
+                let path: syn::Path = syn::parse2(meta_list.tokens.clone())?;
+
+                let path_segment = match path.segments.last() {
+                    Some(segment) => segment.clone(),
+                    None => return Err(Error::new_spanned(&meta_list.path, INVALID_ARGS)),
+                };
+
+                let meta_ident = match meta_list.path.require_ident() {
+                    Ok(ident) => ident.to_string(),
+                    Err(e) => return Err(Error::new_spanned(attr, e)),
+                };
+
+                let (gens, ps) = split_for_impl(path_segment.arguments)?;
+
+                let ctx = ClientCtx::new(path_segment.ident.clone(), gens, ps);
+
+                match meta_ident.as_str() {
+                    "validation" => client_validation_context = Some(ctx),
+                    "execution" => client_execution_context = Some(ctx),
+                    _ => return Err(Error::new_spanned(&meta_list.path, INVALID_ATTR)),
+                };
+            }
+        }
+
+        let client_validation_context = client_validation_context
+            .ok_or_else(|| Error::new_spanned(ast, MISSING_VALIDATION_ATTR))?;
+        let client_execution_context = client_execution_context
+            .ok_or_else(|| Error::new_spanned(ast, MISSING_EXECUTION_ATTR))?;
+
+        Ok(Self {
+            client_validation_context,
+            client_execution_context,
+        })
+    }
+}
+
+fn split_for_impl(
+    args: syn::PathArguments,
+) -> Result<(Vec<GenericArgument>, Vec<WherePredicate>), Error> {
+    let mut generics = vec![];
+    let mut predicates = vec![];
+
+    if let syn::PathArguments::AngleBracketed(gen) = args {
+        for arg in gen.args {
+            match arg.clone() {
+                GenericArgument::Type(_) | GenericArgument::Lifetime(_) => {
+                    generics.push(arg);
+                }
+                GenericArgument::Constraint(c) => {
+                    let ident = c.ident.into_token_stream();
+
+                    let gen = syn::parse2(ident.into_token_stream())?;
+
+                    generics.push(gen);
+
+                    let gen_type_param: syn::TypeParam =
+                        syn::parse2(arg.clone().into_token_stream())?;
+
+                    predicates.push(syn::parse2(gen_type_param.into_token_stream())?);
+                }
+                _ => return Err(Error::new_spanned(arg, INVALID_ARGS)),
+            };
+        }
+    }
+
+    Ok((generics, predicates))
+}
+
+pub fn client_state_derive_impl(ast: DeriveInput, imports: &Imports) -> TokenStream {
+    let opts = match Opts::from_derive_input(&ast) {
+        Ok(opts) => opts,
+        Err(e) => panic!("{e}"),
+    };
+
+    let enum_name = &ast.ident;
+    let enum_variants = match &ast.data {
+        syn::Data::Enum(enum_data) => &enum_data.variants,
+        _ => panic!("ClientState only supports enums"),
+    };
+
+    let ClientStateCommon_impl_block = impl_ClientStateCommon(enum_name, enum_variants, imports);
+    let ClientStateValidation_impl_block =
+        impl_ClientStateValidation(enum_name, enum_variants, &opts, imports);
+    let ClientStateExecution_impl_block =
+        impl_ClientStateExecution(enum_name, enum_variants, &opts, imports);
+
+    quote! {
+        #ClientStateCommon_impl_block
+        #ClientStateValidation_impl_block
+        #ClientStateExecution_impl_block
+    }
+}
diff --git a/crates/ibc-derive/src/client_state/traits.rs b/ibc-derive/src/client_state/traits.rs
similarity index 100%
rename from crates/ibc-derive/src/client_state/traits.rs
rename to ibc-derive/src/client_state/traits.rs
diff --git a/crates/ibc-derive/src/client_state/traits/client_state_common.rs b/ibc-derive/src/client_state/traits/client_state_common.rs
similarity index 76%
rename from crates/ibc-derive/src/client_state/traits/client_state_common.rs
rename to ibc-derive/src/client_state/traits/client_state_common.rs
index 3c9f4f4b6..bac320ff8 100644
--- a/crates/ibc-derive/src/client_state/traits/client_state_common.rs
+++ b/ibc-derive/src/client_state/traits/client_state_common.rs
@@ -1,74 +1,70 @@
 use proc_macro2::{Ident, TokenStream};
 use quote::quote;
-use syn::{
-    punctuated::{Iter, Punctuated},
-    token::Comma,
-    Variant,
-};
+use syn::punctuated::{Iter, Punctuated};
+use syn::token::Comma;
+use syn::Variant;
 
 use crate::utils::{get_enum_variant_type_path, Imports};
 
 pub(crate) fn impl_ClientStateCommon(
     client_state_enum_name: &Ident,
     enum_variants: &Punctuated<Variant, Comma>,
+    imports: &Imports,
 ) -> TokenStream {
     let verify_consensus_state_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! { verify_consensus_state(cs, consensus_state) },
+        imports,
     );
     let client_type_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! {client_type(cs)},
+        imports,
     );
     let latest_height_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! {latest_height(cs)},
+        imports,
     );
     let validate_proof_height_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! {validate_proof_height(cs, proof_height)},
-    );
-    let confirm_not_frozen_impl = delegate_call_in_match(
-        client_state_enum_name,
-        enum_variants.iter(),
-        quote! {confirm_not_frozen(cs)},
-    );
-    let expired_impl = delegate_call_in_match(
-        client_state_enum_name,
-        enum_variants.iter(),
-        quote! {expired(cs, elapsed)},
+        imports,
     );
     let verify_upgrade_client_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! {verify_upgrade_client(cs, upgraded_client_state, upgraded_consensus_state, proof_upgrade_client, proof_upgrade_consensus_state, root)},
+        imports,
     );
     let verify_membership_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! {verify_membership(cs, prefix, proof, root, path, value)},
+        imports,
     );
     let verify_non_membership_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         quote! {verify_non_membership(cs, prefix, proof, root, path)},
+        imports,
     );
 
     let HostClientState = client_state_enum_name;
 
-    let Any = Imports::Any();
-    let CommitmentRoot = Imports::CommitmentRoot();
-    let CommitmentPrefix = Imports::CommitmentPrefix();
-    let CommitmentProofBytes = Imports::CommitmentProofBytes();
-    let ClientStateCommon = Imports::ClientStateCommon();
-    let ClientType = Imports::ClientType();
-    let ClientError = Imports::ClientError();
-    let Height = Imports::Height();
-    let Path = Imports::Path();
+    let Any = imports.any();
+    let CommitmentRoot = imports.commitment_root();
+    let CommitmentPrefix = imports.commitment_prefix();
+    let CommitmentProofBytes = imports.commitment_proof_bytes();
+    let ClientStateCommon = imports.client_state_common();
+    let ClientType = imports.client_type();
+    let ClientError = imports.client_error();
+    let Height = imports.height();
+    let Path = imports.path();
 
     quote! {
         impl #ClientStateCommon for #HostClientState {
@@ -95,18 +91,6 @@ pub(crate) fn impl_ClientStateCommon(
                 }
             }
 
-            fn confirm_not_frozen(&self) -> core::result::Result<(), #ClientError> {
-                match self {
-                    #(#confirm_not_frozen_impl),*
-                }
-            }
-
-            fn expired(&self, elapsed: core::time::Duration) -> bool {
-                match self {
-                    #(#expired_impl),*
-                }
-            }
-
             fn verify_upgrade_client(
                 &self,
                 upgraded_client_state: #Any,
@@ -152,9 +136,9 @@ pub(crate) fn impl_ClientStateCommon(
 ///
 /// Generates the per-enum variant function call delegation token streams.
 ///
-/// enum_name:     The user's enum identifier (e.g. `HostClientState`)
-/// enum_variants: An iterator of all enum variants (e.g. `[HostClientState::Tendermint, HostClientState::Mock]`)
-/// fn_call:       The tokens for the function call. Fully-qualified syntax is assumed, where the name for `self`
+/// `enum_name`:     The user's enum identifier (e.g. `HostClientState`)
+/// `enum_variants`: An iterator of all enum variants (e.g. `[HostClientState::Tendermint, HostClientState::Mock]`)
+/// `fn_call`:       The tokens for the function call. Fully qualified syntax is assumed, where the name for `self`
 ///                  is `cs` (e.g. `client_type(cs)`).
 ///
 /// For example,
@@ -180,8 +164,9 @@ fn delegate_call_in_match(
     enum_name: &Ident,
     enum_variants: Iter<'_, Variant>,
     fn_call: TokenStream,
+    imports: &Imports,
 ) -> Vec<TokenStream> {
-    let ClientStateCommon = Imports::ClientStateCommon();
+    let ClientStateCommon = imports.client_state_common();
 
     enum_variants
         .map(|variant| {
diff --git a/crates/ibc-derive/src/client_state/traits/client_state_execution.rs b/ibc-derive/src/client_state/traits/client_state_execution.rs
similarity index 62%
rename from crates/ibc-derive/src/client_state/traits/client_state_execution.rs
rename to ibc-derive/src/client_state/traits/client_state_execution.rs
index 7b6903122..ddecb00ad 100644
--- a/crates/ibc-derive/src/client_state/traits/client_state_execution.rs
+++ b/ibc-derive/src/client_state/traits/client_state_execution.rs
@@ -1,38 +1,38 @@
 use proc_macro2::{Ident, TokenStream};
-use quote::quote;
-use syn::{
-    punctuated::{Iter, Punctuated},
-    token::Comma,
-    Variant,
-};
-
-use crate::{
-    client_state::Opts,
-    utils::{get_enum_variant_type_path, Imports},
-};
+use quote::{quote, ToTokens};
+use syn::punctuated::{Iter, Punctuated};
+use syn::token::Comma;
+use syn::Variant;
+
+use crate::client_state::Opts;
+use crate::utils::{get_enum_variant_type_path, Imports};
 
 pub(crate) fn impl_ClientStateExecution(
     client_state_enum_name: &Ident,
     enum_variants: &Punctuated<Variant, Comma>,
     opts: &Opts,
+    imports: &Imports,
 ) -> TokenStream {
     let initialise_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         opts,
         quote! { initialise(cs, ctx, client_id, consensus_state) },
+        imports,
     );
     let update_state_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         opts,
         quote! { update_state(cs, ctx, client_id, header) },
+        imports,
     );
     let update_state_on_misbehaviour_impl = delegate_call_in_match(
         client_state_enum_name,
         enum_variants.iter(),
         opts,
-        quote! { update_state_on_misbehaviour(cs, ctx, client_id, client_message, update_kind) },
+        quote! { update_state_on_misbehaviour(cs, ctx, client_id, client_message) },
+        imports,
     );
 
     let update_state_with_upgrade_client_impl = delegate_call_in_match(
@@ -40,23 +40,40 @@ pub(crate) fn impl_ClientStateExecution(
         enum_variants.iter(),
         opts,
         quote! { update_state_on_upgrade(cs, ctx, client_id, upgraded_client_state, upgraded_consensus_state) },
+        imports,
+    );
+
+    let update_on_recovery_impl = delegate_call_in_match(
+        client_state_enum_name,
+        enum_variants.iter(),
+        opts,
+        quote! { update_on_recovery(cs, ctx, client_id, substitute_client_state, substitute_consensus_state) },
+        imports,
     );
 
+    // The imports we need for the generated code.
+    let Any = imports.any();
+    let ClientId = imports.client_id();
+    let ClientError = imports.client_error();
+    let ClientStateExecution = imports.client_state_execution();
+    let Height = imports.height();
+
+    // The types we need for the generated code.
     let HostClientState = client_state_enum_name;
-    let ClientExecutionContext = &opts.client_execution_context;
+    let E = &opts.client_execution_context.clone().into_token_stream();
+
+    // The `impl` block quote based on whether the context includes generics.
+    let Impl = opts.client_execution_context.impl_ts();
 
-    let Any = Imports::Any();
-    let ClientId = Imports::ClientId();
-    let ClientError = Imports::ClientError();
-    let ClientStateExecution = Imports::ClientStateExecution();
-    let UpdateKind = Imports::UpdateKind();
-    let Height = Imports::Height();
+    // The `Where` clause quote based on whether the generics within the context
+    // include trait bounds
+    let Where = opts.client_execution_context.where_clause_ts();
 
     quote! {
-        impl #ClientStateExecution<#ClientExecutionContext> for #HostClientState {
+        #Impl #ClientStateExecution<#E> for #HostClientState #Where {
             fn initialise(
                 &self,
-                ctx: &mut #ClientExecutionContext,
+                ctx: &mut #E,
                 client_id: &#ClientId,
                 consensus_state: #Any,
             ) -> Result<(), #ClientError> {
@@ -67,7 +84,7 @@ pub(crate) fn impl_ClientStateExecution(
 
             fn update_state(
                 &self,
-                ctx: &mut #ClientExecutionContext,
+                ctx: &mut #E,
                 client_id: &#ClientId,
                 header: #Any,
             ) -> core::result::Result<Vec<#Height>, #ClientError> {
@@ -78,10 +95,9 @@ pub(crate) fn impl_ClientStateExecution(
 
             fn update_state_on_misbehaviour(
                 &self,
-                ctx: &mut #ClientExecutionContext,
+                ctx: &mut #E,
                 client_id: &#ClientId,
                 client_message: #Any,
-                update_kind: &#UpdateKind,
             ) -> core::result::Result<(), #ClientError> {
                 match self {
                     #(#update_state_on_misbehaviour_impl),*
@@ -90,7 +106,7 @@ pub(crate) fn impl_ClientStateExecution(
 
             fn update_state_on_upgrade(
                 &self,
-                ctx: &mut #ClientExecutionContext,
+                ctx: &mut #E,
                 client_id: &#ClientId,
                 upgraded_client_state: #Any,
                 upgraded_consensus_state: #Any,
@@ -99,6 +115,18 @@ pub(crate) fn impl_ClientStateExecution(
                     #(#update_state_with_upgrade_client_impl),*
                 }
             }
+
+            fn update_on_recovery(
+                &self,
+                ctx: &mut #E,
+                client_id: &#ClientId,
+                substitute_client_state: #Any,
+                substitute_consensus_state: #Any,
+            ) -> core::result::Result<(), #ClientError> {
+                match self {
+                    #(#update_on_recovery_impl),*
+                }
+            }
         }
 
     }
@@ -109,8 +137,9 @@ fn delegate_call_in_match(
     enum_variants: Iter<'_, Variant>,
     opts: &Opts,
     fn_call: TokenStream,
+    imports: &Imports,
 ) -> Vec<TokenStream> {
-    let ClientStateExecution = Imports::ClientStateExecution();
+    let ClientStateExecution = imports.client_state_execution();
 
     enum_variants
         .map(|variant| {
diff --git a/ibc-derive/src/client_state/traits/client_state_validation.rs b/ibc-derive/src/client_state/traits/client_state_validation.rs
new file mode 100644
index 000000000..263411b15
--- /dev/null
+++ b/ibc-derive/src/client_state/traits/client_state_validation.rs
@@ -0,0 +1,137 @@
+use proc_macro2::{Ident, TokenStream};
+use quote::{quote, ToTokens};
+use syn::punctuated::{Iter, Punctuated};
+use syn::token::Comma;
+use syn::Variant;
+
+use crate::client_state::Opts;
+use crate::utils::{get_enum_variant_type_path, Imports};
+
+pub(crate) fn impl_ClientStateValidation(
+    client_state_enum_name: &Ident,
+    enum_variants: &Punctuated<Variant, Comma>,
+    opts: &Opts,
+    imports: &Imports,
+) -> TokenStream {
+    let verify_client_message_impl = delegate_call_in_match(
+        client_state_enum_name,
+        enum_variants.iter(),
+        opts,
+        quote! { verify_client_message(cs, ctx, client_id, client_message) },
+        imports,
+    );
+
+    let check_for_misbehaviour_impl = delegate_call_in_match(
+        client_state_enum_name,
+        enum_variants.iter(),
+        opts,
+        quote! { check_for_misbehaviour(cs, ctx, client_id, client_message) },
+        imports,
+    );
+
+    let status_impl = delegate_call_in_match(
+        client_state_enum_name,
+        enum_variants.iter(),
+        opts,
+        quote! { status(cs, ctx, client_id) },
+        imports,
+    );
+
+    let check_substitute_impl = delegate_call_in_match(
+        client_state_enum_name,
+        enum_variants.iter(),
+        opts,
+        quote! { check_substitute(cs, ctx, substitute_client_state) },
+        imports,
+    );
+
+    // The imports we need for the generated code.
+    let Any = imports.any();
+    let ClientId = imports.client_id();
+    let ClientError = imports.client_error();
+    let ClientStateValidation = imports.client_state_validation();
+    let Status = imports.status();
+
+    // The types we need for the generated code.
+    let HostClientState = client_state_enum_name;
+    let V = opts.client_validation_context.clone().into_token_stream();
+
+    // The `impl` block quote based on whether the context includes generics.
+    let Impl = opts.client_validation_context.impl_ts();
+
+    // The `Where` clause quote based on whether the generics within the context
+    // include trait bounds
+    let Where = opts.client_validation_context.where_clause_ts();
+
+    quote! {
+        #Impl #ClientStateValidation<#V> for #HostClientState #Where {
+            fn verify_client_message(
+                &self,
+                ctx: &#V,
+                client_id: &#ClientId,
+                client_message: #Any,
+            ) -> core::result::Result<(), #ClientError> {
+                match self {
+                    #(#verify_client_message_impl),*
+                }
+            }
+
+            fn check_for_misbehaviour(
+                &self,
+                ctx: &#V,
+                client_id: &#ClientId,
+                client_message: #Any,
+            ) -> core::result::Result<bool, #ClientError> {
+                match self {
+                    #(#check_for_misbehaviour_impl),*
+                }
+            }
+
+            fn status(
+                &self,
+                ctx: &#V,
+                client_id: &#ClientId,
+            ) -> core::result::Result<#Status, #ClientError> {
+                match self {
+                    #(#status_impl),*
+                }
+            }
+
+            fn check_substitute(
+                &self,
+                ctx: &#V,
+                substitute_client_state: #Any,
+            ) -> core::result::Result<(), #ClientError> {
+                match self {
+                    #(#check_substitute_impl),*
+                }
+            }
+        }
+
+    }
+}
+
+fn delegate_call_in_match(
+    enum_name: &Ident,
+    enum_variants: Iter<'_, Variant>,
+    opts: &Opts,
+    fn_call: TokenStream,
+    imports: &Imports,
+) -> Vec<TokenStream> {
+    let ClientStateValidation = imports.client_state_validation();
+
+    enum_variants
+        .map(|variant| {
+            let HostClientState = enum_name;
+            let Tendermint = &variant.ident;
+            let TmClientState = get_enum_variant_type_path(variant);
+            let ClientValidationContext = &opts.client_validation_context;
+
+            // Note: We use `HostClientState` and `Tendermint`, etc as *variable names*. They're
+            // only meant to improve readability of the `quote`; it's not literally what's generated!
+            quote! {
+                #HostClientState::#Tendermint(cs) => <#TmClientState as #ClientStateValidation<#ClientValidationContext>>::#fn_call
+            }
+        })
+        .collect()
+}
diff --git a/crates/ibc-derive/src/consensus_state.rs b/ibc-derive/src/consensus_state.rs
similarity index 56%
rename from crates/ibc-derive/src/consensus_state.rs
rename to ibc-derive/src/consensus_state.rs
index 3a00ea2de..87fafcffe 100644
--- a/crates/ibc-derive/src/consensus_state.rs
+++ b/ibc-derive/src/consensus_state.rs
@@ -1,25 +1,29 @@
 use proc_macro2::TokenStream;
 use quote::quote;
-use syn::{punctuated::Iter, DeriveInput, Ident, Variant};
+use syn::punctuated::Iter;
+use syn::{DeriveInput, Ident, Variant};
 
 use crate::utils::{get_enum_variant_type_path, Imports};
 
-pub fn consensus_state_derive_impl(ast: DeriveInput) -> TokenStream {
+pub fn consensus_state_derive_impl(ast: DeriveInput, imports: &Imports) -> TokenStream {
     let enum_name = &ast.ident;
-    let enum_variants = match ast.data {
-        syn::Data::Enum(ref enum_data) => &enum_data.variants,
+    let enum_variants = match &ast.data {
+        syn::Data::Enum(enum_data) => &enum_data.variants,
         _ => panic!("ConsensusState only supports enums"),
     };
 
-    let root_impl = delegate_call_in_match(enum_name, enum_variants.iter(), quote! {root(cs)});
-    let timestamp_impl =
-        delegate_call_in_match(enum_name, enum_variants.iter(), quote! {timestamp(cs)});
-    let encode_vec_impl =
-        delegate_call_in_match(enum_name, enum_variants.iter(), quote! {encode_vec(cs)});
+    let root_impl =
+        delegate_call_in_match(enum_name, enum_variants.iter(), quote! {root(cs)}, imports);
+    let timestamp_impl = delegate_call_in_match(
+        enum_name,
+        enum_variants.iter(),
+        quote! {timestamp(cs)},
+        imports,
+    );
 
-    let CommitmentRoot = Imports::CommitmentRoot();
-    let ConsensusState = Imports::ConsensusState();
-    let Timestamp = Imports::Timestamp();
+    let CommitmentRoot = imports.commitment_root();
+    let ConsensusState = imports.consensus_state();
+    let Timestamp = imports.timestamp();
 
     quote! {
         impl #ConsensusState for #enum_name {
@@ -34,12 +38,6 @@ pub fn consensus_state_derive_impl(ast: DeriveInput) -> TokenStream {
                     #(#timestamp_impl),*
                 }
             }
-
-            fn encode_vec(&self) -> Vec<u8> {
-                match self {
-                    #(#encode_vec_impl),*
-                }
-            }
         }
     }
 }
@@ -48,8 +46,9 @@ fn delegate_call_in_match(
     enum_name: &Ident,
     enum_variants: Iter<'_, Variant>,
     fn_call: TokenStream,
+    imports: &Imports,
 ) -> Vec<TokenStream> {
-    let ConsensusState = Imports::ConsensusState();
+    let ConsensusState = imports.consensus_state();
 
     enum_variants
         .map(|variant| {
diff --git a/ibc-derive/src/lib.rs b/ibc-derive/src/lib.rs
new file mode 100644
index 000000000..381c7fdf3
--- /dev/null
+++ b/ibc-derive/src/lib.rs
@@ -0,0 +1,62 @@
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+#![allow(non_snake_case)]
+
+mod client_state;
+mod consensus_state;
+mod utils;
+
+use client_state::client_state_derive_impl;
+use consensus_state::consensus_state_derive_impl;
+use proc_macro::TokenStream as RawTokenStream;
+use syn::{parse_macro_input, DeriveInput};
+use utils::{Imports, SupportedCrate};
+
+#[proc_macro_derive(IbcClientState, attributes(validation, execution))]
+pub fn ibc_client_state_macro_derive(input: RawTokenStream) -> RawTokenStream {
+    generate_client_state_derive(input, SupportedCrate::Ibc)
+}
+
+#[proc_macro_derive(IbcCoreClientState, attributes(validation, execution))]
+pub fn ibc_core_client_state_macro_derive(input: RawTokenStream) -> RawTokenStream {
+    generate_client_state_derive(input, SupportedCrate::IbcCore)
+}
+
+fn generate_client_state_derive(input: RawTokenStream, source: SupportedCrate) -> RawTokenStream {
+    let ast: DeriveInput = parse_macro_input!(input);
+
+    let imports = Imports::new(source);
+
+    let output = client_state_derive_impl(ast, &imports);
+
+    RawTokenStream::from(output)
+}
+
+#[proc_macro_derive(IbcConsensusState)]
+pub fn ibc_consensus_state_macro_derive(input: RawTokenStream) -> RawTokenStream {
+    generate_consensus_state_derive(input, SupportedCrate::Ibc)
+}
+
+#[proc_macro_derive(IbcCoreConsensusState)]
+pub fn ibc_core_consensus_state_macro_derive(input: RawTokenStream) -> RawTokenStream {
+    generate_consensus_state_derive(input, SupportedCrate::IbcCore)
+}
+
+fn generate_consensus_state_derive(
+    input: RawTokenStream,
+    source: SupportedCrate,
+) -> RawTokenStream {
+    let ast: DeriveInput = parse_macro_input!(input);
+
+    let imports = Imports::new(source);
+
+    let output = consensus_state_derive_impl(ast, &imports);
+
+    RawTokenStream::from(output)
+}
diff --git a/ibc-derive/src/utils.rs b/ibc-derive/src/utils.rs
new file mode 100644
index 000000000..ab3986951
--- /dev/null
+++ b/ibc-derive/src/utils.rs
@@ -0,0 +1,142 @@
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{Path, Variant};
+
+/// The IBC crates that we already support in the derive macro
+pub enum SupportedCrate {
+    Ibc,
+    IbcCore,
+}
+
+/// Encodes the ibc-rs types that will be used in the macro
+///
+/// Note: we use `ibc` or `ibc-core` as our top-level crate, due to the `extern
+/// crate ibc as ibc;` statement we inject.
+pub struct Imports {
+    prefix: TokenStream,
+}
+
+impl Imports {
+    pub fn new(crate_name: SupportedCrate) -> Self {
+        let prefix = match crate_name {
+            SupportedCrate::Ibc => quote! {::ibc::core},
+            SupportedCrate::IbcCore => quote! {::ibc_core},
+        };
+
+        Self { prefix }
+    }
+
+    pub fn prefix(&self) -> &TokenStream {
+        &self.prefix
+    }
+
+    pub fn commitment_root(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::commitment_types::commitment::CommitmentRoot}
+    }
+
+    pub fn commitment_prefix(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::commitment_types::commitment::CommitmentPrefix}
+    }
+
+    pub fn commitment_proof_bytes(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::commitment_types::commitment::CommitmentProofBytes}
+    }
+
+    pub fn path(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::host::types::path::Path}
+    }
+
+    pub fn consensus_state(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::client::context::consensus_state::ConsensusState}
+    }
+
+    pub fn client_state_common(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::client::context::client_state::ClientStateCommon}
+    }
+
+    pub fn client_state_validation(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::client::context::client_state::ClientStateValidation}
+    }
+
+    pub fn client_state_execution(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::client::context::client_state::ClientStateExecution}
+    }
+
+    pub fn client_id(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::host::types::identifiers::ClientId}
+    }
+
+    pub fn client_type(&self) -> TokenStream {
+        let Prefix = self.prefix();
+        quote! {#Prefix::host::types::identifiers::ClientType}
+    }
+
+    pub fn client_error(&self) -> TokenStream {
+        let prefix = self.prefix();
+        quote! {#prefix::client::types::error::ClientError}
+    }
+
+    pub fn height(&self) -> TokenStream {
+        let prefix = self.prefix();
+        quote! {#prefix::client::types::Height}
+    }
+
+    pub fn any(&self) -> TokenStream {
+        let prefix = self.prefix();
+        quote! {#prefix::primitives::proto::Any}
+    }
+
+    pub fn timestamp(&self) -> TokenStream {
+        let prefix = self.prefix();
+        quote! {#prefix::primitives::Timestamp}
+    }
+
+    pub fn status(&self) -> TokenStream {
+        let prefix = self.prefix();
+        quote! {#prefix::client::types::Status}
+    }
+}
+
+/// Retrieves the field of a given enum variant. Outputs an error message if the enum variant
+/// is in the wrong format (i.e. isn't an unnamed enum, or contains more than one field).
+///
+/// For example, given
+/// ```ignore
+///
+/// #[derive(IbcClientState)]
+/// enum HostClientState {
+///     Tendermint(TmClientState),
+/// }
+/// ```
+/// when acting on the `Tendermint` variant, this will return `TmClientState`.
+///
+pub fn get_enum_variant_type_path(enum_variant: &Variant) -> &Path {
+    let variant_name = &enum_variant.ident;
+    let syn::Fields::Unnamed(variant_unnamed_fields) = &enum_variant.fields else {
+        panic!("\"{variant_name}\" variant must be unnamed, such as `{variant_name}({variant_name}ClientState)`")
+    };
+
+    if variant_unnamed_fields.unnamed.iter().len() != 1 {
+        panic!("\"{variant_name}\" must contain exactly one field, such as `{variant_name}({variant_name}ClientState)`");
+    }
+
+    // A representation of the variant's field (e.g. `TmClientState`). We must dig into
+    // the field to get the `TmClientState` path.
+    let unnamed_field = variant_unnamed_fields.unnamed.first().unwrap();
+
+    match &unnamed_field.ty {
+        syn::Type::Path(path) => &path.path,
+        _ => {
+            panic!("Invalid enum variant {variant_name} field. Please use an explicit, named type.")
+        }
+    }
+}
diff --git a/ibc-primitives/Cargo.toml b/ibc-primitives/Cargo.toml
new file mode 100644
index 000000000..0afd83407
--- /dev/null
+++ b/ibc-primitives/Cargo.toml
@@ -0,0 +1,69 @@
+[package]
+name         = "ibc-primitives"
+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 = """
+    Maintained by `ibc-rs`, furnishes essential types and traits universally
+    utilized in the implementation of diverse IBC modules, encompassing
+    core functionalities, clients, and applications.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# external dependencies
+borsh       = { workspace = true, optional = true }
+derive_more = { workspace = true }
+displaydoc  = { workspace = true }
+prost       = { workspace = true }
+schemars    = { workspace = true, optional = true }
+serde       = { workspace = true, optional = true }
+time        = { version = ">=0.3.0, <0.3.37", default-features = false }
+
+# ibc dependencies
+ibc-proto = { workspace = true }
+
+# cosmos dependencies
+tendermint = { workspace = true }
+
+# parity dependencies
+parity-scale-codec = { workspace = true, optional = true }
+scale-info         = { workspace = true, optional = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "displaydoc/std",
+  "prost/std",
+  "serde/std",
+  "ibc-proto/std",
+  "tendermint/std",
+  "time/std",
+]
+serde = [
+  "dep:serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "dep:parity-scale-codec",
+  "dep:scale-info",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-primitives/README.md b/ibc-primitives/README.md
new file mode 100644
index 000000000..db295a8fd
--- /dev/null
+++ b/ibc-primitives/README.md
@@ -0,0 +1,5 @@
+# IBC Primitives
+
+This library furnishes essential types, traits, and utilities universally utilized in the
+implementation of diverse IBC modules, encompassing core functionalities,
+clients, and applications.
diff --git a/ibc-primitives/src/lib.rs b/ibc-primitives/src/lib.rs
new file mode 100644
index 000000000..5aa99f4e5
--- /dev/null
+++ b/ibc-primitives/src/lib.rs
@@ -0,0 +1,36 @@
+//! Contains primitives types and traits common to various IBC 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
+)]
+
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod prelude;
+pub mod utils;
+
+mod traits;
+pub use traits::*;
+
+mod types;
+pub use types::*;
+
+// Helper module for serializing and deserializing types through the `String`
+// primarily used by IBC applications.
+#[cfg(feature = "serde")]
+pub mod serializers;
+
+pub mod proto {
+    pub use ibc_proto::google::protobuf::{Any, Duration, Timestamp};
+    pub use ibc_proto::Protobuf;
+}
diff --git a/crates/ibc/src/prelude.rs b/ibc-primitives/src/prelude.rs
similarity index 80%
rename from crates/ibc/src/prelude.rs
rename to ibc-primitives/src/prelude.rs
index 9ff42a989..b7ac674e9 100644
--- a/crates/ibc/src/prelude.rs
+++ b/ibc-primitives/src/prelude.rs
@@ -1,11 +1,9 @@
-pub use core::prelude::v1::*;
-
 // Re-export according to alloc::prelude::v1 because it is not yet stabilized
 // https://doc.rust-lang.org/src/alloc/prelude/v1.rs.html
 pub use alloc::borrow::ToOwned;
 pub use alloc::boxed::Box;
+pub use alloc::collections::BTreeMap;
 pub use alloc::string::{String, ToString};
 pub use alloc::vec::Vec;
-
-pub use alloc::format;
-pub use alloc::vec;
+pub use alloc::{format, str, vec};
+pub use core::prelude::v1::*;
diff --git a/ibc-primitives/src/serializers.rs b/ibc-primitives/src/serializers.rs
new file mode 100644
index 000000000..d61756ea1
--- /dev/null
+++ b/ibc-primitives/src/serializers.rs
@@ -0,0 +1,27 @@
+use core::fmt::Display;
+use core::str::FromStr;
+
+use serde::{de, Deserialize, Deserializer, Serializer};
+
+use crate::prelude::*;
+
+// Note: This method serializes to a String instead of a str in order to
+// avoid a wasm compilation issue. Specifically, str (de)serialization hits
+// some kind of f64/f32 case when compiled into wasm, but this fails
+// validation on f32/f64 wasm runtimes.
+pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+where
+    T: Display,
+    S: Serializer,
+{
+    serializer.serialize_str(value.to_string().as_ref())
+}
+
+pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
+where
+    T: FromStr,
+    T::Err: Display,
+    D: Deserializer<'de>,
+{
+    T::from_str(<String>::deserialize(deserializer)?.as_str()).map_err(de::Error::custom)
+}
diff --git a/ibc-primitives/src/traits/mod.rs b/ibc-primitives/src/traits/mod.rs
new file mode 100644
index 000000000..d473c3a78
--- /dev/null
+++ b/ibc-primitives/src/traits/mod.rs
@@ -0,0 +1,3 @@
+mod proto;
+
+pub use proto::*;
diff --git a/ibc-primitives/src/traits/proto.rs b/ibc-primitives/src/traits/proto.rs
new file mode 100644
index 000000000..54dc35846
--- /dev/null
+++ b/ibc-primitives/src/traits/proto.rs
@@ -0,0 +1,44 @@
+use core::fmt::Display;
+
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::Protobuf;
+
+use crate::prelude::*;
+
+/// Types that implement this trait can be converted to
+/// a raw Protobuf `Any` type.
+pub trait ToProto<P>: Protobuf<P>
+where
+    P: From<Self> + prost::Message + prost::Name + Default,
+    <Self as TryFrom<P>>::Error: Display,
+{
+    fn type_url() -> String {
+        P::type_url()
+    }
+
+    fn to_any(self) -> Any {
+        Any {
+            type_url: P::type_url(),
+            value: self.encode_vec(),
+        }
+    }
+}
+
+impl<T, P> ToProto<P> for T
+where
+    T: Protobuf<P>,
+    P: From<Self> + prost::Message + prost::Name + Default,
+    <Self as TryFrom<P>>::Error: Display,
+{
+}
+
+/// Convenient trait for converting types to a raw Protobuf `Vec<u8>`.
+pub trait ToVec {
+    fn to_vec(&self) -> Vec<u8>;
+}
+
+impl<T: prost::Message> ToVec for T {
+    fn to_vec(&self) -> Vec<u8> {
+        self.encode_to_vec()
+    }
+}
diff --git a/ibc-primitives/src/types/mod.rs b/ibc-primitives/src/types/mod.rs
new file mode 100644
index 000000000..8df0d3c40
--- /dev/null
+++ b/ibc-primitives/src/types/mod.rs
@@ -0,0 +1,5 @@
+mod signer;
+mod timestamp;
+
+pub use signer::*;
+pub use timestamp::*;
diff --git a/crates/ibc/src/signer.rs b/ibc-primitives/src/types/signer.rs
similarity index 94%
rename from crates/ibc/src/signer.rs
rename to ibc-primitives/src/types/signer.rs
index f26e923a1..2ce3eb618 100644
--- a/crates/ibc/src/signer.rs
+++ b/ibc-primitives/src/types/signer.rs
@@ -17,6 +17,7 @@ use derive_more::Display;
     derive(borsh::BorshSerialize, borsh::BorshDeserialize)
 )]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Display)]
 pub struct Signer(String);
 
diff --git a/crates/ibc/src/core/timestamp.rs b/ibc-primitives/src/types/timestamp.rs
similarity index 80%
rename from crates/ibc/src/core/timestamp.rs
rename to ibc-primitives/src/types/timestamp.rs
index 510af94ee..40b72c2eb 100644
--- a/crates/ibc/src/core/timestamp.rs
+++ b/ibc-primitives/src/types/timestamp.rs
@@ -1,9 +1,7 @@
-//! Defines the representation of timestamps used in packet timeouts
-
-use crate::prelude::*;
+//! Defines the representation of timestamps used in IBC.
 
 use core::fmt::{Display, Error as FmtError, Formatter};
-use core::hash::{Hash, Hasher};
+use core::hash::Hash;
 use core::num::ParseIntError;
 use core::ops::{Add, Sub};
 use core::str::FromStr;
@@ -13,9 +11,11 @@ use displaydoc::Display;
 use tendermint::Time;
 use time::OffsetDateTime;
 
+use crate::prelude::*;
+
 pub const ZERO_DURATION: Duration = Duration::from_secs(0);
 
-/// A newtype wrapper over `Option<Time>` to keep track of
+/// A new type wrapper over `Option<Time>` to keep track of
 /// IBC packet timeout.
 ///
 /// We use an explicit `Option` type to distinguish this when converting between
@@ -23,8 +23,11 @@ pub const ZERO_DURATION: Duration = Duration::from_secs(0);
 /// represented as a `u64` Unix timestamp in nanoseconds, with 0 representing the absence
 /// of timestamp.
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[derive(PartialEq, Eq, Copy, Clone, Debug, Default, PartialOrd, Ord)]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+#[derive(PartialEq, Eq, Copy, Clone, Debug, PartialOrd, Ord, Hash)]
 pub struct Timestamp {
+    // Note: The schema representation is the timestamp in nanoseconds (as we do with borsh).
+    #[cfg_attr(feature = "schema", schemars(with = "u64"))]
     time: Option<Time>,
 }
 
@@ -41,10 +44,11 @@ impl borsh::BorshSerialize for Timestamp {
 
 #[cfg(feature = "borsh")]
 impl borsh::BorshDeserialize for Timestamp {
-    fn deserialize(reader: &mut &[u8]) -> borsh::maybestd::io::Result<Self> {
-        let timestamp = u64::deserialize(reader)?;
-        Ok(Timestamp::from_nanoseconds(timestamp)
-            .map_err(|_| borsh::maybestd::io::ErrorKind::Other)?)
+    fn deserialize_reader<R: borsh::maybestd::io::Read>(
+        reader: &mut R,
+    ) -> borsh::maybestd::io::Result<Self> {
+        let timestamp = u64::deserialize_reader(reader)?;
+        Ok(Self::from_nanoseconds(timestamp).map_err(|_| borsh::maybestd::io::ErrorKind::Other)?)
     }
 }
 
@@ -61,7 +65,7 @@ impl parity_scale_codec::Decode for Timestamp {
         input: &mut I,
     ) -> Result<Self, parity_scale_codec::Error> {
         let timestamp = u64::decode(input)?;
-        Timestamp::from_nanoseconds(timestamp)
+        Self::from_nanoseconds(timestamp)
             .map_err(|_| parity_scale_codec::Error::from("from nanoseconds error"))
     }
 }
@@ -80,23 +84,13 @@ impl scale_info::TypeInfo for Timestamp {
     }
 }
 
-// TODO: derive when tendermint::Time supports it:
-// https://github.com/informalsystems/tendermint-rs/pull/1054
-#[allow(clippy::derived_hash_with_manual_eq)]
-impl Hash for Timestamp {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        let odt: Option<OffsetDateTime> = self.time.map(Into::into);
-        odt.hash(state);
-    }
-}
-
 /// The expiry result when comparing two timestamps.
 /// - If either timestamp is invalid (0), the result is `InvalidTimestamp`.
 /// - If the left timestamp is strictly after the right timestamp, the result is `Expired`.
 /// - Otherwise, the result is `NotExpired`.
 ///
-/// User of this result may want to determine whether error should be raised,
-/// when either of the timestamp being compared is invalid.
+/// Users of this result may want to determine whether an error should be raised,
+/// when either of the timestamps being compared is invalid.
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(PartialEq, Eq, Copy, Clone, Debug, Hash)]
 pub enum Expiry {
@@ -113,14 +107,14 @@ impl Timestamp {
     /// is not set. In this case, our domain type takes the
     /// value of None.
     ///
-    pub fn from_nanoseconds(nanoseconds: u64) -> Result<Timestamp, ParseTimestampError> {
+    pub fn from_nanoseconds(nanoseconds: u64) -> Result<Self, ParseTimestampError> {
         if nanoseconds == 0 {
-            Ok(Timestamp { time: None })
+            Ok(Self { time: None })
         } else {
             // As the `u64` representation can only represent times up to
             // about year 2554, there is no risk of overflowing `Time`
             // or `OffsetDateTime`.
-            let ts = OffsetDateTime::from_unix_timestamp_nanos(nanoseconds as i128)
+            let ts = OffsetDateTime::from_unix_timestamp_nanos(nanoseconds.into())
                 .map_err(|e: time::error::ComponentRange| {
                     ParseTimestampError::DataOutOfRange(e.to_string())
                 })?
@@ -128,26 +122,26 @@ impl Timestamp {
                 .map_err(|e: tendermint::error::Error| {
                     ParseTimestampError::DataOutOfRange(e.to_string())
                 })?;
-            Ok(Timestamp { time: Some(ts) })
+            Ok(Self { time: Some(ts) })
         }
     }
 
     /// Returns a `Timestamp` representation of the current time.
     #[cfg(feature = "std")]
-    pub fn now() -> Timestamp {
+    pub fn now() -> Self {
         Time::now().into()
     }
 
     /// Returns a `Timestamp` representation of a timestamp not being set.
     pub fn none() -> Self {
-        Timestamp { time: None }
+        Self { time: None }
     }
 
     /// Computes the duration difference of another `Timestamp` from the current one.
     /// Returns the difference in time as an [`core::time::Duration`].
     /// Returns `None` if the other `Timestamp` is more advanced
-    /// than the current or if either of the `Timestamp`s is not set.
-    pub fn duration_since(&self, other: &Timestamp) -> Option<Duration> {
+    /// than the current, or if either of the `Timestamp`s is not set.
+    pub fn duration_since(&self, other: &Self) -> Option<Duration> {
         match (self.time, other.time) {
             (Some(time1), Some(time2)) => time1.duration_since(time2).ok(),
             _ => None,
@@ -165,7 +159,7 @@ impl Timestamp {
     /// Convert a `Timestamp` to `u64` value in nanoseconds. If no timestamp
     /// is set, the result is 0.
     /// ```
-    /// use ibc::core::timestamp::Timestamp;
+    /// use ibc_primitives::Timestamp;
     ///
     /// let max = u64::MAX;
     /// let tx = Timestamp::from_nanoseconds(max).unwrap();
@@ -175,7 +169,7 @@ impl Timestamp {
     /// let ti = Timestamp::from_nanoseconds(min).unwrap();
     /// let uti = ti.nanoseconds();
     /// assert_eq!(uti, min);
-    /// let tz = Timestamp::default();
+    /// let tz = Timestamp::none();
     /// let utz = tz.nanoseconds();
     /// assert_eq!(utz, 0);
     /// ```
@@ -202,7 +196,7 @@ impl Timestamp {
 
     /// Checks whether the timestamp has expired when compared to the
     /// `other` timestamp. Returns an [`Expiry`] result.
-    pub fn check_expiry(&self, other: &Timestamp) -> Expiry {
+    pub fn check_expiry(&self, other: &Self) -> Expiry {
         match (self.time, other.time) {
             (Some(time1), Some(time2)) => {
                 if time1 > time2 {
@@ -242,32 +236,26 @@ pub enum TimestampOverflowError {
 impl std::error::Error for TimestampOverflowError {}
 
 impl Add<Duration> for Timestamp {
-    type Output = Result<Timestamp, TimestampOverflowError>;
-
-    fn add(self, duration: Duration) -> Result<Timestamp, TimestampOverflowError> {
-        match self.time {
-            Some(time) => {
-                let time =
-                    (time + duration).map_err(|_| TimestampOverflowError::TimestampOverflow)?;
-                Ok(Timestamp { time: Some(time) })
-            }
-            None => Ok(self),
-        }
+    type Output = Result<Self, TimestampOverflowError>;
+
+    fn add(self, duration: Duration) -> Result<Self, TimestampOverflowError> {
+        self.time
+            .map(|time| time + duration)
+            .transpose()
+            .map(|time| Self { time })
+            .map_err(|_| TimestampOverflowError::TimestampOverflow)
     }
 }
 
 impl Sub<Duration> for Timestamp {
-    type Output = Result<Timestamp, TimestampOverflowError>;
-
-    fn sub(self, duration: Duration) -> Result<Timestamp, TimestampOverflowError> {
-        match self.time {
-            Some(time) => {
-                let time =
-                    (time - duration).map_err(|_| TimestampOverflowError::TimestampOverflow)?;
-                Ok(Timestamp { time: Some(time) })
-            }
-            None => Ok(self),
-        }
+    type Output = Result<Self, TimestampOverflowError>;
+
+    fn sub(self, duration: Duration) -> Result<Self, TimestampOverflowError> {
+        self.time
+            .map(|time| time - duration)
+            .transpose()
+            .map(|time| Self { time })
+            .map_err(|_| TimestampOverflowError::TimestampOverflow)
     }
 }
 
@@ -283,8 +271,8 @@ pub enum ParseTimestampError {
 impl std::error::Error for ParseTimestampError {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self {
-            ParseTimestampError::ParseInt(e) => Some(e),
-            ParseTimestampError::DataOutOfRange(_) => None,
+            Self::ParseInt(e) => Some(e),
+            Self::DataOutOfRange(_) => None,
         }
     }
 }
@@ -295,13 +283,13 @@ impl FromStr for Timestamp {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let nanoseconds = u64::from_str(s).map_err(ParseTimestampError::ParseInt)?;
 
-        Timestamp::from_nanoseconds(nanoseconds)
+        Self::from_nanoseconds(nanoseconds)
     }
 }
 
 impl From<Time> for Timestamp {
-    fn from(tendermint_time: Time) -> Timestamp {
-        Timestamp {
+    fn from(tendermint_time: Time) -> Self {
+        Self {
             time: Some(tendermint_time),
         }
     }
@@ -309,11 +297,10 @@ impl From<Time> for Timestamp {
 
 #[cfg(test)]
 mod tests {
-    use time::OffsetDateTime;
-
     use core::time::Duration;
     use std::thread::sleep;
-    use test_log::test;
+
+    use time::OffsetDateTime;
 
     use super::{Expiry, Timestamp, ZERO_DURATION};
 
diff --git a/ibc-primitives/src/utils/mod.rs b/ibc-primitives/src/utils/mod.rs
new file mode 100644
index 000000000..576e377cf
--- /dev/null
+++ b/ibc-primitives/src/utils/mod.rs
@@ -0,0 +1,4 @@
+//! Contains various internally used utilities.
+pub mod pretty;
+
+pub use pretty::*;
diff --git a/crates/ibc/src/utils/pretty.rs b/ibc-primitives/src/utils/pretty.rs
similarity index 92%
rename from crates/ibc/src/utils/pretty.rs
rename to ibc-primitives/src/utils/pretty.rs
index 0f004d8c1..6f59efdbf 100644
--- a/crates/ibc/src/utils/pretty.rs
+++ b/ibc-primitives/src/utils/pretty.rs
@@ -1,5 +1,8 @@
+//! Pretty printing utilities.
+
 use core::fmt::{Display, Error as FmtError, Formatter};
 
+/// A slice type that implements the `Display` trait to pretty-print the contained elements.
 pub struct PrettySlice<'a, T>(pub &'a [T]);
 
 impl<'a, T: Display> Display for PrettySlice<'a, T> {
@@ -22,8 +25,6 @@ mod tests {
     use super::*;
     use crate::prelude::*;
 
-    use crate::alloc::string::ToString;
-
     #[test]
     fn test_pretty_vec_display() {
         let expected_output = "[ one, two, three ]";
diff --git a/ibc-query/Cargo.toml b/ibc-query/Cargo.toml
new file mode 100644
index 000000000..38ec2e048
--- /dev/null
+++ b/ibc-query/Cargo.toml
@@ -0,0 +1,45 @@
+[package]
+name         = "ibc-query"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+readme       = "README.md"
+keywords     = [ "blockchain", "cosmos", "ibc", "rpc", "grpc" ]
+
+description = """
+    Maintained by `ibc-rs`, contains essential IBC query types, utility functions and
+    gRPC service implementations for the IBC core.
+"""
+
+[dependencies]
+# external dependencies
+displaydoc = { version = "0.2", default-features = false }
+schemars   = { workspace = true, optional = true }
+serde      = { workspace = true, optional = true }
+tonic      = { version = "0.11" }
+
+# ibc dependencies
+ibc       = { workspace = true }
+ibc-proto = { workspace = true, features = [ "server" ] }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc/std",
+  "ibc-proto/std",
+]
+serde = [
+  "dep:serde",
+  "ibc/serde",
+  "ibc-proto/serde",
+]
+schema = [
+  "dep:schemars",
+  "ibc/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
diff --git a/ibc-query/LICENSE b/ibc-query/LICENSE
new file mode 100644
index 000000000..58b61ab0f
--- /dev/null
+++ b/ibc-query/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Informal Systems
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/ibc-query/README.md b/ibc-query/README.md
new file mode 100644
index 000000000..c5a5f684e
--- /dev/null
+++ b/ibc-query/README.md
@@ -0,0 +1,33 @@
+# IBC Query
+
+## Overview
+
+This crate offers a comprehensive set of utility types, traits, and functions
+designed for integrating either a gRPC query server or implementing RPC methods
+in hosts. It specifically facilitates querying the state of the IBC core client,
+connection, and channel layers of a chain enabled with `ibc-rs`.
+
+## Features
+
+- Provides essential utility request/response domain types and their conversions
+to the proto types for efficient integration.
+- Provides convenient query objects with pre-implemented gRPC query services.
+- Offers convenient objects on which query service has been implemented and
+- Includes convenient `QueryContext` and `ProvableContext` traits that extend
+  the capabilities of an implemented IBC module, enabling the retrieval of state
+  from the chain.
+- Derives `serde` and `schema` for all the domain types enabling easy
+  (de)serialization. This feature is particularly beneficial for JSON RPC
+  implementations.
+
+## Remarks
+
+- At present, the Protobuf representation of request types does not include
+  support for querying at a specific height. Consequently, the current state of
+  `ibc-query` allows conversion from protos as a compatible direction but does
+  not support conversion into protos due to the absence of the `query_height`
+  fields.
+
+- Currently `ibc-query` does not support pagination. If pagination is a
+  requirement for your project, please open an issue and provide details about
+  your usage.
diff --git a/ibc-query/src/core/channel/mod.rs b/ibc-query/src/core/channel/mod.rs
new file mode 100644
index 000000000..7cdb244ce
--- /dev/null
+++ b/ibc-query/src/core/channel/mod.rs
@@ -0,0 +1,7 @@
+mod query;
+mod service;
+mod types;
+
+pub use query::*;
+pub use service::*;
+pub use types::*;
diff --git a/ibc-query/src/core/channel/query.rs b/ibc-query/src/core/channel/query.rs
new file mode 100644
index 000000000..793ce5700
--- /dev/null
+++ b/ibc-query/src/core/channel/query.rs
@@ -0,0 +1,478 @@
+//! Provides utility functions for querying IBC channel states.
+
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::host::types::path::{
+    AckPath, ChannelEndPath, ClientConsensusStatePath, ClientStatePath, CommitmentPath, Path,
+    ReceiptPath, SeqRecvPath, SeqSendPath,
+};
+use ibc::core::host::{ConsensusStateRef, ValidationContext};
+use ibc::primitives::prelude::format;
+use ibc_proto::google::protobuf::Any;
+
+use super::{
+    QueryChannelClientStateRequest, QueryChannelClientStateResponse,
+    QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse, QueryChannelRequest,
+    QueryChannelResponse, QueryChannelsRequest, QueryChannelsResponse,
+    QueryConnectionChannelsRequest, QueryConnectionChannelsResponse,
+    QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveResponse,
+    QueryNextSequenceSendRequest, QueryNextSequenceSendResponse, QueryPacketAcknowledgementRequest,
+    QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementsRequest,
+    QueryPacketAcknowledgementsResponse, QueryPacketCommitmentRequest,
+    QueryPacketCommitmentResponse, QueryPacketCommitmentsRequest, QueryPacketCommitmentsResponse,
+    QueryPacketReceiptRequest, QueryPacketReceiptResponse, QueryUnreceivedAcksRequest,
+    QueryUnreceivedAcksResponse, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsResponse,
+};
+use crate::core::client::IdentifiedClientState;
+use crate::core::context::{ProvableContext, QueryContext};
+use crate::error::QueryError;
+
+/// Queries for a specific IBC channel by the given channel and port ids and
+/// returns the channel end with the associated proof.
+pub fn query_channel<I>(
+    ibc_ctx: &I,
+    request: &QueryChannelRequest,
+) -> Result<QueryChannelResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let channel_end = ibc_ctx.channel_end(&channel_end_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::ChannelEnd(channel_end_path.clone()))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for channel end path {channel_end_path:?}"
+            ))
+        })?;
+
+    Ok(QueryChannelResponse::new(channel_end, proof, proof_height))
+}
+
+/// Queries for all existing IBC channels and returns the corresponding channel ends
+pub fn query_channels<I>(
+    ibc_ctx: &I,
+    _request: &QueryChannelsRequest,
+) -> Result<QueryChannelsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let channel_ends = ibc_ctx.channel_ends()?;
+
+    Ok(QueryChannelsResponse::new(
+        channel_ends,
+        ibc_ctx.host_height()?,
+        None,
+    ))
+}
+
+/// Queries for all channels associated with a given connection
+pub fn query_connection_channels<I>(
+    ibc_ctx: &I,
+    request: &QueryConnectionChannelsRequest,
+) -> Result<QueryConnectionChannelsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let all_channel_ends = ibc_ctx.channel_ends()?;
+
+    let connection_channel_ends = all_channel_ends
+        .into_iter()
+        .filter(|channel_end| {
+            channel_end
+                .channel_end
+                .connection_hops()
+                .iter()
+                .any(|connection_hop| connection_hop == &request.connection_id)
+        })
+        .map(Into::into)
+        .collect();
+
+    Ok(QueryConnectionChannelsResponse::new(
+        connection_channel_ends,
+        ibc_ctx.host_height()?,
+        None,
+    ))
+}
+
+/// Queries for the client state associated with a channel by the given channel
+/// and port ids
+pub fn query_channel_client_state<I>(
+    ibc_ctx: &I,
+    request: &QueryChannelClientStateRequest,
+) -> Result<QueryChannelClientStateResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let channel_end = ibc_ctx.channel_end(&channel_end_path)?;
+
+    let connection_end = channel_end
+        .connection_hops()
+        .first()
+        .map(|connection_id| ibc_ctx.connection_end(connection_id))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Channel {} does not have a connection",
+                request.channel_id
+            ))
+        })??;
+
+    let client_val_ctx = ibc_ctx.get_client_validation_context();
+
+    let client_state = client_val_ctx.client_state(connection_end.client_id())?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::ClientState(ClientStatePath::new(connection_end.client_id().clone())),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for client state path: {:?}",
+                connection_end.client_id()
+            ))
+        })?;
+
+    Ok(QueryChannelClientStateResponse::new(
+        IdentifiedClientState::new(connection_end.client_id().clone(), client_state.into()),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the consensus state associated with a channel by the given
+/// target height, channel and port ids
+pub fn query_channel_consensus_state<I>(
+    ibc_ctx: &I,
+    request: &QueryChannelConsensusStateRequest,
+) -> Result<QueryChannelConsensusStateResponse, QueryError>
+where
+    I: QueryContext,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let channel_end = ibc_ctx.channel_end(&channel_end_path)?;
+
+    let connection_end = channel_end
+        .connection_hops()
+        .first()
+        .map(|connection_id| ibc_ctx.connection_end(connection_id))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Channel {} does not have a connection",
+                request.channel_id
+            ))
+        })??;
+
+    let consensus_path = ClientConsensusStatePath::new(
+        connection_end.client_id().clone(),
+        request.consensus_height.revision_number(),
+        request.consensus_height.revision_height(),
+    );
+    let client_val_ctx = ibc_ctx.get_client_validation_context();
+
+    let consensus_state = client_val_ctx.consensus_state(&consensus_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::ClientConsensusState(consensus_path.clone()),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for client consensus state path: {consensus_path:?}"
+            ))
+        })?;
+
+    Ok(QueryChannelConsensusStateResponse::new(
+        consensus_state.into(),
+        connection_end.client_id().clone(),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the packet commitment associated with a channel by the given
+/// sequence, channel, and port ids
+pub fn query_packet_commitment<I>(
+    ibc_ctx: &I,
+    request: &QueryPacketCommitmentRequest,
+) -> Result<QueryPacketCommitmentResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let commitment_path =
+        CommitmentPath::new(&request.port_id, &request.channel_id, request.sequence);
+
+    let packet_commitment_data = ibc_ctx.get_packet_commitment(&commitment_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::Commitment(commitment_path.clone()))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for packet commitment path: {commitment_path:?}"
+            ))
+        })?;
+
+    Ok(QueryPacketCommitmentResponse::new(
+        packet_commitment_data,
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for all packet commitments associated with a channel
+pub fn query_packet_commitments<I>(
+    ibc_ctx: &I,
+    request: &QueryPacketCommitmentsRequest,
+) -> Result<QueryPacketCommitmentsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let commitments = ibc_ctx
+        .packet_commitments(&channel_end_path)?
+        .into_iter()
+        .map(Into::into)
+        .collect();
+
+    Ok(QueryPacketCommitmentsResponse::new(
+        commitments,
+        ibc_ctx.host_height()?,
+        None,
+    ))
+}
+
+/// Queries for the packet receipt associated with a channel by the given
+/// sequence, channel, and port ids
+pub fn query_packet_receipt<I>(
+    ibc_ctx: &I,
+    request: &QueryPacketReceiptRequest,
+) -> Result<QueryPacketReceiptResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let receipt_path = ReceiptPath::new(&request.port_id, &request.channel_id, request.sequence);
+
+    // Receipt only has one enum
+    // Unreceived packets are not stored
+    let packet_receipt_data = ibc_ctx.get_packet_receipt(&receipt_path);
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::Receipt(receipt_path.clone()))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for packet receipt path: {receipt_path:?}"
+            ))
+        })?;
+
+    Ok(QueryPacketReceiptResponse::new(
+        packet_receipt_data.is_ok(),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the packet acknowledgement associated with a channel by the
+/// given sequence, channel, and port ids
+pub fn query_packet_acknowledgement<I>(
+    ibc_ctx: &I,
+    request: &QueryPacketAcknowledgementRequest,
+) -> Result<QueryPacketAcknowledgementResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let acknowledgement_path =
+        AckPath::new(&request.port_id, &request.channel_id, request.sequence);
+
+    let packet_acknowledgement_data = ibc_ctx.get_packet_acknowledgement(&acknowledgement_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::Ack(acknowledgement_path.clone()))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for packet acknowledgement path: {acknowledgement_path:?}"
+            ))
+        })?;
+
+    Ok(QueryPacketAcknowledgementResponse::new(
+        packet_acknowledgement_data,
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for all packet acknowledgements associated with a channel
+pub fn query_packet_acknowledgements<I>(
+    ibc_ctx: &I,
+    request: &QueryPacketAcknowledgementsRequest,
+) -> Result<QueryPacketAcknowledgementsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let commitment_sequences = request
+        .packet_commitment_sequences
+        .iter()
+        .copied()
+        .map(Into::into);
+
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let acknowledgements = ibc_ctx
+        .packet_acknowledgements(&channel_end_path, commitment_sequences)?
+        .into_iter()
+        .map(Into::into)
+        .collect();
+
+    Ok(QueryPacketAcknowledgementsResponse::new(
+        acknowledgements,
+        ibc_ctx.host_height()?,
+        None,
+    ))
+}
+
+/// Queries for all unreceived packets associated with a channel
+pub fn query_unreceived_packets<I>(
+    ibc_ctx: &I,
+    request: &QueryUnreceivedPacketsRequest,
+) -> Result<QueryUnreceivedPacketsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let sequences = request
+        .packet_commitment_sequences
+        .iter()
+        .copied()
+        .map(Into::into);
+
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let unreceived_packets = ibc_ctx.unreceived_packets(&channel_end_path, sequences)?;
+
+    Ok(QueryUnreceivedPacketsResponse::new(
+        unreceived_packets,
+        ibc_ctx.host_height()?,
+    ))
+}
+
+/// Queries for all unreceived acknowledgements associated with a channel
+pub fn query_unreceived_acks<I>(
+    ibc_ctx: &I,
+    request: &QueryUnreceivedAcksRequest,
+) -> Result<QueryUnreceivedAcksResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let sequences = request.packet_ack_sequences.iter().copied().map(Into::into);
+
+    let channel_end_path = ChannelEndPath::new(&request.port_id, &request.channel_id);
+
+    let unreceived_acks = ibc_ctx.unreceived_acks(&channel_end_path, sequences)?;
+
+    Ok(QueryUnreceivedAcksResponse::new(
+        unreceived_acks,
+        ibc_ctx.host_height()?,
+    ))
+}
+
+/// Queries for the next sequence to send for the channel specified
+/// in the `request`.
+pub fn query_next_sequence_send<I>(
+    ibc_ctx: &I,
+    request: &QueryNextSequenceSendRequest,
+) -> Result<QueryNextSequenceSendResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let next_seq_send_path = SeqSendPath::new(&request.port_id, &request.channel_id);
+
+    let next_sequence_send = ibc_ctx.get_next_sequence_send(&next_seq_send_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::SeqSend(next_seq_send_path))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Next sequence send proof not found for channel {}",
+                request.channel_id
+            ))
+        })?;
+
+    Ok(QueryNextSequenceSendResponse::new(
+        next_sequence_send,
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the next sequence receive associated with a channel
+pub fn query_next_sequence_receive<I>(
+    ibc_ctx: &I,
+    request: &QueryNextSequenceReceiveRequest,
+) -> Result<QueryNextSequenceReceiveResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let next_seq_recv_path = SeqRecvPath::new(&request.port_id, &request.channel_id);
+
+    let next_sequence_recv = ibc_ctx.get_next_sequence_recv(&next_seq_recv_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::SeqRecv(next_seq_recv_path))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Next sequence receive proof not found for channel {}",
+                request.channel_id
+            ))
+        })?;
+
+    Ok(QueryNextSequenceReceiveResponse::new(
+        next_sequence_recv,
+        proof,
+        proof_height,
+    ))
+}
diff --git a/ibc-query/src/core/channel/service.rs b/ibc-query/src/core/channel/service.rs
new file mode 100644
index 000000000..561778bc7
--- /dev/null
+++ b/ibc-query/src/core/channel/service.rs
@@ -0,0 +1,196 @@
+//! [`ChannelQueryService`](ChannelQueryService) takes a generic `I` to store `ibc_context` that implements [`QueryContext`](QueryContext).
+//! `I` must be a type where writes from one thread are readable from another.
+//! This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+
+use ibc::core::host::ConsensusStateRef;
+use ibc::core::primitives::prelude::*;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::channel::v1::query_server::Query as ChannelQuery;
+use ibc_proto::ibc::core::channel::v1::{
+    QueryChannelClientStateRequest, QueryChannelClientStateResponse,
+    QueryChannelConsensusStateRequest, QueryChannelConsensusStateResponse,
+    QueryChannelParamsRequest, QueryChannelParamsResponse, QueryChannelRequest,
+    QueryChannelResponse, QueryChannelsRequest, QueryChannelsResponse,
+    QueryConnectionChannelsRequest, QueryConnectionChannelsResponse,
+    QueryNextSequenceReceiveRequest, QueryNextSequenceReceiveResponse,
+    QueryNextSequenceSendRequest, QueryNextSequenceSendResponse, QueryPacketAcknowledgementRequest,
+    QueryPacketAcknowledgementResponse, QueryPacketAcknowledgementsRequest,
+    QueryPacketAcknowledgementsResponse, QueryPacketCommitmentRequest,
+    QueryPacketCommitmentResponse, QueryPacketCommitmentsRequest, QueryPacketCommitmentsResponse,
+    QueryPacketReceiptRequest, QueryPacketReceiptResponse, QueryUnreceivedAcksRequest,
+    QueryUnreceivedAcksResponse, QueryUnreceivedPacketsRequest, QueryUnreceivedPacketsResponse,
+    QueryUpgradeErrorRequest, QueryUpgradeErrorResponse, QueryUpgradeRequest, QueryUpgradeResponse,
+};
+use tonic::{Request, Response, Status};
+
+use super::{
+    query_channel, query_channel_client_state, query_channel_consensus_state, query_channels,
+    query_connection_channels, query_next_sequence_receive, query_next_sequence_send,
+    query_packet_acknowledgement, query_packet_acknowledgements, query_packet_commitment,
+    query_packet_commitments, query_packet_receipt, query_unreceived_acks,
+    query_unreceived_packets,
+};
+use crate::core::context::QueryContext;
+use crate::utils::{IntoDomain, IntoResponse, TryIntoDomain};
+
+// TODO(rano): currently the services don't support pagination, so we return all the results.
+
+/// The generic `I` must be a type where writes from one thread are readable from another.
+/// This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+pub struct ChannelQueryService<I>
+where
+    I: QueryContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    ibc_context: I,
+}
+
+impl<I> ChannelQueryService<I>
+where
+    I: QueryContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    /// The parameter `ibc_context` must be a type where writes from one thread are readable from another.
+    /// This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+    pub fn new(ibc_context: I) -> Self {
+        Self { ibc_context }
+    }
+}
+
+#[tonic::async_trait]
+impl<I> ChannelQuery for ChannelQueryService<I>
+where
+    I: QueryContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    async fn channel(
+        &self,
+        request: Request<QueryChannelRequest>,
+    ) -> Result<Response<QueryChannelResponse>, Status> {
+        query_channel(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn channels(
+        &self,
+        request: Request<QueryChannelsRequest>,
+    ) -> Result<Response<QueryChannelsResponse>, Status> {
+        query_channels(&self.ibc_context, &request.into_domain())?.into_response()
+    }
+
+    async fn connection_channels(
+        &self,
+        request: Request<QueryConnectionChannelsRequest>,
+    ) -> Result<Response<QueryConnectionChannelsResponse>, Status> {
+        query_connection_channels(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn channel_client_state(
+        &self,
+        request: Request<QueryChannelClientStateRequest>,
+    ) -> Result<Response<QueryChannelClientStateResponse>, Status> {
+        query_channel_client_state(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn channel_consensus_state(
+        &self,
+        request: Request<QueryChannelConsensusStateRequest>,
+    ) -> Result<Response<QueryChannelConsensusStateResponse>, Status> {
+        query_channel_consensus_state(&self.ibc_context, &request.try_into_domain()?)?
+            .into_response()
+    }
+
+    async fn packet_commitment(
+        &self,
+        request: Request<QueryPacketCommitmentRequest>,
+    ) -> Result<Response<QueryPacketCommitmentResponse>, Status> {
+        query_packet_commitment(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn packet_commitments(
+        &self,
+        request: Request<QueryPacketCommitmentsRequest>,
+    ) -> Result<Response<QueryPacketCommitmentsResponse>, Status> {
+        query_packet_commitments(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn packet_receipt(
+        &self,
+        request: Request<QueryPacketReceiptRequest>,
+    ) -> Result<Response<QueryPacketReceiptResponse>, Status> {
+        query_packet_receipt(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn packet_acknowledgement(
+        &self,
+        request: Request<QueryPacketAcknowledgementRequest>,
+    ) -> Result<Response<QueryPacketAcknowledgementResponse>, Status> {
+        query_packet_acknowledgement(&self.ibc_context, &request.try_into_domain()?)?
+            .into_response()
+    }
+
+    /// Returns all the acknowledgements if sequences are omitted.
+    async fn packet_acknowledgements(
+        &self,
+        request: Request<QueryPacketAcknowledgementsRequest>,
+    ) -> Result<Response<QueryPacketAcknowledgementsResponse>, Status> {
+        query_packet_acknowledgements(&self.ibc_context, &request.try_into_domain()?)?
+            .into_response()
+    }
+
+    /// Returns all the unreceived packets if sequences are omitted.
+    async fn unreceived_packets(
+        &self,
+        request: Request<QueryUnreceivedPacketsRequest>,
+    ) -> Result<Response<QueryUnreceivedPacketsResponse>, Status> {
+        query_unreceived_packets(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    /// Returns all the unreceived acknowledgements if sequences are omitted.
+    async fn unreceived_acks(
+        &self,
+        request: Request<QueryUnreceivedAcksRequest>,
+    ) -> Result<Response<QueryUnreceivedAcksResponse>, Status> {
+        query_unreceived_acks(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn next_sequence_receive(
+        &self,
+        request: Request<QueryNextSequenceReceiveRequest>,
+    ) -> Result<Response<QueryNextSequenceReceiveResponse>, Status> {
+        query_next_sequence_receive(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn next_sequence_send(
+        &self,
+        request: Request<QueryNextSequenceSendRequest>,
+    ) -> Result<Response<QueryNextSequenceSendResponse>, Status> {
+        query_next_sequence_send(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn upgrade_error(
+        &self,
+        _request: Request<QueryUpgradeErrorRequest>,
+    ) -> Result<Response<QueryUpgradeErrorResponse>, Status> {
+        Err(Status::unimplemented(
+            "Querying UpgradeError is not supported yet",
+        ))
+    }
+
+    async fn upgrade(
+        &self,
+        _request: Request<QueryUpgradeRequest>,
+    ) -> Result<Response<QueryUpgradeResponse>, Status> {
+        Err(Status::unimplemented(
+            "Querying Upgrade is not supported yet",
+        ))
+    }
+
+    async fn channel_params(
+        &self,
+        _request: Request<QueryChannelParamsRequest>,
+    ) -> Result<Response<QueryChannelParamsResponse>, Status> {
+        Err(Status::unimplemented(
+            "Querying ChannelParams is not supported yet",
+        ))
+    }
+}
diff --git a/ibc-query/src/core/channel/types/mod.rs b/ibc-query/src/core/channel/types/mod.rs
new file mode 100644
index 000000000..b8be6322b
--- /dev/null
+++ b/ibc-query/src/core/channel/types/mod.rs
@@ -0,0 +1,5 @@
+mod request;
+mod response;
+
+pub use request::*;
+pub use response::*;
diff --git a/ibc-query/src/core/channel/types/request.rs b/ibc-query/src/core/channel/types/request.rs
new file mode 100644
index 000000000..d626df5d9
--- /dev/null
+++ b/ibc-query/src/core/channel/types/request.rs
@@ -0,0 +1,410 @@
+//! Contains all the RPC method request domain types and their conversions to
+//! and from the corresponding gRPC proto types for the channel module.
+
+use ibc::core::client::types::Height;
+use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId, Sequence};
+use ibc::primitives::prelude::*;
+use ibc_proto::ibc::core::channel::v1::{
+    QueryChannelClientStateRequest as RawQueryChannelClientStateRequest,
+    QueryChannelConsensusStateRequest as RawQueryChannelConsensusStateRequest,
+    QueryChannelRequest as RawQueryChannelRequest, QueryChannelsRequest as RawQueryChannelsRequest,
+    QueryConnectionChannelsRequest as RawQueryConnectionChannelsRequest,
+    QueryNextSequenceReceiveRequest as RawQueryNextSequenceReceiveRequest,
+    QueryNextSequenceSendRequest as RawQueryNextSequenceSendRequest,
+    QueryPacketAcknowledgementRequest as RawQueryPacketAcknowledgementRequest,
+    QueryPacketAcknowledgementsRequest as RawQueryPacketAcknowledgementsRequest,
+    QueryPacketCommitmentRequest as RawQueryPacketCommitmentRequest,
+    QueryPacketCommitmentsRequest as RawQueryPacketCommitmentsRequest,
+    QueryPacketReceiptRequest as RawQueryPacketReceiptRequest,
+    QueryUnreceivedAcksRequest as RawQueryUnreceivedAcksRequest,
+    QueryUnreceivedPacketsRequest as RawQueryUnreceivedPacketsRequest,
+};
+
+use crate::error::QueryError;
+use crate::types::PageRequest;
+
+/// Defines the RPC method request type for querying a channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryChannelRequest> for QueryChannelRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryChannelRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying all channels
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelsRequest {
+    pub pagination: Option<PageRequest>,
+}
+
+impl From<RawQueryChannelsRequest> for QueryChannelsRequest {
+    fn from(request: RawQueryChannelsRequest) -> Self {
+        Self {
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying all channels associated
+/// with a connection identifier
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionChannelsRequest {
+    pub connection_id: ConnectionId,
+    pub pagination: Option<PageRequest>,
+}
+
+impl TryFrom<RawQueryConnectionChannelsRequest> for QueryConnectionChannelsRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConnectionChannelsRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            connection_id: request.connection.parse()?,
+            pagination: request.pagination.map(Into::into),
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the client state associated
+/// with a channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelClientStateRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryChannelClientStateRequest> for QueryChannelClientStateRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryChannelClientStateRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the consensus state
+/// associated with a channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelConsensusStateRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub consensus_height: Height,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryChannelConsensusStateRequest> for QueryChannelConsensusStateRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryChannelConsensusStateRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            consensus_height: Height::new(request.revision_number, request.revision_height)?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the packet commitment
+/// associated with the specified channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketCommitmentRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub sequence: Sequence,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryPacketCommitmentRequest> for QueryPacketCommitmentRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryPacketCommitmentRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            sequence: request.sequence.into(),
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying all packet commitments
+/// associated with the specified channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketCommitmentsRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub pagination: Option<PageRequest>,
+}
+
+impl TryFrom<RawQueryPacketCommitmentsRequest> for QueryPacketCommitmentsRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryPacketCommitmentsRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            pagination: request.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryPacketCommitmentsRequest> for RawQueryPacketCommitmentsRequest {
+    fn from(request: QueryPacketCommitmentsRequest) -> Self {
+        Self {
+            port_id: request.port_id.to_string(),
+            channel_id: request.channel_id.to_string(),
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the packet receipt
+/// associated with the specified channel and sequence number
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketReceiptRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub sequence: Sequence,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryPacketReceiptRequest> for QueryPacketReceiptRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryPacketReceiptRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            sequence: request.sequence.into(),
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the packet acknowledgement
+/// associated with the specified channel and sequence number
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketAcknowledgementRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub sequence: Sequence,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryPacketAcknowledgementRequest> for QueryPacketAcknowledgementRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryPacketAcknowledgementRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            sequence: request.sequence.into(),
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the packet acknowledgements
+/// associated with the specified channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketAcknowledgementsRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub packet_commitment_sequences: Vec<Sequence>,
+    pub pagination: Option<PageRequest>,
+}
+
+impl TryFrom<RawQueryPacketAcknowledgementsRequest> for QueryPacketAcknowledgementsRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryPacketAcknowledgementsRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            packet_commitment_sequences: request
+                .packet_commitment_sequences
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+            pagination: request.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryPacketAcknowledgementsRequest> for RawQueryPacketAcknowledgementsRequest {
+    fn from(request: QueryPacketAcknowledgementsRequest) -> Self {
+        Self {
+            port_id: request.port_id.to_string(),
+            channel_id: request.channel_id.to_string(),
+            packet_commitment_sequences: request
+                .packet_commitment_sequences
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the unreceived packets
+/// associated with the specified channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUnreceivedPacketsRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub packet_commitment_sequences: Vec<Sequence>,
+}
+
+impl TryFrom<RawQueryUnreceivedPacketsRequest> for QueryUnreceivedPacketsRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryUnreceivedPacketsRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            packet_commitment_sequences: request
+                .packet_commitment_sequences
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+        })
+    }
+}
+
+impl From<QueryUnreceivedPacketsRequest> for RawQueryUnreceivedPacketsRequest {
+    fn from(request: QueryUnreceivedPacketsRequest) -> Self {
+        Self {
+            port_id: request.port_id.to_string(),
+            channel_id: request.channel_id.to_string(),
+            packet_commitment_sequences: request
+                .packet_commitment_sequences
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+        }
+    }
+}
+
+/// gRPC query to fetch the unreceived acknowledgements sequences associated with
+/// the specified channel.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUnreceivedAcksRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub packet_ack_sequences: Vec<Sequence>,
+}
+
+impl TryFrom<RawQueryUnreceivedAcksRequest> for QueryUnreceivedAcksRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryUnreceivedAcksRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            packet_ack_sequences: request
+                .packet_ack_sequences
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+        })
+    }
+}
+
+impl From<QueryUnreceivedAcksRequest> for RawQueryUnreceivedAcksRequest {
+    fn from(request: QueryUnreceivedAcksRequest) -> Self {
+        Self {
+            port_id: request.port_id.to_string(),
+            channel_id: request.channel_id.to_string(),
+            packet_ack_sequences: request
+                .packet_ack_sequences
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the next sequence receive
+/// number for the specified channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryNextSequenceReceiveRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryNextSequenceReceiveRequest> for QueryNextSequenceReceiveRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryNextSequenceReceiveRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+/// Defines the RPC method request type for querying the next sequence send
+/// number for the specified channel
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryNextSequenceSendRequest {
+    pub port_id: PortId,
+    pub channel_id: ChannelId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryNextSequenceSendRequest> for QueryNextSequenceSendRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryNextSequenceSendRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            port_id: request.port_id.parse()?,
+            channel_id: request.channel_id.parse()?,
+            query_height: None,
+        })
+    }
+}
diff --git a/ibc-query/src/core/channel/types/response.rs b/ibc-query/src/core/channel/types/response.rs
new file mode 100644
index 000000000..8b4f3aa54
--- /dev/null
+++ b/ibc-query/src/core/channel/types/response.rs
@@ -0,0 +1,738 @@
+//! Contains all the RPC method response domain types and their conversions to
+//! and from the corresponding gRPC proto types for the channel module.
+
+use ibc::core::channel::types::channel::{ChannelEnd, IdentifiedChannelEnd};
+use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
+use ibc::core::channel::types::packet::PacketState;
+use ibc::core::client::types::Height;
+use ibc::core::host::types::identifiers::{ClientId, Sequence};
+use ibc::core::primitives::proto::Any;
+use ibc::primitives::prelude::*;
+use ibc::primitives::proto::Protobuf;
+use ibc_proto::ibc::core::channel::v1::{
+    QueryChannelClientStateResponse as RawQueryChannelClientStateResponse,
+    QueryChannelConsensusStateResponse as RawQueryChannelConsensusStateResponse,
+    QueryChannelResponse as RawQueryChannelResponse,
+    QueryChannelsResponse as RawQueryChannelsResponse,
+    QueryConnectionChannelsResponse as RawQueryConnectionChannelsResponse,
+    QueryNextSequenceReceiveResponse as RawQueryNextSequenceReceiveResponse,
+    QueryNextSequenceSendResponse as RawQueryNextSequenceSendResponse,
+    QueryPacketAcknowledgementResponse as RawQueryPacketAcknowledgementResponse,
+    QueryPacketAcknowledgementsResponse as RawQueryPacketAcknowledgementsResponse,
+    QueryPacketCommitmentResponse as RawQueryPacketCommitmentResponse,
+    QueryPacketCommitmentsResponse as RawQueryPacketCommitmentsResponse,
+    QueryPacketReceiptResponse as RawQueryPacketReceiptResponse,
+    QueryUnreceivedAcksResponse as RawQueryUnreceivedAcksResponse,
+    QueryUnreceivedPacketsResponse as RawQueryUnreceivedPacketsResponse,
+};
+
+use crate::core::client::IdentifiedClientState;
+use crate::error::QueryError;
+use crate::types::{PageResponse, Proof};
+
+/// Defines the RPC method response type when querying a channel.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelResponse {
+    pub channel: ChannelEnd,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryChannelResponse {
+    pub fn new(channel: ChannelEnd, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            channel,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryChannelResponse> for QueryChannelResponse {}
+
+impl TryFrom<RawQueryChannelResponse> for QueryChannelResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryChannelResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            channel: value
+                .channel
+                .ok_or_else(|| QueryError::missing_field("channel"))?
+                .try_into()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryChannelResponse> for RawQueryChannelResponse {
+    fn from(response: QueryChannelResponse) -> Self {
+        Self {
+            channel: Some(response.channel.into()),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a list of channels.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelsResponse {
+    pub channels: Vec<IdentifiedChannelEnd>,
+    pub query_height: Height,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryChannelsResponse {
+    pub fn new(
+        channels: Vec<IdentifiedChannelEnd>,
+        query_height: Height,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            channels,
+            query_height,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryChannelsResponse> for QueryChannelsResponse {}
+
+impl TryFrom<RawQueryChannelsResponse> for QueryChannelsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryChannelsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            channels: value
+                .channels
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            query_height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryChannelsResponse> for RawQueryChannelsResponse {
+    fn from(response: QueryChannelsResponse) -> Self {
+        Self {
+            channels: response.channels.into_iter().map(Into::into).collect(),
+            height: Some(response.query_height.into()),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a list of channels associated with a connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionChannelsResponse {
+    pub channels: Vec<IdentifiedChannelEnd>,
+    pub query_height: Height,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryConnectionChannelsResponse {
+    pub fn new(
+        channels: Vec<IdentifiedChannelEnd>,
+        query_height: Height,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            channels,
+            query_height,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConnectionChannelsResponse> for QueryConnectionChannelsResponse {}
+
+impl TryFrom<RawQueryConnectionChannelsResponse> for QueryConnectionChannelsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConnectionChannelsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            channels: value
+                .channels
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            query_height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryConnectionChannelsResponse> for RawQueryConnectionChannelsResponse {
+    fn from(response: QueryConnectionChannelsResponse) -> Self {
+        Self {
+            channels: response.channels.into_iter().map(Into::into).collect(),
+            height: Some(response.query_height.into()),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a channel client state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelClientStateResponse {
+    pub identified_client_state: IdentifiedClientState,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryChannelClientStateResponse {
+    pub fn new(
+        identified_client_state: IdentifiedClientState,
+        proof: Proof,
+        proof_height: Height,
+    ) -> Self {
+        Self {
+            identified_client_state,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryChannelClientStateResponse> for QueryChannelClientStateResponse {}
+
+impl TryFrom<RawQueryChannelClientStateResponse> for QueryChannelClientStateResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryChannelClientStateResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            identified_client_state: value
+                .identified_client_state
+                .ok_or_else(|| QueryError::missing_field("identified_client_state"))?
+                .try_into()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryChannelClientStateResponse> for RawQueryChannelClientStateResponse {
+    fn from(response: QueryChannelClientStateResponse) -> Self {
+        Self {
+            identified_client_state: Some(response.identified_client_state.into()),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response when for querying a channel consensus state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryChannelConsensusStateResponse {
+    pub consensus_state: Any,
+    pub client_id: ClientId,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryChannelConsensusStateResponse {
+    pub fn new(
+        consensus_state: Any,
+        client_id: ClientId,
+        proof: Proof,
+        proof_height: Height,
+    ) -> Self {
+        Self {
+            consensus_state,
+            client_id,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryChannelConsensusStateResponse> for QueryChannelConsensusStateResponse {}
+
+impl TryFrom<RawQueryChannelConsensusStateResponse> for QueryChannelConsensusStateResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryChannelConsensusStateResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            consensus_state: value
+                .consensus_state
+                .ok_or_else(|| QueryError::missing_field("consensus_state"))?,
+            client_id: value.client_id.parse()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryChannelConsensusStateResponse> for RawQueryChannelConsensusStateResponse {
+    fn from(response: QueryChannelConsensusStateResponse) -> Self {
+        Self {
+            consensus_state: Some(response.consensus_state),
+            client_id: response.client_id.to_string(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a packet commitment.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketCommitmentResponse {
+    pub packet_commitment: PacketCommitment,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryPacketCommitmentResponse {
+    pub fn new(packet_commitment: PacketCommitment, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            packet_commitment,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryPacketCommitmentResponse> for QueryPacketCommitmentResponse {}
+
+impl TryFrom<RawQueryPacketCommitmentResponse> for QueryPacketCommitmentResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryPacketCommitmentResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            packet_commitment: value.commitment.into(),
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryPacketCommitmentResponse> for RawQueryPacketCommitmentResponse {
+    fn from(response: QueryPacketCommitmentResponse) -> Self {
+        Self {
+            commitment: response.packet_commitment.into_vec(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a list of packet commitments.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketCommitmentsResponse {
+    pub commitments: Vec<PacketState>,
+    pub height: Height,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryPacketCommitmentsResponse {
+    pub fn new(
+        commitments: Vec<PacketState>,
+        height: Height,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            commitments,
+            height,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryPacketCommitmentsResponse> for QueryPacketCommitmentsResponse {}
+
+impl TryFrom<RawQueryPacketCommitmentsResponse> for QueryPacketCommitmentsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryPacketCommitmentsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            commitments: value
+                .commitments
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryPacketCommitmentsResponse> for RawQueryPacketCommitmentsResponse {
+    fn from(response: QueryPacketCommitmentsResponse) -> Self {
+        Self {
+            commitments: response.commitments.into_iter().map(Into::into).collect(),
+            height: Some(response.height.into()),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a packet receipt.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketReceiptResponse {
+    pub received: bool,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryPacketReceiptResponse {
+    pub fn new(received: bool, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            received,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryPacketReceiptResponse> for QueryPacketReceiptResponse {}
+
+impl TryFrom<RawQueryPacketReceiptResponse> for QueryPacketReceiptResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryPacketReceiptResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            received: value.received,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryPacketReceiptResponse> for RawQueryPacketReceiptResponse {
+    fn from(response: QueryPacketReceiptResponse) -> Self {
+        Self {
+            received: response.received,
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a packet acknowledgement.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketAcknowledgementResponse {
+    pub acknowledgement: AcknowledgementCommitment,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryPacketAcknowledgementResponse {
+    pub fn new(
+        acknowledgement: AcknowledgementCommitment,
+        proof: Proof,
+        proof_height: Height,
+    ) -> Self {
+        Self {
+            acknowledgement,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryPacketAcknowledgementResponse> for QueryPacketAcknowledgementResponse {}
+
+impl TryFrom<RawQueryPacketAcknowledgementResponse> for QueryPacketAcknowledgementResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryPacketAcknowledgementResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            acknowledgement: value.acknowledgement.into(),
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryPacketAcknowledgementResponse> for RawQueryPacketAcknowledgementResponse {
+    fn from(response: QueryPacketAcknowledgementResponse) -> Self {
+        Self {
+            acknowledgement: response.acknowledgement.into_vec(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a list of packet
+/// acknowledgements.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryPacketAcknowledgementsResponse {
+    pub acknowledgements: Vec<PacketState>,
+    pub height: Height,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryPacketAcknowledgementsResponse {
+    pub fn new(
+        acknowledgements: Vec<PacketState>,
+        height: Height,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            acknowledgements,
+            height,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryPacketAcknowledgementsResponse> for QueryPacketAcknowledgementsResponse {}
+
+impl TryFrom<RawQueryPacketAcknowledgementsResponse> for QueryPacketAcknowledgementsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryPacketAcknowledgementsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            acknowledgements: value
+                .acknowledgements
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryPacketAcknowledgementsResponse> for RawQueryPacketAcknowledgementsResponse {
+    fn from(response: QueryPacketAcknowledgementsResponse) -> Self {
+        Self {
+            acknowledgements: response
+                .acknowledgements
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+            height: Some(response.height.into()),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a list of unreceived acks.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUnreceivedAcksResponse {
+    pub sequences: Vec<Sequence>,
+    pub height: Height,
+}
+
+impl QueryUnreceivedAcksResponse {
+    pub fn new(sequences: Vec<Sequence>, height: Height) -> Self {
+        Self { sequences, height }
+    }
+}
+
+impl Protobuf<RawQueryUnreceivedAcksResponse> for QueryUnreceivedAcksResponse {}
+
+impl TryFrom<RawQueryUnreceivedAcksResponse> for QueryUnreceivedAcksResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryUnreceivedAcksResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            sequences: value.sequences.into_iter().map(Into::into).collect(),
+            height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryUnreceivedAcksResponse> for RawQueryUnreceivedAcksResponse {
+    fn from(response: QueryUnreceivedAcksResponse) -> Self {
+        Self {
+            sequences: response.sequences.into_iter().map(Into::into).collect(),
+            height: Some(response.height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying a list of unreceived packets.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUnreceivedPacketsResponse {
+    pub sequences: Vec<Sequence>,
+    pub height: Height,
+}
+
+impl QueryUnreceivedPacketsResponse {
+    pub fn new(sequences: Vec<Sequence>, height: Height) -> Self {
+        Self { sequences, height }
+    }
+}
+
+impl Protobuf<RawQueryUnreceivedPacketsResponse> for QueryUnreceivedPacketsResponse {}
+
+impl TryFrom<RawQueryUnreceivedPacketsResponse> for QueryUnreceivedPacketsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryUnreceivedPacketsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            sequences: value.sequences.into_iter().map(Into::into).collect(),
+            height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryUnreceivedPacketsResponse> for RawQueryUnreceivedPacketsResponse {
+    fn from(response: QueryUnreceivedPacketsResponse) -> Self {
+        Self {
+            sequences: response.sequences.into_iter().map(Into::into).collect(),
+            height: Some(response.height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying the next sequence to be received on a channel.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryNextSequenceReceiveResponse {
+    pub next_sequence_receive: Sequence,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryNextSequenceReceiveResponse {
+    pub fn new(next_sequence_receive: Sequence, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            next_sequence_receive,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryNextSequenceReceiveResponse> for QueryNextSequenceReceiveResponse {}
+
+impl TryFrom<RawQueryNextSequenceReceiveResponse> for QueryNextSequenceReceiveResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryNextSequenceReceiveResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            next_sequence_receive: value.next_sequence_receive.into(),
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryNextSequenceReceiveResponse> for RawQueryNextSequenceReceiveResponse {
+    fn from(response: QueryNextSequenceReceiveResponse) -> Self {
+        Self {
+            next_sequence_receive: response.next_sequence_receive.into(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying the next sequence to be
+/// sent on a channel.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryNextSequenceSendResponse {
+    pub next_sequence_send: Sequence,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryNextSequenceSendResponse {
+    pub fn new(next_sequence_send: Sequence, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            next_sequence_send,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryNextSequenceSendResponse> for QueryNextSequenceSendResponse {}
+
+impl TryFrom<RawQueryNextSequenceSendResponse> for QueryNextSequenceSendResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryNextSequenceSendResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            next_sequence_send: value.next_sequence_send.into(),
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryNextSequenceSendResponse> for RawQueryNextSequenceSendResponse {
+    fn from(response: QueryNextSequenceSendResponse) -> Self {
+        Self {
+            next_sequence_send: response.next_sequence_send.into(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
diff --git a/ibc-query/src/core/client/mod.rs b/ibc-query/src/core/client/mod.rs
new file mode 100644
index 000000000..7cdb244ce
--- /dev/null
+++ b/ibc-query/src/core/client/mod.rs
@@ -0,0 +1,7 @@
+mod query;
+mod service;
+mod types;
+
+pub use query::*;
+pub use service::*;
+pub use types::*;
diff --git a/ibc-query/src/core/client/query.rs b/ibc-query/src/core/client/query.rs
new file mode 100644
index 000000000..076aa8329
--- /dev/null
+++ b/ibc-query/src/core/client/query.rs
@@ -0,0 +1,297 @@
+//! Provides utility functions for querying IBC client states.
+
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::client::types::error::ClientError;
+use ibc::core::host::types::path::{
+    ClientConsensusStatePath, ClientStatePath, Path, UpgradeClientPath,
+};
+use ibc::core::host::{ConsensusStateRef, ValidationContext};
+use ibc::cosmos_host::upgrade_proposal::{UpgradeValidationContext, UpgradedConsensusStateRef};
+use ibc::primitives::prelude::format;
+use ibc::primitives::proto::Any;
+
+use super::{
+    ConsensusStateWithHeight, IdentifiedClientState, QueryClientStateResponse,
+    QueryClientStatesRequest, QueryClientStatesResponse, QueryClientStatusRequest,
+    QueryClientStatusResponse, QueryConsensusStateHeightsRequest,
+    QueryConsensusStateHeightsResponse, QueryConsensusStateRequest, QueryConsensusStateResponse,
+    QueryConsensusStatesRequest, QueryConsensusStatesResponse, QueryUpgradedClientStateRequest,
+    QueryUpgradedClientStateResponse, QueryUpgradedConsensusStateRequest,
+    QueryUpgradedConsensusStateResponse,
+};
+use crate::core::client::QueryClientStateRequest;
+use crate::core::context::{ProvableContext, QueryContext};
+use crate::error::QueryError;
+
+/// Queries for the client state of a given client id.
+pub fn query_client_state<I>(
+    ibc_ctx: &I,
+    request: &QueryClientStateRequest,
+) -> Result<QueryClientStateResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let client_id = request.client_id.clone();
+
+    let client_val_ctx = ibc_ctx.get_client_validation_context();
+
+    let client_state = client_val_ctx.client_state(&client_id)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::ClientState(ClientStatePath::new(client_id.clone())),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for client state path: {client_id:?}"
+            ))
+        })?;
+
+    Ok(QueryClientStateResponse::new(
+        client_state.into(),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for all the existing client states.
+pub fn query_client_states<I>(
+    ibc_ctx: &I,
+    _request: &QueryClientStatesRequest,
+) -> Result<QueryClientStatesResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let client_states = ibc_ctx.client_states()?;
+
+    Ok(QueryClientStatesResponse::new(
+        client_states
+            .into_iter()
+            .map(|(id, state)| IdentifiedClientState::new(id, state.into()))
+            .collect(),
+        // no support for pagination yet
+        None,
+    ))
+}
+
+/// Queries for the consensus state of a given client id and height.
+pub fn query_consensus_state<I>(
+    ibc_ctx: &I,
+    request: &QueryConsensusStateRequest,
+) -> Result<QueryConsensusStateResponse, QueryError>
+where
+    I: QueryContext,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    let client_id = request.client_id.clone();
+
+    let (height, consensus_state) = if let Some(height) = request.consensus_height {
+        let client_val_ctx = ibc_ctx.get_client_validation_context();
+
+        let consensus_state = client_val_ctx.consensus_state(&ClientConsensusStatePath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        ))?;
+
+        (height, consensus_state)
+    } else {
+        ibc_ctx
+            .consensus_states(&client_id)?
+            .into_iter()
+            .max_by_key(|&(h, _)| h)
+            .ok_or_else(|| {
+                QueryError::proof_not_found(format!(
+                    "No consensus state found for client: {client_id:?}"
+                ))
+            })?
+    };
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::ClientConsensusState(ClientConsensusStatePath::new(
+                client_id.clone(),
+                height.revision_number(),
+                height.revision_height(),
+            )),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for consensus state path: {client_id:?}"
+            ))
+        })?;
+
+    Ok(QueryConsensusStateResponse::new(
+        consensus_state.into(),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for all the consensus states of a given client id.
+pub fn query_consensus_states<I>(
+    ibc_ctx: &I,
+    request: &QueryConsensusStatesRequest,
+) -> Result<QueryConsensusStatesResponse, QueryError>
+where
+    I: QueryContext,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    let consensus_states = ibc_ctx.consensus_states(&request.client_id)?;
+
+    Ok(QueryConsensusStatesResponse::new(
+        consensus_states
+            .into_iter()
+            .map(|(height, state)| ConsensusStateWithHeight::new(height, state.into()))
+            .collect(),
+        // no support for pagination yet,
+        None,
+    ))
+}
+
+/// Queries for the heights of all the consensus states of a given client id.
+pub fn query_consensus_state_heights<I>(
+    ibc_ctx: &I,
+    request: &QueryConsensusStateHeightsRequest,
+) -> Result<QueryConsensusStateHeightsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let consensus_state_heights = ibc_ctx.consensus_state_heights(&request.client_id)?;
+
+    Ok(QueryConsensusStateHeightsResponse::new(
+        consensus_state_heights,
+        // no support for pagination yet
+        None,
+    ))
+}
+
+/// Queries for the status (Active, Frozen, Expired, Unauthorized) of a given client.
+pub fn query_client_status<I>(
+    ibc_ctx: &I,
+    request: &QueryClientStatusRequest,
+) -> Result<QueryClientStatusResponse, QueryError>
+where
+    I: ValidationContext,
+{
+    let client_val_ctx = ibc_ctx.get_client_validation_context();
+    let client_state = client_val_ctx.client_state(&request.client_id)?;
+    let client_validation_ctx = ibc_ctx.get_client_validation_context();
+    let client_status = client_state.status(client_validation_ctx, &request.client_id)?;
+
+    Ok(QueryClientStatusResponse::new(client_status))
+}
+
+/// Queries for the upgraded client state.
+pub fn query_upgraded_client_state<I, U>(
+    ibc_ctx: &I,
+    upgrade_ctx: &U,
+    request: &QueryUpgradedClientStateRequest,
+) -> Result<QueryUpgradedClientStateResponse, QueryError>
+where
+    I: ValidationContext,
+    U: UpgradeValidationContext + ProvableContext,
+{
+    let upgrade_revision_height = match request.upgrade_height {
+        Some(height) => height.revision_height(),
+        None => {
+            upgrade_ctx
+                .upgrade_plan()
+                .map_err(ClientError::from)?
+                .height
+        }
+    };
+
+    let upgraded_client_state_path =
+        UpgradeClientPath::UpgradedClientState(upgrade_revision_height);
+
+    let upgraded_client_state = upgrade_ctx
+        .upgraded_client_state(&upgraded_client_state_path)
+        .map_err(ClientError::from)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = upgrade_ctx
+        .get_proof(
+            proof_height,
+            &Path::UpgradeClient(upgraded_client_state_path),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for upgraded client state at: {proof_height:?}"
+            ))
+        })?;
+
+    Ok(QueryUpgradedClientStateResponse::new(
+        upgraded_client_state.into(),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the upgraded consensus state.
+pub fn query_upgraded_consensus_state<I, U>(
+    ibc_ctx: &I,
+    upgrade_ctx: &U,
+    request: &QueryUpgradedConsensusStateRequest,
+) -> Result<QueryUpgradedConsensusStateResponse, QueryError>
+where
+    I: ValidationContext,
+    U: UpgradeValidationContext + ProvableContext,
+    UpgradedConsensusStateRef<U>: Into<Any>,
+{
+    let upgrade_revision_height = match request.upgrade_height {
+        Some(height) => height.revision_height(),
+        None => {
+            upgrade_ctx
+                .upgrade_plan()
+                .map_err(ClientError::from)?
+                .height
+        }
+    };
+
+    let upgraded_consensus_state_path =
+        UpgradeClientPath::UpgradedClientConsensusState(upgrade_revision_height);
+
+    let upgraded_consensus_state = upgrade_ctx
+        .upgraded_consensus_state(&upgraded_consensus_state_path)
+        .map_err(ClientError::from)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = upgrade_ctx
+        .get_proof(
+            proof_height,
+            &Path::UpgradeClient(upgraded_consensus_state_path),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for upgraded consensus state at: {proof_height:?}"
+            ))
+        })?;
+
+    Ok(QueryUpgradedConsensusStateResponse::new(
+        upgraded_consensus_state.into(),
+        proof,
+        proof_height,
+    ))
+}
diff --git a/ibc-query/src/core/client/service.rs b/ibc-query/src/core/client/service.rs
new file mode 100644
index 000000000..c710802cc
--- /dev/null
+++ b/ibc-query/src/core/client/service.rs
@@ -0,0 +1,146 @@
+//! [`ClientQueryService`](ClientQueryService) takes generics `I` and `U` to store `ibc_context` and `upgrade_context` that implement [`QueryContext`](QueryContext) and [`UpgradeValidationContext`](UpgradeValidationContext) respectively.
+//! `I` must be a type where writes from one thread are readable from another.
+//! This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+
+use ibc::core::host::ConsensusStateRef;
+use ibc::core::primitives::prelude::*;
+use ibc::cosmos_host::upgrade_proposal::{
+    UpgradeValidationContext, UpgradedClientStateRef, UpgradedConsensusStateRef,
+};
+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::{
+    QueryClientParamsRequest, QueryClientParamsResponse, QueryClientStateRequest,
+    QueryClientStateResponse, QueryClientStatesRequest, QueryClientStatesResponse,
+    QueryClientStatusRequest, QueryClientStatusResponse, QueryConsensusStateHeightsRequest,
+    QueryConsensusStateHeightsResponse, QueryConsensusStateRequest, QueryConsensusStateResponse,
+    QueryConsensusStatesRequest, QueryConsensusStatesResponse, QueryUpgradedClientStateRequest,
+    QueryUpgradedClientStateResponse, QueryUpgradedConsensusStateRequest,
+    QueryUpgradedConsensusStateResponse,
+};
+use tonic::{Request, Response, Status};
+
+use super::{
+    query_client_state, query_client_states, query_client_status, query_consensus_state,
+    query_consensus_state_heights, query_consensus_states, query_upgraded_client_state,
+    query_upgraded_consensus_state,
+};
+use crate::core::context::{ProvableContext, QueryContext};
+use crate::utils::{IntoDomain, IntoResponse, TryIntoDomain};
+
+// TODO(rano): currently the services don't support pagination, so we return all the results.
+
+/// Generics `I` and `U` must be a type where writes from one thread are readable from another.
+/// This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+pub struct ClientQueryService<I, U>
+where
+    I: QueryContext + Send + Sync + 'static,
+    U: UpgradeValidationContext + Send + Sync + 'static,
+    UpgradedClientStateRef<U>: Into<Any>,
+    UpgradedConsensusStateRef<U>: Into<Any>,
+{
+    ibc_context: I,
+    upgrade_context: U,
+}
+
+impl<I, U> ClientQueryService<I, U>
+where
+    I: QueryContext + Send + Sync + 'static,
+    U: UpgradeValidationContext + Send + Sync + 'static,
+    UpgradedClientStateRef<U>: Into<Any>,
+    UpgradedConsensusStateRef<U>: Into<Any>,
+{
+    /// Parameters `ibc_context` and `upgrade_context` must be a type where writes from one thread are readable from another.
+    /// This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+    pub fn new(ibc_context: I, upgrade_context: U) -> Self {
+        Self {
+            ibc_context,
+            upgrade_context,
+        }
+    }
+}
+
+#[tonic::async_trait]
+impl<I, U> ClientQuery for ClientQueryService<I, U>
+where
+    I: QueryContext + Send + Sync + 'static,
+    U: UpgradeValidationContext + ProvableContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+    UpgradedConsensusStateRef<U>: Into<Any>,
+{
+    async fn client_state(
+        &self,
+        request: Request<QueryClientStateRequest>,
+    ) -> Result<Response<QueryClientStateResponse>, Status> {
+        query_client_state(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn client_states(
+        &self,
+        request: Request<QueryClientStatesRequest>,
+    ) -> Result<Response<QueryClientStatesResponse>, Status> {
+        query_client_states(&self.ibc_context, &request.into_domain())?.into_response()
+    }
+
+    async fn consensus_state(
+        &self,
+        request: Request<QueryConsensusStateRequest>,
+    ) -> Result<Response<QueryConsensusStateResponse>, Status> {
+        query_consensus_state(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn consensus_states(
+        &self,
+        request: Request<QueryConsensusStatesRequest>,
+    ) -> Result<Response<QueryConsensusStatesResponse>, Status> {
+        query_consensus_states(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn consensus_state_heights(
+        &self,
+        request: Request<QueryConsensusStateHeightsRequest>,
+    ) -> Result<Response<QueryConsensusStateHeightsResponse>, Status> {
+        query_consensus_state_heights(&self.ibc_context, &request.try_into_domain()?)?
+            .into_response()
+    }
+
+    async fn client_status(
+        &self,
+        request: Request<QueryClientStatusRequest>,
+    ) -> Result<Response<QueryClientStatusResponse>, Status> {
+        query_client_status(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn client_params(
+        &self,
+        _request: Request<QueryClientParamsRequest>,
+    ) -> Result<Response<QueryClientParamsResponse>, Status> {
+        Err(Status::unimplemented(
+            "Querying ClientParams is not supported yet",
+        ))
+    }
+
+    async fn upgraded_client_state(
+        &self,
+        request: Request<QueryUpgradedClientStateRequest>,
+    ) -> Result<Response<QueryUpgradedClientStateResponse>, Status> {
+        query_upgraded_client_state(
+            &self.ibc_context,
+            &self.upgrade_context,
+            &request.into_domain(),
+        )?
+        .into_response()
+    }
+
+    async fn upgraded_consensus_state(
+        &self,
+        request: Request<QueryUpgradedConsensusStateRequest>,
+    ) -> Result<Response<QueryUpgradedConsensusStateResponse>, Status> {
+        query_upgraded_consensus_state(
+            &self.ibc_context,
+            &self.upgrade_context,
+            &request.into_domain(),
+        )?
+        .into_response()
+    }
+}
diff --git a/ibc-query/src/core/client/types/mod.rs b/ibc-query/src/core/client/types/mod.rs
new file mode 100644
index 000000000..b8be6322b
--- /dev/null
+++ b/ibc-query/src/core/client/types/mod.rs
@@ -0,0 +1,5 @@
+mod request;
+mod response;
+
+pub use request::*;
+pub use response::*;
diff --git a/ibc-query/src/core/client/types/request.rs b/ibc-query/src/core/client/types/request.rs
new file mode 100644
index 000000000..1cc5e4769
--- /dev/null
+++ b/ibc-query/src/core/client/types/request.rs
@@ -0,0 +1,237 @@
+//! Contains all the RPC method request domain types and their conversions to
+//! and from the corresponding gRPC proto types for the client module.
+
+use ibc::core::client::types::Height;
+use ibc::core::host::types::identifiers::ClientId;
+use ibc::primitives::prelude::*;
+use ibc_proto::ibc::core::client::v1::{
+    QueryClientParamsRequest as RawQueryClientParamsRequest,
+    QueryClientStateRequest as RawQueryClientStateRequest,
+    QueryClientStatesRequest as RawQueryClientStatesRequest,
+    QueryClientStatusRequest as RawQueryClientStatusRequest,
+    QueryConsensusStateHeightsRequest as RawQueryConsensusStateHeightsRequest,
+    QueryConsensusStateRequest as RawQueryConsensusStateRequest,
+    QueryConsensusStatesRequest as RawQueryConsensusStatesRequest,
+    QueryUpgradedClientStateRequest as RawUpgradedClientStateRequest,
+    QueryUpgradedConsensusStateRequest as RawUpgradedConsensusStateRequest,
+};
+use ibc_proto::Protobuf;
+
+use crate::error::QueryError;
+use crate::types::PageRequest;
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientStateRequest {
+    /// The client identifier.
+    pub client_id: ClientId,
+    /// The height at which to query the client state. If not provided, the
+    /// latest height should be used.
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryClientStateRequest> for QueryClientStateRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryClientStateRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: request.client_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying all client states.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientStatesRequest {
+    pub pagination: Option<PageRequest>,
+}
+
+impl From<RawQueryClientStatesRequest> for QueryClientStatesRequest {
+    fn from(request: RawQueryClientStatesRequest) -> Self {
+        Self {
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the consensus state of a
+/// client.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConsensusStateRequest {
+    /// The client identifier.
+    pub client_id: ClientId,
+    /// The consensus state height to be queried. If not provided, the latest
+    /// height
+    pub consensus_height: Option<Height>,
+    /// The height at which to query the consensus state. If not provided, the
+    /// latest height should be used.
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryConsensusStateRequest> for QueryConsensusStateRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConsensusStateRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: request.client_id.parse()?,
+            consensus_height: (!request.latest_height)
+                .then(|| Height::new(request.revision_number, request.revision_height))
+                .transpose()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying all consensus states.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConsensusStatesRequest {
+    pub client_id: ClientId,
+    pub pagination: Option<PageRequest>,
+}
+
+impl Protobuf<RawQueryConsensusStatesRequest> for QueryConsensusStatesRequest {}
+
+impl TryFrom<RawQueryConsensusStatesRequest> for QueryConsensusStatesRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConsensusStatesRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: request.client_id.parse()?,
+            pagination: request.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryConsensusStatesRequest> for RawQueryConsensusStatesRequest {
+    fn from(request: QueryConsensusStatesRequest) -> Self {
+        Self {
+            client_id: request.client_id.to_string(),
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the consensus state
+/// heights.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConsensusStateHeightsRequest {
+    pub client_id: ClientId,
+    pub pagination: Option<PageRequest>,
+}
+
+impl Protobuf<RawQueryConsensusStateHeightsRequest> for QueryConsensusStateHeightsRequest {}
+
+impl TryFrom<RawQueryConsensusStateHeightsRequest> for QueryConsensusStateHeightsRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConsensusStateHeightsRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: request.client_id.parse()?,
+            pagination: request.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryConsensusStateHeightsRequest> for RawQueryConsensusStateHeightsRequest {
+    fn from(request: QueryConsensusStateHeightsRequest) -> Self {
+        Self {
+            client_id: request.client_id.to_string(),
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the host consensus state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryHostConsensusStateRequest {
+    pub query_height: Option<Height>,
+}
+
+/// Defines the RPC method request type for querying the status of a client.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientStatusRequest {
+    pub client_id: ClientId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryClientStatusRequest> for QueryClientStatusRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryClientStatusRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: request.client_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the parameters of a client.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientParamsRequest {
+    pub query_height: Option<Height>,
+}
+
+impl From<RawQueryClientParamsRequest> for QueryClientParamsRequest {
+    fn from(_request: RawQueryClientParamsRequest) -> Self {
+        Self { query_height: None }
+    }
+}
+
+/// Defines the RPC method request type for querying the upgraded client state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUpgradedClientStateRequest {
+    /// Height at which the chain is scheduled to halt for upgrade
+    pub upgrade_height: Option<Height>,
+    /// The height at which to query the upgraded client state. If not provided,
+    /// the latest height should be used.
+    pub query_height: Option<Height>,
+}
+
+impl From<RawUpgradedClientStateRequest> for QueryUpgradedClientStateRequest {
+    fn from(_request: RawUpgradedClientStateRequest) -> Self {
+        Self {
+            upgrade_height: None,
+            query_height: None,
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying the upgraded consensus
+/// state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUpgradedConsensusStateRequest {
+    /// The height at which the chain is scheduled to halt for upgrade.
+    pub upgrade_height: Option<Height>,
+    /// The height at which to query the upgraded consensus state. If not
+    /// provided, the latest height should be used.
+    pub query_height: Option<Height>,
+}
+
+impl From<RawUpgradedConsensusStateRequest> for QueryUpgradedConsensusStateRequest {
+    fn from(_request: RawUpgradedConsensusStateRequest) -> Self {
+        Self {
+            upgrade_height: None,
+            query_height: None,
+        }
+    }
+}
diff --git a/ibc-query/src/core/client/types/response.rs b/ibc-query/src/core/client/types/response.rs
new file mode 100644
index 000000000..fa934c90c
--- /dev/null
+++ b/ibc-query/src/core/client/types/response.rs
@@ -0,0 +1,494 @@
+//! Contains all the RPC method response domain types and their conversions to
+//! and from the corresponding gRPC proto types for the client module.
+
+use ibc::core::client::types::{Height, Status};
+use ibc::core::host::types::identifiers::ClientId;
+use ibc::core::primitives::proto::Any;
+use ibc::primitives::prelude::*;
+use ibc::primitives::proto::Protobuf;
+use ibc_proto::ibc::core::client::v1::{
+    ConsensusStateWithHeight as RawConsensusStateWithHeight,
+    IdentifiedClientState as RawIdentifiedClientState, Params as RawParams,
+    QueryClientParamsResponse as RawQueryClientParamsResponse,
+    QueryClientStateResponse as RawQueryClientStateResponse,
+    QueryClientStatesResponse as RawQueryClientStatesResponse,
+    QueryClientStatusResponse as RawQueryClientStatusResponse,
+    QueryConsensusStateHeightsResponse as RawQueryConsensusStateHeightsResponse,
+    QueryConsensusStateResponse as RawQueryConsensusStateResponse,
+    QueryConsensusStatesResponse as RawQueryConsensusStatesResponse,
+    QueryUpgradedClientStateResponse as RawQueryUpgradedClientStateResponse,
+    QueryUpgradedConsensusStateResponse as RawQueryUpgradedConsensusStateResponse,
+};
+
+use crate::error::QueryError;
+use crate::types::{PageResponse, Proof};
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientStateResponse {
+    /// The client identifier.
+    pub client_state: Any,
+    /// The proof that the client state was retrieved.
+    pub proof: Proof,
+    /// The height at which the client state was retrieved.
+    pub proof_height: Height,
+}
+
+impl QueryClientStateResponse {
+    pub fn new(client_state: Any, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            client_state,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryClientStateResponse> for QueryClientStateResponse {}
+
+impl TryFrom<RawQueryClientStateResponse> for QueryClientStateResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryClientStateResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_state: value
+                .client_state
+                .ok_or_else(|| QueryError::missing_field("client_state"))?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryClientStateResponse> for RawQueryClientStateResponse {
+    fn from(response: QueryClientStateResponse) -> Self {
+        Self {
+            client_state: Some(response.client_state),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientStatesResponse {
+    pub client_states: Vec<IdentifiedClientState>,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryClientStatesResponse {
+    pub fn new(
+        client_states: Vec<IdentifiedClientState>,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            client_states,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryClientStatesResponse> for QueryClientStatesResponse {}
+
+impl TryFrom<RawQueryClientStatesResponse> for QueryClientStatesResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryClientStatesResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_states: value
+                .client_states
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryClientStatesResponse> for RawQueryClientStatesResponse {
+    fn from(response: QueryClientStatesResponse) -> Self {
+        Self {
+            client_states: response.client_states.into_iter().map(Into::into).collect(),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct IdentifiedClientState {
+    pub client_id: ClientId,
+    pub client_state: Any,
+}
+
+impl IdentifiedClientState {
+    pub fn new(client_id: ClientId, client_state: Any) -> Self {
+        Self {
+            client_id,
+            client_state,
+        }
+    }
+}
+
+impl Protobuf<RawIdentifiedClientState> for IdentifiedClientState {}
+
+impl TryFrom<RawIdentifiedClientState> for IdentifiedClientState {
+    type Error = QueryError;
+
+    fn try_from(value: RawIdentifiedClientState) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: value.client_id.parse()?,
+            client_state: value
+                .client_state
+                .ok_or_else(|| QueryError::missing_field("client_state"))?,
+        })
+    }
+}
+
+impl From<IdentifiedClientState> for RawIdentifiedClientState {
+    fn from(ics: IdentifiedClientState) -> Self {
+        Self {
+            client_id: ics.client_id.to_string(),
+            client_state: Some(ics.client_state),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConsensusStateResponse {
+    pub consensus_state: Any,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryConsensusStateResponse {
+    pub fn new(consensus_state: Any, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            consensus_state,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConsensusStateResponse> for QueryConsensusStateResponse {}
+
+impl TryFrom<RawQueryConsensusStateResponse> for QueryConsensusStateResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConsensusStateResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            consensus_state: value
+                .consensus_state
+                .ok_or_else(|| QueryError::missing_field("consensus_state"))?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryConsensusStateResponse> for RawQueryConsensusStateResponse {
+    fn from(response: QueryConsensusStateResponse) -> Self {
+        Self {
+            consensus_state: Some(response.consensus_state),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct ConsensusStateWithHeight {
+    pub height: Height,
+    pub consensus_state: Any,
+}
+
+impl ConsensusStateWithHeight {
+    pub fn new(height: Height, consensus_state: Any) -> Self {
+        Self {
+            height,
+            consensus_state,
+        }
+    }
+}
+
+impl Protobuf<RawConsensusStateWithHeight> for ConsensusStateWithHeight {}
+
+impl TryFrom<RawConsensusStateWithHeight> for ConsensusStateWithHeight {
+    type Error = QueryError;
+
+    fn try_from(value: RawConsensusStateWithHeight) -> Result<Self, Self::Error> {
+        Ok(Self {
+            height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+            consensus_state: value
+                .consensus_state
+                .ok_or_else(|| QueryError::missing_field("consensus_state"))?,
+        })
+    }
+}
+
+impl From<ConsensusStateWithHeight> for RawConsensusStateWithHeight {
+    fn from(ics: ConsensusStateWithHeight) -> Self {
+        Self {
+            height: Some(ics.height.into()),
+            consensus_state: Some(ics.consensus_state),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConsensusStatesResponse {
+    pub consensus_states: Vec<ConsensusStateWithHeight>,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryConsensusStatesResponse {
+    pub fn new(
+        consensus_states: Vec<ConsensusStateWithHeight>,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            consensus_states,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConsensusStatesResponse> for QueryConsensusStatesResponse {}
+
+impl TryFrom<RawQueryConsensusStatesResponse> for QueryConsensusStatesResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConsensusStatesResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            consensus_states: value
+                .consensus_states
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryConsensusStatesResponse> for RawQueryConsensusStatesResponse {
+    fn from(response: QueryConsensusStatesResponse) -> Self {
+        Self {
+            consensus_states: response
+                .consensus_states
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type for querying the consensus state heights.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConsensusStateHeightsResponse {
+    pub consensus_state_heights: Vec<Height>,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryConsensusStateHeightsResponse {
+    pub fn new(consensus_state_heights: Vec<Height>, pagination: Option<PageResponse>) -> Self {
+        Self {
+            consensus_state_heights,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConsensusStateHeightsResponse> for QueryConsensusStateHeightsResponse {}
+
+impl TryFrom<RawQueryConsensusStateHeightsResponse> for QueryConsensusStateHeightsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConsensusStateHeightsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            consensus_state_heights: value
+                .consensus_state_heights
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryConsensusStateHeightsResponse> for RawQueryConsensusStateHeightsResponse {
+    fn from(response: QueryConsensusStateHeightsResponse) -> Self {
+        Self {
+            consensus_state_heights: response
+                .consensus_state_heights
+                .into_iter()
+                .map(Into::into)
+                .collect(),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type for querying the client status.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientStatusResponse {
+    pub status: Status,
+}
+
+impl QueryClientStatusResponse {
+    pub fn new(status: Status) -> Self {
+        Self { status }
+    }
+}
+
+impl Protobuf<RawQueryClientStatusResponse> for QueryClientStatusResponse {}
+
+impl TryFrom<RawQueryClientStatusResponse> for QueryClientStatusResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryClientStatusResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            status: value.status.parse()?,
+        })
+    }
+}
+
+impl From<QueryClientStatusResponse> for RawQueryClientStatusResponse {
+    fn from(response: QueryClientStatusResponse) -> Self {
+        Self {
+            status: response.status.to_string(),
+        }
+    }
+}
+
+/// Defines the RPC method response type for querying the client parameters.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientParamsResponse {
+    pub allowed_clients: Vec<ClientId>,
+}
+
+impl QueryClientParamsResponse {
+    pub fn new(allowed_clients: Vec<ClientId>) -> Self {
+        Self { allowed_clients }
+    }
+}
+
+impl Protobuf<RawQueryClientParamsResponse> for QueryClientParamsResponse {}
+
+impl TryFrom<RawQueryClientParamsResponse> for QueryClientParamsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryClientParamsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            allowed_clients: value
+                .params
+                .ok_or_else(|| QueryError::missing_field("params"))?
+                .allowed_clients
+                .into_iter()
+                .map(|id| id.parse())
+                .collect::<Result<_, _>>()?,
+        })
+    }
+}
+
+impl From<QueryClientParamsResponse> for RawQueryClientParamsResponse {
+    fn from(response: QueryClientParamsResponse) -> Self {
+        Self {
+            params: Some(RawParams {
+                allowed_clients: response
+                    .allowed_clients
+                    .into_iter()
+                    .map(|id| id.to_string())
+                    .collect(),
+            }),
+        }
+    }
+}
+
+/// Defines the RPC method response type for querying the upgraded client state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUpgradedClientStateResponse {
+    /// The upgraded client state.
+    pub upgraded_client_state: Any,
+    /// The proof of the upgraded client state existence.
+    pub proof: Proof,
+    /// The height at which the proof was retrieved.
+    pub proof_height: Height,
+}
+
+impl QueryUpgradedClientStateResponse {
+    pub fn new(upgraded_client_state: Any, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            upgraded_client_state,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl From<QueryUpgradedClientStateResponse> for RawQueryUpgradedClientStateResponse {
+    fn from(response: QueryUpgradedClientStateResponse) -> Self {
+        Self {
+            upgraded_client_state: Some(response.upgraded_client_state),
+        }
+    }
+}
+
+/// Defines the RPC method response type for querying the upgraded consensus state.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryUpgradedConsensusStateResponse {
+    /// The upgraded consensus state.
+    pub upgraded_consensus_state: Any,
+    /// The proof of the upgraded consensus state existence.
+    pub proof: Proof,
+    /// The height at which the proof was retrieved.
+    pub proof_height: Height,
+}
+
+impl QueryUpgradedConsensusStateResponse {
+    pub fn new(upgraded_consensus_state: Any, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            upgraded_consensus_state,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl From<QueryUpgradedConsensusStateResponse> for RawQueryUpgradedConsensusStateResponse {
+    fn from(response: QueryUpgradedConsensusStateResponse) -> Self {
+        Self {
+            upgraded_consensus_state: Some(response.upgraded_consensus_state),
+        }
+    }
+}
diff --git a/ibc-query/src/core/connection/mod.rs b/ibc-query/src/core/connection/mod.rs
new file mode 100644
index 000000000..7cdb244ce
--- /dev/null
+++ b/ibc-query/src/core/connection/mod.rs
@@ -0,0 +1,7 @@
+mod query;
+mod service;
+mod types;
+
+pub use query::*;
+pub use service::*;
+pub use types::*;
diff --git a/ibc-query/src/core/connection/query.rs b/ibc-query/src/core/connection/query.rs
new file mode 100644
index 000000000..d156c4c1c
--- /dev/null
+++ b/ibc-query/src/core/connection/query.rs
@@ -0,0 +1,200 @@
+//! Provides utility functions for querying IBC connection states.
+
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::host::types::path::{
+    ClientConnectionPath, ClientConsensusStatePath, ClientStatePath, ConnectionPath, Path,
+};
+use ibc::core::host::{ConsensusStateRef, ValidationContext};
+use ibc::primitives::prelude::format;
+use ibc::primitives::proto::Any;
+
+use super::{
+    QueryClientConnectionsRequest, QueryClientConnectionsResponse,
+    QueryConnectionClientStateRequest, QueryConnectionClientStateResponse,
+    QueryConnectionConsensusStateRequest, QueryConnectionConsensusStateResponse,
+    QueryConnectionParamsRequest, QueryConnectionParamsResponse, QueryConnectionRequest,
+    QueryConnectionResponse, QueryConnectionsRequest, QueryConnectionsResponse,
+};
+use crate::core::client::IdentifiedClientState;
+use crate::core::context::{ProvableContext, QueryContext};
+use crate::error::QueryError;
+use crate::types::Proof;
+
+/// Queries for the connection end of a given connection id.
+pub fn query_connection<I>(
+    ibc_ctx: &I,
+    request: &QueryConnectionRequest,
+) -> Result<QueryConnectionResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+{
+    let connection_end = ibc_ctx.connection_end(&request.connection_id)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::Connection(ConnectionPath::new(&request.connection_id)),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for connection path: {:?}",
+                request.connection_id
+            ))
+        })?;
+
+    Ok(QueryConnectionResponse::new(
+        connection_end,
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for all the existing connection ends.
+pub fn query_connections<I>(
+    ibc_ctx: &I,
+    _request: &QueryConnectionsRequest,
+) -> Result<QueryConnectionsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let connections = ibc_ctx.connection_ends()?;
+
+    Ok(QueryConnectionsResponse::new(
+        connections,
+        ibc_ctx.host_height()?,
+        None,
+    ))
+}
+
+/// Queries for all the existing connection ends for a given client.
+pub fn query_client_connections<I>(
+    ibc_ctx: &I,
+    request: &QueryClientConnectionsRequest,
+) -> Result<QueryClientConnectionsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let connections = ibc_ctx.client_connection_ends(&request.client_id)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof: Proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::ClientConnection(ClientConnectionPath::new(request.client_id.clone())),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for client connection path: {:?}",
+                request.client_id
+            ))
+        })?;
+
+    Ok(QueryClientConnectionsResponse::new(
+        connections,
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the client state of a given connection id.
+pub fn query_connection_client_state<I>(
+    ibc_ctx: &I,
+    request: &QueryConnectionClientStateRequest,
+) -> Result<QueryConnectionClientStateResponse, QueryError>
+where
+    I: QueryContext,
+{
+    let connection_end = ibc_ctx.connection_end(&request.connection_id)?;
+
+    let client_val_ctx = ibc_ctx.get_client_validation_context();
+
+    let client_state = client_val_ctx.client_state(connection_end.client_id())?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(
+            proof_height,
+            &Path::ClientState(ClientStatePath::new(connection_end.client_id().clone())),
+        )
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for client state path: {:?}",
+                connection_end.client_id()
+            ))
+        })?;
+
+    Ok(QueryConnectionClientStateResponse::new(
+        IdentifiedClientState::new(connection_end.client_id().clone(), client_state.into()),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the consensus state of a given connection id and height.
+pub fn query_connection_consensus_state<I>(
+    ibc_ctx: &I,
+    request: &QueryConnectionConsensusStateRequest,
+) -> Result<QueryConnectionConsensusStateResponse, QueryError>
+where
+    I: ValidationContext + ProvableContext,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    let connection_end = ibc_ctx.connection_end(&request.connection_id)?;
+
+    let consensus_path = ClientConsensusStatePath::new(
+        connection_end.client_id().clone(),
+        request.height.revision_number(),
+        request.height.revision_height(),
+    );
+
+    let client_val_ctx = ibc_ctx.get_client_validation_context();
+
+    let consensus_state = client_val_ctx.consensus_state(&consensus_path)?;
+
+    let proof_height = match request.query_height {
+        Some(height) => height,
+        None => ibc_ctx.host_height()?,
+    };
+
+    let proof = ibc_ctx
+        .get_proof(proof_height, &Path::ClientConsensusState(consensus_path))
+        .ok_or_else(|| {
+            QueryError::proof_not_found(format!(
+                "Proof not found for consensus state path: {:?}",
+                connection_end.client_id()
+            ))
+        })?;
+
+    Ok(QueryConnectionConsensusStateResponse::new(
+        consensus_state.into(),
+        connection_end.client_id().clone(),
+        proof,
+        proof_height,
+    ))
+}
+
+/// Queries for the connection parameters.
+pub fn query_connection_params<I>(
+    ibc_ctx: &I,
+    _request: &QueryConnectionParamsRequest,
+) -> Result<QueryConnectionParamsResponse, QueryError>
+where
+    I: QueryContext,
+{
+    Ok(QueryConnectionParamsResponse::new(
+        ibc_ctx.max_expected_time_per_block().as_secs(),
+    ))
+}
diff --git a/ibc-query/src/core/connection/service.rs b/ibc-query/src/core/connection/service.rs
new file mode 100644
index 000000000..3828f071e
--- /dev/null
+++ b/ibc-query/src/core/connection/service.rs
@@ -0,0 +1,101 @@
+//! [`ConnectionQueryService`](ConnectionQueryService) takes a generic `I` to
+//! store `ibc_context` that implements [`QueryContext`](QueryContext). `I` must
+//! be a type where writes from one thread are readable from another. This means
+//! using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most cases.
+
+use ibc::core::host::ConsensusStateRef;
+use ibc::core::primitives::prelude::*;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::connection::v1::query_server::Query as ConnectionQuery;
+use ibc_proto::ibc::core::connection::v1::{
+    QueryClientConnectionsRequest, QueryClientConnectionsResponse,
+    QueryConnectionClientStateRequest, QueryConnectionClientStateResponse,
+    QueryConnectionConsensusStateRequest, QueryConnectionConsensusStateResponse,
+    QueryConnectionParamsRequest, QueryConnectionParamsResponse, QueryConnectionRequest,
+    QueryConnectionResponse, QueryConnectionsRequest, QueryConnectionsResponse,
+};
+use tonic::{Request, Response, Status};
+
+use super::{
+    query_client_connections, query_connection, query_connection_client_state,
+    query_connection_consensus_state, query_connection_params, query_connections,
+};
+use crate::core::context::QueryContext;
+use crate::utils::{IntoDomain, IntoResponse, TryIntoDomain};
+
+// TODO(rano): currently the services don't support pagination, so we return all the results.
+
+/// The generic `I` must be a type where writes from one thread are readable
+/// from another. This means using `Arc<Mutex<_>>` or `Arc<RwLock<_>>` in most
+/// cases.
+pub struct ConnectionQueryService<I>
+where
+    I: QueryContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    ibc_context: I,
+}
+
+impl<I> ConnectionQueryService<I>
+where
+    I: QueryContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    /// The parameter `ibc_context` must be a type where writes from one thread
+    /// are readable from another. This means using `Arc<Mutex<_>>` or
+    /// `Arc<RwLock<_>>` in most cases.
+    pub fn new(ibc_context: I) -> Self {
+        Self { ibc_context }
+    }
+}
+
+#[tonic::async_trait]
+impl<I> ConnectionQuery for ConnectionQueryService<I>
+where
+    I: QueryContext + Send + Sync + 'static,
+    ConsensusStateRef<I>: Into<Any>,
+{
+    async fn connection(
+        &self,
+        request: Request<QueryConnectionRequest>,
+    ) -> Result<Response<QueryConnectionResponse>, Status> {
+        query_connection(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn connections(
+        &self,
+        request: Request<QueryConnectionsRequest>,
+    ) -> Result<Response<QueryConnectionsResponse>, Status> {
+        query_connections(&self.ibc_context, &request.into_domain())?.into_response()
+    }
+
+    async fn client_connections(
+        &self,
+        request: Request<QueryClientConnectionsRequest>,
+    ) -> Result<Response<QueryClientConnectionsResponse>, Status> {
+        query_client_connections(&self.ibc_context, &request.try_into_domain()?)?.into_response()
+    }
+
+    async fn connection_client_state(
+        &self,
+        request: Request<QueryConnectionClientStateRequest>,
+    ) -> Result<Response<QueryConnectionClientStateResponse>, Status> {
+        query_connection_client_state(&self.ibc_context, &request.try_into_domain()?)?
+            .into_response()
+    }
+
+    async fn connection_consensus_state(
+        &self,
+        request: Request<QueryConnectionConsensusStateRequest>,
+    ) -> Result<Response<QueryConnectionConsensusStateResponse>, Status> {
+        query_connection_consensus_state(&self.ibc_context, &request.try_into_domain()?)?
+            .into_response()
+    }
+
+    async fn connection_params(
+        &self,
+        request: Request<QueryConnectionParamsRequest>,
+    ) -> Result<Response<QueryConnectionParamsResponse>, Status> {
+        query_connection_params(&self.ibc_context, &request.into_domain())?.into_response()
+    }
+}
diff --git a/ibc-query/src/core/connection/types/mod.rs b/ibc-query/src/core/connection/types/mod.rs
new file mode 100644
index 000000000..b8be6322b
--- /dev/null
+++ b/ibc-query/src/core/connection/types/mod.rs
@@ -0,0 +1,5 @@
+mod request;
+mod response;
+
+pub use request::*;
+pub use response::*;
diff --git a/ibc-query/src/core/connection/types/request.rs b/ibc-query/src/core/connection/types/request.rs
new file mode 100644
index 000000000..cf0f5a6f9
--- /dev/null
+++ b/ibc-query/src/core/connection/types/request.rs
@@ -0,0 +1,132 @@
+//! Contains all the RPC method request domain types and their conversions to
+//! and from the corresponding gRPC proto types for the connection module.
+
+use ibc::core::client::types::Height;
+use ibc::core::host::types::identifiers::{ClientId, ConnectionId};
+use ibc::primitives::prelude::*;
+use ibc_proto::ibc::core::connection::v1::{
+    QueryClientConnectionsRequest as RawQueryClientConnectionsRequest,
+    QueryConnectionClientStateRequest as RawQueryConnectionClientStateRequest,
+    QueryConnectionConsensusStateRequest as RawQueryConnectionConsensusStateRequest,
+    QueryConnectionParamsRequest as RawQueryConnectionParamsRequest,
+    QueryConnectionRequest as RawQueryConnectionRequest,
+    QueryConnectionsRequest as RawQueryConnectionsRequest,
+};
+
+use crate::error::QueryError;
+use crate::types::PageRequest;
+
+/// Defines the RPC method request type for querying a connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionRequest {
+    pub connection_id: ConnectionId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryConnectionRequest> for QueryConnectionRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConnectionRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            connection_id: request.connection_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying connections.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionsRequest {
+    pub pagination: Option<PageRequest>,
+}
+
+impl From<RawQueryConnectionsRequest> for QueryConnectionsRequest {
+    fn from(request: RawQueryConnectionsRequest) -> Self {
+        Self {
+            pagination: request.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method request type for querying connections associated with
+/// a client.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientConnectionsRequest {
+    pub client_id: ClientId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryClientConnectionsRequest> for QueryClientConnectionsRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryClientConnectionsRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            client_id: request.client_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the client state associated
+/// with a connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionClientStateRequest {
+    pub connection_id: ConnectionId,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryConnectionClientStateRequest> for QueryConnectionClientStateRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConnectionClientStateRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            connection_id: request.connection_id.parse()?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the consensus state
+/// associated with a connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionConsensusStateRequest {
+    pub connection_id: ConnectionId,
+    pub height: Height,
+    pub query_height: Option<Height>,
+}
+
+impl TryFrom<RawQueryConnectionConsensusStateRequest> for QueryConnectionConsensusStateRequest {
+    type Error = QueryError;
+
+    fn try_from(request: RawQueryConnectionConsensusStateRequest) -> Result<Self, Self::Error> {
+        Ok(Self {
+            connection_id: request.connection_id.parse()?,
+            height: Height::new(request.revision_number, request.revision_height)?,
+            query_height: None,
+        })
+    }
+}
+
+/// Defines the RPC method request type for querying the connection parameters.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionParamsRequest {
+    pub query_height: Option<Height>,
+}
+
+impl From<RawQueryConnectionParamsRequest> for QueryConnectionParamsRequest {
+    fn from(_request: RawQueryConnectionParamsRequest) -> Self {
+        Self { query_height: None }
+    }
+}
diff --git a/ibc-query/src/core/connection/types/response.rs b/ibc-query/src/core/connection/types/response.rs
new file mode 100644
index 000000000..5b252e594
--- /dev/null
+++ b/ibc-query/src/core/connection/types/response.rs
@@ -0,0 +1,336 @@
+//! Contains all the RPC method response domain types and their conversions to
+//! and from the corresponding gRPC proto types for the connection module.
+
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::{ConnectionEnd, IdentifiedConnectionEnd};
+use ibc::core::host::types::identifiers::{ClientId, ConnectionId};
+use ibc::core::primitives::proto::Any;
+use ibc::primitives::prelude::*;
+use ibc::primitives::proto::Protobuf;
+use ibc_proto::ibc::core::connection::v1::{
+    Params as RawParams, QueryClientConnectionsResponse as RawQueryClientConnectionsResponse,
+    QueryConnectionClientStateResponse as RawQueryConnectionClientStateResponse,
+    QueryConnectionConsensusStateResponse as RawQueryConnectionConsensusStateResponse,
+    QueryConnectionParamsResponse as RawQueryConnectionParamsResponse,
+    QueryConnectionResponse as RawQueryConnectionResponse,
+    QueryConnectionsResponse as RawQueryConnectionsResponse,
+};
+
+use crate::core::client::IdentifiedClientState;
+use crate::error::QueryError;
+use crate::types::{PageResponse, Proof};
+
+/// Defines the RPC method response type when querying a connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionResponse {
+    pub conn_end: ConnectionEnd,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryConnectionResponse {
+    pub fn new(connection: ConnectionEnd, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            conn_end: connection,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConnectionResponse> for QueryConnectionResponse {}
+
+impl TryFrom<RawQueryConnectionResponse> for QueryConnectionResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConnectionResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            conn_end: value
+                .connection
+                .ok_or_else(|| QueryError::missing_field("connection"))?
+                .try_into()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryConnectionResponse> for RawQueryConnectionResponse {
+    fn from(response: QueryConnectionResponse) -> Self {
+        Self {
+            connection: Some(response.conn_end.into()),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying all the existing connection ends.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionsResponse {
+    pub connections: Vec<IdentifiedConnectionEnd>,
+    pub query_height: Height,
+    pub pagination: Option<PageResponse>,
+}
+
+impl QueryConnectionsResponse {
+    pub fn new(
+        connections: Vec<IdentifiedConnectionEnd>,
+        query_height: Height,
+        pagination: Option<PageResponse>,
+    ) -> Self {
+        Self {
+            connections,
+            query_height,
+            pagination,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConnectionsResponse> for QueryConnectionsResponse {}
+
+impl TryFrom<RawQueryConnectionsResponse> for QueryConnectionsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConnectionsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            connections: value
+                .connections
+                .into_iter()
+                .map(TryInto::try_into)
+                .collect::<Result<_, _>>()?,
+            query_height: value
+                .height
+                .ok_or_else(|| QueryError::missing_field("height"))?
+                .try_into()?,
+            pagination: value.pagination.map(Into::into),
+        })
+    }
+}
+
+impl From<QueryConnectionsResponse> for RawQueryConnectionsResponse {
+    fn from(response: QueryConnectionsResponse) -> Self {
+        Self {
+            connections: response.connections.into_iter().map(Into::into).collect(),
+            height: Some(response.query_height.into()),
+            pagination: response.pagination.map(Into::into),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying client state associated
+/// with a connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionClientStateResponse {
+    pub identified_client_state: IdentifiedClientState,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryConnectionClientStateResponse {
+    pub fn new(
+        identified_client_state: IdentifiedClientState,
+        proof: Proof,
+        proof_height: Height,
+    ) -> Self {
+        Self {
+            identified_client_state,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConnectionClientStateResponse> for QueryConnectionClientStateResponse {}
+
+impl TryFrom<RawQueryConnectionClientStateResponse> for QueryConnectionClientStateResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConnectionClientStateResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            identified_client_state: value
+                .identified_client_state
+                .ok_or_else(|| QueryError::missing_field("identified_client_state"))?
+                .try_into()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryConnectionClientStateResponse> for RawQueryConnectionClientStateResponse {
+    fn from(response: QueryConnectionClientStateResponse) -> Self {
+        Self {
+            identified_client_state: Some(response.identified_client_state.into()),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying all the existing
+/// connection ends for a given client.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryClientConnectionsResponse {
+    pub connection_paths: Vec<ConnectionId>,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryClientConnectionsResponse {
+    pub fn new(connection_paths: Vec<ConnectionId>, proof: Proof, proof_height: Height) -> Self {
+        Self {
+            connection_paths,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryClientConnectionsResponse> for QueryClientConnectionsResponse {}
+
+impl TryFrom<RawQueryClientConnectionsResponse> for QueryClientConnectionsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryClientConnectionsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            connection_paths: value
+                .connection_paths
+                .into_iter()
+                .map(|id| id.parse())
+                .collect::<Result<_, _>>()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryClientConnectionsResponse> for RawQueryClientConnectionsResponse {
+    fn from(response: QueryClientConnectionsResponse) -> Self {
+        Self {
+            connection_paths: response
+                .connection_paths
+                .into_iter()
+                .map(|id| id.to_string())
+                .collect(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+/// Defines the RPC method response type when querying the consensus state for a
+/// connection.
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionConsensusStateResponse {
+    pub consensus_state: Any,
+    pub client_id: ClientId,
+    pub proof: Proof,
+    pub proof_height: Height,
+}
+
+impl QueryConnectionConsensusStateResponse {
+    pub fn new(
+        consensus_state: Any,
+        client_id: ClientId,
+        proof: Proof,
+        proof_height: Height,
+    ) -> Self {
+        Self {
+            consensus_state,
+            client_id,
+            proof,
+            proof_height,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConnectionConsensusStateResponse> for QueryConnectionConsensusStateResponse {}
+
+impl TryFrom<RawQueryConnectionConsensusStateResponse> for QueryConnectionConsensusStateResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConnectionConsensusStateResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            consensus_state: value
+                .consensus_state
+                .ok_or_else(|| QueryError::missing_field("consensus_state"))?,
+            client_id: value.client_id.parse()?,
+            proof: value.proof,
+            proof_height: value
+                .proof_height
+                .ok_or_else(|| QueryError::missing_field("proof_height"))?
+                .try_into()?,
+        })
+    }
+}
+
+impl From<QueryConnectionConsensusStateResponse> for RawQueryConnectionConsensusStateResponse {
+    fn from(response: QueryConnectionConsensusStateResponse) -> Self {
+        Self {
+            consensus_state: Some(response.consensus_state),
+            client_id: response.client_id.to_string(),
+            proof: response.proof,
+            proof_height: Some(response.proof_height.into()),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct QueryConnectionParamsResponse {
+    pub max_expected_time_per_block: u64,
+}
+
+impl QueryConnectionParamsResponse {
+    pub fn new(max_expected_time_per_block: u64) -> Self {
+        Self {
+            max_expected_time_per_block,
+        }
+    }
+}
+
+impl Protobuf<RawQueryConnectionParamsResponse> for QueryConnectionParamsResponse {}
+
+impl TryFrom<RawQueryConnectionParamsResponse> for QueryConnectionParamsResponse {
+    type Error = QueryError;
+
+    fn try_from(value: RawQueryConnectionParamsResponse) -> Result<Self, Self::Error> {
+        Ok(Self {
+            max_expected_time_per_block: value
+                .params
+                .ok_or_else(|| QueryError::missing_field("params"))?
+                .max_expected_time_per_block,
+        })
+    }
+}
+
+impl From<QueryConnectionParamsResponse> for RawQueryConnectionParamsResponse {
+    fn from(response: QueryConnectionParamsResponse) -> Self {
+        Self {
+            params: Some(RawParams {
+                max_expected_time_per_block: response.max_expected_time_per_block,
+            }),
+        }
+    }
+}
diff --git a/ibc-query/src/core/context.rs b/ibc-query/src/core/context.rs
new file mode 100644
index 000000000..693dafec9
--- /dev/null
+++ b/ibc-query/src/core/context.rs
@@ -0,0 +1,82 @@
+//! Required traits for blanket implementations of [`gRPC query services`](crate::core).
+
+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::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::{ClientStateRef, ConsensusStateRef, ValidationContext};
+use ibc::core::primitives::prelude::*;
+
+/// Context to be implemented by the host to provide proofs in query responses
+pub trait ProvableContext {
+    /// Returns the proof for the given path at the given height.
+    /// As this is in the context of IBC, the path is expected to be an [`IbcPath`](Path).
+    fn get_proof(&self, height: Height, path: &Path) -> Option<Vec<u8>>;
+}
+
+/// Context to be implemented by the host that provides gRPC query services.
+pub trait QueryContext: ProvableContext + ValidationContext {
+    // Client queries
+
+    /// Returns the list of all clients.
+    fn client_states(&self) -> Result<Vec<(ClientId, ClientStateRef<Self>)>, ContextError>;
+
+    /// Returns the list of all consensus states for the given client.
+    fn consensus_states(
+        &self,
+        client_id: &ClientId,
+    ) -> Result<Vec<(Height, ConsensusStateRef<Self>)>, ContextError>;
+
+    /// Returns the list of all heights at which consensus states for the given client are.
+    fn consensus_state_heights(&self, client_id: &ClientId) -> Result<Vec<Height>, ContextError>;
+
+    // Connection queries
+
+    /// Returns the list of all connection ends.
+    fn connection_ends(&self) -> Result<Vec<IdentifiedConnectionEnd>, ContextError>;
+
+    /// Returns the list of all connection ids of the given client.
+    fn client_connection_ends(
+        &self,
+        client_id: &ClientId,
+    ) -> Result<Vec<ConnectionId>, ContextError>;
+
+    // Channel queries
+
+    /// Returns the list of all channel ends.
+    fn channel_ends(&self) -> Result<Vec<IdentifiedChannelEnd>, ContextError>;
+
+    // Packet queries
+
+    /// Returns the list of all packet commitments for the given channel end.
+    fn packet_commitments(
+        &self,
+        channel_end_path: &ChannelEndPath,
+    ) -> Result<Vec<PacketState>, ContextError>;
+
+    /// Filters the list of packet sequences for the given channel end that are acknowledged.
+    /// Returns all the packet acknowledgements if `sequences` is empty.
+    fn packet_acknowledgements(
+        &self,
+        channel_end_path: &ChannelEndPath,
+        sequences: impl ExactSizeIterator<Item = Sequence>,
+    ) -> Result<Vec<PacketState>, ContextError>;
+
+    /// Filters the packet sequences for the given channel end that are not received.
+    fn unreceived_packets(
+        &self,
+        channel_end_path: &ChannelEndPath,
+        sequences: impl ExactSizeIterator<Item = Sequence>,
+    ) -> Result<Vec<Sequence>, ContextError>;
+
+    /// Filters the list of packet sequences for the given channel end whose acknowledgement is not received.
+    /// Returns all the unreceived acknowledgements if `sequences` is empty.
+    fn unreceived_acks(
+        &self,
+        channel_end_path: &ChannelEndPath,
+        sequences: impl ExactSizeIterator<Item = Sequence>,
+    ) -> Result<Vec<Sequence>, ContextError>;
+}
diff --git a/ibc-query/src/core/mod.rs b/ibc-query/src/core/mod.rs
new file mode 100644
index 000000000..4404ef3e9
--- /dev/null
+++ b/ibc-query/src/core/mod.rs
@@ -0,0 +1,4 @@
+pub mod channel;
+pub mod client;
+pub mod connection;
+pub mod context;
diff --git a/ibc-query/src/error.rs b/ibc-query/src/error.rs
new file mode 100644
index 000000000..6d11fd2d8
--- /dev/null
+++ b/ibc-query/src/error.rs
@@ -0,0 +1,78 @@
+use alloc::string::{String, ToString};
+
+use displaydoc::Display;
+use ibc::core::channel::types::error::{ChannelError, PacketError};
+use ibc::core::client::types::error::ClientError;
+use ibc::core::connection::types::error::ConnectionError;
+use ibc::core::handler::types::error::ContextError;
+use ibc::core::host::types::error::IdentifierError;
+use tonic::Status;
+
+#[derive(Debug, Display)]
+pub enum QueryError {
+    /// Context error: {0}
+    ContextError(ContextError),
+    /// Identifier error: {0}
+    IdentifierError(IdentifierError),
+    /// Proof not found: {0}
+    ProofNotFound(String),
+    /// Missing field: {0}
+    MissingField(String),
+}
+
+impl QueryError {
+    pub fn proof_not_found<T: ToString>(description: T) -> Self {
+        Self::ProofNotFound(description.to_string())
+    }
+
+    pub fn missing_field<T: ToString>(description: T) -> Self {
+        Self::MissingField(description.to_string())
+    }
+}
+
+impl From<QueryError> for Status {
+    fn from(e: QueryError) -> Self {
+        match e {
+            QueryError::ContextError(ctx_err) => Self::internal(ctx_err.to_string()),
+            QueryError::IdentifierError(id_err) => Self::internal(id_err.to_string()),
+            QueryError::ProofNotFound(description) => Self::not_found(description),
+            QueryError::MissingField(description) => Self::invalid_argument(description),
+        }
+    }
+}
+
+impl From<ContextError> for QueryError {
+    fn from(e: ContextError) -> Self {
+        Self::ContextError(e)
+    }
+}
+
+impl From<ClientError> for QueryError {
+    fn from(e: ClientError) -> Self {
+        Self::ContextError(ContextError::ClientError(e))
+    }
+}
+
+impl From<ConnectionError> for QueryError {
+    fn from(e: ConnectionError) -> Self {
+        Self::ContextError(ContextError::ConnectionError(e))
+    }
+}
+
+impl From<ChannelError> for QueryError {
+    fn from(e: ChannelError) -> Self {
+        Self::ContextError(ContextError::ChannelError(e))
+    }
+}
+
+impl From<PacketError> for QueryError {
+    fn from(e: PacketError) -> Self {
+        Self::ContextError(ContextError::PacketError(e))
+    }
+}
+
+impl From<IdentifierError> for QueryError {
+    fn from(e: IdentifierError) -> Self {
+        Self::IdentifierError(e)
+    }
+}
diff --git a/ibc-query/src/lib.rs b/ibc-query/src/lib.rs
new file mode 100644
index 000000000..710654c94
--- /dev/null
+++ b/ibc-query/src/lib.rs
@@ -0,0 +1,75 @@
+//! Contains a set of utility traits and implementations for querying the state
+//! of an `ibc-rs` enabled chain, including implementation of essential IBC
+//! query methods and gRPC query services defined in `ibc-proto` crate.
+//! Therefore, some ready-to-use Query structs for each layer of the client,
+//! connection, and channel have been implemented and exposed by this crate.
+//!
+//! The provided structs include blanket implementation of their corresponding
+//! gRPC service traits, if the host implements the following _context_ traits:
+//! - [`ValidationContext`](ibc::core::host::ValidationContext)
+//! - [`ProvableContext`](crate::core::context::ProvableContext)
+//! - [`QueryContext`](crate::core::context::QueryContext)
+//! - [`UpgradeValidationContext`](ibc::cosmos_host::upgrade_proposal::UpgradeValidationContext)
+//!   - Only for
+//!     [`ClientQuery::upgraded_client_state`](ibc_proto::ibc::core::client::v1::query_server::Query::upgraded_client_state)
+//!     and
+//!     [`ClientQuery::upgraded_client_state`](ibc_proto::ibc::core::client::v1::query_server::Query::upgraded_consensus_state)
+//!
+//! Example
+//! ```rust,ignore
+//! use ibc_proto::ibc::core::{
+//!     channel::v1::query_server::QueryServer as ChannelQueryServer
+//!     client::v1::query_server::QueryServer as ClientQueryServer,
+//!     connection::v1::query_server::QueryServer as ConnectionQueryServer,
+//! }
+//! use ibc::core::ValidationContext;
+//! use ibc::hosts::tendermint::upgrade_proposal::UpgradeValidationContext;
+//! use ibc::services::core::{ProvableContext, QueryContext};
+//! use ibc::services::{ChannelQueryService, ClientQueryService, ConnectionQueryService};
+//!
+//! struct Ibc;
+//! impl ValidationContext for Ibc { }
+//! impl ProvableContext for Ibc { }
+//! impl QueryContext for Ibc { }
+//!
+//! struct Upgrade;
+//! impl UpgradeValidationContext for Upgrade { }
+//!
+//! let ibc = Ibc::new();
+//! let upgrade = Upgrade::new();
+//!
+//! // `ibc` and `upgrade` must be thread-safe
+//!
+//! let client_service = ClientQueryServer::new(ClientQueryService::new(ibc.clone(), upgrade))
+//! let connection_service = ConnectionQueryServer::new(ConnectionQueryService::new(ibc.clone()))
+//! let channel_service = ChannelQueryServer::new(ChannelQueryService::new(ibc))
+//!
+//! let grpc_server = tonic::transport::Server::builder()
+//!       .add_service(client_service)
+//!       .add_service(connection_service)
+//!       .add_service(channel_service)
+//!       .serve(addr);
+//! ```
+//!
+
+#![cfg_attr(not(test), deny(clippy::unwrap_used))]
+#![no_std]
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+#![forbid(unsafe_code)]
+
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod core;
+pub mod error;
+pub mod types;
+pub mod utils;
diff --git a/ibc-query/src/types.rs b/ibc-query/src/types.rs
new file mode 100644
index 000000000..bc1ff1975
--- /dev/null
+++ b/ibc-query/src/types.rs
@@ -0,0 +1,94 @@
+use ibc::core::primitives::prelude::*;
+use ibc_proto::cosmos::base::query::v1beta1::{
+    PageRequest as RawPageRequest, PageResponse as RawPageResponse,
+};
+
+pub type Proof = Vec<u8>;
+
+#[derive(Clone, Debug, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct PageRequest {
+    /// key is a value returned in PageResponse.next_key to begin
+    /// querying the next page most efficiently. Only one of offset or key
+    /// should be set.
+    pub key: Vec<u8>,
+    /// offset is a numeric offset that can be used when the key is unavailable.
+    /// It is less efficient than using the key.
+    /// Only one of offset or key should be set.
+    pub offset: u64,
+    /// limit is the total number of results to be returned to the result page.
+    /// If left empty, it will default to a value to be set by each app.
+    pub limit: u64,
+    /// count_total is set to true  to indicate that the result set should include
+    /// a count of the total number of items available for pagination in UIs.
+    /// count_total is only respected when offset is used. It is ignored when key
+    /// is set.
+    pub count_total: bool,
+    /// reverse is set to true if results are to be returned in the descending order.
+    pub reverse: bool,
+}
+
+impl PageRequest {
+    pub fn all() -> Self {
+        Self {
+            limit: u64::MAX,
+            ..Default::default()
+        }
+    }
+}
+
+impl From<PageRequest> for RawPageRequest {
+    fn from(request: PageRequest) -> Self {
+        Self {
+            key: request.key,
+            offset: request.offset,
+            limit: request.limit,
+            count_total: request.count_total,
+            reverse: request.reverse,
+        }
+    }
+}
+
+impl From<RawPageRequest> for PageRequest {
+    fn from(request: RawPageRequest) -> Self {
+        Self {
+            key: request.key,
+            offset: request.offset,
+            limit: request.limit,
+            count_total: request.count_total,
+            reverse: request.reverse,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
+pub struct PageResponse {
+    /// next_key is the key to be passed to PageRequest.key to
+    /// query the next page most efficiently. It will be empty if
+    /// there are no more results.
+    pub next_key: Vec<u8>,
+    /// total is the total number of results available if PageRequest.count_total
+    /// was set, its value is undefined otherwise
+    pub total: u64,
+}
+
+impl From<PageResponse> for RawPageResponse {
+    fn from(response: PageResponse) -> Self {
+        Self {
+            next_key: response.next_key,
+            total: response.total,
+        }
+    }
+}
+
+impl From<RawPageResponse> for PageResponse {
+    fn from(response: RawPageResponse) -> Self {
+        Self {
+            next_key: response.next_key,
+            total: response.total,
+        }
+    }
+}
diff --git a/ibc-query/src/utils.rs b/ibc-query/src/utils.rs
new file mode 100644
index 000000000..7b1adeebe
--- /dev/null
+++ b/ibc-query/src/utils.rs
@@ -0,0 +1,40 @@
+use tonic::{Request, Response, Status};
+
+use crate::error::QueryError;
+
+pub trait TryIntoDomain<T> {
+    fn try_into_domain(self) -> Result<T, Status>;
+}
+
+pub trait IntoDomain<T> {
+    fn into_domain(self) -> T;
+}
+
+impl<T, Raw> TryIntoDomain<T> for Request<Raw>
+where
+    T: TryFrom<Raw, Error = QueryError>,
+{
+    fn try_into_domain(self) -> Result<T, Status> {
+        Ok(self.into_inner().try_into()?)
+    }
+}
+
+impl<T, Raw> IntoDomain<T> for Request<Raw>
+where
+    T: From<Raw>,
+{
+    fn into_domain(self) -> T {
+        self.into_inner().into()
+    }
+}
+
+pub trait IntoResponse<Raw>: Sized
+where
+    Self: Into<Raw>,
+{
+    fn into_response(self) -> Result<Response<Raw>, Status> {
+        Ok(Response::new(self.into()))
+    }
+}
+
+impl<T, Raw> IntoResponse<Raw> for T where T: Into<Raw> {}
diff --git a/ibc-testkit/Cargo.toml b/ibc-testkit/Cargo.toml
new file mode 100644
index 000000000..1ce60b37c
--- /dev/null
+++ b/ibc-testkit/Cargo.toml
@@ -0,0 +1,76 @@
+[package]
+name = "ibc-testkit"
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+rust-version = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+readme = "README.md"
+keywords = [ "blockchain", "consensus", "cosmos", "ibc", "tendermint" ]
+description = """
+    Maintained by `ibc-rs`, serves as a versatile library that provides essential abstractions
+    and implementations, fulfilling a dual role of enabling rigorous integration testing for
+    the `ibc-rs` implementation while also aiding host chains in addressing a broad spectrum
+    of testing scenarios during their integrations with `ibc-rs`.
+"""
+
+[dependencies]
+# external dependencies
+borsh           = { workspace = true, optional = true }
+derive_more     = { workspace = true }
+displaydoc      = { workspace = true }
+parking_lot     = { version = "0.12.1", default-features = false }
+schemars        = { workspace = true, optional = true }
+serde           = { workspace = true, optional = true }
+serde_json      = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+typed-builder   = { version = "0.18.0" }
+
+# ibc dependencies
+ibc       = { workspace = true, features = [ "std" ] }
+ibc-proto = { workspace = true }
+ibc-query = { workspace = true }
+
+# basecoin dependencies
+basecoin-store = { version = "0.1.0" }
+
+# cosmos dependencies
+tendermint         = { workspace = true }
+tendermint-testgen = { workspace = true }
+
+[dev-dependencies]
+hex    = { version = "0.4.2" }
+rstest = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "serde/std",
+  "serde_json/std",
+  "ibc/std",
+  "ibc-proto/std",
+  "tendermint/std",
+]
+serde = [
+  "dep:serde",
+  "ibc/serde",
+  "ibc-proto/serde",
+  "serde_json",
+]
+schema = [
+  "dep:schemars",
+  "ibc/schema",
+  "ibc-proto/json-schema",
+  "serde",
+  "std",
+]
+borsh = [
+  "dep:borsh",
+  "ibc/borsh",
+  "ibc-proto/borsh",
+]
+parity-scale-codec = [
+  "ibc/parity-scale-codec",
+  "ibc-proto/parity-scale-codec",
+]
diff --git a/ibc-testkit/README.md b/ibc-testkit/README.md
new file mode 100644
index 000000000..75f01e5d4
--- /dev/null
+++ b/ibc-testkit/README.md
@@ -0,0 +1,10 @@
+# IBC Testkit
+
+`ibc-testkit` is a versatile library that provides essential abstractions and
+implementations, fulfilling a dual role of enabling rigorous integration testing
+for the [`ibc-rs`](https://github.com/cosmos/ibc-rs) implementation while also
+aiding host chains in addressing a broad spectrum of testing scenarios during
+their integrations with `ibc-rs`.
+
+- Note: `ibc-testkit` currently only supports `std` environments. See this
+  [issue](https://github.com/cosmos/ibc-rs/issues/329) for more details.
diff --git a/ibc-testkit/src/context.rs b/ibc-testkit/src/context.rs
new file mode 100644
index 000000000..4380de474
--- /dev/null
+++ b/ibc-testkit/src/context.rs
@@ -0,0 +1,612 @@
+use core::fmt::Debug;
+use core::time::Duration;
+
+use basecoin_store::context::ProvableStore;
+use basecoin_store::impls::InMemoryStore;
+use ibc::core::channel::types::channel::ChannelEnd;
+use ibc::core::channel::types::commitment::PacketCommitment;
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::context::{ClientExecutionContext, ClientValidationContext};
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::ConnectionEnd;
+use ibc::core::entrypoint::{dispatch, execute, validate};
+use ibc::core::handler::types::error::ContextError;
+use ibc::core::handler::types::events::IbcEvent;
+use ibc::core::handler::types::msgs::MsgEnvelope;
+use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId, Sequence};
+use ibc::core::host::types::path::{
+    ChannelEndPath, ClientConsensusStatePath, ClientStatePath, CommitmentPath, ConnectionPath,
+    SeqAckPath, SeqRecvPath, SeqSendPath,
+};
+use ibc::core::host::{ExecutionContext, ValidationContext};
+use ibc::primitives::prelude::*;
+use ibc::primitives::Timestamp;
+
+use super::testapp::ibc::core::types::{LightClientState, MockIbcStore};
+use crate::fixtures::core::context::TestContextConfig;
+use crate::hosts::{HostClientState, MockHost, TendermintHost, TestBlock, TestHeader, TestHost};
+use crate::relayer::error::RelayerError;
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+use crate::testapp::ibc::core::router::MockRouter;
+use crate::testapp::ibc::core::types::DEFAULT_BLOCK_TIME_SECS;
+
+/// A context implementing the dependencies necessary for testing any IBC module.
+#[derive(Debug)]
+pub struct StoreGenericTestContext<S, H>
+where
+    S: ProvableStore + Debug,
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
+{
+    /// The multi store of the context.
+    /// This is where the IBC store root is stored at IBC commitment prefix.
+    pub multi_store: S,
+
+    /// The type of host chain underlying this mock context.
+    pub host: H,
+
+    /// An object that stores all IBC related data.
+    pub ibc_store: MockIbcStore<S>,
+
+    /// A router that can route messages to the appropriate IBC application.
+    pub ibc_router: MockRouter,
+}
+
+/// A mock store type using basecoin-storage implementations.
+pub type MockStore = InMemoryStore;
+/// A [`StoreGenericTestContext`] using [`MockStore`].
+pub type TestContext<H> = StoreGenericTestContext<MockStore, H>;
+/// A [`StoreGenericTestContext`] using [`MockStore`] and [`MockHost`].
+pub type MockContext = TestContext<MockHost>;
+/// A [`StoreGenericTestContext`] using [`MockStore`] and [`TendermintHost`].
+pub type TendermintContext = TestContext<TendermintHost>;
+
+/// Returns a [`StoreGenericTestContext`] with bare minimum initialization: no clients, no connections, and no channels are
+/// present, and the chain has Height(5). This should be used sparingly, mostly for testing the
+/// creation of new domain objects.
+impl<S, H> Default for StoreGenericTestContext<S, H>
+where
+    S: ProvableStore + Debug + Default,
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
+{
+    fn default() -> Self {
+        TestContextConfig::builder().build()
+    }
+}
+
+/// Implementation of internal interface for use in testing. The methods in this interface should
+/// _not_ be accessible to any ICS handler.
+impl<S, H> StoreGenericTestContext<S, H>
+where
+    S: ProvableStore + Debug,
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
+{
+    /// Returns an immutable reference to the IBC store.
+    pub fn ibc_store(&self) -> &MockIbcStore<S> {
+        &self.ibc_store
+    }
+
+    /// Returns a mutable reference to the IBC store.
+    pub fn ibc_store_mut(&mut self) -> &mut MockIbcStore<S> {
+        &mut self.ibc_store
+    }
+
+    /// Returns an immutable reference to the IBC router.
+    pub fn ibc_router(&self) -> &MockRouter {
+        &self.ibc_router
+    }
+
+    /// Returns a mutable reference to the IBC router.
+    pub fn ibc_router_mut(&mut self) -> &mut MockRouter {
+        &mut self.ibc_router
+    }
+
+    /// Returns the block at the given height from the host chain, if exists.
+    pub fn host_block(&self, target_height: &Height) -> Option<H::Block> {
+        self.host.get_block(target_height)
+    }
+
+    /// Returns the latest block from the host chain.
+    pub fn query_latest_block(&self) -> Option<H::Block> {
+        self.host.get_block(&self.latest_height())
+    }
+
+    /// Returns the latest height of client state for the given [`ClientId`].
+    pub fn light_client_latest_height(&self, client_id: &ClientId) -> Height {
+        self.ibc_store
+            .client_state(client_id)
+            .expect("client state exists")
+            .latest_height()
+    }
+
+    /// Advances the host chain height to the given target height.
+    pub fn advance_block_up_to_height(mut self, target_height: Height) -> Self {
+        let latest_height = self.host.latest_height();
+        if target_height.revision_number() != latest_height.revision_number() {
+            panic!("Cannot advance history of the chain to a different revision number!")
+        } else if target_height.revision_height() < latest_height.revision_height() {
+            panic!("Cannot rewind history of the chain to a smaller revision height!")
+        } else {
+            // Repeatedly advance the host chain height till we hit the desired height
+            while self.host.latest_height().revision_height() < target_height.revision_height() {
+                self.advance_block_height()
+            }
+        }
+        self
+    }
+
+    /// Advance the first height of the host chain by generating a genesis block.
+    ///
+    /// This method is same as [`Self::advance_genesis_height`].
+    /// But it bootstraps the genesis block by height 1 and `genesis_time`.
+    ///
+    /// The method starts and ends with [`Self::end_block`] and [`Self::begin_block`], just
+    /// like the [`Self::advance_block_height_with_params`], so that it can advance to next height
+    /// i.e. height 2 - just by calling [`Self::advance_block_height_with_params`].
+    pub fn advance_genesis_height(&mut self, genesis_time: Timestamp, params: &H::BlockParams) {
+        self.end_block();
+
+        // commit multi store
+        let multi_store_commitment = self.multi_store.commit().expect("no error");
+
+        // generate a genesis block
+        // this is basically self.host.produce_block() but with
+        // block height 1 and block timestamp `genesis_time`.
+        let genesis_block =
+            self.host
+                .generate_block(multi_store_commitment, 1, genesis_time, params);
+
+        // push the genesis block to the host
+        self.host.push_block(genesis_block);
+
+        self.begin_block();
+    }
+
+    /// Begin a new block on the context.
+    ///
+    /// This method commits the required metadata from the last block generation
+    /// and consensus, and prepares the context for the next block. This includes
+    /// the latest consensus state and the latest IBC commitment proof.
+    pub fn begin_block(&mut self) {
+        let consensus_state = self
+            .host
+            .latest_block()
+            .into_header()
+            .into_consensus_state()
+            .into();
+
+        let ibc_commitment_proof = self
+            .multi_store
+            .get_proof(
+                self.host.latest_height().revision_height().into(),
+                &self
+                    .ibc_store
+                    .commitment_prefix()
+                    .as_bytes()
+                    .try_into()
+                    .expect("valid utf8 prefix"),
+            )
+            .expect("no error");
+
+        self.ibc_store.begin_block(
+            self.host.latest_height().revision_height(),
+            consensus_state,
+            ibc_commitment_proof,
+        );
+    }
+
+    /// End the current block on the context.
+    ///
+    /// This method commits the state of the IBC store and the host's multi store.
+    pub fn end_block(&mut self) {
+        // commit ibc store
+        let ibc_store_commitment = self.ibc_store.end_block().expect("no error");
+
+        // commit ibc store commitment in multi store
+        self.multi_store
+            .set(
+                self.ibc_store
+                    .commitment_prefix()
+                    .as_bytes()
+                    .try_into()
+                    .expect("valid utf8 prefix"),
+                ibc_store_commitment,
+            )
+            .expect("no error");
+    }
+
+    /// Commit store state to the current block of the host chain by:
+    /// - Committing the state to the context's multi store.
+    /// - Generating a new block with the commitment.
+    /// - Adding the generated block to the host's block history.
+    pub fn commit_state_to_host(&mut self, block_time: Duration, params: &H::BlockParams) {
+        // commit the multi store
+        let multi_store_commitment = self.multi_store.commit().expect("no error");
+        // generate a new block and add it to the block history
+        self.host
+            .commit_block(multi_store_commitment, block_time, params);
+    }
+
+    /// Advances the host chain height by ending the current block, producing a new block, and
+    /// beginning the next block.
+    pub fn advance_block_height_with_params(
+        &mut self,
+        block_time: Duration,
+        params: &H::BlockParams,
+    ) {
+        self.end_block();
+        self.commit_state_to_host(block_time, params);
+        self.begin_block();
+    }
+
+    /// Convenience method to advance the host chain height using default parameters.
+    pub fn advance_block_height(&mut self) {
+        self.advance_block_height_with_params(
+            Duration::from_secs(DEFAULT_BLOCK_TIME_SECS),
+            &Default::default(),
+        )
+    }
+
+    /// Returns the latest height of the host chain.
+    pub fn latest_height(&self) -> Height {
+        let latest_ibc_height = self.ibc_store.host_height().expect("Never fails");
+        let latest_host_height = self.host.latest_height();
+        assert_eq!(
+            latest_ibc_height, latest_host_height,
+            "The IBC store and the host chain must have the same height"
+        );
+        latest_ibc_height
+    }
+
+    /// Returns the latest timestamp of the host chain.
+    pub fn latest_timestamp(&self) -> Timestamp {
+        self.host.latest_block().timestamp()
+    }
+
+    /// Returns the timestamp at the given height.
+    pub fn timestamp_at(&self, height: Height) -> Timestamp {
+        self.host
+            .get_block(&height)
+            .expect("block exists")
+            .timestamp()
+    }
+
+    /// Bootstraps the context with a client state and its corresponding [`ClientId`].
+    pub fn with_client_state(mut self, client_id: &ClientId, client_state: AnyClientState) -> Self {
+        let client_state_path = ClientStatePath::new(client_id.clone());
+        self.ibc_store
+            .store_client_state(client_state_path, client_state)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Bootstraps the context with a consensus state and its corresponding [`ClientId`] and [`Height`].
+    pub fn with_consensus_state(
+        mut self,
+        client_id: &ClientId,
+        height: Height,
+        consensus_state: AnyConsensusState,
+    ) -> Self {
+        let consensus_state_path = ClientConsensusStatePath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+        self.ibc_store
+            .store_consensus_state(consensus_state_path, consensus_state)
+            .expect("error writing to store");
+
+        self
+    }
+
+    /// Generates a light client for the host by generating a client
+    /// state, as well as generating consensus states for each
+    /// consensus height.
+    pub fn generate_light_client(
+        &self,
+        mut consensus_heights: Vec<Height>,
+        client_params: &H::LightClientParams,
+    ) -> LightClientState<H> {
+        let client_height = if let Some(&height) = consensus_heights.last() {
+            height
+        } else {
+            consensus_heights.push(self.latest_height());
+            self.latest_height()
+        };
+
+        let client_state = self
+            .host
+            .generate_client_state(&client_height, client_params);
+
+        let consensus_states = consensus_heights
+            .into_iter()
+            .map(|height| {
+                (
+                    height,
+                    self.host_block(&height)
+                        .expect("block exists")
+                        .into_header()
+                        .into_consensus_state(),
+                )
+            })
+            .collect();
+
+        LightClientState {
+            client_state,
+            consensus_states,
+        }
+    }
+
+    /// Bootstrap a light client with ClientState and its ConsensusState(s) to this context.
+    pub fn with_light_client<RH>(
+        mut self,
+        client_id: &ClientId,
+        light_client: LightClientState<RH>,
+    ) -> Self
+    where
+        RH: TestHost,
+    {
+        self = self.with_client_state(client_id, light_client.client_state.into());
+
+        for (height, consensus_state) in light_client.consensus_states {
+            self = self.with_consensus_state(client_id, height, consensus_state.into());
+
+            self.ibc_store
+                .store_update_meta(
+                    client_id.clone(),
+                    height,
+                    self.latest_timestamp(),
+                    self.latest_height(),
+                )
+                .expect("error writing to store");
+        }
+
+        self
+    }
+
+    /// Bootstraps an IBC connection to this context.
+    ///
+    /// This does not bootstrap any light client.
+    pub fn with_connection(
+        mut self,
+        connection_id: ConnectionId,
+        connection_end: ConnectionEnd,
+    ) -> Self {
+        let connection_path = ConnectionPath::new(&connection_id);
+        self.ibc_store
+            .store_connection(&connection_path, connection_end)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Bootstraps an IBC channel to this context.
+    ///
+    /// This does not bootstrap any corresponding IBC connection or light client.
+    pub fn with_channel(
+        mut self,
+        port_id: PortId,
+        chan_id: ChannelId,
+        channel_end: ChannelEnd,
+    ) -> Self {
+        let channel_end_path = ChannelEndPath::new(&port_id, &chan_id);
+        self.ibc_store
+            .store_channel(&channel_end_path, channel_end)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Bootstraps a send sequence to this context.
+    ///
+    /// This does not bootstrap any corresponding IBC channel, connection or light client.
+    pub fn with_send_sequence(
+        mut self,
+        port_id: PortId,
+        chan_id: ChannelId,
+        seq_number: Sequence,
+    ) -> Self {
+        let seq_send_path = SeqSendPath::new(&port_id, &chan_id);
+        self.ibc_store
+            .store_next_sequence_send(&seq_send_path, seq_number)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Bootstraps a receive sequence to this context.
+    ///
+    /// This does not bootstrap any corresponding IBC channel, connection or light client.
+    pub fn with_recv_sequence(
+        mut self,
+        port_id: PortId,
+        chan_id: ChannelId,
+        seq_number: Sequence,
+    ) -> Self {
+        let seq_recv_path = SeqRecvPath::new(&port_id, &chan_id);
+        self.ibc_store
+            .store_next_sequence_recv(&seq_recv_path, seq_number)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Bootstraps an ack sequence to this context.
+    ///
+    /// This does not bootstrap any corresponding IBC channel, connection or light client.
+    pub fn with_ack_sequence(
+        mut self,
+        port_id: PortId,
+        chan_id: ChannelId,
+        seq_number: Sequence,
+    ) -> Self {
+        let seq_ack_path = SeqAckPath::new(&port_id, &chan_id);
+        self.ibc_store
+            .store_next_sequence_ack(&seq_ack_path, seq_number)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Bootstraps a packet commitment to this context.
+    ///
+    /// This does not bootstrap any corresponding IBC channel, connection or light client.
+    pub fn with_packet_commitment(
+        mut self,
+        port_id: PortId,
+        chan_id: ChannelId,
+        seq: Sequence,
+        data: PacketCommitment,
+    ) -> Self {
+        let commitment_path = CommitmentPath::new(&port_id, &chan_id, seq);
+        self.ibc_store
+            .store_packet_commitment(&commitment_path, data)
+            .expect("error writing to store");
+        self
+    }
+
+    /// Calls [`validate`] function on [`MsgEnvelope`] using the context's IBC store and router.
+    pub fn validate(&mut self, msg: MsgEnvelope) -> Result<(), ContextError> {
+        validate(&self.ibc_store, &self.ibc_router, msg)
+    }
+
+    /// Calls [`execute`] function on [`MsgEnvelope`] using the context's IBC store and router.
+    pub fn execute(&mut self, msg: MsgEnvelope) -> Result<(), ContextError> {
+        execute(&mut self.ibc_store, &mut self.ibc_router, msg)
+    }
+
+    /// Calls [`dispatch`] function on [`MsgEnvelope`] using the context's IBC store and router.
+    pub fn dispatch(&mut self, msg: MsgEnvelope) -> Result<(), ContextError> {
+        dispatch(&mut self.ibc_store, &mut self.ibc_router, msg)
+    }
+
+    /// A datagram passes from the relayer to the IBC module (on host chain).
+    /// Alternative method to `Ics18Context::send` that does not exercise any serialization.
+    /// Used in testing the Ics18 algorithms, hence this may return an Ics18Error.
+    pub fn deliver(&mut self, msg: MsgEnvelope) -> Result<(), RelayerError> {
+        self.dispatch(msg)
+            .map_err(RelayerError::TransactionFailed)?;
+        // Create a new block.
+        self.advance_block_height();
+        Ok(())
+    }
+
+    /// Returns all the events that have been emitted by the context's IBC store.
+    pub fn get_events(&self) -> Vec<IbcEvent> {
+        self.ibc_store.events.lock().clone()
+    }
+
+    /// Returns all the logs that have been emitted by the context's IBC store.
+    pub fn get_logs(&self) -> Vec<String> {
+        self.ibc_store.logs.lock().clone()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::client::context::consensus_state::ConsensusState;
+
+    use super::*;
+    use crate::hosts::{HostConsensusState, MockHost, TendermintHost};
+    use crate::testapp::ibc::core::types::DefaultIbcStore;
+
+    #[test]
+    fn test_mock_history_validation() {
+        pub struct Test<H: TestHost>
+        where
+            H: TestHost,
+            HostConsensusState<H>: ConsensusState,
+            HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
+        {
+            name: String,
+            ctx: TestContext<H>,
+        }
+
+        fn run_tests<H>(sub_title: &str)
+        where
+            H: TestHost,
+            HostConsensusState<H>: ConsensusState,
+            HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
+        {
+            let cv = 0; // The version to use for all chains.
+
+            let tests: Vec<Test<H>> = vec![
+                Test {
+                    name: "Empty history, small pruning window".to_string(),
+                    ctx: TestContextConfig::builder()
+                        .latest_height(Height::new(cv, 1).expect("Never fails"))
+                        .build(),
+                },
+                Test {
+                    name: "Large pruning window".to_string(),
+                    ctx: TestContextConfig::builder()
+                        .latest_height(Height::new(cv, 2).expect("Never fails"))
+                        .build(),
+                },
+                Test {
+                    name: "Small pruning window".to_string(),
+                    ctx: TestContextConfig::builder()
+                        .latest_height(Height::new(cv, 30).expect("Never fails"))
+                        .build(),
+                },
+                Test {
+                    name: "Small pruning window, small starting height".to_string(),
+                    ctx: TestContextConfig::builder()
+                        .latest_height(Height::new(cv, 2).expect("Never fails"))
+                        .build(),
+                },
+                // This is disabled, as now we generate all the blocks till latest_height
+                // Generating 2000 Tendermint blocks is slow.
+                // Test {
+                //     name: "Large pruning window, large starting height".to_string(),
+                //     ctx: TestContextConfig::builder()
+                //         .latest_height(Height::new(cv, 2000).expect("Never fails"))
+                //         .build(),
+                // },
+            ];
+
+            for mut test in tests {
+                // All tests should yield a valid context after initialization.
+                assert!(
+                    test.ctx.host.validate().is_ok(),
+                    "failed in test [{}] {} while validating context {:?}",
+                    sub_title,
+                    test.name,
+                    test.ctx
+                );
+
+                let current_height = test.ctx.latest_height();
+
+                // After advancing the chain's height, the context should still be valid.
+                test.ctx.advance_block_height();
+                assert!(
+                    test.ctx.host.validate().is_ok(),
+                    "failed in test [{}] {} while validating context {:?}",
+                    sub_title,
+                    test.name,
+                    test.ctx
+                );
+
+                let next_height = current_height.increment();
+                assert_eq!(
+                    test.ctx.latest_height(),
+                    next_height,
+                    "failed while increasing height for context {:?}",
+                    test.ctx
+                );
+
+                assert_eq!(
+                    test.ctx
+                        .host
+                        .get_block(&current_height)
+                        .expect("Never fails")
+                        .height(),
+                    current_height,
+                    "failed while fetching height {:?} of context {:?}",
+                    current_height,
+                    test.ctx
+                );
+            }
+        }
+
+        run_tests::<MockHost>("Mock Host");
+        run_tests::<TendermintHost>("Synthetic TM Host");
+    }
+}
diff --git a/crates/ibc/tests/support/signed_header.json b/ibc-testkit/src/data/json/signed_header.json
similarity index 98%
rename from crates/ibc/tests/support/signed_header.json
rename to ibc-testkit/src/data/json/signed_header.json
index 9416df80c..c4fe96713 100644
--- a/crates/ibc/tests/support/signed_header.json
+++ b/ibc-testkit/src/data/json/signed_header.json
@@ -4,7 +4,7 @@
       "block": "0",
       "app": "0"
     },
-    "chain_id": "test-chain-01",
+    "chain_id": "test-chain-1",
     "height": "20",
     "time": "2019-11-02T15:04:10Z",
     "last_block_id": {
diff --git a/crates/ibc/src/applications/mod.rs b/ibc-testkit/src/fixtures/applications/mod.rs
similarity index 74%
rename from crates/ibc/src/applications/mod.rs
rename to ibc-testkit/src/fixtures/applications/mod.rs
index 25d89021a..99cdde23e 100644
--- a/crates/ibc/src/applications/mod.rs
+++ b/ibc-testkit/src/fixtures/applications/mod.rs
@@ -1,5 +1,3 @@
-//! Implementation of IBC applications
-
 #[cfg(feature = "serde")]
 pub mod transfer;
 
diff --git a/ibc-testkit/src/fixtures/applications/transfer.rs b/ibc-testkit/src/fixtures/applications/transfer.rs
new file mode 100644
index 000000000..dfd16a5e0
--- /dev/null
+++ b/ibc-testkit/src/fixtures/applications/transfer.rs
@@ -0,0 +1,77 @@
+use ibc::apps::transfer::types::msgs::transfer::MsgTransfer;
+use ibc::apps::transfer::types::packet::PacketData;
+use ibc::apps::transfer::types::{Memo, PrefixedCoin};
+use ibc::core::channel::types::packet::Packet;
+use ibc::core::channel::types::timeout::TimeoutHeight;
+use ibc::core::host::types::identifiers::{ChannelId, PortId, Sequence};
+use ibc::core::primitives::{Signer, Timestamp};
+use typed_builder::TypedBuilder;
+
+use crate::fixtures::core::signer::dummy_account_id;
+
+/// Configuration of the `MsgTransfer` message for building dummy messages.
+#[derive(TypedBuilder, Debug)]
+#[builder(build_method(into = MsgTransfer))]
+pub struct MsgTransferConfig {
+    #[builder(default = PortId::transfer())]
+    pub port_id_on_a: PortId,
+    #[builder(default = ChannelId::zero())]
+    pub chan_id_on_a: ChannelId,
+    pub packet_data: PacketData,
+    #[builder(default = TimeoutHeight::Never)]
+    pub timeout_height_on_b: TimeoutHeight,
+    #[builder(default = Timestamp::none())]
+    pub timeout_timestamp_on_b: Timestamp,
+}
+
+impl From<MsgTransferConfig> for MsgTransfer {
+    fn from(config: MsgTransferConfig) -> Self {
+        Self {
+            port_id_on_a: config.port_id_on_a,
+            chan_id_on_a: config.chan_id_on_a,
+            packet_data: config.packet_data,
+            timeout_height_on_b: config.timeout_height_on_b,
+            timeout_timestamp_on_b: config.timeout_timestamp_on_b,
+        }
+    }
+}
+
+pub fn extract_transfer_packet(msg: &MsgTransfer, sequence: Sequence) -> Packet {
+    let data = serde_json::to_vec(&msg.packet_data)
+        .expect("PacketData's infallible Serialize impl failed");
+
+    Packet {
+        seq_on_a: sequence,
+        port_id_on_a: msg.port_id_on_a.clone(),
+        chan_id_on_a: msg.chan_id_on_a.clone(),
+        port_id_on_b: PortId::transfer(),
+        chan_id_on_b: ChannelId::zero(),
+        data,
+        timeout_height_on_b: msg.timeout_height_on_b,
+        timeout_timestamp_on_b: msg.timeout_timestamp_on_b,
+    }
+}
+
+/// Configuration of the `PacketData` type for building dummy packets.
+#[derive(TypedBuilder, Debug)]
+#[builder(build_method(into = PacketData))]
+pub struct PacketDataConfig {
+    pub token: PrefixedCoin,
+    #[builder(default = dummy_account_id())]
+    pub sender: Signer,
+    #[builder(default = dummy_account_id())]
+    pub receiver: Signer,
+    #[builder(default = "".into())]
+    pub memo: Memo,
+}
+
+impl From<PacketDataConfig> for PacketData {
+    fn from(config: PacketDataConfig) -> Self {
+        Self {
+            token: config.token,
+            sender: config.sender,
+            receiver: config.receiver,
+            memo: config.memo,
+        }
+    }
+}
diff --git a/ibc-testkit/src/fixtures/clients/mock.rs b/ibc-testkit/src/fixtures/clients/mock.rs
new file mode 100644
index 000000000..63ec379bc
--- /dev/null
+++ b/ibc-testkit/src/fixtures/clients/mock.rs
@@ -0,0 +1,7 @@
+use ibc::core::client::types::Height;
+
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+/// Returns a dummy `MockHeader` with the given revision height.
+pub fn dummy_new_mock_header(revision_height: u64) -> MockHeader {
+    MockHeader::new(Height::new(0, revision_height).expect("Never fails"))
+}
diff --git a/ibc-testkit/src/fixtures/clients/mod.rs b/ibc-testkit/src/fixtures/clients/mod.rs
new file mode 100644
index 000000000..301d7f544
--- /dev/null
+++ b/ibc-testkit/src/fixtures/clients/mod.rs
@@ -0,0 +1,2 @@
+pub mod mock;
+pub mod tendermint;
diff --git a/ibc-testkit/src/fixtures/clients/tendermint.rs b/ibc-testkit/src/fixtures/clients/tendermint.rs
new file mode 100644
index 000000000..aaa49a5d7
--- /dev/null
+++ b/ibc-testkit/src/fixtures/clients/tendermint.rs
@@ -0,0 +1,235 @@
+use core::str::FromStr;
+use core::time::Duration;
+
+use basecoin_store::avl::get_proof_spec as basecoin_proof_spec;
+use ibc::clients::tendermint::client_state::ClientState as TmClientState;
+use ibc::clients::tendermint::types::error::{Error as ClientError, Error};
+use ibc::clients::tendermint::types::proto::v1::{ClientState as RawTmClientState, Fraction};
+#[cfg(feature = "serde")]
+use ibc::clients::tendermint::types::Header;
+use ibc::clients::tendermint::types::{
+    AllowUpdate, ClientState as ClientStateType, TrustThreshold,
+};
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::specs::ProofSpecs;
+use ibc::core::host::types::identifiers::ChainId;
+use ibc::core::primitives::prelude::*;
+use tendermint::block::Header as TmHeader;
+use typed_builder::TypedBuilder;
+
+/// Returns a dummy tendermint `ClientState` by given `frozen_height`, for testing purposes only!
+pub fn dummy_tm_client_state_from_raw(frozen_height: RawHeight) -> Result<TmClientState, Error> {
+    ClientStateType::try_from(dummy_raw_tm_client_state(frozen_height)).map(TmClientState::from)
+}
+
+/// Returns a dummy tendermint `ClientState` from a `TmHeader`, for testing purposes only!
+pub fn dummy_tm_client_state_from_header(tm_header: TmHeader) -> TmClientState {
+    let chain_id = ChainId::from_str(tm_header.chain_id.as_str()).expect("Never fails");
+    let client_state = ClientStateType::new(
+        chain_id.clone(),
+        TrustThreshold::ONE_THIRD,
+        Duration::from_secs(64000),
+        Duration::from_secs(128_000),
+        Duration::from_millis(3000),
+        Height::new(chain_id.revision_number(), u64::from(tm_header.height)).expect("Never fails"),
+        ProofSpecs::cosmos(),
+        Vec::new(),
+        AllowUpdate {
+            after_expiry: false,
+            after_misbehaviour: false,
+        },
+    )
+    .expect("Never fails");
+
+    TmClientState::from(client_state)
+}
+
+/// Returns a dummy tendermint `RawTmClientState` by given `frozen_height`, for testing purposes only!
+pub fn dummy_raw_tm_client_state(frozen_height: RawHeight) -> RawTmClientState {
+    #[allow(deprecated)]
+    RawTmClientState {
+        chain_id: ChainId::new("ibc-0").expect("Never fails").to_string(),
+        trust_level: Some(Fraction {
+            numerator: 1,
+            denominator: 3,
+        }),
+        trusting_period: Some(Duration::from_secs(64000).into()),
+        unbonding_period: Some(Duration::from_secs(128_000).into()),
+        max_clock_drift: Some(Duration::from_millis(3000).into()),
+        latest_height: Some(Height::new(0, 10).expect("Never fails").into()),
+        proof_specs: ProofSpecs::cosmos().into(),
+        upgrade_path: Vec::new(),
+        frozen_height: Some(frozen_height),
+        allow_update_after_expiry: false,
+        allow_update_after_misbehaviour: false,
+    }
+}
+
+#[derive(TypedBuilder, Debug)]
+pub struct ClientStateConfig {
+    #[builder(default = TrustThreshold::ONE_THIRD)]
+    pub trust_level: TrustThreshold,
+    #[builder(default = Duration::from_secs(64000))]
+    pub trusting_period: Duration,
+    #[builder(default = Duration::from_secs(128_000))]
+    pub unbonding_period: Duration,
+    #[builder(default = Duration::from_millis(3000))]
+    pub max_clock_drift: Duration,
+    #[builder(default = vec![basecoin_proof_spec(); 2].try_into().expect("no error"))]
+    pub proof_specs: ProofSpecs,
+    #[builder(default)]
+    pub upgrade_path: Vec<String>,
+    #[builder(default = AllowUpdate { after_expiry: false, after_misbehaviour: false })]
+    allow_update: AllowUpdate,
+}
+
+impl Default for ClientStateConfig {
+    fn default() -> Self {
+        Self::builder().build()
+    }
+}
+
+impl ClientStateConfig {
+    pub fn into_client_state(
+        self,
+        chain_id: ChainId,
+        latest_height: Height,
+    ) -> Result<TmClientState, ClientError> {
+        Ok(ClientStateType::new(
+            chain_id,
+            self.trust_level,
+            self.trusting_period,
+            self.unbonding_period,
+            self.max_clock_drift,
+            latest_height,
+            self.proof_specs,
+            self.upgrade_path,
+            self.allow_update,
+        )?
+        .into())
+    }
+}
+
+#[cfg(feature = "serde")]
+pub fn dummy_tendermint_header() -> tendermint::block::Header {
+    use tendermint::block::signed_header::SignedHeader;
+
+    serde_json::from_str::<SignedHeader>(include_str!(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/src/data/json/signed_header.json"
+    )))
+    .expect("Never fails")
+    .header
+}
+
+// TODO: This should be replaced with a ::default() or ::produce().
+// The implementation of this function comprises duplicate code (code borrowed from
+// `tendermint-rs` for assembling a Header).
+// See https://github.com/informalsystems/tendermint-rs/issues/381.
+//
+// The normal flow is:
+// - get the (trusted) signed header and the `trusted_validator_set` at a `trusted_height`
+// - get the `signed_header` and the `validator_set` at latest height
+// - build the ics07 Header
+// For testing purposes this function does:
+// - get the `signed_header` from a .json file
+// - create the `validator_set` with a single validator that is also the proposer
+// - assume a `trusted_height` of 1 and no change in the validator set since height 1,
+//   i.e. `trusted_validator_set` = `validator_set`
+#[cfg(feature = "serde")]
+pub fn dummy_ics07_header() -> Header {
+    use subtle_encoding::hex;
+    use tendermint::block::signed_header::SignedHeader;
+    use tendermint::validator::{Info as ValidatorInfo, Set as ValidatorSet};
+    use tendermint::PublicKey;
+
+    // Build a SignedHeader from a JSON file.
+    let shdr = serde_json::from_str::<SignedHeader>(include_str!(concat!(
+        env!("CARGO_MANIFEST_DIR"),
+        "/src/data/json/signed_header.json"
+    )))
+    .expect("Never fails");
+
+    // Build a set of validators.
+    // Below are test values inspired form `test_validator_set()` in tendermint-rs.
+    let v1 = ValidatorInfo::new(
+        PublicKey::from_raw_ed25519(
+            &hex::decode_upper("F349539C7E5EF7C49549B09C4BFC2335318AB0FE51FBFAA2433B4F13E816F4A7")
+                .expect("Never fails"),
+        )
+        .expect("Never fails"),
+        281_815_u64.try_into().expect("Never fails"),
+    );
+
+    let vs = ValidatorSet::new(vec![v1.clone()], Some(v1));
+
+    Header {
+        signed_header: shdr,
+        validator_set: vs.clone(),
+        trusted_height: Height::min(0),
+        trusted_next_validator_set: vs,
+    }
+}
+
+#[cfg(all(test, feature = "serde"))]
+mod tests {
+    use ibc::primitives::proto::Any;
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    // try conversions for when the client is not frozen
+    #[case::valid_client(0, 0, false)]
+    // try conversions for when the client is frozen
+    #[case::frozen_client(0, 1, true)]
+    fn tm_client_state_conversions_healthy(
+        #[case] revision_number: u64,
+        #[case] revision_height: u64,
+        #[case] is_frozen: bool,
+    ) {
+        let frozen_height = RawHeight {
+            revision_number,
+            revision_height,
+        };
+
+        // check client state creation path from a proto type
+        let tm_client_state_from_raw = dummy_tm_client_state_from_raw(frozen_height);
+        assert!(tm_client_state_from_raw.is_ok());
+
+        let any_from_tm_client_state = Any::from(
+            tm_client_state_from_raw
+                .as_ref()
+                .expect("Never fails")
+                .clone(),
+        );
+        let tm_client_state_from_any = ClientStateType::try_from(any_from_tm_client_state);
+        assert!(tm_client_state_from_any.is_ok());
+        assert_eq!(
+            Some(is_frozen),
+            tm_client_state_from_any
+                .as_ref()
+                .map(|x| x.is_frozen())
+                .ok()
+        );
+        assert_eq!(
+            tm_client_state_from_raw.expect("Never fails"),
+            tm_client_state_from_any.expect("Never fails").into()
+        );
+    }
+
+    #[test]
+    fn tm_client_state_from_header_healthy() {
+        // check client state creation path from a tendermint header
+        let tm_header = dummy_tendermint_header();
+        let tm_client_state_from_header = dummy_tm_client_state_from_header(tm_header);
+        let any_from_header = Any::from(tm_client_state_from_header.clone());
+        let tm_client_state_from_any = ClientStateType::try_from(any_from_header);
+        assert!(tm_client_state_from_any.is_ok());
+        assert_eq!(
+            tm_client_state_from_header,
+            tm_client_state_from_any.expect("Never fails").into()
+        );
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/acknowledgement.rs b/ibc-testkit/src/fixtures/core/channel/acknowledgement.rs
new file mode 100644
index 000000000..ac09a89e0
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/acknowledgement.rs
@@ -0,0 +1,100 @@
+use ibc::core::channel::types::proto::v1::{
+    MsgAcknowledgement as RawMsgAcknowledgement, Packet as RawPacket,
+};
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+
+use super::{dummy_proof, dummy_raw_packet};
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgAcknowledgement`, for testing purposes only!
+/// The `height` parametrizes the proof height as well as the timeout height.
+pub fn dummy_raw_msg_acknowledgement(height: u64) -> RawMsgAcknowledgement {
+    dummy_raw_msg_ack_with_packet(dummy_raw_packet(height, 1), height)
+}
+
+pub fn dummy_raw_msg_ack_with_packet(packet: RawPacket, height: u64) -> RawMsgAcknowledgement {
+    RawMsgAcknowledgement {
+        packet: Some(packet),
+        acknowledgement: dummy_proof(),
+        proof_acked: dummy_proof(),
+        proof_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: height,
+        }),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use ibc::core::channel::types::error::PacketError;
+    use ibc::core::channel::types::msgs::MsgAcknowledgement;
+    use ibc::primitives::prelude::*;
+
+    use super::*;
+
+    #[test]
+    fn msg_acknowledgment_try_from_raw() {
+        struct Test {
+            name: String,
+            raw: RawMsgAcknowledgement,
+            want_pass: bool,
+        }
+
+        let height = 50;
+        let default_raw_msg = dummy_raw_msg_acknowledgement(height);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Missing packet".to_string(),
+                raw: RawMsgAcknowledgement {
+                    packet: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof height".to_string(),
+                raw: RawMsgAcknowledgement {
+                    proof_height: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Empty signer".to_string(),
+                raw: RawMsgAcknowledgement {
+                    signer: dummy_bech32_account(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Empty proof acked".to_string(),
+                raw: RawMsgAcknowledgement {
+                    proof_acked: Vec::new(),
+                    ..default_raw_msg
+                },
+                want_pass: false,
+            },
+        ];
+
+        for test in tests {
+            let res_msg: Result<MsgAcknowledgement, PacketError> = test.raw.clone().try_into();
+
+            assert_eq!(
+                res_msg.is_ok(),
+                test.want_pass,
+                "MsgAcknowledgement::try_from failed for test {} \nraw message: {:?} with error: {:?}",
+                test.name,
+                test.raw,
+                res_msg.err()
+            );
+        }
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/chan_close_confirm.rs b/ibc-testkit/src/fixtures/core/channel/chan_close_confirm.rs
new file mode 100644
index 000000000..57694974f
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/chan_close_confirm.rs
@@ -0,0 +1,137 @@
+use ibc::core::channel::types::proto::v1::MsgChannelCloseConfirm as RawMsgChannelCloseConfirm;
+use ibc::core::client::types::proto::v1::Height;
+use ibc::core::host::types::identifiers::{ChannelId, PortId};
+use ibc::core::primitives::prelude::*;
+
+use super::dummy_proof;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgChannelCloseConfirm`, for testing purposes only!
+pub fn dummy_raw_msg_chan_close_confirm(proof_height: u64) -> RawMsgChannelCloseConfirm {
+    RawMsgChannelCloseConfirm {
+        port_id: PortId::transfer().to_string(),
+        channel_id: ChannelId::zero().to_string(),
+        proof_init: dummy_proof(),
+        proof_height: Some(Height {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        signer: dummy_bech32_account(),
+        counterparty_upgrade_sequence: 0,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::channel::types::msgs::MsgChannelCloseConfirm;
+
+    use super::*;
+
+    #[test]
+    fn parse_channel_close_confirm_msg() {
+        struct Test {
+            name: String,
+            raw: RawMsgChannelCloseConfirm,
+            want_pass: bool,
+        }
+
+        let proof_height = 10;
+        let default_raw_msg = dummy_raw_msg_chan_close_confirm(proof_height);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Correct port".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    port_id: "p34".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad port, name too short".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    port_id: "p".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad port, name too long".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    port_id:
+                        "abcdefghijklmnsdfasdfasdfasdfasdgafgadsfasdfasdfasdasfdasdfsadfopqrstuabcdefghijklmnsdfasdfasdfasdfasdgafgadsfasdfasdfasdasfdasdfsadfopqrstu"
+                            .to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Correct channel identifier".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    channel_id: "channel-34".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad channel, name too short".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    channel_id: "chshort".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad channel, name too long".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    channel_id:
+                        "channel-128391283791827398127398791283912837918273981273987912839"
+                            .to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad proof height, height = 0".to_string(),
+                raw: RawMsgChannelCloseConfirm {
+                    proof_height: Some(Height {
+                        revision_number: 0,
+                        revision_height: 0,
+                    }),
+                    ..default_raw_msg
+                },
+                want_pass: false,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let msg = MsgChannelCloseConfirm::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                msg.is_ok(),
+                "MsgChanCloseConfirm::try_from raw failed for test {}, \nraw msg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_chan_close_confirm(19);
+        let msg = MsgChannelCloseConfirm::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgChannelCloseConfirm::from(msg.clone());
+        let msg_back = MsgChannelCloseConfirm::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+}
diff --git a/crates/ibc/src/core/ics04_channel/msgs/chan_close_init.rs b/ibc-testkit/src/fixtures/core/channel/chan_close_init.rs
similarity index 53%
rename from crates/ibc/src/core/ics04_channel/msgs/chan_close_init.rs
rename to ibc-testkit/src/fixtures/core/channel/chan_close_init.rs
index 98c8c694c..89956ddab 100644
--- a/crates/ibc/src/core/ics04_channel/msgs/chan_close_init.rs
+++ b/ibc-testkit/src/fixtures/core/channel/chan_close_init.rs
@@ -1,87 +1,23 @@
-use crate::prelude::*;
-
-use ibc_proto::protobuf::Protobuf;
-
-use ibc_proto::ibc::core::channel::v1::MsgChannelCloseInit as RawMsgChannelCloseInit;
-
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::core::Msg;
-use crate::signer::Signer;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelCloseInit";
-
-///
-/// Message definition for the first step in the channel close handshake (`ChanCloseInit` datagram).
-/// Per our convention, this message is sent to chain A.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgChannelCloseInit {
-    pub port_id_on_a: PortId,
-    pub chan_id_on_a: ChannelId,
-    pub signer: Signer,
-}
-
-impl Msg for MsgChannelCloseInit {
-    type Raw = RawMsgChannelCloseInit;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgChannelCloseInit> for MsgChannelCloseInit {}
-
-impl TryFrom<RawMsgChannelCloseInit> for MsgChannelCloseInit {
-    type Error = ChannelError;
-
-    fn try_from(raw_msg: RawMsgChannelCloseInit) -> Result<Self, Self::Error> {
-        Ok(MsgChannelCloseInit {
-            port_id_on_a: raw_msg.port_id.parse()?,
-            chan_id_on_a: raw_msg.channel_id.parse()?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgChannelCloseInit> for RawMsgChannelCloseInit {
-    fn from(domain_msg: MsgChannelCloseInit) -> Self {
-        RawMsgChannelCloseInit {
-            port_id: domain_msg.port_id_on_a.to_string(),
-            channel_id: domain_msg.chan_id_on_a.to_string(),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelCloseInit as RawMsgChannelCloseInit;
-
-    use crate::core::ics24_host::identifier::{ChannelId, PortId};
-    use crate::test_utils::get_dummy_bech32_account;
-
-    /// Returns a dummy `RawMsgChannelCloseInit`, for testing only!
-    pub fn get_dummy_raw_msg_chan_close_init() -> RawMsgChannelCloseInit {
-        RawMsgChannelCloseInit {
-            port_id: PortId::default().to_string(),
-            channel_id: ChannelId::default().to_string(),
-            signer: get_dummy_bech32_account(),
-        }
+use ibc::core::channel::types::proto::v1::MsgChannelCloseInit as RawMsgChannelCloseInit;
+use ibc::core::host::types::identifiers::{ChannelId, PortId};
+use ibc::core::primitives::prelude::*;
+
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgChannelCloseInit`, for testing purposes only!
+pub fn dummy_raw_msg_chan_close_init() -> RawMsgChannelCloseInit {
+    RawMsgChannelCloseInit {
+        port_id: PortId::transfer().to_string(),
+        channel_id: ChannelId::zero().to_string(),
+        signer: dummy_bech32_account(),
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::prelude::*;
-
-    use test_log::test;
-
-    use ibc_proto::ibc::core::channel::v1::MsgChannelCloseInit as RawMsgChannelCloseInit;
+    use ibc::core::channel::types::msgs::MsgChannelCloseInit;
 
-    use crate::core::ics04_channel::msgs::chan_close_init::test_util::get_dummy_raw_msg_chan_close_init;
-    use crate::core::ics04_channel::msgs::chan_close_init::MsgChannelCloseInit;
+    use super::*;
 
     #[test]
     fn parse_channel_close_init_msg() {
@@ -91,7 +27,7 @@ mod tests {
             want_pass: bool,
         }
 
-        let default_raw_msg = get_dummy_raw_msg_chan_close_init();
+        let default_raw_msg = dummy_raw_msg_chan_close_init();
 
         let tests: Vec<Test> = vec![
             Test {
@@ -167,7 +103,7 @@ mod tests {
 
     #[test]
     fn to_and_from() {
-        let raw = get_dummy_raw_msg_chan_close_init();
+        let raw = dummy_raw_msg_chan_close_init();
         let msg = MsgChannelCloseInit::try_from(raw.clone()).unwrap();
         let raw_back = RawMsgChannelCloseInit::from(msg.clone());
         let msg_back = MsgChannelCloseInit::try_from(raw_back.clone()).unwrap();
diff --git a/crates/ibc/src/core/ics04_channel/msgs/chan_open_ack.rs b/ibc-testkit/src/fixtures/core/channel/chan_open_ack.rs
similarity index 58%
rename from crates/ibc/src/core/ics04_channel/msgs/chan_open_ack.rs
rename to ibc-testkit/src/fixtures/core/channel/chan_open_ack.rs
index 2f8587ef3..2b89bd3b4 100644
--- a/crates/ibc/src/core/ics04_channel/msgs/chan_open_ack.rs
+++ b/ibc-testkit/src/fixtures/core/channel/chan_open_ack.rs
@@ -1,112 +1,32 @@
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics04_channel::Version;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::{prelude::*, Height};
-
-use ibc_proto::ibc::core::channel::v1::MsgChannelOpenAck as RawMsgChannelOpenAck;
-use ibc_proto::protobuf::Protobuf;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenAck";
-
-/// Message definition for the third step in the channel open handshake (`ChanOpenAck` datagram).
-///
-/// Per our convention, this message is sent to chain A.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgChannelOpenAck {
-    pub port_id_on_a: PortId,
-    pub chan_id_on_a: ChannelId,
-    pub chan_id_on_b: ChannelId,
-    pub version_on_b: Version,
-    pub proof_chan_end_on_b: CommitmentProofBytes,
-    pub proof_height_on_b: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgChannelOpenAck {
-    type Raw = RawMsgChannelOpenAck;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgChannelOpenAck> for MsgChannelOpenAck {}
-
-impl TryFrom<RawMsgChannelOpenAck> for MsgChannelOpenAck {
-    type Error = ChannelError;
-
-    fn try_from(raw_msg: RawMsgChannelOpenAck) -> Result<Self, Self::Error> {
-        Ok(MsgChannelOpenAck {
-            port_id_on_a: raw_msg.port_id.parse()?,
-            chan_id_on_a: raw_msg.channel_id.parse()?,
-            chan_id_on_b: raw_msg.counterparty_channel_id.parse()?,
-            version_on_b: raw_msg.counterparty_version.into(),
-            proof_chan_end_on_b: raw_msg
-                .proof_try
-                .try_into()
-                .map_err(|_| ChannelError::InvalidProof)?,
-            proof_height_on_b: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ChannelError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgChannelOpenAck> for RawMsgChannelOpenAck {
-    fn from(domain_msg: MsgChannelOpenAck) -> Self {
-        RawMsgChannelOpenAck {
-            port_id: domain_msg.port_id_on_a.to_string(),
-            channel_id: domain_msg.chan_id_on_a.to_string(),
-            counterparty_channel_id: domain_msg.chan_id_on_b.to_string(),
-            counterparty_version: domain_msg.version_on_b.to_string(),
-            proof_try: domain_msg.proof_chan_end_on_b.into(),
-            proof_height: Some(domain_msg.proof_height_on_b.into()),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenAck as RawMsgChannelOpenAck;
-
-    use crate::core::ics24_host::identifier::{ChannelId, PortId};
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-    use ibc_proto::ibc::core::client::v1::Height;
-
-    /// Returns a dummy `RawMsgChannelOpenAck`, for testing only!
-    pub fn get_dummy_raw_msg_chan_open_ack(proof_height: u64) -> RawMsgChannelOpenAck {
-        RawMsgChannelOpenAck {
-            port_id: PortId::default().to_string(),
-            channel_id: ChannelId::default().to_string(),
-            counterparty_channel_id: ChannelId::default().to_string(),
-            counterparty_version: "".to_string(),
-            proof_try: get_dummy_proof(),
-            proof_height: Some(Height {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
+use ibc::core::channel::types::proto::v1::MsgChannelOpenAck as RawMsgChannelOpenAck;
+use ibc::core::client::types::proto::v1::Height;
+use ibc::core::host::types::identifiers::{ChannelId, PortId};
+use ibc::core::primitives::prelude::*;
+
+use super::dummy_proof;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgChannelOpenAck`, for testing purposes only!
+pub fn dummy_raw_msg_chan_open_ack(proof_height: u64) -> RawMsgChannelOpenAck {
+    RawMsgChannelOpenAck {
+        port_id: PortId::transfer().to_string(),
+        channel_id: ChannelId::zero().to_string(),
+        counterparty_channel_id: ChannelId::zero().to_string(),
+        counterparty_version: "".to_string(),
+        proof_try: dummy_proof(),
+        proof_height: Some(Height {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        signer: dummy_bech32_account(),
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenAck as RawMsgChannelOpenAck;
-    use test_log::test;
-
-    use crate::core::ics04_channel::msgs::chan_open_ack::test_util::get_dummy_raw_msg_chan_open_ack;
-    use crate::core::ics04_channel::msgs::chan_open_ack::MsgChannelOpenAck;
+    use ibc::core::channel::types::msgs::MsgChannelOpenAck;
 
-    use ibc_proto::ibc::core::client::v1::Height;
+    use super::*;
 
     #[test]
     fn parse_channel_open_ack_msg() {
@@ -117,7 +37,7 @@ mod tests {
         }
 
         let proof_height = 20;
-        let default_raw_msg = get_dummy_raw_msg_chan_open_ack(proof_height);
+        let default_raw_msg = dummy_raw_msg_chan_open_ack(proof_height);
 
         let tests: Vec<Test> = vec![
             Test {
@@ -260,7 +180,7 @@ mod tests {
 
     #[test]
     fn to_and_from() {
-        let raw = get_dummy_raw_msg_chan_open_ack(100);
+        let raw = dummy_raw_msg_chan_open_ack(100);
         let msg = MsgChannelOpenAck::try_from(raw.clone()).unwrap();
         let raw_back = RawMsgChannelOpenAck::from(msg.clone());
         let msg_back = MsgChannelOpenAck::try_from(raw_back.clone()).unwrap();
diff --git a/crates/ibc/src/core/ics04_channel/msgs/chan_open_confirm.rs b/ibc-testkit/src/fixtures/core/channel/chan_open_confirm.rs
similarity index 51%
rename from crates/ibc/src/core/ics04_channel/msgs/chan_open_confirm.rs
rename to ibc-testkit/src/fixtures/core/channel/chan_open_confirm.rs
index aeaa39706..3871fc9f2 100644
--- a/crates/ibc/src/core/ics04_channel/msgs/chan_open_confirm.rs
+++ b/ibc-testkit/src/fixtures/core/channel/chan_open_confirm.rs
@@ -1,105 +1,30 @@
-use crate::core::ics04_channel::error::ChannelError;
-use crate::core::ics23_commitment::commitment::CommitmentProofBytes;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::core::Msg;
-use crate::signer::Signer;
-use crate::{prelude::*, Height};
-
-use ibc_proto::ibc::core::channel::v1::MsgChannelOpenConfirm as RawMsgChannelOpenConfirm;
-use ibc_proto::protobuf::Protobuf;
-
-pub(crate) const TYPE_URL: &str = "/ibc.core.channel.v1.MsgChannelOpenConfirm";
-
-///
-/// Message definition for the fourth step in the channel open handshake (`ChanOpenConfirm`
-/// datagram).
-/// Per our convention, this message is sent to chain B.
-///
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct MsgChannelOpenConfirm {
-    pub port_id_on_b: PortId,
-    pub chan_id_on_b: ChannelId,
-    pub proof_chan_end_on_a: CommitmentProofBytes,
-    pub proof_height_on_a: Height,
-    pub signer: Signer,
-}
-
-impl Msg for MsgChannelOpenConfirm {
-    type Raw = RawMsgChannelOpenConfirm;
-
-    fn type_url(&self) -> String {
-        TYPE_URL.to_string()
-    }
-}
-
-impl Protobuf<RawMsgChannelOpenConfirm> for MsgChannelOpenConfirm {}
-
-impl TryFrom<RawMsgChannelOpenConfirm> for MsgChannelOpenConfirm {
-    type Error = ChannelError;
-
-    fn try_from(raw_msg: RawMsgChannelOpenConfirm) -> Result<Self, Self::Error> {
-        Ok(MsgChannelOpenConfirm {
-            port_id_on_b: raw_msg.port_id.parse()?,
-            chan_id_on_b: raw_msg.channel_id.parse()?,
-            proof_chan_end_on_a: raw_msg
-                .proof_ack
-                .try_into()
-                .map_err(|_| ChannelError::InvalidProof)?,
-            proof_height_on_a: raw_msg
-                .proof_height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ChannelError::MissingHeight)?,
-            signer: raw_msg.signer.into(),
-        })
-    }
-}
-
-impl From<MsgChannelOpenConfirm> for RawMsgChannelOpenConfirm {
-    fn from(domain_msg: MsgChannelOpenConfirm) -> Self {
-        RawMsgChannelOpenConfirm {
-            port_id: domain_msg.port_id_on_b.to_string(),
-            channel_id: domain_msg.chan_id_on_b.to_string(),
-            proof_ack: domain_msg.proof_chan_end_on_a.into(),
-            proof_height: Some(domain_msg.proof_height_on_a.into()),
-            signer: domain_msg.signer.to_string(),
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_util {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenConfirm as RawMsgChannelOpenConfirm;
-
-    use crate::core::ics24_host::identifier::{ChannelId, PortId};
-    use crate::test_utils::{get_dummy_bech32_account, get_dummy_proof};
-    use ibc_proto::ibc::core::client::v1::Height;
-
-    /// Returns a dummy `RawMsgChannelOpenConfirm`, for testing only!
-    pub fn get_dummy_raw_msg_chan_open_confirm(proof_height: u64) -> RawMsgChannelOpenConfirm {
-        RawMsgChannelOpenConfirm {
-            port_id: PortId::default().to_string(),
-            channel_id: ChannelId::default().to_string(),
-            proof_ack: get_dummy_proof(),
-            proof_height: Some(Height {
-                revision_number: 0,
-                revision_height: proof_height,
-            }),
-            signer: get_dummy_bech32_account(),
-        }
+use ibc::core::channel::types::proto::v1::MsgChannelOpenConfirm as RawMsgChannelOpenConfirm;
+use ibc::core::client::types::proto::v1::Height;
+use ibc::core::host::types::identifiers::{ChannelId, PortId};
+use ibc::core::primitives::prelude::*;
+
+use super::dummy_proof;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgChannelOpenConfirm`, for testing purposes only!
+pub fn dummy_raw_msg_chan_open_confirm(proof_height: u64) -> RawMsgChannelOpenConfirm {
+    RawMsgChannelOpenConfirm {
+        port_id: PortId::transfer().to_string(),
+        channel_id: ChannelId::zero().to_string(),
+        proof_ack: dummy_proof(),
+        proof_height: Some(Height {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        signer: dummy_bech32_account(),
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use crate::prelude::*;
-    use ibc_proto::ibc::core::channel::v1::MsgChannelOpenConfirm as RawMsgChannelOpenConfirm;
-    use test_log::test;
-
-    use crate::core::ics04_channel::msgs::chan_open_confirm::test_util::get_dummy_raw_msg_chan_open_confirm;
-    use crate::core::ics04_channel::msgs::chan_open_confirm::MsgChannelOpenConfirm;
+    use ibc::core::channel::types::msgs::MsgChannelOpenConfirm;
 
-    use ibc_proto::ibc::core::client::v1::Height;
+    use super::*;
 
     #[test]
     fn parse_channel_open_confirm_msg() {
@@ -110,7 +35,7 @@ mod tests {
         }
 
         let proof_height = 78;
-        let default_raw_msg = get_dummy_raw_msg_chan_open_confirm(proof_height);
+        let default_raw_msg = dummy_raw_msg_chan_open_confirm(proof_height);
 
         let tests: Vec<Test> = vec![
             Test {
@@ -205,7 +130,7 @@ mod tests {
 
     #[test]
     fn to_and_from() {
-        let raw = get_dummy_raw_msg_chan_open_confirm(19);
+        let raw = dummy_raw_msg_chan_open_confirm(19);
         let msg = MsgChannelOpenConfirm::try_from(raw.clone()).unwrap();
         let raw_back = RawMsgChannelOpenConfirm::from(msg.clone());
         let msg_back = MsgChannelOpenConfirm::try_from(raw_back.clone()).unwrap();
diff --git a/ibc-testkit/src/fixtures/core/channel/chan_open_init.rs b/ibc-testkit/src/fixtures/core/channel/chan_open_init.rs
new file mode 100644
index 000000000..a40f5afa8
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/chan_open_init.rs
@@ -0,0 +1,106 @@
+use ibc::core::channel::types::proto::v1::MsgChannelOpenInit as RawMsgChannelOpenInit;
+use ibc::core::host::types::identifiers::PortId;
+use ibc::core::primitives::prelude::*;
+
+use super::dummy_raw_channel_end;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgChannelOpenInit`, for testing purposes only!
+pub fn dummy_raw_msg_chan_open_init(counterparty_channel_id: Option<u64>) -> RawMsgChannelOpenInit {
+    RawMsgChannelOpenInit {
+        port_id: PortId::transfer().to_string(),
+        channel: Some(dummy_raw_channel_end(1, counterparty_channel_id)),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::channel::types::msgs::MsgChannelOpenInit;
+
+    use super::*;
+
+    #[test]
+    fn channel_open_init_from_raw() {
+        struct Test {
+            name: String,
+            raw: RawMsgChannelOpenInit,
+            want_pass: bool,
+        }
+
+        let default_raw_init_msg = dummy_raw_msg_chan_open_init(None);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_init_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Incorrect port identifier, slash (separator) prohibited".to_string(),
+                raw: RawMsgChannelOpenInit {
+                    port_id: "p34/".to_string(),
+                    ..default_raw_init_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing channel".to_string(),
+                raw: RawMsgChannelOpenInit {
+                    channel: None,
+                    ..default_raw_init_msg
+                },
+                want_pass: false,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let res_msg = MsgChannelOpenInit::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                res_msg.is_ok(),
+                "MsgChanOpenInit::try_from failed for test {}, \nraw msg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                res_msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        // Check if raw and domain types are equal after conversions
+        let raw = dummy_raw_msg_chan_open_init(None);
+        let msg = MsgChannelOpenInit::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgChannelOpenInit::from(msg.clone());
+        let msg_back = MsgChannelOpenInit::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+
+        // Check if handler sets counterparty channel id to `None`
+        // in case relayer passes `MsgChannelOpenInit` message with it set to `Some(_)`
+        let raw_with_counterparty_chan_id_some = dummy_raw_msg_chan_open_init(None);
+        let msg_with_counterparty_chan_id_some =
+            MsgChannelOpenInit::try_from(raw_with_counterparty_chan_id_some).unwrap();
+        let raw_with_counterparty_chan_id_some_back =
+            RawMsgChannelOpenInit::from(msg_with_counterparty_chan_id_some.clone());
+        let msg_with_counterparty_chan_id_some_back =
+            MsgChannelOpenInit::try_from(raw_with_counterparty_chan_id_some_back.clone()).unwrap();
+        assert_eq!(
+            raw_with_counterparty_chan_id_some_back
+                .channel
+                .unwrap()
+                .counterparty
+                .unwrap()
+                .channel_id,
+            "".to_string()
+        );
+        assert_eq!(
+            msg_with_counterparty_chan_id_some,
+            msg_with_counterparty_chan_id_some_back
+        );
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/chan_open_try.rs b/ibc-testkit/src/fixtures/core/channel/chan_open_try.rs
new file mode 100644
index 000000000..8b4185df6
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/chan_open_try.rs
@@ -0,0 +1,143 @@
+use ibc::core::channel::types::proto::v1::MsgChannelOpenTry as RawMsgChannelOpenTry;
+use ibc::core::client::types::proto::v1::Height;
+use ibc::core::host::types::identifiers::PortId;
+use ibc::core::primitives::prelude::*;
+
+use super::{dummy_proof, dummy_raw_channel_end};
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgChannelOpenTry`, for testing purposes only!
+pub fn dummy_raw_msg_chan_open_try(proof_height: u64) -> RawMsgChannelOpenTry {
+    #[allow(deprecated)]
+    RawMsgChannelOpenTry {
+        port_id: PortId::transfer().to_string(),
+        previous_channel_id: "".to_string(),
+        channel: Some(dummy_raw_channel_end(2, Some(0))),
+        counterparty_version: "".to_string(),
+        proof_init: dummy_proof(),
+        proof_height: Some(Height {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::channel::types::msgs::MsgChannelOpenTry;
+
+    use super::*;
+
+    #[test]
+    fn channel_open_try_from_raw() {
+        struct Test {
+            name: String,
+            raw: RawMsgChannelOpenTry,
+            want_pass: bool,
+        }
+
+        let proof_height = 10;
+        let default_raw_msg = dummy_raw_msg_chan_open_try(proof_height);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Correct port".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    port_id: "p34".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad port, name too short".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    port_id: "p".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad port, name too long".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    port_id: "abcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfaabcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfa".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Empty counterparty version (valid choice)".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    counterparty_version: " ".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Arbitrary counterparty version (valid choice)".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    counterparty_version: "anyversion".to_string(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad proof height, height = 0".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    proof_height: Some(Height {
+                        revision_number: 0,
+                        revision_height: 0,
+                    }),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof height".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    proof_height: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof init (object proof)".to_string(),
+                raw: RawMsgChannelOpenTry {
+                    proof_init: Vec::new(),
+                    ..default_raw_msg
+                },
+                want_pass: false,
+            },
+        ]
+            .into_iter()
+            .collect();
+
+        for test in tests {
+            let res_msg = MsgChannelOpenTry::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                res_msg.is_ok(),
+                "MsgChanOpenTry::try_from failed for test {}, \nraw msg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                res_msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_chan_open_try(10);
+        let msg = MsgChannelOpenTry::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgChannelOpenTry::from(msg.clone());
+        let msg_back = MsgChannelOpenTry::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/mod.rs b/ibc-testkit/src/fixtures/core/channel/mod.rs
new file mode 100644
index 000000000..5f12f7b88
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/mod.rs
@@ -0,0 +1,196 @@
+mod acknowledgement;
+mod chan_close_confirm;
+mod chan_close_init;
+mod chan_open_ack;
+mod chan_open_confirm;
+mod chan_open_init;
+mod chan_open_try;
+mod packet;
+mod recv_packet;
+mod timeout;
+mod timeout_on_close;
+
+use ibc::core::channel::types::proto::v1::{
+    Channel as RawChannel, Counterparty as RawCounterparty,
+};
+use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc::primitives::prelude::*;
+
+pub use self::acknowledgement::*;
+pub use self::chan_close_confirm::*;
+pub use self::chan_close_init::*;
+pub use self::chan_open_ack::*;
+pub use self::chan_open_confirm::*;
+pub use self::chan_open_init::*;
+pub use self::chan_open_try::*;
+pub use self::packet::*;
+pub use self::recv_packet::*;
+pub use self::timeout::*;
+pub use self::timeout_on_close::*;
+
+/// Returns a dummy `RawCounterparty`, for testing purposes only!
+/// Can be optionally parametrized with a specific channel identifier.
+pub fn dummy_raw_counterparty_chan(channel_id: String) -> RawCounterparty {
+    RawCounterparty {
+        port_id: PortId::transfer().to_string(),
+        channel_id,
+    }
+}
+
+/// Returns a dummy `RawChannel`, for testing purposes only!
+pub fn dummy_raw_channel_end(state: i32, channel_id: Option<u64>) -> RawChannel {
+    let channel_id = match channel_id {
+        Some(id) => ChannelId::new(id).to_string(),
+        None => "".to_string(),
+    };
+    RawChannel {
+        state,
+        ordering: 2,
+        counterparty: Some(dummy_raw_counterparty_chan(channel_id)),
+        connection_hops: vec![ConnectionId::zero().to_string()],
+        version: "".to_string(), // The version is not validated.
+        upgrade_sequence: 0,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use core::str::FromStr;
+
+    use ibc::core::channel::types::channel::ChannelEnd;
+
+    use super::*;
+    #[test]
+    fn channel_end_try_from_raw() {
+        let raw_channel_end = dummy_raw_channel_end(2, Some(0));
+
+        let empty_raw_channel_end = RawChannel {
+            counterparty: None,
+            ..raw_channel_end.clone()
+        };
+
+        struct Test {
+            name: String,
+            params: RawChannel,
+            want_pass: bool,
+        }
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Raw channel end with missing counterparty".to_string(),
+                params: empty_raw_channel_end,
+                want_pass: false,
+            },
+            Test {
+                name: "Raw channel end with incorrect state".to_string(),
+                params: RawChannel {
+                    state: -1,
+                    ..raw_channel_end.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Raw channel end with incorrect ordering".to_string(),
+                params: RawChannel {
+                    ordering: -1,
+                    ..raw_channel_end.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Raw channel end with incorrect connection id in connection hops".to_string(),
+                params: RawChannel {
+                    connection_hops: vec!["connection*".to_string()].into_iter().collect(),
+                    ..raw_channel_end.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Raw channel end with incorrect connection id (has blank space)".to_string(),
+                params: RawChannel {
+                    connection_hops: vec!["con nection".to_string()].into_iter().collect(),
+                    ..raw_channel_end.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Raw channel end with two correct connection ids in connection hops"
+                    .to_string(),
+                params: RawChannel {
+                    connection_hops: vec!["connection-1".to_string(), "connection-2".to_string()]
+                        .into_iter()
+                        .collect(),
+                    ..raw_channel_end.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Raw channel end with correct params".to_string(),
+                params: raw_channel_end,
+                want_pass: true,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let p = test.params.clone();
+
+            let ce_result = ChannelEnd::try_from(p);
+
+            assert_eq!(
+                test.want_pass,
+                ce_result.is_ok(),
+                "ChannelEnd::try_from() failed for test {}, \nmsg{:?} with error {:?}",
+                test.name,
+                test.params.clone(),
+                ce_result.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn parse_channel_ordering_type() {
+        use ibc::core::channel::types::channel::Order;
+
+        struct Test {
+            ordering: &'static str,
+            want_res: Order,
+            want_err: bool,
+        }
+        let tests: Vec<Test> = vec![
+            Test {
+                ordering: "UNINITIALIZED",
+                want_res: Order::None,
+                want_err: false,
+            },
+            Test {
+                ordering: "UNORDERED",
+                want_res: Order::Unordered,
+                want_err: false,
+            },
+            Test {
+                ordering: "ORDERED",
+                want_res: Order::Ordered,
+                want_err: false,
+            },
+            Test {
+                ordering: "UNKNOWN_ORDER",
+                want_res: Order::None,
+                want_err: true,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            match Order::from_str(test.ordering) {
+                Ok(res) => {
+                    assert!(!test.want_err);
+                    assert_eq!(test.want_res, res);
+                }
+                Err(_) => assert!(test.want_err, "parse failed"),
+            }
+        }
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/packet.rs b/ibc-testkit/src/fixtures/core/channel/packet.rs
new file mode 100644
index 000000000..9e213826f
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/packet.rs
@@ -0,0 +1,272 @@
+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::types::identifiers::{ChannelId, PortId, Sequence};
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Timestamp;
+use typed_builder::TypedBuilder;
+
+/// Configuration of the `PacketData` type for building dummy packets.
+#[derive(TypedBuilder, Debug)]
+#[builder(build_method(into = Packet))]
+pub struct PacketConfig {
+    #[builder(default = Sequence::from(0))]
+    pub seq_on_a: Sequence,
+    #[builder(default = PortId::transfer())]
+    pub port_id_on_a: PortId,
+    #[builder(default = ChannelId::zero())]
+    pub chan_id_on_a: ChannelId,
+    #[builder(default = PortId::transfer())]
+    pub port_id_on_b: PortId,
+    #[builder(default = ChannelId::zero())]
+    pub chan_id_on_b: ChannelId,
+    #[builder(default)]
+    pub data: Vec<u8>,
+    #[builder(default = TimeoutHeight::Never)]
+    pub timeout_height_on_b: TimeoutHeight,
+    #[builder(default = Timestamp::none())]
+    pub timeout_timestamp_on_b: Timestamp,
+}
+
+impl From<PacketConfig> for Packet {
+    fn from(config: PacketConfig) -> Self {
+        Self {
+            seq_on_a: config.seq_on_a,
+            port_id_on_a: config.port_id_on_a,
+            chan_id_on_a: config.chan_id_on_a,
+            port_id_on_b: config.port_id_on_b,
+            chan_id_on_b: config.chan_id_on_b,
+            data: config.data,
+            timeout_height_on_b: config.timeout_height_on_b,
+            timeout_timestamp_on_b: config.timeout_timestamp_on_b,
+        }
+    }
+}
+
+/// Returns a dummy `RawPacket`, for testing purposes only!
+pub fn dummy_raw_packet(timeout_height: u64, timeout_timestamp: u64) -> RawPacket {
+    RawPacket {
+        sequence: 1,
+        source_port: PortId::transfer().to_string(),
+        source_channel: ChannelId::zero().to_string(),
+        destination_port: PortId::transfer().to_string(),
+        destination_channel: ChannelId::zero().to_string(),
+        data: vec![0],
+        timeout_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: timeout_height,
+        }),
+        timeout_timestamp,
+    }
+}
+
+pub fn dummy_proof() -> Vec<u8> {
+    b"Y29uc2Vuc3VzU3RhdGUvaWJjb25lY2xpZW50LzIy".to_vec()
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::channel::types::channel::Order;
+    use ibc::core::channel::types::events::SendPacket;
+    use ibc::core::handler::types::events::IbcEvent;
+    use ibc::core::host::types::identifiers::ConnectionId;
+
+    use super::*;
+
+    #[test]
+    fn packet_try_from_raw() {
+        struct Test {
+            name: String,
+            raw: RawPacket,
+            want_pass: bool,
+        }
+
+        let proof_height = 10;
+        let default_raw_packet = dummy_raw_packet(proof_height, 1000);
+        let raw_packet_no_timeout_timestamp = dummy_raw_packet(10, 0);
+
+        let mut raw_packet_invalid_timeout_height = dummy_raw_packet(0, 10);
+        raw_packet_invalid_timeout_height.timeout_height = Some(RawHeight {
+            revision_number: 1,
+            revision_height: 0,
+        });
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_packet.clone(),
+                want_pass: true,
+            },
+            Test {
+                // Note: ibc-go currently (July 2022) incorrectly rejects this
+                // case, even though it is allowed in ICS-4.
+                name: "Packet with no timeout timestamp".to_string(),
+                raw: raw_packet_no_timeout_timestamp.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Packet with invalid timeout height".to_string(),
+                raw: raw_packet_invalid_timeout_height,
+                want_pass: false,
+            },
+            Test {
+                name: "Src port validation: correct".to_string(),
+                raw: RawPacket {
+                    source_port: "srcportp34".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad src port, name too short".to_string(),
+                raw: RawPacket {
+                    source_port: "p".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad src port, name too long".to_string(),
+                raw: RawPacket {
+                    source_port: "abcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfasdfasdfaklmnopqrstuabcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfasdfasdfaklmnopqrstu".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Dst port validation: correct".to_string(),
+                raw: RawPacket {
+                    destination_port: "destportsrcp34".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad dst port, name too short".to_string(),
+                raw: RawPacket {
+                    destination_port: "p".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad dst port, name too long".to_string(),
+                raw: RawPacket {
+                    destination_port: "abcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfasdfasdfasdfaklmnopqrstuabcdefghijasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfadgasgasdfas".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Src channel validation: correct".to_string(),
+                raw: RawPacket {
+                    source_channel: "channel-1".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad src channel, name too short".to_string(),
+                raw: RawPacket {
+                    source_channel: "p".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad src channel, name too long".to_string(),
+                raw: RawPacket {
+                    source_channel: "channel-128391283791827398127398791283912837918273981273987912839".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Dst channel validation: correct".to_string(),
+                raw: RawPacket {
+                    destination_channel: "channel-34".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Bad dst channel, name too short".to_string(),
+                raw: RawPacket {
+                    destination_channel: "p".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad dst channel, name too long".to_string(),
+                raw: RawPacket {
+                    destination_channel: "channel-128391283791827398127398791283912837918273981273987912839".to_string(),
+                    ..default_raw_packet.clone()
+                },
+                want_pass: false,
+            },
+            // Note: `timeout_height == None` is a quirk of protobuf. In
+            // `proto3` syntax, all structs are "nullable" by default and are
+            // represented as `Option<T>`. `ibc-go` defines the protobuf file
+            // with the extension option `gogoproto.nullable = false`, which
+            // means that they will always generate a field. It is left
+            // unspecified what a `None` value means. In this case, I believe it
+            // is best to assume the obvious semantic of "no timeout".
+            Test {
+                name: "Missing timeout height".to_string(),
+                raw: RawPacket {
+                    timeout_height: None,
+                    ..default_raw_packet
+                },
+                want_pass: true,
+            },
+            Test {
+                name: "Missing both timeout height and timestamp".to_string(),
+                raw: RawPacket {
+                    timeout_height: None,
+                    ..raw_packet_no_timeout_timestamp
+                },
+                want_pass: false,
+            }
+        ];
+
+        for test in tests {
+            let res_msg = Packet::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                res_msg.is_ok(),
+                "Packet::try_from failed for test {}, \nraw packet {:?} with error {:?}",
+                test.name,
+                test.raw,
+                res_msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_packet(15, 0);
+        let msg = Packet::try_from(raw.clone()).unwrap();
+        let raw_back = RawPacket::from(msg.clone());
+        let msg_back = Packet::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+
+    #[test]
+    /// Ensures that we don't panic when packet data is not valid UTF-8.
+    /// See issue [#199](https://github.com/cosmos/ibc-rs/issues/199)
+    pub fn test_packet_data_non_utf8() {
+        let mut packet = Packet::try_from(dummy_raw_packet(1, 1)).unwrap();
+        packet.data = vec![128];
+
+        let ibc_event = IbcEvent::SendPacket(SendPacket::new(
+            packet,
+            Order::Unordered,
+            ConnectionId::zero(),
+        ));
+        let _ = tendermint::abci::Event::try_from(ibc_event);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/recv_packet.rs b/ibc-testkit/src/fixtures/core/channel/recv_packet.rs
new file mode 100644
index 000000000..57403a69e
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/recv_packet.rs
@@ -0,0 +1,119 @@
+use core::ops::Add;
+use core::time::Duration;
+
+use ibc::core::channel::types::msgs::MsgRecvPacket;
+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_types::commitment::CommitmentProofBytes;
+use ibc::core::primitives::{Signer, Timestamp};
+
+use super::{dummy_proof, dummy_raw_packet};
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+pub fn dummy_msg_recv_packet(
+    packet: Packet,
+    proof_commitment_on_a: CommitmentProofBytes,
+    proof_height_on_a: Height,
+    signer: Signer,
+) -> MsgRecvPacket {
+    MsgRecvPacket {
+        packet,
+        proof_commitment_on_a,
+        proof_height_on_a,
+        signer,
+    }
+}
+
+/// Returns a dummy `RawMsgRecvPacket`, for testing purposes only! The `height`
+/// parametrizes the proof height as well as the timeout height.
+pub fn dummy_raw_msg_recv_packet(height: u64) -> RawMsgRecvPacket {
+    let timestamp = Timestamp::now().add(Duration::from_secs(9));
+    RawMsgRecvPacket {
+        packet: Some(dummy_raw_packet(
+            height,
+            timestamp.expect("timestamp").nanoseconds(),
+        )),
+        proof_commitment: dummy_proof(),
+        proof_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: height,
+        }),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use ibc::core::channel::types::error::PacketError;
+    use ibc::primitives::prelude::*;
+
+    use super::*;
+
+    #[test]
+    fn msg_recv_packet_try_from_raw() {
+        struct Test {
+            name: String,
+            raw: RawMsgRecvPacket,
+            want_pass: bool,
+        }
+
+        let height = 20;
+        let default_raw_msg = dummy_raw_msg_recv_packet(height);
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Missing proof".to_string(),
+                raw: RawMsgRecvPacket {
+                    proof_commitment: Vec::new(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof height".to_string(),
+                raw: RawMsgRecvPacket {
+                    proof_height: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Empty signer".to_string(),
+                raw: RawMsgRecvPacket {
+                    signer: dummy_bech32_account(),
+                    ..default_raw_msg
+                },
+                want_pass: true,
+            },
+        ];
+
+        for test in tests {
+            let res_msg: Result<MsgRecvPacket, PacketError> = test.raw.clone().try_into();
+
+            assert_eq!(
+                res_msg.is_ok(),
+                test.want_pass,
+                "MsgRecvPacket::try_from failed for test {} \nraw message: {:?} with error: {:?}",
+                test.name,
+                test.raw,
+                res_msg.err()
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_recv_packet(15);
+        let msg = MsgRecvPacket::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgRecvPacket::from(msg.clone());
+        let msg_back = MsgRecvPacket::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/timeout.rs b/ibc-testkit/src/fixtures/core/channel/timeout.rs
new file mode 100644
index 000000000..97719aafd
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/timeout.rs
@@ -0,0 +1,112 @@
+use ibc::core::channel::types::proto::v1::MsgTimeout as RawMsgTimeout;
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+
+use super::{dummy_proof, dummy_raw_packet};
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgTimeout`, for testing purposes only!
+/// The `height` parametrizes the proof height as well as the timeout height.
+pub fn dummy_raw_msg_timeout(
+    proof_height: u64,
+    timeout_height: u64,
+    timeout_timestamp: u64,
+) -> RawMsgTimeout {
+    RawMsgTimeout {
+        packet: Some(dummy_raw_packet(timeout_height, timeout_timestamp)),
+        proof_unreceived: dummy_proof(),
+        proof_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        next_sequence_recv: 1,
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use ibc::core::channel::types::error::PacketError;
+    use ibc::core::channel::types::msgs::MsgTimeout;
+    use ibc::primitives::prelude::*;
+
+    use super::*;
+
+    #[test]
+    fn msg_timeout_try_from_raw() {
+        struct Test {
+            name: String,
+            raw: RawMsgTimeout,
+            want_pass: bool,
+        }
+
+        let proof_height = 50;
+        let timeout_height = proof_height;
+        let timeout_timestamp = 0;
+        let default_raw_msg =
+            dummy_raw_msg_timeout(proof_height, timeout_height, timeout_timestamp);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Missing packet".to_string(),
+                raw: RawMsgTimeout {
+                    packet: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof".to_string(),
+                raw: RawMsgTimeout {
+                    proof_unreceived: Vec::new(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof height".to_string(),
+                raw: RawMsgTimeout {
+                    proof_height: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Empty signer".to_string(),
+                raw: RawMsgTimeout {
+                    signer: dummy_bech32_account(),
+                    ..default_raw_msg
+                },
+                want_pass: true,
+            },
+        ];
+
+        for test in tests {
+            let res_msg: Result<MsgTimeout, PacketError> = test.raw.clone().try_into();
+
+            assert_eq!(
+                res_msg.is_ok(),
+                test.want_pass,
+                "MsgTimeout::try_from failed for test {} \nraw message: {:?} with error: {:?}",
+                test.name,
+                test.raw,
+                res_msg.err()
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let dummy_raw_msg_timeout = dummy_raw_msg_timeout(15, 20, 0);
+        let raw = dummy_raw_msg_timeout;
+        let msg = MsgTimeout::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgTimeout::from(msg.clone());
+        let msg_back = MsgTimeout::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/channel/timeout_on_close.rs b/ibc-testkit/src/fixtures/core/channel/timeout_on_close.rs
new file mode 100644
index 000000000..165d0299f
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/channel/timeout_on_close.rs
@@ -0,0 +1,107 @@
+use ibc::core::channel::types::proto::v1::MsgTimeoutOnClose as RawMsgTimeoutOnClose;
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+
+use super::{dummy_proof, dummy_raw_packet};
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgTimeoutOnClose`, for testing purposes only!
+/// The `height` parametrizes the proof height as well as the timeout height.
+pub fn dummy_raw_msg_timeout_on_close(height: u64, timeout_timestamp: u64) -> RawMsgTimeoutOnClose {
+    RawMsgTimeoutOnClose {
+        packet: Some(dummy_raw_packet(height, timeout_timestamp)),
+        proof_unreceived: dummy_proof(),
+        proof_close: dummy_proof(),
+        proof_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: height,
+        }),
+        next_sequence_recv: 1,
+        signer: dummy_bech32_account(),
+        counterparty_upgrade_sequence: 0,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::channel::types::msgs::MsgTimeoutOnClose;
+    use ibc::primitives::prelude::*;
+
+    use super::*;
+
+    #[test]
+    fn msg_timeout_on_close_try_from_raw() {
+        let height = 50;
+        let timeout_timestamp = 5;
+        let raw = dummy_raw_msg_timeout_on_close(height, timeout_timestamp);
+
+        let msg = MsgTimeoutOnClose::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgTimeoutOnClose::from(msg);
+        assert_eq!(raw, raw_back);
+    }
+
+    #[test]
+    fn parse_timeout_on_close_msg() {
+        struct Test {
+            name: String,
+            raw: RawMsgTimeoutOnClose,
+            want_pass: bool,
+        }
+
+        let height = 50;
+        let timeout_timestamp = 5;
+        let default_raw_msg = dummy_raw_msg_timeout_on_close(height, timeout_timestamp);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_raw_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Missing packet".to_string(),
+                raw: RawMsgTimeoutOnClose {
+                    packet: None,
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof of unreceived packet".to_string(),
+                raw: RawMsgTimeoutOnClose {
+                    proof_unreceived: Vec::new(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof of channel".to_string(),
+                raw: RawMsgTimeoutOnClose {
+                    proof_close: Vec::new(),
+                    ..default_raw_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Missing proof height".to_string(),
+                raw: RawMsgTimeoutOnClose {
+                    proof_height: None,
+                    ..default_raw_msg
+                },
+                want_pass: false,
+            },
+        ];
+
+        for test in tests {
+            let res_msg = MsgTimeoutOnClose::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                res_msg.is_ok(),
+                "MsgTimeoutOnClose::try_from raw failed for test {}, \nraw msg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                res_msg.err(),
+            );
+        }
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/client/mod.rs b/ibc-testkit/src/fixtures/core/client/mod.rs
new file mode 100644
index 000000000..508fe0e3b
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/client/mod.rs
@@ -0,0 +1,115 @@
+#[cfg(feature = "serde")]
+mod msg_create_client;
+#[cfg(feature = "serde")]
+mod msg_update_client;
+mod msg_upgrade_client;
+
+#[cfg(feature = "serde")]
+pub use self::msg_create_client::*;
+#[cfg(feature = "serde")]
+pub use self::msg_update_client::*;
+pub use self::msg_upgrade_client::*;
+
+#[cfg(test)]
+mod tests {
+    use core::str::FromStr;
+
+    use ibc::core::client::types::events::*;
+    use ibc::core::client::types::Height;
+    use ibc::core::host::types::identifiers::*;
+    use ibc::primitives::prelude::*;
+    use ibc::primitives::ToVec;
+    use ibc_proto::google::protobuf::Any;
+    use tendermint::abci::Event as AbciEvent;
+
+    use crate::fixtures::clients::mock::dummy_new_mock_header;
+
+    #[test]
+    fn ibc_to_abci_client_events() {
+        struct Test {
+            event_kind: &'static str,
+            event: AbciEvent,
+            expected_keys: Vec<&'static str>,
+            expected_values: Vec<&'static str>,
+        }
+
+        let client_type = ClientType::from_str("07-tendermint")
+            .expect("never fails because it's a valid client type");
+        let client_id = client_type.build_client_id(0);
+        let consensus_height = Height::new(0, 5).unwrap();
+        let consensus_heights = vec![Height::new(0, 5).unwrap(), Height::new(0, 7).unwrap()];
+        let header: Any = dummy_new_mock_header(5).into();
+        let expected_keys = vec![
+            "client_id",
+            "client_type",
+            "consensus_height",
+            "consensus_heights",
+            "header",
+        ];
+
+        let expected_values = vec![
+            "07-tendermint-0",
+            "07-tendermint",
+            "0-5",
+            "0-5,0-7",
+            "0a102f6962632e6d6f636b2e48656164657212040a021005",
+        ];
+
+        let tests: Vec<Test> = vec![
+            Test {
+                event_kind: CREATE_CLIENT_EVENT,
+                event: CreateClient::new(client_id.clone(), client_type.clone(), consensus_height)
+                    .into(),
+                expected_keys: expected_keys[0..3].to_vec(),
+                expected_values: expected_values[0..3].to_vec(),
+            },
+            Test {
+                event_kind: UPDATE_CLIENT_EVENT,
+                event: UpdateClient::new(
+                    client_id.clone(),
+                    client_type.clone(),
+                    consensus_height,
+                    consensus_heights,
+                    header.to_vec(),
+                )
+                .into(),
+                expected_keys: expected_keys.clone(),
+                expected_values: expected_values.clone(),
+            },
+            Test {
+                event_kind: UPGRADE_CLIENT_EVENT,
+                event: UpgradeClient::new(client_id.clone(), client_type.clone(), consensus_height)
+                    .into(),
+                expected_keys: expected_keys[0..3].to_vec(),
+                expected_values: expected_values[0..3].to_vec(),
+            },
+            Test {
+                event_kind: CLIENT_MISBEHAVIOUR_EVENT,
+                event: ClientMisbehaviour::new(client_id, client_type).into(),
+                expected_keys: expected_keys[0..2].to_vec(),
+                expected_values: expected_values[0..2].to_vec(),
+            },
+        ];
+
+        for t in tests {
+            assert_eq!(t.event.kind, t.event_kind);
+            assert_eq!(t.expected_keys.len(), t.event.attributes.len());
+            for (i, e) in t.event.attributes.iter().enumerate() {
+                assert_eq!(
+                    e.key_str().unwrap(),
+                    t.expected_keys[i],
+                    "key mismatch for {:?}",
+                    t.event_kind
+                );
+            }
+            for (i, e) in t.event.attributes.iter().enumerate() {
+                assert_eq!(
+                    e.value_str().unwrap(),
+                    t.expected_values[i],
+                    "value mismatch for {:?}",
+                    t.event_kind
+                );
+            }
+        }
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/client/msg_create_client.rs b/ibc-testkit/src/fixtures/core/client/msg_create_client.rs
new file mode 100644
index 000000000..bc1cfbc31
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/client/msg_create_client.rs
@@ -0,0 +1,38 @@
+use ibc::clients::tendermint::types::ConsensusState as TmConsensusState;
+use ibc::core::client::types::proto::v1::MsgCreateClient as RawMsgCreateClient;
+use ibc::primitives::proto::Any;
+
+use crate::fixtures::clients::tendermint::{
+    dummy_tendermint_header, dummy_tm_client_state_from_header,
+};
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgCreateClient`, for testing purposes only!
+pub fn dummy_raw_msg_create_client() -> RawMsgCreateClient {
+    let tm_header = dummy_tendermint_header();
+
+    let tm_client_state = dummy_tm_client_state_from_header(tm_header.clone());
+
+    RawMsgCreateClient {
+        client_state: Some(Any::from(tm_client_state)),
+        consensus_state: Some(Any::from(TmConsensusState::from(tm_header))),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::client::types::msgs::MsgCreateClient;
+
+    use super::*;
+
+    #[test]
+    fn msg_create_client_serialization() {
+        let raw = dummy_raw_msg_create_client();
+        let msg = MsgCreateClient::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgCreateClient::from(msg.clone());
+        let msg_back = MsgCreateClient::try_from(raw_back.clone()).unwrap();
+        assert_eq!(msg, msg_back);
+        assert_eq!(raw, raw_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/client/msg_update_client.rs b/ibc-testkit/src/fixtures/core/client/msg_update_client.rs
new file mode 100644
index 000000000..83de78d04
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/client/msg_update_client.rs
@@ -0,0 +1,35 @@
+use ibc::core::client::types::proto::v1::MsgUpdateClient as RawMsgUpdateClient;
+use ibc::primitives::proto::Any;
+
+use crate::fixtures::clients::tendermint::dummy_ics07_header;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `RawMsgUpdateClient`, for testing purposes only!
+pub fn dummy_raw_msg_update_client() -> RawMsgUpdateClient {
+    let client_id = "07-tendermint-0".parse().expect("no error");
+
+    let tm_header = dummy_ics07_header();
+
+    RawMsgUpdateClient {
+        client_id,
+        client_message: Some(Any::from(tm_header)),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::client::types::msgs::MsgUpdateClient;
+
+    use super::*;
+
+    #[test]
+    fn msg_update_client_serialization() {
+        let raw = dummy_raw_msg_update_client();
+        let msg = MsgUpdateClient::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgUpdateClient::from(msg.clone());
+        let msg_back = MsgUpdateClient::try_from(raw_back.clone()).unwrap();
+        assert_eq!(msg, msg_back);
+        assert_eq!(raw, raw_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/client/msg_upgrade_client.rs b/ibc-testkit/src/fixtures/core/client/msg_upgrade_client.rs
new file mode 100644
index 000000000..5b1dbbbe2
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/client/msg_upgrade_client.rs
@@ -0,0 +1,53 @@
+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::types::identifiers::ClientId;
+
+use crate::fixtures::core::commitment::dummy_commitment_proof_bytes;
+use crate::fixtures::core::signer::{dummy_account_id, dummy_bech32_account};
+use crate::testapp::ibc::clients::mock::client_state::MockClientState;
+use crate::testapp::ibc::clients::mock::consensus_state::MockConsensusState;
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+
+/// Returns a dummy `MsgUpgradeClient`, for testing purposes only!
+pub fn dummy_msg_upgrade_client(client_id: ClientId, upgrade_height: Height) -> MsgUpgradeClient {
+    MsgUpgradeClient {
+        client_id,
+        upgraded_client_state: MockClientState::new(MockHeader::new(upgrade_height)).into(),
+        upgraded_consensus_state: MockConsensusState::new(MockHeader::new(upgrade_height)).into(),
+        proof_upgrade_client: dummy_commitment_proof_bytes(),
+        proof_upgrade_consensus_state: dummy_commitment_proof_bytes(),
+        signer: dummy_account_id(),
+    }
+}
+
+/// Returns a dummy `RawMsgUpgradeClient`, for testing purposes only!
+pub fn dummy_raw_msg_upgrade_client() -> RawMsgUpgradeClient {
+    let client_id = "07-tendermint-0".parse().expect("no error");
+
+    let upgrade_height = Height::new(0, 10).expect("Never fails");
+
+    RawMsgUpgradeClient {
+        client_id,
+        client_state: Some(MockClientState::new(MockHeader::new(upgrade_height)).into()),
+        consensus_state: Some(MockConsensusState::new(MockHeader::new(upgrade_height)).into()),
+        proof_upgrade_client: dummy_commitment_proof_bytes().into(),
+        proof_upgrade_consensus_state: dummy_commitment_proof_bytes().into(),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn msg_upgrade_client_serialization() {
+        let raw = dummy_raw_msg_upgrade_client();
+        let msg = MsgUpgradeClient::try_from(raw.clone()).unwrap();
+        let raw_back: RawMsgUpgradeClient = RawMsgUpgradeClient::from(msg.clone());
+        let msg_back = MsgUpgradeClient::try_from(raw_back.clone()).unwrap();
+        assert_eq!(msg, msg_back);
+        assert_eq!(raw, raw_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/commitment.rs b/ibc-testkit/src/fixtures/core/commitment.rs
new file mode 100644
index 000000000..7abbd95c5
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/commitment.rs
@@ -0,0 +1,14 @@
+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!
+pub fn dummy_commitment_proof_bytes() -> CommitmentProofBytes {
+    let parsed = CommitmentProof { proof: None };
+    let mproofs: Vec<CommitmentProof> = vec![parsed];
+    let raw_mp = RawMerkleProof { proofs: mproofs };
+    raw_mp
+        .try_into()
+        .expect("could not convert to CommitmentProofBytes")
+}
diff --git a/ibc-testkit/src/fixtures/core/connection/conn_open_ack.rs b/ibc-testkit/src/fixtures/core/connection/conn_open_ack.rs
new file mode 100644
index 000000000..863e79343
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/connection/conn_open_ack.rs
@@ -0,0 +1,133 @@
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+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 as ConnectionVersion;
+use ibc::core::host::types::identifiers::ConnectionId;
+use ibc::core::primitives::prelude::*;
+
+use crate::fixtures::core::channel::dummy_proof;
+use crate::fixtures::core::signer::dummy_bech32_account;
+use crate::testapp::ibc::clients::mock::client_state::MockClientState;
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+
+/// Returns a dummy `MsgConnectionOpenAck` with dummy values.
+pub fn dummy_msg_conn_open_ack(proof_height: u64, consensus_height: u64) -> MsgConnectionOpenAck {
+    MsgConnectionOpenAck::try_from(dummy_raw_msg_conn_open_ack(proof_height, consensus_height))
+        .expect("Never fails")
+}
+
+/// Returns a dummy `RawMsgConnectionOpenAck`, for testing purposes only!
+pub fn dummy_raw_msg_conn_open_ack(
+    proof_height: u64,
+    consensus_height: u64,
+) -> RawMsgConnectionOpenAck {
+    let client_state_height = Height::new(0, consensus_height).expect("invalid height");
+    RawMsgConnectionOpenAck {
+        connection_id: ConnectionId::zero().to_string(),
+        counterparty_connection_id: ConnectionId::new(1).to_string(),
+        proof_try: dummy_proof(),
+        proof_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        proof_consensus: dummy_proof(),
+        consensus_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: consensus_height,
+        }),
+        client_state: Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
+        proof_client: dummy_proof(),
+        version: Some(ConnectionVersion::compatibles()[0].clone().into()),
+        signer: dummy_bech32_account(),
+        host_consensus_state_proof: vec![],
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_connection_open_ack_msg() {
+        #[derive(Clone, Debug, PartialEq)]
+        struct Test {
+            name: String,
+            raw: RawMsgConnectionOpenAck,
+            want_pass: bool,
+        }
+
+        let default_ack_msg = dummy_raw_msg_conn_open_ack(5, 5);
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_ack_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Bad connection id, non-alpha".to_string(),
+                raw: RawMsgConnectionOpenAck {
+                    connection_id: "con007".to_string(),
+                    ..default_ack_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad version, missing version".to_string(),
+                raw: RawMsgConnectionOpenAck {
+                    version: None,
+                    ..default_ack_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad proof height, height is 0".to_string(),
+                raw: RawMsgConnectionOpenAck {
+                    proof_height: Some(RawHeight {
+                        revision_number: 1,
+                        revision_height: 0,
+                    }),
+                    ..default_ack_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad consensus height, height is 0".to_string(),
+                raw: RawMsgConnectionOpenAck {
+                    consensus_height: Some(RawHeight {
+                        revision_number: 1,
+                        revision_height: 0,
+                    }),
+                    ..default_ack_msg
+                },
+                want_pass: false,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let msg = MsgConnectionOpenAck::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                msg.is_ok(),
+                "MsgConnOpenAck::new failed for test {}, \nmsg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_conn_open_ack(5, 6);
+        let msg = MsgConnectionOpenAck::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgConnectionOpenAck::from(msg.clone());
+        let msg_back = MsgConnectionOpenAck::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/connection/conn_open_confirm.rs b/ibc-testkit/src/fixtures/core/connection/conn_open_confirm.rs
new file mode 100644
index 000000000..9a5014b87
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/connection/conn_open_confirm.rs
@@ -0,0 +1,93 @@
+use ibc::core::client::types::proto::v1::Height;
+use ibc::core::connection::types::msgs::MsgConnectionOpenConfirm;
+use ibc::core::connection::types::proto::v1::MsgConnectionOpenConfirm as RawMsgConnectionOpenConfirm;
+use ibc::primitives::prelude::*;
+
+use crate::fixtures::core::channel::dummy_proof;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+/// Returns a dummy `MsgConnectionOpenConfirm` for testing purposes only!
+pub fn dummy_conn_open_confirm() -> MsgConnectionOpenConfirm {
+    MsgConnectionOpenConfirm::try_from(dummy_raw_msg_conn_open_confirm()).expect("Never fails")
+}
+
+/// Returns a dummy `RawMsgConnectionOpenConfirm` for testing purposes only!
+pub fn dummy_raw_msg_conn_open_confirm() -> RawMsgConnectionOpenConfirm {
+    RawMsgConnectionOpenConfirm {
+        connection_id: "connection-118".to_string(),
+        proof_ack: dummy_proof(),
+        proof_height: Some(Height {
+            revision_number: 0,
+            revision_height: 10,
+        }),
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_connection_open_confirm_msg() {
+        #[derive(Clone, Debug, PartialEq)]
+        struct Test {
+            name: String,
+            raw: RawMsgConnectionOpenConfirm,
+            want_pass: bool,
+        }
+
+        let default_ack_msg = dummy_raw_msg_conn_open_confirm();
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_ack_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Bad connection id, non-alpha".to_string(),
+                raw: RawMsgConnectionOpenConfirm {
+                    connection_id: "con007".to_string(),
+                    ..default_ack_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad proof height, height is 0".to_string(),
+                raw: RawMsgConnectionOpenConfirm {
+                    proof_height: Some(Height {
+                        revision_number: 1,
+                        revision_height: 0,
+                    }),
+                    ..default_ack_msg
+                },
+                want_pass: false,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let msg = MsgConnectionOpenConfirm::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                msg.is_ok(),
+                "MsgConnOpenTry::new failed for test {}, \nmsg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_conn_open_confirm();
+        let msg = MsgConnectionOpenConfirm::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgConnectionOpenConfirm::from(msg.clone());
+        let msg_back = MsgConnectionOpenConfirm::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/connection/conn_open_init.rs b/ibc-testkit/src/fixtures/core/connection/conn_open_init.rs
new file mode 100644
index 000000000..07036f4fc
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/connection/conn_open_init.rs
@@ -0,0 +1,192 @@
+use ibc::core::connection::types::msgs::MsgConnectionOpenInit;
+use ibc::core::connection::types::proto::v1::{
+    MsgConnectionOpenInit as RawMsgConnectionOpenInit, Version as RawVersion,
+};
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::Counterparty;
+use ibc::core::host::types::identifiers::ClientId;
+use ibc::core::primitives::prelude::*;
+
+use super::dummy_raw_counterparty_conn;
+use crate::fixtures::core::signer::dummy_bech32_account;
+
+pub fn raw_version_from_identifier(identifier: &str) -> Option<RawVersion> {
+    if identifier.is_empty() {
+        return None;
+    }
+
+    Some(RawVersion {
+        identifier: identifier.to_string(),
+        features: vec![],
+    })
+}
+
+/// Returns a dummy `MsgConnectionOpenInit` for testing purposes only!
+pub fn dummy_msg_conn_open_init() -> MsgConnectionOpenInit {
+    MsgConnectionOpenInit::try_from(dummy_raw_msg_conn_open_init()).expect("Never fails")
+}
+
+/// Setter for `client_id`. Amenable to chaining, since it consumes the input message.
+pub fn dummy_msg_conn_open_init_with_client_id(
+    msg: MsgConnectionOpenInit,
+    client_id: ClientId,
+) -> MsgConnectionOpenInit {
+    MsgConnectionOpenInit {
+        client_id_on_a: client_id,
+        ..msg
+    }
+}
+
+/// Setter for `counterparty`. Amenable to chaining, since it consumes the input message.
+pub fn msg_conn_open_init_with_counterparty_conn_id(
+    msg: MsgConnectionOpenInit,
+    counterparty_conn_id: u64,
+) -> MsgConnectionOpenInit {
+    let counterparty =
+        Counterparty::try_from(dummy_raw_counterparty_conn(Some(counterparty_conn_id)))
+            .expect("Never fails");
+    MsgConnectionOpenInit {
+        counterparty,
+        ..msg
+    }
+}
+
+/// Setter for the connection `version`
+pub fn msg_conn_open_with_version(
+    msg: MsgConnectionOpenInit,
+    identifier: Option<&str>,
+) -> MsgConnectionOpenInit {
+    let version = match identifier {
+        Some(v) => ConnectionVersion::try_from(RawVersion {
+            identifier: v.to_string(),
+            features: vec![],
+        })
+        .expect("could not create version from identifier")
+        .into(),
+        None => None,
+    };
+    MsgConnectionOpenInit { version, ..msg }
+}
+
+/// Returns a dummy `RawMsgConnectionOpenInit`, for testing purposes only!
+pub fn dummy_raw_msg_conn_open_init() -> RawMsgConnectionOpenInit {
+    RawMsgConnectionOpenInit {
+        client_id: "07-tendermint-0".into(),
+        counterparty: Some(dummy_raw_counterparty_conn(None)),
+        version: Some(ConnectionVersion::compatibles()[0].clone().into()),
+        delay_period: 0,
+        signer: dummy_bech32_account(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::connection::types::proto::v1::Counterparty as RawCounterparty;
+
+    use super::*;
+
+    #[test]
+    fn parse_connection_open_init_msg() {
+        #[derive(Clone, Debug, PartialEq)]
+        struct Test {
+            name: String,
+            raw: RawMsgConnectionOpenInit,
+            want_pass: bool,
+        }
+
+        let default_init_msg = dummy_raw_msg_conn_open_init();
+
+        let tests: Vec<Test> = vec![
+            Test {
+                name: "Good parameters".to_string(),
+                raw: default_init_msg.clone(),
+                want_pass: true,
+            },
+            Test {
+                name: "Bad client id, name too short".to_string(),
+                raw: RawMsgConnectionOpenInit {
+                    client_id: "client".to_string(),
+                    ..default_init_msg.clone()
+                },
+                want_pass: false,
+            },
+            Test {
+                name: "Bad destination connection id, name too long".to_string(),
+                raw: RawMsgConnectionOpenInit {
+                    counterparty: Some(RawCounterparty {
+                        connection_id:
+                            "abcdefghijksdffjssdkflweldflsfladfsfwjkrekcmmsdfsdfjflddmnopqrstu"
+                                .to_string(),
+                        ..dummy_raw_counterparty_conn(None)
+                    }),
+                    ..default_init_msg
+                },
+                want_pass: false,
+            },
+        ]
+        .into_iter()
+        .collect();
+
+        for test in tests {
+            let msg = MsgConnectionOpenInit::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                msg.is_ok(),
+                "MsgConnOpenInit::new failed for test {}, \nmsg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_conn_open_init();
+        let msg = MsgConnectionOpenInit::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgConnectionOpenInit::from(msg.clone());
+        let msg_back = MsgConnectionOpenInit::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+
+        // Check if handler sets counterparty connection id to `None`
+        // in case relayer passes `MsgConnectionOpenInit` message with it set to `Some(_)`.
+        let raw_with_counterparty_conn_id_some = dummy_raw_msg_conn_open_init();
+        let msg_with_counterparty_conn_id_some =
+            MsgConnectionOpenInit::try_from(raw_with_counterparty_conn_id_some).unwrap();
+        let raw_with_counterparty_conn_id_some_back =
+            RawMsgConnectionOpenInit::from(msg_with_counterparty_conn_id_some.clone());
+        let msg_with_counterparty_conn_id_some_back =
+            MsgConnectionOpenInit::try_from(raw_with_counterparty_conn_id_some_back.clone())
+                .unwrap();
+        assert_eq!(
+            raw_with_counterparty_conn_id_some_back
+                .counterparty
+                .unwrap()
+                .connection_id,
+            "".to_string()
+        );
+        assert_eq!(
+            msg_with_counterparty_conn_id_some,
+            msg_with_counterparty_conn_id_some_back
+        );
+    }
+
+    /// Test that borsh serialization/deserialization works well with delay periods up to u64::MAX
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn test_borsh() {
+        let mut raw = dummy_raw_msg_conn_open_init();
+        raw.delay_period = u64::MAX;
+        let msg = MsgConnectionOpenInit::try_from(raw.clone()).unwrap();
+
+        let serialized = borsh::to_vec(&msg).unwrap();
+
+        let msg_deserialized =
+            <MsgConnectionOpenInit as borsh::BorshDeserialize>::try_from_slice(&serialized)
+                .unwrap();
+
+        assert_eq!(msg, msg_deserialized);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/connection/conn_open_try.rs b/ibc-testkit/src/fixtures/core/connection/conn_open_try.rs
new file mode 100644
index 000000000..d3f9f60ea
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/connection/conn_open_try.rs
@@ -0,0 +1,208 @@
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+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::Version as ConnectionVersion;
+use ibc::core::host::types::identifiers::{ClientId, ConnectionId};
+use ibc::core::primitives::prelude::*;
+
+use super::dummy_raw_counterparty_conn;
+use crate::fixtures::core::channel::dummy_proof;
+use crate::fixtures::core::signer::dummy_bech32_account;
+use crate::testapp::ibc::clients::mock::client_state::MockClientState;
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+
+/// Returns a dummy `MsgConnectionOpenTry` for testing purposes only!
+pub fn dummy_msg_conn_open_try(proof_height: u64, consensus_height: u64) -> MsgConnectionOpenTry {
+    MsgConnectionOpenTry::try_from(dummy_raw_msg_conn_open_try(proof_height, consensus_height))
+        .expect("Never fails")
+}
+/// Setter for the `client_id`
+pub fn msg_conn_open_try_with_client_id(
+    msg: MsgConnectionOpenTry,
+    client_id: ClientId,
+) -> MsgConnectionOpenTry {
+    MsgConnectionOpenTry {
+        client_id_on_b: client_id,
+        ..msg
+    }
+}
+
+/// Returns a dummy `RawMsgConnectionOpenTry` with parametrized heights. The parameter
+/// `proof_height` represents the height, on the source chain, at which this chain produced the
+/// proof. Parameter `consensus_height` represents the height of destination chain which a
+/// client on the source chain stores.
+pub fn dummy_raw_msg_conn_open_try(
+    proof_height: u64,
+    consensus_height: u64,
+) -> RawMsgConnectionOpenTry {
+    let client_state_height = Height::new(0, consensus_height).expect("could not create height");
+
+    #[allow(deprecated)]
+    RawMsgConnectionOpenTry {
+        client_id: "07-tendermint-0".into(),
+        previous_connection_id: ConnectionId::zero().to_string(),
+        client_state: Some(MockClientState::new(MockHeader::new(client_state_height)).into()),
+        counterparty: Some(dummy_raw_counterparty_conn(Some(0))),
+        delay_period: 0,
+        counterparty_versions: ConnectionVersion::compatibles()
+            .iter()
+            .map(|v| v.clone().into())
+            .collect(),
+        proof_init: dummy_proof(),
+        proof_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: proof_height,
+        }),
+        proof_consensus: dummy_proof(),
+        consensus_height: Some(RawHeight {
+            revision_number: 0,
+            revision_height: consensus_height,
+        }),
+        proof_client: dummy_proof(),
+        signer: dummy_bech32_account(),
+        host_consensus_state_proof: vec![],
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::connection::types::proto::v1::Counterparty as RawCounterparty;
+
+    use super::*;
+
+    #[test]
+    fn parse_connection_open_try_msg() {
+        #[derive(Clone, Debug, PartialEq)]
+        struct Test {
+            name: String,
+            raw: RawMsgConnectionOpenTry,
+            want_pass: bool,
+        }
+
+        let default_try_msg = dummy_raw_msg_conn_open_try(10, 34);
+
+        let tests: Vec<Test> =
+            vec![
+                Test {
+                    name: "Good parameters".to_string(),
+                    raw: default_try_msg.clone(),
+                    want_pass: true,
+                },
+                Test {
+                    name: "Bad client id, name too short".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        client_id: "client".to_string(),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: false,
+                },
+                Test {
+                    name: "Bad destination connection id, name too long".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        counterparty: Some(RawCounterparty {
+                            connection_id:
+                            "abcdasdfasdfsdfasfdwefwfsdfsfsfasfwewvxcvdvwgadvaadsefghijklmnopqrstu"
+                                .to_string(),
+                            ..dummy_raw_counterparty_conn(Some(0))
+                        }),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: false,
+                },
+                Test {
+                    name: "Correct destination client id with lower/upper case and special chars"
+                        .to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        counterparty: Some(RawCounterparty {
+                            client_id: "ClientId_".to_string(),
+                            ..dummy_raw_counterparty_conn(Some(0))
+                        }),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: true,
+                },
+                Test {
+                    name: "Bad counterparty versions, empty versions vec".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        counterparty_versions: Vec::new(),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: false,
+                },
+                Test {
+                    name: "Bad counterparty versions, empty version string".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        counterparty_versions: Vec::new(),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: false,
+                },
+                Test {
+                    name: "Bad proof height, height is 0".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        proof_height: Some(RawHeight { revision_number: 1, revision_height: 0 }),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: false,
+                },
+                Test {
+                    name: "Bad consensus height, height is 0".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        proof_height: Some(RawHeight { revision_number: 1, revision_height: 0 }),
+                        ..default_try_msg.clone()
+                    },
+                    want_pass: false,
+                },
+                Test {
+                    name: "Empty proof".to_string(),
+                    raw: RawMsgConnectionOpenTry {
+                        proof_init: b"".to_vec(),
+                        ..default_try_msg
+                    },
+                    want_pass: false,
+                }
+            ]
+            .into_iter()
+            .collect();
+
+        for test in tests {
+            let msg = MsgConnectionOpenTry::try_from(test.raw.clone());
+
+            assert_eq!(
+                test.want_pass,
+                msg.is_ok(),
+                "MsgConnOpenTry::new failed for test {}, \nmsg {:?} with error {:?}",
+                test.name,
+                test.raw,
+                msg.err(),
+            );
+        }
+    }
+
+    #[test]
+    fn to_and_from() {
+        let raw = dummy_raw_msg_conn_open_try(10, 34);
+        let msg = MsgConnectionOpenTry::try_from(raw.clone()).unwrap();
+        let raw_back = RawMsgConnectionOpenTry::from(msg.clone());
+        let msg_back = MsgConnectionOpenTry::try_from(raw_back.clone()).unwrap();
+        assert_eq!(raw, raw_back);
+        assert_eq!(msg, msg_back);
+    }
+
+    /// Test that borsh serialization/deserialization works well with delay periods up to u64::MAX
+    #[cfg(feature = "borsh")]
+    #[test]
+    fn test_borsh() {
+        let mut raw = dummy_raw_msg_conn_open_try(10, 34);
+        raw.delay_period = u64::MAX;
+        let msg = MsgConnectionOpenTry::try_from(raw.clone()).unwrap();
+
+        let serialized = borsh::to_vec(&msg).unwrap();
+
+        let msg_deserialized =
+            <MsgConnectionOpenTry as borsh::BorshDeserialize>::try_from_slice(&serialized).unwrap();
+
+        assert_eq!(msg, msg_deserialized);
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/connection/mod.rs b/ibc-testkit/src/fixtures/core/connection/mod.rs
new file mode 100644
index 000000000..3460a3f10
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/connection/mod.rs
@@ -0,0 +1,52 @@
+mod conn_open_ack;
+mod conn_open_confirm;
+mod conn_open_init;
+mod conn_open_try;
+
+use ibc::core::commitment_types::proto::v1::MerklePrefix;
+use ibc::core::connection::types::proto::v1::Counterparty as RawCounterparty;
+use ibc::core::host::types::identifiers::ConnectionId;
+use ibc::core::primitives::prelude::*;
+use typed_builder::TypedBuilder;
+
+pub use self::conn_open_ack::*;
+pub use self::conn_open_confirm::*;
+pub use self::conn_open_init::*;
+pub use self::conn_open_try::*;
+
+#[derive(TypedBuilder, Debug)]
+#[builder(build_method(into = RawCounterparty))]
+pub struct CounterpartyConfig {
+    #[builder(default = "07-tendermint-0")]
+    client_id: &'static str,
+    #[builder(default = "connection-0")]
+    connection_id: &'static str,
+    #[builder(default = Some(MerklePrefix {
+        key_prefix: b"ibc".to_vec()
+    }))]
+    prefix: Option<MerklePrefix>,
+}
+
+impl From<CounterpartyConfig> for RawCounterparty {
+    fn from(config: CounterpartyConfig) -> Self {
+        Self {
+            client_id: config.client_id.to_string(),
+            connection_id: config.connection_id.to_string(),
+            prefix: config.prefix,
+        }
+    }
+}
+
+pub fn dummy_raw_counterparty_conn(conn_id: Option<u64>) -> RawCounterparty {
+    let connection_id = match conn_id {
+        Some(id) => ConnectionId::new(id).to_string(),
+        None => "".to_string(),
+    };
+    RawCounterparty {
+        client_id: "07-tendermint-0".into(),
+        connection_id,
+        prefix: Some(MerklePrefix {
+            key_prefix: b"ibc".to_vec(),
+        }),
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/context.rs b/ibc-testkit/src/fixtures/core/context.rs
new file mode 100644
index 000000000..99304f0e0
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/context.rs
@@ -0,0 +1,100 @@
+use alloc::fmt::Debug;
+use core::time::Duration;
+
+use basecoin_store::context::ProvableStore;
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::types::Height;
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Timestamp;
+use typed_builder::TypedBuilder;
+
+use crate::context::StoreGenericTestContext;
+use crate::hosts::{HostClientState, TestBlock, TestHost};
+use crate::testapp::ibc::core::router::MockRouter;
+use crate::testapp::ibc::core::types::{MockIbcStore, DEFAULT_BLOCK_TIME_SECS};
+use crate::utils::year_2023;
+
+/// Configuration of the [`StoreGenericTestContext`] type for generating dummy contexts.
+#[derive(Debug, TypedBuilder)]
+#[builder(build_method(into))]
+pub struct TestContextConfig<H>
+where
+    H: TestHost,
+{
+    #[builder(default)]
+    host: H,
+
+    #[builder(default = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS))]
+    block_time: Duration,
+
+    #[builder(default = year_2023())]
+    latest_timestamp: Timestamp,
+
+    #[builder(default)]
+    block_params_history: Vec<H::BlockParams>,
+
+    #[builder(default = Height::new(0, 5).expect("Never fails"))]
+    latest_height: Height,
+}
+
+impl<S, H> From<TestContextConfig<H>> for StoreGenericTestContext<S, H>
+where
+    S: ProvableStore + Debug + Default,
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<MockIbcStore<S>>,
+{
+    fn from(params: TestContextConfig<H>) -> Self {
+        assert_ne!(
+            params.latest_height.revision_height(),
+            0,
+            "The chain must have a non-zero revision_height"
+        );
+
+        // timestamp at height 1
+        let genesis_timestamp = (params.latest_timestamp
+            - (params.block_time
+                * u32::try_from(params.latest_height.revision_height() - 1).expect("no overflow")))
+        .expect("no underflow");
+
+        let mut context = Self {
+            multi_store: Default::default(),
+            host: params.host,
+            ibc_store: MockIbcStore::new(
+                params.latest_height.revision_number(),
+                Default::default(),
+            ),
+            ibc_router: MockRouter::new_with_transfer(),
+        };
+
+        // store is at height 0; no block
+
+        context.advance_genesis_height(genesis_timestamp, &Default::default());
+
+        // store is at height 1; one block
+
+        context = context.advance_block_up_to_height(
+            params
+                .latest_height
+                .sub(params.block_params_history.len() as u64)
+                .expect("no error"),
+        );
+
+        for block_params in params.block_params_history {
+            context.advance_block_height_with_params(params.block_time, &block_params);
+        }
+
+        assert_eq!(
+            context.host.latest_block().height(),
+            params.latest_height,
+            "The latest height in the host must match the latest height in the context"
+        );
+
+        assert_eq!(
+            context.host.latest_block().timestamp(),
+            params.latest_timestamp,
+            "The latest timestamp in the host must match the latest timestamp in the context"
+        );
+
+        context
+    }
+}
diff --git a/ibc-testkit/src/fixtures/core/mod.rs b/ibc-testkit/src/fixtures/core/mod.rs
new file mode 100644
index 000000000..1fe85ed5d
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/mod.rs
@@ -0,0 +1,6 @@
+pub mod channel;
+pub mod client;
+pub mod commitment;
+pub mod connection;
+pub mod context;
+pub mod signer;
diff --git a/ibc-testkit/src/fixtures/core/signer.rs b/ibc-testkit/src/fixtures/core/signer.rs
new file mode 100644
index 000000000..6adb8727e
--- /dev/null
+++ b/ibc-testkit/src/fixtures/core/signer.rs
@@ -0,0 +1,12 @@
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Signer;
+
+pub fn dummy_account_id() -> Signer {
+    "0CDA3F47EF3C4906693B170EF650EB968C5F4B2C"
+        .to_string()
+        .into()
+}
+
+pub fn dummy_bech32_account() -> String {
+    "cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng".to_string()
+}
diff --git a/ibc-testkit/src/fixtures/mod.rs b/ibc-testkit/src/fixtures/mod.rs
new file mode 100644
index 000000000..f6b51ef46
--- /dev/null
+++ b/ibc-testkit/src/fixtures/mod.rs
@@ -0,0 +1,37 @@
+pub mod applications;
+pub mod clients;
+pub mod core;
+use alloc::fmt::Debug;
+
+use ibc::core::handler::types::error::ContextError;
+use ibc::core::primitives::prelude::*;
+
+use crate::testapp::ibc::core::types::DefaultIbcStore;
+pub enum Expect {
+    Success,
+    Failure(Option<ContextError>),
+}
+
+#[derive(Debug)]
+pub struct Fixture<M: Debug> {
+    pub ctx: DefaultIbcStore,
+    pub msg: M,
+}
+
+impl<M: Debug> Fixture<M> {
+    pub fn generate_error_msg(
+        &self,
+        expect: &Expect,
+        process: &str,
+        res: &Result<(), ContextError>,
+    ) -> String {
+        let base_error = match expect {
+            Expect::Success => "step failed!",
+            Expect::Failure(_) => "step passed but was supposed to fail!",
+        };
+        format!(
+            "{process} {base_error} /n {res:?} /n {:?} /n {:?}",
+            &self.msg, &self.ctx
+        )
+    }
+}
diff --git a/ibc-testkit/src/hosts/mock.rs b/ibc-testkit/src/hosts/mock.rs
new file mode 100644
index 000000000..266f69f53
--- /dev/null
+++ b/ibc-testkit/src/hosts/mock.rs
@@ -0,0 +1,97 @@
+use alloc::vec::Vec;
+
+use ibc::core::client::types::Height;
+use ibc::core::host::types::identifiers::ChainId;
+use ibc::core::primitives::Timestamp;
+use typed_builder::TypedBuilder;
+
+use super::{TestBlock, TestHeader, TestHost};
+use crate::testapp::ibc::clients::mock::client_state::MockClientState;
+use crate::testapp::ibc::clients::mock::consensus_state::MockConsensusState;
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+
+#[derive(TypedBuilder, Debug)]
+pub struct MockHost {
+    /// Unique identifier for the chain.
+    #[builder(default = ChainId::new("mock-0").expect("Never fails"))]
+    pub chain_id: ChainId,
+    /// The chain of blocks underlying this context.
+    #[builder(default)]
+    pub history: Vec<MockHeader>,
+}
+
+impl Default for MockHost {
+    fn default() -> Self {
+        Self::builder().build()
+    }
+}
+
+impl TestHost for MockHost {
+    type Block = MockHeader;
+    type ClientState = MockClientState;
+    type BlockParams = ();
+    type LightClientParams = ();
+
+    fn history(&self) -> &Vec<Self::Block> {
+        &self.history
+    }
+
+    fn push_block(&mut self, block: Self::Block) {
+        self.history.push(block);
+    }
+
+    fn generate_block(
+        &self,
+        _commitment_root: Vec<u8>,
+        height: u64,
+        timestamp: Timestamp,
+        _params: &Self::BlockParams,
+    ) -> Self::Block {
+        MockHeader {
+            height: Height::new(self.chain_id.revision_number(), height).expect("Never fails"),
+            timestamp,
+        }
+    }
+
+    fn generate_client_state(
+        &self,
+        latest_height: &Height,
+        _params: &Self::LightClientParams,
+    ) -> Self::ClientState {
+        MockClientState::new(self.get_block(latest_height).expect("height exists"))
+    }
+}
+
+impl TestBlock for MockHeader {
+    type Header = Self;
+
+    fn height(&self) -> Height {
+        self.height
+    }
+
+    fn timestamp(&self) -> Timestamp {
+        self.timestamp
+    }
+
+    fn into_header_with_trusted(self, _trusted_block: &Self) -> Self::Header {
+        self
+    }
+}
+
+impl From<MockHeader> for MockConsensusState {
+    fn from(block: MockHeader) -> Self {
+        Self::new(block)
+    }
+}
+
+impl TestHeader for MockHeader {
+    type ConsensusState = MockConsensusState;
+
+    fn height(&self) -> Height {
+        self.height
+    }
+
+    fn timestamp(&self) -> Timestamp {
+        self.timestamp
+    }
+}
diff --git a/ibc-testkit/src/hosts/mod.rs b/ibc-testkit/src/hosts/mod.rs
new file mode 100644
index 000000000..86b17cc54
--- /dev/null
+++ b/ibc-testkit/src/hosts/mod.rs
@@ -0,0 +1,157 @@
+pub mod mock;
+pub mod tendermint;
+
+use core::fmt::Debug;
+use core::ops::Add;
+use core::time::Duration;
+
+use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::types::Height;
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Timestamp;
+use ibc::primitives::proto::Any;
+
+pub use self::mock::MockHost;
+pub use self::tendermint::TendermintHost;
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+
+pub type HostClientState<H> = <H as TestHost>::ClientState;
+pub type HostBlock<H> = <H as TestHost>::Block;
+pub type HostBlockParams<H> = <H as TestHost>::BlockParams;
+pub type HostLightClientParams<H> = <H as TestHost>::LightClientParams;
+pub type HostHeader<H> = <HostBlock<H> as TestBlock>::Header;
+pub type HostConsensusState<H> = <HostHeader<H> as TestHeader>::ConsensusState;
+
+/// TestHost is a trait that defines the interface for a host blockchain.
+pub trait TestHost: Default + Debug + Sized {
+    /// The type of block produced by the host.
+    type Block: TestBlock;
+
+    /// The type of client state produced by the host.
+    type ClientState: Into<AnyClientState> + Debug;
+
+    /// The type of block parameter to produce a block.
+    type BlockParams: Debug + Default;
+
+    /// The type of light client parameters to produce a light client state.
+    type LightClientParams: Debug + Default;
+
+    /// The history of blocks produced by the host chain.
+    fn history(&self) -> &Vec<Self::Block>;
+
+    /// Returns true if the host chain has no blocks.
+    fn is_empty(&self) -> bool {
+        self.history().is_empty()
+    }
+
+    /// The latest height of the host chain.
+    fn latest_height(&self) -> Height {
+        self.latest_block().height()
+    }
+
+    /// The latest block of the host chain.
+    fn latest_block(&self) -> Self::Block {
+        self.history().last().cloned().expect("no error")
+    }
+
+    /// Get the block at the given height.
+    fn get_block(&self, target_height: &Height) -> Option<Self::Block> {
+        self.history()
+            .get(target_height.revision_height() as usize - 1)
+            .cloned() // indexed from 1
+    }
+
+    /// Add a block to the host chain.
+    fn push_block(&mut self, block: Self::Block);
+
+    /// Commit a block with commitment root to the blockchain, by extending the history of blocks.
+    fn commit_block(
+        &mut self,
+        commitment_root: Vec<u8>,
+        block_time: Duration,
+        params: &Self::BlockParams,
+    ) {
+        let latest_block = self.latest_block();
+
+        let height = TestBlock::height(&latest_block)
+            .increment()
+            .revision_height();
+        let timestamp = TestBlock::timestamp(&latest_block)
+            .add(block_time)
+            .expect("Never fails");
+
+        let new_block = self.generate_block(commitment_root, height, timestamp, params);
+
+        // History is not full yet.
+        self.push_block(new_block);
+    }
+
+    /// Generate a block at the given height and timestamp, using the provided parameters.
+    fn generate_block(
+        &self,
+        commitment_root: Vec<u8>,
+        height: u64,
+        timestamp: Timestamp,
+        params: &Self::BlockParams,
+    ) -> Self::Block;
+
+    /// Generate a client state using the block at the given height and the provided parameters.
+    fn generate_client_state(
+        &self,
+        latest_height: &Height,
+        params: &Self::LightClientParams,
+    ) -> Self::ClientState;
+
+    fn validate(&self) -> Result<(), String> {
+        // Check that headers in the history are in sequential order.
+        let latest_height = self.latest_height();
+        let mut current_height = Height::min(latest_height.revision_number());
+
+        while current_height <= latest_height {
+            if current_height != self.get_block(&current_height).expect("no error").height() {
+                return Err("block height does not match".to_owned());
+            }
+            current_height = current_height.increment();
+        }
+        Ok(())
+    }
+}
+
+/// TestBlock is a trait that defines the interface for a block produced by a host blockchain.
+pub trait TestBlock: Clone + Debug {
+    /// The type of header can be extracted from the block.
+    type Header: TestHeader;
+
+    /// The height of the block.
+    fn height(&self) -> Height;
+
+    /// The timestamp of the block.
+    fn timestamp(&self) -> Timestamp;
+
+    /// Extract the IBC header using the target and trusted blocks.
+    fn into_header_with_trusted(self, trusted_block: &Self) -> Self::Header;
+
+    /// Extract the IBC header only using the target block (sets the trusted
+    /// block to itself).
+    fn into_header(self) -> Self::Header {
+        self.clone().into_header_with_trusted(&self)
+    }
+}
+
+/// TestHeader is a trait that defines the interface for a header
+/// submitted by relayer from the host blockchain.
+pub trait TestHeader: Clone + Debug + Into<Any> {
+    /// The type of consensus state can be extracted from the header.
+    type ConsensusState: ConsensusState + Into<AnyConsensusState> + From<Self> + Clone + Debug;
+
+    /// The height of the block, as recorded in the header.
+    fn height(&self) -> Height;
+
+    /// The timestamp of the block, as recorded in the header.
+    fn timestamp(&self) -> Timestamp;
+
+    /// Extract the consensus state from the header.
+    fn into_consensus_state(self) -> Self::ConsensusState {
+        Self::ConsensusState::from(self)
+    }
+}
diff --git a/ibc-testkit/src/hosts/tendermint.rs b/ibc-testkit/src/hosts/tendermint.rs
new file mode 100644
index 000000000..a3b8af534
--- /dev/null
+++ b/ibc-testkit/src/hosts/tendermint.rs
@@ -0,0 +1,240 @@
+use core::str::FromStr;
+
+use ibc::clients::tendermint::client_state::ClientState;
+use ibc::clients::tendermint::consensus_state::ConsensusState;
+use ibc::clients::tendermint::types::proto::v1::Header as RawHeader;
+use ibc::clients::tendermint::types::{Header, TENDERMINT_HEADER_TYPE_URL};
+use ibc::core::client::types::Height;
+use ibc::core::host::types::identifiers::ChainId;
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Timestamp;
+use ibc::primitives::proto::Any;
+use ibc::primitives::ToVec;
+use tendermint::block::Header as TmHeader;
+use tendermint::validator::Set as ValidatorSet;
+use tendermint_testgen::light_block::TmLightBlock;
+use tendermint_testgen::{
+    Generator, Header as TestgenHeader, LightBlock as TestgenLightBlock,
+    Validator as TestgenValidator,
+};
+use typed_builder::TypedBuilder;
+
+use crate::fixtures::clients::tendermint::ClientStateConfig;
+use crate::hosts::{TestBlock, TestHeader, TestHost};
+
+/// A host that produces Tendermint blocks and interfaces with Tendermint light clients.
+#[derive(TypedBuilder, Debug)]
+pub struct TendermintHost {
+    /// Unique identifier for the chain.
+    #[builder(default = ChainId::new("mock-0").expect("Never fails"))]
+    pub chain_id: ChainId,
+    /// The chain of blocks underlying this context.
+    #[builder(default)]
+    pub history: Vec<TmLightBlock>,
+}
+
+impl Default for TendermintHost {
+    fn default() -> Self {
+        Self::builder().build()
+    }
+}
+
+impl TestHost for TendermintHost {
+    type Block = TmLightBlock;
+    type BlockParams = BlockParams;
+    type LightClientParams = ClientStateConfig;
+    type ClientState = ClientState;
+
+    fn history(&self) -> &Vec<Self::Block> {
+        &self.history
+    }
+
+    fn push_block(&mut self, block: Self::Block) {
+        self.history.push(block);
+    }
+
+    fn generate_block(
+        &self,
+        commitment_root: Vec<u8>,
+        height: u64,
+        timestamp: Timestamp,
+        params: &Self::BlockParams,
+    ) -> Self::Block {
+        TestgenLightBlock::new_default_with_header(
+            TestgenHeader::new(&params.validators)
+                .app_hash(commitment_root.try_into().expect("infallible"))
+                .height(height)
+                .chain_id(self.chain_id.as_str())
+                .next_validators(&params.next_validators)
+                .time(timestamp.into_tm_time().expect("Never fails")),
+        )
+        .validators(&params.validators)
+        .next_validators(&params.next_validators)
+        .generate()
+        .expect("Never fails")
+    }
+
+    fn generate_client_state(
+        &self,
+        latest_height: &Height,
+        params: &Self::LightClientParams,
+    ) -> Self::ClientState {
+        let client_state = ClientStateConfig::builder()
+            .trusting_period(params.trusting_period)
+            .max_clock_drift(params.max_clock_drift)
+            .unbonding_period(params.unbonding_period)
+            .proof_specs(params.proof_specs.clone())
+            .build()
+            .into_client_state(
+                self.chain_id.clone(),
+                self.get_block(latest_height)
+                    .expect("block exists")
+                    .height(),
+            )
+            .expect("never fails");
+
+        client_state.inner().validate().expect("never fails");
+
+        client_state
+    }
+}
+
+impl TestBlock for TmLightBlock {
+    type Header = TendermintHeader;
+
+    fn height(&self) -> Height {
+        Height::new(
+            ChainId::from_str(self.signed_header.header.chain_id.as_str())
+                .expect("Never fails")
+                .revision_number(),
+            self.signed_header.header.height.value(),
+        )
+        .expect("Never fails")
+    }
+
+    fn timestamp(&self) -> Timestamp {
+        self.signed_header.header.time.into()
+    }
+
+    fn into_header_with_trusted(self, trusted_block: &Self) -> Self::Header {
+        let mut header = TendermintHeader::from(self.clone());
+        header.set_trusted_height(trusted_block.height());
+        header.set_trusted_next_validators_set(trusted_block.validators.clone());
+        header
+    }
+}
+
+#[derive(Debug, TypedBuilder)]
+pub struct BlockParams {
+    pub validators: Vec<TestgenValidator>,
+    pub next_validators: Vec<TestgenValidator>,
+}
+
+impl BlockParams {
+    pub fn from_validator_history(validator_history: Vec<Vec<TestgenValidator>>) -> Vec<Self> {
+        validator_history
+            .windows(2)
+            .map(|vals| {
+                Self::builder()
+                    .validators(vals[0].clone())
+                    .next_validators(vals[1].clone())
+                    .build()
+            })
+            .collect()
+    }
+}
+
+impl Default for BlockParams {
+    fn default() -> Self {
+        Self::builder()
+            .validators(vec![
+                TestgenValidator::new("1").voting_power(50),
+                TestgenValidator::new("2").voting_power(50),
+            ])
+            .next_validators(vec![
+                TestgenValidator::new("1").voting_power(50),
+                TestgenValidator::new("2").voting_power(50),
+            ])
+            .build()
+    }
+}
+
+/// This wrapper type is needed to implement
+/// [`From`] traits [`Header`] to foreign types.
+#[derive(Debug, Clone)]
+pub struct TendermintHeader(Header);
+
+impl TendermintHeader {
+    pub fn set_trusted_height(&mut self, trusted_height: Height) {
+        self.0.trusted_height = trusted_height
+    }
+
+    pub fn set_trusted_next_validators_set(&mut self, trusted_next_validator_set: ValidatorSet) {
+        self.0.trusted_next_validator_set = trusted_next_validator_set
+    }
+
+    pub fn header(&self) -> &TmHeader {
+        &self.0.signed_header.header
+    }
+}
+
+impl TestHeader for TendermintHeader {
+    type ConsensusState = ConsensusState;
+
+    fn height(&self) -> Height {
+        Height::new(
+            ChainId::from_str(self.0.signed_header.header.chain_id.as_str())
+                .expect("Never fails")
+                .revision_number(),
+            self.0.signed_header.header.height.value(),
+        )
+        .expect("Never fails")
+    }
+
+    fn timestamp(&self) -> Timestamp {
+        self.0.signed_header.header.time.into()
+    }
+}
+
+impl From<TendermintHeader> for Header {
+    fn from(header: TendermintHeader) -> Self {
+        header.0
+    }
+}
+
+impl From<TendermintHeader> for ConsensusState {
+    fn from(header: TendermintHeader) -> Self {
+        header.0.signed_header.header.into()
+    }
+}
+
+impl From<TmLightBlock> for TendermintHeader {
+    fn from(block: TmLightBlock) -> Self {
+        let trusted_height = block.height();
+
+        let TmLightBlock {
+            signed_header,
+            validators: validator_set,
+            ..
+        } = block;
+
+        let trusted_next_validator_set = validator_set.clone();
+
+        // by default trust the current height and validators
+        Self(Header {
+            signed_header,
+            validator_set,
+            trusted_height,
+            trusted_next_validator_set,
+        })
+    }
+}
+
+impl From<TendermintHeader> for Any {
+    fn from(value: TendermintHeader) -> Self {
+        Self {
+            type_url: TENDERMINT_HEADER_TYPE_URL.to_string(),
+            value: RawHeader::from(value.0).to_vec(),
+        }
+    }
+}
diff --git a/ibc-testkit/src/lib.rs b/ibc-testkit/src/lib.rs
new file mode 100644
index 000000000..f4326ba1d
--- /dev/null
+++ b/ibc-testkit/src/lib.rs
@@ -0,0 +1,23 @@
+#![no_std]
+#![forbid(unsafe_code)]
+#![cfg_attr(not(test), deny(clippy::unwrap_used))]
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+
+extern crate alloc;
+
+#[cfg(feature = "std")]
+extern crate std;
+
+pub mod context;
+pub mod fixtures;
+pub mod hosts;
+pub mod relayer;
+pub mod testapp;
+pub mod utils;
diff --git a/ibc-testkit/src/relayer/context.rs b/ibc-testkit/src/relayer/context.rs
new file mode 100644
index 000000000..9ea3bd196
--- /dev/null
+++ b/ibc-testkit/src/relayer/context.rs
@@ -0,0 +1,544 @@
+use ibc::core::channel::types::packet::Packet;
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId};
+use ibc::core::host::types::path::ChannelEndPath;
+use ibc::core::host::ValidationContext;
+use ibc::primitives::Signer;
+
+use crate::context::TestContext;
+use crate::hosts::{HostClientState, TestHost};
+use crate::relayer::utils::TypedRelayerOps;
+use crate::testapp::ibc::core::types::DefaultIbcStore;
+
+/// A relayer context that allows interaction between two [`TestContext`] instances.
+pub struct RelayerContext<A, B>
+where
+    A: TestHost,
+    B: TestHost,
+    HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
+    HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
+{
+    ctx_a: TestContext<A>,
+    ctx_b: TestContext<B>,
+}
+
+impl<A, B> RelayerContext<A, B>
+where
+    A: TestHost,
+    B: TestHost,
+    HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
+    HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
+{
+    /// Creates a new relayer context with the given [`TestContext`] instances.
+    pub fn new(ctx_a: TestContext<A>, ctx_b: TestContext<B>) -> Self {
+        Self { ctx_a, ctx_b }
+    }
+
+    /// Returns an immutable reference to the first context.
+    pub fn get_ctx_a(&self) -> &TestContext<A> {
+        &self.ctx_a
+    }
+
+    /// Returns an immutable reference to the second context.
+    pub fn get_ctx_b(&self) -> &TestContext<B> {
+        &self.ctx_b
+    }
+
+    /// Returns a mutable reference to the first context.
+    pub fn get_ctx_a_mut(&mut self) -> &mut TestContext<A> {
+        &mut self.ctx_a
+    }
+
+    /// Returns a mutable reference to the second context.
+    pub fn get_ctx_b_mut(&mut self) -> &mut TestContext<B> {
+        &mut self.ctx_b
+    }
+
+    /// Creates a light client of second context on the first context.
+    /// Returns the client identifier of the created client.
+    pub fn create_client_on_a(&mut self, signer: Signer) -> ClientId {
+        TypedRelayerOps::<A, B>::create_client_on_a(&mut self.ctx_a, &self.ctx_b, signer)
+    }
+
+    /// Creates a light client of first context on the second context.
+    /// Returns the client identifier of the created client.
+    pub fn create_client_on_b(&mut self, signer: Signer) -> ClientId {
+        TypedRelayerOps::<B, A>::create_client_on_a(&mut self.ctx_b, &self.ctx_a, signer)
+    }
+
+    /// Updates the client on the first context with the latest header of the second context.
+    pub fn update_client_on_a_with_sync(&mut self, client_id_on_a: ClientId, signer: Signer) {
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            client_id_on_a,
+            signer,
+        )
+    }
+
+    /// Updates the client on the second context with the latest header of the first context.
+    pub fn update_client_on_b_with_sync(&mut self, client_id_on_b: ClientId, signer: Signer) {
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            &mut self.ctx_b,
+            &mut self.ctx_a,
+            client_id_on_b,
+            signer,
+        )
+    }
+
+    /// Creates a connection between the two contexts starting from the first context.
+    /// Returns the connection identifiers of the created connection ends.
+    pub fn create_connection_on_a(
+        &mut self,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) -> (ConnectionId, ConnectionId) {
+        TypedRelayerOps::<A, B>::create_connection_on_a(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            client_id_on_a,
+            client_id_on_b,
+            signer,
+        )
+    }
+
+    /// Creates a connection between the two contexts starting from the second context.
+    /// Returns the connection identifiers of the created connection ends.
+    pub fn create_connection_on_b(
+        &mut self,
+        client_id_on_b: ClientId,
+        client_id_on_a: ClientId,
+        signer: Signer,
+    ) -> (ConnectionId, ConnectionId) {
+        TypedRelayerOps::<B, A>::create_connection_on_a(
+            &mut self.ctx_b,
+            &mut self.ctx_a,
+            client_id_on_b,
+            client_id_on_a,
+            signer,
+        )
+    }
+
+    /// Creates a channel between the two contexts starting from the first context.
+    /// Returns the channel identifiers of the created channel ends.
+    pub fn create_channel_on_a(
+        &mut self,
+        conn_id_on_a: ConnectionId,
+        port_id_on_a: PortId,
+        conn_id_on_b: ConnectionId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) -> (ChannelId, ChannelId) {
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<A, B>::create_channel_on_a(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            client_id_on_a,
+            conn_id_on_a,
+            port_id_on_a,
+            client_id_on_b,
+            conn_id_on_b,
+            port_id_on_b,
+            signer,
+        )
+    }
+
+    /// Creates a channel between the two contexts starting from the second context.
+    /// Returns the channel identifiers of the created channel ends.
+    pub fn create_channel_on_b(
+        &mut self,
+        conn_id_on_b: ConnectionId,
+        port_id_on_b: PortId,
+        conn_id_on_a: ConnectionId,
+        port_id_on_a: PortId,
+        signer: Signer,
+    ) -> (ChannelId, ChannelId) {
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<B, A>::create_channel_on_a(
+            &mut self.ctx_b,
+            &mut self.ctx_a,
+            client_id_on_b,
+            conn_id_on_b,
+            port_id_on_b,
+            client_id_on_a,
+            conn_id_on_a,
+            port_id_on_a,
+            signer,
+        )
+    }
+
+    /// Closes a channel between the two contexts starting from the first context.
+    pub fn close_channel_on_a(
+        &mut self,
+        chan_id_on_a: ChannelId,
+        port_id_on_a: PortId,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) {
+        let conn_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(&port_id_on_a, &chan_id_on_a))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let conn_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(&port_id_on_b, &chan_id_on_b))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<A, B>::close_channel_on_a(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            client_id_on_a,
+            chan_id_on_a,
+            port_id_on_a,
+            client_id_on_b,
+            chan_id_on_b,
+            port_id_on_b,
+            signer,
+        )
+    }
+
+    /// Closes a channel between the two contexts starting from the second context.
+    pub fn close_channel_on_b(
+        &mut self,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        chan_id_on_a: ChannelId,
+        port_id_on_a: PortId,
+        signer: Signer,
+    ) {
+        let conn_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(&port_id_on_b, &chan_id_on_b))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let conn_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(&port_id_on_a, &chan_id_on_a))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<B, A>::close_channel_on_a(
+            &mut self.ctx_b,
+            &mut self.ctx_a,
+            client_id_on_b,
+            chan_id_on_b,
+            port_id_on_b,
+            client_id_on_a,
+            chan_id_on_a,
+            port_id_on_a,
+            signer,
+        )
+    }
+
+    /// Sends a packet from the first context to the second context by
+    /// submitting on receive packet on the second context.
+    ///
+    /// The IBC packet is created by an IBC application on the first context.
+    pub fn submit_packet_on_b(&mut self, packet: Packet, signer: Signer) {
+        let conn_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(
+                &packet.port_id_on_a,
+                &packet.chan_id_on_a,
+            ))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let conn_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(
+                &packet.port_id_on_b,
+                &packet.chan_id_on_b,
+            ))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<A, B>::submit_packet_on_b(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            packet,
+            client_id_on_a,
+            client_id_on_b,
+            signer,
+        )
+    }
+
+    /// Times out a packet from the first context to the second context by waiting
+    /// for the timeout period and then sending a timeout packet to the first context.
+    ///
+    /// The IBC packet is created by an IBC application on the first context.
+    pub fn timeout_packet_from_a(&mut self, packet: Packet, signer: Signer) {
+        let conn_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(
+                &packet.port_id_on_a,
+                &packet.chan_id_on_a,
+            ))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let conn_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(
+                &packet.port_id_on_b,
+                &packet.chan_id_on_b,
+            ))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<A, B>::timeout_packet_from_a(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            packet,
+            client_id_on_a,
+            client_id_on_b,
+            signer,
+        )
+    }
+
+    /// Timeouts a packet from the first context to the second context by closing the
+    /// corresponding channel is closed and then sending a timeout packet to the first context.
+    ///
+    /// The IBC packet is created by an IBC application on the first context.
+    pub fn timeout_packet_from_a_on_channel_close(&mut self, packet: Packet, signer: Signer) {
+        let conn_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(
+                &packet.port_id_on_a,
+                &packet.chan_id_on_a,
+            ))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let conn_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .channel_end(&ChannelEndPath::new(
+                &packet.port_id_on_b,
+                &packet.chan_id_on_b,
+            ))
+            .expect("connection exists")
+            .connection_hops()[0]
+            .clone();
+
+        let client_id_on_a = self
+            .ctx_a
+            .ibc_store()
+            .connection_end(&conn_id_on_a)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        let client_id_on_b = self
+            .ctx_b
+            .ibc_store()
+            .connection_end(&conn_id_on_b)
+            .expect("connection exists")
+            .client_id()
+            .clone();
+
+        TypedRelayerOps::<A, B>::timeout_packet_from_a_on_channel_close(
+            &mut self.ctx_a,
+            &mut self.ctx_b,
+            packet,
+            client_id_on_a,
+            client_id_on_b,
+            signer,
+        )
+    }
+
+    /// Submit a
+    /// [`DummyTransferModule`](crate::testapp::ibc::applications::transfer::types::DummyTransferModule)
+    /// packet on the first context.
+    ///
+    /// Requires `serde` feature because of [`ibc::apps::transfer::handler::send_transfer`].
+    #[cfg(feature = "serde")]
+    pub fn send_dummy_transfer_packet_on_a(
+        &mut self,
+        chan_id_on_a: ChannelId,
+        signer: Signer,
+    ) -> Packet {
+        use ibc::apps::transfer::handler::send_transfer;
+        use ibc::apps::transfer::types::msgs::transfer::MsgTransfer;
+        use ibc::apps::transfer::types::packet::PacketData;
+        use ibc::core::handler::types::events::IbcEvent;
+        use ibc::primitives::Timestamp;
+
+        use crate::testapp::ibc::applications::transfer::types::DummyTransferModule;
+
+        // generate packet for DummyTransferModule
+        let packet_data = PacketData {
+            token: "1000uibc".parse().expect("valid prefixed coin"),
+            sender: signer.clone(),
+            receiver: signer.clone(),
+            memo: "sample memo".into(),
+        };
+
+        // packet with ibc metadata
+        // either height timeout or timestamp timeout must be set
+        let msg = MsgTransfer {
+            port_id_on_a: PortId::transfer(),
+            chan_id_on_a: chan_id_on_a.clone(),
+            packet_data,
+            // setting timeout height to 10 blocks from B's current height.
+            timeout_height_on_b: self.get_ctx_b().latest_height().add(10).into(),
+            // not setting timeout timestamp.
+            timeout_timestamp_on_b: Timestamp::none(),
+        };
+
+        // module creates the send_packet
+        send_transfer(
+            self.get_ctx_a_mut().ibc_store_mut(),
+            &mut DummyTransferModule,
+            msg,
+        )
+        .expect("successfully created send_packet");
+
+        // send_packet wasn't committed, hence produce a block
+        self.get_ctx_a_mut().advance_block_height();
+
+        // retrieve the send_packet event
+        let Some(IbcEvent::SendPacket(send_packet_event)) = self
+            .get_ctx_a()
+            .ibc_store()
+            .events
+            .lock()
+            .iter()
+            .rev()
+            .nth(2)
+            .cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        // create the IBC packet type
+        Packet {
+            port_id_on_a: send_packet_event.port_id_on_a().clone(),
+            chan_id_on_a: send_packet_event.chan_id_on_a().clone(),
+            seq_on_a: *send_packet_event.seq_on_a(),
+            data: send_packet_event.packet_data().to_vec(),
+            timeout_height_on_b: *send_packet_event.timeout_height_on_b(),
+            timeout_timestamp_on_b: *send_packet_event.timeout_timestamp_on_b(),
+            port_id_on_b: send_packet_event.port_id_on_b().clone(),
+            chan_id_on_b: send_packet_event.chan_id_on_b().clone(),
+        }
+    }
+}
diff --git a/crates/ibc/src/mock/ics18_relayer/error.rs b/ibc-testkit/src/relayer/error.rs
similarity index 58%
rename from crates/ibc/src/mock/ics18_relayer/error.rs
rename to ibc-testkit/src/relayer/error.rs
index d352ab93d..20a995461 100644
--- a/crates/ibc/src/mock/ics18_relayer/error.rs
+++ b/ibc-testkit/src/relayer/error.rs
@@ -1,28 +1,29 @@
-use crate::core::ics24_host::identifier::ClientId;
-use crate::core::{ics03_connection, RouterError};
-use crate::Height;
 use displaydoc::Display;
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::error::ConnectionError;
+use ibc::core::handler::types::error::ContextError;
+use ibc::core::host::types::identifiers::ClientId;
 
 #[derive(Debug, Display)]
 pub enum RelayerError {
     /// client state on destination chain not found, (client id: `{client_id}`)
     ClientStateNotFound { client_id: ClientId },
-    /// the client on destination chain is already up-to-date (client id: `{client_id}`, source height: `{source_height}`, dest height: `{destination_height}`)
+    /// the client on the destination chain is already up-to-date (client id: `{client_id}`, source height: `{source_height}`, dest height: `{destination_height}`)
     ClientAlreadyUpToDate {
         client_id: ClientId,
         source_height: Height,
         destination_height: Height,
     },
-    /// the client on destination chain is at a higher height (client id: `{client_id}`, source height: `{source_height}`, dest height: `{destination_height}`)
+    /// the client on the destination chain is at a higher height (client id: `{client_id}`, source height: `{source_height}`, dest height: `{destination_height}`)
     ClientAtHigherHeight {
         client_id: ClientId,
         source_height: Height,
         destination_height: Height,
     },
     /// transaction processing by modules failed error: `{0}`
-    TransactionFailed(RouterError),
+    TransactionFailed(ContextError),
     /// connection error: `{0}`
-    Connection(ics03_connection::error::ConnectionError),
+    Connection(ConnectionError),
 }
 
 #[cfg(feature = "std")]
diff --git a/ibc-testkit/src/relayer/integration.rs b/ibc-testkit/src/relayer/integration.rs
new file mode 100644
index 000000000..145ed5004
--- /dev/null
+++ b/ibc-testkit/src/relayer/integration.rs
@@ -0,0 +1,178 @@
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId};
+
+use crate::context::TestContext;
+use crate::fixtures::core::signer::dummy_account_id;
+use crate::hosts::{HostClientState, TestHost};
+use crate::relayer::context::RelayerContext;
+use crate::testapp::ibc::core::types::DefaultIbcStore;
+
+/// Integration test for IBC implementation. This test creates clients,
+/// connections, channels between two [`TestHost`]s.
+///
+/// If `serde` feature is enabled, this also exercises packet relay between [`TestHost`]s. This uses
+/// [`DummyTransferModule`](crate::testapp::ibc::applications::transfer::types::DummyTransferModule)
+/// to simulate the transfer of tokens between two contexts.
+pub fn ibc_integration_test<A, B>()
+where
+    A: TestHost,
+    B: TestHost,
+    HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
+    HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
+{
+    let ctx_a = TestContext::<A>::default();
+    let ctx_b = TestContext::<B>::default();
+
+    let signer = dummy_account_id();
+
+    let mut relayer = RelayerContext::new(ctx_a, ctx_b);
+
+    // client creation
+    let client_id_on_a = relayer.create_client_on_a(signer.clone());
+    let client_id_on_b = relayer.create_client_on_b(signer.clone());
+
+    // connection from A to B
+    let (conn_id_on_a, conn_id_on_b) = relayer.create_connection_on_a(
+        client_id_on_a.clone(),
+        client_id_on_b.clone(),
+        signer.clone(),
+    );
+
+    assert_eq!(conn_id_on_a, ConnectionId::new(0));
+    assert_eq!(conn_id_on_b, ConnectionId::new(0));
+
+    // connection from B to A
+    let (conn_id_on_b, conn_id_on_a) = relayer.create_connection_on_b(
+        client_id_on_b.clone(),
+        client_id_on_a.clone(),
+        signer.clone(),
+    );
+
+    assert_eq!(conn_id_on_a, ConnectionId::new(1));
+    assert_eq!(conn_id_on_b, ConnectionId::new(1));
+
+    // channel from A to B
+    let (chan_id_on_a, chan_id_on_b) = relayer.create_channel_on_a(
+        conn_id_on_a.clone(),
+        PortId::transfer(),
+        conn_id_on_b.clone(),
+        PortId::transfer(),
+        signer.clone(),
+    );
+
+    assert_eq!(chan_id_on_a, ChannelId::new(0));
+    assert_eq!(chan_id_on_b, ChannelId::new(0));
+
+    // close the channel from A to B
+    relayer.close_channel_on_a(
+        chan_id_on_a.clone(),
+        PortId::transfer(),
+        chan_id_on_b.clone(),
+        PortId::transfer(),
+        signer.clone(),
+    );
+
+    // channel from B to A
+    let (chan_id_on_b, chan_id_on_a) = relayer.create_channel_on_b(
+        conn_id_on_b,
+        PortId::transfer(),
+        conn_id_on_a,
+        PortId::transfer(),
+        signer.clone(),
+    );
+
+    assert_eq!(chan_id_on_a, ChannelId::new(1));
+    assert_eq!(chan_id_on_b, ChannelId::new(1));
+
+    #[cfg(feature = "serde")]
+    {
+        use ibc::core::handler::types::events::IbcEvent;
+
+        {
+            // ------------------------
+            // send packet from A to B
+            // ------------------------
+
+            let packet =
+                relayer.send_dummy_transfer_packet_on_a(chan_id_on_a.clone(), signer.clone());
+
+            // continue packet relay; submitting recv_packet at B
+            relayer.submit_packet_on_b(packet, signer.clone());
+
+            // retrieve the ack_packet event
+            let Some(IbcEvent::AcknowledgePacket(_)) = relayer
+                .get_ctx_a()
+                .ibc_store()
+                .events
+                .lock()
+                .last()
+                .cloned()
+            else {
+                panic!("unexpected event")
+            };
+        }
+
+        {
+            // --------------------------
+            // timeout packet from A to B
+            // --------------------------
+
+            let packet =
+                relayer.send_dummy_transfer_packet_on_a(chan_id_on_a.clone(), signer.clone());
+
+            // timeout the packet on B; by never submitting the packet to B
+            relayer.timeout_packet_from_a(packet.clone(), signer.clone());
+
+            // retrieve the timeout_packet event
+            let Some(IbcEvent::TimeoutPacket(_)) = relayer
+                .get_ctx_a()
+                .ibc_store()
+                .events
+                .lock()
+                .last()
+                .cloned()
+            else {
+                panic!("unexpected event")
+            };
+        }
+
+        {
+            // ------------------------------------------------
+            // timeout packet from A to B; using closed channel
+            // ------------------------------------------------
+
+            let packet =
+                relayer.send_dummy_transfer_packet_on_a(chan_id_on_a.clone(), signer.clone());
+
+            // timeout the packet on B; close the corresponding channel
+            relayer.timeout_packet_from_a_on_channel_close(packet.clone(), signer.clone());
+
+            // retrieve the timeout_packet event
+            let Some(IbcEvent::TimeoutPacket(_)) = relayer
+                .get_ctx_a()
+                .ibc_store()
+                .events
+                .lock()
+                .last()
+                .cloned()
+            else {
+                panic!("unexpected event")
+            };
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::hosts::{MockHost, TendermintHost};
+
+    // tests among all the `TestHost` implementations
+    #[test]
+    fn ibc_integration_test_for_all_pairs() {
+        ibc_integration_test::<MockHost, MockHost>();
+        ibc_integration_test::<MockHost, TendermintHost>();
+        ibc_integration_test::<TendermintHost, MockHost>();
+        ibc_integration_test::<TendermintHost, TendermintHost>();
+    }
+}
diff --git a/ibc-testkit/src/relayer/mod.rs b/ibc-testkit/src/relayer/mod.rs
new file mode 100644
index 000000000..961de7885
--- /dev/null
+++ b/ibc-testkit/src/relayer/mod.rs
@@ -0,0 +1,4 @@
+pub mod context;
+pub mod error;
+pub mod integration;
+pub mod utils;
diff --git a/ibc-testkit/src/relayer/utils.rs b/ibc-testkit/src/relayer/utils.rs
new file mode 100644
index 000000000..cd3c5f0a3
--- /dev/null
+++ b/ibc-testkit/src/relayer/utils.rs
@@ -0,0 +1,1086 @@
+use alloc::string::String;
+use core::marker::PhantomData;
+use core::time::Duration;
+
+use ibc::core::channel::types::acknowledgement::Acknowledgement;
+use ibc::core::channel::types::channel::Order;
+use ibc::core::channel::types::msgs::{
+    ChannelMsg, MsgAcknowledgement, MsgChannelCloseConfirm, MsgChannelCloseInit, MsgChannelOpenAck,
+    MsgChannelOpenConfirm, MsgChannelOpenInit, MsgChannelOpenTry, MsgRecvPacket, MsgTimeout,
+    MsgTimeoutOnClose, PacketMsg,
+};
+use ibc::core::channel::types::packet::Packet;
+use ibc::core::channel::types::timeout::TimeoutHeight;
+use ibc::core::channel::types::Version as ChannelVersion;
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::client::types::msgs::{ClientMsg, MsgCreateClient, MsgUpdateClient};
+use ibc::core::connection::types::msgs::{
+    ConnectionMsg, MsgConnectionOpenAck, MsgConnectionOpenConfirm, MsgConnectionOpenInit,
+    MsgConnectionOpenTry,
+};
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::Counterparty as ConnectionCounterParty;
+use ibc::core::handler::types::events::IbcEvent;
+use ibc::core::handler::types::msgs::MsgEnvelope;
+use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId};
+use ibc::core::host::types::path::{
+    AckPath, ChannelEndPath, ClientConsensusStatePath, ClientStatePath, CommitmentPath,
+    ConnectionPath, ReceiptPath,
+};
+use ibc::core::host::ValidationContext;
+use ibc::primitives::Signer;
+use ibc_query::core::context::ProvableContext;
+
+use crate::context::TestContext;
+use crate::hosts::{HostClientState, TestBlock, TestHost};
+use crate::testapp::ibc::core::types::{DefaultIbcStore, LightClientBuilder, LightClientState};
+
+/// Implements IBC relayer functions for a pair of [`TestHost`] implementations: `A` and `B`.
+/// Note that, all the implementations are in one direction: from `A` to `B`.
+/// This ensures that the variable namings are consistent with the IBC message fields,
+/// leading to a less error-prone implementation.
+///
+/// For the functions in the opposite direction, use `TypedRelayerOps::<B, A>` instead of TypedRelayerOps::<A, B>`.
+#[derive(Debug, Default)]
+pub struct TypedRelayerOps<A, B>(PhantomData<A>, PhantomData<B>)
+where
+    A: TestHost,
+    B: TestHost,
+    HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
+    HostClientState<B>: ClientStateValidation<DefaultIbcStore>;
+
+impl<A, B> TypedRelayerOps<A, B>
+where
+    A: TestHost,
+    B: TestHost,
+    HostClientState<A>: ClientStateValidation<DefaultIbcStore>,
+    HostClientState<B>: ClientStateValidation<DefaultIbcStore>,
+{
+    /// Creates a client on `A` with the state of `B`.
+    /// Returns the client identifier on `A`.
+    pub fn create_client_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        signer: Signer,
+    ) -> ClientId {
+        let light_client_of_b = LightClientBuilder::init()
+            .context(ctx_b)
+            .build::<LightClientState<B>>();
+
+        let msg_for_a = MsgEnvelope::Client(ClientMsg::CreateClient(MsgCreateClient {
+            client_state: light_client_of_b.client_state.into(),
+            consensus_state: light_client_of_b
+                .consensus_states
+                .values()
+                .next()
+                .expect("at least one")
+                .clone()
+                .into(),
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::CreateClient(create_client_b_event)) =
+            ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        let client_id_on_a = create_client_b_event.client_id().clone();
+
+        assert_eq!(
+            ValidationContext::get_client_validation_context(ctx_a.ibc_store())
+                .client_state(&client_id_on_a)
+                .expect("client state exists")
+                .latest_height(),
+            ctx_b.latest_height()
+        );
+
+        client_id_on_a
+    }
+
+    /// Advances the block height on `A` until it catches up with the latest timestamp on `B`.
+    pub fn sync_clock_on_a(ctx_a: &mut TestContext<A>, ctx_b: &TestContext<B>) {
+        while ctx_b.latest_timestamp() > ctx_a.latest_timestamp() {
+            ctx_a.advance_block_height();
+        }
+    }
+
+    /// Updates the client on `A` with the latest header from `B`.
+    pub fn update_client_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        client_id_on_a: ClientId,
+        signer: Signer,
+    ) {
+        let trusted_height_of_b = ctx_a
+            .ibc_store()
+            .get_client_validation_context()
+            .client_state(&client_id_on_a)
+            .expect("client state exists")
+            .latest_height();
+
+        let trusted_block_of_b = ctx_b
+            .host
+            .get_block(&trusted_height_of_b)
+            .expect("block exists");
+
+        let target_height_of_b = ctx_b.latest_height();
+
+        let target_block_of_b = ctx_b.host_block(&target_height_of_b).expect("block exists");
+
+        let msg_for_a = MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
+            client_id: client_id_on_a.clone(),
+            client_message: target_block_of_b
+                .into_header_with_trusted(&trusted_block_of_b)
+                .into(),
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::UpdateClient(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// Updates the client on `A` with the latest header from `B` after syncing the timestamps.
+    ///
+    /// Timestamp sync is required, as IBC doesn't allow client updates from the future beyond max clock drift.
+    pub fn update_client_on_a_with_sync(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        client_id_on_a: ClientId,
+        signer: Signer,
+    ) {
+        TypedRelayerOps::<A, B>::sync_clock_on_a(ctx_a, ctx_b);
+        TypedRelayerOps::<A, B>::update_client_on_a(ctx_a, ctx_b, client_id_on_a, signer);
+    }
+
+    /// `A` initiates a connection with the other end on `B`.
+    /// Returns the connection identifier on `A`.
+    pub fn connection_open_init_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) -> ConnectionId {
+        let counterparty_b = ConnectionCounterParty::new(
+            client_id_on_b.clone(),
+            None,
+            ctx_b.ibc_store().commitment_prefix(),
+        );
+
+        let msg_for_a = MsgEnvelope::Connection(ConnectionMsg::OpenInit(MsgConnectionOpenInit {
+            client_id_on_a: client_id_on_a.clone(),
+            counterparty: counterparty_b,
+            version: None,
+            delay_period: Duration::from_secs(0),
+            signer: signer.clone(),
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::OpenInitConnection(open_init_connection_event)) =
+            ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        open_init_connection_event.conn_id_on_a().clone()
+    }
+
+    /// `B` receives the connection opening attempt by `A` after `A` initiates the connection.
+    /// Returns the connection identifier on `B`.
+    pub fn connection_open_try_on_b(
+        ctx_b: &mut TestContext<B>,
+        ctx_a: &TestContext<A>,
+        conn_id_on_a: ConnectionId,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) -> ConnectionId {
+        let proofs_height_on_a = ctx_a.latest_height();
+
+        let client_state_of_b_on_a = ctx_a
+            .ibc_store()
+            .client_state(&client_id_on_a)
+            .expect("client state exists");
+
+        let consensus_height_of_b_on_a = client_state_of_b_on_a.latest_height();
+
+        let counterparty_a = ConnectionCounterParty::new(
+            client_id_on_a.clone(),
+            Some(conn_id_on_a.clone()),
+            ctx_a.ibc_store().commitment_prefix(),
+        );
+
+        let proof_conn_end_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proofs_height_on_a,
+                &ConnectionPath::new(&conn_id_on_a).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let proof_client_state_of_b_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proofs_height_on_a,
+                &ClientStatePath::new(client_id_on_a.clone()).into(),
+            )
+            .expect("client state exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let proof_consensus_state_of_b_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proofs_height_on_a,
+                &ClientConsensusStatePath::new(
+                    client_id_on_a.clone(),
+                    consensus_height_of_b_on_a.revision_number(),
+                    consensus_height_of_b_on_a.revision_height(),
+                )
+                .into(),
+            )
+            .expect("consensus state exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        #[allow(deprecated)]
+        let msg_for_b = MsgEnvelope::Connection(ConnectionMsg::OpenTry(MsgConnectionOpenTry {
+            client_id_on_b: client_id_on_b.clone(),
+            client_state_of_b_on_a: client_state_of_b_on_a.into(),
+            counterparty: counterparty_a,
+            versions_on_a: ConnectionVersion::compatibles(),
+            proof_conn_end_on_a,
+            proof_client_state_of_b_on_a,
+            proof_consensus_state_of_b_on_a,
+            proofs_height_on_a,
+            consensus_height_of_b_on_a,
+            delay_period: Duration::from_secs(0),
+            signer: signer.clone(),
+            proof_consensus_state_of_b: None,
+            // deprecated
+            previous_connection_id: String::new(),
+        }));
+
+        ctx_b.deliver(msg_for_b).expect("success");
+
+        let Some(IbcEvent::OpenTryConnection(open_try_connection_event)) =
+            ctx_b.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        open_try_connection_event.conn_id_on_b().clone()
+    }
+
+    /// `A` receives `B`'s acknowledgement that `B` received the connection opening attempt by `A`.
+    /// `A` starts processing the connection on its side.
+    pub fn connection_open_ack_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        conn_id_on_a: ConnectionId,
+        conn_id_on_b: ConnectionId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) {
+        let proofs_height_on_b = ctx_b.latest_height();
+
+        let client_state_of_a_on_b = ctx_b
+            .ibc_store()
+            .client_state(&client_id_on_b)
+            .expect("client state exists");
+
+        let consensus_height_of_a_on_b = client_state_of_a_on_b.latest_height();
+
+        let proof_conn_end_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proofs_height_on_b,
+                &ConnectionPath::new(&conn_id_on_b).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let proof_client_state_of_a_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proofs_height_on_b,
+                &ClientStatePath::new(client_id_on_b.clone()).into(),
+            )
+            .expect("client state exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let proof_consensus_state_of_a_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proofs_height_on_b,
+                &ClientConsensusStatePath::new(
+                    client_id_on_b.clone(),
+                    consensus_height_of_a_on_b.revision_number(),
+                    consensus_height_of_a_on_b.revision_height(),
+                )
+                .into(),
+            )
+            .expect("consensus state exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_a = MsgEnvelope::Connection(ConnectionMsg::OpenAck(MsgConnectionOpenAck {
+            conn_id_on_a: conn_id_on_a.clone(),
+            conn_id_on_b: conn_id_on_b.clone(),
+            client_state_of_a_on_b: client_state_of_a_on_b.into(),
+            proof_conn_end_on_b,
+            proof_client_state_of_a_on_b,
+            proof_consensus_state_of_a_on_b,
+            proofs_height_on_b,
+            consensus_height_of_a_on_b,
+            version: ConnectionVersion::compatibles()[0].clone(),
+            signer: signer.clone(),
+            proof_consensus_state_of_a: None,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::OpenAckConnection(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// `B` receives the confirmation from `A` that the connection creation was successful.
+    /// `B` also starts processing the connection on its side.
+    pub fn connection_open_confirm_on_b(
+        ctx_b: &mut TestContext<B>,
+        ctx_a: &TestContext<A>,
+        conn_id_on_a: ConnectionId,
+        conn_id_on_b: ConnectionId,
+        signer: Signer,
+    ) {
+        let proof_height_on_a = ctx_a.latest_height();
+
+        let proof_conn_end_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proof_height_on_a,
+                &ConnectionPath::new(&conn_id_on_a).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_b =
+            MsgEnvelope::Connection(ConnectionMsg::OpenConfirm(MsgConnectionOpenConfirm {
+                conn_id_on_b: conn_id_on_b.clone(),
+                proof_conn_end_on_a,
+                proof_height_on_a,
+                signer: signer.clone(),
+            }));
+
+        ctx_b.deliver(msg_for_b).expect("success");
+
+        let Some(IbcEvent::OpenConfirmConnection(_)) = ctx_b.ibc_store().events.lock().last()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// A connection is created by `A` towards `B` using the IBC connection handshake protocol.
+    /// Returns the connection identifiers of `A` and `B`.
+    pub fn create_connection_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) -> (ConnectionId, ConnectionId) {
+        let conn_id_on_a = TypedRelayerOps::<A, B>::connection_open_init_on_a(
+            ctx_a,
+            ctx_b,
+            client_id_on_a.clone(),
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        let conn_id_on_b = TypedRelayerOps::<A, B>::connection_open_try_on_b(
+            ctx_b,
+            ctx_a,
+            conn_id_on_a.clone(),
+            client_id_on_a.clone(),
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(
+            ctx_a,
+            ctx_b,
+            client_id_on_a.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::connection_open_ack_on_a(
+            ctx_a,
+            ctx_b,
+            conn_id_on_a.clone(),
+            conn_id_on_b.clone(),
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::connection_open_confirm_on_b(
+            ctx_b,
+            ctx_a,
+            conn_id_on_b.clone(),
+            conn_id_on_a.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(ctx_a, ctx_b, client_id_on_a, signer);
+
+        (conn_id_on_a, conn_id_on_b)
+    }
+
+    /// `A` initiates a channel with port identifier with the other end on `B`.
+    /// Returns the channel identifier of `A`.
+    pub fn channel_open_init_on_a(
+        ctx_a: &mut TestContext<A>,
+        conn_id_on_a: ConnectionId,
+        port_id_on_a: PortId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) -> ChannelId {
+        let msg_for_a = MsgEnvelope::Channel(ChannelMsg::OpenInit(MsgChannelOpenInit {
+            port_id_on_a,
+            connection_hops_on_a: [conn_id_on_a].to_vec(),
+            port_id_on_b,
+            ordering: Order::Unordered,
+            signer,
+            version_proposal: ChannelVersion::empty(),
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::OpenInitChannel(open_init_channel_event)) =
+            ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        open_init_channel_event.chan_id_on_a().clone()
+    }
+
+    /// `B` receives the channel opening attempt by `A` after `A` initiates the channel.
+    /// Returns the channel identifier of `B`.
+    pub fn channel_open_try_on_b(
+        ctx_b: &mut TestContext<B>,
+        ctx_a: &TestContext<A>,
+        conn_id_on_b: ConnectionId,
+        chan_id_on_a: ChannelId,
+        port_id_on_a: PortId,
+        signer: Signer,
+    ) -> ChannelId {
+        let proof_height_on_a = ctx_a.latest_height();
+
+        let proof_chan_end_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proof_height_on_a,
+                &ChannelEndPath::new(&port_id_on_a, &chan_id_on_a).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        #[allow(deprecated)]
+        let msg_for_b = MsgEnvelope::Channel(ChannelMsg::OpenTry(MsgChannelOpenTry {
+            port_id_on_b: PortId::transfer(),
+            connection_hops_on_b: [conn_id_on_b].to_vec(),
+            port_id_on_a: PortId::transfer(),
+            chan_id_on_a,
+            version_supported_on_a: ChannelVersion::empty(),
+            proof_chan_end_on_a,
+            proof_height_on_a,
+            ordering: Order::Unordered,
+            signer,
+
+            version_proposal: ChannelVersion::empty(),
+        }));
+
+        ctx_b.deliver(msg_for_b).expect("success");
+
+        let Some(IbcEvent::OpenTryChannel(open_try_channel_event)) =
+            ctx_b.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        open_try_channel_event.chan_id_on_b().clone()
+    }
+
+    /// `A` receives `B`'s acknowledgement that `B` received the channel opening attempt by `A`.
+    /// `A` starts processing the channel on its side.
+    pub fn channel_open_ack_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        chan_id_on_a: ChannelId,
+        port_id_on_a: PortId,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) {
+        let proof_height_on_b = ctx_b.latest_height();
+
+        let proof_chan_end_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proof_height_on_b,
+                &ChannelEndPath::new(&port_id_on_b, &chan_id_on_b).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_a = MsgEnvelope::Channel(ChannelMsg::OpenAck(MsgChannelOpenAck {
+            port_id_on_a,
+            chan_id_on_a,
+            chan_id_on_b,
+            version_on_b: ChannelVersion::empty(),
+            proof_chan_end_on_b,
+            proof_height_on_b,
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::OpenAckChannel(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// `B` receives the confirmation from `A` that the channel creation was successful.
+    /// `B` also starts processing the channel on its side.
+    pub fn channel_open_confirm_on_b(
+        ctx_b: &mut TestContext<B>,
+        ctx_a: &TestContext<A>,
+        chan_id_on_a: ChannelId,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) {
+        let proof_height_on_a = ctx_a.latest_height();
+
+        let proof_chan_end_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proof_height_on_a,
+                &ChannelEndPath::new(&PortId::transfer(), &chan_id_on_a).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_b = MsgEnvelope::Channel(ChannelMsg::OpenConfirm(MsgChannelOpenConfirm {
+            port_id_on_b,
+            chan_id_on_b,
+            proof_chan_end_on_a,
+            proof_height_on_a,
+            signer,
+        }));
+
+        ctx_b.deliver(msg_for_b).expect("success");
+
+        let Some(IbcEvent::OpenConfirmChannel(_)) = ctx_b.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// `A` initiates the channel closing, with the other end on `B`.
+    /// `A` stops processing the channel.
+    pub fn channel_close_init_on_a(
+        ctx_a: &mut TestContext<A>,
+        chan_id_on_a: ChannelId,
+        port_id_on_a: PortId,
+        signer: Signer,
+    ) {
+        let msg_for_a = MsgEnvelope::Channel(ChannelMsg::CloseInit(MsgChannelCloseInit {
+            port_id_on_a,
+            chan_id_on_a,
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::CloseInitChannel(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// `B` receives the channel closing attempt by `A` after `A` initiates the channel closing.
+    /// `B` also stops processing the channel.
+    pub fn channel_close_confirm_on_b(
+        ctx_b: &mut TestContext<B>,
+        ctx_a: &TestContext<A>,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) {
+        let proof_height_on_a = ctx_a.latest_height();
+
+        let proof_chan_end_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proof_height_on_a,
+                &ChannelEndPath::new(&PortId::transfer(), &chan_id_on_b).into(),
+            )
+            .expect("connection end exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_b = MsgEnvelope::Channel(ChannelMsg::CloseConfirm(MsgChannelCloseConfirm {
+            port_id_on_b,
+            chan_id_on_b,
+            proof_chan_end_on_a,
+            proof_height_on_a,
+            signer,
+        }));
+
+        ctx_b.deliver(msg_for_b).expect("success");
+
+        let Some(IbcEvent::CloseConfirmChannel(_)) =
+            ctx_b.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// A channel is created by `A` towards `B` using the IBC channel handshake protocol.
+    /// Returns the channel identifiers of `A` and `B`.
+    #[allow(clippy::too_many_arguments)]
+    pub fn create_channel_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        client_id_on_a: ClientId,
+        conn_id_on_a: ConnectionId,
+        port_id_on_a: PortId,
+        client_id_on_b: ClientId,
+        conn_id_on_b: ConnectionId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) -> (ChannelId, ChannelId) {
+        let chan_id_on_a = TypedRelayerOps::<A, B>::channel_open_init_on_a(
+            ctx_a,
+            conn_id_on_a.clone(),
+            port_id_on_a.clone(),
+            port_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        let chan_id_on_b = TypedRelayerOps::<A, B>::channel_open_try_on_b(
+            ctx_b,
+            ctx_a,
+            conn_id_on_b.clone(),
+            chan_id_on_a.clone(),
+            port_id_on_a.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(
+            ctx_a,
+            ctx_b,
+            client_id_on_a.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::channel_open_ack_on_a(
+            ctx_a,
+            ctx_b,
+            chan_id_on_a.clone(),
+            port_id_on_a.clone(),
+            chan_id_on_b.clone(),
+            port_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::channel_open_confirm_on_b(
+            ctx_b,
+            ctx_a,
+            chan_id_on_a.clone(),
+            chan_id_on_b.clone(),
+            port_id_on_b,
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(ctx_a, ctx_b, client_id_on_a, signer);
+
+        (chan_id_on_a, chan_id_on_b)
+    }
+
+    /// A channel is closed by `A` towards `B` using the IBC channel handshake protocol.
+    #[allow(clippy::too_many_arguments)]
+    pub fn close_channel_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        client_id_on_a: ClientId,
+        chan_id_on_a: ChannelId,
+        port_id_on_a: PortId,
+        client_id_on_b: ClientId,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) {
+        TypedRelayerOps::<A, B>::channel_close_init_on_a(
+            ctx_a,
+            chan_id_on_a.clone(),
+            port_id_on_a.clone(),
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b,
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::channel_close_confirm_on_b(
+            ctx_b,
+            ctx_a,
+            chan_id_on_b,
+            port_id_on_b,
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(ctx_a, ctx_b, client_id_on_a, signer);
+    }
+
+    /// `B` receives a packet from an IBC module on `A`.
+    /// Returns `B`'s acknowledgement of receipt.
+    pub fn packet_recv_on_b(
+        ctx_b: &mut TestContext<B>,
+        ctx_a: &TestContext<A>,
+        packet: Packet,
+        signer: Signer,
+    ) -> Acknowledgement {
+        let proof_height_on_a = ctx_a.latest_height();
+
+        let proof_commitment_on_a = ctx_a
+            .ibc_store()
+            .get_proof(
+                proof_height_on_a,
+                &CommitmentPath::new(&packet.port_id_on_a, &packet.chan_id_on_a, packet.seq_on_a)
+                    .into(),
+            )
+            .expect("commitment proof exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_b = MsgEnvelope::Packet(PacketMsg::Recv(MsgRecvPacket {
+            packet,
+            proof_commitment_on_a,
+            proof_height_on_a,
+            signer,
+        }));
+
+        ctx_b.deliver(msg_for_b).expect("success");
+
+        let Some(IbcEvent::WriteAcknowledgement(write_ack_event)) =
+            ctx_b.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+
+        write_ack_event.acknowledgement().clone()
+    }
+
+    /// `A` receives the acknowledgement from `B` that `B` received the packet from `A`.
+    pub fn packet_ack_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        packet: Packet,
+        acknowledgement: Acknowledgement,
+        signer: Signer,
+    ) {
+        let proof_height_on_b = ctx_b.latest_height();
+
+        let proof_acked_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proof_height_on_b,
+                &AckPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a).into(),
+            )
+            .expect("acknowledgement proof exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_a = MsgEnvelope::Packet(PacketMsg::Ack(MsgAcknowledgement {
+            packet,
+            acknowledgement,
+            proof_acked_on_b,
+            proof_height_on_b,
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::AcknowledgePacket(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// `A` receives the timeout packet from `B`.
+    /// That is, `B` has not received the packet from `A` within the timeout period.
+    pub fn packet_timeout_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        packet: Packet,
+        signer: Signer,
+    ) {
+        let proof_height_on_b = ctx_b.latest_height();
+
+        let proof_unreceived_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proof_height_on_b,
+                &ReceiptPath::new(&packet.port_id_on_b, &packet.chan_id_on_b, packet.seq_on_a)
+                    .into(),
+            )
+            .expect("non-membership receipt proof exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_a = MsgEnvelope::Packet(PacketMsg::Timeout(MsgTimeout {
+            next_seq_recv_on_b: packet.seq_on_a,
+            packet,
+            proof_unreceived_on_b,
+            proof_height_on_b,
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::TimeoutPacket(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// `A` receives the timeout packet from `B` after closing the channel.
+    /// That is, `B` has not received the packet from `A` because the channel is closed.
+    pub fn packet_timeout_on_close_on_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &TestContext<B>,
+        packet: Packet,
+        chan_id_on_b: ChannelId,
+        port_id_on_b: PortId,
+        signer: Signer,
+    ) {
+        let proof_height_on_b = ctx_b.latest_height();
+
+        let proof_unreceived_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proof_height_on_b,
+                &ReceiptPath::new(&port_id_on_b, &chan_id_on_b, packet.seq_on_a).into(),
+            )
+            .expect("non-membership receipt proof")
+            .try_into()
+            .expect("value merkle proof");
+
+        let proof_close_on_b = ctx_b
+            .ibc_store()
+            .get_proof(
+                proof_height_on_b,
+                &ChannelEndPath::new(&port_id_on_b, &chan_id_on_b).into(),
+            )
+            .expect("channel end data exists")
+            .try_into()
+            .expect("value merkle proof");
+
+        let msg_for_a = MsgEnvelope::Packet(PacketMsg::TimeoutOnClose(MsgTimeoutOnClose {
+            next_seq_recv_on_b: packet.seq_on_a,
+            packet,
+            proof_unreceived_on_b,
+            proof_close_on_b,
+            proof_height_on_b,
+            signer,
+        }));
+
+        ctx_a.deliver(msg_for_a).expect("success");
+
+        let Some(IbcEvent::TimeoutPacket(_)) = ctx_a.ibc_store().events.lock().last().cloned()
+        else {
+            panic!("unexpected event")
+        };
+    }
+
+    /// Sends a packet from an IBC application on `A` to `B` using the IBC packet relay protocol.
+    pub fn submit_packet_on_b(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        packet: Packet,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) {
+        // packet is passed from module
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        let acknowledgement =
+            TypedRelayerOps::<A, B>::packet_recv_on_b(ctx_b, ctx_a, packet.clone(), signer.clone());
+
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(
+            ctx_a,
+            ctx_b,
+            client_id_on_a,
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<A, B>::packet_ack_on_a(
+            ctx_a,
+            ctx_b,
+            packet,
+            acknowledgement,
+            signer.clone(),
+        );
+
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b,
+            signer.clone(),
+        );
+    }
+
+    /// Times out a packet from an IBC application on `A` to `B` after waiting timeout period.
+    pub fn timeout_packet_from_a(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        packet: Packet,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) {
+        // packet is passed from module
+
+        let TimeoutHeight::At(timeout_height) = packet.timeout_height_on_b else {
+            panic!("timeout height is set")
+        };
+
+        // progress `B`'s block height to the timeout height.
+        // packet is timed out at the timeout height + 1
+        while ctx_b.latest_height() <= timeout_height {
+            ctx_b.advance_block_height();
+        }
+
+        // update client on `A` with the latest header from `B`.
+        TypedRelayerOps::<A, B>::update_client_on_a_with_sync(
+            ctx_a,
+            ctx_b,
+            client_id_on_a.clone(),
+            signer.clone(),
+        );
+
+        // timeout the packet on `A`.
+        TypedRelayerOps::<A, B>::packet_timeout_on_a(ctx_a, ctx_b, packet.clone(), signer.clone());
+
+        // `A` has progressed; update client on `B` with the latest header from `A`.
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b,
+            signer.clone(),
+        );
+    }
+
+    /// Times out a packet from an IBC application on `A` to `B` after closing the channel.
+    pub fn timeout_packet_from_a_on_channel_close(
+        ctx_a: &mut TestContext<A>,
+        ctx_b: &mut TestContext<B>,
+        packet: Packet,
+        client_id_on_a: ClientId,
+        client_id_on_b: ClientId,
+        signer: Signer,
+    ) {
+        // packet is passed from module
+
+        // close the channel on `A`.
+        TypedRelayerOps::<A, B>::close_channel_on_a(
+            ctx_a,
+            ctx_b,
+            client_id_on_a.clone(),
+            packet.chan_id_on_a.clone(),
+            packet.port_id_on_a.clone(),
+            client_id_on_b.clone(),
+            packet.chan_id_on_b.clone(),
+            packet.port_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        // timeout the packet on `A`.
+        TypedRelayerOps::<A, B>::packet_timeout_on_close_on_a(
+            ctx_a,
+            ctx_b,
+            packet.clone(),
+            packet.chan_id_on_b.clone(),
+            packet.port_id_on_b.clone(),
+            signer.clone(),
+        );
+
+        // `A` has progressed; update client on `B` with the latest header from `A`.
+        TypedRelayerOps::<B, A>::update_client_on_a_with_sync(
+            ctx_b,
+            ctx_a,
+            client_id_on_b,
+            signer.clone(),
+        );
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/applications/mod.rs b/ibc-testkit/src/testapp/ibc/applications/mod.rs
new file mode 100644
index 000000000..85baa285f
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/mod.rs
@@ -0,0 +1,2 @@
+pub mod nft_transfer;
+pub mod transfer;
diff --git a/ibc-testkit/src/testapp/ibc/applications/nft_transfer/context.rs b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/context.rs
new file mode 100644
index 000000000..a526dcf45
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/context.rs
@@ -0,0 +1,185 @@
+use ibc::apps::nft_transfer::context::{
+    NftClassContext, NftContext, NftTransferExecutionContext, NftTransferValidationContext,
+};
+use ibc::apps::nft_transfer::types::error::NftTransferError;
+use ibc::apps::nft_transfer::types::{
+    ClassData, ClassId, ClassUri, Memo, PrefixedClassId, TokenData, TokenId, TokenUri,
+};
+use ibc::core::host::types::identifiers::{ChannelId, PortId};
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Signer;
+
+use super::types::{DummyNft, DummyNftClass, DummyNftTransferModule};
+
+impl NftContext for DummyNft {
+    fn get_class_id(&self) -> &ClassId {
+        &self.class_id
+    }
+
+    fn get_id(&self) -> &TokenId {
+        &self.token_id
+    }
+
+    fn get_uri(&self) -> Option<&TokenUri> {
+        self.token_uri.as_ref()
+    }
+
+    fn get_data(&self) -> Option<&TokenData> {
+        self.token_data.as_ref()
+    }
+}
+
+impl NftClassContext for DummyNftClass {
+    fn get_id(&self) -> &ClassId {
+        &self.class_id
+    }
+
+    fn get_uri(&self) -> Option<&ClassUri> {
+        self.class_uri.as_ref()
+    }
+
+    fn get_data(&self) -> Option<&ClassData> {
+        self.class_data.as_ref()
+    }
+}
+
+impl NftTransferValidationContext for DummyNftTransferModule {
+    type AccountId = Signer;
+    type Nft = DummyNft;
+    type NftClass = DummyNftClass;
+
+    fn get_port(&self) -> Result<PortId, NftTransferError> {
+        Ok(PortId::transfer())
+    }
+
+    fn can_send_nft(&self) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn can_receive_nft(&self) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn create_or_update_class_validate(
+        &self,
+        _class_id: &PrefixedClassId,
+        _class_uri: Option<&ClassUri>,
+        _class_data: Option<&ClassData>,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn escrow_nft_validate(
+        &self,
+        _from_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+        _memo: &Memo,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn unescrow_nft_validate(
+        &self,
+        _to_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn mint_nft_validate(
+        &self,
+        _account: &Self::AccountId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+        _token_uri: Option<&TokenUri>,
+        _token_data: Option<&TokenData>,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn burn_nft_validate(
+        &self,
+        _account: &Self::AccountId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+        _memo: &Memo,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn get_nft(
+        &self,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+    ) -> Result<Self::Nft, NftTransferError> {
+        Ok(DummyNft::default())
+    }
+
+    fn get_nft_class(
+        &self,
+        _class_id: &PrefixedClassId,
+    ) -> Result<Self::NftClass, NftTransferError> {
+        Ok(DummyNftClass::default())
+    }
+}
+
+impl NftTransferExecutionContext for DummyNftTransferModule {
+    fn create_or_update_class_execute(
+        &self,
+        _class_id: &PrefixedClassId,
+        _class_uri: Option<&ClassUri>,
+        _class_data: Option<&ClassData>,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn escrow_nft_execute(
+        &mut self,
+        _from_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+        _memo: &Memo,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn unescrow_nft_execute(
+        &mut self,
+        _to_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn mint_nft_execute(
+        &mut self,
+        _account: &Self::AccountId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+        _token_uri: Option<&TokenUri>,
+        _token_data: Option<&TokenData>,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+
+    fn burn_nft_execute(
+        &mut self,
+        _account: &Self::AccountId,
+        _class_id: &PrefixedClassId,
+        _token_id: &TokenId,
+        _memo: &Memo,
+    ) -> Result<(), NftTransferError> {
+        Ok(())
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/applications/nft_transfer/mod.rs b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/mod.rs
new file mode 100644
index 000000000..a811b728e
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/mod.rs
@@ -0,0 +1,4 @@
+#[cfg(feature = "serde")]
+pub mod context;
+pub mod module;
+pub mod types;
diff --git a/ibc-testkit/src/testapp/ibc/applications/nft_transfer/module.rs b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/module.rs
new file mode 100644
index 000000000..06652a1dd
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/module.rs
@@ -0,0 +1,107 @@
+use ibc::core::channel::types::acknowledgement::Acknowledgement;
+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::types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Signer;
+use ibc::core::router::module::Module;
+use ibc::core::router::types::module::ModuleExtras;
+
+use super::types::DummyNftTransferModule;
+
+impl Module for DummyNftTransferModule {
+    fn on_chan_open_init_validate(
+        &self,
+        _order: Order,
+        _connection_hops: &[ConnectionId],
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _counterparty: &Counterparty,
+        version: &Version,
+    ) -> Result<Version, ChannelError> {
+        Ok(version.clone())
+    }
+
+    fn on_chan_open_init_execute(
+        &mut self,
+        _order: Order,
+        _connection_hops: &[ConnectionId],
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _counterparty: &Counterparty,
+        version: &Version,
+    ) -> Result<(ModuleExtras, Version), ChannelError> {
+        Ok((ModuleExtras::empty(), version.clone()))
+    }
+
+    fn on_chan_open_try_validate(
+        &self,
+        _order: Order,
+        _connection_hops: &[ConnectionId],
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _counterparty: &Counterparty,
+        counterparty_version: &Version,
+    ) -> Result<Version, ChannelError> {
+        Ok(counterparty_version.clone())
+    }
+
+    fn on_chan_open_try_execute(
+        &mut self,
+        _order: Order,
+        _connection_hops: &[ConnectionId],
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _counterparty: &Counterparty,
+        counterparty_version: &Version,
+    ) -> Result<(ModuleExtras, Version), ChannelError> {
+        Ok((ModuleExtras::empty(), counterparty_version.clone()))
+    }
+
+    fn on_recv_packet_execute(
+        &mut self,
+        _packet: &Packet,
+        _relayer: &Signer,
+    ) -> (ModuleExtras, Acknowledgement) {
+        (
+            ModuleExtras::empty(),
+            Acknowledgement::try_from(vec![1u8]).expect("Never fails"),
+        )
+    }
+
+    fn on_timeout_packet_validate(
+        &self,
+        _packet: &Packet,
+        _relayer: &Signer,
+    ) -> Result<(), PacketError> {
+        Ok(())
+    }
+
+    fn on_timeout_packet_execute(
+        &mut self,
+        _packet: &Packet,
+        _relayer: &Signer,
+    ) -> (ModuleExtras, Result<(), PacketError>) {
+        (ModuleExtras::empty(), Ok(()))
+    }
+
+    fn on_acknowledgement_packet_validate(
+        &self,
+        _packet: &Packet,
+        _acknowledgement: &Acknowledgement,
+        _relayer: &Signer,
+    ) -> Result<(), PacketError> {
+        Ok(())
+    }
+
+    fn on_acknowledgement_packet_execute(
+        &mut self,
+        _packet: &Packet,
+        _acknowledgement: &Acknowledgement,
+        _relayer: &Signer,
+    ) -> (ModuleExtras, Result<(), PacketError>) {
+        (ModuleExtras::empty(), Ok(()))
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/applications/nft_transfer/types.rs b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/types.rs
new file mode 100644
index 000000000..6e282fe61
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/nft_transfer/types.rs
@@ -0,0 +1,61 @@
+use ibc::apps::nft_transfer::types::{ClassData, ClassId, ClassUri, TokenData, TokenId, TokenUri};
+
+#[derive(Debug)]
+pub struct DummyNftTransferModule;
+
+#[derive(Debug)]
+pub struct DummyNft {
+    pub class_id: ClassId,
+    pub token_id: TokenId,
+    pub token_uri: Option<TokenUri>,
+    pub token_data: Option<TokenData>,
+}
+
+impl Default for DummyNft {
+    fn default() -> Self {
+        let class_id = "class_0".parse().expect("infallible");
+        let token_id = "token_0".parse().expect("infallible");
+        let token_uri = Some("http://example.com".parse().expect("infallible"));
+        let data = r#"{"name":{"value":"Crypto Creatures"},"image":{"value":"binary","mime":"image/png"}}"#;
+        let token_data = Some(data.parse().expect("infallible"));
+        Self {
+            class_id,
+            token_id,
+            token_uri,
+            token_data,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct DummyNftClass {
+    pub class_id: ClassId,
+    pub class_uri: Option<ClassUri>,
+    pub class_data: Option<ClassData>,
+}
+
+impl Default for DummyNftClass {
+    fn default() -> Self {
+        let class_id = "class_0".parse().expect("infallible");
+        let class_uri = Some("http://example.com".parse().expect("infallible"));
+        let data = r#"{"name":{"value":"Crypto Creatures"},"image":{"value":"binary","mime":"image/png"}}"#;
+        let class_data = Some(data.parse().expect("infallible"));
+        Self {
+            class_id,
+            class_uri,
+            class_data,
+        }
+    }
+}
+
+impl DummyNftTransferModule {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+impl Default for DummyNftTransferModule {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/crates/ibc/src/mock/context/applications.rs b/ibc-testkit/src/testapp/ibc/applications/transfer/context.rs
similarity index 55%
rename from crates/ibc/src/mock/context/applications.rs
rename to ibc-testkit/src/testapp/ibc/applications/transfer/context.rs
index 219604de0..d8876b315 100644
--- a/crates/ibc/src/mock/context/applications.rs
+++ b/ibc-testkit/src/testapp/ibc/applications/transfer/context.rs
@@ -1,32 +1,18 @@
-//! Application context implementations for `MockContext`
+use ibc::apps::transfer::context::{TokenTransferExecutionContext, TokenTransferValidationContext};
+use ibc::apps::transfer::types::error::TokenTransferError;
+use ibc::apps::transfer::types::{Memo, PrefixedCoin};
+use ibc::core::host::types::identifiers::{ChannelId, PortId};
+use ibc::core::primitives::Signer;
 
-use subtle_encoding::bech32;
+use super::types::DummyTransferModule;
 
-use super::MockContext;
-use crate::applications::transfer::context::cosmos_adr028_escrow_address;
-use crate::applications::transfer::context::TokenTransferExecutionContext;
-use crate::applications::transfer::context::TokenTransferValidationContext;
-use crate::applications::transfer::error::TokenTransferError;
-use crate::applications::transfer::PrefixedCoin;
-use crate::core::ics24_host::identifier::{ChannelId, PortId};
-use crate::Signer;
-
-impl TokenTransferValidationContext for MockContext {
+impl TokenTransferValidationContext for DummyTransferModule {
     type AccountId = Signer;
 
     fn get_port(&self) -> Result<PortId, TokenTransferError> {
         Ok(PortId::transfer())
     }
 
-    fn get_escrow_account(
-        &self,
-        port_id: &PortId,
-        channel_id: &ChannelId,
-    ) -> Result<Self::AccountId, TokenTransferError> {
-        let addr = cosmos_adr028_escrow_address(port_id, channel_id);
-        Ok(bech32::encode("cosmos", addr).into())
-    }
-
     fn can_send_coins(&self) -> Result<(), TokenTransferError> {
         Ok(())
     }
@@ -34,11 +20,22 @@ impl TokenTransferValidationContext for MockContext {
     fn can_receive_coins(&self) -> Result<(), TokenTransferError> {
         Ok(())
     }
-
-    fn send_coins_validate(
+    fn escrow_coins_validate(
         &self,
         _from_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _coin: &PrefixedCoin,
+        _memo: &Memo,
+    ) -> Result<(), TokenTransferError> {
+        Ok(())
+    }
+
+    fn unescrow_coins_validate(
+        &self,
         _to_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
         _coin: &PrefixedCoin,
     ) -> Result<(), TokenTransferError> {
         Ok(())
@@ -56,16 +53,29 @@ impl TokenTransferValidationContext for MockContext {
         &self,
         _account: &Self::AccountId,
         _coin: &PrefixedCoin,
+        _memo: &Memo,
     ) -> Result<(), TokenTransferError> {
         Ok(())
     }
 }
 
-impl TokenTransferExecutionContext for MockContext {
-    fn send_coins_execute(
+impl TokenTransferExecutionContext for DummyTransferModule {
+    fn escrow_coins_execute(
         &mut self,
         _from_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
+        _coin: &PrefixedCoin,
+        _memo: &Memo,
+    ) -> Result<(), TokenTransferError> {
+        Ok(())
+    }
+
+    fn unescrow_coins_execute(
+        &mut self,
         _to_account: &Self::AccountId,
+        _port_id: &PortId,
+        _channel_id: &ChannelId,
         _coin: &PrefixedCoin,
     ) -> Result<(), TokenTransferError> {
         Ok(())
@@ -83,6 +93,7 @@ impl TokenTransferExecutionContext for MockContext {
         &mut self,
         _account: &Self::AccountId,
         _coin: &PrefixedCoin,
+        _memo: &Memo,
     ) -> Result<(), TokenTransferError> {
         Ok(())
     }
diff --git a/ibc-testkit/src/testapp/ibc/applications/transfer/mod.rs b/ibc-testkit/src/testapp/ibc/applications/transfer/mod.rs
new file mode 100644
index 000000000..a811b728e
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/transfer/mod.rs
@@ -0,0 +1,4 @@
+#[cfg(feature = "serde")]
+pub mod context;
+pub mod module;
+pub mod types;
diff --git a/crates/ibc/src/test_utils.rs b/ibc-testkit/src/testapp/ibc/applications/transfer/module.rs
similarity index 58%
rename from crates/ibc/src/test_utils.rs
rename to ibc-testkit/src/testapp/ibc/applications/transfer/module.rs
index 6235039cc..2246c893b 100644
--- a/crates/ibc/src/test_utils.rs
+++ b/ibc-testkit/src/testapp/ibc/applications/transfer/module.rs
@@ -1,68 +1,15 @@
-use tendermint::{block, consensus, evidence, public_key::Algorithm};
-
-use crate::core::ics04_channel::acknowledgement::Acknowledgement;
-use crate::core::ics04_channel::channel::{Counterparty, Order};
-use crate::core::ics04_channel::error::{ChannelError, PacketError};
-use crate::core::ics04_channel::packet::Packet;
-use crate::core::ics04_channel::Version;
-use crate::core::ics24_host::identifier::{ChannelId, ConnectionId, PortId};
-use crate::core::router::{Module, ModuleExtras};
-use crate::prelude::*;
-use crate::signer::Signer;
-
-// Needed in mocks.
-pub fn default_consensus_params() -> consensus::Params {
-    consensus::Params {
-        block: block::Size {
-            max_bytes: 22020096,
-            max_gas: -1,
-            time_iota_ms: 1000,
-        },
-        evidence: evidence::Params {
-            max_age_num_blocks: 100000,
-            max_age_duration: evidence::Duration(core::time::Duration::new(48 * 3600, 0)),
-            max_bytes: 0,
-        },
-        validator: consensus::params::ValidatorParams {
-            pub_key_types: vec![Algorithm::Ed25519],
-        },
-        version: Some(consensus::params::VersionParams::default()),
-    }
-}
-
-pub fn get_dummy_proof() -> Vec<u8> {
-    "Y29uc2Vuc3VzU3RhdGUvaWJjb25lY2xpZW50LzIy"
-        .as_bytes()
-        .to_vec()
-}
-
-pub fn get_dummy_account_id() -> Signer {
-    "0CDA3F47EF3C4906693B170EF650EB968C5F4B2C"
-        .to_string()
-        .into()
-}
-
-pub fn get_dummy_bech32_account() -> String {
-    "cosmos1wxeyh7zgn4tctjzs0vtqpc6p5cxq5t2muzl7ng".to_string()
-}
-
-pub fn get_dummy_transfer_module() -> DummyTransferModule {
-    DummyTransferModule
-}
-#[derive(Debug)]
-pub struct DummyTransferModule;
-
-impl DummyTransferModule {
-    pub fn new() -> Self {
-        Self
-    }
-}
-
-impl Default for DummyTransferModule {
-    fn default() -> Self {
-        Self::new()
-    }
-}
+use ibc::core::channel::types::acknowledgement::Acknowledgement;
+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::types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Signer;
+use ibc::core::router::module::Module;
+use ibc::core::router::types::module::ModuleExtras;
+
+use super::types::DummyTransferModule;
 
 impl Module for DummyTransferModule {
     fn on_chan_open_init_validate(
diff --git a/ibc-testkit/src/testapp/ibc/applications/transfer/types.rs b/ibc-testkit/src/testapp/ibc/applications/transfer/types.rs
new file mode 100644
index 000000000..f5d91a531
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/applications/transfer/types.rs
@@ -0,0 +1,14 @@
+#[derive(Debug)]
+pub struct DummyTransferModule;
+
+impl DummyTransferModule {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+impl Default for DummyTransferModule {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs b/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs
new file mode 100644
index 000000000..4352ac22f
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/clients/mock/client_state.rs
@@ -0,0 +1,505 @@
+use core::str::FromStr;
+use core::time::Duration;
+
+use ibc::core::client::context::prelude::*;
+use ibc::core::client::types::error::{ClientError, UpgradeClientError};
+use ibc::core::client::types::{Height, Status};
+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::primitives::proto::{Any, Protobuf};
+
+use crate::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use crate::testapp::ibc::clients::mock::consensus_state::MockConsensusState;
+use crate::testapp::ibc::clients::mock::header::{MockHeader, MOCK_HEADER_TYPE_URL};
+use crate::testapp::ibc::clients::mock::misbehaviour::{Misbehaviour, MOCK_MISBEHAVIOUR_TYPE_URL};
+use crate::testapp::ibc::clients::mock::proto::ClientState as RawMockClientState;
+
+pub const MOCK_CLIENT_STATE_TYPE_URL: &str = "/ibc.mock.ClientState";
+pub const MOCK_CLIENT_TYPE: &str = "9999-mock";
+
+pub fn client_type() -> ClientType {
+    ClientType::from_str(MOCK_CLIENT_TYPE).expect("never fails because it's valid client type")
+}
+
+/// A mock of a client state. For an example of a real structure that this mocks, you can see
+/// `ClientState` of ics07_tendermint/client_state.rs.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct MockClientState {
+    pub header: MockHeader,
+    pub trusting_period: Duration,
+    pub frozen: bool,
+}
+
+impl MockClientState {
+    /// Initializes a new `MockClientState` with the given `MockHeader` and a
+    /// trusting period of 10 seconds as a default. If the trusting period
+    /// needs to be changed, use the `with_trusting_period` method to override it.
+    pub fn new(header: MockHeader) -> Self {
+        Self {
+            header,
+            trusting_period: Duration::from_secs(64000),
+            frozen: false,
+        }
+    }
+
+    pub fn latest_height(&self) -> Height {
+        self.header.height()
+    }
+
+    pub fn refresh_time(&self) -> Option<Duration> {
+        None
+    }
+
+    pub fn with_trusting_period(self, trusting_period: Duration) -> Self {
+        Self {
+            trusting_period,
+            ..self
+        }
+    }
+
+    pub fn frozen(self) -> Self {
+        Self {
+            frozen: true,
+            ..self
+        }
+    }
+
+    pub fn unfrozen(self) -> Self {
+        Self {
+            frozen: false,
+            ..self
+        }
+    }
+
+    pub fn is_frozen(&self) -> bool {
+        self.frozen
+    }
+
+    fn expired(&self, elapsed: Duration) -> bool {
+        elapsed > self.trusting_period
+    }
+}
+
+impl Protobuf<RawMockClientState> for MockClientState {}
+
+impl TryFrom<RawMockClientState> for MockClientState {
+    type Error = ClientError;
+
+    fn try_from(raw: RawMockClientState) -> Result<Self, Self::Error> {
+        Ok(Self {
+            header: raw
+                .header
+                .ok_or(ClientError::Other {
+                    description: "header is not present".into(),
+                })?
+                .try_into()?,
+            trusting_period: Duration::from_nanos(raw.trusting_period),
+            frozen: raw.frozen,
+        })
+    }
+}
+
+impl From<MockClientState> for RawMockClientState {
+    fn from(value: MockClientState) -> Self {
+        Self {
+            header: Some(value.header.into()),
+            trusting_period: value
+                .trusting_period
+                .as_nanos()
+                .try_into()
+                .expect("no overflow"),
+            frozen: value.frozen,
+        }
+    }
+}
+
+impl Protobuf<Any> for MockClientState {}
+
+impl TryFrom<Any> for MockClientState {
+    type Error = ClientError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        fn decode_client_state(value: &[u8]) -> Result<MockClientState, ClientError> {
+            let client_state =
+                Protobuf::<RawMockClientState>::decode(value).map_err(|e| ClientError::Other {
+                    description: e.to_string(),
+                })?;
+            Ok(client_state)
+        }
+        match raw.type_url.as_str() {
+            MOCK_CLIENT_STATE_TYPE_URL => decode_client_state(&raw.value),
+            _ => Err(ClientError::UnknownClientStateType {
+                client_state_type: raw.type_url,
+            }),
+        }
+    }
+}
+
+impl From<MockClientState> for Any {
+    fn from(client_state: MockClientState) -> Self {
+        Self {
+            type_url: MOCK_CLIENT_STATE_TYPE_URL.to_string(),
+            value: Protobuf::<RawMockClientState>::encode_vec(client_state),
+        }
+    }
+}
+
+pub trait MockClientContext {
+    /// Returns the current timestamp of the local chain.
+    fn host_timestamp(&self) -> Result<Timestamp, ContextError>;
+
+    /// Returns the current height of the local chain.
+    fn host_height(&self) -> Result<Height, ContextError>;
+}
+
+impl ClientStateCommon for MockClientState {
+    fn verify_consensus_state(&self, consensus_state: Any) -> Result<(), ClientError> {
+        let _mock_consensus_state = MockConsensusState::try_from(consensus_state)?;
+
+        Ok(())
+    }
+
+    fn client_type(&self) -> ClientType {
+        mock_client_type()
+    }
+
+    fn latest_height(&self) -> Height {
+        self.header.height()
+    }
+
+    fn validate_proof_height(&self, proof_height: Height) -> Result<(), ClientError> {
+        if self.latest_height() < proof_height {
+            return Err(ClientError::InvalidProofHeight {
+                latest_height: self.latest_height(),
+                proof_height,
+            });
+        }
+        Ok(())
+    }
+
+    fn verify_upgrade_client(
+        &self,
+        upgraded_client_state: Any,
+        upgraded_consensus_state: Any,
+        _proof_upgrade_client: CommitmentProofBytes,
+        _proof_upgrade_consensus_state: CommitmentProofBytes,
+        _root: &CommitmentRoot,
+    ) -> Result<(), ClientError> {
+        let upgraded_mock_client_state = Self::try_from(upgraded_client_state)?;
+        MockConsensusState::try_from(upgraded_consensus_state)?;
+        if self.latest_height() >= upgraded_mock_client_state.latest_height() {
+            return Err(UpgradeClientError::LowUpgradeHeight {
+                upgraded_height: self.latest_height(),
+                client_height: upgraded_mock_client_state.latest_height(),
+            })?;
+        }
+        Ok(())
+    }
+
+    fn verify_membership(
+        &self,
+        _prefix: &CommitmentPrefix,
+        _proof: &CommitmentProofBytes,
+        _root: &CommitmentRoot,
+        _path: Path,
+        _value: Vec<u8>,
+    ) -> Result<(), ClientError> {
+        Ok(())
+    }
+
+    fn verify_non_membership(
+        &self,
+        _prefix: &CommitmentPrefix,
+        _proof: &CommitmentProofBytes,
+        _root: &CommitmentRoot,
+        _path: Path,
+    ) -> Result<(), ClientError> {
+        Ok(())
+    }
+}
+
+impl<V> ClientStateValidation<V> for MockClientState
+where
+    V: ClientValidationContext + MockClientContext,
+    MockConsensusState: Convertible<V::ConsensusStateRef>,
+    <MockConsensusState as TryFrom<V::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    fn verify_client_message(
+        &self,
+        _ctx: &V,
+        _client_id: &ClientId,
+        client_message: Any,
+    ) -> Result<(), ClientError> {
+        match client_message.type_url.as_str() {
+            MOCK_HEADER_TYPE_URL => {
+                let _header = MockHeader::try_from(client_message)?;
+            }
+            MOCK_MISBEHAVIOUR_TYPE_URL => {
+                let _misbehaviour = Misbehaviour::try_from(client_message)?;
+            }
+            _ => {}
+        }
+
+        Ok(())
+    }
+
+    fn check_for_misbehaviour(
+        &self,
+        _ctx: &V,
+        _client_id: &ClientId,
+        client_message: Any,
+    ) -> Result<bool, ClientError> {
+        match client_message.type_url.as_str() {
+            MOCK_HEADER_TYPE_URL => Ok(false),
+            MOCK_MISBEHAVIOUR_TYPE_URL => {
+                let misbehaviour = Misbehaviour::try_from(client_message)?;
+                let header_1 = misbehaviour.header1;
+                let header_2 = misbehaviour.header2;
+
+                let header_heights_equal = header_1.height() == header_2.height();
+                let headers_are_in_future = self.latest_height() < header_1.height();
+
+                Ok(header_heights_equal && headers_are_in_future)
+            }
+            header_type => Err(ClientError::UnknownHeaderType {
+                header_type: header_type.to_owned(),
+            }),
+        }
+    }
+
+    fn status(&self, ctx: &V, client_id: &ClientId) -> Result<Status, ClientError> {
+        if self.is_frozen() {
+            return Ok(Status::Frozen);
+        }
+
+        let latest_consensus_state: MockConsensusState = {
+            match ctx.consensus_state(&ClientConsensusStatePath::new(
+                client_id.clone(),
+                self.latest_height().revision_number(),
+                self.latest_height().revision_height(),
+            )) {
+                Ok(cs) => cs.try_into().map_err(Into::into)?,
+                // if the client state does not have an associated consensus state for its latest height
+                // then it must be expired
+                Err(_) => return Ok(Status::Expired),
+            }
+        };
+
+        let now = ctx.host_timestamp()?;
+        let elapsed_since_latest_consensus_state = now
+            .duration_since(&latest_consensus_state.timestamp())
+            .ok_or(ClientError::Other {
+                description: format!("latest consensus state is in the future. now: {now}, latest consensus state: {}", latest_consensus_state.timestamp()),
+            })?;
+
+        if self.expired(elapsed_since_latest_consensus_state) {
+            return Ok(Status::Expired);
+        }
+
+        Ok(Status::Active)
+    }
+
+    fn check_substitute(&self, _ctx: &V, _substitute_client_state: Any) -> Result<(), ClientError> {
+        Ok(())
+    }
+}
+
+impl<E> ClientStateExecution<E> for MockClientState
+where
+    E: ClientExecutionContext + MockClientContext,
+    E::ClientStateRef: From<Self>,
+    MockConsensusState: Convertible<E::ConsensusStateRef>,
+    <MockConsensusState as TryFrom<E::ConsensusStateRef>>::Error: Into<ClientError>,
+{
+    fn initialise(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        consensus_state: Any,
+    ) -> Result<(), ClientError> {
+        let mock_consensus_state: MockConsensusState = consensus_state.try_into()?;
+
+        ctx.store_client_state(ClientStatePath::new(client_id.clone()), (*self).into())?;
+        ctx.store_consensus_state(
+            ClientConsensusStatePath::new(
+                client_id.clone(),
+                self.latest_height().revision_number(),
+                self.latest_height().revision_height(),
+            ),
+            mock_consensus_state.into(),
+        )?;
+        ctx.store_update_meta(
+            client_id.clone(),
+            self.latest_height(),
+            ctx.host_timestamp()?,
+            ctx.host_height()?,
+        )?;
+
+        Ok(())
+    }
+
+    fn update_state(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        header: Any,
+    ) -> Result<Vec<Height>, ClientError> {
+        let header = MockHeader::try_from(header)?;
+        let header_height = header.height;
+
+        let new_client_state = Self::new(header);
+        let new_consensus_state = MockConsensusState::new(header);
+
+        ctx.store_consensus_state(
+            ClientConsensusStatePath::new(
+                client_id.clone(),
+                new_client_state.latest_height().revision_number(),
+                new_client_state.latest_height().revision_height(),
+            ),
+            new_consensus_state.into(),
+        )?;
+        ctx.store_client_state(
+            ClientStatePath::new(client_id.clone()),
+            new_client_state.into(),
+        )?;
+        ctx.store_update_meta(
+            client_id.clone(),
+            header_height,
+            ctx.host_timestamp()?,
+            ctx.host_height()?,
+        )?;
+
+        Ok(vec![header_height])
+    }
+
+    fn update_state_on_misbehaviour(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        _client_message: Any,
+    ) -> Result<(), ClientError> {
+        let frozen_client_state = self.frozen();
+
+        ctx.store_client_state(
+            ClientStatePath::new(client_id.clone()),
+            frozen_client_state.into(),
+        )?;
+
+        Ok(())
+    }
+
+    fn update_state_on_upgrade(
+        &self,
+        ctx: &mut E,
+        client_id: &ClientId,
+        upgraded_client_state: Any,
+        upgraded_consensus_state: Any,
+    ) -> Result<Height, ClientError> {
+        let new_client_state = Self::try_from(upgraded_client_state)?;
+        let new_consensus_state: MockConsensusState = upgraded_consensus_state.try_into()?;
+
+        let latest_height = new_client_state.latest_height();
+
+        ctx.store_consensus_state(
+            ClientConsensusStatePath::new(
+                client_id.clone(),
+                latest_height.revision_number(),
+                latest_height.revision_height(),
+            ),
+            new_consensus_state.into(),
+        )?;
+        ctx.store_client_state(
+            ClientStatePath::new(client_id.clone()),
+            new_client_state.into(),
+        )?;
+
+        let host_timestamp = ctx.host_timestamp()?;
+        let host_height = ctx.host_height()?;
+
+        ctx.store_update_meta(
+            client_id.clone(),
+            latest_height,
+            host_timestamp,
+            host_height,
+        )?;
+
+        Ok(latest_height)
+    }
+
+    fn update_on_recovery(
+        &self,
+        ctx: &mut E,
+        subject_client_id: &ClientId,
+        substitute_client_state: Any,
+        substitute_consensus_state: Any,
+    ) -> Result<(), ClientError> {
+        let substitute_client_state = MockClientState::try_from(substitute_client_state)?;
+
+        let latest_height = substitute_client_state.latest_height();
+
+        let new_mock_client_state = MockClientState {
+            frozen: false,
+            ..substitute_client_state
+        };
+
+        let host_timestamp = ctx.host_timestamp()?;
+        let host_height = ctx.host_height()?;
+
+        let mock_consensus_state: MockConsensusState = substitute_consensus_state.try_into()?;
+
+        ctx.store_consensus_state(
+            ClientConsensusStatePath::new(
+                subject_client_id.clone(),
+                new_mock_client_state.latest_height().revision_number(),
+                new_mock_client_state.latest_height().revision_height(),
+            ),
+            mock_consensus_state.into(),
+        )?;
+
+        ctx.store_client_state(
+            ClientStatePath::new(subject_client_id.clone()),
+            new_mock_client_state.into(),
+        )?;
+
+        ctx.store_update_meta(
+            subject_client_id.clone(),
+            latest_height,
+            host_timestamp,
+            host_height,
+        )?;
+
+        Ok(())
+    }
+}
+
+impl From<MockConsensusState> for MockClientState {
+    fn from(cs: MockConsensusState) -> Self {
+        Self::new(cs.header)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    #[cfg(feature = "serde")]
+    #[test]
+    fn test_any_client_state_to_json() {
+        use ibc::primitives::proto::Any;
+
+        use super::{MockClientState, MockHeader};
+
+        let client_state = MockClientState::new(MockHeader::default());
+        let expected = r#"{"typeUrl":"/ibc.mock.ClientState","value":"CgQKAhABEICAkMrSxg4="}"#;
+        let json = serde_json::to_string(&Any::from(client_state)).unwrap();
+        assert_eq!(json, expected);
+
+        let proto_any = serde_json::from_str::<Any>(expected).unwrap();
+        assert_eq!(proto_any, Any::from(client_state));
+    }
+}
diff --git a/crates/ibc/src/mock/consensus_state.rs b/ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs
similarity index 58%
rename from crates/ibc/src/mock/consensus_state.rs
rename to ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs
index 0da9a4cfc..c637d26e5 100644
--- a/crates/ibc/src/mock/consensus_state.rs
+++ b/ibc-testkit/src/testapp/ibc/clients/mock/consensus_state.rs
@@ -1,15 +1,12 @@
-use crate::prelude::*;
-
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::mock::ConsensusState as RawMockConsensusState;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics02_client::consensus_state::ConsensusState;
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics23_commitment::commitment::CommitmentRoot;
-use crate::core::timestamp::Timestamp;
-use crate::mock::header::MockHeader;
-
+use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::types::error::ClientError;
+use ibc::core::commitment_types::commitment::CommitmentRoot;
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Timestamp;
+use ibc::primitives::proto::{Any, Protobuf};
+
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+use crate::testapp::ibc::clients::mock::proto::ConsensusState as RawMockConsensusState;
 pub const MOCK_CONSENSUS_STATE_TYPE_URL: &str = "/ibc.mock.ConsensusState";
 
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -21,7 +18,7 @@ pub struct MockConsensusState {
 
 impl MockConsensusState {
     pub fn new(header: MockHeader) -> Self {
-        MockConsensusState {
+        Self {
             header,
             root: CommitmentRoot::from(vec![0]),
         }
@@ -41,7 +38,7 @@ impl TryFrom<RawMockConsensusState> for MockConsensusState {
         let raw_header = raw.header.ok_or(ClientError::MissingRawConsensusState)?;
 
         Ok(Self {
-            header: MockHeader::try_from(raw_header)?,
+            header: raw_header.try_into()?,
             root: CommitmentRoot::from(vec![0]),
         })
     }
@@ -49,11 +46,8 @@ impl TryFrom<RawMockConsensusState> for MockConsensusState {
 
 impl From<MockConsensusState> for RawMockConsensusState {
     fn from(value: MockConsensusState) -> Self {
-        RawMockConsensusState {
-            header: Some(ibc_proto::ibc::mock::Header {
-                height: Some(value.header.height().into()),
-                timestamp: value.header.timestamp.nanoseconds(),
-            }),
+        Self {
+            header: Some(value.header.into()),
         }
     }
 }
@@ -64,20 +58,17 @@ impl TryFrom<Any> for MockConsensusState {
     type Error = ClientError;
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
-        use bytes::Buf;
-        use core::ops::Deref;
-        use prost::Message;
-
-        fn decode_consensus_state<B: Buf>(buf: B) -> Result<MockConsensusState, ClientError> {
-            RawMockConsensusState::decode(buf)
-                .map_err(ClientError::Decode)?
-                .try_into()
+        fn decode_consensus_state(value: &[u8]) -> Result<MockConsensusState, ClientError> {
+            let mock_consensus_state =
+                Protobuf::<RawMockConsensusState>::decode(value).map_err(|e| {
+                    ClientError::Other {
+                        description: e.to_string(),
+                    }
+                })?;
+            Ok(mock_consensus_state)
         }
-
         match raw.type_url.as_str() {
-            MOCK_CONSENSUS_STATE_TYPE_URL => {
-                decode_consensus_state(raw.value.deref()).map_err(Into::into)
-            }
+            MOCK_CONSENSUS_STATE_TYPE_URL => decode_consensus_state(&raw.value),
             _ => Err(ClientError::UnknownConsensusStateType {
                 consensus_state_type: raw.type_url,
             }),
@@ -87,9 +78,9 @@ impl TryFrom<Any> for MockConsensusState {
 
 impl From<MockConsensusState> for Any {
     fn from(consensus_state: MockConsensusState) -> Self {
-        Any {
+        Self {
             type_url: MOCK_CONSENSUS_STATE_TYPE_URL.to_string(),
-            value: Protobuf::<RawMockConsensusState>::encode_vec(&consensus_state),
+            value: Protobuf::<RawMockConsensusState>::encode_vec(consensus_state),
         }
     }
 }
@@ -102,8 +93,4 @@ impl ConsensusState for MockConsensusState {
     fn timestamp(&self) -> Timestamp {
         self.header.timestamp
     }
-
-    fn encode_vec(&self) -> Vec<u8> {
-        <Self as Protobuf<Any>>::encode_vec(self)
-    }
 }
diff --git a/crates/ibc/src/mock/header.rs b/ibc-testkit/src/testapp/ibc/clients/mock/header.rs
similarity index 68%
rename from crates/ibc/src/mock/header.rs
rename to ibc-testkit/src/testapp/ibc/clients/mock/header.rs
index fa459d193..804db7ab0 100644
--- a/crates/ibc/src/mock/header.rs
+++ b/ibc-testkit/src/testapp/ibc/clients/mock/header.rs
@@ -1,13 +1,12 @@
 use alloc::string::ToString;
 use core::fmt::{Display, Error as FmtError, Formatter};
 
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::mock::Header as RawMockHeader;
-use ibc_proto::protobuf::Protobuf;
+use ibc::core::client::types::error::ClientError;
+use ibc::core::client::types::Height;
+use ibc::core::primitives::Timestamp;
+use ibc::primitives::proto::{Any, Protobuf};
 
-use crate::core::ics02_client::error::ClientError;
-use crate::core::timestamp::Timestamp;
-use crate::Height;
+use crate::testapp::ibc::clients::mock::proto::Header as RawMockHeader;
 
 pub const MOCK_HEADER_TYPE_URL: &str = "/ibc.mock.Header";
 
@@ -22,7 +21,7 @@ impl Default for MockHeader {
     fn default() -> Self {
         Self {
             height: Height::min(0),
-            timestamp: Default::default(),
+            timestamp: Timestamp::none(),
         }
     }
 }
@@ -43,21 +42,25 @@ impl TryFrom<RawMockHeader> for MockHeader {
     type Error = ClientError;
 
     fn try_from(raw: RawMockHeader) -> Result<Self, Self::Error> {
-        Ok(MockHeader {
+        Ok(Self {
             height: raw
                 .height
-                .and_then(|raw_height| raw_height.try_into().ok())
-                .ok_or(ClientError::MissingRawHeader)?,
-
-            timestamp: Timestamp::from_nanoseconds(raw.timestamp)
-                .map_err(ClientError::InvalidPacketTimestamp)?,
+                .ok_or(ClientError::Other {
+                    description: "missing height".into(),
+                })?
+                .try_into()?,
+            timestamp: Timestamp::from_nanoseconds(raw.timestamp).map_err(|err| {
+                ClientError::Other {
+                    description: err.to_string(),
+                }
+            })?,
         })
     }
 }
 
 impl From<MockHeader> for RawMockHeader {
     fn from(value: MockHeader) -> Self {
-        RawMockHeader {
+        Self {
             height: Some(value.height.into()),
             timestamp: value.timestamp.nanoseconds(),
         }
@@ -70,16 +73,16 @@ impl MockHeader {
     }
 
     pub fn new(height: Height) -> Self {
-        if cfg!(any(test, feature = "std")) {
-            Self {
-                height,
-                timestamp: Timestamp::now(),
-            }
-        } else {
-            Self {
-                height,
-                timestamp: Timestamp::none(),
-            }
+        Self {
+            height,
+            timestamp: Timestamp::none(),
+        }
+    }
+
+    pub fn with_current_timestamp(self) -> Self {
+        Self {
+            timestamp: Timestamp::now(),
+            ..self
         }
     }
 
@@ -95,8 +98,11 @@ impl TryFrom<Any> for MockHeader {
 
     fn try_from(raw: Any) -> Result<Self, Self::Error> {
         match raw.type_url.as_str() {
-            MOCK_HEADER_TYPE_URL => Ok(Protobuf::<RawMockHeader>::decode_vec(&raw.value)
-                .map_err(ClientError::InvalidRawHeader)?),
+            MOCK_HEADER_TYPE_URL => Ok(Protobuf::<RawMockHeader>::decode_vec(&raw.value).map_err(
+                |e| ClientError::InvalidRawHeader {
+                    reason: e.to_string(),
+                },
+            )?),
             _ => Err(ClientError::UnknownHeaderType {
                 header_type: raw.type_url,
             }),
@@ -106,23 +112,23 @@ impl TryFrom<Any> for MockHeader {
 
 impl From<MockHeader> for Any {
     fn from(header: MockHeader) -> Self {
-        Any {
+        Self {
             type_url: MOCK_HEADER_TYPE_URL.to_string(),
-            value: Protobuf::<RawMockHeader>::encode_vec(&header),
+            value: Protobuf::<RawMockHeader>::encode_vec(header),
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
+
     use super::*;
-    use ibc_proto::protobuf::Protobuf;
 
     #[test]
     fn encode_any() {
         let header = MockHeader::new(Height::new(1, 10).expect("Never fails"))
             .with_timestamp(Timestamp::none());
-        let bytes = <MockHeader as Protobuf<Any>>::encode_vec(&header);
+        let bytes = <MockHeader as Protobuf<Any>>::encode_vec(header);
 
         assert_eq!(
             &bytes,
diff --git a/crates/ibc/src/mock/misbehaviour.rs b/ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs
similarity index 64%
rename from crates/ibc/src/mock/misbehaviour.rs
rename to ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs
index f2f6990bc..ff4664da4 100644
--- a/crates/ibc/src/mock/misbehaviour.rs
+++ b/ibc-testkit/src/testapp/ibc/clients/mock/misbehaviour.rs
@@ -1,13 +1,10 @@
-use crate::prelude::*;
+use ibc::core::client::types::error::ClientError;
+use ibc::core::host::types::identifiers::ClientId;
+use ibc::core::primitives::prelude::*;
+use ibc::primitives::proto::{Any, Protobuf};
 
-use bytes::Buf;
-use ibc_proto::google::protobuf::Any;
-use ibc_proto::ibc::mock::Misbehaviour as RawMisbehaviour;
-use ibc_proto::protobuf::Protobuf;
-
-use crate::core::ics02_client::error::ClientError;
-use crate::core::ics24_host::identifier::ClientId;
-use crate::mock::header::MockHeader;
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+use crate::testapp::ibc::clients::mock::proto::Misbehaviour as RawMisbehaviour;
 
 pub const MOCK_MISBEHAVIOUR_TYPE_URL: &str = "/ibc.mock.Misbehavior";
 
@@ -26,7 +23,7 @@ impl TryFrom<RawMisbehaviour> for Misbehaviour {
 
     fn try_from(raw: RawMisbehaviour) -> Result<Self, Self::Error> {
         Ok(Self {
-            client_id: Default::default(),
+            client_id: ClientId::new("07-tendermint", 0).expect("no error"),
             header1: raw
                 .header1
                 .ok_or(ClientError::MissingRawMisbehaviour)?
@@ -41,7 +38,7 @@ impl TryFrom<RawMisbehaviour> for Misbehaviour {
 
 impl From<Misbehaviour> for RawMisbehaviour {
     fn from(value: Misbehaviour) -> Self {
-        RawMisbehaviour {
+        Self {
             client_id: value.client_id.to_string(),
             header1: Some(value.header1.into()),
             header2: Some(value.header2.into()),
@@ -55,20 +52,15 @@ impl TryFrom<Any> for Misbehaviour {
     type Error = ClientError;
 
     fn try_from(raw: Any) -> Result<Self, ClientError> {
-        use core::ops::Deref;
-
-        fn decode_misbehaviour<B: Buf>(buf: B) -> Result<Misbehaviour, ClientError> {
-            use prost::Message;
-
-            RawMisbehaviour::decode(buf)
-                .map_err(ClientError::Decode)?
-                .try_into()
+        fn decode_misbehaviour(value: &[u8]) -> Result<Misbehaviour, ClientError> {
+            let raw_misbehaviour =
+                Protobuf::<RawMisbehaviour>::decode(value).map_err(|e| ClientError::Other {
+                    description: e.to_string(),
+                })?;
+            Ok(raw_misbehaviour)
         }
-
         match raw.type_url.as_str() {
-            MOCK_MISBEHAVIOUR_TYPE_URL => {
-                decode_misbehaviour(raw.value.deref()).map_err(Into::into)
-            }
+            MOCK_MISBEHAVIOUR_TYPE_URL => decode_misbehaviour(&raw.value),
             _ => Err(ClientError::UnknownMisbehaviourType {
                 misbehaviour_type: raw.type_url,
             }),
@@ -78,9 +70,9 @@ impl TryFrom<Any> for Misbehaviour {
 
 impl From<Misbehaviour> for Any {
     fn from(misbehaviour: Misbehaviour) -> Self {
-        Any {
+        Self {
             type_url: MOCK_MISBEHAVIOUR_TYPE_URL.to_string(),
-            value: Protobuf::<RawMisbehaviour>::encode_vec(&misbehaviour),
+            value: Protobuf::<RawMisbehaviour>::encode_vec(misbehaviour),
         }
     }
 }
diff --git a/ibc-testkit/src/testapp/ibc/clients/mock/mod.rs b/ibc-testkit/src/testapp/ibc/clients/mock/mod.rs
new file mode 100644
index 000000000..ec880383c
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/clients/mock/mod.rs
@@ -0,0 +1,10 @@
+//! Definitions of ibc mock types used in testing.
+pub mod client_state;
+pub mod consensus_state;
+pub mod header;
+pub mod misbehaviour;
+
+/// Re-exports mock proto types from the `ibc-proto` crate
+pub mod proto {
+    pub use ibc_proto::ibc::mock::*;
+}
diff --git a/ibc-testkit/src/testapp/ibc/clients/mod.rs b/ibc-testkit/src/testapp/ibc/clients/mod.rs
new file mode 100644
index 000000000..05fe539da
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/clients/mod.rs
@@ -0,0 +1,146 @@
+pub mod mock;
+
+use alloc::fmt::Debug;
+
+use basecoin_store::context::ProvableStore;
+use derive_more::From;
+use ibc::clients::tendermint::client_state::ClientState as TmClientState;
+use ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState;
+use ibc::clients::tendermint::types::{
+    ClientState as ClientStateType, ConsensusState as ConsensusStateType,
+    TENDERMINT_CLIENT_STATE_TYPE_URL, TENDERMINT_CONSENSUS_STATE_TYPE_URL,
+};
+use ibc::core::client::types::error::ClientError;
+use ibc::core::client::types::Height;
+use ibc::core::primitives::prelude::*;
+use ibc::derive::{ClientState, ConsensusState};
+use ibc::primitives::proto::{Any, Protobuf};
+
+use super::core::types::MockIbcStore;
+use crate::testapp::ibc::clients::mock::client_state::{
+    MockClientState, MOCK_CLIENT_STATE_TYPE_URL,
+};
+use crate::testapp::ibc::clients::mock::consensus_state::{
+    MockConsensusState, MOCK_CONSENSUS_STATE_TYPE_URL,
+};
+
+#[derive(Debug, Clone, From, PartialEq, ClientState)]
+#[validation(MockIbcStore<S: ProvableStore + Debug>)]
+#[execution(MockIbcStore<S: ProvableStore + Debug>)]
+pub enum AnyClientState {
+    Tendermint(TmClientState),
+    Mock(MockClientState),
+}
+
+impl AnyClientState {
+    pub fn latest_height(&self) -> Height {
+        match self {
+            Self::Tendermint(cs) => cs.inner().latest_height,
+            Self::Mock(cs) => cs.latest_height(),
+        }
+    }
+
+    pub fn is_frozen(&self) -> bool {
+        match self {
+            Self::Tendermint(cs) => cs.inner().is_frozen(),
+            Self::Mock(cs) => cs.is_frozen(),
+        }
+    }
+}
+
+impl Protobuf<Any> for AnyClientState {}
+
+impl TryFrom<Any> for AnyClientState {
+    type Error = ClientError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        if raw.type_url == TENDERMINT_CLIENT_STATE_TYPE_URL {
+            Ok(TmClientState::try_from(raw)?.into())
+        } else if raw.type_url == MOCK_CLIENT_STATE_TYPE_URL {
+            MockClientState::try_from(raw).map(Into::into)
+        } else {
+            Err(ClientError::Other {
+                description: "failed to deserialize message".to_string(),
+            })
+        }
+    }
+}
+
+impl From<AnyClientState> for Any {
+    fn from(host_client_state: AnyClientState) -> Self {
+        match host_client_state {
+            AnyClientState::Tendermint(cs) => cs.into(),
+            AnyClientState::Mock(cs) => cs.into(),
+        }
+    }
+}
+
+impl From<ClientStateType> for AnyClientState {
+    fn from(client_state: ClientStateType) -> Self {
+        Self::Tendermint(client_state.into())
+    }
+}
+
+impl From<ConsensusStateType> for AnyConsensusState {
+    fn from(consensus_state: ConsensusStateType) -> Self {
+        Self::Tendermint(consensus_state.into())
+    }
+}
+
+#[derive(Debug, Clone, From, PartialEq, Eq, ConsensusState)]
+pub enum AnyConsensusState {
+    Tendermint(TmConsensusState),
+    Mock(MockConsensusState),
+}
+
+impl TryFrom<Any> for AnyConsensusState {
+    type Error = ClientError;
+
+    fn try_from(raw: Any) -> Result<Self, Self::Error> {
+        if raw.type_url == TENDERMINT_CONSENSUS_STATE_TYPE_URL {
+            Ok(TmConsensusState::try_from(raw)?.into())
+        } else if raw.type_url == MOCK_CONSENSUS_STATE_TYPE_URL {
+            MockConsensusState::try_from(raw).map(Into::into)
+        } else {
+            Err(ClientError::Other {
+                description: "failed to deserialize message".to_string(),
+            })
+        }
+    }
+}
+
+impl From<AnyConsensusState> for Any {
+    fn from(host_consensus_state: AnyConsensusState) -> Self {
+        match host_consensus_state {
+            AnyConsensusState::Tendermint(cs) => cs.into(),
+            AnyConsensusState::Mock(cs) => cs.into(),
+        }
+    }
+}
+
+impl TryFrom<AnyConsensusState> for ConsensusStateType {
+    type Error = ClientError;
+
+    fn try_from(value: AnyConsensusState) -> Result<Self, Self::Error> {
+        match value {
+            AnyConsensusState::Tendermint(cs) => Ok(cs.inner().clone()),
+            _ => Err(ClientError::Other {
+                description: "failed to convert AnyConsensusState to TmConsensusState".to_string(),
+            }),
+        }
+    }
+}
+
+impl TryFrom<AnyConsensusState> for MockConsensusState {
+    type Error = ClientError;
+
+    fn try_from(value: AnyConsensusState) -> Result<Self, Self::Error> {
+        match value {
+            AnyConsensusState::Mock(cs) => Ok(cs),
+            _ => Err(ClientError::Other {
+                description: "failed to convert AnyConsensusState to MockConsensusState"
+                    .to_string(),
+            }),
+        }
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/core/client_ctx.rs b/ibc-testkit/src/testapp/ibc/core/client_ctx.rs
new file mode 100644
index 000000000..8c7bd8dd2
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/client_ctx.rs
@@ -0,0 +1,325 @@
+use core::fmt::Debug;
+
+use basecoin_store::context::{ProvableStore, Store};
+use basecoin_store::types::Height as StoreHeight;
+use ibc::core::client::context::{
+    ClientExecutionContext, ClientValidationContext, ExtClientValidationContext,
+};
+use ibc::core::client::types::error::ClientError;
+use ibc::core::client::types::Height;
+use ibc::core::handler::types::error::ContextError;
+use ibc::core::host::types::identifiers::{ChannelId, ClientId, PortId};
+use ibc::core::host::types::path::{
+    ClientConsensusStatePath, ClientStatePath, ClientUpdateHeightPath, ClientUpdateTimePath, Path,
+};
+use ibc::core::host::ValidationContext;
+use ibc::core::primitives::Timestamp;
+use ibc::primitives::prelude::*;
+
+use super::types::MockIbcStore;
+use crate::testapp::ibc::clients::mock::client_state::MockClientContext;
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+
+pub type PortChannelIdMap<V> = BTreeMap<PortId, BTreeMap<ChannelId, V>>;
+
+/// A mock of an IBC client record as it is stored in a mock context.
+/// For testing ICS02 handlers mostly, cf. `MockClientContext`.
+#[derive(Clone, Debug)]
+pub struct MockClientRecord {
+    /// The client state (representing only the latest height at the moment).
+    pub client_state: Option<AnyClientState>,
+
+    /// Mapping of heights to consensus states for this client.
+    pub consensus_states: BTreeMap<Height, AnyConsensusState>,
+}
+
+impl<S> MockClientContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    fn host_timestamp(&self) -> Result<Timestamp, ContextError> {
+        ValidationContext::host_timestamp(self)
+    }
+
+    fn host_height(&self) -> Result<Height, ContextError> {
+        ValidationContext::host_height(self)
+    }
+}
+
+impl<S> ExtClientValidationContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    fn host_timestamp(&self) -> Result<Timestamp, ContextError> {
+        ValidationContext::host_timestamp(self)
+    }
+
+    fn host_height(&self) -> Result<Height, ContextError> {
+        ValidationContext::host_height(self)
+    }
+
+    /// Returns the list of heights at which the consensus state of the given client was updated.
+    fn consensus_state_heights(&self, client_id: &ClientId) -> Result<Vec<Height>, ContextError> {
+        let path = format!("clients/{}/consensusStates", client_id)
+            .try_into()
+            .map_err(|_| ClientError::Other {
+                description: "Invalid consensus state path".into(),
+            })?;
+
+        self.consensus_state_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::ClientConsensusState(consensus_path)) = path.try_into() {
+                    Some(consensus_path)
+                } else {
+                    None
+                }
+            })
+            .map(|consensus_path| {
+                Ok(Height::new(
+                    consensus_path.revision_number,
+                    consensus_path.revision_height,
+                )?)
+            })
+            .collect::<Result<Vec<_>, _>>()
+    }
+
+    fn next_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::ConsensusStateRef>, ContextError> {
+        let path = format!("clients/{client_id}/consensusStates").into();
+
+        let keys = self.store.get_keys(&path);
+        let found_path = keys.into_iter().find_map(|path| {
+            if let Ok(Path::ClientConsensusState(path)) = path.try_into() {
+                if height
+                    < &Height::new(path.revision_number, path.revision_height).expect("no error")
+                {
+                    return Some(path);
+                }
+            }
+            None
+        });
+
+        let consensus_state = found_path
+            .map(|path| {
+                self.consensus_state_store
+                    .get(StoreHeight::Pending, &path)
+                    .ok_or_else(|| ClientError::ConsensusStateNotFound {
+                        client_id: client_id.clone(),
+                        height: *height,
+                    })
+            })
+            .transpose()?;
+
+        Ok(consensus_state)
+    }
+
+    fn prev_consensus_state(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<Option<Self::ConsensusStateRef>, ContextError> {
+        let path = format!("clients/{client_id}/consensusStates").into();
+
+        let keys = self.store.get_keys(&path);
+        let found_path = keys.into_iter().rev().find_map(|path| {
+            if let Ok(Path::ClientConsensusState(path)) = path.try_into() {
+                if height
+                    > &Height::new(path.revision_number, path.revision_height).expect("no error")
+                {
+                    return Some(path);
+                }
+            }
+            None
+        });
+
+        let consensus_state = found_path
+            .map(|path| {
+                self.consensus_state_store
+                    .get(StoreHeight::Pending, &path)
+                    .ok_or_else(|| ClientError::ConsensusStateNotFound {
+                        client_id: client_id.clone(),
+                        height: *height,
+                    })
+            })
+            .transpose()?;
+
+        Ok(consensus_state)
+    }
+}
+
+impl<S> ClientValidationContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    type ClientStateRef = AnyClientState;
+    type ConsensusStateRef = AnyConsensusState;
+
+    fn client_state(&self, client_id: &ClientId) -> Result<Self::ClientStateRef, ContextError> {
+        Ok(self
+            .client_state_store
+            .get(StoreHeight::Pending, &ClientStatePath(client_id.clone()))
+            .ok_or(ClientError::ClientStateNotFound {
+                client_id: client_id.clone(),
+            })?)
+    }
+
+    fn consensus_state(
+        &self,
+        client_cons_state_path: &ClientConsensusStatePath,
+    ) -> Result<AnyConsensusState, ContextError> {
+        let height = Height::new(
+            client_cons_state_path.revision_number,
+            client_cons_state_path.revision_height,
+        )
+        .map_err(|_| ClientError::InvalidHeight)?;
+        let consensus_state = self
+            .consensus_state_store
+            .get(StoreHeight::Pending, client_cons_state_path)
+            .ok_or(ClientError::ConsensusStateNotFound {
+                client_id: client_cons_state_path.client_id.clone(),
+                height,
+            })?;
+
+        Ok(consensus_state)
+    }
+
+    /// Returns the time and height when the client state for the given
+    /// [`ClientId`] was updated with a header for the given [`Height`]
+    fn client_update_meta(
+        &self,
+        client_id: &ClientId,
+        height: &Height,
+    ) -> Result<(Timestamp, Height), ContextError> {
+        let client_update_time_path = ClientUpdateTimePath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+        let processed_timestamp = self
+            .client_processed_times
+            .get(StoreHeight::Pending, &client_update_time_path)
+            .ok_or(ClientError::UpdateMetaDataNotFound {
+                client_id: client_id.clone(),
+                height: *height,
+            })?;
+        let client_update_height_path = ClientUpdateHeightPath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+        let processed_height = self
+            .client_processed_heights
+            .get(StoreHeight::Pending, &client_update_height_path)
+            .ok_or(ClientError::UpdateMetaDataNotFound {
+                client_id: client_id.clone(),
+                height: *height,
+            })?;
+
+        Ok((processed_timestamp, processed_height))
+    }
+}
+
+impl<S> ClientExecutionContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    type ClientStateMut = AnyClientState;
+
+    /// Called upon successful client creation and update
+    fn store_client_state(
+        &mut self,
+        client_state_path: ClientStatePath,
+        client_state: Self::ClientStateRef,
+    ) -> Result<(), ContextError> {
+        self.client_state_store
+            .set(client_state_path, client_state)
+            .map_err(|_| ClientError::Other {
+                description: "Client state store error".to_string(),
+            })?;
+
+        Ok(())
+    }
+
+    /// Called upon successful client creation and update
+    fn store_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+        consensus_state: Self::ConsensusStateRef,
+    ) -> Result<(), ContextError> {
+        self.consensus_state_store
+            .set(consensus_state_path, consensus_state)
+            .map_err(|_| ClientError::Other {
+                description: "Consensus state store error".to_string(),
+            })?;
+        Ok(())
+    }
+
+    fn delete_consensus_state(
+        &mut self,
+        consensus_state_path: ClientConsensusStatePath,
+    ) -> Result<(), ContextError> {
+        self.consensus_state_store.delete(consensus_state_path);
+        Ok(())
+    }
+
+    /// Delete the update metadata associated with the client at the specified
+    /// height.
+    fn delete_update_meta(
+        &mut self,
+        client_id: ClientId,
+        height: Height,
+    ) -> Result<(), ContextError> {
+        let client_update_time_path = ClientUpdateTimePath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+        self.client_processed_times.delete(client_update_time_path);
+        let client_update_height_path = ClientUpdateHeightPath::new(
+            client_id,
+            height.revision_number(),
+            height.revision_height(),
+        );
+        self.client_processed_heights
+            .delete(client_update_height_path);
+        Ok(())
+    }
+
+    /// Called upon successful client update. Implementations are expected to
+    /// use this to record the time and height at which this update (or header)
+    /// was processed.
+    fn store_update_meta(
+        &mut self,
+        client_id: ClientId,
+        height: Height,
+        host_timestamp: Timestamp,
+        host_height: Height,
+    ) -> Result<(), ContextError> {
+        let client_update_time_path = ClientUpdateTimePath::new(
+            client_id.clone(),
+            height.revision_number(),
+            height.revision_height(),
+        );
+        self.client_processed_times
+            .set(client_update_time_path, host_timestamp)
+            .map_err(|_| ClientError::Other {
+                description: "store update error".into(),
+            })?;
+        let client_update_height_path = ClientUpdateHeightPath::new(
+            client_id,
+            height.revision_number(),
+            height.revision_height(),
+        );
+        self.client_processed_heights
+            .set(client_update_height_path, host_height)
+            .map_err(|_| ClientError::Other {
+                description: "store update error".into(),
+            })?;
+        Ok(())
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/core/core_ctx.rs b/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
new file mode 100644
index 000000000..d650cccd1
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/core_ctx.rs
@@ -0,0 +1,838 @@
+//! Implementation of a global context mock. Used in testing handlers of all IBC modules.
+
+use core::fmt::Debug;
+use core::time::Duration;
+
+use basecoin_store::context::{ProvableStore, Store};
+use basecoin_store::types::Height as StoreHeight;
+use ibc::core::channel::types::channel::{ChannelEnd, IdentifiedChannelEnd};
+use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
+use ibc::core::channel::types::error::{ChannelError, PacketError};
+use ibc::core::channel::types::packet::{PacketState, Receipt};
+use ibc::core::client::context::consensus_state::ConsensusState;
+use ibc::core::client::types::error::ClientError;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::commitment::CommitmentPrefix;
+use ibc::core::commitment_types::merkle::MerkleProof;
+use ibc::core::connection::types::error::ConnectionError;
+use ibc::core::connection::types::{ConnectionEnd, IdentifiedConnectionEnd};
+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, CommitmentPath, ConnectionPath,
+    NextChannelSequencePath, NextClientSequencePath, NextConnectionSequencePath, Path, ReceiptPath,
+    SeqAckPath, SeqRecvPath, SeqSendPath,
+};
+use ibc::core::host::{ClientStateRef, ConsensusStateRef, ExecutionContext, ValidationContext};
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::{Signer, Timestamp};
+use ibc::primitives::ToVec;
+use ibc_proto::ibc::core::commitment::v1::MerkleProof as RawMerkleProof;
+use ibc_query::core::context::{ProvableContext, QueryContext};
+
+use super::types::{MockIbcStore, DEFAULT_BLOCK_TIME_SECS};
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+
+impl<S> ValidationContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    type V = Self;
+    type HostClientState = AnyClientState;
+    type HostConsensusState = AnyConsensusState;
+
+    fn host_height(&self) -> Result<Height, ContextError> {
+        Ok(Height::new(
+            *self.revision_number.lock(),
+            self.store.current_height(),
+        )?)
+    }
+
+    fn host_timestamp(&self) -> Result<Timestamp, ContextError> {
+        let host_height = self.host_height()?;
+        let host_cons_state = self.host_consensus_state(&host_height)?;
+        Ok(host_cons_state.timestamp())
+    }
+
+    fn client_counter(&self) -> Result<u64, ContextError> {
+        Ok(self
+            .client_counter
+            .get(StoreHeight::Pending, &NextClientSequencePath)
+            .ok_or(ClientError::Other {
+                description: "client counter not found".into(),
+            })?)
+    }
+
+    fn host_consensus_state(
+        &self,
+        height: &Height,
+    ) -> Result<Self::HostConsensusState, ContextError> {
+        let consensus_states_binding = self.host_consensus_states.lock();
+        Ok(consensus_states_binding
+            .get(&height.revision_height())
+            .cloned()
+            .ok_or(ClientError::MissingLocalConsensusState { height: *height })?)
+    }
+
+    fn validate_self_client(
+        &self,
+        client_state_of_host_on_counterparty: Self::HostClientState,
+    ) -> Result<(), ContextError> {
+        if client_state_of_host_on_counterparty.is_frozen() {
+            return Err(ClientError::ClientFrozen {
+                description: String::new(),
+            }
+            .into());
+        }
+
+        let latest_height = self.host_height()?;
+
+        let self_revision_number = latest_height.revision_number();
+        if self_revision_number
+            != client_state_of_host_on_counterparty
+                .latest_height()
+                .revision_number()
+        {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "client is not in the same revision as the chain. expected: {}, got: {}",
+                        self_revision_number,
+                        client_state_of_host_on_counterparty
+                            .latest_height()
+                            .revision_number()
+                    ),
+                },
+            ));
+        }
+
+        let host_current_height = latest_height.increment();
+        if client_state_of_host_on_counterparty.latest_height() >= host_current_height {
+            return Err(ContextError::ConnectionError(
+                ConnectionError::InvalidClientState {
+                    reason: format!(
+                        "client has latest height {} greater than or equal to chain height {}",
+                        client_state_of_host_on_counterparty.latest_height(),
+                        host_current_height
+                    ),
+                },
+            ));
+        }
+
+        Ok(())
+    }
+
+    fn connection_end(&self, conn_id: &ConnectionId) -> Result<ConnectionEnd, ContextError> {
+        Ok(self
+            .connection_end_store
+            .get(StoreHeight::Pending, &ConnectionPath::new(conn_id))
+            .ok_or(ConnectionError::ConnectionNotFound {
+                connection_id: conn_id.clone(),
+            })?)
+    }
+
+    fn commitment_prefix(&self) -> CommitmentPrefix {
+        // this is prefix of ibc store
+        // using a dummy prefix as in our mock context
+        CommitmentPrefix::try_from(b"mock".to_vec()).expect("Never fails")
+    }
+
+    fn connection_counter(&self) -> Result<u64, ContextError> {
+        Ok(self
+            .conn_counter
+            .get(StoreHeight::Pending, &NextConnectionSequencePath)
+            .ok_or(ConnectionError::Other {
+                description: "connection counter not found".into(),
+            })?)
+    }
+
+    fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError> {
+        Ok(self
+            .channel_end_store
+            .get(
+                StoreHeight::Pending,
+                &ChannelEndPath::new(&channel_end_path.0, &channel_end_path.1),
+            )
+            .ok_or(ChannelError::MissingChannel)?)
+    }
+
+    fn get_next_sequence_send(
+        &self,
+        seq_send_path: &SeqSendPath,
+    ) -> Result<Sequence, ContextError> {
+        Ok(self
+            .send_sequence_store
+            .get(
+                StoreHeight::Pending,
+                &SeqSendPath::new(&seq_send_path.0, &seq_send_path.1),
+            )
+            .ok_or(PacketError::ImplementationSpecific)?)
+    }
+
+    fn get_next_sequence_recv(
+        &self,
+        seq_recv_path: &SeqRecvPath,
+    ) -> Result<Sequence, ContextError> {
+        Ok(self
+            .recv_sequence_store
+            .get(
+                StoreHeight::Pending,
+                &SeqRecvPath::new(&seq_recv_path.0, &seq_recv_path.1),
+            )
+            .ok_or(PacketError::ImplementationSpecific)?)
+    }
+
+    fn get_next_sequence_ack(&self, seq_ack_path: &SeqAckPath) -> Result<Sequence, ContextError> {
+        Ok(self
+            .ack_sequence_store
+            .get(
+                StoreHeight::Pending,
+                &SeqAckPath::new(&seq_ack_path.0, &seq_ack_path.1),
+            )
+            .ok_or(PacketError::ImplementationSpecific)?)
+    }
+
+    fn get_packet_commitment(
+        &self,
+        commitment_path: &CommitmentPath,
+    ) -> Result<PacketCommitment, ContextError> {
+        Ok(self
+            .packet_commitment_store
+            .get(
+                StoreHeight::Pending,
+                &CommitmentPath::new(
+                    &commitment_path.port_id,
+                    &commitment_path.channel_id,
+                    commitment_path.sequence,
+                ),
+            )
+            .ok_or(PacketError::ImplementationSpecific)?)
+    }
+
+    fn get_packet_receipt(&self, receipt_path: &ReceiptPath) -> Result<Receipt, ContextError> {
+        Ok(self
+            .packet_receipt_store
+            .is_path_set(
+                StoreHeight::Pending,
+                &ReceiptPath::new(
+                    &receipt_path.port_id,
+                    &receipt_path.channel_id,
+                    receipt_path.sequence,
+                ),
+            )
+            .then_some(Receipt::Ok)
+            .ok_or(PacketError::PacketReceiptNotFound {
+                sequence: receipt_path.sequence,
+            })?)
+    }
+
+    fn get_packet_acknowledgement(
+        &self,
+        ack_path: &AckPath,
+    ) -> Result<AcknowledgementCommitment, ContextError> {
+        Ok(self
+            .packet_ack_store
+            .get(
+                StoreHeight::Pending,
+                &AckPath::new(&ack_path.port_id, &ack_path.channel_id, ack_path.sequence),
+            )
+            .ok_or(PacketError::PacketAcknowledgementNotFound {
+                sequence: ack_path.sequence,
+            })?)
+    }
+
+    /// Returns a counter of the number of channel ids that have been created thus far.
+    /// The value of this counter should increase only via the
+    /// `ChannelKeeper::increase_channel_counter` method.
+    fn channel_counter(&self) -> Result<u64, ContextError> {
+        Ok(self
+            .channel_counter
+            .get(StoreHeight::Pending, &NextChannelSequencePath)
+            .ok_or(ChannelError::Other {
+                description: "channel counter not found".into(),
+            })?)
+    }
+
+    /// Returns the maximum expected time per block
+    fn max_expected_time_per_block(&self) -> Duration {
+        Duration::from_secs(DEFAULT_BLOCK_TIME_SECS)
+    }
+
+    fn validate_message_signer(&self, _signer: &Signer) -> Result<(), ContextError> {
+        Ok(())
+    }
+
+    fn get_client_validation_context(&self) -> &Self::V {
+        self
+    }
+}
+
+/// Trait to provide proofs in gRPC service blanket implementations.
+impl<S> ProvableContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    /// Returns the proof for the given [`Height`] and [`Path`]
+    fn get_proof(&self, height: Height, path: &Path) -> Option<Vec<u8>> {
+        self.store
+            .get_proof(height.revision_height().into(), &path.to_string().into())
+            .map(|path_proof| {
+                let ibc_commitment_proof = self
+                    .ibc_commiment_proofs
+                    .lock()
+                    .get(&height.revision_height())
+                    .expect("proof exists")
+                    .clone();
+
+                RawMerkleProof::from(MerkleProof {
+                    proofs: vec![path_proof, ibc_commitment_proof],
+                })
+            })
+            .map(|p| p.to_vec())
+    }
+}
+
+/// Trait to complete the gRPC service blanket implementations.
+impl<S> QueryContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    /// Returns the list of all client states.
+    fn client_states(&self) -> Result<Vec<(ClientId, ClientStateRef<Self>)>, ContextError> {
+        let path = "clients".to_owned().into();
+
+        self.client_state_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::ClientState(client_path)) = path.try_into() {
+                    Some(client_path)
+                } else {
+                    None
+                }
+            })
+            .map(|client_state_path| {
+                let client_state = self
+                    .client_state_store
+                    .get(StoreHeight::Pending, &client_state_path)
+                    .ok_or_else(|| ClientError::ClientStateNotFound {
+                        client_id: client_state_path.0.clone(),
+                    })?;
+                Ok((client_state_path.0, client_state))
+            })
+            .collect()
+    }
+
+    /// Returns the list of all consensus states of the given client.
+    fn consensus_states(
+        &self,
+        client_id: &ClientId,
+    ) -> Result<Vec<(Height, ConsensusStateRef<Self>)>, ContextError> {
+        let path = format!("clients/{}/consensusStates", client_id)
+            .try_into()
+            .map_err(|_| ClientError::Other {
+                description: "Invalid consensus state path".into(),
+            })?;
+
+        self.consensus_state_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::ClientConsensusState(consensus_path)) = path.try_into() {
+                    Some(consensus_path)
+                } else {
+                    None
+                }
+            })
+            .map(|consensus_path| {
+                let height = Height::new(
+                    consensus_path.revision_number,
+                    consensus_path.revision_height,
+                )?;
+                let client_state = self
+                    .consensus_state_store
+                    .get(StoreHeight::Pending, &consensus_path)
+                    .ok_or({
+                        ClientError::ConsensusStateNotFound {
+                            client_id: consensus_path.client_id,
+                            height,
+                        }
+                    })?;
+                Ok((height, client_state))
+            })
+            .collect()
+    }
+
+    /// Returns the list of heights at which the consensus state of the given client was updated.
+    fn consensus_state_heights(&self, client_id: &ClientId) -> Result<Vec<Height>, ContextError> {
+        let path = format!("clients/{}/consensusStates", client_id)
+            .try_into()
+            .map_err(|_| ClientError::Other {
+                description: "Invalid consensus state path".into(),
+            })?;
+
+        self.consensus_state_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::ClientConsensusState(consensus_path)) = path.try_into() {
+                    Some(consensus_path)
+                } else {
+                    None
+                }
+            })
+            .map(|consensus_path| {
+                Ok(Height::new(
+                    consensus_path.revision_number,
+                    consensus_path.revision_height,
+                )?)
+            })
+            .collect::<Result<Vec<_>, _>>()
+    }
+
+    /// Returns all the IBC connection ends of a chain.
+    fn connection_ends(&self) -> Result<Vec<IdentifiedConnectionEnd>, ContextError> {
+        let path = "connections".to_owned().into();
+
+        self.connection_end_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::Connection(connection_path)) = path.try_into() {
+                    Some(connection_path)
+                } else {
+                    None
+                }
+            })
+            .map(|connection_path| {
+                let connection_end = self
+                    .connection_end_store
+                    .get(StoreHeight::Pending, &connection_path)
+                    .ok_or_else(|| ConnectionError::ConnectionNotFound {
+                        connection_id: connection_path.0.clone(),
+                    })?;
+                Ok(IdentifiedConnectionEnd {
+                    connection_id: connection_path.0,
+                    connection_end,
+                })
+            })
+            .collect()
+    }
+
+    /// Returns all the IBC connection ends associated with a client.
+    fn client_connection_ends(
+        &self,
+        client_id: &ClientId,
+    ) -> Result<Vec<ConnectionId>, ContextError> {
+        let client_connection_path = ClientConnectionPath::new(client_id.clone());
+
+        Ok(self
+            .connection_ids_store
+            .get(StoreHeight::Pending, &client_connection_path)
+            .unwrap_or_default())
+    }
+
+    /// Returns all the IBC channel ends of a chain.
+    fn channel_ends(&self) -> Result<Vec<IdentifiedChannelEnd>, ContextError> {
+        let path = "channelEnds".to_owned().into();
+
+        self.channel_end_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::ChannelEnd(channel_path)) = path.try_into() {
+                    Some(channel_path)
+                } else {
+                    None
+                }
+            })
+            .map(|channel_path| {
+                let channel_end = self
+                    .channel_end_store
+                    .get(StoreHeight::Pending, &channel_path)
+                    .ok_or_else(|| ChannelError::ChannelNotFound {
+                        port_id: channel_path.0.clone(),
+                        channel_id: channel_path.1.clone(),
+                    })?;
+                Ok(IdentifiedChannelEnd {
+                    port_id: channel_path.0,
+                    channel_id: channel_path.1,
+                    channel_end,
+                })
+            })
+            .collect()
+    }
+
+    /// Returns all the packet commitments associated with a channel.
+    fn packet_commitments(
+        &self,
+        channel_end_path: &ChannelEndPath,
+    ) -> Result<Vec<PacketState>, ContextError> {
+        let path = format!(
+            "commitments/ports/{}/channels/{}/sequences",
+            channel_end_path.0, channel_end_path.1
+        )
+        .try_into()
+        .map_err(|_| PacketError::Other {
+            description: "Invalid commitment path".into(),
+        })?;
+
+        self.packet_commitment_store
+            .get_keys(&path)
+            .into_iter()
+            .filter_map(|path| {
+                if let Ok(Path::Commitment(commitment_path)) = path.try_into() {
+                    Some(commitment_path)
+                } else {
+                    None
+                }
+            })
+            .filter(|commitment_path| {
+                self.packet_commitment_store
+                    .get(StoreHeight::Pending, commitment_path)
+                    .is_some()
+            })
+            .map(|commitment_path| {
+                self.get_packet_commitment(&commitment_path)
+                    .map(|packet| PacketState {
+                        seq: commitment_path.sequence,
+                        port_id: commitment_path.port_id,
+                        chan_id: commitment_path.channel_id,
+                        data: packet.as_ref().into(),
+                    })
+            })
+            .collect::<Result<Vec<_>, _>>()
+    }
+
+    /// Returns the acknowledged packets associated with a channel.
+    ///
+    /// Takes a sequence list as an argument.
+    /// If the list set is empty, it returns all acknowledged packets.
+    fn packet_acknowledgements(
+        &self,
+        channel_end_path: &ChannelEndPath,
+        sequences: impl ExactSizeIterator<Item = Sequence>,
+    ) -> Result<Vec<PacketState>, ContextError> {
+        let collected_paths: Vec<_> = if sequences.len() == 0 {
+            // if sequences is empty, return all the acks
+            let ack_path_prefix = format!(
+                "acks/ports/{}/channels/{}/sequences",
+                channel_end_path.0, channel_end_path.1
+            )
+            .try_into()
+            .map_err(|_| PacketError::Other {
+                description: "Invalid ack path".into(),
+            })?;
+
+            self.packet_ack_store
+                .get_keys(&ack_path_prefix)
+                .into_iter()
+                .filter_map(|path| {
+                    if let Ok(Path::Ack(ack_path)) = path.try_into() {
+                        Some(ack_path)
+                    } else {
+                        None
+                    }
+                })
+                .collect()
+        } else {
+            sequences
+                .into_iter()
+                .map(|seq| AckPath::new(&channel_end_path.0, &channel_end_path.1, seq))
+                .collect()
+        };
+
+        collected_paths
+            .into_iter()
+            .filter(|ack_path| {
+                self.packet_ack_store
+                    .get(StoreHeight::Pending, ack_path)
+                    .is_some()
+            })
+            .map(|ack_path| {
+                self.get_packet_acknowledgement(&ack_path)
+                    .map(|packet| PacketState {
+                        seq: ack_path.sequence,
+                        port_id: ack_path.port_id,
+                        chan_id: ack_path.channel_id,
+                        data: packet.as_ref().into(),
+                    })
+            })
+            .collect::<Result<Vec<_>, _>>()
+    }
+
+    /// Returns the unreceived IBC packets associated with a channel and sequences.
+    ///
+    /// Takes a sequence list as an argument.
+    fn unreceived_packets(
+        &self,
+        channel_end_path: &ChannelEndPath,
+        sequences: impl ExactSizeIterator<Item = Sequence>,
+    ) -> Result<Vec<Sequence>, ContextError> {
+        // QUESTION. Currently only works for unordered channels; ordered channels
+        // don't use receipts. However, ibc-go does it this way. Investigate if
+        // this query only ever makes sense on unordered channels.
+
+        Ok(sequences
+            .into_iter()
+            .map(|seq| ReceiptPath::new(&channel_end_path.0, &channel_end_path.1, seq))
+            .filter(|receipt_path| {
+                self.packet_receipt_store
+                    .get(StoreHeight::Pending, receipt_path)
+                    .is_none()
+            })
+            .map(|receipts_path| receipts_path.sequence)
+            .collect())
+    }
+
+    /// Returns all the unreceived IBC acknowledgements associated with a channel and sequences.
+    ///
+    /// Takes a sequence list as an argument.
+    /// If the list is empty, it Returns all the unreceived acks.
+    fn unreceived_acks(
+        &self,
+        channel_end_path: &ChannelEndPath,
+        sequences: impl ExactSizeIterator<Item = Sequence>,
+    ) -> Result<Vec<Sequence>, ContextError> {
+        let collected_paths: Vec<_> = if sequences.len() == 0 {
+            // if sequences is empty, return all the acks
+            let commitment_path_prefix = format!(
+                "commitments/ports/{}/channels/{}/sequences",
+                channel_end_path.0, channel_end_path.1
+            )
+            .try_into()
+            .map_err(|_| PacketError::Other {
+                description: "Invalid commitment path".into(),
+            })?;
+
+            self.packet_commitment_store
+                .get_keys(&commitment_path_prefix)
+                .into_iter()
+                .filter_map(|path| {
+                    if let Ok(Path::Commitment(commitment_path)) = path.try_into() {
+                        Some(commitment_path)
+                    } else {
+                        None
+                    }
+                })
+                .collect()
+        } else {
+            sequences
+                .into_iter()
+                .map(|seq| CommitmentPath::new(&channel_end_path.0, &channel_end_path.1, seq))
+                .collect()
+        };
+
+        Ok(collected_paths
+            .into_iter()
+            .filter(|commitment_path: &CommitmentPath| -> bool {
+                self.packet_commitment_store
+                    .get(StoreHeight::Pending, commitment_path)
+                    .is_some()
+            })
+            .map(|commitment_path| commitment_path.sequence)
+            .collect())
+    }
+}
+
+impl<S> ExecutionContext for MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    type E = Self;
+
+    fn get_client_execution_context(&mut self) -> &mut Self::E {
+        self
+    }
+
+    /// Called upon client creation.
+    /// Increases the counter, that keeps track of how many clients have been created.
+    fn increase_client_counter(&mut self) -> Result<(), ContextError> {
+        let current_sequence = self
+            .client_counter
+            .get(StoreHeight::Pending, &NextClientSequencePath)
+            .ok_or(ClientError::Other {
+                description: "client counter not found".into(),
+            })?;
+
+        self.client_counter
+            .set(NextClientSequencePath, current_sequence + 1)
+            .map_err(|e| ClientError::Other {
+                description: format!("client counter update failed: {e:?}"),
+            })?;
+
+        Ok(())
+    }
+
+    /// Stores the given connection_end at path
+    fn store_connection(
+        &mut self,
+        connection_path: &ConnectionPath,
+        connection_end: ConnectionEnd,
+    ) -> Result<(), ContextError> {
+        self.connection_end_store
+            .set(connection_path.clone(), connection_end)
+            .map_err(|_| ConnectionError::Other {
+                description: "Connection end store error".to_string(),
+            })?;
+        Ok(())
+    }
+
+    /// Stores the given connection_id at a path associated with the client_id.
+    fn store_connection_to_client(
+        &mut self,
+        client_connection_path: &ClientConnectionPath,
+        conn_id: ConnectionId,
+    ) -> Result<(), ContextError> {
+        let mut conn_ids: Vec<ConnectionId> = self
+            .connection_ids_store
+            .get(StoreHeight::Pending, client_connection_path)
+            .unwrap_or_default();
+        conn_ids.push(conn_id);
+        self.connection_ids_store
+            .set(client_connection_path.clone(), conn_ids)
+            .map_err(|_| ConnectionError::Other {
+                description: "Connection ids store error".to_string(),
+            })?;
+        Ok(())
+    }
+
+    /// Called upon connection identifier creation (Init or Try process).
+    /// Increases the counter, that keeps track of how many connections have been created.
+    fn increase_connection_counter(&mut self) -> Result<(), ContextError> {
+        let current_sequence = self
+            .conn_counter
+            .get(StoreHeight::Pending, &NextConnectionSequencePath)
+            .ok_or(ConnectionError::Other {
+                description: "connection counter not found".into(),
+            })?;
+
+        self.conn_counter
+            .set(NextConnectionSequencePath, current_sequence + 1)
+            .map_err(|e| ConnectionError::Other {
+                description: format!("connection counter update failed: {e:?}"),
+            })?;
+
+        Ok(())
+    }
+
+    fn store_packet_commitment(
+        &mut self,
+        commitment_path: &CommitmentPath,
+        commitment: PacketCommitment,
+    ) -> Result<(), ContextError> {
+        self.packet_commitment_store
+            .set(commitment_path.clone(), commitment)
+            .map_err(|_| PacketError::ImplementationSpecific)?;
+        Ok(())
+    }
+
+    fn delete_packet_commitment(
+        &mut self,
+        commitment_path: &CommitmentPath,
+    ) -> Result<(), ContextError> {
+        self.packet_commitment_store.delete(commitment_path.clone());
+        Ok(())
+    }
+
+    fn store_packet_receipt(
+        &mut self,
+        receipt_path: &ReceiptPath,
+        _receipt: Receipt,
+    ) -> Result<(), ContextError> {
+        self.packet_receipt_store
+            .set_path(receipt_path.clone())
+            .map_err(|_| PacketError::ImplementationSpecific)?;
+        Ok(())
+    }
+
+    fn store_packet_acknowledgement(
+        &mut self,
+        ack_path: &AckPath,
+        ack_commitment: AcknowledgementCommitment,
+    ) -> Result<(), ContextError> {
+        self.packet_ack_store
+            .set(ack_path.clone(), ack_commitment)
+            .map_err(|_| PacketError::ImplementationSpecific)?;
+        Ok(())
+    }
+
+    fn delete_packet_acknowledgement(&mut self, ack_path: &AckPath) -> Result<(), ContextError> {
+        self.packet_ack_store.delete(ack_path.clone());
+        Ok(())
+    }
+
+    fn store_channel(
+        &mut self,
+        channel_end_path: &ChannelEndPath,
+        channel_end: ChannelEnd,
+    ) -> Result<(), ContextError> {
+        self.channel_end_store
+            .set(channel_end_path.clone(), channel_end)
+            .map_err(|_| ChannelError::Other {
+                description: "Channel end store error".to_string(),
+            })?;
+        Ok(())
+    }
+
+    fn store_next_sequence_send(
+        &mut self,
+        seq_send_path: &SeqSendPath,
+        seq: Sequence,
+    ) -> Result<(), ContextError> {
+        self.send_sequence_store
+            .set(seq_send_path.clone(), seq)
+            .map_err(|_| PacketError::ImplementationSpecific)?;
+        Ok(())
+    }
+
+    fn store_next_sequence_recv(
+        &mut self,
+        seq_recv_path: &SeqRecvPath,
+        seq: Sequence,
+    ) -> Result<(), ContextError> {
+        self.recv_sequence_store
+            .set(seq_recv_path.clone(), seq)
+            .map_err(|_| PacketError::ImplementationSpecific)?;
+        Ok(())
+    }
+
+    fn store_next_sequence_ack(
+        &mut self,
+        seq_ack_path: &SeqAckPath,
+        seq: Sequence,
+    ) -> Result<(), ContextError> {
+        self.ack_sequence_store
+            .set(seq_ack_path.clone(), seq)
+            .map_err(|_| PacketError::ImplementationSpecific)?;
+        Ok(())
+    }
+
+    fn increase_channel_counter(&mut self) -> Result<(), ContextError> {
+        let current_sequence = self
+            .channel_counter
+            .get(StoreHeight::Pending, &NextChannelSequencePath)
+            .ok_or(ChannelError::Other {
+                description: "channel counter not found".into(),
+            })?;
+
+        self.channel_counter
+            .set(NextChannelSequencePath, current_sequence + 1)
+            .map_err(|e| ChannelError::Other {
+                description: format!("channel counter update failed: {e:?}"),
+            })?;
+
+        Ok(())
+    }
+
+    fn emit_ibc_event(&mut self, event: IbcEvent) -> Result<(), ContextError> {
+        self.events.lock().push(event);
+        Ok(())
+    }
+
+    fn log_message(&mut self, message: String) -> Result<(), ContextError> {
+        self.logs.lock().push(message);
+        Ok(())
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/core/mod.rs b/ibc-testkit/src/testapp/ibc/core/mod.rs
new file mode 100644
index 000000000..052ffa92e
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/mod.rs
@@ -0,0 +1,4 @@
+pub mod client_ctx;
+pub mod core_ctx;
+pub mod router;
+pub mod types;
diff --git a/ibc-testkit/src/testapp/ibc/core/router/context.rs b/ibc-testkit/src/testapp/ibc/core/router/context.rs
new file mode 100644
index 000000000..aa8faefc8
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/router/context.rs
@@ -0,0 +1,33 @@
+use alloc::sync::Arc;
+
+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;
+
+use super::types::MockRouter;
+
+impl Router for MockRouter {
+    fn get_route(&self, module_id: &ModuleId) -> Option<&dyn Module> {
+        self.router.get(module_id).map(Arc::as_ref)
+    }
+    fn get_route_mut(&mut self, module_id: &ModuleId) -> Option<&mut dyn Module> {
+        // NOTE: The following:
+
+        // self.router.get_mut(module_id).and_then(Arc::get_mut)
+
+        // doesn't work due to a compiler bug. So we expand it out manually.
+
+        match self.router.get_mut(module_id) {
+            Some(arc_mod) => match Arc::get_mut(arc_mod) {
+                Some(m) => Some(m),
+                None => None,
+            },
+            None => None,
+        }
+    }
+
+    fn lookup_module(&self, port_id: &PortId) -> Option<ModuleId> {
+        self.port_to_module.get(port_id).cloned()
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/core/router/mod.rs b/ibc-testkit/src/testapp/ibc/core/router/mod.rs
new file mode 100644
index 000000000..faaf47994
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/router/mod.rs
@@ -0,0 +1,4 @@
+mod context;
+mod types;
+
+pub use self::types::*;
diff --git a/ibc-testkit/src/testapp/ibc/core/router/types.rs b/ibc-testkit/src/testapp/ibc/core/router/types.rs
new file mode 100644
index 000000000..739c0ba4f
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/router/types.rs
@@ -0,0 +1,50 @@
+use alloc::sync::Arc;
+
+use ibc::apps::transfer::types::MODULE_ID_STR;
+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;
+
+use crate::testapp::ibc::applications::transfer::types::DummyTransferModule;
+
+#[derive(Debug, Default)]
+pub struct MockRouter {
+    pub router: BTreeMap<ModuleId, Arc<dyn Module>>,
+
+    /// Maps ports to the module that owns it
+    pub port_to_module: BTreeMap<PortId, ModuleId>,
+}
+
+impl MockRouter {
+    pub fn new_with_transfer() -> Self {
+        let mut router = Self::default();
+
+        let module_id = ModuleId::new(MODULE_ID_STR.to_string());
+
+        router.scope_port_to_module(PortId::transfer(), module_id.clone());
+
+        let transfer_mod = DummyTransferModule::new();
+
+        router
+            .add_route(module_id, transfer_mod)
+            .expect("Never fails");
+
+        router
+    }
+
+    pub fn add_route(
+        &mut self,
+        module_id: ModuleId,
+        module: impl Module + 'static,
+    ) -> Result<(), String> {
+        match self.router.insert(module_id, Arc::new(module)) {
+            None => Ok(()),
+            Some(_) => Err("Duplicate module_id".to_owned()),
+        }
+    }
+
+    pub fn scope_port_to_module(&mut self, port_id: PortId, module_id: ModuleId) {
+        self.port_to_module.insert(port_id, module_id);
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/core/types.rs b/ibc-testkit/src/testapp/ibc/core/types.rs
new file mode 100644
index 000000000..a1296cf6a
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/core/types.rs
@@ -0,0 +1,504 @@
+//! Implementation of a global context mock. Used in testing handlers of all IBC modules.
+
+use alloc::sync::Arc;
+use core::fmt::Debug;
+
+use basecoin_store::context::{ProvableStore, Store};
+use basecoin_store::impls::SharedStore;
+use basecoin_store::types::{BinStore, JsonStore, ProtobufStore, TypedSet, TypedStore};
+use ibc::core::channel::types::channel::ChannelEnd;
+use ibc::core::channel::types::commitment::{AcknowledgementCommitment, PacketCommitment};
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::ConnectionEnd;
+use ibc::core::handler::types::events::IbcEvent;
+use ibc::core::host::types::identifiers::{ConnectionId, Sequence};
+use ibc::core::host::types::path::{
+    AckPath, ChannelEndPath, ClientConnectionPath, ClientConsensusStatePath, ClientStatePath,
+    ClientUpdateHeightPath, ClientUpdateTimePath, CommitmentPath, ConnectionPath,
+    NextChannelSequencePath, NextClientSequencePath, NextConnectionSequencePath, ReceiptPath,
+    SeqAckPath, SeqRecvPath, SeqSendPath,
+};
+use ibc::core::primitives::prelude::*;
+use ibc::core::primitives::Timestamp;
+use ibc_proto::google::protobuf::Any;
+use ibc_proto::ibc::core::channel::v1::Channel as RawChannelEnd;
+use ibc_proto::ibc::core::client::v1::Height as RawHeight;
+use ibc_proto::ibc::core::connection::v1::ConnectionEnd as RawConnectionEnd;
+use ibc_proto::ics23::CommitmentProof;
+use parking_lot::Mutex;
+use typed_builder::TypedBuilder;
+
+use crate::context::{MockStore, TestContext};
+use crate::fixtures::core::context::TestContextConfig;
+use crate::hosts::{HostClientState, TestBlock, TestHeader, TestHost};
+use crate::testapp::ibc::clients::mock::header::MockHeader;
+use crate::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+pub const DEFAULT_BLOCK_TIME_SECS: u64 = 3;
+
+pub type DefaultIbcStore = MockIbcStore<MockStore>;
+
+/// An object that stores all IBC related data.
+#[derive(Debug)]
+pub struct MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    /// chain revision number,
+    pub revision_number: Arc<Mutex<u64>>,
+
+    /// Handle to store instance.
+    /// The module is guaranteed exclusive access to all paths in the store key-space.
+    pub store: SharedStore<S>,
+    /// A typed-store for next client counter sequence
+    pub client_counter: JsonStore<SharedStore<S>, NextClientSequencePath, u64>,
+    /// A typed-store for next connection counter sequence
+    pub conn_counter: JsonStore<SharedStore<S>, NextConnectionSequencePath, u64>,
+    /// A typed-store for next channel counter sequence
+    pub channel_counter: JsonStore<SharedStore<S>, NextChannelSequencePath, u64>,
+    /// Tracks the processed time for client updates
+    pub client_processed_times: JsonStore<SharedStore<S>, ClientUpdateTimePath, Timestamp>,
+    /// A typed-store to track the processed height for client updates
+    pub client_processed_heights:
+        ProtobufStore<SharedStore<S>, ClientUpdateHeightPath, Height, RawHeight>,
+    /// A typed-store for AnyClientState
+    pub client_state_store: ProtobufStore<SharedStore<S>, ClientStatePath, AnyClientState, Any>,
+    /// A typed-store for AnyConsensusState
+    pub consensus_state_store:
+        ProtobufStore<SharedStore<S>, ClientConsensusStatePath, AnyConsensusState, Any>,
+    /// A typed-store for ConnectionEnd
+    pub connection_end_store:
+        ProtobufStore<SharedStore<S>, ConnectionPath, ConnectionEnd, RawConnectionEnd>,
+    /// A typed-store for ConnectionIds
+    pub connection_ids_store: JsonStore<SharedStore<S>, ClientConnectionPath, Vec<ConnectionId>>,
+    /// A typed-store for ChannelEnd
+    pub channel_end_store: ProtobufStore<SharedStore<S>, ChannelEndPath, ChannelEnd, RawChannelEnd>,
+    /// A typed-store for send sequences
+    pub send_sequence_store: JsonStore<SharedStore<S>, SeqSendPath, Sequence>,
+    /// A typed-store for receive sequences
+    pub recv_sequence_store: JsonStore<SharedStore<S>, SeqRecvPath, Sequence>,
+    /// A typed-store for ack sequences
+    pub ack_sequence_store: JsonStore<SharedStore<S>, SeqAckPath, Sequence>,
+    /// A typed-store for packet commitments
+    pub packet_commitment_store: BinStore<SharedStore<S>, CommitmentPath, PacketCommitment>,
+    /// A typed-store for packet receipts
+    pub packet_receipt_store: TypedSet<SharedStore<S>, ReceiptPath>,
+    /// A typed-store for packet ack
+    pub packet_ack_store: BinStore<SharedStore<S>, AckPath, AcknowledgementCommitment>,
+    /// Map of host consensus states
+    pub host_consensus_states: Arc<Mutex<BTreeMap<u64, AnyConsensusState>>>,
+    /// Map of older ibc commitment proofs
+    pub ibc_commiment_proofs: Arc<Mutex<BTreeMap<u64, CommitmentProof>>>,
+    /// IBC Events
+    pub events: Arc<Mutex<Vec<IbcEvent>>>,
+    /// message logs
+    pub logs: Arc<Mutex<Vec<String>>>,
+}
+
+impl<S> MockIbcStore<S>
+where
+    S: ProvableStore + Debug,
+{
+    pub fn new(revision_number: u64, store: S) -> Self {
+        let shared_store = SharedStore::new(store);
+
+        let mut client_counter = TypedStore::new(shared_store.clone());
+        let mut conn_counter = TypedStore::new(shared_store.clone());
+        let mut channel_counter = TypedStore::new(shared_store.clone());
+
+        client_counter
+            .set(NextClientSequencePath, 0)
+            .expect("no error");
+
+        conn_counter
+            .set(NextConnectionSequencePath, 0)
+            .expect("no error");
+
+        channel_counter
+            .set(NextChannelSequencePath, 0)
+            .expect("no error");
+
+        Self {
+            revision_number: Arc::new(Mutex::new(revision_number)),
+            client_counter,
+            conn_counter,
+            channel_counter,
+            client_processed_times: TypedStore::new(shared_store.clone()),
+            client_processed_heights: TypedStore::new(shared_store.clone()),
+            host_consensus_states: Arc::new(Mutex::new(Default::default())),
+            ibc_commiment_proofs: Arc::new(Mutex::new(Default::default())),
+            client_state_store: TypedStore::new(shared_store.clone()),
+            consensus_state_store: TypedStore::new(shared_store.clone()),
+            connection_end_store: TypedStore::new(shared_store.clone()),
+            connection_ids_store: TypedStore::new(shared_store.clone()),
+            channel_end_store: TypedStore::new(shared_store.clone()),
+            send_sequence_store: TypedStore::new(shared_store.clone()),
+            recv_sequence_store: TypedStore::new(shared_store.clone()),
+            ack_sequence_store: TypedStore::new(shared_store.clone()),
+            packet_commitment_store: TypedStore::new(shared_store.clone()),
+            packet_receipt_store: TypedStore::new(shared_store.clone()),
+            packet_ack_store: TypedStore::new(shared_store.clone()),
+            events: Arc::new(Mutex::new(Vec::new())),
+            logs: Arc::new(Mutex::new(Vec::new())),
+            store: shared_store,
+        }
+    }
+
+    fn store_host_consensus_state(&mut self, height: u64, consensus_state: AnyConsensusState) {
+        self.host_consensus_states
+            .lock()
+            .insert(height, consensus_state);
+    }
+
+    fn store_ibc_commitment_proof(&mut self, height: u64, proof: CommitmentProof) {
+        self.ibc_commiment_proofs.lock().insert(height, proof);
+    }
+
+    pub fn begin_block(
+        &mut self,
+        height: u64,
+        consensus_state: AnyConsensusState,
+        proof: CommitmentProof,
+    ) {
+        assert_eq!(self.store.current_height(), height);
+        self.store_host_consensus_state(height, consensus_state);
+        self.store_ibc_commitment_proof(height, proof);
+    }
+
+    pub fn end_block(&mut self) -> Result<Vec<u8>, <SharedStore<S> as Store>::Error> {
+        self.store.commit()
+    }
+
+    pub fn prune_host_consensus_states_till(&self, height: &Height) {
+        assert!(height.revision_number() == *self.revision_number.lock());
+        let mut history = self.host_consensus_states.lock();
+        history.retain(|h, _| h > &height.revision_height());
+        let mut commitment_proofs = self.ibc_commiment_proofs.lock();
+        commitment_proofs.retain(|h, _| h > &height.revision_height());
+    }
+}
+
+impl<S> Default for MockIbcStore<S>
+where
+    S: ProvableStore + Debug + Default,
+{
+    fn default() -> Self {
+        // Note: this creates a MockIbcStore which has MockConsensusState as Host ConsensusState
+        let mut ibc_store = Self::new(0, S::default());
+        ibc_store.store.commit().expect("no error");
+        ibc_store.store_host_consensus_state(
+            ibc_store.store.current_height(),
+            MockHeader::default().into_consensus_state().into(),
+        );
+        ibc_store.store_ibc_commitment_proof(
+            ibc_store.store.current_height(),
+            CommitmentProof::default(),
+        );
+        ibc_store
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use ibc::core::channel::types::acknowledgement::Acknowledgement;
+    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::types::identifiers::{ChannelId, PortId};
+    use ibc::core::primitives::Signer;
+    use ibc::core::router::module::Module;
+    use ibc::core::router::router::Router;
+    use ibc::core::router::types::module::{ModuleExtras, ModuleId};
+
+    use super::*;
+    use crate::fixtures::core::channel::PacketConfig;
+    use crate::fixtures::core::signer::dummy_bech32_account;
+    use crate::testapp::ibc::core::router::MockRouter;
+
+    #[test]
+    fn test_router() {
+        #[derive(Debug, Default)]
+        struct FooModule {
+            counter: u64,
+        }
+
+        impl Module for FooModule {
+            fn on_chan_open_init_validate(
+                &self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                version: &Version,
+            ) -> Result<Version, ChannelError> {
+                Ok(version.clone())
+            }
+
+            fn on_chan_open_init_execute(
+                &mut self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                version: &Version,
+            ) -> Result<(ModuleExtras, Version), ChannelError> {
+                Ok((ModuleExtras::empty(), version.clone()))
+            }
+
+            fn on_chan_open_try_validate(
+                &self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                counterparty_version: &Version,
+            ) -> Result<Version, ChannelError> {
+                Ok(counterparty_version.clone())
+            }
+
+            fn on_chan_open_try_execute(
+                &mut self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                counterparty_version: &Version,
+            ) -> Result<(ModuleExtras, Version), ChannelError> {
+                Ok((ModuleExtras::empty(), counterparty_version.clone()))
+            }
+
+            fn on_recv_packet_execute(
+                &mut self,
+                _packet: &Packet,
+                _relayer: &Signer,
+            ) -> (ModuleExtras, Acknowledgement) {
+                self.counter += 1;
+
+                (
+                    ModuleExtras::empty(),
+                    Acknowledgement::try_from(vec![1u8]).expect("Never fails"),
+                )
+            }
+
+            fn on_timeout_packet_validate(
+                &self,
+                _packet: &Packet,
+                _relayer: &Signer,
+            ) -> Result<(), PacketError> {
+                Ok(())
+            }
+
+            fn on_timeout_packet_execute(
+                &mut self,
+                _packet: &Packet,
+                _relayer: &Signer,
+            ) -> (ModuleExtras, Result<(), PacketError>) {
+                (ModuleExtras::empty(), Ok(()))
+            }
+
+            fn on_acknowledgement_packet_validate(
+                &self,
+                _packet: &Packet,
+                _acknowledgement: &Acknowledgement,
+                _relayer: &Signer,
+            ) -> Result<(), PacketError> {
+                Ok(())
+            }
+
+            fn on_acknowledgement_packet_execute(
+                &mut self,
+                _packet: &Packet,
+                _acknowledgement: &Acknowledgement,
+                _relayer: &Signer,
+            ) -> (ModuleExtras, Result<(), PacketError>) {
+                (ModuleExtras::empty(), Ok(()))
+            }
+        }
+
+        #[derive(Debug, Default)]
+        struct BarModule;
+
+        impl Module for BarModule {
+            fn on_chan_open_init_validate(
+                &self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                version: &Version,
+            ) -> Result<Version, ChannelError> {
+                Ok(version.clone())
+            }
+
+            fn on_chan_open_init_execute(
+                &mut self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                version: &Version,
+            ) -> Result<(ModuleExtras, Version), ChannelError> {
+                Ok((ModuleExtras::empty(), version.clone()))
+            }
+
+            fn on_chan_open_try_validate(
+                &self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                counterparty_version: &Version,
+            ) -> Result<Version, ChannelError> {
+                Ok(counterparty_version.clone())
+            }
+
+            fn on_chan_open_try_execute(
+                &mut self,
+                _order: Order,
+                _connection_hops: &[ConnectionId],
+                _port_id: &PortId,
+                _channel_id: &ChannelId,
+                _counterparty: &Counterparty,
+                counterparty_version: &Version,
+            ) -> Result<(ModuleExtras, Version), ChannelError> {
+                Ok((ModuleExtras::empty(), counterparty_version.clone()))
+            }
+
+            fn on_recv_packet_execute(
+                &mut self,
+                _packet: &Packet,
+                _relayer: &Signer,
+            ) -> (ModuleExtras, Acknowledgement) {
+                (
+                    ModuleExtras::empty(),
+                    Acknowledgement::try_from(vec![1u8]).expect("Never fails"),
+                )
+            }
+
+            fn on_timeout_packet_validate(
+                &self,
+                _packet: &Packet,
+                _relayer: &Signer,
+            ) -> Result<(), PacketError> {
+                Ok(())
+            }
+
+            fn on_timeout_packet_execute(
+                &mut self,
+                _packet: &Packet,
+                _relayer: &Signer,
+            ) -> (ModuleExtras, Result<(), PacketError>) {
+                (ModuleExtras::empty(), Ok(()))
+            }
+
+            fn on_acknowledgement_packet_validate(
+                &self,
+                _packet: &Packet,
+                _acknowledgement: &Acknowledgement,
+                _relayer: &Signer,
+            ) -> Result<(), PacketError> {
+                Ok(())
+            }
+
+            fn on_acknowledgement_packet_execute(
+                &mut self,
+                _packet: &Packet,
+                _acknowledgement: &Acknowledgement,
+                _relayer: &Signer,
+            ) -> (ModuleExtras, Result<(), PacketError>) {
+                (ModuleExtras::empty(), Ok(()))
+            }
+        }
+
+        let mut router = MockRouter::default();
+        router
+            .add_route(ModuleId::new("foomodule".to_string()), FooModule::default())
+            .expect("Never fails");
+        router
+            .add_route(ModuleId::new("barmodule".to_string()), BarModule)
+            .expect("Never fails");
+
+        let mut on_recv_packet_result = |module_id: &'static str| {
+            let module_id = ModuleId::new(module_id.to_string());
+            let m = router.get_route_mut(&module_id).expect("Never fails");
+
+            let packet = PacketConfig::builder().build();
+
+            let result = m.on_recv_packet_execute(&packet, &dummy_bech32_account().into());
+            (module_id, result)
+        };
+
+        let _results = [
+            on_recv_packet_result("foomodule"),
+            on_recv_packet_result("barmodule"),
+        ];
+    }
+}
+
+pub struct LightClientState<H: TestHost> {
+    pub client_state: H::ClientState,
+    pub consensus_states:
+        BTreeMap<Height, <<H::Block as TestBlock>::Header as TestHeader>::ConsensusState>,
+}
+
+impl<H> Default for LightClientState<H>
+where
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
+{
+    fn default() -> Self {
+        let context = TestContext::<H>::default();
+        LightClientBuilder::init().context(&context).build()
+    }
+}
+
+impl<H> LightClientState<H>
+where
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
+{
+    pub fn with_latest_height(height: Height) -> Self {
+        let context = TestContextConfig::builder()
+            .latest_height(height)
+            .build::<TestContext<_>>();
+        LightClientBuilder::init().context(&context).build()
+    }
+}
+
+#[derive(TypedBuilder)]
+#[builder(builder_method(name = init), build_method(into))]
+pub struct LightClientBuilder<'a, H>
+where
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
+{
+    context: &'a TestContext<H>,
+    #[builder(default, setter(into))]
+    consensus_heights: Vec<Height>,
+    #[builder(default)]
+    params: H::LightClientParams,
+}
+
+impl<'a, H> From<LightClientBuilder<'a, H>> for LightClientState<H>
+where
+    H: TestHost,
+    HostClientState<H>: ClientStateValidation<DefaultIbcStore>,
+{
+    fn from(builder: LightClientBuilder<'a, H>) -> Self {
+        let LightClientBuilder {
+            context,
+            consensus_heights,
+            params,
+        } = builder;
+
+        context.generate_light_client(consensus_heights, &params)
+    }
+}
diff --git a/ibc-testkit/src/testapp/ibc/mod.rs b/ibc-testkit/src/testapp/ibc/mod.rs
new file mode 100644
index 000000000..f13a3c645
--- /dev/null
+++ b/ibc-testkit/src/testapp/ibc/mod.rs
@@ -0,0 +1,3 @@
+pub mod applications;
+pub mod clients;
+pub mod core;
diff --git a/ibc-testkit/src/testapp/mod.rs b/ibc-testkit/src/testapp/mod.rs
new file mode 100644
index 000000000..0887f62f4
--- /dev/null
+++ b/ibc-testkit/src/testapp/mod.rs
@@ -0,0 +1 @@
+pub mod ibc;
diff --git a/ibc-testkit/src/utils/mod.rs b/ibc-testkit/src/utils/mod.rs
new file mode 100644
index 000000000..94163e32e
--- /dev/null
+++ b/ibc-testkit/src/utils/mod.rs
@@ -0,0 +1,42 @@
+use ibc::primitives::Timestamp;
+#[cfg(feature = "serde")]
+use serde::{de::DeserializeOwned, Serialize};
+use tendermint::Time;
+
+/// Returns a `Timestamp` representation of the beginning of year 2023.
+///
+/// This is introduced to initialize [`StoreGenericTestContext`](crate::context::StoreGenericTestContext)s
+/// with the same latest timestamp by default.
+/// If two [`StoreGenericTestContext`](crate::context::StoreGenericTestContext)
+/// are initialized using [`Time::now()`], the second one will have a greater timestamp than the first one.
+/// So, the latest header of the second context cannot be submitted to first one.
+/// We can still set a custom timestamp via [`TestContextConfig`](crate::fixtures::core::context::TestContextConfig).
+pub fn year_2023() -> Timestamp {
+    // Sun Jan 01 2023 00:00:00 GMT+0000
+    Time::from_unix_timestamp(1_672_531_200, 0)
+        .expect("should be a valid time")
+        .into()
+}
+
+/// Utility function that asserts that the given JSON input can be
+/// serialized into and deserialized from the specified type `T`.
+#[cfg(feature = "serde")]
+pub fn test_serialization_roundtrip<T>(json_data: &str)
+where
+    T: core::fmt::Debug + PartialEq + Serialize + DeserializeOwned,
+{
+    let parsed0 = serde_json::from_str::<T>(json_data);
+    assert!(parsed0.is_ok());
+    let parsed0 = parsed0.expect("should not fail");
+
+    let serialized = serde_json::to_string(&parsed0);
+    assert!(serialized.is_ok());
+    let serialized = serialized.expect("should not fail");
+    assert_eq!(serialized, json_data);
+
+    let parsed1 = serde_json::from_str::<T>(&serialized);
+    assert!(parsed1.is_ok());
+    let parsed1 = parsed1.expect("should not fail");
+
+    assert_eq!(parsed0, parsed1);
+}
diff --git a/ibc/Cargo.toml b/ibc/Cargo.toml
new file mode 100644
index 000000000..1005db2a0
--- /dev/null
+++ b/ibc/Cargo.toml
@@ -0,0 +1,69 @@
+[package]
+name         = "ibc"
+version      = { workspace = true }
+authors      = { workspace = true }
+edition      = { workspace = true }
+rust-version = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+keywords     = [ "blockchain", "consensus", "cosmos", "ibc" ]
+readme       = "README.md"
+
+description = """
+    Maintained by `ibc-rs`, serves as a top-level library that contain a comprehensive set of
+    Inter-Blockchain Communication (IBC) implementations, re-exporting data structures and
+    implementations of various IBC core, clients and applications from the `ibc-core`,
+    `ibc-clients` and `ibc-apps` crates.
+"""
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+# ibc dependencies
+ibc-apps             = { workspace = true }
+ibc-clients          = { workspace = true }
+ibc-core             = { workspace = true }
+ibc-core-host-cosmos = { workspace = true }
+ibc-derive           = { workspace = true }
+ibc-primitives       = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "ibc-apps/std",
+  "ibc-clients/std",
+  "ibc-core/std",
+  "ibc-core-host-cosmos/std",
+  "ibc-primitives/std",
+]
+borsh = [
+  "ibc-apps/borsh",
+  "ibc-clients/borsh",
+  "ibc-core/borsh",
+  "ibc-core-host-cosmos/borsh",
+  "ibc-primitives/borsh",
+]
+serde = [
+  "ibc-apps/serde",
+  "ibc-clients/serde",
+  "ibc-core/serde",
+  "ibc-core-host-cosmos/serde",
+  "ibc-primitives/serde",
+]
+schema = [
+  "ibc-apps/schema",
+  "ibc-clients/schema",
+  "ibc-core/schema",
+  "ibc-core-host-cosmos/schema",
+  "ibc-primitives/schema",
+  "serde",
+  "std",
+]
+parity-scale-codec = [
+  "ibc-apps/parity-scale-codec",
+  "ibc-clients/parity-scale-codec",
+  "ibc-core/parity-scale-codec",
+  "ibc-core-host-cosmos/parity-scale-codec",
+  "ibc-primitives/parity-scale-codec",
+]
diff --git a/ibc/README.md b/ibc/README.md
new file mode 100644
index 000000000..c168ff1e6
--- /dev/null
+++ b/ibc/README.md
@@ -0,0 +1,70 @@
+<div align="center">
+    <h1>IBC in Rust</h1>
+</div>
+
+![banner](./../docs/static/img/ibc-rs-cover.svg)
+
+<div align="center">
+
+[![Crate][crate-image]][crate-link]
+[![Docs][docs-image]][docs-link]
+[![Build Status][build-image]][build-link]
+[![Apache 2.0 Licensed][license-image]][license-link]
+![Version][crates-io-version]
+![Downloads][crates-io-downloads]
+![Rust Stable][msrv-image]
+
+</div>
+
+Implementation of the Inter-Blockchain Communication Protocol ([IBC]) in Rust.
+This crate serves as one-stop shop library re-exporting data structures and
+implementations of various IBC core, clients and applications from the
+[`ibc-core`](../ibc-core), [`ibc-clients`](../ibc-clients) and
+[`ibc-apps`](../ibc-apps) crates.
+
+## Documentation
+
+See documentation on [docs.rs][docs-link].
+
+## Contributing
+
+IBC is specified in English in the [cosmos/ibc
+repo](https://github.com/cosmos/ibc). Any protocol changes or clarifications
+should be contributed there.
+
+If you're interested in contributing, please take a look at the
+[CONTRIBUTING](./../CONTRIBUTING.md) guidelines. We welcome and appreciate
+community contributions!
+
+## License
+
+Copyright © 2021 Informal Systems Inc. and `ibc-rs` authors.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+the files in this repository except in compliance with the License. You may
+obtain a copy of the License at
+
+    https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+[//]: # (badges)
+
+[crate-image]: https://img.shields.io/crates/v/ibc.svg
+[crate-link]: https://crates.io/crates/ibc
+[docs-image]: https://docs.rs/ibc/badge.svg
+[docs-link]: https://docs.rs/ibc/
+[build-image]: https://github.com/cosmos/ibc-rs/workflows/Rust/badge.svg
+[build-link]: https://github.com/cosmos/ibc-rs/actions?query=workflow%3ARust
+[license-image]: https://img.shields.io/crates/l/ibc
+[license-link]: https://github.com/cosmos/ibc-rs/blob/main/LICENSE
+[crates-io-version]: https://img.shields.io/crates/v/ibc.svg
+[crates-io-downloads]: https://img.shields.io/crates/d/ibc.svg
+[msrv-image]: https://img.shields.io/crates/msrv/ibc
+
+[//]: # (general links)
+
+[IBC]: https://github.com/cosmos/ibc
diff --git a/ibc/src/lib.rs b/ibc/src/lib.rs
new file mode 100644
index 000000000..a6e22ba20
--- /dev/null
+++ b/ibc/src/lib.rs
@@ -0,0 +1,95 @@
+#![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_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+//! This library re-exports implementations of all the Inter-Blockchain
+//! Communication (IBC) specifications available in [`ibc-rs`][ibc-rs]
+//! repository. IBC is a distributed protocol that enables communication between
+//! distinct sovereign blockchains.
+//!
+//! The layout of this crate mirrors the organization of the [IBC
+//! Standard][ibc-standard]:
+//!
+//! + [Core](core) implements the transport, authentication, and ordering layers
+//!   of the IBC protocol.
+//!
+//! + [Clients](clients) consists of implementations of client verification
+//! algorithms (following the base client interface that is defined in `Core`)
+//! for specific consensus algorithms. A chain uses these verification
+//! algorithms to verify the state of remote chains.
+//!
+//! + [Applications](apps) consists of implementations of some IBC applications.
+//! This is the part of the protocol that abstracts away the core protocol and
+//! focuses solely on business logic.
+//!
+//! [ibc-standard]: https://github.com/cosmos/ibc
+//! [ibc-rs]: https://github.com/cosmos/ibc-rs
+
+#[cfg(any(test, feature = "std"))]
+extern crate std;
+
+/// Re-exports primitive types and traits from the `ibc-primitives` crate.
+pub mod primitives {
+    pub use ibc_primitives::*;
+}
+
+/// Re-exports implementations of all the IBC core (TAO) modules.
+pub mod core {
+    #[doc(inline)]
+    pub use ibc_core::*;
+}
+
+/// Re-exports implementations of IBC light clients.
+pub mod clients {
+    #[doc(inline)]
+    pub use ibc_clients::*;
+}
+
+/// Re-exports implementations of various IBC applications.
+pub mod apps {
+    #[doc(inline)]
+    pub use ibc_apps::*;
+}
+
+/// Re-exports Cosmos-specific utility types, traits, and implementations.
+pub mod cosmos_host {
+    pub use ibc_core_host_cosmos::*;
+}
+
+/// Re-exports convenient derive macros from `ibc-derive` crate.
+pub mod derive {
+    /// A derive macro for implementing the
+    /// [`ClientState`](crate::core::client::context::client_state::ClientState)
+    /// trait for enums. Enums with variants that also implement the
+    /// [`ClientState`](crate::core::client::context::client_state::ClientState)
+    /// trait can leverage this macro for automatic implementation.
+    ///
+    /// To specify the generic arguments for `ClientState`, use the following
+    /// attributes:
+    ///
+    /// - `#[validation(<YourClientValidationContext>)]`
+    /// - `#[execution(<YourClientExecutionContext>)]`
+    ///
+    /// The argument to the `validation` or `execution` attributes may contain
+    /// lifetimes or generic types, and even that types might be bounded by
+    /// traits. For instance:
+    ///
+    /// - `#[validation(Context<S>)]`
+    /// - `#[validation(Context<'a, S>)]`
+    /// - `#[validation(Context<'a, S: Clone>)]`
+    pub use ibc_derive::IbcClientState as ClientState;
+    /// A derive macro for implementing the
+    /// [`ConsensusState`](crate::core::client::context::consensus_state::ConsensusState)
+    /// trait for enums. Enums with variants that also implement the
+    /// [`ConsensusState`](crate::core::client::context::consensus_state::ConsensusState)
+    /// trait can leverage this macro for automatic implementation..
+    pub use ibc_derive::IbcConsensusState as ConsensusState;
+}
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 000000000..e9e7427c4
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,5 @@
+reorder_imports = true
+
+# unstable features
+group_imports = "StdExternalCrate"
+imports_granularity = "Module"
diff --git a/taplo.toml b/taplo.toml
new file mode 100644
index 000000000..edaa7882b
--- /dev/null
+++ b/taplo.toml
@@ -0,0 +1,7 @@
+include = [ "taplo.toml", "**/Cargo.toml" ]
+
+[formatting]
+align_entries       = true
+compact_arrays      = false
+array_auto_expand   = false
+array_auto_collapse = false
diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml
new file mode 100644
index 000000000..26877042b
--- /dev/null
+++ b/tests-integration/Cargo.toml
@@ -0,0 +1,57 @@
+[package]
+name        = "tests-integration"
+version     = "0.1.0"
+authors     = { workspace = true }
+license     = { workspace = true }
+edition     = { workspace = true }
+repository  = { workspace = true }
+readme      = "README.md"
+keywords    = [ "blockchain", "consensus", "cosmos", "ibc", "tendermint" ]
+publish     = false
+description = "Integration tests using `ibc-testkit` and the other IBC crates."
+
+[dependencies]
+# external dependencies
+serde           = { workspace = true, optional = true }
+serde_json      = { workspace = true, optional = true }
+subtle-encoding = { workspace = true }
+tracing         = { version = "0.1.40", default-features = false }
+
+# ibc dependencies
+ibc                         = { workspace = true }
+ibc-core-client-types       = { workspace = true }
+ibc-core-commitment-types   = { workspace = true }
+ibc-client-cw               = { workspace = true }
+ibc-client-tendermint-cw    = { workspace = true }
+ibc-client-tendermint-types = { workspace = true }
+ibc-core-host-types         = { workspace = true }
+ibc-primitives              = { workspace = true }
+ibc-query                   = { workspace = true }
+ibc-testkit                 = { workspace = true }
+
+# basecoin dependencies
+basecoin-store = { version = "0.1.0" }
+
+# cosmos dependencies
+tendermint         = { workspace = true }
+tendermint-testgen = { workspace = true }
+
+[dev_dependencies]
+cosmwasm-std   = { workspace = true }
+hex            = { version = "0.4.2" }
+rstest         = { workspace = true }
+test-log       = { version = "0.2.13", features = [ "trace" ] }
+tendermint-rpc = { workspace = true }
+
+[features]
+default = [ "std" ]
+std = [
+  "serde/std",
+  "serde_json/std",
+  "ibc/std",
+  "ibc/serde",
+  "ibc-testkit/serde",
+  "tendermint/std",
+  "dep:serde",
+  "dep:serde_json",
+]
diff --git a/tests-integration/README.md b/tests-integration/README.md
new file mode 100644
index 000000000..cc6ec8863
--- /dev/null
+++ b/tests-integration/README.md
@@ -0,0 +1,3 @@
+Integration tests that make use of the types exposed by `ibc-testkit`. These
+tests also depend upon the other IBC crates. They live in a separate crate, that
+is not meant to be published, to avoid circular dependencies.
diff --git a/tests-integration/src/lib.rs b/tests-integration/src/lib.rs
new file mode 100644
index 000000000..7913c79d6
--- /dev/null
+++ b/tests-integration/src/lib.rs
@@ -0,0 +1 @@
+#![doc = include_str!("../README.md")]
diff --git a/tests-integration/tests/applications/mod.rs b/tests-integration/tests/applications/mod.rs
new file mode 100644
index 000000000..2b046ccd5
--- /dev/null
+++ b/tests-integration/tests/applications/mod.rs
@@ -0,0 +1,4 @@
+#[cfg(feature = "serde")]
+pub mod nft_transfer;
+#[cfg(feature = "serde")]
+pub mod transfer;
diff --git a/tests-integration/tests/applications/nft_transfer.rs b/tests-integration/tests/applications/nft_transfer.rs
new file mode 100644
index 000000000..05996a534
--- /dev/null
+++ b/tests-integration/tests/applications/nft_transfer.rs
@@ -0,0 +1,135 @@
+use ibc::apps::nft_transfer::module::{
+    on_chan_open_init_execute, on_chan_open_init_validate, on_chan_open_try_execute,
+    on_chan_open_try_validate,
+};
+use ibc::apps::nft_transfer::types::VERSION;
+use ibc::core::channel::types::channel::{Counterparty, Order};
+use ibc::core::channel::types::Version;
+use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc::core::primitives::prelude::*;
+use ibc_testkit::testapp::ibc::applications::nft_transfer::types::DummyNftTransferModule;
+
+fn get_defaults() -> (
+    DummyNftTransferModule,
+    Order,
+    Vec<ConnectionId>,
+    PortId,
+    ChannelId,
+    Counterparty,
+) {
+    let order = Order::Unordered;
+    let connection_hops = vec![ConnectionId::new(1)];
+    let port_id = PortId::transfer();
+    let channel_id = ChannelId::new(1);
+    let counterparty = Counterparty::new(port_id.clone(), Some(channel_id.clone()));
+
+    (
+        DummyNftTransferModule,
+        order,
+        connection_hops,
+        port_id,
+        channel_id,
+        counterparty,
+    )
+}
+
+/// If the relayer passed "", indicating that it wants us to return the versions we support.
+#[test]
+fn test_on_chan_open_init_empty_version() {
+    let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let in_version = Version::new("".to_string());
+
+    let (_, out_version) = on_chan_open_init_execute(
+        &mut ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &in_version,
+    )
+    .unwrap();
+
+    assert_eq!(out_version, Version::new(VERSION.to_string()));
+}
+
+/// If the relayer passed in the only supported version (ics721-1), then return ics721-1
+#[test]
+fn test_on_chan_open_init_ics721_version() {
+    let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let in_version = Version::new(VERSION.to_string());
+    let (_, out_version) = on_chan_open_init_execute(
+        &mut ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &in_version,
+    )
+    .unwrap();
+
+    assert_eq!(out_version, Version::new(VERSION.to_string()));
+}
+
+/// If the relayer passed in an unsupported version, then fail
+#[test]
+fn test_on_chan_open_init_incorrect_version() {
+    let (ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let in_version = Version::new("some-unsupported-version".to_string());
+    let res = on_chan_open_init_validate(
+        &ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &in_version,
+    );
+
+    assert!(res.is_err());
+}
+
+/// If the counterparty supports ics721, then return ics721
+#[test]
+fn test_on_chan_open_try_counterparty_correct_version() {
+    let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let counterparty_version = Version::new(VERSION.to_string());
+
+    let (_, out_version) = on_chan_open_try_execute(
+        &mut ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &counterparty_version,
+    )
+    .unwrap();
+
+    assert_eq!(out_version, Version::new(VERSION.to_string()));
+}
+
+/// If the counterparty doesn't support ics721, then fail
+#[test]
+fn test_on_chan_open_try_counterparty_incorrect_version() {
+    let (ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let counterparty_version = Version::new("some-unsupported-version".to_string());
+
+    let res = on_chan_open_try_validate(
+        &ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &counterparty_version,
+    );
+
+    assert!(res.is_err());
+}
diff --git a/tests-integration/tests/applications/transfer.rs b/tests-integration/tests/applications/transfer.rs
new file mode 100644
index 000000000..6aa8e3839
--- /dev/null
+++ b/tests-integration/tests/applications/transfer.rs
@@ -0,0 +1,168 @@
+use ibc::apps::transfer::module::{
+    on_chan_open_init_execute, on_chan_open_init_validate, on_chan_open_try_execute,
+    on_chan_open_try_validate,
+};
+use ibc::apps::transfer::types::VERSION;
+use ibc::core::channel::types::channel::{Counterparty, Order};
+use ibc::core::channel::types::Version;
+use ibc::core::host::types::identifiers::{ChannelId, ConnectionId, PortId};
+use ibc::core::primitives::prelude::*;
+use ibc::cosmos_host::utils::cosmos_adr028_escrow_address;
+use ibc_testkit::testapp::ibc::applications::transfer::types::DummyTransferModule;
+use subtle_encoding::bech32;
+
+fn get_defaults() -> (
+    DummyTransferModule,
+    Order,
+    Vec<ConnectionId>,
+    PortId,
+    ChannelId,
+    Counterparty,
+) {
+    let order = Order::Unordered;
+    let connection_hops = vec![ConnectionId::new(1)];
+    let port_id = PortId::transfer();
+    let channel_id = ChannelId::new(1);
+    let counterparty = Counterparty::new(port_id.clone(), Some(channel_id.clone()));
+
+    (
+        DummyTransferModule,
+        order,
+        connection_hops,
+        port_id,
+        channel_id,
+        counterparty,
+    )
+}
+
+#[test]
+fn test_cosmos_escrow_address() {
+    fn assert_eq_escrow_address(port_id: &str, channel_id: &str, address: &str) {
+        let port_id = port_id.parse().unwrap();
+        let channel_id = channel_id.parse().unwrap();
+        let gen_address = {
+            let addr = cosmos_adr028_escrow_address(&port_id, &channel_id);
+            bech32::encode("cosmos", addr)
+        };
+        assert_eq!(gen_address, address.to_owned())
+    }
+
+    // addresses obtained using `gaiad query ibc-transfer escrow-address [port-id] [channel-id]`
+    assert_eq_escrow_address(
+        "transfer",
+        "channel-141",
+        "cosmos1x54ltnyg88k0ejmk8ytwrhd3ltm84xehrnlslf",
+    );
+    assert_eq_escrow_address(
+        "transfer",
+        "channel-207",
+        "cosmos1ju6tlfclulxumtt2kglvnxduj5d93a64r5czge",
+    );
+    assert_eq_escrow_address(
+        "transfer",
+        "channel-187",
+        "cosmos177x69sver58mcfs74x6dg0tv6ls4s3xmmcaw53",
+    );
+}
+
+/// If the relayer passed "", indicating that it wants us to return the versions we support.
+/// We currently only support ics20
+#[test]
+fn test_on_chan_open_init_empty_version() {
+    let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let in_version = Version::new("".to_string());
+
+    let (_, out_version) = on_chan_open_init_execute(
+        &mut ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &in_version,
+    )
+    .unwrap();
+
+    assert_eq!(out_version, Version::new(VERSION.to_string()));
+}
+
+/// If the relayer passed in the only supported version (ics20), then return ics20
+#[test]
+fn test_on_chan_open_init_ics20_version() {
+    let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let in_version = Version::new(VERSION.to_string());
+    let (_, out_version) = on_chan_open_init_execute(
+        &mut ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &in_version,
+    )
+    .unwrap();
+
+    assert_eq!(out_version, Version::new(VERSION.to_string()));
+}
+
+/// If the relayer passed in an unsupported version, then fail
+#[test]
+fn test_on_chan_open_init_incorrect_version() {
+    let (ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let in_version = Version::new("some-unsupported-version".to_string());
+    let res = on_chan_open_init_validate(
+        &ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &in_version,
+    );
+
+    assert!(res.is_err());
+}
+
+/// If the counterparty supports ics20, then return ics20
+#[test]
+fn test_on_chan_open_try_counterparty_correct_version() {
+    let (mut ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let counterparty_version = Version::new(VERSION.to_string());
+
+    let (_, out_version) = on_chan_open_try_execute(
+        &mut ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &counterparty_version,
+    )
+    .unwrap();
+
+    assert_eq!(out_version, Version::new(VERSION.to_string()));
+}
+
+/// If the counterparty doesn't support ics20, then fail
+#[test]
+fn test_on_chan_open_try_counterparty_incorrect_version() {
+    let (ctx, order, connection_hops, port_id, channel_id, counterparty) = get_defaults();
+
+    let counterparty_version = Version::new("some-unsupported-version".to_string());
+
+    let res = on_chan_open_try_validate(
+        &ctx,
+        order,
+        &connection_hops,
+        &port_id,
+        &channel_id,
+        &counterparty,
+        &counterparty_version,
+    );
+
+    assert!(res.is_err());
+}
diff --git a/tests-integration/tests/clients/ics07_tendermint/client_state.rs b/tests-integration/tests/clients/ics07_tendermint/client_state.rs
new file mode 100644
index 000000000..9e2e3ece4
--- /dev/null
+++ b/tests-integration/tests/clients/ics07_tendermint/client_state.rs
@@ -0,0 +1,23 @@
+#[cfg(all(test, feature = "serde"))]
+mod tests {
+    use ibc_testkit::utils::test_serialization_roundtrip;
+    use tendermint_rpc::endpoint::abci_query::AbciQuery;
+
+    #[test]
+    fn serialization_roundtrip_no_proof() {
+        let json_data = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/tests/data/json/client_state.json"
+        ));
+        test_serialization_roundtrip::<AbciQuery>(json_data);
+    }
+
+    #[test]
+    fn serialization_roundtrip_with_proof() {
+        let json_data = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/tests/data/json/client_state_proof.json"
+        ));
+        test_serialization_roundtrip::<AbciQuery>(json_data);
+    }
+}
diff --git a/tests-integration/tests/clients/ics07_tendermint/consensus_state.rs b/tests-integration/tests/clients/ics07_tendermint/consensus_state.rs
new file mode 100644
index 000000000..564bb4715
--- /dev/null
+++ b/tests-integration/tests/clients/ics07_tendermint/consensus_state.rs
@@ -0,0 +1,23 @@
+#[cfg(feature = "serde")]
+mod tests {
+    use ibc_testkit::utils::test_serialization_roundtrip;
+    use tendermint_rpc::endpoint::abci_query::AbciQuery;
+
+    #[test]
+    fn serialization_roundtrip_no_proof() {
+        let json_data = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/tests/data/json/consensus_state.json"
+        ));
+        test_serialization_roundtrip::<AbciQuery>(json_data);
+    }
+
+    #[test]
+    fn serialization_roundtrip_with_proof() {
+        let json_data = include_str!(concat!(
+            env!("CARGO_MANIFEST_DIR"),
+            "/tests/data/json/consensus_state_proof.json"
+        ));
+        test_serialization_roundtrip::<AbciQuery>(json_data);
+    }
+}
diff --git a/tests-integration/tests/clients/ics07_tendermint/mod.rs b/tests-integration/tests/clients/ics07_tendermint/mod.rs
new file mode 100644
index 000000000..620c017de
--- /dev/null
+++ b/tests-integration/tests/clients/ics07_tendermint/mod.rs
@@ -0,0 +1,2 @@
+pub mod client_state;
+pub mod consensus_state;
diff --git a/tests-integration/tests/clients/mod.rs b/tests-integration/tests/clients/mod.rs
new file mode 100644
index 000000000..cc3da1b01
--- /dev/null
+++ b/tests-integration/tests/clients/mod.rs
@@ -0,0 +1 @@
+pub mod ics07_tendermint;
diff --git a/tests-integration/tests/core/ics02_client/create_client.rs b/tests-integration/tests/core/ics02_client/create_client.rs
new file mode 100644
index 000000000..4e5dd9e77
--- /dev/null
+++ b/tests-integration/tests/core/ics02_client/create_client.rs
@@ -0,0 +1,216 @@
+use basecoin_store::impls::InMemoryStore;
+use ibc::clients::tendermint::types::{
+    client_type as tm_client_type, ConsensusState as TmConsensusState,
+};
+use ibc::core::client::context::client_state::ClientStateCommon;
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::client::types::error::ClientError;
+use ibc::core::client::types::msgs::{ClientMsg, MsgCreateClient};
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::error::CommitmentError;
+use ibc::core::entrypoint::{execute, validate};
+use ibc::core::handler::types::error::ContextError;
+use ibc::core::handler::types::msgs::MsgEnvelope;
+use ibc::core::host::types::identifiers::ClientId;
+use ibc::core::host::types::path::{ClientConsensusStatePath, NextClientSequencePath};
+use ibc::core::host::{ClientStateRef, ValidationContext};
+use ibc_query::core::context::ProvableContext;
+use ibc_testkit::context::{MockContext, TendermintContext};
+#[cfg(feature = "serde")]
+use ibc_testkit::fixtures::clients::tendermint::dummy_tendermint_header;
+use ibc_testkit::fixtures::clients::tendermint::dummy_tm_client_state_from_header;
+use ibc_testkit::fixtures::core::context::TestContextConfig;
+use ibc_testkit::fixtures::core::signer::dummy_account_id;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::{
+    client_type as mock_client_type, MockClientState,
+};
+use ibc_testkit::testapp::ibc::clients::mock::consensus_state::MockConsensusState;
+use ibc_testkit::testapp::ibc::clients::mock::header::MockHeader;
+use ibc_testkit::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::{DefaultIbcStore, LightClientBuilder, MockIbcStore};
+use test_log::test;
+
+#[test]
+fn test_create_client_ok() {
+    let mut ctx = DefaultIbcStore::default();
+    let mut router = MockRouter::new_with_transfer();
+    let signer = dummy_account_id();
+    let height = Height::new(0, 42).unwrap();
+
+    let msg = MsgCreateClient::new(
+        MockClientState::new(MockHeader::new(height)).into(),
+        MockConsensusState::new(MockHeader::new(height)).into(),
+        signer,
+    );
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let client_type = mock_client_type();
+    let client_id = client_type.build_client_id(ctx.client_counter().unwrap());
+
+    let res = validate(&ctx, &router, msg_envelope.clone());
+
+    assert!(res.is_ok(), "validation happy path");
+
+    let res = execute(&mut ctx, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "execution happy path");
+
+    let expected_client_state =
+        ClientStateRef::<DefaultIbcStore>::try_from(msg.client_state).unwrap();
+    assert_eq!(expected_client_state.client_type(), client_type);
+    assert_eq!(ctx.client_state(&client_id).unwrap(), expected_client_state);
+}
+
+#[cfg(feature = "serde")]
+#[test]
+fn test_tm_create_client_ok() {
+    let signer = dummy_account_id();
+
+    let mut ctx = DefaultIbcStore::default();
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let tm_header = dummy_tendermint_header();
+
+    let tm_client_state = dummy_tm_client_state_from_header(tm_header.clone()).into();
+
+    let client_type = tm_client_type();
+    let client_id = client_type.build_client_id(ctx.client_counter().unwrap());
+
+    let msg = MsgCreateClient::new(
+        tm_client_state,
+        TmConsensusState::from(tm_header).into(),
+        signer,
+    );
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx, &router, msg_envelope.clone());
+
+    assert!(res.is_ok(), "tendermint client validation happy path");
+
+    let res = execute(&mut ctx, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "tendermint client execution happy path");
+
+    let expected_client_state =
+        ClientStateRef::<MockIbcStore<InMemoryStore>>::try_from(msg.client_state).unwrap();
+    assert_eq!(expected_client_state.client_type(), client_type);
+    assert_eq!(ctx.client_state(&client_id).unwrap(), expected_client_state);
+}
+
+#[cfg(feature = "serde")]
+#[test]
+fn test_invalid_frozen_tm_client_creation() {
+    let signer = dummy_account_id();
+
+    let ctx = DefaultIbcStore::default();
+
+    let router = MockRouter::new_with_transfer();
+
+    let tm_header = dummy_tendermint_header();
+
+    let tm_client_state = dummy_tm_client_state_from_header(tm_header.clone())
+        .inner()
+        .clone()
+        .with_frozen_height(Height::min(0));
+
+    let msg = MsgCreateClient::new(
+        tm_client_state.into(),
+        TmConsensusState::from(tm_header).into(),
+        signer,
+    );
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx, &router, msg_envelope);
+
+    assert!(matches!(
+        res,
+        Err(ContextError::ClientError(ClientError::ClientFrozen { .. }))
+    ))
+}
+
+#[test]
+fn test_tm_create_client_proof_verification_ok() {
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+    let client_height = Height::new(0, 10).expect("no error");
+
+    let ctx_tm = TestContextConfig::builder()
+        .latest_height(client_height)
+        .build::<TendermintContext>();
+
+    let ctx_mk = MockContext::default().with_light_client(
+        &client_id,
+        LightClientBuilder::init().context(&ctx_tm).build(),
+    );
+
+    let client_validation_ctx_mk = ctx_mk.ibc_store().get_client_validation_context();
+
+    let (AnyClientState::Tendermint(tm_client_state),) = (client_validation_ctx_mk
+        .client_state(&client_id)
+        .expect("client state exists"),)
+    else {
+        panic!("client state is not valid")
+    };
+
+    let latest_client_height = tm_client_state.latest_height();
+    let consensus_state_path = ClientConsensusStatePath::new(
+        client_id.clone(),
+        latest_client_height.revision_number(),
+        latest_client_height.revision_height(),
+    );
+
+    let AnyConsensusState::Tendermint(tm_consensus_state) = client_validation_ctx_mk
+        .consensus_state(&consensus_state_path)
+        .expect("consensus_state exists")
+    else {
+        panic!("consensus state is not valid")
+    };
+
+    let next_client_seq_path = NextClientSequencePath;
+    let next_client_seq_value = client_validation_ctx_mk
+        .client_counter()
+        .expect("counter exists");
+
+    assert_eq!(
+        next_client_seq_value, 0,
+        "client counter is not incremented"
+    );
+
+    let proof = ctx_tm
+        .ibc_store()
+        .get_proof(ctx_tm.latest_height(), &next_client_seq_path.clone().into())
+        .expect("proof exists")
+        .try_into()
+        .expect("value merkle proof");
+
+    let root = tm_consensus_state.inner().root();
+
+    // correct value verification
+    tm_client_state
+        .verify_membership(
+            &ctx_tm.ibc_store().commitment_prefix(),
+            &proof,
+            &root,
+            next_client_seq_path.clone().into(),
+            serde_json::to_vec(&next_client_seq_value).expect("valid json serialization"),
+        )
+        .expect("successful proof verification");
+
+    // incorrect value verification
+    assert!(matches!(
+        tm_client_state
+            .verify_membership(
+                &ctx_tm.ibc_store().commitment_prefix(),
+                &proof,
+                &root,
+                next_client_seq_path.into(),
+                serde_json::to_vec(&(next_client_seq_value + 1)).expect("valid json serialization"),
+            )
+            .expect_err("proof verification fails"),
+        ClientError::Ics23Verification(CommitmentError::VerificationFailure)
+    ));
+}
diff --git a/tests-integration/tests/core/ics02_client/mod.rs b/tests-integration/tests/core/ics02_client/mod.rs
new file mode 100644
index 000000000..267b760cc
--- /dev/null
+++ b/tests-integration/tests/core/ics02_client/mod.rs
@@ -0,0 +1,6 @@
+#[cfg(feature = "serde")]
+pub mod create_client;
+pub mod recover_client;
+pub mod update_client;
+#[cfg(feature = "serde")]
+pub mod upgrade_client;
diff --git a/tests-integration/tests/core/ics02_client/recover_client.rs b/tests-integration/tests/core/ics02_client/recover_client.rs
new file mode 100644
index 000000000..f40f15f52
--- /dev/null
+++ b/tests-integration/tests/core/ics02_client/recover_client.rs
@@ -0,0 +1,289 @@
+use core::time::Duration;
+
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::client::handler::recover_client;
+use ibc::core::client::types::msgs::{ClientMsg, MsgCreateClient, MsgRecoverClient};
+use ibc::core::client::types::{Height, Status as ClientStatus};
+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::Signer;
+use ibc_testkit::context::{MockContext, TendermintContext};
+use ibc_testkit::fixtures::core::context::TestContextConfig;
+use ibc_testkit::fixtures::core::signer::dummy_account_id;
+use ibc_testkit::hosts::{TestBlock, TestHost};
+use ibc_testkit::testapp::ibc::clients::mock::client_state::{
+    client_type as mock_client_type, MockClientState,
+};
+use ibc_testkit::testapp::ibc::clients::mock::consensus_state::MockConsensusState;
+use ibc_testkit::testapp::ibc::core::types::DEFAULT_BLOCK_TIME_SECS;
+use rstest::*;
+
+struct Fixture {
+    ctx: TendermintContext,
+    subject_client_id: ClientId,
+    substitute_client_id: ClientId,
+    signer: Signer,
+}
+
+/// Initializes the testing fixture for validating client recovery logic.
+///
+/// Creates the subject and substitute clients via sending two `MsgCreateClient`
+/// messages. The subject client is initialized in an expired state by sleeping
+/// for the duration of its trusting period. The substitute client state is
+/// initialized with a much longer trusting period and at a height higher than
+/// the subject client state's in order to ensure that it remains in an active
+/// state.
+fn setup_client_recovery_fixture(
+    subject_trusting_period: Duration,
+    subject_height: Height,
+    substitute_trusting_period: Duration,
+    substitute_height: Height,
+) -> Fixture {
+    let mut ctx = TendermintContext::default();
+
+    // create a ctx_b
+    let ctx_b: MockContext = TestContextConfig::builder()
+        .latest_height(substitute_height)
+        .build();
+
+    let signer = dummy_account_id();
+
+    let subject_client_header = ctx_b
+        .host
+        .get_block(&subject_height)
+        .expect("block exists")
+        .into_header();
+
+    let msg = MsgCreateClient::new(
+        MockClientState::new(subject_client_header)
+            .with_trusting_period(subject_trusting_period)
+            .into(),
+        MockConsensusState::new(subject_client_header).into(),
+        signer.clone(),
+    );
+
+    let subject_msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let client_type = mock_client_type();
+    let subject_client_id = client_type.build_client_id(ctx.ibc_store().client_counter().unwrap());
+
+    ctx.dispatch(subject_msg_envelope)
+        .expect("create subject client execution");
+
+    let substitute_client_header = ctx_b
+        .host
+        .get_block(&substitute_height)
+        .expect("block exists")
+        .into_header();
+
+    let msg = MsgCreateClient::new(
+        MockClientState::new(substitute_client_header)
+            .with_trusting_period(substitute_trusting_period)
+            .into(),
+        MockConsensusState::new(substitute_client_header).into(),
+        signer.clone(),
+    );
+
+    let substitute_msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let substitute_client_id =
+        client_type.build_client_id(ctx.ibc_store().client_counter().unwrap());
+
+    ctx.dispatch(substitute_msg_envelope)
+        .expect("create substitute client execution");
+
+    let subject_client_trusted_timestamp =
+        (subject_client_header.timestamp() + subject_trusting_period).expect("no error");
+
+    // Let the subject client state expire.
+    while ctx.latest_timestamp() <= subject_client_trusted_timestamp {
+        ctx.advance_block_height();
+    }
+
+    // at this point, the subject client should be expired.
+    // and the substitute client should be active or expired according
+    // to the fixture arguments
+
+    Fixture {
+        ctx,
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    }
+}
+
+#[rstest]
+fn test_recover_client_ok() {
+    let subject_trusting_period = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS);
+    let substitute_trusting_period = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS) * 10;
+    let subject_height = Height::new(0, 42).unwrap();
+    let substitute_height = Height::new(0, 43).unwrap();
+
+    let Fixture {
+        mut ctx,
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    } = setup_client_recovery_fixture(
+        subject_trusting_period,
+        subject_height,
+        substitute_trusting_period,
+        substitute_height,
+    );
+
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&subject_client_id)
+            .expect("substitute client state exists")
+            .status(ctx.ibc_store(), &subject_client_id)
+            .expect("no error"),
+        ClientStatus::Expired
+    );
+
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&substitute_client_id)
+            .expect("substitute client state exists")
+            .status(ctx.ibc_store(), &substitute_client_id)
+            .expect("no error"),
+        ClientStatus::Active
+    );
+
+    let msg = MsgRecoverClient {
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    };
+
+    recover_client::validate(ctx.ibc_store_mut(), msg.clone())
+        .expect("client recovery execution happy path");
+
+    recover_client::execute(ctx.ibc_store_mut(), msg.clone())
+        .expect("client recovery execution happy path");
+
+    // client state is copied.
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&msg.subject_client_id)
+            .unwrap(),
+        ctx.ibc_store()
+            .client_state(&msg.substitute_client_id)
+            .unwrap(),
+    );
+
+    // latest consensus state is copied.
+    assert_eq!(
+        ctx.ibc_store()
+            .consensus_state(&ClientConsensusStatePath::new(
+                msg.subject_client_id,
+                substitute_height.revision_number(),
+                substitute_height.revision_height(),
+            ))
+            .unwrap(),
+        ctx.ibc_store()
+            .consensus_state(&ClientConsensusStatePath::new(
+                msg.substitute_client_id,
+                substitute_height.revision_number(),
+                substitute_height.revision_height(),
+            ))
+            .unwrap(),
+    );
+}
+
+#[rstest]
+fn test_recover_client_with_expired_substitute() {
+    // twice of DEFAULT_BLOCK_TIME_SECS to make sure the substitute client is expired as well
+    let subject_trusting_period = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS) * 2;
+    let substitute_trusting_period = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS);
+    let subject_height = Height::new(0, 42).unwrap();
+    let substitute_height = Height::new(0, 43).unwrap();
+
+    let Fixture {
+        ctx,
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    } = setup_client_recovery_fixture(
+        subject_trusting_period,
+        subject_height,
+        substitute_trusting_period,
+        substitute_height,
+    );
+
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&subject_client_id)
+            .expect("substitute client state exists")
+            .status(ctx.ibc_store(), &subject_client_id)
+            .expect("no error"),
+        ClientStatus::Expired
+    );
+
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&substitute_client_id)
+            .expect("substitute client state exists")
+            .status(ctx.ibc_store(), &substitute_client_id)
+            .expect("no error"),
+        ClientStatus::Expired
+    );
+
+    let msg = MsgRecoverClient {
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    };
+
+    recover_client::validate(ctx.ibc_store(), msg)
+        .expect_err("expected client recovery validation to fail");
+}
+
+#[rstest]
+fn test_recover_client_with_matching_heights() {
+    let subject_trusting_period = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS);
+    let substitute_trusting_period = Duration::from_secs(DEFAULT_BLOCK_TIME_SECS) * 10;
+    let subject_height = Height::new(0, 42).unwrap();
+    let substitute_height = Height::new(0, 42).unwrap();
+
+    let Fixture {
+        ctx,
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    } = setup_client_recovery_fixture(
+        subject_trusting_period,
+        subject_height,
+        substitute_trusting_period,
+        substitute_height,
+    );
+
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&subject_client_id)
+            .expect("substitute client state exists")
+            .status(ctx.ibc_store(), &subject_client_id)
+            .expect("no error"),
+        ClientStatus::Expired
+    );
+
+    assert_eq!(
+        ctx.ibc_store()
+            .client_state(&substitute_client_id)
+            .expect("substitute client state exists")
+            .status(ctx.ibc_store(), &substitute_client_id)
+            .expect("no error"),
+        ClientStatus::Active
+    );
+
+    let msg = MsgRecoverClient {
+        subject_client_id,
+        substitute_client_id,
+        signer,
+    };
+
+    recover_client::validate(ctx.ibc_store(), msg)
+        .expect_err("expected client recovery validation to fail");
+}
diff --git a/tests-integration/tests/core/ics02_client/update_client.rs b/tests-integration/tests/core/ics02_client/update_client.rs
new file mode 100644
index 000000000..d5f19f8eb
--- /dev/null
+++ b/tests-integration/tests/core/ics02_client/update_client.rs
@@ -0,0 +1,1683 @@
+use core::fmt::Debug;
+use core::str::FromStr;
+use core::time::Duration;
+
+use basecoin_store::context::ProvableStore;
+use ibc::clients::tendermint::client_state::ClientState;
+use ibc::clients::tendermint::types::proto::v1::{ClientState as RawTmClientState, Fraction};
+use ibc::clients::tendermint::types::{
+    client_type as tm_client_type, ClientState as TmClientState, Header as TmHeader,
+    Misbehaviour as TmMisbehaviour,
+};
+use ibc::core::client::context::client_state::ClientStateValidation;
+use ibc::core::client::context::ClientValidationContext;
+use ibc::core::client::types::msgs::{ClientMsg, MsgUpdateClient};
+use ibc::core::client::types::proto::v1::Height as RawHeight;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::specs::ProofSpecs;
+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::types::identifiers::{ChainId, ClientId, ClientType};
+use ibc::core::host::types::path::ClientConsensusStatePath;
+use ibc::core::host::ValidationContext;
+use ibc::core::primitives::Timestamp;
+use ibc::primitives::proto::Any;
+use ibc::primitives::ToVec;
+use ibc_testkit::context::{MockContext, TendermintContext, TestContext};
+use ibc_testkit::fixtures::clients::tendermint::ClientStateConfig;
+use ibc_testkit::fixtures::core::context::TestContextConfig;
+use ibc_testkit::fixtures::core::signer::dummy_account_id;
+use ibc_testkit::hosts::tendermint::BlockParams;
+use ibc_testkit::hosts::{
+    HostClientState, MockHost, TendermintHost, TestBlock, TestHeader, TestHost,
+};
+use ibc_testkit::relayer::error::RelayerError;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::{
+    client_type as mock_client_type, MockClientState,
+};
+use ibc_testkit::testapp::ibc::clients::mock::header::MockHeader;
+use ibc_testkit::testapp::ibc::clients::mock::misbehaviour::Misbehaviour as MockMisbehaviour;
+use ibc_testkit::testapp::ibc::clients::AnyConsensusState;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::{
+    DefaultIbcStore, LightClientBuilder, LightClientState, MockIbcStore,
+};
+use rstest::*;
+use tendermint_testgen::Validator as TestgenValidator;
+use tracing::debug;
+
+struct Fixture {
+    ctx: MockContext,
+    router: MockRouter,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+
+    let ctx = MockContext::default().with_light_client(
+        &client_id,
+        LightClientState::<MockHost>::with_latest_height(Height::new(0, 42).unwrap()),
+    );
+
+    let router = MockRouter::new_with_transfer();
+
+    Fixture { ctx, router }
+}
+
+/// Returns a `MsgEnvelope` with the `client_message` field set to a `MockMisbehaviour` report.
+fn msg_update_client(client_id: &ClientId) -> MsgEnvelope {
+    let timestamp = Timestamp::now();
+    let height = Height::new(0, 46).unwrap();
+    let msg = MsgUpdateClient {
+        client_id: client_id.clone(),
+        client_message: MockMisbehaviour {
+            client_id: client_id.clone(),
+            header1: MockHeader::new(height).with_timestamp(timestamp),
+            header2: MockHeader::new(height).with_timestamp(timestamp),
+        }
+        .into(),
+        signer: dummy_account_id(),
+    };
+
+    MsgEnvelope::from(ClientMsg::from(msg))
+}
+
+#[rstest]
+fn test_update_client_ok(fixture: Fixture) {
+    let Fixture {
+        mut ctx,
+        mut router,
+    } = fixture;
+
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+    let signer = dummy_account_id();
+    let timestamp = Timestamp::now();
+
+    let height = Height::new(0, 46).unwrap();
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: MockHeader::new(height).with_timestamp(timestamp).into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope.clone());
+
+    assert!(res.is_ok(), "validation happy path");
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "execution happy path");
+
+    assert_eq!(
+        ctx.ibc_store.client_state(&msg.client_id).unwrap(),
+        MockClientState::new(MockHeader::new(height).with_timestamp(timestamp)).into()
+    );
+}
+
+#[rstest]
+// Tests successful submission of a header with a height below the latest
+// client's height and ensures that `ConsensusState` is stored at the correct
+// path (header height).
+fn test_update_client_with_prev_header() {
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+    let chain_id_b = ChainId::new("mockgaiaA-0").unwrap();
+    let latest_height = Height::new(0, 42).unwrap();
+    let height_1 = Height::new(0, 43).unwrap();
+    let height_2 = Height::new(0, 44).unwrap();
+
+    let ctx_b = TestContextConfig::builder()
+        .host(
+            TendermintHost::builder()
+                .chain_id(chain_id_b.clone())
+                .build(),
+        )
+        .latest_height(latest_height)
+        .build::<TendermintContext>();
+
+    let mut ctx = MockContext::default()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init().context(&ctx_b).build(),
+        )
+        .ibc_store;
+
+    let mut router = MockRouter::new_with_transfer();
+
+    fn build_msg_from_header(
+        chain_id: ChainId,
+        client_id: ClientId,
+        target_height: Height,
+        trusted_height: Height,
+    ) -> MsgEnvelope {
+        let mut tm_block = TendermintHost::builder()
+            .chain_id(chain_id)
+            .build()
+            .generate_block(
+                Vec::new(),
+                target_height.revision_height(),
+                Timestamp::now(),
+                &Default::default(),
+            )
+            .into_header();
+
+        tm_block.set_trusted_height(trusted_height);
+
+        let msg = MsgUpdateClient {
+            client_id,
+            client_message: TmHeader::from(tm_block).into(),
+            signer: dummy_account_id(),
+        };
+
+        MsgEnvelope::from(ClientMsg::from(msg))
+    }
+
+    let msg_1 = build_msg_from_header(
+        chain_id_b.clone(),
+        client_id.clone(),
+        height_1,
+        latest_height,
+    );
+
+    let msg_2 = build_msg_from_header(chain_id_b, client_id.clone(), height_2, latest_height);
+
+    // First, submit a header with `height_2` to set the client's latest
+    // height to `height_2`.
+    let _ = validate(&ctx, &router, msg_2.clone());
+    let _ = execute(&mut ctx, &mut router, msg_2);
+
+    // Then, submit a header with `height_1` to see if the client's latest
+    // height remains `height_2` and the consensus state is stored at the
+    // correct path (`height_1`).
+    let _ = validate(&ctx, &router, msg_1.clone());
+    let _ = execute(&mut ctx, &mut router, msg_1);
+
+    let client_state = ctx.client_state(&client_id).unwrap();
+    assert_eq!(client_state.latest_height(), height_2);
+
+    let cons_state_path = ClientConsensusStatePath::new(
+        client_id,
+        height_1.revision_number(),
+        height_1.revision_height(),
+    );
+    assert!(ctx.consensus_state(&cons_state_path).is_ok());
+}
+
+/// Tests that the Tendermint client consensus state pruning logic
+/// functions correctly.
+///
+/// This test sets up a `TendermintContext` with host height 1 and a trusting
+/// period of 3 seconds. It then advances the state of the `TendermintContext`
+/// by 2 heights, and thus 6 seconds, due to the DEFAULT_BLOCK_TIME_SECS
+/// constant being set to 3 seconds. At this point, the chain is at height
+/// 3. Any consensus states associated with a block more than 3 seconds
+/// in the past should be expired and pruned from the IBC store. The test
+/// thus checks that the consensus state at height 1 is not contained in
+/// the store. It also checks that the consensus state at height 2 is
+/// contained in the store and has not expired.
+#[rstest]
+fn test_consensus_state_pruning() {
+    let chain_id = ChainId::new("mockgaiaA-1").unwrap();
+
+    let client_height = Height::new(1, 1).unwrap();
+
+    let client_id = tm_client_type().build_client_id(0);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id.clone()).build())
+        .latest_height(client_height)
+        .build::<TendermintContext>();
+
+    let mut ctx = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id).build())
+        .latest_height(client_height)
+        .latest_timestamp(Timestamp::now())
+        .build::<TendermintContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .params(
+                    ClientStateConfig::builder()
+                        .trusting_period(Duration::from_secs(3))
+                        .build(),
+                )
+                .build(),
+        );
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let start_host_timestamp = ctx.ibc_store.host_timestamp().unwrap();
+
+    // Move the chain forward by 2 blocks to pass the trusting period.
+    for _ in 1..=2 {
+        let signer = dummy_account_id();
+
+        let update_height = ctx.latest_height();
+
+        ctx.advance_block_height();
+
+        let block = ctx.host_block(&update_height).unwrap().clone();
+        let mut block = block.into_header();
+
+        block.set_trusted_height(client_height);
+
+        let msg = MsgUpdateClient {
+            client_id: client_id.clone(),
+            client_message: block.clone().into(),
+            signer,
+        };
+
+        let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+        let _ = validate(&ctx.ibc_store, &router, msg_envelope.clone());
+        let _ = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+    }
+
+    // Check that latest expired consensus state is pruned.
+    let expired_height = Height::new(1, 1).unwrap();
+    let client_cons_state_path = ClientConsensusStatePath::new(
+        client_id.clone(),
+        expired_height.revision_number(),
+        expired_height.revision_height(),
+    );
+    assert!(ctx
+        .ibc_store
+        .client_update_meta(&client_id, &expired_height)
+        .is_err());
+    assert!(ctx
+        .ibc_store
+        .consensus_state(&client_cons_state_path)
+        .is_err());
+
+    // Check that latest valid consensus state exists.
+    let earliest_valid_height = Height::new(1, 2).unwrap();
+    let client_cons_state_path = ClientConsensusStatePath::new(
+        client_id.clone(),
+        earliest_valid_height.revision_number(),
+        earliest_valid_height.revision_height(),
+    );
+
+    assert!(ctx
+        .ibc_store
+        .client_update_meta(&client_id, &earliest_valid_height)
+        .is_ok());
+    assert!(ctx
+        .ibc_store
+        .consensus_state(&client_cons_state_path)
+        .is_ok());
+
+    let end_host_timestamp = ctx.ibc_store.host_timestamp().unwrap();
+
+    assert_eq!(
+        end_host_timestamp,
+        (start_host_timestamp + Duration::from_secs(6)).unwrap()
+    );
+}
+
+#[rstest]
+fn test_update_nonexisting_client(fixture: Fixture) {
+    let Fixture { ctx, router } = fixture;
+
+    let signer = dummy_account_id();
+
+    let msg = MsgUpdateClient {
+        client_id: ClientId::from_str("nonexistingclient").unwrap(),
+        client_message: MockHeader::new(Height::new(0, 46).unwrap()).into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(res.is_err());
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_adjacent_ok() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let update_height = Height::new(1, 21).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .build::<TendermintContext>();
+
+    let mut ctx = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let block = ctx_b.host_block(&update_height).unwrap();
+    let mut block = block.into_header();
+    block.set_trusted_height(client_height);
+
+    let latest_header_height = block.height();
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope.clone());
+    assert!(res.is_ok());
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+    assert!(res.is_ok(), "result: {res:?}");
+
+    let client_state = ctx.ibc_store.client_state(&msg.client_id).unwrap();
+
+    assert!(client_state
+        .status(&ctx.ibc_store, &msg.client_id)
+        .unwrap()
+        .is_active());
+
+    assert_eq!(client_state.latest_height(), latest_header_height);
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_validator_change_ok() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b_val_history = vec![
+        // validator set of height-20
+        vec![
+            TestgenValidator::new("1").voting_power(50),
+            TestgenValidator::new("2").voting_power(50),
+        ],
+        // next validator set of height-20
+        // validator set of height-21
+        vec![
+            TestgenValidator::new("1").voting_power(34),
+            TestgenValidator::new("2").voting_power(66),
+        ],
+        // next validator set of height-21
+        // validator set of height-22
+        // overlap maintains 1/3 power in older set
+        vec![
+            TestgenValidator::new("1").voting_power(1),
+            TestgenValidator::new("4").voting_power(99),
+        ],
+        // next validator set of height-22
+        vec![
+            TestgenValidator::new("1").voting_power(20),
+            TestgenValidator::new("2").voting_power(80),
+        ],
+    ];
+
+    let block_params = BlockParams::from_validator_history(ctx_b_val_history);
+
+    let update_height = client_height.add(block_params.len() as u64 - 1);
+
+    assert_eq!(update_height.revision_height(), 22);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .block_params_history(block_params)
+        .build::<TendermintContext>();
+
+    let mut ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            // remote light client initialized with client_height
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let mut router_a = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let mut block = ctx_b.host_block(&update_height).unwrap().into_header();
+
+    let trusted_next_validator_set = ctx_b
+        .host_block(&client_height)
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    block.set_trusted_height(client_height);
+    block.set_trusted_next_validators_set(trusted_next_validator_set);
+
+    let latest_header_height = block.height();
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope.clone());
+    assert!(res.is_ok());
+
+    let res = execute(&mut ctx_a.ibc_store, &mut router_a, msg_envelope);
+    assert!(res.is_ok(), "result: {res:?}");
+
+    let client_state = ctx_a.ibc_store.client_state(&msg.client_id).unwrap();
+    assert!(client_state
+        .status(&ctx_a.ibc_store, &msg.client_id)
+        .unwrap()
+        .is_active());
+    assert_eq!(client_state.latest_height(), latest_header_height);
+}
+
+// TODO(rano): refactor the validator change tests to use a single test function
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_wrong_trusted_validator_change_fail() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b_val_history = vec![
+        // validator set of height-20
+        vec![
+            TestgenValidator::new("1").voting_power(50),
+            TestgenValidator::new("2").voting_power(50),
+        ],
+        // next validator set of height-20
+        // validator set of height-21
+        vec![
+            TestgenValidator::new("1").voting_power(45),
+            TestgenValidator::new("2").voting_power(55),
+        ],
+        // next validator set of height-21
+        // validator set of height-22
+        vec![
+            TestgenValidator::new("1").voting_power(30),
+            TestgenValidator::new("2").voting_power(70),
+        ],
+        // next validator set of height-22
+        vec![
+            TestgenValidator::new("1").voting_power(20),
+            TestgenValidator::new("2").voting_power(80),
+        ],
+    ];
+
+    let block_params = BlockParams::from_validator_history(ctx_b_val_history);
+
+    let update_height = client_height.add(block_params.len() as u64 - 1);
+
+    assert_eq!(update_height.revision_height(), 22);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .block_params_history(block_params)
+        .build::<TendermintContext>();
+
+    let ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            // remote light client initialized with client_height
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let router = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    // next validator set from height-20
+    let trusted_next_validator_set = ctx_b
+        .host_block(&client_height)
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    // next validator set from height-21
+    let mistrusted_next_validator_set = ctx_b
+        .host_block(&client_height.increment())
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    // ensure the next validator sets are different
+    assert_ne!(
+        mistrusted_next_validator_set.hash(),
+        trusted_next_validator_set.hash()
+    );
+
+    let mut block = ctx_b.host_block(&update_height).unwrap().into_header();
+
+    // set the trusted height to height-20
+    block.set_trusted_height(client_height);
+    // set the trusted next validator set from height-21, which is different than height-20
+    block.set_trusted_next_validators_set(mistrusted_next_validator_set);
+
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx_a.ibc_store, &router, msg_envelope);
+
+    assert!(res.is_err());
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_validator_change_fail() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b_val_history = vec![
+        // validator set of height-20
+        vec![
+            TestgenValidator::new("1").voting_power(50),
+            TestgenValidator::new("2").voting_power(50),
+        ],
+        // next validator set of height-20
+        // validator set of height-21
+        vec![
+            TestgenValidator::new("1").voting_power(90),
+            TestgenValidator::new("2").voting_power(10),
+        ],
+        // next validator set of height-21
+        // validator set of height-22
+        // overlap doesn't maintain 1/3 power in older set
+        vec![
+            // TestgenValidator::new("1").voting_power(0),
+            TestgenValidator::new("4").voting_power(90),
+            TestgenValidator::new("2").voting_power(10),
+        ],
+        // validator set of height-23
+        vec![
+            TestgenValidator::new("1").voting_power(20),
+            TestgenValidator::new("2").voting_power(80),
+        ],
+    ];
+
+    let block_params = BlockParams::from_validator_history(ctx_b_val_history);
+
+    let update_height = client_height.add(block_params.len() as u64 - 1);
+
+    assert_eq!(update_height.revision_height(), 22);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .block_params_history(block_params)
+        .build::<TendermintContext>();
+
+    let ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            // remote light client initialized with client_height
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let router_a = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let trusted_next_validator_set = ctx_b
+        .host_block(&client_height)
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    let mut block = ctx_b.host_block(&update_height).unwrap().into_header();
+
+    block.set_trusted_height(client_height);
+    block.set_trusted_next_validators_set(trusted_next_validator_set);
+
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope);
+
+    assert!(res.is_err());
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_malicious_validator_change_pass() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b_val_history = vec![
+        // First two validator sets are default at client creation
+        //
+        // validator set of height-20
+        vec![
+            TestgenValidator::new("1").voting_power(50),
+            TestgenValidator::new("2").voting_power(50),
+        ],
+        // validator set of height-21
+        // next validator set of height-20
+        vec![
+            TestgenValidator::new("1").voting_power(34),
+            TestgenValidator::new("2").voting_power(66),
+        ],
+        // validator set of height-22
+        // next validator set of height-21
+        vec![
+            TestgenValidator::new("4").voting_power(90),
+            TestgenValidator::new("2").voting_power(10),
+        ],
+        // next validator set of height-22
+        vec![
+            TestgenValidator::new("1").voting_power(20),
+            TestgenValidator::new("2").voting_power(80),
+        ],
+    ];
+
+    let mut block_params = BlockParams::from_validator_history(ctx_b_val_history);
+
+    if let Some(block_param) = block_params.last_mut() {
+        // forged validator set of height-22
+        block_param.validators = vec![TestgenValidator::new("1").voting_power(100)];
+    }
+
+    let update_height = client_height.add(block_params.len() as u64 - 1);
+
+    assert_eq!(update_height.revision_height(), 22);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .block_params_history(block_params)
+        .build::<TendermintContext>();
+
+    let mut ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            // remote light client initialized with client_height
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let mut router_a = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let mut block = ctx_b.host_block(&update_height).unwrap().into_header();
+
+    let trusted_next_validator_set = ctx_b
+        .host_block(&client_height)
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    block.set_trusted_height(client_height);
+    block.set_trusted_next_validators_set(trusted_next_validator_set);
+
+    let latest_header_height = block.height();
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope.clone());
+    assert!(res.is_ok());
+
+    let res = execute(&mut ctx_a.ibc_store, &mut router_a, msg_envelope);
+    assert!(res.is_ok(), "result: {res:?}");
+
+    let client_state = ctx_a.ibc_store.client_state(&msg.client_id).unwrap();
+    assert!(client_state
+        .status(&ctx_a.ibc_store, &msg.client_id)
+        .unwrap()
+        .is_active());
+    assert_eq!(client_state.latest_height(), latest_header_height);
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_adjacent_malicious_validator_change_fail() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 21).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b_val_history = vec![
+        // validator set of height-21
+        vec![
+            TestgenValidator::new("1").voting_power(34),
+            TestgenValidator::new("2").voting_power(66),
+        ],
+        // next validator set of height-21
+        // validator set of height-22
+        vec![
+            TestgenValidator::new("4").voting_power(90),
+            TestgenValidator::new("2").voting_power(10),
+        ],
+        // next validator set of height-22
+        vec![
+            TestgenValidator::new("1").voting_power(20),
+            TestgenValidator::new("2").voting_power(80),
+        ],
+    ];
+
+    let mut block_params = BlockParams::from_validator_history(ctx_b_val_history);
+
+    if let Some(block_param) = block_params.last_mut() {
+        // forged validator set of height-22
+        block_param.validators = vec![TestgenValidator::new("1").voting_power(100)];
+    }
+
+    let update_height = client_height.add(block_params.len() as u64 - 1);
+
+    assert_eq!(update_height.revision_height(), 22);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .block_params_history(block_params)
+        .build::<TendermintContext>();
+
+    let ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            // remote light client initialized with client_height
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let router_a = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let mut block = ctx_b.host_block(&update_height).unwrap().into_header();
+
+    let trusted_next_validator_set = ctx_b
+        .host_block(&client_height)
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    block.set_trusted_height(client_height);
+    block.set_trusted_next_validators_set(trusted_next_validator_set);
+
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope);
+
+    assert!(res.is_err());
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_non_adjacent_ok() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let update_height = Height::new(1, 21).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(update_height)
+        .build::<TendermintContext>();
+
+    let mut ctx = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height.sub(1).expect("no error"), client_height])
+                .build(),
+        );
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let block = ctx_b.host_block(&update_height).unwrap();
+    let mut block = block.into_header();
+    let trusted_height = client_height.clone().sub(1).unwrap();
+    block.set_trusted_height(trusted_height);
+
+    let latest_header_height = block.height();
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope.clone());
+    assert!(res.is_ok());
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+    assert!(res.is_ok(), "result: {res:?}");
+
+    let client_state = ctx.ibc_store.client_state(&msg.client_id).unwrap();
+
+    assert!(client_state
+        .status(&ctx.ibc_store, &msg.client_id)
+        .unwrap()
+        .is_active());
+
+    assert_eq!(client_state.latest_height(), latest_header_height);
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_duplicate_ok() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+
+    let ctx_a_chain_id = ChainId::new("mockgaiaA-1").unwrap();
+    let ctx_b_chain_id = ChainId::new("mockgaiaB-1").unwrap();
+    let start_height = Height::new(1, 11).unwrap();
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(ctx_b_chain_id).build())
+        .latest_height(client_height)
+        .build::<TendermintContext>();
+
+    let mut ctx_a = TestContextConfig::builder()
+        .host(MockHost::builder().chain_id(ctx_a_chain_id).build())
+        .latest_height(start_height)
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([start_height])
+                .build(),
+        );
+
+    let mut router_a = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let block = ctx_b.host_block(&client_height).unwrap();
+    let mut block = block.into_header();
+
+    // Update the trusted height of the header to point to the previous height
+    // (`start_height` in this case).
+    //
+    // Note: The current `TestContext` interface doesn't allow us to
+    // do this without a major redesign.
+
+    // current problem: the timestamp of the new header doesn't match the timestamp of
+    // the stored consensus state. If we hack them to match, then commit check fails.
+    // FIXME: figure out why they don't match.
+
+    block.set_trusted_height(start_height);
+
+    // Update the client height to `client_height`
+    //
+    // Note: The current `TestContext` interface doesn't allow us to
+    // do this without a major redesign.
+    {
+        // FIXME: idea: we need to update the light client with the latest block from
+        // chain B
+        let consensus_state: AnyConsensusState = block.clone().into_consensus_state().into();
+
+        let tm_block = &block;
+
+        let chain_id = ChainId::from_str(tm_block.header().chain_id.as_str()).unwrap();
+
+        let client_state = {
+            #[allow(deprecated)]
+            let raw_client_state = RawTmClientState {
+                chain_id: chain_id.to_string(),
+                trust_level: Some(Fraction {
+                    numerator: 1,
+                    denominator: 3,
+                }),
+                trusting_period: Some(Duration::from_secs(64000).into()),
+                unbonding_period: Some(Duration::from_secs(128_000).into()),
+                max_clock_drift: Some(Duration::from_millis(3000).into()),
+                latest_height: Some(
+                    Height::new(
+                        chain_id.revision_number(),
+                        u64::from(tm_block.header().height),
+                    )
+                    .unwrap()
+                    .into(),
+                ),
+                proof_specs: ProofSpecs::cosmos().into(),
+                upgrade_path: Vec::new(),
+                frozen_height: Some(RawHeight {
+                    revision_number: 0,
+                    revision_height: 0,
+                }),
+                allow_update_after_expiry: false,
+                allow_update_after_misbehaviour: false,
+            };
+
+            let client_state = TmClientState::try_from(raw_client_state).unwrap();
+
+            ClientState::from(client_state).into()
+        };
+
+        ctx_a = ctx_a.with_client_state(&client_id, client_state);
+
+        ctx_a = ctx_a.with_consensus_state(&client_id, client_height, consensus_state);
+    }
+
+    let latest_header_height = block.height();
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope.clone());
+    assert!(res.is_ok(), "result: {res:?}");
+
+    let res = execute(&mut ctx_a.ibc_store, &mut router_a, msg_envelope);
+    assert!(res.is_ok(), "result: {res:?}");
+
+    let client_state = ctx_a.ibc_store.client_state(&msg.client_id).unwrap();
+    assert!(client_state
+        .status(&ctx_a.ibc_store, &msg.client_id)
+        .unwrap()
+        .is_active());
+    assert_eq!(client_state.latest_height(), latest_header_height);
+}
+
+#[rstest]
+fn test_update_synthetic_tendermint_client_lower_height() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+
+    let client_update_height = Height::new(1, 19).unwrap();
+
+    let chain_start_height = Height::new(1, 11).unwrap();
+
+    let ctx_b = TestContextConfig::builder()
+        .host(
+            TendermintHost::builder()
+                .chain_id(ChainId::new("mockgaiaB-1").unwrap())
+                .build(),
+        )
+        .latest_height(client_height)
+        .build::<TendermintContext>();
+
+    let ctx = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(chain_start_height)
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init().context(&ctx_b).build(),
+        );
+
+    let router = MockRouter::new_with_transfer();
+
+    let signer = dummy_account_id();
+
+    let block_ref = ctx_b.host_block(&client_update_height).unwrap();
+
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block_ref.into_header().into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+    assert!(res.is_err());
+}
+
+#[rstest]
+fn test_update_client_events(fixture: Fixture) {
+    let Fixture {
+        mut ctx,
+        mut router,
+    } = fixture;
+
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+    let signer = dummy_account_id();
+    let timestamp = Timestamp::now();
+
+    let height = Height::new(0, 46).unwrap();
+    let header: Any = MockHeader::new(height).with_timestamp(timestamp).into();
+    let msg = MsgUpdateClient {
+        client_id: client_id.clone(),
+        client_message: header.clone(),
+        signer,
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+    assert!(res.is_ok());
+
+    let ibc_events = ctx.get_events();
+
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Client)
+    ));
+
+    let IbcEvent::UpdateClient(update_client_event) = &ibc_events[1] else {
+        panic!("UpdateClient event is expected")
+    };
+
+    assert_eq!(update_client_event.client_id(), &client_id);
+    assert_eq!(update_client_event.client_type(), &mock_client_type());
+    assert_eq!(update_client_event.consensus_height(), &height);
+    assert_eq!(update_client_event.consensus_heights(), &vec![height]);
+    assert_eq!(update_client_event.header(), &header.to_vec());
+}
+
+fn ensure_misbehaviour<S: ProvableStore + Debug>(
+    ctx: &MockIbcStore<S>,
+    client_id: &ClientId,
+    client_type: &ClientType,
+) {
+    let client_state = ctx.client_state(client_id).unwrap();
+
+    let status = client_state.status(ctx, client_id).unwrap();
+    assert!(status.is_frozen(), "client_state status: {status}");
+
+    // check events
+    let ibc_events = ctx.events.lock();
+    assert_eq!(ibc_events.len(), 2);
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Client),
+    ));
+    let IbcEvent::ClientMisbehaviour(misbehaviour_client_event) = &ibc_events[1] else {
+        panic!("ClientMisbehaviour event is expected")
+    };
+    assert_eq!(misbehaviour_client_event.client_id(), client_id);
+    assert_eq!(misbehaviour_client_event.client_type(), client_type);
+}
+
+/// Tests misbehaviour handling for the mock client.
+///
+/// Misbehaviour evidence consists of identical headers - mock misbehaviour handler
+/// considers it a valid proof of misbehaviour.
+#[rstest]
+fn test_misbehaviour_client_ok(fixture: Fixture) {
+    let Fixture {
+        mut ctx,
+        mut router,
+    } = fixture;
+
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+    let msg_envelope = msg_update_client(&client_id);
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope.clone());
+    assert!(res.is_ok());
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+    assert!(res.is_ok());
+
+    ensure_misbehaviour(&ctx.ibc_store, &client_id, &mock_client_type());
+}
+
+#[rstest]
+fn test_submit_misbehaviour_nonexisting_client(fixture: Fixture) {
+    let Fixture { router, .. } = fixture;
+
+    let client_id = ClientId::from_str("mockclient1").unwrap();
+
+    let msg_envelope = msg_update_client(&ClientId::from_str("nonexistingclient").unwrap());
+
+    let ctx = MockContext::default().with_light_client(
+        &client_id,
+        LightClientState::<MockHost>::with_latest_height(Height::new(0, 42).unwrap()),
+    );
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+    assert!(res.is_err());
+}
+
+#[rstest]
+fn test_client_update_misbehaviour_nonexisting_client(fixture: Fixture) {
+    let Fixture { router, .. } = fixture;
+
+    let client_id = ClientId::from_str("mockclient1").unwrap();
+
+    let msg_envelope = msg_update_client(&ClientId::from_str("nonexistingclient").unwrap());
+
+    let ctx = MockContext::default().with_light_client(
+        &client_id,
+        LightClientState::<MockHost>::with_latest_height(Height::new(0, 42).unwrap()),
+    );
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+    assert!(res.is_err());
+}
+
+/// Tests misbehaviour handling for the synthetic Tendermint client.
+/// Misbehaviour evidence consists of equivocal headers.
+#[rstest]
+fn test_misbehaviour_synthetic_tendermint_equivocation() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let misbehaviour_height = Height::new(1, 21).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    // Create a mock context for chain-B
+    let ctx_b = TestContextConfig::builder()
+        .host(
+            TendermintHost::builder()
+                .chain_id(chain_id_b.clone())
+                .build(),
+        )
+        .latest_height(misbehaviour_height)
+        .build::<TendermintContext>();
+
+    // Create a mock context for chain-A with a synthetic tendermint light client for chain-B
+    let mut ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .consensus_heights([client_height])
+                .build(),
+        );
+
+    let mut router_a = MockRouter::new_with_transfer();
+
+    // Get chain-B's header at `misbehaviour_height`
+    let header1: TmHeader = {
+        let block = ctx_b.host_block(&misbehaviour_height).unwrap();
+        let mut block = block.into_header();
+        block.set_trusted_height(client_height);
+        block.into()
+    };
+
+    // Generate an equivocal header for chain-B at `misbehaviour_height`
+    let header2 = {
+        let mut tm_block = TendermintHost::builder()
+            .chain_id(chain_id_b)
+            .build()
+            .generate_block(
+                Vec::new(),
+                misbehaviour_height.revision_height(),
+                Timestamp::now(),
+                &Default::default(),
+            )
+            .into_header();
+        tm_block.set_trusted_height(client_height);
+        tm_block.into()
+    };
+
+    let msg = MsgUpdateClient {
+        client_id: client_id.clone(),
+        client_message: TmMisbehaviour::new(client_id.clone(), header1, header2).into(),
+        signer: dummy_account_id(),
+    };
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope.clone());
+    assert!(res.is_ok());
+    let res = execute(&mut ctx_a.ibc_store, &mut router_a, msg_envelope);
+    assert!(res.is_ok());
+    ensure_misbehaviour(&ctx_a.ibc_store, &client_id, &tm_client_type());
+}
+
+#[rstest]
+fn test_misbehaviour_synthetic_tendermint_bft_time() {
+    let client_id = tm_client_type().build_client_id(0);
+    let client_height = Height::new(1, 20).unwrap();
+    let misbehaviour_height = Height::new(1, 21).unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let ctx_b = TestContextConfig::builder()
+        .host(
+            TendermintHost::builder()
+                .chain_id(chain_id_b.clone())
+                .build(),
+        )
+        .latest_height(client_height)
+        .build::<TendermintContext>();
+
+    // Create a mock context for chain-A with a synthetic tendermint light client for chain-B
+    let mut ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init().context(&ctx_b).build(),
+        );
+
+    let mut router_a = MockRouter::new_with_transfer();
+
+    // Generate `header1` for chain-B
+    let header1 = {
+        let mut tm_block = TendermintHost::builder()
+            .chain_id(chain_id_b.clone())
+            .build()
+            .generate_block(
+                Vec::new(),
+                misbehaviour_height.revision_height(),
+                Timestamp::now(),
+                &Default::default(),
+            )
+            .into_header();
+        tm_block.set_trusted_height(client_height);
+        tm_block
+    };
+
+    // Generate `header2` for chain-B which is identical to `header1` but with a conflicting
+    // timestamp
+    let header2 = {
+        let timestamp =
+            Timestamp::from_nanoseconds(Timestamp::now().nanoseconds() + 1_000_000_000).unwrap();
+        let mut tm_block = TendermintHost::builder()
+            .chain_id(chain_id_b)
+            .build()
+            .generate_block(
+                Vec::new(),
+                misbehaviour_height.revision_height(),
+                timestamp,
+                &Default::default(),
+            )
+            .into_header();
+        tm_block.set_trusted_height(client_height);
+        tm_block
+    };
+
+    let msg = MsgUpdateClient {
+        client_id: client_id.clone(),
+        client_message: TmMisbehaviour::new(client_id.clone(), header1.into(), header2.into())
+            .into(),
+        signer: dummy_account_id(),
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope.clone());
+    assert!(res.is_ok());
+    let res = execute(&mut ctx_a.ibc_store, &mut router_a, msg_envelope);
+    assert!(res.is_ok());
+    ensure_misbehaviour(&ctx_a.ibc_store, &client_id, &tm_client_type());
+}
+
+#[rstest]
+fn test_expired_client() {
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let update_height = Height::new(1, 21).unwrap();
+    let client_height = update_height.sub(3).unwrap();
+
+    let client_id = tm_client_type().build_client_id(0);
+
+    let timestamp = Timestamp::now();
+
+    let trusting_period = Duration::from_secs(64);
+
+    let ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(client_height)
+        .latest_timestamp(timestamp)
+        .build::<TendermintContext>();
+
+    let mut ctx = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .latest_timestamp(timestamp)
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .params(
+                    ClientStateConfig::builder()
+                        .trusting_period(trusting_period)
+                        .build(),
+                )
+                .build(),
+        );
+
+    while ctx.ibc_store.host_timestamp().expect("no error")
+        < (timestamp + trusting_period).expect("no error")
+    {
+        ctx.advance_block_height();
+    }
+
+    let client_state = ctx.ibc_store.client_state(&client_id).unwrap();
+
+    assert!(client_state
+        .status(&ctx.ibc_store, &client_id)
+        .unwrap()
+        .is_expired());
+}
+
+#[rstest]
+fn test_client_update_max_clock_drift() {
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    let client_height = Height::new(1, 20).unwrap();
+
+    let client_id = tm_client_type().build_client_id(0);
+
+    let timestamp = Timestamp::now();
+
+    let max_clock_drift = Duration::from_secs(64);
+
+    let mut ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(client_height)
+        .latest_timestamp(timestamp)
+        .build::<TendermintContext>();
+
+    let ctx_a = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(ChainId::new("mockgaiaA-1").unwrap())
+                .build(),
+        )
+        .latest_height(Height::new(1, 1).unwrap())
+        .latest_timestamp(timestamp)
+        .build::<MockContext>()
+        .with_light_client(
+            &client_id,
+            LightClientBuilder::init()
+                .context(&ctx_b)
+                .params(
+                    ClientStateConfig::builder()
+                        .max_clock_drift(max_clock_drift)
+                        .build(),
+                )
+                .build(),
+        );
+
+    let router_a = MockRouter::new_with_transfer();
+
+    while ctx_b.ibc_store.host_timestamp().expect("no error")
+        < (ctx_a.ibc_store.host_timestamp().expect("no error") + max_clock_drift).expect("no error")
+    {
+        ctx_b.advance_block_height();
+    }
+
+    // include current block
+    ctx_b.advance_block_height();
+
+    let update_height = ctx_b.latest_height();
+
+    let signer = dummy_account_id();
+
+    let block = ctx_b.host_block(&update_height).unwrap();
+    let mut block = block.into_header();
+    block.set_trusted_height(client_height);
+
+    let trusted_next_validator_set = ctx_b
+        .host_block(&client_height)
+        .expect("no error")
+        .next_validators
+        .clone();
+
+    block.set_trusted_next_validators_set(trusted_next_validator_set);
+
+    let msg = MsgUpdateClient {
+        client_id,
+        client_message: block.clone().into(),
+        signer,
+    };
+
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg));
+
+    let res = validate(&ctx_a.ibc_store, &router_a, msg_envelope);
+    assert!(res.is_err());
+}
+
+/// Builds a `ClientMsg::UpdateClient` for a client with id `client_id` running on the `dest`
+/// context, assuming that the latest header on the source context is `src_header`.
+pub(crate) fn build_client_update_datagram<H: TestHeader, Dst: TestHost>(
+    dest: &TestContext<Dst>,
+    client_id: &ClientId,
+    src_header: &H,
+) -> Result<ClientMsg, RelayerError>
+where
+    HostClientState<Dst>: ClientStateValidation<DefaultIbcStore>,
+{
+    // Check if client for ibc0 on ibc1 has been updated to latest height:
+    // - query client state on destination chain
+    let dest_client_latest_height = dest.light_client_latest_height(client_id);
+
+    if src_header.height() == dest_client_latest_height {
+        return Err(RelayerError::ClientAlreadyUpToDate {
+            client_id: client_id.clone(),
+            source_height: src_header.height(),
+            destination_height: dest_client_latest_height,
+        });
+    };
+
+    if dest_client_latest_height > src_header.height() {
+        return Err(RelayerError::ClientAtHigherHeight {
+            client_id: client_id.clone(),
+            source_height: src_header.height(),
+            destination_height: dest_client_latest_height,
+        });
+    };
+
+    // Client on destination chain can be updated.
+    Ok(ClientMsg::UpdateClient(MsgUpdateClient {
+        client_id: client_id.clone(),
+        client_message: src_header.clone().into(),
+        signer: dummy_account_id(),
+    }))
+}
+
+/// Serves to test both ICS-26 `dispatch` & `build_client_update_datagram` functions.
+/// Implements a "ping pong" of client update messages, so that two chains repeatedly
+/// process a client update message and update their height in sequence.
+#[rstest]
+fn client_update_ping_pong() {
+    let chain_a_start_height = Height::new(1, 11).unwrap();
+    let chain_b_start_height = Height::new(1, 20).unwrap();
+    let client_on_b_for_a_height = Height::new(1, 10).unwrap(); // Should be smaller than `chain_a_start_height`
+    let client_on_a_for_b_height = Height::new(1, 20).unwrap(); // Should be smaller than `chain_b_start_height`
+    let num_iterations = 4;
+
+    let client_on_a_for_b = tm_client_type().build_client_id(0);
+    let client_on_b_for_a = mock_client_type().build_client_id(0);
+
+    let chain_id_a = ChainId::new("mockgaiaA-1").unwrap();
+    let chain_id_b = ChainId::new("mockgaiaB-1").unwrap();
+
+    // Create two mock contexts, one for each chain.
+    let mut ctx_a = TestContextConfig::builder()
+        .host(MockHost::builder().chain_id(chain_id_a).build())
+        .latest_height(chain_a_start_height)
+        .build::<MockContext>();
+
+    let mut ctx_b = TestContextConfig::builder()
+        .host(TendermintHost::builder().chain_id(chain_id_b).build())
+        .latest_height(chain_b_start_height)
+        .latest_timestamp(ctx_a.timestamp_at(chain_a_start_height.decrement().unwrap())) // chain B is running slower than chain A
+        .build::<TendermintContext>();
+
+    ctx_a = ctx_a.with_light_client(
+        &client_on_a_for_b,
+        LightClientBuilder::init()
+            .context(&ctx_b)
+            .consensus_heights([client_on_a_for_b_height])
+            .build(),
+    );
+
+    ctx_b = ctx_b.with_light_client(
+        &client_on_b_for_a,
+        LightClientBuilder::init()
+            .context(&ctx_a)
+            .consensus_heights([client_on_b_for_a_height])
+            .build(),
+    );
+
+    for _i in 0..num_iterations {
+        // Update client on chain B to latest height of A.
+        // - create the client update message with the latest header from A
+        let a_latest_header = ctx_a.query_latest_block().unwrap();
+        let client_msg_b_res = build_client_update_datagram(
+            &ctx_b,
+            &client_on_b_for_a,
+            &a_latest_header.into_header(),
+        );
+
+        assert!(
+                client_msg_b_res.is_ok(),
+                "create_client_update failed for context destination {ctx_b:?}, error: {client_msg_b_res:?}",
+            );
+
+        let client_msg_b = client_msg_b_res.unwrap();
+
+        // - send the message to B. We bypass ICS18 interface and call directly into
+        // `TestContext` `recv` method (to avoid additional serialization steps).
+        let dispatch_res_b = ctx_b.deliver(MsgEnvelope::Client(client_msg_b));
+        let validation_res = ctx_b.host.validate();
+        assert!(
+            validation_res.is_ok(),
+            "context validation failed with error {validation_res:?} for context {ctx_b:?}",
+        );
+
+        // Check if the update succeeded.
+        assert!(
+            dispatch_res_b.is_ok(),
+            "Dispatch failed for host chain b with error: {dispatch_res_b:?}"
+        );
+
+        assert_eq!(
+            ctx_b.light_client_latest_height(&client_on_b_for_a),
+            ctx_a.latest_height()
+        );
+
+        // Update client on chain A to latest height of B.
+        // - create the client update message with the latest header from B
+        // The test uses LightClientBlock that does not store the trusted height
+        let mut b_latest_header = ctx_b.query_latest_block().unwrap().clone().into_header();
+
+        let th = b_latest_header.height();
+        b_latest_header.set_trusted_height(th.decrement().unwrap());
+
+        let client_msg_a_res =
+            build_client_update_datagram(&ctx_a, &client_on_a_for_b, &b_latest_header);
+
+        assert!(
+                client_msg_a_res.is_ok(),
+                "create_client_update failed for context destination {ctx_a:?}, error: {client_msg_a_res:?}",
+            );
+
+        let client_msg_a = client_msg_a_res.unwrap();
+
+        debug!("client_msg_a = {:?}", client_msg_a);
+
+        // - send the message to A
+        let dispatch_res_a = ctx_a.deliver(MsgEnvelope::Client(client_msg_a));
+        let validation_res = ctx_a.host.validate();
+        assert!(
+            validation_res.is_ok(),
+            "context validation failed with error {validation_res:?} for context {ctx_a:?}",
+        );
+
+        // Check if the update succeeded.
+        assert!(
+            dispatch_res_a.is_ok(),
+            "Dispatch failed for host chain a with error: {dispatch_res_a:?}"
+        );
+        assert_eq!(
+            ctx_a.light_client_latest_height(&client_on_a_for_b),
+            ctx_b.latest_height()
+        );
+    }
+}
diff --git a/tests-integration/tests/core/ics02_client/upgrade_client.rs b/tests-integration/tests/core/ics02_client/upgrade_client.rs
new file mode 100644
index 000000000..015bf8921
--- /dev/null
+++ b/tests-integration/tests/core/ics02_client/upgrade_client.rs
@@ -0,0 +1,172 @@
+use ibc::clients::tendermint::types::client_type;
+use ibc::core::client::context::{ClientValidationContext, ExtClientValidationContext};
+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::entrypoint::{execute, validate};
+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::path::ClientConsensusStatePath;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::clients::tendermint::{
+    dummy_tendermint_header, dummy_tm_client_state_from_header,
+};
+use ibc_testkit::fixtures::core::client::dummy_msg_upgrade_client;
+use ibc_testkit::fixtures::{Expect, Fixture};
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use ibc_testkit::testapp::ibc::clients::{AnyClientState, AnyConsensusState};
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+
+enum Ctx {
+    Default,
+    WithClient,
+}
+
+enum Msg {
+    Default,
+    LowUpgradeHeight,
+    UnknownUpgradedClientStateType,
+}
+
+fn msg_upgrade_client_fixture(ctx_variant: Ctx, msg_variant: Msg) -> Fixture<MsgUpgradeClient> {
+    let client_id = mock_client_type().build_client_id(0);
+
+    let ctx_default = MockContext::default();
+    let ctx_with_client = MockContext::default().with_light_client(
+        &client_id,
+        LightClientState::<MockHost>::with_latest_height(Height::new(0, 42).unwrap()),
+    );
+    let ctx = match ctx_variant {
+        Ctx::Default => ctx_default.ibc_store,
+        Ctx::WithClient => ctx_with_client.ibc_store,
+    };
+
+    let upgrade_height = Height::new(1, 26).unwrap();
+    let msg_default = dummy_msg_upgrade_client(client_id.clone(), upgrade_height);
+
+    let low_upgrade_height = Height::new(0, 26).unwrap();
+    let msg_with_low_upgrade_height = dummy_msg_upgrade_client(client_id, low_upgrade_height);
+
+    let msg_with_unknown_upgraded_cs = MsgUpgradeClient {
+        upgraded_client_state: dummy_tm_client_state_from_header(dummy_tendermint_header()).into(),
+        ..msg_default.clone()
+    };
+
+    let msg = match msg_variant {
+        Msg::Default => msg_default,
+        Msg::LowUpgradeHeight => msg_with_low_upgrade_height,
+        Msg::UnknownUpgradedClientStateType => msg_with_unknown_upgraded_cs,
+    };
+
+    Fixture { ctx, msg }
+}
+
+fn upgrade_client_validate(fxt: &Fixture<MsgUpgradeClient>, expect: Expect) {
+    let Fixture { ctx, msg } = fxt;
+    let router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(msg.clone()));
+    let res = validate(ctx, &router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
+
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}");
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}");
+        }
+    };
+}
+
+fn upgrade_client_execute(fxt: &mut Fixture<MsgUpgradeClient>, expect: Expect) {
+    let mut router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ClientMsg::from(fxt.msg.clone()));
+    let res = execute(&mut fxt.ctx, &mut router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
+    match expect {
+        Expect::Failure(err) => {
+            assert!(res.is_err(), "{err_msg}");
+            assert_eq!(
+                core::mem::discriminant(res.as_ref().unwrap_err()),
+                core::mem::discriminant(&err.unwrap())
+            );
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}");
+            let ibc_events = fxt.ctx.events.lock();
+            assert!(matches!(
+                ibc_events[0],
+                IbcEvent::Message(MessageEvent::Client)
+            ));
+
+            let IbcEvent::UpgradeClient(upgrade_client_event) = &ibc_events[1] else {
+                panic!("UpgradeClient event is expected")
+            };
+            let plan_height = Height::new(1, 26).unwrap();
+
+            assert_eq!(upgrade_client_event.client_id(), &fxt.msg.client_id);
+            assert_eq!(upgrade_client_event.client_type(), &mock_client_type());
+            assert_eq!(upgrade_client_event.consensus_height(), &plan_height);
+
+            let client_state = fxt.ctx.client_state(&fxt.msg.client_id).unwrap();
+            let msg_client_state: AnyClientState =
+                fxt.msg.upgraded_client_state.clone().try_into().unwrap();
+            assert_eq!(client_state, msg_client_state);
+
+            let consensus_state = fxt
+                .ctx
+                .consensus_state(&ClientConsensusStatePath::new(
+                    fxt.msg.client_id.clone(),
+                    plan_height.revision_number(),
+                    plan_height.revision_height(),
+                ))
+                .unwrap();
+            let msg_consensus_state: AnyConsensusState =
+                fxt.msg.upgraded_consensus_state.clone().try_into().unwrap();
+            assert_eq!(consensus_state, msg_consensus_state);
+        }
+    };
+}
+
+#[test]
+fn msg_upgrade_client_healthy() {
+    let mut fxt = msg_upgrade_client_fixture(Ctx::WithClient, Msg::Default);
+    upgrade_client_validate(&fxt, Expect::Success);
+    upgrade_client_execute(&mut fxt, Expect::Success);
+}
+
+#[test]
+fn upgrade_client_fail_nonexisting_client() {
+    let fxt = msg_upgrade_client_fixture(Ctx::Default, Msg::Default);
+    let expected_err = ContextError::ClientError(ClientError::ClientStateNotFound {
+        client_id: fxt.msg.client_id.clone(),
+    });
+    upgrade_client_validate(&fxt, Expect::Failure(Some(expected_err)));
+}
+
+#[test]
+fn upgrade_client_fail_low_upgrade_height() {
+    let fxt: Fixture<MsgUpgradeClient> =
+        msg_upgrade_client_fixture(Ctx::WithClient, Msg::LowUpgradeHeight);
+    let expected_err: ClientError = UpgradeClientError::LowUpgradeHeight {
+        upgraded_height: Height::new(0, 26).unwrap(),
+        client_height: fxt.ctx.host_height().unwrap(),
+    }
+    .into();
+    upgrade_client_validate(
+        &fxt,
+        Expect::Failure(Some(ContextError::from(expected_err))),
+    );
+}
+
+#[test]
+fn upgrade_client_fail_unknown_upgraded_client_state() {
+    let fxt = msg_upgrade_client_fixture(Ctx::WithClient, Msg::UnknownUpgradedClientStateType);
+    let expected_err = ContextError::ClientError(ClientError::UnknownClientStateType {
+        client_state_type: client_type().to_string(),
+    });
+    upgrade_client_validate(&fxt, Expect::Failure(Some(expected_err)));
+}
diff --git a/tests-integration/tests/core/ics03_connection/conn_open_ack.rs b/tests-integration/tests/core/ics03_connection/conn_open_ack.rs
new file mode 100644
index 000000000..8860e3227
--- /dev/null
+++ b/tests-integration/tests/core/ics03_connection/conn_open_ack.rs
@@ -0,0 +1,214 @@
+use core::str::FromStr;
+
+use ibc::core::client::types::Height;
+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::entrypoint::{execute, validate};
+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::context::MockContext;
+use ibc_testkit::fixtures::core::connection::dummy_msg_conn_open_ack;
+use ibc_testkit::fixtures::core::context::TestContextConfig;
+use ibc_testkit::fixtures::{Expect, Fixture};
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::{DefaultIbcStore, LightClientState};
+use test_log::test;
+
+enum Ctx {
+    New,
+    NewWithConnection,
+    NewWithConnectionEndOpen,
+    DefaultWithConnection,
+}
+
+fn conn_open_ack_fixture(ctx: Ctx) -> Fixture<MsgConnectionOpenAck> {
+    let msg = dummy_msg_conn_open_ack(10, 10);
+
+    // Client parameters -- identifier and correct height (matching the proof height)
+    let client_id = ClientId::from_str("mock_clientid").unwrap();
+    let proof_height = msg.proofs_height_on_b;
+    let conn_id = msg.conn_id_on_a.clone();
+
+    // Parametrize the host chain to have a height at least as recent as the
+    // the height of the proofs in the Ack msg.
+    let latest_height = proof_height.increment();
+
+    // A connection end that will exercise the successful path.
+    let default_conn_end = ConnectionEnd::new(
+        State::Init,
+        client_id.clone(),
+        Counterparty::new(
+            client_id.clone(),
+            Some(msg.conn_id_on_b.clone()),
+            CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
+        ),
+        vec![msg.version.clone()],
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    // A connection end with incorrect state `Open`; will be part of the context.
+    let mut conn_end_open = default_conn_end.clone();
+    conn_end_open.set_state(State::Open); // incorrect field
+
+    let ctx_default = MockContext::default();
+    let ctx_new = TestContextConfig::builder()
+        .host(
+            MockHost::builder()
+                .chain_id(
+                    ChainId::new(&format!("mockgaia-{}", latest_height.revision_number())).unwrap(),
+                )
+                .build(),
+        )
+        .latest_height(latest_height)
+        .build::<MockContext>();
+    let ctx = match ctx {
+        Ctx::New => ctx_new.ibc_store,
+        Ctx::NewWithConnection => {
+            ctx_new
+                .with_light_client(
+                    &client_id,
+                    LightClientState::<MockHost>::with_latest_height(proof_height),
+                )
+                .with_connection(conn_id, default_conn_end)
+                .ibc_store
+        }
+        Ctx::DefaultWithConnection => {
+            ctx_default
+                .with_light_client(
+                    &client_id,
+                    LightClientState::<MockHost>::with_latest_height(proof_height),
+                )
+                .with_connection(conn_id, default_conn_end)
+                .ibc_store
+        }
+        Ctx::NewWithConnectionEndOpen => {
+            ctx_new
+                .with_light_client(
+                    &client_id,
+                    LightClientState::<MockHost>::with_latest_height(proof_height),
+                )
+                .with_connection(conn_id, conn_end_open)
+                .ibc_store
+        }
+    };
+
+    Fixture { ctx, msg }
+}
+
+fn conn_open_ack_validate(fxt: &Fixture<MsgConnectionOpenAck>, expect: Expect) {
+    let router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = validate(&fxt.ctx, &router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
+    match expect {
+        Expect::Failure(err) => {
+            assert!(res.is_err(), "{err_msg}");
+            assert_eq!(
+                core::mem::discriminant(res.as_ref().unwrap_err()),
+                core::mem::discriminant(&err.unwrap())
+            );
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}");
+            return;
+        }
+    };
+    let right_connection_id = fxt.msg.conn_id_on_a.clone();
+    let cons_state_height = fxt.msg.consensus_height_of_a_on_b;
+
+    match res.unwrap_err() {
+        ContextError::ConnectionError(ConnectionError::ConnectionNotFound { connection_id }) => {
+            assert_eq!(connection_id, right_connection_id)
+        }
+        ContextError::ConnectionError(ConnectionError::InvalidConsensusHeight {
+            target_height,
+            current_height: _,
+        }) => {
+            assert_eq!(cons_state_height, target_height);
+        }
+        ContextError::ConnectionError(ConnectionError::InvalidState {
+            expected: _,
+            actual: _,
+        }) => {}
+        _ => unreachable!(),
+    }
+}
+
+fn conn_open_ack_execute(fxt: &mut Fixture<MsgConnectionOpenAck>, expect: Expect) {
+    let mut router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = execute(&mut fxt.ctx, &mut router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}");
+        }
+        Expect::Success => {
+            let ibc_events = fxt.ctx.events.lock();
+            assert!(res.is_ok(), "{err_msg}");
+            assert_eq!(ibc_events.len(), 2);
+
+            assert!(matches!(
+                ibc_events[0],
+                IbcEvent::Message(MessageEvent::Connection)
+            ));
+            let event = &ibc_events[1];
+            assert!(matches!(event, &IbcEvent::OpenAckConnection(_)));
+
+            let IbcEvent::OpenAckConnection(conn_open_try_event) = event else {
+                unreachable!()
+            };
+            let conn_end = <DefaultIbcStore as ValidationContext>::connection_end(
+                &fxt.ctx,
+                conn_open_try_event.conn_id_on_a(),
+            )
+            .unwrap();
+            assert_eq!(conn_end.state().clone(), State::Open);
+        }
+    }
+}
+
+#[test]
+fn conn_open_ack_healthy() {
+    let mut fxt = conn_open_ack_fixture(Ctx::NewWithConnection);
+    conn_open_ack_validate(&fxt, Expect::Success);
+    conn_open_ack_execute(&mut fxt, Expect::Success);
+}
+
+#[test]
+fn conn_open_ack_no_connection() {
+    let fxt = conn_open_ack_fixture(Ctx::New);
+    let expected_err = ContextError::ConnectionError(ConnectionError::ConnectionNotFound {
+        connection_id: fxt.msg.conn_id_on_a.clone(),
+    });
+    conn_open_ack_validate(&fxt, Expect::Failure(Some(expected_err)));
+}
+
+#[test]
+fn conn_open_ack_invalid_consensus_height() {
+    let fxt = conn_open_ack_fixture(Ctx::DefaultWithConnection);
+    let expected_err = ContextError::ConnectionError(ConnectionError::InvalidConsensusHeight {
+        target_height: fxt.msg.consensus_height_of_a_on_b,
+        current_height: Height::new(0, 10).unwrap(),
+    });
+    conn_open_ack_validate(&fxt, Expect::Failure(Some(expected_err)));
+}
+
+#[test]
+fn conn_open_ack_connection_mismatch() {
+    let fxt = conn_open_ack_fixture(Ctx::NewWithConnectionEndOpen);
+    let expected_err = ContextError::ConnectionError(ConnectionError::InvalidState {
+        expected: State::Init.to_string(),
+        actual: State::Open.to_string(),
+    });
+    conn_open_ack_validate(&fxt, Expect::Failure(Some(expected_err)));
+}
diff --git a/tests-integration/tests/core/ics03_connection/conn_open_confirm.rs b/tests-integration/tests/core/ics03_connection/conn_open_confirm.rs
new file mode 100644
index 000000000..dc21dadef
--- /dev/null
+++ b/tests-integration/tests/core/ics03_connection/conn_open_confirm.rs
@@ -0,0 +1,140 @@
+use core::str::FromStr;
+
+use ibc::core::client::types::Height;
+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::entrypoint::{execute, validate};
+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::context::MockContext;
+use ibc_testkit::fixtures::core::connection::dummy_conn_open_confirm;
+use ibc_testkit::fixtures::{Expect, Fixture};
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use test_log::test;
+
+enum Ctx {
+    Default,
+    CorrectConnection,
+    IncorrectConnection,
+}
+
+fn conn_open_confirm_fixture(ctx: Ctx) -> Fixture<MsgConnectionOpenConfirm> {
+    let client_id = ClientId::from_str("mock_clientid").unwrap();
+    let msg = dummy_conn_open_confirm();
+    let counterparty = Counterparty::new(
+        client_id.clone(),
+        Some(msg.conn_id_on_b.clone()),
+        CommitmentPrefix::try_from(b"ibc".to_vec()).unwrap(),
+    );
+
+    let ctx_default = MockContext::default();
+
+    let incorrect_conn_end_state = ConnectionEnd::new(
+        State::Init,
+        client_id.clone(),
+        counterparty,
+        ValidationContext::get_compatible_versions(&ctx_default.ibc_store),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let mut correct_conn_end = incorrect_conn_end_state.clone();
+    correct_conn_end.set_state(State::TryOpen);
+
+    let ctx = match ctx {
+        Ctx::Default => ctx_default.ibc_store,
+        Ctx::IncorrectConnection => {
+            ctx_default
+                .with_light_client(
+                    &client_id,
+                    LightClientState::<MockHost>::with_latest_height(Height::new(0, 10).unwrap()),
+                )
+                .with_connection(msg.conn_id_on_b.clone(), incorrect_conn_end_state)
+                .ibc_store
+        }
+        Ctx::CorrectConnection => {
+            ctx_default
+                .with_light_client(
+                    &client_id,
+                    LightClientState::<MockHost>::with_latest_height(Height::new(0, 10).unwrap()),
+                )
+                .with_connection(msg.conn_id_on_b.clone(), correct_conn_end)
+                .ibc_store
+        }
+    };
+
+    Fixture { ctx, msg }
+}
+
+fn conn_open_confirm_validate(fxt: &Fixture<MsgConnectionOpenConfirm>, expect: Expect) {
+    let router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = validate(&fxt.ctx, &router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}");
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}");
+        }
+    };
+}
+
+fn conn_open_confirm_execute(fxt: &mut Fixture<MsgConnectionOpenConfirm>, expect: Expect) {
+    let mut router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = execute(&mut fxt.ctx, &mut router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}");
+        }
+        Expect::Success => {
+            let ibc_events = fxt.ctx.events.lock();
+            assert!(res.is_ok(), "{err_msg}");
+            assert_eq!(ibc_events.len(), 2);
+
+            assert!(matches!(
+                ibc_events[0],
+                IbcEvent::Message(MessageEvent::Connection)
+            ));
+            let event = &ibc_events[1];
+            assert!(matches!(event, &IbcEvent::OpenConfirmConnection(_)));
+
+            let IbcEvent::OpenConfirmConnection(conn_open_try_event) = event else {
+                unreachable!()
+            };
+            let conn_end =
+                ValidationContext::connection_end(&fxt.ctx, conn_open_try_event.conn_id_on_b())
+                    .unwrap();
+            assert_eq!(conn_end.state().clone(), State::Open);
+        }
+    }
+}
+
+#[test]
+fn conn_open_confirm_healthy() {
+    let mut fxt = conn_open_confirm_fixture(Ctx::CorrectConnection);
+    conn_open_confirm_validate(&fxt, Expect::Success);
+    conn_open_confirm_execute(&mut fxt, Expect::Success);
+}
+
+#[test]
+fn conn_open_confirm_no_connection() {
+    let fxt = conn_open_confirm_fixture(Ctx::Default);
+    conn_open_confirm_validate(&fxt, Expect::Failure(None));
+}
+
+#[test]
+fn conn_open_confirm_connection_mismatch() {
+    let fxt = conn_open_confirm_fixture(Ctx::IncorrectConnection);
+    conn_open_confirm_validate(&fxt, Expect::Failure(None));
+}
diff --git a/tests-integration/tests/core/ics03_connection/conn_open_init.rs b/tests-integration/tests/core/ics03_connection/conn_open_init.rs
new file mode 100644
index 000000000..1a9218e24
--- /dev/null
+++ b/tests-integration/tests/core/ics03_connection/conn_open_init.rs
@@ -0,0 +1,149 @@
+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::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::context::MockContext;
+use ibc_testkit::fixtures::core::connection::{
+    dummy_msg_conn_open_init, msg_conn_open_init_with_counterparty_conn_id,
+    msg_conn_open_with_version,
+};
+use ibc_testkit::fixtures::{Expect, Fixture};
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use test_log::test;
+
+enum Ctx {
+    Default,
+    WithClient,
+}
+
+enum Msg {
+    Default,
+    NoVersion,
+    BadVersion,
+    WithCounterpartyConnId,
+}
+
+fn conn_open_init_fixture(ctx_variant: Ctx, msg_variant: Msg) -> Fixture<MsgConnectionOpenInit> {
+    let msg_default = dummy_msg_conn_open_init();
+    let msg = match msg_variant {
+        Msg::Default => msg_default,
+        Msg::NoVersion => msg_conn_open_with_version(msg_default, None),
+        Msg::BadVersion => {
+            msg_conn_open_with_version(msg_default, Some("random identifier 424242"))
+        }
+        Msg::WithCounterpartyConnId => msg_conn_open_init_with_counterparty_conn_id(msg_default, 2),
+    };
+
+    let ctx_default = MockContext::default();
+    let ctx = match ctx_variant {
+        Ctx::WithClient => {
+            ctx_default
+                .with_light_client(
+                    &msg.client_id_on_a,
+                    LightClientState::<MockHost>::with_latest_height(Height::new(0, 10).unwrap()),
+                )
+                .ibc_store
+        }
+        _ => ctx_default.ibc_store,
+    };
+
+    Fixture { ctx, msg }
+}
+
+fn conn_open_init_validate(fxt: &Fixture<MsgConnectionOpenInit>, expect: Expect) {
+    let router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = validate(&fxt.ctx, &router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}")
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}")
+        }
+    }
+}
+
+fn conn_open_init_execute(
+    fxt: &mut Fixture<MsgConnectionOpenInit>,
+    expect: Expect,
+    expected_version: Vec<Version>,
+) {
+    let mut router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = execute(&mut fxt.ctx, &mut router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}")
+        }
+        Expect::Success => {
+            let ibc_events = fxt.ctx.events.lock();
+
+            assert!(res.is_ok(), "{err_msg}");
+
+            assert_eq!(fxt.ctx.connection_counter().unwrap(), 1);
+
+            assert_eq!(ibc_events.len(), 2);
+
+            assert!(matches!(
+                ibc_events[0],
+                IbcEvent::Message(MessageEvent::Connection)
+            ));
+            let event = &ibc_events[1];
+            assert!(matches!(event, &IbcEvent::OpenInitConnection(_)));
+
+            let IbcEvent::OpenInitConnection(conn_open_init_event) = event else {
+                unreachable!()
+            };
+            let conn_end =
+                ValidationContext::connection_end(&fxt.ctx, conn_open_init_event.conn_id_on_a())
+                    .unwrap();
+            assert_eq!(conn_end.state().clone(), State::Init);
+            assert_eq!(conn_end.versions(), expected_version);
+        }
+    }
+}
+
+#[test]
+fn conn_open_init_healthy() {
+    let mut fxt = conn_open_init_fixture(Ctx::WithClient, Msg::Default);
+    conn_open_init_validate(&fxt, Expect::Success);
+    let expected_version = vec![fxt.msg.version.clone().unwrap()];
+    conn_open_init_execute(&mut fxt, Expect::Success, expected_version);
+}
+
+#[test]
+fn conn_open_init_no_context() {
+    let fxt = conn_open_init_fixture(Ctx::Default, Msg::Default);
+    conn_open_init_validate(&fxt, Expect::Failure(None));
+}
+
+#[test]
+fn conn_open_init_no_version() {
+    let mut fxt = conn_open_init_fixture(Ctx::WithClient, Msg::NoVersion);
+    conn_open_init_validate(&fxt, Expect::Success);
+    let expected_version = ValidationContext::get_compatible_versions(&fxt.ctx);
+    conn_open_init_execute(&mut fxt, Expect::Success, expected_version);
+}
+#[test]
+fn conn_open_init_incompatible_version() {
+    let fxt = conn_open_init_fixture(Ctx::WithClient, Msg::BadVersion);
+    conn_open_init_validate(&fxt, Expect::Failure(None));
+}
+
+#[test]
+fn conn_open_init_with_counterparty_conn_id() {
+    let mut fxt = conn_open_init_fixture(Ctx::WithClient, Msg::WithCounterpartyConnId);
+    conn_open_init_validate(&fxt, Expect::Success);
+    let expected_version = vec![fxt.msg.version.clone().unwrap()];
+    conn_open_init_execute(&mut fxt, Expect::Success, expected_version);
+}
diff --git a/tests-integration/tests/core/ics03_connection/conn_open_try.rs b/tests-integration/tests/core/ics03_connection/conn_open_try.rs
new file mode 100644
index 000000000..e466b403d
--- /dev/null
+++ b/tests-integration/tests/core/ics03_connection/conn_open_try.rs
@@ -0,0 +1,155 @@
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::msgs::{ConnectionMsg, MsgConnectionOpenTry};
+use ibc::core::connection::types::State;
+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::context::MockContext;
+use ibc_testkit::fixtures::core::connection::dummy_msg_conn_open_try;
+use ibc_testkit::fixtures::core::context::TestContextConfig;
+use ibc_testkit::fixtures::{Expect, Fixture};
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::{DefaultIbcStore, LightClientState};
+use test_log::test;
+
+enum Ctx {
+    Default,
+    WithClient,
+}
+
+enum Msg {
+    Default,
+    HeightAdvanced,
+    HeightOld,
+    ProofHeightMissing,
+}
+
+fn conn_open_try_fixture(ctx_variant: Ctx, msg_variant: Msg) -> Fixture<MsgConnectionOpenTry> {
+    let retained_history_size = 5;
+    let client_cons_state_height = 10;
+    let host_chain_height = Height::new(0, 35).unwrap();
+    let pruned_height = host_chain_height.sub(retained_history_size + 1).unwrap();
+
+    let msg = match msg_variant {
+        Msg::Default => dummy_msg_conn_open_try(
+            client_cons_state_height,
+            host_chain_height.revision_height(),
+        ),
+        Msg::HeightAdvanced => dummy_msg_conn_open_try(
+            client_cons_state_height,
+            host_chain_height.increment().revision_height(),
+        ),
+        Msg::HeightOld => {
+            dummy_msg_conn_open_try(client_cons_state_height, pruned_height.revision_height())
+        }
+        Msg::ProofHeightMissing => dummy_msg_conn_open_try(
+            client_cons_state_height - 1,
+            host_chain_height.revision_height(),
+        ),
+    };
+
+    let ctx_new = TestContextConfig::builder()
+        .latest_height(host_chain_height)
+        .build::<MockContext>();
+    let ctx = match ctx_variant {
+        Ctx::Default => DefaultIbcStore::default(),
+        Ctx::WithClient => {
+            ctx_new
+                .with_light_client(
+                    &msg.client_id_on_b,
+                    LightClientState::<MockHost>::with_latest_height(
+                        Height::new(0, client_cons_state_height).unwrap(),
+                    ),
+                )
+                .ibc_store
+        }
+    };
+
+    ctx.prune_host_consensus_states_till(&pruned_height);
+    Fixture { ctx, msg }
+}
+
+fn conn_open_try_validate(fxt: &Fixture<MsgConnectionOpenTry>, expect: Expect) {
+    let router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = validate(&fxt.ctx, &router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "validation", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}")
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}");
+        }
+    }
+}
+
+fn conn_open_try_execute(fxt: &mut Fixture<MsgConnectionOpenTry>, expect: Expect) {
+    let mut router = MockRouter::new_with_transfer();
+    let msg_envelope = MsgEnvelope::from(ConnectionMsg::from(fxt.msg.clone()));
+    let res = execute(&mut fxt.ctx, &mut router, msg_envelope);
+    let err_msg = fxt.generate_error_msg(&expect, "execution", &res);
+    match expect {
+        Expect::Failure(_) => {
+            assert!(res.is_err(), "{err_msg}")
+        }
+        Expect::Success => {
+            assert!(res.is_ok(), "{err_msg}");
+
+            assert_eq!(fxt.ctx.connection_counter().unwrap(), 1);
+
+            let ibc_events = fxt.ctx.events.lock();
+
+            assert_eq!(ibc_events.len(), 2);
+
+            assert!(matches!(
+                ibc_events[0],
+                IbcEvent::Message(MessageEvent::Connection)
+            ));
+            let event = &ibc_events[1];
+            assert!(matches!(event, &IbcEvent::OpenTryConnection(_)));
+
+            let IbcEvent::OpenTryConnection(conn_open_try_event) = event else {
+                unreachable!()
+            };
+            let conn_end =
+                ValidationContext::connection_end(&fxt.ctx, conn_open_try_event.conn_id_on_b())
+                    .unwrap();
+            assert_eq!(conn_end.state().clone(), State::TryOpen);
+        }
+    }
+}
+
+#[test]
+fn conn_open_try_healthy() {
+    let mut fxt = conn_open_try_fixture(Ctx::WithClient, Msg::Default);
+    conn_open_try_validate(&fxt, Expect::Success);
+    conn_open_try_execute(&mut fxt, Expect::Success);
+}
+
+#[test]
+fn conn_open_try_height_advanced() {
+    let fxt = conn_open_try_fixture(Ctx::WithClient, Msg::HeightAdvanced);
+    conn_open_try_validate(&fxt, Expect::Failure(None));
+}
+
+#[test]
+fn conn_open_try_height_old() {
+    let fxt = conn_open_try_fixture(Ctx::WithClient, Msg::HeightOld);
+    conn_open_try_validate(&fxt, Expect::Failure(None));
+}
+
+#[test]
+fn conn_open_try_proof_height_missing() {
+    let fxt = conn_open_try_fixture(Ctx::WithClient, Msg::ProofHeightMissing);
+    conn_open_try_validate(&fxt, Expect::Failure(None));
+}
+
+#[test]
+fn conn_open_try_no_client() {
+    let fxt = conn_open_try_fixture(Ctx::Default, Msg::Default);
+    conn_open_try_validate(&fxt, Expect::Failure(None));
+}
diff --git a/tests-integration/tests/core/ics03_connection/mod.rs b/tests-integration/tests/core/ics03_connection/mod.rs
new file mode 100644
index 000000000..c504edc00
--- /dev/null
+++ b/tests-integration/tests/core/ics03_connection/mod.rs
@@ -0,0 +1,4 @@
+pub mod conn_open_ack;
+pub mod conn_open_confirm;
+pub mod conn_open_init;
+pub mod conn_open_try;
diff --git a/tests-integration/tests/core/ics04_channel/acknowledgement.rs b/tests-integration/tests/core/ics04_channel/acknowledgement.rs
new file mode 100644
index 000000000..1afd22fe1
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/acknowledgement.rs
@@ -0,0 +1,263 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::commitment::{compute_packet_commitment, PacketCommitment};
+use ibc::core::channel::types::msgs::{MsgAcknowledgement, PacketMsg};
+use ibc::core::channel::types::Version;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::commitment::CommitmentPrefix;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId};
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_acknowledgement;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+use test_log::test;
+
+struct Fixture {
+    ctx: MockContext,
+    router: MockRouter,
+    client_height: Height,
+    msg: MsgAcknowledgement,
+    packet_commitment: PacketCommitment,
+    conn_end_on_a: ConnectionEnd,
+    chan_end_on_a_ordered: ChannelEnd,
+    chan_end_on_a_unordered: ChannelEnd,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let default_client_id = ClientId::new("07-tendermint", 0).expect("no error");
+
+    let client_height = Height::new(0, 2).unwrap();
+    let ctx = MockContext::default().with_light_client(
+        &ClientId::new("07-tendermint", 0).expect("no error"),
+        LightClientState::<MockHost>::with_latest_height(client_height),
+    );
+
+    let router = MockRouter::new_with_transfer();
+
+    let msg = MsgAcknowledgement::try_from(dummy_raw_msg_acknowledgement(
+        client_height.revision_height(),
+    ))
+    .unwrap();
+
+    let packet = msg.packet.clone();
+
+    let packet_commitment = compute_packet_commitment(
+        &packet.data,
+        &packet.timeout_height_on_b,
+        &packet.timeout_timestamp_on_b,
+    );
+
+    let chan_end_on_a_unordered = ChannelEnd::new(
+        State::Open,
+        Order::Unordered,
+        Counterparty::new(packet.port_id_on_b, Some(packet.chan_id_on_b)),
+        vec![ConnectionId::zero()],
+        Version::new("ics20-1".to_string()),
+    )
+    .unwrap();
+
+    let mut chan_end_on_a_ordered = chan_end_on_a_unordered.clone();
+    chan_end_on_a_ordered.ordering = Order::Ordered;
+
+    let conn_end_on_a = ConnectionEnd::new(
+        ConnectionState::Open,
+        default_client_id.clone(),
+        ConnectionCounterparty::new(
+            default_client_id,
+            Some(ConnectionId::zero()),
+            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+        ),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    Fixture {
+        ctx,
+        router,
+        client_height,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_ordered,
+        chan_end_on_a_unordered,
+    }
+}
+
+#[rstest]
+fn ack_fail_no_channel(fixture: Fixture) {
+    let Fixture {
+        ctx, router, msg, ..
+    } = fixture;
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no channel exists in the context"
+    )
+}
+
+/// NO-OP case
+#[rstest]
+fn ack_success_no_packet_commitment(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        conn_end_on_a,
+        chan_end_on_a_unordered,
+        client_height,
+        ..
+    } = fixture;
+    let ctx = ctx
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a);
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Validation should succeed when no packet commitment is present"
+    )
+}
+
+#[rstest]
+fn ack_success_happy_path(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_unordered,
+        client_height,
+        ..
+    } = fixture;
+    let ctx = ctx
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            msg.packet.port_id_on_a.clone(),
+            msg.packet.chan_id_on_a.clone(),
+            msg.packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Happy path: validation should succeed. err: {res:?}"
+    )
+}
+
+#[rstest]
+fn ack_unordered_chan_execute(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        mut router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_unordered,
+        ..
+    } = fixture;
+    let mut ctx = ctx
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            msg.packet.port_id_on_a.clone(),
+            msg.packet.chan_id_on_a.clone(),
+            msg.packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok());
+
+    let ibc_events = ctx.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::AcknowledgePacket(_)));
+}
+
+#[rstest]
+fn ack_ordered_chan_execute(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        mut router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_ordered,
+        ..
+    } = fixture;
+    let mut ctx = ctx
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a_ordered)
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            msg.packet.port_id_on_a.clone(),
+            msg.packet.chan_id_on_a.clone(),
+            msg.packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok());
+
+    let ibc_events = ctx.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::AcknowledgePacket(_)));
+}
diff --git a/tests-integration/tests/core/ics04_channel/chan_close_confirm.rs b/tests-integration/tests/core/ics04_channel/chan_close_confirm.rs
new file mode 100644
index 000000000..f3491f9ca
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/chan_close_confirm.rs
@@ -0,0 +1,142 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State as ChannelState};
+use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelCloseConfirm};
+use ibc::core::channel::types::Version;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::ConnectionId;
+use ibc::core::host::ValidationContext;
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_chan_close_confirm;
+use ibc_testkit::fixtures::core::connection::dummy_raw_counterparty_conn;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+
+#[test]
+fn test_chan_close_confirm_validate() {
+    let client_id = mock_client_type().build_client_id(24);
+    let conn_id = ConnectionId::new(2);
+    let default_context = MockContext::default();
+    let client_consensus_state_height = default_context.ibc_store.host_height().unwrap();
+
+    let conn_end = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let msg_chan_close_confirm = MsgChannelCloseConfirm::try_from(
+        dummy_raw_msg_chan_close_confirm(client_consensus_state_height.revision_height()),
+    )
+    .unwrap();
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg_chan_close_confirm.clone()));
+
+    let chan_end = ChannelEnd::new(
+        ChannelState::Open,
+        Order::Unordered,
+        Counterparty::new(
+            msg_chan_close_confirm.port_id_on_b.clone(),
+            Some(msg_chan_close_confirm.chan_id_on_b.clone()),
+        ),
+        vec![conn_id.clone()],
+        Version::empty(),
+    )
+    .unwrap();
+
+    let context = default_context
+        .with_light_client(
+            &client_id,
+            LightClientState::<MockHost>::with_latest_height(client_consensus_state_height),
+        )
+        .with_connection(conn_id, conn_end)
+        .with_channel(
+            msg_chan_close_confirm.port_id_on_b.clone(),
+            msg_chan_close_confirm.chan_id_on_b,
+            chan_end,
+        );
+
+    let router = MockRouter::new_with_transfer();
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Validation expected to succeed (happy path). Error: {res:?}"
+    );
+}
+
+#[test]
+fn test_chan_close_confirm_execute() {
+    let client_id = mock_client_type().build_client_id(24);
+    let conn_id = ConnectionId::new(2);
+    let default_context = MockContext::default();
+    let client_consensus_state_height = default_context.ibc_store.host_height().unwrap();
+
+    let conn_end = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let msg_chan_close_confirm = MsgChannelCloseConfirm::try_from(
+        dummy_raw_msg_chan_close_confirm(client_consensus_state_height.revision_height()),
+    )
+    .unwrap();
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg_chan_close_confirm.clone()));
+
+    let chan_end = ChannelEnd::new(
+        ChannelState::Open,
+        Order::Unordered,
+        Counterparty::new(
+            msg_chan_close_confirm.port_id_on_b.clone(),
+            Some(msg_chan_close_confirm.chan_id_on_b.clone()),
+        ),
+        vec![conn_id.clone()],
+        Version::empty(),
+    )
+    .unwrap();
+
+    let mut context = default_context
+        .with_light_client(
+            &client_id,
+            LightClientState::<MockHost>::with_latest_height(client_consensus_state_height),
+        )
+        .with_connection(conn_id, conn_end)
+        .with_channel(
+            msg_chan_close_confirm.port_id_on_b.clone(),
+            msg_chan_close_confirm.chan_id_on_b,
+            chan_end,
+        );
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let res = execute(&mut context.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "Execution success: happy path");
+
+    let ibc_events = context.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+
+    assert!(matches!(ibc_events[1], IbcEvent::CloseConfirmChannel(_)));
+}
diff --git a/tests-integration/tests/core/ics04_channel/chan_close_init.rs b/tests-integration/tests/core/ics04_channel/chan_close_init.rs
new file mode 100644
index 000000000..63fd30d65
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/chan_close_init.rs
@@ -0,0 +1,144 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State as ChannelState};
+use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelCloseInit};
+use ibc::core::channel::types::Version;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::ConnectionId;
+use ibc::core::host::ValidationContext;
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_chan_close_init;
+use ibc_testkit::fixtures::core::connection::dummy_raw_counterparty_conn;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+
+#[test]
+fn test_chan_close_init_validate() {
+    let client_id = mock_client_type().build_client_id(24);
+    let conn_id = ConnectionId::new(2);
+
+    let conn_end = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let msg_chan_close_init =
+        MsgChannelCloseInit::try_from(dummy_raw_msg_chan_close_init()).unwrap();
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg_chan_close_init.clone()));
+
+    let chan_end = ChannelEnd::new(
+        ChannelState::Open,
+        Order::Unordered,
+        Counterparty::new(
+            msg_chan_close_init.port_id_on_a.clone(),
+            Some(msg_chan_close_init.chan_id_on_a.clone()),
+        ),
+        vec![conn_id.clone()],
+        Version::empty(),
+    )
+    .unwrap();
+
+    let context = {
+        let default_context = MockContext::default();
+        let client_consensus_state_height = default_context.ibc_store.host_height().unwrap();
+
+        default_context
+            .with_light_client(
+                &client_id,
+                LightClientState::<MockHost>::with_latest_height(client_consensus_state_height),
+            )
+            .with_connection(conn_id, conn_end)
+            .with_channel(
+                msg_chan_close_init.port_id_on_a.clone(),
+                msg_chan_close_init.chan_id_on_a,
+                chan_end,
+            )
+    };
+
+    let router = MockRouter::new_with_transfer();
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Validation expected to succeed (happy path). Error: {res:?}"
+    );
+}
+
+#[test]
+fn test_chan_close_init_execute() {
+    let client_id = mock_client_type().build_client_id(24);
+    let conn_id = ConnectionId::new(2);
+
+    let conn_end = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let msg_chan_close_init =
+        MsgChannelCloseInit::try_from(dummy_raw_msg_chan_close_init()).unwrap();
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg_chan_close_init.clone()));
+
+    let chan_end = ChannelEnd::new(
+        ChannelState::Open,
+        Order::Unordered,
+        Counterparty::new(
+            msg_chan_close_init.port_id_on_a.clone(),
+            Some(msg_chan_close_init.chan_id_on_a.clone()),
+        ),
+        vec![conn_id.clone()],
+        Version::empty(),
+    )
+    .unwrap();
+
+    let mut context = {
+        let default_context = MockContext::default();
+        let client_consensus_state_height = default_context.ibc_store.host_height().unwrap();
+
+        default_context
+            .with_light_client(
+                &client_id,
+                LightClientState::<MockHost>::with_latest_height(client_consensus_state_height),
+            )
+            .with_connection(conn_id, conn_end)
+            .with_channel(
+                msg_chan_close_init.port_id_on_a.clone(),
+                msg_chan_close_init.chan_id_on_a,
+                chan_end,
+            )
+    };
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let res = execute(&mut context.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "Execution happy path");
+
+    let ibc_events = context.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+
+    assert!(matches!(ibc_events[1], IbcEvent::CloseInitChannel(_)));
+}
diff --git a/tests-integration/tests/core/ics04_channel/chan_open_ack.rs b/tests-integration/tests/core/ics04_channel/chan_open_ack.rs
new file mode 100644
index 000000000..e4250dd83
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/chan_open_ack.rs
@@ -0,0 +1,258 @@
+use ibc::apps::transfer::types::MODULE_ID_STR;
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelOpenAck};
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::{ClientId, ConnectionId};
+use ibc::core::primitives::*;
+use ibc::core::router::types::module::ModuleId;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_chan_open_ack;
+use ibc_testkit::fixtures::core::connection::dummy_raw_counterparty_conn;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+use test_log::test;
+
+pub struct Fixture {
+    pub context: MockContext,
+    pub router: MockRouter,
+    pub module_id: ModuleId,
+    pub msg: MsgChannelOpenAck,
+    pub client_id_on_a: ClientId,
+    pub conn_id_on_a: ConnectionId,
+    pub conn_end_on_a: ConnectionEnd,
+    pub chan_end_on_a: ChannelEnd,
+    pub proof_height: u64,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let proof_height = 10;
+    let context = MockContext::default();
+
+    let module_id = ModuleId::new(MODULE_ID_STR.to_string());
+    let router = MockRouter::new_with_transfer();
+
+    let client_id_on_a = mock_client_type().build_client_id(45);
+    let conn_id_on_a = ConnectionId::new(2);
+    let conn_end_on_a = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id_on_a.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let msg = MsgChannelOpenAck::try_from(dummy_raw_msg_chan_open_ack(proof_height)).unwrap();
+
+    let chan_end_on_a = ChannelEnd::new(
+        State::Init,
+        Order::Unordered,
+        Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_b.clone())),
+        vec![conn_id_on_a.clone()],
+        msg.version_on_b.clone(),
+    )
+    .unwrap();
+
+    Fixture {
+        context,
+        router,
+        module_id,
+        msg,
+        client_id_on_a,
+        conn_id_on_a,
+        conn_end_on_a,
+        chan_end_on_a,
+        proof_height,
+    }
+}
+
+#[rstest]
+fn chan_open_ack_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_a,
+        conn_id_on_a,
+        conn_end_on_a,
+        chan_end_on_a,
+        proof_height,
+        ..
+    } = fixture;
+
+    let context = context
+        .with_light_client(
+            &client_id_on_a,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_a, conn_end_on_a)
+        .with_channel(
+            msg.port_id_on_a.clone(),
+            msg.chan_id_on_a.clone(),
+            chan_end_on_a,
+        );
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(res.is_ok(), "Validation happy path")
+}
+
+#[rstest]
+fn chan_open_ack_execute_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        mut router,
+        msg,
+        client_id_on_a,
+        conn_id_on_a,
+        conn_end_on_a,
+        chan_end_on_a,
+        proof_height,
+        ..
+    } = fixture;
+
+    let mut context = context
+        .with_light_client(
+            &client_id_on_a,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_a, conn_end_on_a)
+        .with_channel(
+            msg.port_id_on_a.clone(),
+            msg.chan_id_on_a.clone(),
+            chan_end_on_a,
+        );
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = execute(&mut context.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "Execution happy path");
+
+    let ibc_events = context.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::OpenAckChannel(_)));
+}
+
+#[rstest]
+fn chan_open_ack_fail_no_connection(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_a,
+        chan_end_on_a,
+        proof_height,
+        ..
+    } = fixture;
+
+    let context = context
+        .with_light_client(
+            &client_id_on_a,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_channel(
+            msg.port_id_on_a.clone(),
+            msg.chan_id_on_a.clone(),
+            chan_end_on_a,
+        );
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no connection exists in the context"
+    )
+}
+
+#[rstest]
+fn chan_open_ack_fail_no_channel(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_a,
+        conn_id_on_a,
+        conn_end_on_a,
+        proof_height,
+        ..
+    } = fixture;
+    let context = context
+        .with_light_client(
+            &client_id_on_a,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_a, conn_end_on_a);
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no channel exists in the context"
+    )
+}
+
+#[rstest]
+fn chan_open_ack_fail_channel_wrong_state(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_a,
+        conn_id_on_a,
+        conn_end_on_a,
+        proof_height,
+        ..
+    } = fixture;
+
+    let wrong_chan_end = ChannelEnd::new(
+        State::Open,
+        Order::Unordered,
+        Counterparty::new(msg.port_id_on_a.clone(), Some(msg.chan_id_on_b.clone())),
+        vec![conn_id_on_a.clone()],
+        msg.version_on_b.clone(),
+    )
+    .unwrap();
+    let context = context
+        .with_light_client(
+            &client_id_on_a,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_a, conn_end_on_a)
+        .with_channel(
+            msg.port_id_on_a.clone(),
+            msg.chan_id_on_a.clone(),
+            wrong_chan_end,
+        );
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because channel is in the wrong state"
+    )
+}
diff --git a/tests-integration/tests/core/ics04_channel/chan_open_confirm.rs b/tests-integration/tests/core/ics04_channel/chan_open_confirm.rs
new file mode 100644
index 000000000..0b399aa40
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/chan_open_confirm.rs
@@ -0,0 +1,212 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelOpenConfirm};
+use ibc::core::channel::types::Version;
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::{ChannelId, ClientId, ConnectionId};
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_chan_open_confirm;
+use ibc_testkit::fixtures::core::connection::dummy_raw_counterparty_conn;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+use test_log::test;
+
+pub struct Fixture {
+    pub context: MockContext,
+    pub router: MockRouter,
+    pub msg: MsgChannelOpenConfirm,
+    pub client_id_on_b: ClientId,
+    pub conn_id_on_b: ConnectionId,
+    pub conn_end_on_b: ConnectionEnd,
+    pub chan_end_on_b: ChannelEnd,
+    pub proof_height: u64,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let proof_height = 10;
+    let context = MockContext::default();
+
+    let router = MockRouter::new_with_transfer();
+
+    let client_id_on_b = mock_client_type().build_client_id(45);
+    let conn_id_on_b = ConnectionId::new(2);
+    let conn_end_on_b = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id_on_b.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let msg =
+        MsgChannelOpenConfirm::try_from(dummy_raw_msg_chan_open_confirm(proof_height)).unwrap();
+
+    let chan_end_on_b = ChannelEnd::new(
+        State::TryOpen,
+        Order::Unordered,
+        Counterparty::new(msg.port_id_on_b.clone(), Some(ChannelId::zero())),
+        vec![conn_id_on_b.clone()],
+        Version::empty(),
+    )
+    .unwrap();
+
+    Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        chan_end_on_b,
+        proof_height,
+    }
+}
+
+#[rstest]
+fn chan_open_confirm_validate_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        chan_end_on_b,
+        proof_height,
+        ..
+    } = fixture;
+
+    let context = context
+        .with_light_client(
+            &client_id_on_b,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_b, conn_end_on_b)
+        .with_channel(msg.port_id_on_b.clone(), ChannelId::zero(), chan_end_on_b);
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(res.is_ok(), "Validation happy path")
+}
+
+#[rstest]
+fn chan_open_confirm_execute_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        mut router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        chan_end_on_b,
+        proof_height,
+        ..
+    } = fixture;
+
+    let mut context = context
+        .with_light_client(
+            &client_id_on_b,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_b, conn_end_on_b)
+        .with_channel(msg.port_id_on_b.clone(), ChannelId::zero(), chan_end_on_b);
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = execute(&mut context.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok(), "Execution happy path");
+
+    let ibc_events = context.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+
+    assert!(matches!(ibc_events[1], IbcEvent::OpenConfirmChannel(_)));
+}
+
+#[rstest]
+fn chan_open_confirm_fail_no_channel(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        proof_height,
+        ..
+    } = fixture;
+    let context = context
+        .with_light_client(
+            &client_id_on_b,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_b, conn_end_on_b);
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no channel exists in the context"
+    )
+}
+
+#[rstest]
+fn chan_open_confirm_fail_channel_wrong_state(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        proof_height,
+        ..
+    } = fixture;
+
+    let wrong_chan_end = ChannelEnd::new(
+        State::Init,
+        Order::Unordered,
+        Counterparty::new(msg.port_id_on_b.clone(), Some(ChannelId::zero())),
+        vec![conn_id_on_b.clone()],
+        Version::empty(),
+    )
+    .unwrap();
+    let context = context
+        .with_light_client(
+            &client_id_on_b,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_b, conn_end_on_b)
+        .with_channel(msg.port_id_on_b.clone(), ChannelId::zero(), wrong_chan_end);
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because channel is in the wrong state"
+    )
+}
diff --git a/tests-integration/tests/core/ics04_channel/chan_open_init.rs b/tests-integration/tests/core/ics04_channel/chan_open_init.rs
new file mode 100644
index 000000000..844af3d65
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/chan_open_init.rs
@@ -0,0 +1,123 @@
+use ibc::clients::tendermint::types::client_type as tm_client_type;
+use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelOpenInit};
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{ConnectionEnd, State as ConnectionState};
+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::types::identifiers::ConnectionId;
+use ibc::core::host::ValidationContext;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_chan_open_init;
+use ibc_testkit::fixtures::core::connection::dummy_msg_conn_open_init;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::{DefaultIbcStore, LightClientState};
+use rstest::*;
+use test_log::test;
+
+pub struct Fixture {
+    pub ctx: MockContext,
+    pub router: MockRouter,
+    pub msg: MsgEnvelope,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let msg_chan_open_init =
+        MsgChannelOpenInit::try_from(dummy_raw_msg_chan_open_init(None)).unwrap();
+
+    let msg = MsgEnvelope::from(ChannelMsg::from(msg_chan_open_init));
+
+    let default_ctx = MockContext::default();
+    let router = MockRouter::new_with_transfer();
+
+    let msg_conn_init = dummy_msg_conn_open_init();
+
+    let client_id_on_a = tm_client_type().build_client_id(0);
+    let client_height = Height::new(0, 10).unwrap();
+
+    let conn_end_on_a = ConnectionEnd::new(
+        ConnectionState::Init,
+        msg_conn_init.client_id_on_a.clone(),
+        msg_conn_init.counterparty.clone(),
+        ConnectionVersion::compatibles(),
+        msg_conn_init.delay_period,
+    )
+    .unwrap();
+
+    let ctx = default_ctx
+        .with_light_client(
+            &client_id_on_a,
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a);
+
+    Fixture { ctx, router, msg }
+}
+
+#[rstest]
+fn chan_open_init_validate_happy_path(fixture: Fixture) {
+    let Fixture {
+        ctx, router, msg, ..
+    } = fixture;
+
+    let res = validate(&ctx.ibc_store, &router, msg);
+
+    assert!(res.is_ok(), "Validation succeeds; good parameters")
+}
+
+#[rstest]
+fn chan_open_init_validate_counterparty_chan_id_set(fixture: Fixture) {
+    let Fixture { ctx, router, .. } = fixture;
+
+    let msg = MsgChannelOpenInit::try_from(dummy_raw_msg_chan_open_init(None)).unwrap();
+
+    let msg_envelope = MsgEnvelope::from(ChannelMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Validation succeeds even if counterparty channel id is set by relayer"
+    )
+}
+
+#[rstest]
+fn chan_open_init_execute_happy_path(fixture: Fixture) {
+    let Fixture {
+        mut ctx,
+        mut router,
+        msg,
+        ..
+    } = fixture;
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg);
+
+    assert!(res.is_ok(), "Execution succeeds; good parameters");
+
+    assert_eq!(ctx.ibc_store.channel_counter().unwrap(), 1);
+
+    let ibc_events = ctx.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::OpenInitChannel(_)));
+}
+
+#[rstest]
+fn chan_open_init_fail_no_connection(fixture: Fixture) {
+    let Fixture { router, msg, .. } = fixture;
+
+    let res = validate(&DefaultIbcStore::default(), &router, msg);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no connection exists in the context"
+    )
+}
diff --git a/tests-integration/tests/core/ics04_channel/chan_open_try.rs b/tests-integration/tests/core/ics04_channel/chan_open_try.rs
new file mode 100644
index 000000000..3a43d0dfb
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/chan_open_try.rs
@@ -0,0 +1,168 @@
+use ibc::core::channel::types::msgs::{ChannelMsg, MsgChannelOpenTry};
+use ibc::core::client::types::Height;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::{ClientId, ConnectionId};
+use ibc::core::host::ValidationContext;
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_chan_open_try;
+use ibc_testkit::fixtures::core::connection::dummy_raw_counterparty_conn;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::client_type as mock_client_type;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+use test_log::test;
+
+pub struct Fixture {
+    pub ctx: MockContext,
+    pub router: MockRouter,
+    pub msg: MsgEnvelope,
+    pub client_id_on_b: ClientId,
+    pub conn_id_on_b: ConnectionId,
+    pub conn_end_on_b: ConnectionEnd,
+    pub proof_height: u64,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let proof_height = 10;
+    let conn_id_on_b = ConnectionId::new(2);
+    let client_id_on_b = mock_client_type().build_client_id(45);
+
+    // This is the connection underlying the channel we're trying to open.
+    let conn_end_on_b = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id_on_b.clone(),
+        ConnectionCounterparty::try_from(dummy_raw_counterparty_conn(Some(0))).unwrap(),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    // We're going to test message processing against this message.
+    // Note: we make the counterparty's channel_id `None`.
+    let mut msg_chan_open_try =
+        MsgChannelOpenTry::try_from(dummy_raw_msg_chan_open_try(proof_height)).unwrap();
+
+    let hops = vec![conn_id_on_b.clone()];
+    msg_chan_open_try.connection_hops_on_b = hops;
+
+    let msg = MsgEnvelope::from(ChannelMsg::from(msg_chan_open_try));
+
+    let ctx = MockContext::default();
+
+    let router = MockRouter::new_with_transfer();
+
+    Fixture {
+        ctx,
+        router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        proof_height,
+    }
+}
+
+#[rstest]
+fn chan_open_try_validate_happy_path(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        proof_height,
+        ..
+    } = fixture;
+
+    let ctx = ctx
+        .with_light_client(
+            &client_id_on_b,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_b, conn_end_on_b);
+
+    let res = validate(&ctx.ibc_store, &router, msg);
+
+    assert!(res.is_ok(), "Validation success: happy path")
+}
+
+#[rstest]
+fn chan_open_try_execute_happy_path(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        mut router,
+        msg,
+        client_id_on_b,
+        conn_id_on_b,
+        conn_end_on_b,
+        proof_height,
+        ..
+    } = fixture;
+
+    let mut ctx = ctx
+        .with_light_client(
+            &client_id_on_b,
+            LightClientState::<MockHost>::with_latest_height(Height::new(0, proof_height).unwrap()),
+        )
+        .with_connection(conn_id_on_b, conn_end_on_b);
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg);
+
+    assert!(res.is_ok(), "Execution success: happy path");
+
+    assert_eq!(ctx.ibc_store.channel_counter().unwrap(), 1);
+
+    let ibc_events = ctx.get_events();
+
+    assert_eq!(ibc_events.len(), 2);
+
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::OpenTryChannel(_)));
+}
+
+#[rstest]
+fn chan_open_try_fail_no_connection(fixture: Fixture) {
+    let Fixture {
+        ctx, router, msg, ..
+    } = fixture;
+
+    let res = validate(&ctx.ibc_store, &router, msg);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no connection exists in the context"
+    )
+}
+
+#[rstest]
+fn chan_open_try_fail_no_client_state(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        conn_id_on_b,
+        conn_end_on_b,
+        ..
+    } = fixture;
+    let ctx = ctx.with_connection(conn_id_on_b, conn_end_on_b);
+
+    let res = validate(&ctx.ibc_store, &router, msg);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because the context has no client state"
+    )
+}
diff --git a/tests-integration/tests/core/ics04_channel/mod.rs b/tests-integration/tests/core/ics04_channel/mod.rs
new file mode 100644
index 000000000..01d376a35
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/mod.rs
@@ -0,0 +1,11 @@
+pub mod acknowledgement;
+pub mod chan_close_confirm;
+pub mod chan_close_init;
+pub mod chan_open_ack;
+pub mod chan_open_confirm;
+pub mod chan_open_init;
+pub mod chan_open_try;
+pub mod recv_packet;
+pub mod send_packet;
+pub mod timeout;
+pub mod timeout_on_close;
diff --git a/tests-integration/tests/core/ics04_channel/recv_packet.rs b/tests-integration/tests/core/ics04_channel/recv_packet.rs
new file mode 100644
index 000000000..df946f1e3
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/recv_packet.rs
@@ -0,0 +1,243 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::msgs::{MsgRecvPacket, PacketMsg};
+use ibc::core::channel::types::packet::Packet;
+use ibc::core::channel::types::Version;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::commitment::CommitmentPrefix;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId};
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::{dummy_msg_recv_packet, dummy_raw_msg_recv_packet};
+use ibc_testkit::fixtures::core::signer::dummy_account_id;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+use test_log::test;
+
+pub struct Fixture {
+    pub context: MockContext,
+    pub router: MockRouter,
+    pub client_height: Height,
+    pub host_height: Height,
+    pub msg: MsgRecvPacket,
+    pub conn_end_on_b: ConnectionEnd,
+    pub chan_end_on_b: ChannelEnd,
+    pub client_id: ClientId,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+
+    let context = MockContext::default();
+
+    let router = MockRouter::new_with_transfer();
+
+    let host_height = context.latest_height().increment();
+
+    let client_height = host_height.increment();
+
+    let msg = MsgRecvPacket::try_from(dummy_raw_msg_recv_packet(client_height.revision_height()))
+        .unwrap();
+
+    let packet = msg.packet.clone();
+
+    let chan_end_on_b = ChannelEnd::new(
+        State::Open,
+        Order::Unordered,
+        Counterparty::new(packet.port_id_on_a, Some(packet.chan_id_on_a)),
+        vec![ConnectionId::zero()],
+        Version::new("ics20-1".to_string()),
+    )
+    .unwrap();
+
+    let conn_end_on_b = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id.clone(),
+        ConnectionCounterparty::new(
+            client_id.clone(),
+            Some(ConnectionId::zero()),
+            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+        ),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    Fixture {
+        context,
+        router,
+        client_height,
+        host_height,
+        msg,
+        conn_end_on_b,
+        chan_end_on_b,
+        client_id,
+    }
+}
+
+#[rstest]
+fn recv_packet_fail_no_channel(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        ..
+    } = fixture;
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no channel exists in the context"
+    )
+}
+
+#[rstest]
+fn recv_packet_validate_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        conn_end_on_b,
+        chan_end_on_b,
+        client_height,
+        host_height,
+        ..
+    } = fixture;
+
+    let packet = &msg.packet;
+    let context = context
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_b)
+        .with_channel(
+            packet.port_id_on_b.clone(),
+            packet.chan_id_on_b.clone(),
+            chan_end_on_b,
+        )
+        .with_send_sequence(
+            packet.port_id_on_b.clone(),
+            packet.chan_id_on_b.clone(),
+            1.into(),
+        )
+        .advance_block_up_to_height(host_height)
+        // This `with_recv_sequence` is required for ordered channels
+        .with_recv_sequence(
+            packet.port_id_on_b.clone(),
+            packet.chan_id_on_b.clone(),
+            packet.seq_on_a,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Happy path: validation should succeed. err: {res:?}"
+    )
+}
+
+#[rstest]
+fn recv_packet_timeout_expired(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        conn_end_on_b,
+        chan_end_on_b,
+        client_height,
+        host_height,
+        ..
+    } = fixture;
+
+    let packet_old = Packet {
+        seq_on_a: 1.into(),
+        port_id_on_a: PortId::transfer(),
+        chan_id_on_a: ChannelId::zero(),
+        port_id_on_b: PortId::transfer(),
+        chan_id_on_b: ChannelId::zero(),
+        data: Vec::new(),
+        timeout_height_on_b: client_height.into(),
+        timeout_timestamp_on_b: Timestamp::from_nanoseconds(1).unwrap(),
+    };
+
+    let msg_packet_old = dummy_msg_recv_packet(
+        packet_old,
+        msg.proof_commitment_on_a.clone(),
+        msg.proof_height_on_a,
+        dummy_account_id(),
+    );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg_packet_old));
+
+    let context = context
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_b)
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_b)
+        .with_send_sequence(PortId::transfer(), ChannelId::zero(), 1.into())
+        .advance_block_up_to_height(host_height);
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "recv_packet validation should fail when the packet has timed out"
+    )
+}
+
+#[rstest]
+fn recv_packet_execute_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        mut router,
+        msg,
+        conn_end_on_b,
+        chan_end_on_b,
+        client_height,
+        ..
+    } = fixture;
+    let mut ctx = context
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_b)
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_b);
+
+    let msg_env = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_env);
+
+    assert!(res.is_ok());
+
+    let ibc_events = ctx.get_events();
+
+    assert_eq!(ibc_events.len(), 4);
+    assert!(matches!(
+        &ibc_events[0],
+        &IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(&ibc_events[1], &IbcEvent::ReceivePacket(_)));
+    assert!(matches!(
+        &ibc_events[2],
+        &IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(&ibc_events[3], &IbcEvent::WriteAcknowledgement(_)));
+}
diff --git a/tests-integration/tests/core/ics04_channel/send_packet.rs b/tests-integration/tests/core/ics04_channel/send_packet.rs
new file mode 100644
index 000000000..3a2bace44
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/send_packet.rs
@@ -0,0 +1,208 @@
+use core::ops::Add;
+use core::time::Duration;
+
+use ibc::core::channel::handler::send_packet;
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::packet::Packet;
+use ibc::core::channel::types::timeout::TimeoutHeight;
+use ibc::core::channel::types::Version;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::commitment::CommitmentPrefix;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_packet;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use test_log::test;
+
+#[test]
+fn send_packet_processing() {
+    let default_client_id = ClientId::new("07-tendermint", 0).expect("no error");
+
+    struct Test {
+        name: String,
+        ctx: MockContext,
+        packet: Packet,
+        want_pass: bool,
+    }
+
+    let chan_end_on_a = ChannelEnd::new(
+        State::Open,
+        Order::Unordered,
+        Counterparty::new(PortId::transfer(), Some(ChannelId::zero())),
+        vec![ConnectionId::zero()],
+        Version::new("ics20-1".to_string()),
+    )
+    .unwrap();
+
+    let conn_end_on_a = ConnectionEnd::new(
+        ConnectionState::Open,
+        default_client_id.clone(),
+        ConnectionCounterparty::new(
+            default_client_id,
+            Some(ConnectionId::zero()),
+            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+        ),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    let timestamp_future = Timestamp::now().add(Duration::from_secs(10)).unwrap();
+    let timestamp_ns_past = 1;
+
+    let timeout_height_future = 10;
+
+    let mut packet: Packet =
+        dummy_raw_packet(timeout_height_future, timestamp_future.nanoseconds())
+            .try_into()
+            .unwrap();
+    packet.seq_on_a = 1.into();
+    packet.data = vec![0];
+
+    let mut packet_with_timestamp_old: Packet =
+        dummy_raw_packet(timeout_height_future, timestamp_ns_past)
+            .try_into()
+            .unwrap();
+    packet_with_timestamp_old.seq_on_a = 1.into();
+    packet_with_timestamp_old.data = vec![0];
+
+    let client_raw_height = 5;
+    let packet_timeout_equal_client_height: Packet =
+        dummy_raw_packet(client_raw_height, timestamp_future.nanoseconds())
+            .try_into()
+            .unwrap();
+    let packet_timeout_one_before_client_height: Packet =
+        dummy_raw_packet(client_raw_height - 1, timestamp_future.nanoseconds())
+            .try_into()
+            .unwrap();
+
+    let client_height = Height::new(0, client_raw_height).unwrap();
+
+    let packet_with_no_timeout: Packet = {
+        let mut packet: Packet = dummy_raw_packet(10, 10).try_into().unwrap();
+        packet.timeout_height_on_b = TimeoutHeight::no_timeout();
+        packet.timeout_timestamp_on_b = Timestamp::none();
+        packet
+    };
+
+    let tests: Vec<Test> = vec![
+        Test {
+            name: "Processing fails because no channel exists in the context".to_string(),
+            ctx: MockContext::default(),
+            packet: packet.clone(),
+            want_pass: false,
+        },
+        Test {
+            name: "Good parameters".to_string(),
+            ctx: MockContext::default()
+                .with_light_client(
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
+                    LightClientState::<MockHost>::with_latest_height(client_height),
+                )
+                .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
+                .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a.clone())
+                .with_send_sequence(PortId::transfer(), ChannelId::zero(), 1.into()),
+            packet,
+            want_pass: true,
+        },
+        Test {
+            name: "Packet timeout height same as destination chain height".to_string(),
+            ctx: MockContext::default()
+                .with_light_client(
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
+                    LightClientState::<MockHost>::with_latest_height(client_height),
+                )
+                .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
+                .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a.clone())
+                .with_send_sequence(PortId::transfer(), ChannelId::zero(), 1.into()),
+            packet: packet_timeout_equal_client_height,
+            want_pass: true,
+        },
+        Test {
+            name: "Packet timeout height one more than destination chain height".to_string(),
+            ctx: MockContext::default()
+                .with_light_client(
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
+                    LightClientState::<MockHost>::with_latest_height(client_height),
+                )
+                .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
+                .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a.clone())
+                .with_send_sequence(PortId::transfer(), ChannelId::zero(), 1.into()),
+            packet: packet_timeout_one_before_client_height,
+            want_pass: false,
+        },
+        Test {
+            name: "Packet without height and timestamp timeout".to_string(),
+            ctx: MockContext::default()
+                .with_light_client(
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
+                    LightClientState::<MockHost>::with_latest_height(client_height),
+                )
+                .with_connection(ConnectionId::zero(), conn_end_on_a.clone())
+                .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a.clone())
+                .with_send_sequence(PortId::transfer(), ChannelId::zero(), 1.into()),
+            packet: packet_with_no_timeout,
+            want_pass: false,
+        },
+        Test {
+            name: "Packet timeout due to timestamp".to_string(),
+            ctx: MockContext::default()
+                .with_light_client(
+                    &ClientId::new("07-tendermint", 0).expect("no error"),
+                    LightClientState::<MockHost>::with_latest_height(client_height),
+                )
+                .with_connection(ConnectionId::zero(), conn_end_on_a)
+                .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a)
+                .with_send_sequence(PortId::transfer(), ChannelId::zero(), 1.into()),
+            packet: packet_with_timestamp_old,
+            want_pass: false,
+        },
+    ]
+    .into_iter()
+    .collect();
+
+    for mut test in tests {
+        let res = send_packet(&mut test.ctx.ibc_store, test.packet.clone());
+        // Additionally check the events and the output objects in the result.
+        match res {
+            Ok(()) => {
+                assert!(
+                        test.want_pass,
+                        "send_packet: test passed but was supposed to fail for test: {}, \nparams {:?} {:?}",
+                        test.name,
+                        test.packet.clone(),
+                        test.ctx
+                    );
+
+                let ibc_events = test.ctx.get_events();
+
+                assert!(!ibc_events.is_empty()); // Some events must exist.
+
+                assert_eq!(ibc_events.len(), 2);
+                assert!(matches!(
+                    &ibc_events[0],
+                    &IbcEvent::Message(MessageEvent::Channel)
+                ));
+                // TODO: The object in the output is a PacketResult what can we check on it?
+                assert!(matches!(&ibc_events[1], &IbcEvent::SendPacket(_)));
+            }
+            Err(e) => {
+                assert!(
+                    !test.want_pass,
+                    "send_packet: did not pass test: {}, \nparams {:?} {:?} error: {:?}",
+                    test.name,
+                    test.packet.clone(),
+                    test.ctx,
+                    e,
+                );
+            }
+        }
+    }
+}
diff --git a/tests-integration/tests/core/ics04_channel/timeout.rs b/tests-integration/tests/core/ics04_channel/timeout.rs
new file mode 100644
index 000000000..240ddd4a8
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/timeout.rs
@@ -0,0 +1,420 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::commitment::{compute_packet_commitment, PacketCommitment};
+use ibc::core::channel::types::msgs::{MsgTimeout, PacketMsg};
+use ibc::core::channel::types::Version;
+use ibc::core::client::context::ClientExecutionContext;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::commitment::CommitmentPrefix;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+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::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId};
+use ibc::core::host::types::path::ClientConsensusStatePath;
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_timeout;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+
+struct Fixture {
+    ctx: MockContext,
+    pub router: MockRouter,
+    client_id: ClientId,
+    client_height: Height,
+    msg: MsgTimeout,
+    packet_commitment: PacketCommitment,
+    conn_end_on_a: ConnectionEnd,
+    chan_end_on_a_ordered: ChannelEnd,
+    chan_end_on_a_unordered: ChannelEnd,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let client_id = ClientId::new("07-tendermint", 0).expect("no error");
+
+    let client_height = Height::new(0, 2).unwrap();
+    let ctx = MockContext::default().with_light_client(
+        &ClientId::new("07-tendermint", 0).expect("no error"),
+        LightClientState::<MockHost>::with_latest_height(client_height),
+    );
+
+    let client_height = Height::new(0, 2).unwrap();
+
+    let router = MockRouter::new_with_transfer();
+
+    // in case of timeout, timeout timestamp should be less than host's timestamp
+    let timeout_timestamp = ctx.latest_timestamp().nanoseconds() - 1;
+    let msg_proof_height = 2;
+    let msg_timeout_height = 5;
+
+    let msg = MsgTimeout::try_from(dummy_raw_msg_timeout(
+        msg_proof_height,
+        msg_timeout_height,
+        timeout_timestamp,
+    ))
+    .unwrap();
+
+    let packet = msg.packet.clone();
+
+    let packet_commitment = compute_packet_commitment(
+        &msg.packet.data,
+        &msg.packet.timeout_height_on_b,
+        &msg.packet.timeout_timestamp_on_b,
+    );
+
+    let chan_end_on_a_unordered = ChannelEnd::new(
+        State::Open,
+        Order::Unordered,
+        Counterparty::new(packet.port_id_on_b.clone(), Some(packet.chan_id_on_b)),
+        vec![ConnectionId::zero()],
+        Version::new("ics20-1".to_string()),
+    )
+    .unwrap();
+
+    let mut chan_end_on_a_ordered = chan_end_on_a_unordered.clone();
+    chan_end_on_a_ordered.ordering = Order::Ordered;
+
+    let conn_end_on_a = ConnectionEnd::new(
+        ConnectionState::Open,
+        client_id.clone(),
+        ConnectionCounterparty::new(
+            client_id.clone(),
+            Some(ConnectionId::zero()),
+            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+        ),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    Fixture {
+        ctx,
+        router,
+        client_id,
+        client_height,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_ordered,
+        chan_end_on_a_unordered,
+    }
+}
+
+#[rstest]
+fn timeout_fail_no_channel(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        client_height,
+        ..
+    } = fixture;
+    let ctx = ctx.with_light_client(
+        &ClientId::new("07-tendermint", 0).expect("no error"),
+        LightClientState::<MockHost>::with_latest_height(client_height),
+    );
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no channel exists in the context"
+    )
+}
+
+#[rstest]
+fn timeout_fail_no_consensus_state_for_height(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        chan_end_on_a_unordered,
+        conn_end_on_a,
+        packet_commitment,
+        client_id,
+        ..
+    } = fixture;
+
+    let packet = msg.packet.clone();
+
+    let mut ctx = ctx
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            packet.port_id_on_a,
+            packet.chan_id_on_a,
+            packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let consensus_state_path = ClientConsensusStatePath::new(
+        client_id,
+        msg.proof_height_on_b.revision_number(),
+        msg.proof_height_on_b.revision_height(),
+    );
+
+    ctx.ibc_store
+        .delete_consensus_state(consensus_state_path)
+        .expect("consensus state exists");
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+            res.is_err(),
+            "Validation fails because the client does not have a consensus state for the required height"
+        )
+}
+
+#[rstest]
+fn timeout_fail_proof_timeout_not_reached(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        mut msg,
+        chan_end_on_a_unordered,
+        conn_end_on_a,
+        client_height,
+        ..
+    } = fixture;
+
+    // timeout timestamp has not reached yet
+    let timeout_timestamp_on_b =
+        (msg.packet.timeout_timestamp_on_b + core::time::Duration::new(10, 0)).unwrap();
+    msg.packet.timeout_timestamp_on_b = timeout_timestamp_on_b;
+    let packet_commitment = compute_packet_commitment(
+        &msg.packet.data,
+        &msg.packet.timeout_height_on_b,
+        &msg.packet.timeout_timestamp_on_b,
+    );
+
+    let packet = msg.packet.clone();
+
+    let ctx = ctx
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_packet_commitment(
+            packet.port_id_on_a,
+            packet.chan_id_on_a,
+            packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+            res.is_err(),
+            "Validation should fail because the timeout height was reached, but the timestamp hasn't been reached. Both the height and timestamp need to be reached for the packet to be considered timed out"
+        )
+}
+
+/// NO-OP case
+#[rstest]
+fn timeout_success_no_packet_commitment(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        conn_end_on_a,
+        chan_end_on_a_unordered,
+        ..
+    } = fixture;
+    let ctx = ctx
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a);
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Validation should succeed when no packet commitment is present"
+    )
+}
+
+#[rstest]
+fn timeout_unordered_channel_validate(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        chan_end_on_a_unordered,
+        conn_end_on_a,
+        packet_commitment,
+        client_height,
+        ..
+    } = fixture;
+
+    let packet = msg.packet.clone();
+
+    let ctx = ctx
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_packet_commitment(
+            packet.port_id_on_a,
+            packet.chan_id_on_a,
+            packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(res.is_ok(), "Good parameters for unordered channels")
+}
+
+#[rstest]
+fn timeout_ordered_channel_validate(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        router,
+        msg,
+        chan_end_on_a_ordered,
+        conn_end_on_a,
+        packet_commitment,
+        client_height,
+        ..
+    } = fixture;
+
+    let packet = msg.packet.clone();
+
+    let ctx = ctx
+        .with_light_client(
+            &ClientId::new("07-tendermint", 0).expect("no error"),
+            LightClientState::<MockHost>::with_latest_height(client_height),
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a_ordered)
+        .with_packet_commitment(
+            packet.port_id_on_a,
+            packet.chan_id_on_a,
+            packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&ctx.ibc_store, &router, msg_envelope);
+
+    assert!(res.is_ok(), "Good parameters for unordered channels")
+}
+
+#[rstest]
+fn timeout_unordered_chan_execute(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        mut router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_unordered,
+        ..
+    } = fixture;
+    let mut ctx = ctx
+        .with_channel(
+            PortId::transfer(),
+            ChannelId::zero(),
+            chan_end_on_a_unordered,
+        )
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            msg.packet.port_id_on_a.clone(),
+            msg.packet.chan_id_on_a.clone(),
+            msg.packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok());
+
+    let ibc_events = ctx.get_events();
+
+    // Unordered channels only emit one event
+    assert_eq!(ibc_events.len(), 2);
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::TimeoutPacket(_)));
+}
+
+#[rstest]
+fn timeout_ordered_chan_execute(fixture: Fixture) {
+    let Fixture {
+        ctx,
+        mut router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a_ordered,
+        ..
+    } = fixture;
+    let mut ctx = ctx
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a_ordered)
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            msg.packet.port_id_on_a.clone(),
+            msg.packet.chan_id_on_a.clone(),
+            msg.packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = execute(&mut ctx.ibc_store, &mut router, msg_envelope);
+
+    assert!(res.is_ok());
+
+    let ibc_events = ctx.get_events();
+
+    // Ordered channels emit 2 events
+    assert_eq!(ibc_events.len(), 4);
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[1], IbcEvent::TimeoutPacket(_)));
+    assert!(matches!(
+        ibc_events[2],
+        IbcEvent::Message(MessageEvent::Channel)
+    ));
+    assert!(matches!(ibc_events[3], IbcEvent::ChannelClosed(_)));
+}
diff --git a/tests-integration/tests/core/ics04_channel/timeout_on_close.rs b/tests-integration/tests/core/ics04_channel/timeout_on_close.rs
new file mode 100644
index 000000000..a454261fd
--- /dev/null
+++ b/tests-integration/tests/core/ics04_channel/timeout_on_close.rs
@@ -0,0 +1,162 @@
+use ibc::core::channel::types::channel::{ChannelEnd, Counterparty, Order, State};
+use ibc::core::channel::types::commitment::{compute_packet_commitment, PacketCommitment};
+use ibc::core::channel::types::msgs::{MsgTimeoutOnClose, PacketMsg};
+use ibc::core::channel::types::Version;
+use ibc::core::client::types::Height;
+use ibc::core::commitment_types::commitment::CommitmentPrefix;
+use ibc::core::connection::types::version::Version as ConnectionVersion;
+use ibc::core::connection::types::{
+    ConnectionEnd, Counterparty as ConnectionCounterparty, State as ConnectionState,
+};
+use ibc::core::entrypoint::validate;
+use ibc::core::handler::types::msgs::MsgEnvelope;
+use ibc::core::host::types::identifiers::{ChannelId, ClientId, ConnectionId, PortId};
+use ibc::core::primitives::*;
+use ibc_testkit::context::MockContext;
+use ibc_testkit::fixtures::core::channel::dummy_raw_msg_timeout_on_close;
+use ibc_testkit::hosts::MockHost;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use ibc_testkit::testapp::ibc::core::types::LightClientState;
+use rstest::*;
+
+pub struct Fixture {
+    pub context: MockContext,
+    pub router: MockRouter,
+    pub msg: MsgTimeoutOnClose,
+    pub packet_commitment: PacketCommitment,
+    pub conn_end_on_a: ConnectionEnd,
+    pub chan_end_on_a: ChannelEnd,
+}
+
+#[fixture]
+fn fixture() -> Fixture {
+    let default_client_id = ClientId::new("07-tendermint", 0).expect("no error");
+
+    let client_height = Height::new(0, 2).unwrap();
+    let context = MockContext::default().with_light_client(
+        &ClientId::new("07-tendermint", 0).expect("no error"),
+        LightClientState::<MockHost>::with_latest_height(client_height),
+    );
+    let router = MockRouter::new_with_transfer();
+
+    let height = 2;
+    let timeout_timestamp = 5;
+
+    let msg =
+        MsgTimeoutOnClose::try_from(dummy_raw_msg_timeout_on_close(height, timeout_timestamp))
+            .unwrap();
+
+    let packet = msg.packet.clone();
+
+    let packet_commitment = compute_packet_commitment(
+        &msg.packet.data,
+        &msg.packet.timeout_height_on_b,
+        &msg.packet.timeout_timestamp_on_b,
+    );
+
+    let chan_end_on_a = ChannelEnd::new(
+        State::Open,
+        Order::Ordered,
+        Counterparty::new(packet.port_id_on_b.clone(), Some(packet.chan_id_on_b)),
+        vec![ConnectionId::zero()],
+        Version::new("ics20-1".to_string()),
+    )
+    .unwrap();
+
+    let conn_end_on_a = ConnectionEnd::new(
+        ConnectionState::Open,
+        default_client_id.clone(),
+        ConnectionCounterparty::new(
+            default_client_id,
+            Some(ConnectionId::zero()),
+            CommitmentPrefix::try_from(vec![0]).expect("no error"),
+        ),
+        ConnectionVersion::compatibles(),
+        ZERO_DURATION,
+    )
+    .unwrap();
+
+    Fixture {
+        context,
+        router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a,
+    }
+}
+
+#[rstest]
+fn timeout_on_close_fail_no_channel(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        ..
+    } = fixture;
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_err(),
+        "Validation fails because no channel exists in the context"
+    )
+}
+
+/// NO-OP case
+#[rstest]
+fn timeout_on_close_success_no_packet_commitment(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        conn_end_on_a,
+        chan_end_on_a,
+        ..
+    } = fixture;
+    let context = context
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a)
+        .with_connection(ConnectionId::zero(), conn_end_on_a);
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Validation should succeed when no packet commitment is present"
+    )
+}
+
+#[rstest]
+fn timeout_on_close_success_happy_path(fixture: Fixture) {
+    let Fixture {
+        context,
+        router,
+        msg,
+        packet_commitment,
+        conn_end_on_a,
+        chan_end_on_a,
+        ..
+    } = fixture;
+    let context = context
+        .with_channel(PortId::transfer(), ChannelId::zero(), chan_end_on_a)
+        .with_connection(ConnectionId::zero(), conn_end_on_a)
+        .with_packet_commitment(
+            msg.packet.port_id_on_a.clone(),
+            msg.packet.chan_id_on_a.clone(),
+            msg.packet.seq_on_a,
+            packet_commitment,
+        );
+
+    let msg_envelope = MsgEnvelope::from(PacketMsg::from(msg));
+
+    let res = validate(&context.ibc_store, &router, msg_envelope);
+
+    assert!(
+        res.is_ok(),
+        "Happy path: validation should succeed. err: {res:?}"
+    )
+}
diff --git a/tests-integration/tests/core/mod.rs b/tests-integration/tests/core/mod.rs
new file mode 100644
index 000000000..10f45250e
--- /dev/null
+++ b/tests-integration/tests/core/mod.rs
@@ -0,0 +1,5 @@
+pub mod ics02_client;
+pub mod ics03_connection;
+pub mod ics04_channel;
+#[cfg(feature = "serde")]
+pub mod router;
diff --git a/tests-integration/tests/core/router.rs b/tests-integration/tests/core/router.rs
new file mode 100644
index 000000000..5bc657702
--- /dev/null
+++ b/tests-integration/tests/core/router.rs
@@ -0,0 +1,448 @@
+use core::ops::Add;
+
+use ibc::apps::transfer::handler::send_transfer;
+use ibc::apps::transfer::types::error::TokenTransferError;
+use ibc::apps::transfer::types::msgs::transfer::MsgTransfer;
+use ibc::apps::transfer::types::{BaseCoin, U256};
+use ibc::core::channel::types::error::ChannelError;
+use ibc::core::channel::types::msgs::{
+    ChannelMsg, MsgAcknowledgement, MsgChannelCloseConfirm, MsgChannelCloseInit, MsgChannelOpenAck,
+    MsgChannelOpenInit, MsgChannelOpenTry, MsgRecvPacket, MsgTimeoutOnClose, PacketMsg,
+};
+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::entrypoint::dispatch;
+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_testkit::context::MockContext;
+use ibc_testkit::fixtures::applications::transfer::{
+    extract_transfer_packet, MsgTransferConfig, PacketDataConfig,
+};
+use ibc_testkit::fixtures::core::channel::{
+    dummy_raw_msg_ack_with_packet, dummy_raw_msg_chan_close_confirm, dummy_raw_msg_chan_close_init,
+    dummy_raw_msg_chan_open_ack, dummy_raw_msg_chan_open_init, dummy_raw_msg_chan_open_try,
+    dummy_raw_msg_recv_packet, dummy_raw_msg_timeout_on_close,
+};
+use ibc_testkit::fixtures::core::client::dummy_msg_upgrade_client;
+use ibc_testkit::fixtures::core::connection::{
+    dummy_msg_conn_open_ack, dummy_msg_conn_open_init, dummy_msg_conn_open_init_with_client_id,
+    dummy_msg_conn_open_try, msg_conn_open_try_with_client_id,
+};
+use ibc_testkit::fixtures::core::context::TestContextConfig;
+use ibc_testkit::fixtures::core::signer::dummy_account_id;
+use ibc_testkit::testapp::ibc::applications::transfer::types::DummyTransferModule;
+use ibc_testkit::testapp::ibc::clients::mock::client_state::MockClientState;
+use ibc_testkit::testapp::ibc::clients::mock::consensus_state::MockConsensusState;
+use ibc_testkit::testapp::ibc::clients::mock::header::MockHeader;
+use ibc_testkit::testapp::ibc::core::router::MockRouter;
+use test_log::test;
+
+#[test]
+/// These tests exercise two main paths: (1) the ability of the ICS26 routing module to dispatch
+/// messages to the correct module handler, and more importantly: (2) the ability of ICS handlers
+/// to work with the context and correctly store results.
+fn routing_module_and_keepers() {
+    #[derive(Clone, Debug)]
+    enum TestMsg {
+        Ics26(MsgEnvelope),
+        Ics20(MsgTransfer),
+    }
+
+    impl From<MsgEnvelope> for TestMsg {
+        fn from(msg: MsgEnvelope) -> Self {
+            Self::Ics26(msg)
+        }
+    }
+
+    impl From<MsgTransfer> for TestMsg {
+        fn from(msg: MsgTransfer) -> Self {
+            Self::Ics20(msg)
+        }
+    }
+
+    type StateCheckFn = dyn FnOnce(&MockContext) -> bool;
+
+    // Test parameters
+    struct Test {
+        name: String,
+        msg: TestMsg,
+        want_pass: bool,
+        state_check: Option<Box<StateCheckFn>>,
+    }
+    let default_signer = dummy_account_id();
+    let client_height = 5;
+    let start_client_height = Height::new(0, client_height).unwrap();
+    let update_client_height = Height::new(0, 34).unwrap();
+    let update_client_height_after_send = Height::new(0, 35).unwrap();
+
+    let update_client_height_after_second_send = Height::new(0, 36).unwrap();
+
+    let upgrade_client_height = Height::new(1, 2).unwrap();
+
+    let upgrade_client_height_second = Height::new(1, 1).unwrap();
+
+    // We reuse this same context across all tests. Nothing in particular needs parametrizing.
+    let mut ctx = TestContextConfig::builder()
+        // a future timestamp, so that submitted packets are considered from past
+        // not more than 5 secs, as later dummy_raw_msg_timeout_on_close(*, 5) is used
+        .latest_timestamp(
+            Timestamp::now()
+                .add(core::time::Duration::from_secs(4))
+                .unwrap(),
+        )
+        .build::<MockContext>();
+
+    let mut router = MockRouter::new_with_transfer();
+
+    let header = MockHeader::new(start_client_height).with_current_timestamp();
+
+    let create_client_msg = MsgCreateClient::new(
+        MockClientState::new(header).into(),
+        MockConsensusState::new(header).into(),
+        default_signer.clone(),
+    );
+
+    //
+    // Connection handshake messages.
+    //
+    let msg_conn_init = dummy_msg_conn_open_init();
+
+    let correct_msg_conn_try = dummy_msg_conn_open_try(client_height, client_height);
+
+    // The handler will fail to process this msg because the client height is too advanced.
+    let incorrect_msg_conn_try = dummy_msg_conn_open_try(client_height + 1, client_height + 1);
+
+    let msg_conn_ack = dummy_msg_conn_open_ack(client_height, client_height);
+
+    //
+    // Channel handshake messages.
+    //
+    let msg_chan_init = MsgChannelOpenInit::try_from(dummy_raw_msg_chan_open_init(None)).unwrap();
+
+    // The handler will fail to process this b/c the associated connection does not exist
+    let mut incorrect_msg_chan_init = msg_chan_init.clone();
+    incorrect_msg_chan_init.connection_hops_on_a = vec![ConnectionId::new(590)];
+
+    let msg_chan_try =
+        MsgChannelOpenTry::try_from(dummy_raw_msg_chan_open_try(client_height)).unwrap();
+
+    let msg_chan_ack =
+        MsgChannelOpenAck::try_from(dummy_raw_msg_chan_open_ack(client_height)).unwrap();
+
+    let msg_chan_close_init =
+        MsgChannelCloseInit::try_from(dummy_raw_msg_chan_close_init()).unwrap();
+
+    let msg_chan_close_confirm =
+        MsgChannelCloseConfirm::try_from(dummy_raw_msg_chan_close_confirm(client_height)).unwrap();
+
+    let packet_data = PacketDataConfig::builder()
+        .token(
+            BaseCoin {
+                denom: "uatom".parse().expect("parse denom"),
+                amount: U256::from(10).into(),
+            }
+            .into(),
+        )
+        .build();
+
+    let msg_transfer = MsgTransferConfig::builder()
+        .packet_data(packet_data.clone())
+        .timeout_height_on_b(TimeoutHeight::At(Height::new(0, 35).unwrap()))
+        .build();
+
+    let msg_transfer_two = MsgTransferConfig::builder()
+        .packet_data(packet_data.clone())
+        .timeout_height_on_b(TimeoutHeight::At(Height::new(0, 36).unwrap()))
+        .build();
+
+    let msg_transfer_no_timeout = MsgTransferConfig::builder()
+        .packet_data(packet_data.clone())
+        .build();
+
+    let msg_transfer_no_timeout_or_timestamp = MsgTransferConfig::builder()
+        .packet_data(packet_data)
+        // Timestamp::from_nanoseconds(0) and Timestamp::none() are equivalent
+        .timeout_timestamp_on_b(Timestamp::from_nanoseconds(0).unwrap())
+        .build();
+
+    let mut msg_to_on_close =
+        MsgTimeoutOnClose::try_from(dummy_raw_msg_timeout_on_close(36, 5)).unwrap();
+    msg_to_on_close.packet.seq_on_a = 2.into();
+    msg_to_on_close.packet.timeout_height_on_b = msg_transfer_two.timeout_height_on_b;
+    msg_to_on_close.packet.timeout_timestamp_on_b = msg_transfer_two.timeout_timestamp_on_b;
+
+    let packet_data = serde_json::to_vec(&msg_transfer_two.packet_data)
+        .expect("PacketData's infallible Serialize impl failed");
+
+    msg_to_on_close.packet.data = packet_data;
+
+    let msg_recv_packet = MsgRecvPacket::try_from(dummy_raw_msg_recv_packet(35)).unwrap();
+    let msg_ack_packet = MsgAcknowledgement::try_from(dummy_raw_msg_ack_with_packet(
+        extract_transfer_packet(&msg_transfer, 1u64.into()).into(),
+        35,
+    ))
+    .unwrap();
+
+    // First, create a client..
+    let res = dispatch(
+        &mut ctx.ibc_store,
+        &mut router,
+        MsgEnvelope::Client(ClientMsg::CreateClient(create_client_msg.clone())),
+    );
+
+    assert!(
+            res.is_ok(),
+            "ICS26 routing dispatch test 'client creation' failed for message {create_client_msg:?} with result: {res:?}",
+        );
+
+    let ibc_events = ctx.get_events();
+
+    // Figure out the ID of the client that was just created.
+    assert!(matches!(
+        ibc_events[0],
+        IbcEvent::Message(MessageEvent::Client)
+    ));
+    let client_id_event = ibc_events.get(1);
+    assert!(
+        client_id_event.is_some(),
+        "There was no event generated for client creation!"
+    );
+    let client_id = match client_id_event.unwrap() {
+        IbcEvent::CreateClient(create_client) => create_client.client_id().clone(),
+        event => panic!("unexpected IBC event: {:?}", event),
+    };
+
+    let tests: Vec<Test> = vec![
+        // Test some ICS2 client functionality.
+        Test {
+            name: "Client update successful".to_string(),
+            msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
+                client_id: client_id.clone(),
+                client_message: MockHeader::new(update_client_height)
+                    .with_current_timestamp()
+                    .into(),
+                signer: default_signer.clone(),
+            }))
+            .into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Connection open init succeeds".to_string(),
+            msg: MsgEnvelope::Connection(ConnectionMsg::OpenInit(
+                dummy_msg_conn_open_init_with_client_id(msg_conn_init, client_id.clone()),
+            ))
+            .into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Connection open try fails due to InvalidConsensusHeight (too high)".to_string(),
+            msg: MsgEnvelope::Connection(ConnectionMsg::OpenTry(incorrect_msg_conn_try)).into(),
+            want_pass: false,
+            state_check: None,
+        },
+        Test {
+            name: "Connection open try succeeds".to_string(),
+            msg: MsgEnvelope::Connection(ConnectionMsg::OpenTry(msg_conn_open_try_with_client_id(
+                correct_msg_conn_try,
+                client_id.clone(),
+            )))
+            .into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Connection open ack succeeds".to_string(),
+            msg: MsgEnvelope::Connection(ConnectionMsg::OpenAck(msg_conn_ack)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        // ICS04
+        Test {
+            name: "Channel open init succeeds".to_string(),
+            msg: MsgEnvelope::Channel(ChannelMsg::OpenInit(msg_chan_init)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Channel open init fail due to missing connection".to_string(),
+            msg: MsgEnvelope::Channel(ChannelMsg::OpenInit(incorrect_msg_chan_init)).into(),
+            want_pass: false,
+            state_check: None,
+        },
+        Test {
+            name: "Channel open try succeeds".to_string(),
+            msg: MsgEnvelope::Channel(ChannelMsg::OpenTry(msg_chan_try)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Channel open ack succeeds".to_string(),
+            msg: MsgEnvelope::Channel(ChannelMsg::OpenAck(msg_chan_ack)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Packet send".to_string(),
+            msg: msg_transfer.into(),
+            want_pass: true,
+            state_check: None,
+        },
+        // The client update is required in this test, because the proof associated with
+        // msg_recv_packet has the same height as the packet TO height (see get_dummy_raw_msg_recv_packet)
+        Test {
+            name: "Client update successful #2".to_string(),
+            msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
+                client_id: client_id.clone(),
+                client_message: MockHeader::new(update_client_height_after_send)
+                    .with_current_timestamp()
+                    .into(),
+                signer: default_signer.clone(),
+            }))
+            .into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Receive packet".to_string(),
+            msg: MsgEnvelope::Packet(PacketMsg::Recv(msg_recv_packet.clone())).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Re-Receive packet".to_string(),
+            msg: MsgEnvelope::Packet(PacketMsg::Recv(msg_recv_packet)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        // Ack packet
+        Test {
+            name: "Ack packet".to_string(),
+            msg: MsgEnvelope::Packet(PacketMsg::Ack(msg_ack_packet.clone())).into(),
+            want_pass: true,
+            state_check: Some(Box::new(move |ctx| {
+                ctx.ibc_store
+                    .get_packet_commitment(&CommitmentPath::new(
+                        &msg_ack_packet.packet.port_id_on_a,
+                        &msg_ack_packet.packet.chan_id_on_a,
+                        msg_ack_packet.packet.seq_on_a,
+                    ))
+                    .is_err()
+            })),
+        },
+        Test {
+            name: "Packet send".to_string(),
+            msg: msg_transfer_two.into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Client update successful".to_string(),
+            msg: MsgEnvelope::Client(ClientMsg::UpdateClient(MsgUpdateClient {
+                client_id: client_id.clone(),
+                client_message: MockHeader::new(update_client_height_after_second_send)
+                    .with_current_timestamp()
+                    .into(),
+                signer: default_signer,
+            }))
+            .into(),
+            want_pass: true,
+            state_check: None,
+        },
+        // Timeout packets
+        Test {
+            name: "Transfer message no timeout".to_string(),
+            msg: msg_transfer_no_timeout.into(),
+            want_pass: false,
+            state_check: None,
+        },
+        Test {
+            name: "Transfer message no timeout nor timestamp".to_string(),
+            msg: msg_transfer_no_timeout_or_timestamp.into(),
+            want_pass: false,
+            state_check: None,
+        },
+        //ICS04-close channel
+        Test {
+            name: "Channel close init succeeds".to_string(),
+            msg: MsgEnvelope::Channel(ChannelMsg::CloseInit(msg_chan_close_init)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Channel close confirm fails cause channel is already closed".to_string(),
+            msg: MsgEnvelope::Channel(ChannelMsg::CloseConfirm(msg_chan_close_confirm)).into(),
+            want_pass: false,
+            state_check: None,
+        },
+        //ICS04-to_on_close
+        Test {
+            name: "Timeout on close".to_string(),
+            msg: MsgEnvelope::Packet(PacketMsg::TimeoutOnClose(msg_to_on_close)).into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Client upgrade successful".to_string(),
+            msg: MsgEnvelope::Client(ClientMsg::UpgradeClient(dummy_msg_upgrade_client(
+                client_id.clone(),
+                upgrade_client_height,
+            )))
+            .into(),
+            want_pass: true,
+            state_check: None,
+        },
+        Test {
+            name: "Client upgrade un-successful".to_string(),
+            msg: MsgEnvelope::Client(ClientMsg::UpgradeClient(dummy_msg_upgrade_client(
+                client_id,
+                upgrade_client_height_second,
+            )))
+            .into(),
+            want_pass: false,
+            state_check: None,
+        },
+    ]
+    .into_iter()
+    .collect();
+
+    for test in tests {
+        let res = match test.msg.clone() {
+            TestMsg::Ics26(msg) => dispatch(&mut ctx.ibc_store, &mut router, msg),
+            TestMsg::Ics20(msg) => send_transfer(&mut ctx.ibc_store, &mut DummyTransferModule, msg)
+                .map_err(|e: TokenTransferError| ChannelError::AppModule {
+                    description: e.to_string(),
+                })
+                .map_err(ContextError::from),
+        };
+
+        assert_eq!(
+            test.want_pass,
+            res.is_ok(),
+            "ICS26 routing dispatch test '{}' failed for message {:?}\nwith result: {:?}",
+            test.name,
+            test.msg,
+            res
+        );
+
+        if let Some(state_check) = test.state_check {
+            assert_eq!(
+                test.want_pass,
+                state_check(&ctx),
+                "ICS26 routing state check '{}' failed for message {:?}\nwith result: {:?}",
+                test.name,
+                test.msg,
+                res
+            );
+        }
+    }
+}
diff --git a/tests-integration/tests/cosmwasm/fixture.rs b/tests-integration/tests/cosmwasm/fixture.rs
new file mode 100644
index 000000000..8e8403342
--- /dev/null
+++ b/tests-integration/tests/cosmwasm/fixture.rs
@@ -0,0 +1,220 @@
+use std::time::Duration;
+
+use cosmwasm_std::{from_json, Deps, DepsMut, Empty, Response, StdError, StdResult};
+use ibc::clients::tendermint::client_state::ClientState as TmClientState;
+use ibc::clients::tendermint::consensus_state::ConsensusState as TmConsensusState;
+use ibc::clients::tendermint::types::Header;
+use ibc::core::client::types::{Height, Status};
+use ibc::core::host::types::identifiers::ChainId;
+use ibc::core::primitives::Timestamp;
+use ibc_client_cw::types::{
+    CheckForMisbehaviourMsgRaw, ContractError, ExportMetadataMsg, GenesisMetadata, InstantiateMsg,
+    MigrationPrefix, QueryMsg, QueryResponse, StatusMsg, UpdateStateMsgRaw,
+    UpdateStateOnMisbehaviourMsgRaw, VerifyClientMessageRaw,
+};
+use ibc_client_cw::utils::AnyCodec;
+use ibc_client_tendermint_cw::entrypoint::TendermintContext;
+use ibc_testkit::fixtures::clients::tendermint::ClientStateConfig;
+use tendermint::Time;
+use tendermint_testgen::{Generator, Validator};
+
+use super::helper::{dummy_checksum, dummy_sov_consensus_state, mock_env_with_timestamp_now};
+
+/// Test fixture
+#[derive(Clone, Debug)]
+pub struct Fixture {
+    pub chain_id: ChainId,
+    pub trusted_timestamp: Timestamp,
+    pub trusted_height: Height,
+    pub validators: Vec<Validator>,
+    pub migration_prefix: MigrationPrefix,
+}
+
+impl Default for Fixture {
+    fn default() -> Self {
+        Fixture {
+            chain_id: ChainId::new("test-chain").unwrap(),
+            trusted_timestamp: Timestamp::now(),
+            trusted_height: Height::new(0, 5).unwrap(),
+            validators: vec![
+                Validator::new("1").voting_power(40),
+                Validator::new("2").voting_power(30),
+                Validator::new("3").voting_power(30),
+            ],
+            migration_prefix: MigrationPrefix::None,
+        }
+    }
+}
+
+impl Fixture {
+    pub fn set_migration_prefix(&mut self, migration_mode: MigrationPrefix) {
+        self.migration_prefix = migration_mode;
+    }
+
+    pub fn ctx_ref<'a>(&self, deps: Deps<'a, Empty>) -> TendermintContext<'a> {
+        let mut ctx =
+            TendermintContext::new_ref(deps, mock_env_with_timestamp_now()).expect("never fails");
+
+        match self.migration_prefix {
+            MigrationPrefix::None => {}
+            MigrationPrefix::Subject => {
+                ctx.set_subject_prefix();
+            }
+            MigrationPrefix::Substitute => {
+                ctx.set_substitute_prefix();
+            }
+        };
+
+        ctx
+    }
+
+    pub fn ctx_mut<'a>(&self, deps: DepsMut<'a, Empty>) -> TendermintContext<'a> {
+        let mut ctx =
+            TendermintContext::new_mut(deps, mock_env_with_timestamp_now()).expect("never fails");
+
+        match self.migration_prefix {
+            MigrationPrefix::None => {}
+            MigrationPrefix::Subject => {
+                ctx.set_subject_prefix();
+            }
+            MigrationPrefix::Substitute => {
+                ctx.set_substitute_prefix();
+            }
+        };
+
+        ctx
+    }
+
+    pub fn dummy_instantiate_msg(&self) -> InstantiateMsg {
+        // Setting the `trusting_period` to 1 second allows the quick
+        // client expiry for the tests.
+        let tm_client_state: TmClientState = ClientStateConfig::builder()
+            .trusting_period(Duration::from_secs(1))
+            .build()
+            .into_client_state(self.chain_id.clone(), self.trusted_height)
+            .expect("never fails");
+
+        let tm_consensus_state = dummy_sov_consensus_state(self.trusted_timestamp);
+
+        InstantiateMsg {
+            client_state: TmClientState::encode_to_any_vec(tm_client_state),
+            consensus_state: TmConsensusState::encode_to_any_vec(tm_consensus_state),
+            checksum: dummy_checksum(),
+        }
+    }
+
+    fn dummy_header(&self, header_height: Height) -> Vec<u8> {
+        let header = tendermint_testgen::Header::new(&self.validators)
+            .chain_id(self.chain_id.as_str())
+            .height(header_height.revision_height())
+            .time(Time::now())
+            .next_validators(&self.validators)
+            .app_hash(vec![0; 32].try_into().expect("never fails"));
+
+        let light_block = tendermint_testgen::LightBlock::new_default_with_header(header)
+            .generate()
+            .expect("failed to generate light block");
+
+        let tm_header = Header {
+            signed_header: light_block.signed_header,
+            validator_set: light_block.validators,
+            trusted_height: self.trusted_height,
+            trusted_next_validator_set: light_block.next_validators,
+        };
+
+        Header::encode_to_any_vec(tm_header)
+    }
+
+    pub fn dummy_client_message(&self, target_height: Height) -> Vec<u8> {
+        self.dummy_header(target_height)
+    }
+
+    /// Constructs a dummy misbehaviour message that is one block behind the
+    /// trusted height, but with a future timestamp.
+    pub fn dummy_misbehaviour_message(&self) -> Vec<u8> {
+        let prev_height = self.trusted_height.decrement().expect("never fails");
+
+        self.dummy_header(prev_height)
+    }
+
+    pub fn verify_client_message(&self, deps: Deps<'_>, client_message: Vec<u8>) {
+        let resp = self
+            .query(deps, VerifyClientMessageRaw { client_message }.into())
+            .unwrap();
+
+        assert!(resp.is_valid);
+        assert!(resp.status.is_none());
+        assert!(resp.found_misbehaviour.is_none());
+    }
+
+    pub fn check_for_misbehaviour(&self, deps: Deps<'_>, client_message: Vec<u8>) {
+        let resp = self
+            .query(deps, CheckForMisbehaviourMsgRaw { client_message }.into())
+            .unwrap();
+
+        assert!(resp.is_valid);
+        assert_eq!(resp.found_misbehaviour, Some(true));
+    }
+
+    pub fn check_client_status(&self, deps: Deps<'_>, expected: Status) {
+        let resp = self.query(deps, StatusMsg {}.into()).unwrap();
+
+        assert_eq!(resp.status, Some(expected.to_string()));
+    }
+
+    pub fn get_metadata(&self, deps: Deps<'_>) -> Option<Vec<GenesisMetadata>> {
+        self.query(deps, ExportMetadataMsg {}.into())
+            .map(|resp| resp.genesis_metadata)
+            .unwrap()
+    }
+
+    pub fn query(&self, deps: Deps<'_>, msg: QueryMsg) -> StdResult<QueryResponse> {
+        let ctx = self.ctx_ref(deps);
+
+        let resp_bytes = ctx
+            .query(msg)
+            .map_err(|e| StdError::generic_err(e.to_string()))?;
+
+        from_json(resp_bytes)
+    }
+
+    pub fn create_client(&self, deps_mut: DepsMut<'_>) -> Result<Response, ContractError> {
+        let mut ctx = self.ctx_mut(deps_mut);
+
+        let instantiate_msg = self.dummy_instantiate_msg();
+
+        let data = ctx.instantiate(instantiate_msg)?;
+
+        Ok(Response::default().set_data(data))
+    }
+
+    pub fn update_client(
+        &self,
+        deps_mut: DepsMut<'_>,
+        target_height: Height,
+    ) -> Result<Response, ContractError> {
+        let client_message = self.dummy_client_message(target_height);
+
+        self.verify_client_message(deps_mut.as_ref(), client_message.clone());
+
+        let mut ctx = self.ctx_mut(deps_mut);
+
+        let data = ctx.sudo(UpdateStateMsgRaw { client_message }.into())?;
+
+        Ok(Response::default().set_data(data))
+    }
+
+    pub fn update_client_on_misbehaviour(&self, deps_mut: DepsMut<'_>) -> Response {
+        let client_message = self.dummy_misbehaviour_message();
+
+        self.check_for_misbehaviour(deps_mut.as_ref(), client_message.clone());
+
+        let mut ctx = self.ctx_mut(deps_mut);
+
+        let data = ctx
+            .sudo(UpdateStateOnMisbehaviourMsgRaw { client_message }.into())
+            .unwrap();
+
+        Response::default().set_data(data)
+    }
+}
diff --git a/tests-integration/tests/cosmwasm/helper.rs b/tests-integration/tests/cosmwasm/helper.rs
new file mode 100644
index 000000000..f1c9ad74b
--- /dev/null
+++ b/tests-integration/tests/cosmwasm/helper.rs
@@ -0,0 +1,35 @@
+use std::str::FromStr;
+
+use cosmwasm_std::testing::{mock_env, mock_info};
+use cosmwasm_std::{coins, Env, MessageInfo, Timestamp as CwTimestamp};
+use ibc::clients::tendermint::types::ConsensusState;
+use ibc::core::primitives::Timestamp as IbcTimestamp;
+use tendermint::Hash;
+
+pub fn dummy_msg_info() -> MessageInfo {
+    mock_info("creator", &coins(1000, "ibc"))
+}
+
+pub fn dummy_checksum() -> Vec<u8> {
+    hex::decode("2469f43c3ca20d476442bd3d98cbd97a180776ab37332aa7b02cae5a620acfc6")
+        .expect("Never fails")
+}
+
+pub fn dummy_sov_consensus_state(timestamp: IbcTimestamp) -> ConsensusState {
+    ConsensusState::new(
+        vec![0].into(),
+        timestamp.into_tm_time().expect("Time exists"),
+        // Hash of default validator set
+        Hash::from_str("D6B93922C33AAEBEC9043566CB4B1B48365B1358B67C7DEF986D9EE1861BC143")
+            .expect("Never fails"),
+    )
+}
+
+/// Returns a mock environment with the current timestamp. This is defined
+/// to be used for testing client expiry and other time-sensitive operations.
+pub fn mock_env_with_timestamp_now() -> Env {
+    let mut env = mock_env();
+    let now_nanos = IbcTimestamp::now().nanoseconds();
+    env.block.time = CwTimestamp::from_nanos(now_nanos);
+    env
+}
diff --git a/tests-integration/tests/cosmwasm/mod.rs b/tests-integration/tests/cosmwasm/mod.rs
new file mode 100644
index 000000000..413981236
--- /dev/null
+++ b/tests-integration/tests/cosmwasm/mod.rs
@@ -0,0 +1,123 @@
+pub mod fixture;
+pub mod helper;
+
+use std::time::Duration;
+
+use cosmwasm_std::from_json;
+use cosmwasm_std::testing::{mock_dependencies, mock_env};
+use fixture::Fixture;
+use ibc::core::client::types::{Height, Status};
+use ibc_client_cw::types::{
+    ContractResult, MigrateClientStoreMsg, MigrationPrefix, VerifyClientMessageRaw,
+};
+use ibc_client_tendermint_cw::entrypoint::sudo;
+
+#[test]
+fn test_cw_create_client_ok() {
+    let fxt = Fixture::default();
+
+    let mut deps = mock_dependencies();
+
+    let resp = fxt.create_client(deps.as_mut()).unwrap();
+
+    assert_eq!(0, resp.messages.len());
+
+    let contract_result: ContractResult = from_json(resp.data.unwrap()).unwrap();
+
+    assert!(contract_result.heights.is_none());
+
+    fxt.check_client_status(deps.as_ref(), Status::Active);
+}
+
+#[test]
+fn test_cw_update_client_ok() {
+    let fxt = Fixture::default();
+
+    let mut deps = mock_dependencies();
+
+    // ------------------- Create client -------------------
+
+    fxt.create_client(deps.as_mut()).unwrap();
+
+    // ------------------- Verify and Update client -------------------
+
+    let target_height = Height::new(0, 10).unwrap();
+
+    let resp = fxt.update_client(deps.as_mut(), target_height).unwrap();
+
+    // ------------------- Check response -------------------
+
+    assert_eq!(0, resp.messages.len());
+
+    let contract_result: ContractResult = from_json(resp.data.unwrap()).unwrap();
+
+    assert_eq!(contract_result.heights, Some(vec![target_height]));
+
+    fxt.check_client_status(deps.as_ref(), Status::Active);
+}
+
+#[test]
+fn test_cw_recovery_client_ok() {
+    let mut fxt = Fixture::default();
+
+    let mut deps = mock_dependencies();
+
+    // ------------------- Create subject client -------------------
+
+    fxt.set_migration_prefix(MigrationPrefix::Subject);
+
+    fxt.create_client(deps.as_mut()).unwrap();
+
+    // ------------------- Freeze subject client -------------------
+
+    fxt.update_client_on_misbehaviour(deps.as_mut());
+
+    // ------------------- Create substitute client -------------------
+
+    fxt.set_migration_prefix(MigrationPrefix::Substitute);
+
+    fxt.create_client(deps.as_mut()).unwrap();
+
+    // ------------------- Recover subject client -------------------
+
+    let resp = sudo(deps.as_mut(), mock_env(), MigrateClientStoreMsg {}.into()).unwrap();
+
+    assert_eq!(0, resp.messages.len());
+
+    fxt.check_client_status(deps.as_ref(), Status::Active);
+}
+
+#[test]
+fn test_cw_client_expiry() {
+    let fxt = Fixture::default();
+
+    let mut deps = mock_dependencies();
+
+    // ------------------- Create client -------------------
+
+    fxt.create_client(deps.as_mut()).unwrap();
+
+    // ------------------- Expire client -------------------
+
+    std::thread::sleep(Duration::from_millis(1200));
+
+    // ------------------- Try update client -------------------
+
+    let target_height = Height::new(0, 10).unwrap();
+
+    let client_message = fxt.dummy_client_message(target_height);
+
+    let resp = fxt.query(
+        deps.as_ref(),
+        VerifyClientMessageRaw {
+            client_message: client_message.clone(),
+        }
+        .into(),
+    );
+
+    assert!(resp.is_err());
+
+    // ------------------- Check client status -------------------
+
+    fxt.check_client_status(deps.as_ref(), Status::Expired);
+}
diff --git a/crates/ibc/tests/support/query/serialization/client_state.json b/tests-integration/tests/data/json/client_state.json
similarity index 100%
rename from crates/ibc/tests/support/query/serialization/client_state.json
rename to tests-integration/tests/data/json/client_state.json
diff --git a/crates/ibc/tests/support/query/serialization/client_state_proof.json b/tests-integration/tests/data/json/client_state_proof.json
similarity index 100%
rename from crates/ibc/tests/support/query/serialization/client_state_proof.json
rename to tests-integration/tests/data/json/client_state_proof.json
diff --git a/crates/ibc/tests/support/query/serialization/consensus_state.json b/tests-integration/tests/data/json/consensus_state.json
similarity index 100%
rename from crates/ibc/tests/support/query/serialization/consensus_state.json
rename to tests-integration/tests/data/json/consensus_state.json
diff --git a/crates/ibc/tests/support/query/serialization/consensus_state_proof.json b/tests-integration/tests/data/json/consensus_state_proof.json
similarity index 100%
rename from crates/ibc/tests/support/query/serialization/consensus_state_proof.json
rename to tests-integration/tests/data/json/consensus_state_proof.json
diff --git a/tests-integration/tests/mod.rs b/tests-integration/tests/mod.rs
new file mode 100644
index 000000000..d9b64093d
--- /dev/null
+++ b/tests-integration/tests/mod.rs
@@ -0,0 +1,12 @@
+#![deny(
+    warnings,
+    trivial_casts,
+    trivial_numeric_casts,
+    unused_import_braces,
+    unused_qualifications,
+    rust_2018_idioms
+)]
+pub mod applications;
+pub mod clients;
+pub mod core;
+pub mod cosmwasm;