feat: accomplish relay feature between Axon and Ckb

synapseweb3 · Jul 17, 2023 · d1057ee · d1057ee
1 parent 060be2f
commit d1057ee
Show file tree

Hide file tree

Showing 34 changed files with 1,007 additions and 658 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/relayer-types/src/clients/ics07_axon/client_state.rs b/crates/relayer-types/src/clients/ics07_axon/client_state.rs
@@ -4,7 +4,7 @@ use crate::{
             client_state::ClientState as Ics02ClientState, client_state::UpgradeOptions,
             client_type::ClientType, error::Error as Ics02Error,
         },
-        ics24_host::identifier::{ChainId, ClientId},
+        ics24_host::identifier::ChainId,
     },
     prelude::*,
     Height,
@@ -20,7 +20,6 @@ pub const AXON_CLIENT_STATE_TYPE_URL: &str = "/axon.client.v1.state";
 pub struct AxonClientState {
     pub chain_id: ChainId,
     pub latest_height: Height,
-    pub default_client_id: ClientId,
 }
 
 impl Ics02ClientState for AxonClientState {

diff --git a/crates/relayer-types/src/clients/ics07_ckb/client_state.rs b/crates/relayer-types/src/clients/ics07_ckb/client_state.rs
@@ -1,7 +1,7 @@
 use crate::{
     core::{
         ics02_client::{client_state::UpgradeOptions, client_type::ClientType},
-        ics24_host::identifier::{ChainId, ClientId},
+        ics24_host::identifier::ChainId,
     },
     prelude::*,
     Height,
@@ -21,7 +21,6 @@ pub const CKB_CLIENT_STATE_TYPE_URL: &str = "/ibc.lightclients.ckb.v1.ClientStat
 pub struct CkbClientState {
     pub chain_id: ChainId,
     pub latest_height: Height,
-    pub default_client_id: ClientId,
 }
 
 impl Ics02ClientState for CkbClientState {

diff --git a/crates/relayer-types/src/core/ics02_client/client_type.rs b/crates/relayer-types/src/core/ics02_client/client_type.rs
@@ -1,6 +1,7 @@
-use crate::prelude::*;
+use crate::{core::ics24_host::identifier::ClientId, prelude::*};
 use core::fmt::{Display, Error as FmtError, Formatter};
 use serde_derive::{Deserialize, Serialize};
+use strum::IntoEnumIterator;
 
 use super::error::Error;
 
@@ -26,7 +27,7 @@ pub enum ClientType {
     Ckb4Ibc = 5,
 
     #[cfg(any(test, feature = "mocks"))]
-    Mock = 9999,
+    Mock = 255,
 }
 
 impl ClientType {
@@ -71,6 +72,18 @@ impl TryFrom<u64> for ClientType {
     }
 }
 
+impl From<ClientId> for ClientType {
+    fn from(client_id: ClientId) -> Self {
+        let mut client_type = ClientType::Mock;
+        for value in ClientType::iter() {
+            if client_id.as_str().starts_with(value.as_str()) {
+                client_type = value;
+            }
+        }
+        client_type
+    }
+}
+
 impl Display for ClientType {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), FmtError> {
         write!(f, "ClientType({})", self.as_str())

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -89,7 +89,7 @@ ckb-jsonrpc-types = "0.106.0"
 jsonrpc-core = "18.0"
 strum = { version = "0.24.1", features = ["derive"] }
 
-ckb-ics-axon = {git = "https://github.com/synapseweb3/ckb-ics.git", rev = "e57a669"}
+ckb-ics-axon = {git = "https://github.com/synapseweb3/ckb-ics.git", rev = "fe67bd3"}
 cstr_core = "0.2.6"
 rlp = "0.5.2"