From 2e8045154684633c2324a32b30729207240b6348 Mon Sep 17 00:00:00 2001 From: liyukun Date: Fri, 27 Oct 2023 12:53:28 +0800 Subject: [PATCH 1/3] chore: change hermes to forcerelay --- README.md | 2 +- crates/relayer-cli/build.rs | 2 +- crates/relayer-cli/src/lib.rs | 2 +- crates/relayer/src/chain/ckb4ibc.rs | 4 ++-- crates/relayer/src/keyring.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 144327a66..cc0505d22 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ $ cargo install -p ibc-relayer-cli $ forcerelay --version ``` -Forcerelay can be executed by specifying a configuration file in the command line, otherwise it will access the `~/.hermes/config.toml`. We provide a pre-generated [example](https://github.com/synapseweb3/forcerelay/blob/main/config.toml) configuration file written for Axon and CKB (Testnet). To run Forcerelay, only minimal modifications are needed to this configuration: +Forcerelay can be executed by specifying a configuration file in the command line, otherwise it will access the `~/.forcerelay/config.toml`. We provide a pre-generated [example](https://github.com/synapseweb3/forcerelay/blob/main/config.toml) configuration file written for Axon and CKB (Testnet). To run Forcerelay, only minimal modifications are needed to this configuration: ``` websocket_addr = "ws://:" diff --git a/crates/relayer-cli/build.rs b/crates/relayer-cli/build.rs index 7fdab17b0..c2a293bc6 100644 --- a/crates/relayer-cli/build.rs +++ b/crates/relayer-cli/build.rs @@ -8,7 +8,7 @@ fn main() { // outputs consistent usage and help messages. // https://github.com/informalsystems/hermes/issues/590 // Note: This can potentially break the normal cargo (or crates.io) workflow. - println!("cargo:rustc-env=CARGO_PKG_NAME=hermes"); + println!("cargo:rustc-env=CARGO_PKG_NAME=forcerelay"); println!("cargo:rustc-env=CARGO_PKG_VERSION={}", version()); } diff --git a/crates/relayer-cli/src/lib.rs b/crates/relayer-cli/src/lib.rs index 4787113d8..4f7ca1188 100644 --- a/crates/relayer-cli/src/lib.rs +++ b/crates/relayer-cli/src/lib.rs @@ -36,4 +36,4 @@ pub mod error; pub mod prelude; /// The path to the default configuration file, relative to the home directory. -pub const DEFAULT_CONFIG_PATH: &str = ".hermes/config.toml"; +pub const DEFAULT_CONFIG_PATH: &str = ".forcerelay/config.toml"; diff --git a/crates/relayer/src/chain/ckb4ibc.rs b/crates/relayer/src/chain/ckb4ibc.rs index c953c921b..aaed6ca5a 100644 --- a/crates/relayer/src/chain/ckb4ibc.rs +++ b/crates/relayer/src/chain/ckb4ibc.rs @@ -69,7 +69,7 @@ use std::sync::RwLock; use tendermint_rpc::endpoint::broadcast::tx_sync::Response; use tokio::runtime::Runtime; use tokio::sync::watch::Sender as WatchSender; -use tracing::log::{info, warn}; +use tracing::log::{error, info, warn}; use self::extractor::{extract_connections_from_tx, extract_ibc_packet_from_tx}; use self::message::{convert_msg_to_ckb_tx, CkbTxInfo, Converter, MsgToTxConverter}; @@ -372,7 +372,7 @@ impl Ckb4IbcChain { if let Ok(client_type) = self.config.lc_client_type(&client_id) { resps.push((tx, cell_input, capacity, client_type)); } else { - warn!("skip local missing client_id found on-chain: {client_id}"); + error!("skip local missing client_id found on-chain: {client_id}"); } } Ok(resps) diff --git a/crates/relayer/src/keyring.rs b/crates/relayer/src/keyring.rs index 888e47bd5..cdf997356 100644 --- a/crates/relayer/src/keyring.rs +++ b/crates/relayer/src/keyring.rs @@ -24,7 +24,7 @@ use serde::{Deserialize, Serialize}; use crate::{chain::ChainType, config::ChainConfig}; use errors::Error; -pub const KEYSTORE_DEFAULT_FOLDER: &str = ".hermes/keys/"; +pub const KEYSTORE_DEFAULT_FOLDER: &str = ".forcerelay/keys/"; pub const KEYSTORE_DISK_BACKEND: &str = "keyring-test"; pub const KEYSTORE_FILE_EXTENSION: &str = "json"; From a4cbd987a5939964391df22a0c386f3ca0bb7551 Mon Sep 17 00:00:00 2001 From: liyukun Date: Fri, 27 Oct 2023 14:23:37 +0800 Subject: [PATCH 2/3] chore: extend forcerelay-test CI run period of time --- .github/workflows/forcrerelay-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/forcrerelay-test.yaml b/.github/workflows/forcrerelay-test.yaml index ac417318c..19fd792b8 100644 --- a/.github/workflows/forcrerelay-test.yaml +++ b/.github/workflows/forcrerelay-test.yaml @@ -24,7 +24,7 @@ concurrency: jobs: forecerelay-test: runs-on: ubuntu-20.04 - timeout-minutes: 60 + timeout-minutes: 75 steps: - uses: actions/checkout@v3 - name: add test key From 6d9915b4179f9e377816d40dff793b189d3c7836 Mon Sep 17 00:00:00 2001 From: liyukun Date: Mon, 30 Oct 2023 09:02:57 +0800 Subject: [PATCH 3/3] bug: forcerelay-test in CI --- .github/workflows/forcrerelay-test.yaml | 6 +++--- crates/relayer-cli/build.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/forcrerelay-test.yaml b/.github/workflows/forcrerelay-test.yaml index 19fd792b8..07f7bf9fd 100644 --- a/.github/workflows/forcrerelay-test.yaml +++ b/.github/workflows/forcrerelay-test.yaml @@ -24,13 +24,13 @@ concurrency: jobs: forecerelay-test: runs-on: ubuntu-20.04 - timeout-minutes: 75 + timeout-minutes: 60 steps: - uses: actions/checkout@v3 - name: add test key run: | - mkdir -p ~/.hermes/keys/ibc-ckb-0/keyring-test - cp ./tools/forcerelay-test/ckb/relayer_ckb_wallet.json ~/.hermes/keys/ibc-ckb-0/keyring-test + mkdir -p ~/.forcerelay/keys/ibc-ckb-0/keyring-test + cp ./tools/forcerelay-test/ckb/relayer_ckb_wallet.json ~/.forcerelay/keys/ibc-ckb-0/keyring-test - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/crates/relayer-cli/build.rs b/crates/relayer-cli/build.rs index c2a293bc6..7fdab17b0 100644 --- a/crates/relayer-cli/build.rs +++ b/crates/relayer-cli/build.rs @@ -8,7 +8,7 @@ fn main() { // outputs consistent usage and help messages. // https://github.com/informalsystems/hermes/issues/590 // Note: This can potentially break the normal cargo (or crates.io) workflow. - println!("cargo:rustc-env=CARGO_PKG_NAME=forcerelay"); + println!("cargo:rustc-env=CARGO_PKG_NAME=hermes"); println!("cargo:rustc-env=CARGO_PKG_VERSION={}", version()); }