diff --git a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs index d840415c..b7d3ffdc 100644 --- a/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs +++ b/relayer/crates/starknet-chain-components/src/components/encoding/cairo.rs @@ -11,7 +11,7 @@ use hermes_cairo_encoding_components::strategy::ViaCairo; pub use hermes_encoding_components::traits::decode_mut::MutDecoderComponent; pub use hermes_encoding_components::traits::encode_mut::MutEncoderComponent; use ibc::core::host::types::identifiers::ChainId; -use starknet::core::types::{Felt, U256}; +use starknet::core::types::U256; use crate::types::channel_id::{ ChannelCounterparty, ChannelEnd, ChannelId, ChannelState, EncodeChannelCounterparty, diff --git a/relayer/crates/starknet-cli/src/contexts/app.rs b/relayer/crates/starknet-cli/src/contexts/app.rs index 1a7a8906..a6f9c088 100644 --- a/relayer/crates/starknet-cli/src/contexts/app.rs +++ b/relayer/crates/starknet-cli/src/contexts/app.rs @@ -137,22 +137,22 @@ delegate_components! { delegate_components! { StarknetParserComponents { - (QueryClientStateArgs, symbol!("chain_id")): ParseFromString, + (QueryClientStateArgs, symbol!("chain_id")): ParseFromString, (QueryClientStateArgs, symbol!("client_id")): ParseFromString, (QueryClientStateArgs, symbol!("height")): ParseFromOptionalString, - (QueryConsensusStateArgs, symbol!("chain_id")): ParseFromString, + (QueryConsensusStateArgs, symbol!("chain_id")): ParseFromString, (QueryConsensusStateArgs, symbol!("client_id")): ParseFromString, (QueryConsensusStateArgs, symbol!("query_height")): ParseFromOptionalString, (QueryConsensusStateArgs, symbol!("consensus_height")): ParseFromOptionalString, - (QueryChainStatusArgs, symbol!("chain_id")): ParseFromString, + (QueryChainStatusArgs, symbol!("chain_id")): ParseFromString, - (QueryBalanceArgs, symbol!("chain_id")): ParseFromString, + (QueryBalanceArgs, symbol!("chain_id")): ParseFromString, (QueryBalanceArgs, symbol!("address")): ParseFromString, (QueryBalanceArgs, symbol!("denom")): ParseFromString, - (UpdateClientArgs, symbol!("host_chain_id")): ParseFromString, + (UpdateClientArgs, symbol!("host_chain_id")): ParseFromString, (UpdateClientArgs, symbol!("client_id")): ParseFromString, (UpdateClientArgs, symbol!("counterparty_client_id")): ParseFromString, (UpdateClientArgs, symbol!("target_height")): ParseFromOptionalString, diff --git a/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs b/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs index da6566e1..a32efeeb 100644 --- a/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs +++ b/relayer/crates/starknet-integration-tests/src/contexts/bootstrap.rs @@ -138,7 +138,7 @@ impl ChainDriverBuilder for StarknetBootstrapComponents { let chain = StarknetChain { runtime: runtime.clone(), - chain_id, + chain_id: chain_id.to_string(), rpc_client, account, ibc_client_contract_address: None, diff --git a/relayer/crates/starknet-relayer/src/build/components/relay/build.rs b/relayer/crates/starknet-relayer/src/build/components/relay/build.rs index 5d49d497..9c761492 100644 --- a/relayer/crates/starknet-relayer/src/build/components/relay/build.rs +++ b/relayer/crates/starknet-relayer/src/build/components/relay/build.rs @@ -5,7 +5,6 @@ use hermes_relayer_components::build::traits::builders::relay_builder::RelayBuil use hermes_relayer_components::multi::types::index::Index; use hermes_starknet_chain_components::types::client_id::ClientId as StarknetClientId; use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId}; -use starknet::core::types::Felt; use crate::contexts::builder::{StarknetBuildComponents, StarknetBuilder}; use crate::contexts::starknet_to_cosmos_relay::StarknetToCosmosRelay; @@ -14,7 +13,7 @@ impl RelayBuilder, Index<1>> for StarknetBuildComponen async fn build_relay( build: &StarknetBuilder, _index: PhantomData<(Index<0>, Index<1>)>, - _src_chain_id: &Felt, + _src_chain_id: &String, dst_chain_id: &ChainId, src_client_id: &StarknetClientId, dst_client_id: &CosmosClientId, diff --git a/relayer/crates/starknet-relayer/src/contexts/builder.rs b/relayer/crates/starknet-relayer/src/contexts/builder.rs index 20f889a8..904621fb 100644 --- a/relayer/crates/starknet-relayer/src/contexts/builder.rs +++ b/relayer/crates/starknet-relayer/src/contexts/builder.rs @@ -26,7 +26,6 @@ use hermes_starknet_chain_context::contexts::chain::StarknetChain; use hermes_starknet_chain_context::impls::error::HandleStarknetChainError; use ibc::core::host::types::identifiers::{ChainId, ClientId as CosmosClientId}; use starknet::accounts::{ExecutionEncoding, SingleOwnerAccount}; -use starknet::core::types::Felt; use starknet::providers::jsonrpc::HttpTransport; use starknet::providers::{JsonRpcClient, Provider}; use starknet::signers::{LocalWallet, SigningKey}; @@ -89,7 +88,7 @@ impl ChainBuilder> for StarknetBuildComponents { async fn build_chain( build: &StarknetBuilder, _index: PhantomData>, - _chain_id: &Felt, + _chain_id: &String, ) -> Result { build.build_chain().await } @@ -143,7 +142,7 @@ impl StarknetBuilder { let context = StarknetChain { runtime: self.runtime.clone(), - chain_id, + chain_id: chain_id.to_string(), rpc_client, account, ibc_client_contract_address: None,