feat: reorganize libraries (#3347)

- rename `IbcVersionId` to `IbcSpecId` as this type no longer represents
an IBC *version*, but rather the entire specification
- clean up `ibc-solidity`, removing unused definitions and moving some
that are only used in one place into said place where they're used. this
crate now only defines the IBC stack itself, so the `ibc` module was
also inlined
- split IBC spec definitions out of `voyager-message` into their own
crates
- these crates define the interface of the individual IBC interfaces;
there are still some rough edges but this is a good start
- remove `ics24` module from `unionlabs` and move those store path
definitions into the relevant IBC spec libraries
  - TODO: move `unionlabs::id` as well
- `union-ibc` now depends on `voyager-core`. i'm not super happy about
this, but it's fine for now - i'm still working on the library design
for the IBC specs, but i will likely split them further such that
`union-ibc` can only depend on the parts it needs.

Cargo.toml

@@ -156,6 +156,9 @@ members = [
   "mpc/shared",
   "mpc/client",
   "mpc/coordinator",
+
+  "lib/ibc-union-spec",
+  "lib/ibc-classic-spec",
 ]
 
 [workspace.package]
@@ -231,6 +234,9 @@ poseidon-rs                    = { path = "lib/poseidon-rs", default-features =
 protos                         = { path = "generated/rust/protos", default-features = false }
 reconnecting-jsonrpc-ws-client = { path = "lib/reconnecting-jsonrpc-ws-client", default-features = false }
 
+ibc-classic-spec = { path = "lib/ibc-classic-spec", default-features = false }
+ibc-union-spec   = { path = "lib/ibc-union-spec", default-features = false }
+
 movement-light-client-types = { path = "lib/movement-light-client-types", default-features = false }
 
 cosmos-sdk-event = { path = "lib/cosmos-sdk-event", default-features = false }

cosmwasm/ucs01-relay/src/ibc.rs

@@ -7,7 +7,7 @@ use cosmwasm_std::{
     IbcReceiveResponse, IbcTimeout, IbcTimeoutBlock, MessageInfo, Reply, Response, SubMsgResult,
     Timestamp,
 };
-use ibc_solidity::ibc::{Channel, Packet};
+use ibc_solidity::{Channel, Packet};
 use prost::{Message, Name};
 use protos::cosmwasm::wasm::v1::MsgIbcSendResponse;
 use token_factory_api::TokenFactoryMsg;

cosmwasm/ucs01-relay/src/protocol.rs

@@ -5,7 +5,7 @@ use cosmwasm_std::{
     IbcReceiveResponse, IbcTimeout, IbcTimeoutBlock, MessageInfo, StdError, Timestamp, Uint128,
     Uint512, WasmMsg,
 };
-use ibc_solidity::ibc::{Channel, Packet};
+use ibc_solidity::{Channel, Packet};
 use sha2::{Digest, Sha256};
 use token_factory_api::TokenFactoryMsg;
 use ucs01_relay_api::{

cosmwasm/union-ibc/core/Cargo.toml

@@ -16,18 +16,19 @@ crate-type = ["cdylib", "rlib"]
 library = []
 
 [dependencies]
-alloy           = { workspace = true, features = ["sol-types"] }
-cosmwasm-schema = { workspace = true }
-cosmwasm-std    = { workspace = true, features = ["abort"] }
-cw-storage-plus = { workspace = true }
-ethabi          = { workspace = true }
-hex             = { workspace = true }
-ibc-solidity    = { workspace = true, features = ["serde"] }
-serde           = { workspace = true, features = ["derive"] }
-serde_json      = { workspace = true }
-sha2            = { workspace = true }
-sha3            = { workspace = true }
-strum           = { version = "0.26.3", features = ["derive"] }
-thiserror       = { workspace = true }
-union-ibc-msg   = { workspace = true }
-unionlabs       = { workspace = true, features = ["ethabi"] }
+alloy                    = { workspace = true, features = ["sol-types"] }
+cosmwasm-schema          = { workspace = true }
+cosmwasm-std             = { workspace = true, features = ["abort"] }
+cw-storage-plus          = { workspace = true }
+ethabi                   = { workspace = true }
+hex                      = { workspace = true }
+ibc-solidity             = { workspace = true, features = ["serde"] }
+ibc-union-spec.workspace = true
+serde                    = { workspace = true, features = ["derive"] }
+serde_json               = { workspace = true }
+sha2                     = { workspace = true }
+sha3                     = { workspace = true }
+strum                    = { version = "0.26.3", features = ["derive"] }
+thiserror                = { workspace = true }
+union-ibc-msg            = { workspace = true }
+unionlabs                = { workspace = true, features = ["ethabi"] }

cosmwasm/union-ibc/core/msg/src/module.rs

@@ -1,4 +1,4 @@
-use ibc_solidity::ibc::Packet;
+use ibc_solidity::Packet;
 use unionlabs::bytes::Bytes;
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]

cosmwasm/union-ibc/core/msg/src/msg.rs

@@ -1,4 +1,4 @@
-use ibc_solidity::ibc::Packet;
+use ibc_solidity::Packet;
 use unionlabs::bytes::Bytes;
 
 #[derive(serde::Serialize, serde::Deserialize)]
@@ -107,7 +107,7 @@ pub struct MsgChannelOpenInit {
 #[serde(deny_unknown_fields)]
 pub struct MsgChannelOpenTry {
     pub port_id: String,
-    pub channel: ibc_solidity::ibc::Channel,
+    pub channel: ibc_solidity::Channel,
     pub counterparty_version: String,
     pub proof_init: Bytes,
     pub proof_height: u64,

cosmwasm/union-ibc/core/src/contract.rs

@@ -7,7 +7,11 @@ use cosmwasm_std::{
     to_json_binary, wasm_execute, Addr, Binary, Deps, DepsMut, Env, Event, MessageInfo, Response,
 };
 use cw_storage_plus::Item;
-use ibc_solidity::ibc::{Channel, ChannelState, Connection, ConnectionState, Packet};
+use ibc_solidity::{Channel, ChannelState, Connection, ConnectionState, Packet};
+use ibc_union_spec::{
+    BatchPacketsPath, BatchReceiptsPath, ChannelPath, ClientStatePath, ConnectionPath,
+    ConsensusStatePath, COMMITMENT_MAGIC,
+};
 use serde::{Deserialize, Serialize};
 use union_ibc_msg::{
     lightclient::{QueryMsg as LightClientQuery, Status, VerifyClientMessageUpdate},
@@ -25,10 +29,6 @@ use union_ibc_msg::{
 use unionlabs::{
     ethereum::keccak256,
     hash::{hash_v2::HexPrefixed, H256},
-    ics24::ethabi::{
-        BatchPacketsPath, BatchReceiptsPath, ChannelPath, ClientStatePath, ConnectionPath,
-        ConsensusStatePath, COMMITMENT_MAGIC,
-    },
 };
 
 use crate::{

cosmwasm/union-ibc/core/src/lib.rs

@@ -4,7 +4,7 @@ pub mod contract;
 pub mod state;
 
 use cosmwasm_std::{Addr, StdError};
-use ibc_solidity::ibc::{ChannelState, ConnectionState};
+use ibc_solidity::{ChannelState, ConnectionState};
 use thiserror::Error;
 use unionlabs::bytes::Bytes;
 

cosmwasm/union-ibc/core/src/state.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeSet;
 
 use cosmwasm_std::{Addr, Binary};
 use cw_storage_plus::{Item, Map};
-use ibc_solidity::ibc::{Channel, Connection};
+use ibc_solidity::{Channel, Connection};
 
 pub const CHANNEL_OWNER: Map<u32, Addr> = Map::new("channel_owner");
 

cosmwasm/union-ibc/light-clients/arbitrum/src/errors.rs

@@ -1,6 +1,6 @@
 use ethereum_light_client::client::EthereumLightClient;
 use union_ibc_light_client::IbcClientError;
-use unionlabs::{hash::H256, ibc::core::client::height::Height, ics24::PathParseError};
+use unionlabs::{hash::H256, ibc::core::client::height::Height};
 
 use crate::client::ArbitrumLightClient;
 
@@ -22,9 +22,6 @@ pub enum Error {
     #[error("expected value ({expected}) and stored value ({stored}) don't match")]
     StoredValueMismatch { expected: H256, stored: H256 },
 
-    #[error("unable to parse ics24 path")]
-    PathParse(#[from] PathParseError),
-
     #[error("failed to verify arbitrum header: {0}")]
     HeaderVerify(#[from] arbitrum_verifier::Error),
 

lib/ibc-classic-spec/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+edition.workspace      = true
+license-file.workspace = true
+name                   = "ibc-classic-spec"
+repository.workspace   = true
+version                = "0.1.0"
+
+[dependencies]
+enumorph.workspace     = true
+macros.workspace       = true
+serde                  = { workspace = true, features = ["derive"] }
+subset-of.workspace    = true
+thiserror.workspace    = true
+tracing.workspace      = true
+unionlabs.workspace    = true
+voyager-core.workspace = true
+
+[lints]
+workspace = true