feat: replace axon-tools & upgrade to 0.111

synapseweb3 · Oct 30, 2023 · 2aac0b7 · 2aac0b7
1 parent 6dc8eee
commit 2aac0b7
Show file tree

Hide file tree

Showing 13 changed files with 1,058 additions and 186 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/relayer-storage/Cargo.toml b/crates/relayer-storage/Cargo.toml
@@ -15,4 +15,6 @@ description  = "The storage part of SynapseWeb3 IBC Relayer"
 thiserror = "1.0.37"
 rocksdb = { package = "ckb-rocksdb", version ="=0.19.0", default-features = false, features = ["snappy"] }
 eth2_types = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6", package = "types" }
-eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
+# eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
+# eth_light_client_in_ckb-verification = { version = "0.3.0-alpha", git = "https://github.com/synapseweb3/eth-light-client-in-ckb" }
+eth_light_client_in_ckb-verification = { path = "/root/git/eth-light-client-in-ckb/verification", version = "0.2.1" }
diff --git a/crates/relayer-storage/src/error.rs b/crates/relayer-storage/src/error.rs
@@ -1,6 +1,6 @@
 use std::{fmt, result};
 
-use eth_light_client_in_ckb_verification::{mmr, molecule};
+use eth_light_client_in_ckb_verification::{molecule, mmr};
 
 use thiserror::Error;
 

diff --git a/crates/relayer-storage/src/prelude.rs b/crates/relayer-storage/src/prelude.rs
@@ -1,7 +1,7 @@
 use eth2_types::EthSpec;
 use eth_light_client_in_ckb_verification::{
-    mmr::{self, ClientRootMMR},
     types::packed,
+    mmr::{self, ClientRootMMR},
 };
 
 use crate::{
@@ -27,7 +27,11 @@ pub trait StorageWriter<S: EthSpec>: Send + Sync + Sized {
 }
 
 pub trait StorageAsMMRStore<S: EthSpec>:
-    mmr::lib::MMRStore<packed::HeaderDigest> + StorageReader<S> + StorageWriter<S> + Clone
+    mmr::lib::MMRStoreReadOps<packed::HeaderDigest>
+    + mmr::lib::MMRStoreWriteOps<packed::HeaderDigest>
+    + StorageReader<S>
+    + StorageWriter<S>
+    + Clone
 {
     /// Checks if there is any data in the MMR.
     fn is_initialized(&self) -> Result<bool> {

diff --git a/crates/relayer-storage/src/storage/mmr.rs b/crates/relayer-storage/src/storage/mmr.rs
@@ -1,13 +1,15 @@
 use eth2_types::EthSpec;
 use eth_light_client_in_ckb_verification::{
-    mmr::lib::{Error as MMRError, MMRStore, Result as MMRResult},
     types::packed,
+    mmr::lib::{
+        Error as MMRError, MMRStoreReadOps, MMRStoreWriteOps, Result as MMRResult,
+    },
 };
 
 use super::Storage;
 use crate::prelude::*;
 
-impl<S> MMRStore<packed::HeaderDigest> for Storage<S>
+impl<S> MMRStoreReadOps<packed::HeaderDigest> for Storage<S>
 where
     S: EthSpec,
 {
@@ -19,7 +21,12 @@ where
             ))
         })
     }
+}
 
