feat(cosmwasm): move Status enum to types and update status commitment query

0xumutkk · 0xumutkk · commit 4cac861e2a05 · 2025-07-25T11:41:17.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
@@ -11,7 +11,7 @@ use ibc_union_msg::lightclient::{
     MisbehaviourResponse, QueryMsg, StorageWrites, UpdateStateResponse, VerifyCreationResponse,
     VerifyCreationResponseEvent,
 };
-use ibc_union_spec::{path::Status, ClientId, Timestamp};
+use ibc_union_spec::{ClientId, Status, 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(ibc_union_spec::path::Status))]
+    #[cfg_attr(feature = "cw-orch-interface", returns(ibc_union_spec::Status))]
     GetStatus { client_id: ClientId },
-    #[cfg_attr(feature = "cw-orch-interface", returns(ibc_union_spec::path::Status))]
-    GetCommittedStatus { client_id: ClientId },
+    #[cfg_attr(feature = "cw-orch-interface", returns(Option<H256>))]
+    GetStatusCommitment { 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,16 +28,16 @@ use ibc_union_msg::{
 use ibc_union_spec::{
     path::{
         commit_packets, BatchPacketsPath, BatchReceiptsPath, ChannelPath, ClientStatePath,
-        ClientStatusPath, ConnectionPath, ConsensusStatePath, Status, COMMITMENT_MAGIC,
+        ClientStatusPath, ConnectionPath, ConsensusStatePath, COMMITMENT_MAGIC,
         COMMITMENT_MAGIC_ACK,
     },
     Channel, ChannelId, ChannelState, ClientId, Connection, ConnectionId, ConnectionState, Packet,
-    Timestamp,
+    Status, Timestamp,
 };
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use unionlabs::{
     ethereum::keccak256,
-    primitives::{Bytes, H256},
+    primitives::{Bytes, H256, U256},
 };
 
 use crate::{
@@ -605,18 +605,14 @@ pub fn execute(
                     client_id: msg.client_id,
                 },
             )?;
-
-            let status_bytes = (status as u8).to_le_bytes();
-
             store_commit(
                 deps.branch(),
                 &ClientStatusPath {
                     client_id: msg.client_id,
                 }
                 .key(),
-                &commit(status_bytes),
+                &commit(U256::from(status as u32).to_le_bytes()),
             );
-
             Ok(Response::default())
         }
     }
@@ -2194,7 +2190,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractErr
             )?;
             Ok(to_json_binary(&status)?)
         }
-        QueryMsg::GetCommittedStatus { client_id } => {
+        QueryMsg::GetStatusCommitment { 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,7 +10,7 @@ mod tests;
 
 use cosmwasm_std::{Addr, StdError};
 use frissitheto::UpgradeError;
-use ibc_union_spec::{path::Status, ChannelId, ChannelState, ClientId, ConnectionState, Timestamp};
+use ibc_union_spec::{ChannelId, ChannelState, ClientId, ConnectionState, Status, 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,7 +24,6 @@ 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
@@ -3,9 +3,9 @@ use cosmwasm_std::{Addr, Empty};
 use ethereum_light_client::client::EthereumLightClient;
 use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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,7 +28,6 @@ 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
@@ -3,9 +3,9 @@ use cosmwasm_std::{Addr, Empty};
 use ethereum_light_client::client::EthereumLightClient;
 use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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,7 +28,6 @@ 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
@@ -3,9 +3,9 @@ use berachain_light_client_types::{ClientState, ConsensusState, Header};
 use cosmwasm_std::{Addr, Empty};
 use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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,7 +28,6 @@ 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
@@ -4,9 +4,9 @@ use cosmwasm_std::{Addr, Empty};
 use ethereum_light_client::client::EthereumLightClient;
 use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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,10 +8,7 @@ use cosmwasm_std::{Addr, Empty};
 use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_spec::{
-    path::{Status, IBC_UNION_COSMWASM_COMMITMENT_PREFIX},
-    Duration, Timestamp,
-};
+use ibc_union_spec::{path::IBC_UNION_COSMWASM_COMMITMENT_PREFIX, Duration, Status, 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,7 +33,6 @@ 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
@@ -19,9 +19,9 @@ use evm_storage_verifier::{
     verify_account_storage_root, verify_storage_absence, verify_storage_proof,
 };
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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,7 +25,6 @@ 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
@@ -2,9 +2,9 @@ use cometbft_types::crypto::public_key::PublicKey;
 use cosmwasm_std::{Addr, Empty};
 use ethermint_light_client_types::ClientState;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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,7 +27,6 @@ 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
@@ -1,9 +1,9 @@
 use cosmwasm_std::{Addr, Empty};
 use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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
@@ -4,10 +4,7 @@ use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
 use ibc_union_msg::lightclient::VerifyCreationResponseEvent;
-use ibc_union_spec::{
-    path::{ConsensusStatePath, Status},
-    Timestamp,
-};
+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
@@ -5,10 +5,7 @@ use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
 use ibc_union_msg::lightclient::VerifyCreationResponseEvent;
-use ibc_union_spec::{
-    path::{ConsensusStatePath, Status},
-    Timestamp,
-};
+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,7 +23,6 @@ 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
@@ -1,9 +1,9 @@
 use cosmwasm_std::{Empty, StdError};
 use depolama::{KeyCodec, Prefix, Store, ValueCodec};
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientError, StateUpdate,
 };
-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,7 +6,7 @@ use cosmwasm_std::{Addr, Empty};
 use ibc_union_light_client::{
     ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-use ibc_union_spec::path::{Status, IBC_UNION_COSMWASM_COMMITMENT_PREFIX};
+use ibc_union_spec::{path::IBC_UNION_COSMWASM_COMMITMENT_PREFIX, Status};
 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,7 +22,6 @@ 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
@@ -1,9 +1,9 @@
 use cosmwasm_std::{Addr, Empty};
 use ethereum_light_client_types::StorageProof;
 use ibc_union_light_client::{
-    spec::Timestamp, ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
+    spec::{Status, Timestamp},
+    ClientCreationResult, IbcClient, IbcClientCtx, IbcClientError, StateUpdate,
 };
-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/src/lib.rs b/lib/ibc-union-spec/src/lib.rs
@@ -14,7 +14,7 @@ pub use crate::types::{
     channel::{Channel, ChannelState},
     connection::{Connection, ConnectionState},
     packet::Packet,
-    ChannelId, ClientId, ConnectionId,
+    ChannelId, ClientId, ConnectionId, Status,
 };
 use crate::{
     datagram::{Datagram, MsgUpdateClient},
diff --git a/lib/ibc-union-spec/src/path.rs b/lib/ibc-union-spec/src/path.rs
diff --git a/lib/ibc-union-spec/src/types.rs b/lib/ibc-union-spec/src/types.rs
diff --git a/voyager/modules/state/cosmos-sdk-union/src/main.rs b/voyager/modules/state/cosmos-sdk-union/src/main.rs
diff --git a/voyager/modules/state/ethereum/src/main.rs b/voyager/modules/state/ethereum/src/main.rs
