feat(cosmwasm): add query for committed client status

0xumutkk · 0xumutkk · commit f1d7005f8b07 · 2025-07-23T14:09:27.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cosmwasm/ibc-union/core/light-client-interface/src/lib.rs b/cosmwasm/ibc-union/core/light-client-interface/src/lib.rs
@@ -8,10 +8,10 @@ use depolama::{QuerierExt, StorageExt, Store};
 use frissitheto::UpgradeError;
 use ibc_union::state::{ClientConsensusStates, ClientImpls, ClientStates, ClientStore, QueryStore};
 use ibc_union_msg::lightclient::{
-    MisbehaviourResponse, QueryMsg, Status, StorageWrites, UpdateStateResponse,
-    VerifyCreationResponse, VerifyCreationResponseEvent,
+    MisbehaviourResponse, QueryMsg, StorageWrites, UpdateStateResponse, VerifyCreationResponse,
+    VerifyCreationResponseEvent,
 };
-use ibc_union_spec::{ClientId, Timestamp};
+use ibc_union_spec::{path::Status, ClientId, Timestamp};
 use unionlabs::{
     encoding::{Decode, DecodeAs, DecodeErrorOf, Encode, EncodeAs, Encoding, EthAbi},
     primitives::Bytes,
diff --git a/cosmwasm/ibc-union/core/msg/src/query.rs b/cosmwasm/ibc-union/core/msg/src/query.rs
@@ -16,10 +16,10 @@ pub enum QueryMsg {
     GetClientState { client_id: ClientId },
     #[cfg_attr(feature = "cw-orch-interface", returns(unionlabs_primitives::Bytes))]
     GetConsensusState { client_id: ClientId, height: u64 },
-    #[cfg_attr(feature = "cw-orch-interface", returns(crate::lightclient::Status))]
+    #[cfg_attr(feature = "cw-orch-interface", returns(ibc_union_spec::path::Status))]
     GetStatus { client_id: ClientId },
-    #[cfg_attr(feature = "cw-orch-interface", returns(crate::lightclient::Status))]
-    GetCommittedStatus { client_id: ClientId, height: u64 },
+    #[cfg_attr(feature = "cw-orch-interface", returns(ibc_union_spec::path::Status))]
+    GetCommittedStatus { client_id: ClientId },
     #[cfg_attr(feature = "cw-orch-interface", returns(String))]
     GetClientType { client_id: ClientId },
     #[cfg_attr(feature = "cw-orch-interface", returns(ibc_union_spec::Connection))]
diff --git a/cosmwasm/ibc-union/core/src/contract.rs b/cosmwasm/ibc-union/core/src/contract.rs
@@ -28,8 +28,8 @@ use ibc_union_msg::{
 use ibc_union_spec::{
     path::{
         commit_packets, BatchPacketsPath, BatchReceiptsPath, ChannelPath, ClientStatePath,
-        ClientStatusPath, ConnectionPath, ConsensusStatePath, COMMITMENT_MAGIC,
-        COMMITMENT_MAGIC_ACK, Status,
+        ClientStatusPath, ConnectionPath, ConsensusStatePath, Status, COMMITMENT_MAGIC,
+        COMMITMENT_MAGIC_ACK,
     },
     Channel, ChannelId, ChannelState, ClientId, Connection, ConnectionId, ConnectionState, Packet,
     Timestamp,
@@ -2194,7 +2194,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractErr
             )?;
             Ok(to_json_binary(&status)?)
         }
-        QueryMsg::GetCommittedStatus { client_id, .. } => {
+        QueryMsg::GetCommittedStatus { client_id } => {
             let commit = read_commit(deps, &ClientStatusPath { client_id }.key());
             Ok(to_json_binary(&commit)?)
         }
diff --git a/cosmwasm/ibc-union/core/src/lib.rs b/cosmwasm/ibc-union/core/src/lib.rs
@@ -10,8 +10,7 @@ mod tests;
 
 use cosmwasm_std::{Addr, StdError};
 use frissitheto::UpgradeError;
-use ibc_union_spec::path::Status;
-use ibc_union_spec::{ChannelId, ChannelState, ClientId, ConnectionState, Timestamp};
+use ibc_union_spec::{path::Status, ChannelId, ChannelState, ClientId, ConnectionState, Timestamp};
 use thiserror::Error;
 use unionlabs::primitives::Bytes;
 
diff --git a/cosmwasm/ibc-union/lightclient/arbitrum/Cargo.toml b/cosmwasm/ibc-union/lightclient/arbitrum/Cargo.toml
@@ -24,6 +24,7 @@ ethereum-light-client-types = { workspace = true }
 frissitheto                 = { workspace = true }
 ibc-union-light-client      = { workspace = true }
 ibc-union-msg               = { workspace = true }
+ibc-union-spec              = { workspace = true }
 serde                       = { workspace = true, features = ["derive"] }
 thiserror                   = { workspace = true }
 unionlabs                   = { workspace = true, features = ["ethabi"] }
diff --git a/cosmwasm/ibc-union/lightclient/arbitrum/src/client.rs b/cosmwasm/ibc-union/lightclient/arbitrum/src/client.rs
@@ -5,7 +5,7 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use unionlabs::encoding::Bincode;
 
 use crate::errors::Error;
diff --git a/cosmwasm/ibc-union/lightclient/base/Cargo.toml b/cosmwasm/ibc-union/lightclient/base/Cargo.toml
@@ -28,6 +28,7 @@ evm-storage-verifier        = { workspace = true }
 frissitheto                 = { workspace = true }
 ibc-union-light-client      = { workspace = true }
 ibc-union-msg               = { workspace = true }
+ibc-union-spec              = { workspace = true }
 ics23                       = { workspace = true }
 serde                       = { workspace = true, features = ["derive"] }
 thiserror                   = { workspace = true }
diff --git a/cosmwasm/ibc-union/lightclient/base/src/client.rs b/cosmwasm/ibc-union/lightclient/base/src/client.rs
@@ -5,7 +5,7 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use unionlabs::encoding::Bincode;
 
 use crate::errors::Error;
diff --git a/cosmwasm/ibc-union/lightclient/berachain/Cargo.toml b/cosmwasm/ibc-union/lightclient/berachain/Cargo.toml
@@ -28,6 +28,7 @@ evm-storage-verifier         = { workspace = true }
 frissitheto                  = { workspace = true }
 ibc-union-light-client       = { workspace = true }
 ibc-union-msg                = { workspace = true }
+ibc-union-spec               = { workspace = true }
 ics23                        = { workspace = true }
 serde                        = { workspace = true, features = ["derive"] }
 tendermint-light-client      = { workspace = true, features = ["library"] }
diff --git a/cosmwasm/ibc-union/lightclient/berachain/src/client.rs b/cosmwasm/ibc-union/lightclient/berachain/src/client.rs
@@ -5,7 +5,7 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use tendermint_light_client::client::TendermintLightClient;
 use unionlabs::{
     berachain::LATEST_EXECUTION_PAYLOAD_HEADER_PREFIX,
diff --git a/cosmwasm/ibc-union/lightclient/bob/Cargo.toml b/cosmwasm/ibc-union/lightclient/bob/Cargo.toml
@@ -28,6 +28,7 @@ evm-storage-verifier        = { workspace = true }
 frissitheto                 = { workspace = true }
 ibc-union-light-client      = { workspace = true }
 ibc-union-msg               = { workspace = true }
+ibc-union-spec              = { workspace = true }
 ics23                       = { workspace = true }
 serde                       = { workspace = true, features = ["derive"] }
 thiserror                   = { workspace = true }
diff --git a/cosmwasm/ibc-union/lightclient/bob/src/client.rs b/cosmwasm/ibc-union/lightclient/bob/src/client.rs
@@ -6,7 +6,7 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use unionlabs::encoding::Bincode;
 
 use crate::errors::Error;
diff --git a/cosmwasm/ibc-union/lightclient/cometbls/src/client.rs b/cosmwasm/ibc-union/lightclient/cometbls/src/client.rs
@@ -8,8 +8,10 @@ use cosmwasm_std::{Addr, Empty};
 use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
-use ibc_union_spec::{path::IBC_UNION_COSMWASM_COMMITMENT_PREFIX, Duration, Timestamp};
+use ibc_union_spec::{
+    path::{Status, IBC_UNION_COSMWASM_COMMITMENT_PREFIX},
+    Duration, Timestamp,
+};
 use ics23::ibc_api::SDK_SPECS;
 use unionlabs::{
     encoding::Bincode,
diff --git a/cosmwasm/ibc-union/lightclient/ethereum/Cargo.toml b/cosmwasm/ibc-union/lightclient/ethereum/Cargo.toml
@@ -33,6 +33,7 @@ evm-storage-verifier        = { workspace = true }
 frissitheto                 = { workspace = true }
 ibc-union-light-client      = { workspace = true }
 ibc-union-msg               = { workspace = true }
+ibc-union-spec              = { workspace = true }
 rlp                         = { workspace = true }
 serde                       = { workspace = true, features = ["derive"] }
 thiserror                   = { workspace = true }
diff --git a/cosmwasm/ibc-union/lightclient/ethereum/src/client.rs b/cosmwasm/ibc-union/lightclient/ethereum/src/client.rs
@@ -21,7 +21,7 @@ use evm_storage_verifier::{
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use unionlabs::{
     encoding::{Bincode, DecodeAs, EncodeAs},
     ensure,
diff --git a/cosmwasm/ibc-union/lightclient/ethermint/Cargo.toml b/cosmwasm/ibc-union/lightclient/ethermint/Cargo.toml
@@ -25,6 +25,7 @@ ethermint-light-client-types  = { workspace = true, features = ["serde", "bincod
 frissitheto                   = { workspace = true }
 ibc-union-light-client        = { workspace = true }
 ibc-union-msg                 = { workspace = true }
+ibc-union-spec                = { workspace = true }
 ics23                         = { workspace = true }
 serde                         = { workspace = true, features = ["derive"] }
 tendermint-light-client       = { workspace = true, features = ["library"] }
diff --git a/cosmwasm/ibc-union/lightclient/ethermint/src/client.rs b/cosmwasm/ibc-union/lightclient/ethermint/src/client.rs
@@ -4,7 +4,7 @@ use ethermint_light_client_types::ClientState;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use ics23::ibc_api::SDK_SPECS;
 use tendermint_light_client::verifier::Ed25519Verifier;
 use tendermint_light_client_types::{ConsensusState, Header};
diff --git a/cosmwasm/ibc-union/lightclient/parlia/Cargo.toml b/cosmwasm/ibc-union/lightclient/parlia/Cargo.toml
@@ -27,6 +27,7 @@ evm-storage-verifier        = { workspace = true }
 frissitheto                 = { workspace = true }
 ibc-union-light-client      = { workspace = true }
 ibc-union-msg               = { workspace = true }
+ibc-union-spec              = { workspace = true }
 ics23                       = { workspace = true }
 parlia-light-client-types   = { workspace = true, features = ["serde", "ethabi", "bincode"] }
 parlia-types                = { workspace = true, features = ["bincode"] }
diff --git a/cosmwasm/ibc-union/lightclient/parlia/src/client.rs b/cosmwasm/ibc-union/lightclient/parlia/src/client.rs
@@ -3,7 +3,7 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use parlia_light_client_types::{ClientState, ClientStateV1, ConsensusState, Header, Misbehaviour};
 use parlia_types::Valset;
 use parlia_verifier::VerificationContext;
diff --git a/cosmwasm/ibc-union/lightclient/state-lens-ics23-ics23/src/client.rs b/cosmwasm/ibc-union/lightclient/state-lens-ics23-ics23/src/client.rs
@@ -3,8 +3,11 @@ use cosmwasm_std::{Addr, Empty};
 use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::{Status, VerifyCreationResponseEvent};
-use ibc_union_spec::{path::ConsensusStatePath, Timestamp};
+use ibc_union_msg::lightclient::VerifyCreationResponseEvent;
+use ibc_union_spec::{
+    path::{ConsensusStatePath, Status},
+    Timestamp,
+};
 use ics23::ibc_api::SDK_SPECS;
 use state_lens_ics23_ics23_light_client_types::{client_state::Extra, ClientState, ConsensusState};
 use state_lens_light_client_types::Header;
diff --git a/cosmwasm/ibc-union/lightclient/state-lens-ics23-mpt/src/client.rs b/cosmwasm/ibc-union/lightclient/state-lens-ics23-mpt/src/client.rs
@@ -4,8 +4,11 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::{Status, VerifyCreationResponseEvent};
-use ibc_union_spec::{path::ConsensusStatePath, Timestamp};
+use ibc_union_msg::lightclient::VerifyCreationResponseEvent;
+use ibc_union_spec::{
+    path::{ConsensusStatePath, Status},
+    Timestamp,
+};
 use state_lens_ics23_mpt_light_client_types::{client_state::Extra, ClientState, ConsensusState};
 use state_lens_light_client_types::Header;
 use unionlabs::{
diff --git a/cosmwasm/ibc-union/lightclient/sui/Cargo.toml b/cosmwasm/ibc-union/lightclient/sui/Cargo.toml
@@ -23,6 +23,7 @@ embed-commit           = { workspace = true }
 frissitheto            = { workspace = true }
 ibc-union-light-client = { workspace = true }
 ibc-union-msg          = { workspace = true }
+ibc-union-spec         = { workspace = true }
 serde                  = { workspace = true, features = ["derive"] }
 serde_repr             = { version = "0.1.20", optional = true }
 sui-light-client-types = { workspace = true, features = ["bincode", "ethabi", "serde"] }
diff --git a/cosmwasm/ibc-union/lightclient/sui/src/client.rs b/cosmwasm/ibc-union/lightclient/sui/src/client.rs
@@ -3,7 +3,7 @@ use depolama::{KeyCodec, Prefix, Store, ValueCodec};
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use sui_light_client_types::{
     client_state::ClientState, committee::Committee, consensus_state::ConsensusState,
     header::Header, storage_proof::StorageProof, U64,
diff --git a/cosmwasm/ibc-union/lightclient/tendermint/src/client.rs b/cosmwasm/ibc-union/lightclient/tendermint/src/client.rs
@@ -6,8 +6,7 @@ use cosmwasm_std::{Addr, Empty};
 use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
-use ibc_union_spec::path::IBC_UNION_COSMWASM_COMMITMENT_PREFIX;
+use ibc_union_spec::path::{Status, IBC_UNION_COSMWASM_COMMITMENT_PREFIX};
 use ics23::ibc_api::SDK_SPECS;
 use tendermint_light_client_types::{ClientState, ConsensusState, Header};
 use tendermint_verifier::types::{HostFns, SignatureVerifier};
diff --git a/cosmwasm/ibc-union/lightclient/trusted-mpt/Cargo.toml b/cosmwasm/ibc-union/lightclient/trusted-mpt/Cargo.toml
@@ -22,6 +22,7 @@ evm-storage-verifier           = { workspace = true }
 frissitheto                    = { workspace = true }
 ibc-union-light-client         = { workspace = true }
 ibc-union-msg                  = { workspace = true }
+ibc-union-spec                 = { workspace = true }
 rlp                            = { workspace = true }
 serde                          = { workspace = true, features = ["derive"] }
 thiserror                      = { workspace = true }
diff --git a/cosmwasm/ibc-union/lightclient/trusted-mpt/src/client.rs b/cosmwasm/ibc-union/lightclient/trusted-mpt/src/client.rs
@@ -3,7 +3,7 @@ use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
     spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_msg::lightclient::Status;
+use ibc_union_spec::path::Status;
 use trusted_mpt_light_client_types::{
     signed_data::SignedData, ClientState, ConsensusState, Header,
 };
diff --git a/lib/ibc-union-spec/Cargo.toml b/lib/ibc-union-spec/Cargo.toml
@@ -28,7 +28,7 @@ voyager-primitives = { workspace = true }
 ibc-union-spec = { workspace = true, features = ["ethabi", "schemars", "serde"] }
 
 [features]
-default = ["serde"]
+default = []
 
 bincode  = ["dep:bincode", "voyager-primitives/bincode", "unionlabs/bincode"]
 ethabi   = ["dep:alloy-sol-types", "unionlabs/ethabi"]
diff --git a/lib/ibc-union-spec/src/path.rs b/lib/ibc-union-spec/src/path.rs
@@ -3,7 +3,6 @@ use sha3::{Digest, Keccak256};
 use unionlabs::primitives::{Bytes, H256, U256};
 use voyager_primitives::IbcStorePathKey;
 
-
 #[cfg(feature = "ethabi")]
 use crate::Packet;
 use crate::{
@@ -270,17 +269,21 @@ impl IbcStorePathKey for BatchPacketsPath {
     type Value = H256;
 }
 
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, PartialEq)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[serde(deny_unknown_fields, rename_all = "snake_case")]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(
+    feature = "serde",
+    serde(rename_all = "snake_case", deny_unknown_fields)
+)]
 #[repr(u8)]
 pub enum Status {
     Active = 1,
     Expired = 2,
     Frozen = 3,
 }
 
-/// Represents the path to a client's committed status (Active, Expired, etc.)
+/// Represents the path to a client's committed [`Status`].
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
 #[cfg_attr(
@@ -305,5 +308,5 @@ impl ClientStatusPath {
 
 impl IbcStorePathKey for ClientStatusPath {
     type Spec = IbcUnion;
-    type Value = u8; // repr(u8) status stored as raw byte
+    type Value = Status;
 }
diff --git a/voyager/modules/state/cosmos-sdk-union/src/main.rs b/voyager/modules/state/cosmos-sdk-union/src/main.rs
@@ -383,14 +383,13 @@ impl Module {
     ) -> RpcResult<Option<u8>> {
         let status = self
             .query_smart::<_, u8>(
-                &ibc_union_msg::query::QueryMsg::GetStatus { client_id },
+                &ibc_union_msg::query::QueryMsg::GetCommittedStatus { client_id },
                 Some(height),
             )
             .await?;
 
         Ok(status)
     }
-
 }
 
 #[derive(Debug, thiserror::Error)]
diff --git a/voyager/modules/state/ethereum/src/main.rs b/voyager/modules/state/ethereum/src/main.rs
