chore: review fixes

Signed-off-by: aeryz <[email protected]>
unionlabs · Jan 8, 2025 · 588e8bf · 588e8bf
1 parent d8b1693
commit 588e8bf
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 131 deletions.
diff --git a/cosmwasm/ibc-union/core/light-client-interface/src/lib.rs b/cosmwasm/ibc-union/core/light-client-interface/src/lib.rs
@@ -22,8 +22,8 @@ pub mod msg;
 pub mod state;
 
 // These are only used for `key` calculation. We don't want this crate to depend on `ibc-union`.
-const CLIENT_STATES: Map<u32, Binary> = Map::new("client_states");
-const CLIENT_CONSENSUS_STATES: Map<(u32, u64), Binary> = Map::new("client_consensus_states");
+pub const CLIENT_STATES: Map<u32, Binary> = Map::new("client_states");
+pub const CLIENT_CONSENSUS_STATES: Map<(u32, u64), Binary> = Map::new("client_consensus_states");
 const CLIENT_IMPLS: Map<u32, Addr> = Map::new("client_impls");
 const QUERY_STORE: Item<Binary> = Item::new("query_store");
 

diff --git a/cosmwasm/ibc-union/light-clients/ethereum/src/contract.rs b/cosmwasm/ibc-union/light-clients/ethereum/src/contract.rs
@@ -4,14 +4,13 @@ use cosmwasm_std::{
     from_json, to_json_binary, Binary, CosmosMsg, Deps, DepsMut, Env, MessageInfo, Response,
     StdResult, SubMsg,
 };
-use ethereum_light_client_types::{ClientState, ConsensusState};
+use ethereum_light_client_types::ClientState;
 use ibc_union_light_client::{
     msg::{InstantiateMsg, QueryMsg},
     read_consensus_state,
     state::IBC_HOST,
-    IbcClientError, CLIENT_CONSENSUS_STATES, CLIENT_STATES,
+    IbcClientError, CLIENT_STATES,
 };
-use ibc_union_msg::module::IbcUnionMsg;
 use serde::{Deserialize, Serialize};
 use unionlabs::{
     encoding::{Bincode, EncodeAs, EthAbi},

diff --git a/lib/cometbls-light-client-types/src/client_state.rs b/lib/cometbls-light-client-types/src/client_state.rs
@@ -29,8 +29,6 @@ pub struct ClientState {
 
 #[cfg(feature = "proto")]
 pub mod proto {
-    use std::array::TryFromSliceError;
-
     use unionlabs::{
         errors::{InvalidLength, MissingField},
         impl_proto_via_try_from_into,
@@ -54,14 +52,12 @@ pub mod proto {
         }
     }
 
-    #[derive(Debug, Clone, thiserror::Error)]
+    #[derive(Debug, PartialEq, Clone, thiserror::Error)]
     pub enum Error {
         #[error(transparent)]
         MissingField(#[from] MissingField),
         #[error("invalid chain_id")]
         ChainId(#[from] InvalidLength),
-        #[error("invalid contract address")]
-        ContractAddress(#[source] TryFromSliceError),
     }
 
     impl TryFrom<protos::union::ibc::lightclients::cometbls::v1::ClientState> for ClientState {

diff --git a/lib/tendermint-light-client-types/src/client_state.rs b/lib/tendermint-light-client-types/src/client_state.rs
@@ -102,7 +102,7 @@ pub mod proto {
                     .collect::<Result<Vec<_>, _>>()
                     .map_err(Error::ProofSpecs)?,
                 upgrade_path: value.upgrade_path,
-                // // FIXME: we need to define the tm proto ourself and regenerate
+                // contract address is not needed for native impl which uses proto
                 contract_address: H256::default(),
             })
         }

diff --git a/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos.rs b/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos.rs
diff --git a/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos/client_state.rs b/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos/client_state.rs
diff --git a/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos/consensus_state.rs b/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos/consensus_state.rs
diff --git a/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos/header.rs b/lib/unionlabs/src/ibc/lightclients/evm_in_cosmos/header.rs
diff --git a/voyager/modules/client/state-lens/evm/src/main.rs b/voyager/modules/client/state-lens/evm/src/main.rs
@@ -79,16 +79,9 @@ impl ClientModule for Module {
     async fn new(_: Self::Config, info: ClientModuleInfo) -> Result<Self, BoxDynError> {
         info.ensure_client_type(ClientType::STATE_LENS_EVM)?;
         info.ensure_consensus_type(ConsensusType::ETHEREUM)?;
-        // TODO(aeryz): impl a nice combinator
-        if info
-            .ensure_ibc_interface(IbcInterface::IBC_SOLIDITY)
-            .is_err()
-            && info
-                .ensure_ibc_interface(IbcInterface::IBC_COSMWASM)
-                .is_err()
-        {
-            panic!("no no no")
-        }
+        info.ensure_ibc_interface(IbcInterface::IBC_SOLIDITY)
+            .or(info.ensure_ibc_interface(IbcInterface::IBC_COSMWASM))?;
+
         Ok(Self {
             ibc_interface: SupportedIbcInterface::try_from(info.ibc_interface.to_string())?,
         })
@@ -279,9 +272,9 @@ impl ClientModuleServer for Module {
                 None::<()>,
             )
         })?;
-        // TODO: extract to unionlabs? this is MPT proofs encoding for EVM
-        // the solidity MPT verifier expects the proof RLP nodes to be serialized in sequence
         match self.ibc_interface {
+            // TODO: extract to unionlabs? this is MPT proofs encoding for EVM
+            // the solidity MPT verifier expects the proof RLP nodes to be serialized in sequence
             SupportedIbcInterface::IbcSolidity => Ok(proof.proof.into_iter().flatten().collect()),
             SupportedIbcInterface::IbcCosmwasm => Ok(proof.encode_as::<Bincode>().into()),
         }