Replace remaining Felt chainID types to String

informalsystems · Jan 10, 2025 · 7ced046 · 7ced046
1 parent 70009d7
commit 7ced046
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git 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
@@ -137,22 +137,22 @@ delegate_components! {
 
 delegate_components! {
     StarknetParserComponents {
-        (QueryClientStateArgs, symbol!("chain_id")): ParseFromString<Felt>,
+        (QueryClientStateArgs, symbol!("chain_id")): ParseFromString<String>,
         (QueryClientStateArgs, symbol!("client_id")): ParseFromString<ClientId>,
         (QueryClientStateArgs, symbol!("height")): ParseFromOptionalString<u64>,
 
-        (QueryConsensusStateArgs, symbol!("chain_id")): ParseFromString<Felt>,
+        (QueryConsensusStateArgs, symbol!("chain_id")): ParseFromString<String>,
         (QueryConsensusStateArgs, symbol!("client_id")): ParseFromString<ClientId>,
         (QueryConsensusStateArgs, symbol!("query_height")): ParseFromOptionalString<u64>,
         (QueryConsensusStateArgs, symbol!("consensus_height")): ParseFromOptionalString<Height>,
 
-        (QueryChainStatusArgs, symbol!("chain_id")): ParseFromString<Felt>,
+        (QueryChainStatusArgs, symbol!("chain_id")): ParseFromString<String>,
 
-        (QueryBalanceArgs, symbol!("chain_id")): ParseFromString<Felt>,
+        (QueryBalanceArgs, symbol!("chain_id")): ParseFromString<String>,
         (QueryBalanceArgs, symbol!("address")): ParseFromString<Felt>,
         (QueryBalanceArgs, symbol!("denom")): ParseFromString<Felt>,
 
-        (UpdateClientArgs, symbol!("host_chain_id")): ParseFromString<Felt>,
+        (UpdateClientArgs, symbol!("host_chain_id")): ParseFromString<String>,
         (UpdateClientArgs, symbol!("client_id")): ParseFromString<ClientId>,
         (UpdateClientArgs, symbol!("counterparty_client_id")): ParseFromString<CosmosClientId>,
         (UpdateClientArgs, symbol!("target_height")): ParseFromOptionalString<Height>,

diff --git 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<StarknetBootstrap> 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
@@ -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<StarknetBuilder, Index<0>, 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
@@ -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<StarknetBuilder, Index<0>> for StarknetBuildComponents {
     async fn build_chain(
         build: &StarknetBuilder,
         _index: PhantomData<Index<0>>,
-        _chain_id: &Felt,
+        _chain_id: &String,
     ) -> Result<StarknetChain, HermesError> {
         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,