Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: complete ckb4ibc-test with embedded forcerelay-ckb-sdk #305

Merged
merged 16 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
499 changes: 355 additions & 144 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions crates/relayer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ bech32 = "0.9.1"
itertools = "0.10.5"
dirs-next = "2.0.0"
retry = { version = "2.0.0", default-features = false }
async-stream = "0.3.4"
async-stream = "0.3.5"
http = "0.2.9"
flex-error = { version = "0.4.4", default-features = false }
signature = "1.6.0"
Expand All @@ -91,15 +91,15 @@ reqwest-middleware = "0.1"
reqwest-retry = "0.1"
eyre = "0.6"
ethers = { version = "2.0.2", features = ["rustls", "ws"] }
ckb-sdk = "2.4.0"
ckb-hash = "0.106.0"
ckb-types = "0.106.0"
ckb-jsonrpc-types = "0.106.0"
ckb-sdk = "2.5.0"
ckb-hash = "0.108.0"
ckb-types = "0.108.0"
ckb-jsonrpc-types = "0.108.0"
jsonrpc-core = "18.0"
strum = { version = "0.24.1", features = ["derive"] }
lazy_static = "1.4.0"

ckb-ics-axon = { git = "https://github.com/synapseweb3/ckb-ics.git", rev = "1dc597c" }
ckb-ics-axon = { git = "https://github.com/synapseweb3/ckb-ics.git", rev = "56b09fa" }
cstr_core = "0.2.6"
rlp = "0.5.2"

Expand Down
2 changes: 1 addition & 1 deletion crates/relayer/src/chain/ckb/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ pub trait CellSearcher: CkbReader {
.objects
.into_iter()
.filter_map(|cell| {
if searched_capacity < need_capacity {
if searched_capacity < need_capacity && cell.output.type_.is_none() {
searched_capacity += Into::<u64>::into(cell.output.capacity);
Some(cell.into())
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/relayer/src/chain/ckb/sighash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// https://github.com/cryptape/kabletop-ckb-sdk/blob/master/src/ckb/transaction/genesis.rs

#[cfg(not(test))]
mod no_test {
pub mod no_test {
use super::super::prelude::CkbReader;
use crate::error::Error;
use ckb_jsonrpc_types::TransactionView;
Expand Down
Loading
Loading