+impl<S> MMRStoreWriteOps<packed::HeaderDigest> for Storage<S>
+where
+    S: EthSpec,
+{
     fn append(&mut self, pos: u64, elems: Vec<packed::HeaderDigest>) -> MMRResult<()> {
         for (offset, elem) in elems.iter().enumerate() {
             let pos: u64 = pos + (offset as u64);

diff --git a/crates/relayer-types/Cargo.toml b/crates/relayer-types/Cargo.toml
@@ -52,7 +52,9 @@ tree_hash_derive = { git = "https://github.com/synapseweb3/lighthouse", rev = "2
 thiserror = "1.0"
 ethereum-types = "0.14.1"
 hex = "0.4"
-axon-tools = { git = "https://github.com/axonweb3/axon-tools.git", branch = "main", version = "0.1.1", features = ["impl-serde", "proof"] }
+# axon-tools = { path = "/root/git/axon-tools/axon-tools", version = "0.1.1", features = ["impl-serde", "proof"] }
+# axon-tools = { git = "https://github.com/wenyuanhust/axon.git", branch = "forcerelay-test", version = "0.1.1", features = ["impl-serde", "proof"] }
+axon-tools = { path = "/root/git/axon/devtools/axon-tools", version = "0.1.1", features = ["impl-serde", "proof"] }
 strum = { version = "0.24.1", features = ["derive"] }
 
 [dependencies.tendermint]

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -32,9 +32,13 @@ eth2_types = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6
 tree_hash_derive = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" }
 tree_hash = { git = "https://github.com/synapseweb3/lighthouse", rev = "2c246d6" }
 
-eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
-eth_light_client_in_ckb-prover = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
-axon-tools = { git = "https://github.com/axonweb3/axon-tools.git", branch = "main", version = "0.1.1", features = ["impl-serde", "proof"] }
+# eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
+# eth_light_client_in_ckb-prover = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
+eth_light_client_in_ckb-verification = { path = "/root/git/eth-light-client-in-ckb/verification", version = "0.2.1" }
+eth_light_client_in_ckb-prover = { version = "0.3.0-alpha", git = "https://github.com/synapseweb3/eth-light-client-in-ckb" }
+# axon-tools = { path = "/root/git/axon-tools/axon-tools", version = "0.1.1", features = ["impl-serde", "proof"] }
+# axon-tools = { git = "https://github.com/wenyuanhust/axon.git", branch = "forcerelay-test", version = "0.1.1", features = ["impl-serde", "proof"] }
+axon-tools = { path = "/root/git/axon/devtools/axon-tools", version = "0.1.1", features = ["impl-serde", "proof"] }
 
 subtle-encoding = "0.5"
 humantime-serde = "1.1.1"
@@ -92,10 +96,10 @@ reqwest-middleware = "0.1"
 reqwest-retry = "0.1"
 eyre = "0.6"
 ethers = { version = "2.0.2", features = ["rustls", "ws"] }
-ckb-sdk = "2.5.0"
+ckb-sdk = "3.0.0"
 ckb-hash = "0.108.0"
-ckb-types = "0.108.0"
-ckb-jsonrpc-types = "0.108.0"
+ckb-types = "0.111.0"
+ckb-jsonrpc-types = "0.111.0"
 jsonrpc-core = "18.0"
 strum = { version = "0.24.1", features = ["derive"] }
 lazy_static = "1.4.0"

diff --git a/crates/relayer/src/chain/axon.rs b/crates/relayer/src/chain/axon.rs
@@ -1,6 +1,6 @@
 use std::{collections::HashMap, str::FromStr, sync::Arc, thread, time::Duration};
 
-use axon_tools::types::{AxonBlock, Proof as AxonProof, ValidatorExtend};
+use axon_tools::types::{Block as AxonBlock, Proof as AxonProof, ValidatorExtend};
 use eth2_types::Hash256;
 use k256::ecdsa::SigningKey;
 use rlp::Encodable;

diff --git a/crates/relayer/src/chain/axon/rpc.rs b/crates/relayer/src/chain/axon/rpc.rs
@@ -1,7 +1,7 @@
 use crate::error::Error;
 
 use async_trait::async_trait;
-use axon_tools::types::{AxonBlock, CkbRelatedInfo, Metadata, Proof};
+use axon_tools::types::{Block as AxonBlock, CkbRelatedInfo, Metadata, Proof};
 use ethers::types::{BlockId, BlockNumber};
 use reqwest::Client;
 use std::sync::atomic::{AtomicU64, Ordering};

diff --git a/crates/relayer/src/chain/axon/utils.rs b/crates/relayer/src/chain/axon/utils.rs
@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use axon_tools::types::{AxonBlock, Proof as AxonProof};
+use axon_tools::types::{Block as AxonBlock, Proof as AxonProof};
 use ckb_ics_axon::proof::{
     Log as CkbLog, ObjectProof, TransactionReceipt as CkbTransactionReceipt,
 };

diff --git a/crates/relayer/src/light_client/axon.rs b/crates/relayer/src/light_client/axon.rs
@@ -2,7 +2,7 @@
 
 use std::sync::Arc;
 
-use axon_tools::types::AxonHeader as AxonChainHeader;
+use axon_tools::types::Header as AxonChainHeader;
 use ethers::prelude::k256::ecdsa::SigningKey;
 use ethers::prelude::*;
 use futures::TryFutureExt;

diff --git a/tools/forcerelay-test/Cargo.toml b/tools/forcerelay-test/Cargo.toml
@@ -4,10 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dev-dependencies]
-ckb-sdk = "2.5.0"
-ckb-jsonrpc-types = "0.108.0"
-ckb-types = "0.108.0"
+ckb-sdk = "3.0.0"
+ckb-jsonrpc-types = "0.111.0"
+ckb-types = "0.111.0"
 hex = "0.4"
 
-eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
+# eth_light_client_in_ckb-verification = { version = "0.3.0-alpha", git = "https://github.com/synapseweb3/eth-light-client-in-ckb" }
+# eth_light_client_in_ckb-verification = { version = "0.2.1", git = "https://github.com/synapseweb3/eth-light-client-in-ckb", tag = "v0.2.1" }
+eth_light_client_in_ckb-verification = { path = "/root/git/eth-light-client-in-ckb/verification", version = "0.2.1" }
 relayer = { version = "*", package = "ibc-relayer", path = "../../crates/relayer" }
diff --git a/tools/ibc-test/Cargo.toml b/tools/ibc-test/Cargo.toml
@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dev-dependencies]
-ckb-sdk = "2.5.0"
-ckb-jsonrpc-types = "0.108.0"
-ckb-types = "0.108.0"
-ckb-chain-spec = "0.108.0"
+ckb-sdk = "3.0.0"
+ckb-jsonrpc-types = "0.111.0"
+ckb-types = "0.111.0"
+ckb-chain-spec = "0.111.0"
 hex = "0.4"
 eyre = "0.6.8"
 
@@ -45,7 +45,8 @@ toml_edit = "0.19.14"
 lazy_static = "1.4.0"
 ethers = { version = "2.0.2", features = ["rustls", "ws"] }
 
-forcerelay-ckb-sdk = { git = "https://github.com/synapseweb3/forcerelay-ckb-sdk", rev = "cd82be97" }
+# forcerelay-ckb-sdk = { git = "https://github.com/synapseweb3/forcerelay-ckb-sdk", rev = "cd82be97" }
+forcerelay-ckb-sdk = { path = "/root/git/forcerelay-ckb-sdk", version = "0.1.0" }
 
 [dependencies]
 bytes = "1.5.0"