From 0477eb91940a51098cc811d712bdb6ab53e1a3fd Mon Sep 17 00:00:00 2001 From: Jayden Lee <41176085+tkxkd0159@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:34:41 +0900 Subject: [PATCH] allow finschia-sdk in Hermes (#1) --- crates/relayer/src/chain/cosmos/version.rs | 10 +++++++--- scripts/remote-install | 6 ++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100755 scripts/remote-install diff --git a/crates/relayer/src/chain/cosmos/version.rs b/crates/relayer/src/chain/cosmos/version.rs index e6987eebb5..cfb3a44165 100644 --- a/crates/relayer/src/chain/cosmos/version.rs +++ b/crates/relayer/src/chain/cosmos/version.rs @@ -22,7 +22,7 @@ use ibc_proto::cosmos::base::tendermint::v1beta1::VersionInfo; /// sum: "h1:yaD4PyOx0LnyfiWasC5egg1U76lT83GRxjJjupPo7Gk=", /// }, /// ``` -const SDK_MODULE_NAME: &str = "cosmos/cosmos-sdk"; +const SDK_MODULE_NAMES: [&'static str; 2] = ["cosmos/cosmos-sdk", "Finschia/finschia-sdk"]; const IBC_GO_MODULE_NAME: &str = "cosmos/ibc-go"; const TENDERMINT_MODULE_NAME: &str = "tendermint/tendermint"; const COMET_MODULE_NAME: &str = "cometbft/cometbft"; @@ -141,9 +141,13 @@ fn parse_sdk_version(version_info: &VersionInfo) -> Result bool { + SDK_MODULE_NAMES + .iter() + .any(|sdk_module| m.path.contains(sdk_module)) + }) .ok_or_else(|| { - Error::sdk_module_not_found(SDK_MODULE_NAME.to_string(), AppInfo::from(version_info)) + Error::sdk_module_not_found(SDK_MODULE_NAMES.join(" OR "), AppInfo::from(version_info)) })?; // The raw version number has a leading 'v', trim it out; diff --git a/scripts/remote-install b/scripts/remote-install new file mode 100755 index 0000000000..d476f93877 --- /dev/null +++ b/scripts/remote-install @@ -0,0 +1,6 @@ +#!/bin/bash -e + +git clone https://github.com/Finschia/hermes.git +cd hermes +git checkout v1.8.0-fnsa +cargo install --bin hermes --locked --path ./crates/relayer-cli --force