informalsystems · soareschen · Oct 21, 2024 · Sep 30, 2024 · Sep 30, 2024 · Sep 30, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## v0.2.0 (pre-release)
 
+-  Implement abstract and mock IBC v2 components - [#445](https://github.com/informalsystems/hermes-sdk/pull/445)
+  - Rename `DelegateTo` to `UseDelegate`.
+  - Move the following chain trait types to `hermes-chain-type-components`: `HasAddressType`, `HasAmountType`,
+    `HasDenomType`, `HasCommitmentPrefixType`.
+
 -  CGP Refactoring [#440](https://github.com/informalsystems/hermes-sdk/pull/440)
     - Update `cgp` version to include the addition of `cgp-type`. [cgp#23](https://github.com/contextgeneric/cgp/pull/23)
     - Use `DelegateTo` from `cgp-component` instead of custom constructs to implement delegated chain implementations.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,6 +53,10 @@ members = [
 
     "tools/integration-test",
     "tools/test-framework",
+
+    "crates/ibc/ibc-components",
+    "crates/ibc/ibc-token-transfer-components",
+    "crates/ibc/ibc-mock-chain",
 ]
 
 [workspace.package]
@@ -157,6 +161,10 @@ hermes-wasm-test-components             = { version = "0.1.0" }
 hermes-solomachine-chain-components     = { version = "0.1.0" }
 hermes-solomachine-relayer              = { version = "0.1.0" }
 
+hermes-ibc-components                   = { version = "0.1.0" }
+hermes-ibc-token-transfer-components    = { version = "0.1.0" }
+hermes-ibc-mock-chain                   = { version = "0.1.0" }
+
 [patch.crates-io]
 cgp                         = { git = "https://github.com/contextgeneric/cgp.git" }
 cgp-core                    = { git = "https://github.com/contextgeneric/cgp.git" }
@@ -219,3 +227,7 @@ hermes-wasm-test-components         = { path = "./crates/wasm/wasm-test-componen
 
 hermes-solomachine-chain-components = { path = "./crates/solomachine/solomachine-chain-components" }
 hermes-solomachine-relayer          = { path = "./crates/solomachine/solomachine-relayer" }
+
+hermes-ibc-components                   = { path = "./crates/ibc/ibc-components" }
+hermes-ibc-token-transfer-components    = { path = "./crates/ibc/ibc-token-transfer-components" }
+hermes-ibc-mock-chain                   = { path = "./crates/ibc/ibc-mock-chain" }
diff --git a/crates/chain/chain-components/src/traits/commitment_prefix.rs b/crates/chain/chain-components/src/traits/commitment_prefix.rs
@@ -1,5 +1,4 @@
 use cgp::prelude::*;
-
 pub use hermes_chain_type_components::traits::types::commitment_prefix::*;
 
 #[derive_component(IbcCommitmentPrefixGetterComponent, IbcCommitmentPrefixGetter<Chain>)]

diff --git a/crates/chain/chain-components/src/traits/message_builders/channel_handshake.rs b/crates/chain/chain-components/src/traits/message_builders/channel_handshake.rs
@@ -1,4 +1,4 @@
-use cgp::core::component::DelegateTo;
+use cgp::core::component::UseDelegate;
 use cgp::prelude::*;
 
 use crate::traits::types::channel::{
@@ -70,7 +70,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ChannelOpenInitMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasInitChannelOptionsType<Counterparty> + HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasIbcChainTypes<Chain>,
@@ -94,7 +94,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ChannelOpenTryMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasChannelOpenTryPayloadType<Chain> + HasIbcChainTypes<Chain>,
@@ -120,7 +120,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ChannelOpenAckMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasChannelOpenAckPayloadType<Chain> + HasIbcChainTypes<Chain>,
@@ -146,7 +146,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate>
-    ChannelOpenConfirmMessageBuilder<Chain, Counterparty> for DelegateTo<Components>
+    ChannelOpenConfirmMessageBuilder<Chain, Counterparty> for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasChannelOpenConfirmPayloadType<Chain> + HasIbcChainTypes<Chain>,

diff --git a/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs b/crates/chain/chain-components/src/traits/message_builders/connection_handshake.rs
@@ -1,4 +1,4 @@
-use cgp::core::component::DelegateTo;
+use cgp::core::component::UseDelegate;
 use cgp::prelude::*;
 
 use crate::traits::types::connection::{
@@ -70,7 +70,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate>
-    ConnectionOpenInitMessageBuilder<Chain, Counterparty> for DelegateTo<Components>
+    ConnectionOpenInitMessageBuilder<Chain, Counterparty> for UseDelegate<Components>
 where
     Chain:
         HasInitConnectionOptionsType<Counterparty> + HasIbcChainTypes<Counterparty> + HasErrorType,
@@ -97,7 +97,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ConnectionOpenTryMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasConnectionOpenTryPayloadType<Chain> + HasIbcChainTypes<Chain>,
@@ -123,7 +123,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ConnectionOpenAckMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasConnectionOpenAckPayloadType<Chain> + HasIbcChainTypes<Chain>,
@@ -147,7 +147,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate>
-    ConnectionOpenConfirmMessageBuilder<Chain, Counterparty> for DelegateTo<Components>
+    ConnectionOpenConfirmMessageBuilder<Chain, Counterparty> for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasConnectionOpenConfirmPayloadType<Chain> + HasIbcChainTypes<Chain>,

diff --git a/crates/chain/chain-components/src/traits/message_builders/create_client.rs b/crates/chain/chain-components/src/traits/message_builders/create_client.rs
@@ -1,4 +1,4 @@
-use cgp::core::component::DelegateTo;
+use cgp::core::component::UseDelegate;
 use cgp::prelude::*;
 
 use crate::traits::types::create_client::{
@@ -21,7 +21,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> CreateClientMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasCreateClientMessageOptionsType<Counterparty> + HasMessageType + HasErrorType,
     Counterparty: HasCreateClientPayloadType<Chain>,

diff --git a/crates/chain/chain-components/src/traits/message_builders/update_client.rs b/crates/chain/chain-components/src/traits/message_builders/update_client.rs
@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 
-use cgp::core::component::DelegateTo;
+use cgp::core::component::UseDelegate;
 use cgp::prelude::*;
 
 use crate::traits::types::ibc::HasIbcChainTypes;
@@ -21,7 +21,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> UpdateClientMessageBuilder<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasUpdateClientPayloadType<Chain>,

diff --git a/crates/chain/chain-components/src/traits/queries/channel_end.rs b/crates/chain/chain-components/src/traits/queries/channel_end.rs
@@ -52,7 +52,7 @@ where
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         writeln!(
             f,
-            "channel not found with channel id {}, port id {}, height {}",
+            "channel not found with channel id {:?}, port id {}, height {}",
             self.channel_id, self.port_id, self.height,
         )?;
 

diff --git a/crates/chain/chain-components/src/traits/queries/client_state.rs b/crates/chain/chain-components/src/traits/queries/client_state.rs
@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 
-use cgp::core::component::DelegateTo;
+use cgp::core::component::UseDelegate;
 use cgp::prelude::*;
 
 use crate::traits::queries::chain_status::CanQueryChainStatus;
@@ -138,7 +138,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ClientStateQuerier<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasClientStateType<Chain>,
@@ -155,7 +155,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> ClientStateWithProofsQuerier<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasCommitmentProofType + HasErrorType,
     Counterparty: HasClientStateType<Chain>,
@@ -172,7 +172,7 @@ where
 }
 
 impl<Chain, Counterparty, Components, Delegate> AllClientStatesQuerier<Chain, Counterparty>
-    for DelegateTo<Components>
+    for UseDelegate<Components>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
     Counterparty: HasClientStateType<Chain>,