Crates reorganization (#184)

* Reorganize crates directories * Remove unused dependencies * Fix Nix build * Fix formatting of .toml files
informalsystems · Jun 21, 2024 · 83b5c91 · 83b5c91
1 parent 200e831
commit 83b5c91
Show file tree

Hide file tree

Showing 118 changed files with 47 additions and 36 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,9 +1,12 @@
 [patch.crates-io]
 
-sov-ibc                     = { path = "modules/sov-ibc" }
-sov-ibc-transfer            = { path = "modules/sov-ibc-transfer" }
-sov-consensus-state-tracker = { path = "modules/sov-consensus-state-tracker" }
-sov-celestia-client         = { path = "clients/sov-celestia" }
+sov-ibc-proto               = { path = "crates/proto/sov-ibc-proto" }
+sov-client-types            = { path = "crates/clients/sov-client-types" }
+sov-celestia-client         = { path = "crates/clients/sov-celestia-client" }
+sov-celestia-client-types   = { path = "crates/clients/sov-celestia-client-types" }
+sov-ibc                     = { path = "crates/modules/sov-ibc" }
+sov-ibc-transfer            = { path = "crates/modules/sov-ibc-transfer" }
+sov-consensus-state-tracker = { path = "crates/modules/sov-consensus-state-tracker" }
 
 ibc                   = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
 ibc-core              = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
@@ -17,7 +20,7 @@ ibc-primitives        = { git = "https://github.com/cosmos/ibc-rs.git", branch =
 ibc-query             = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
 ibc-testkit           = { git = "https://github.com/cosmos/ibc-rs.git", branch = "rano/downgrade-borsh" }
 
-cosmrs         = { git = "https://github.com/cosmos/cosmos-rust.git", rev = "ced74a7" }
+cosmrs         = { git = "https://github.com/cosmos/cosmos-rust.git", rev = "4b1332e" }
 basecoin       = { git = "https://github.com/informalsystems/basecoin-rs.git", branch = "rano/sov-support" }
 basecoin-store = { git = "https://github.com/informalsystems/basecoin-rs.git", branch = "rano/sov-support" }
 jmt            = { git = "https://github.com/penumbra-zone/jmt.git", rev = "1d007e11cb68aa5ca13e9a5af4a12e6439d5f7b6" }

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,16 +1,16 @@
 [workspace]
 resolver = "2"
 members = [
-  "proto",
-  "proto/compiler",
-  "clients/sov-types",
-  "clients/sov-celestia/types",
-  "clients/sov-celestia",
-  "clients/sov-celestia/cw-contract",
-  "modules/sov-ibc-transfer",
-  "modules/sov-ibc",
-  "modules/sov-consensus-state-tracker",
-  "mocks",
+  "crates/proto/sov-ibc-proto",
+  "crates/proto/sov-ibc-proto-compiler",
+  "crates/clients/sov-client-types",
+  "crates/clients/sov-celestia-client",
+  "crates/clients/sov-celestia-client-types",
+  "crates/clients/sov-celestia-client-cw",
+  "crates/modules/sov-ibc",
+  "crates/modules/sov-ibc-transfer",
+  "crates/modules/sov-consensus-state-tracker",
+  "crates/test/sov-ibc-mocks",
 ]
 
 exclude = [
@@ -46,6 +46,15 @@ semicolon_if_nothing_returned = "deny"
 uninlined_format_args         = "deny"
 
 [workspace.dependencies]
+
+sov-ibc-proto               = { version = "0.1.0" }
+sov-client-types            = { version = "0.1.0" }
+sov-celestia-client         = { version = "0.1.0", default-features = false }
+sov-celestia-client-types   = { version = "0.1.0", default-features = false }
+sov-ibc                     = { version = "0.1.0" }
+sov-ibc-transfer            = { version = "0.1.0" }
+sov-consensus-state-tracker = { version = "0.1.0" }
+
 # external dependencies
 anyhow      = "1.0.68"
 base64      = { version = "0.21", default-features = false }
@@ -105,3 +114,5 @@ sov-kernels                = { version = "0.3.0" }
 sov-mock-zkvm              = { version = "0.3.0" }
 sov-prover-storage-manager = { version = "0.3.0" }
 const-rollup-config        = { version = "0.3.0" }
+
+# Note: the `[patch.crates-io]` section is placed at `./cargo/config.toml`
diff --git a/ci/risc0-check/methods/guest/Cargo.toml b/ci/risc0-check/methods/guest/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 [workspace]
 
 [dependencies]
-sov-ibc             = { path = "../../../../modules/sov-ibc" }
-sov-ibc-transfer    = { path = "../../../../modules/sov-ibc-transfer" }
-sov-celestia-client = { path = "../../../../clients/sov-celestia" }
+sov-ibc             = { path = "../../../../crates/modules/sov-ibc" }
+sov-ibc-transfer    = { path = "../../../../crates/modules/sov-ibc-transfer" }
+sov-celestia-client = { path = "../../../../crates/clients/sov-celestia-client" }
 risc0-zkvm          = { version = "0.20.1", default-features = false, features = [ "std" ] }
diff --git a/clients/README.md → crates/clients/README.md b/clients/README.md → crates/clients/README.md
diff --git a/clients/sov-celestia/cw-contract/Cargo.toml → ...clients/sov-celestia-client-cw/Cargo.toml b/clients/sov-celestia/cw-contract/Cargo.toml → ...clients/sov-celestia-client-cw/Cargo.toml
@@ -20,7 +20,7 @@ crate-type = [ "cdylib", "rlib" ]
 # ibc dependencies
 ibc-core            = { workspace = true }
 ibc-client-cw       = { workspace = true }
-sov-celestia-client = { path = "./../", default-features = false, features = [ "serde" ] }
+sov-celestia-client = { workspace = true, default-features = false, features = [ "serde" ] }
 
 # cosmwasm dependencies
 ### Note: Kept at the following version to match the CosmWasm module version
@@ -32,7 +32,7 @@ cosmwasm-std    = "2.0.4"
 [dev-dependencies]
 cosmwasm-vm           = "2.0.4"
 ibc-client-tendermint = { workspace = true }
-sov-celestia-client   = { path = "./../", default-features = false, features = [ "test-util" ] }
+sov-celestia-client   = { workspace = true, default-features = false, features = [ "test-util" ] }
 tendermint-testgen    = { workspace = true }
 
 [features]

diff --git a/...v-celestia/cw-contract/src/client_type.rs → ...sov-celestia-client-cw/src/client_type.rs b/...v-celestia/cw-contract/src/client_type.rs → ...sov-celestia-client-cw/src/client_type.rs
diff --git a/...ov-celestia/cw-contract/src/entrypoint.rs → .../sov-celestia-client-cw/src/entrypoint.rs b/...ov-celestia/cw-contract/src/entrypoint.rs → .../sov-celestia-client-cw/src/entrypoint.rs
diff --git a/clients/sov-celestia/cw-contract/src/lib.rs → ...clients/sov-celestia-client-cw/src/lib.rs b/clients/sov-celestia/cw-contract/src/lib.rs → ...clients/sov-celestia-client-cw/src/lib.rs
diff --git a/...celestia/cw-contract/src/tests/fixture.rs → ...v-celestia-client-cw/src/tests/fixture.rs b/...celestia/cw-contract/src/tests/fixture.rs → ...v-celestia-client-cw/src/tests/fixture.rs
diff --git a/...sov-celestia/cw-contract/src/tests/mod.rs → ...s/sov-celestia-client-cw/src/tests/mod.rs b/...sov-celestia/cw-contract/src/tests/mod.rs → ...s/sov-celestia-client-cw/src/tests/mod.rs
diff --git a/clients/sov-celestia/types/Cargo.toml → ...ents/sov-celestia-client-types/Cargo.toml b/clients/sov-celestia/types/Cargo.toml → ...ents/sov-celestia-client-types/Cargo.toml
@@ -31,8 +31,8 @@ typed-builder = { version = "0.18.0", optional = true }
 ibc-core              = { workspace = true }
 ibc-client-tendermint = { workspace = true }
 ibc-client-wasm-types = { workspace = true, features = [ "cosmwasm" ], optional = true }
-sov-client-types      = { path = "./../../sov-types" }
-sov-ibc-proto         = { path = "./../../../proto" }
+sov-client-types      = { workspace = true }
+sov-ibc-proto         = { workspace = true }
 
 # DA layer dependencies
 tendermint                       = { workspace = true }

diff --git a/...lestia/types/src/client_message/header.rs → ...client-types/src/client_message/header.rs b/...lestia/types/src/client_message/header.rs → ...client-types/src/client_message/header.rs
diff --git a/.../types/src/client_message/misbehaviour.rs → ...-types/src/client_message/misbehaviour.rs b/.../types/src/client_message/misbehaviour.rs → ...-types/src/client_message/misbehaviour.rs
diff --git a/...-celestia/types/src/client_message/mod.rs → ...ia-client-types/src/client_message/mod.rs b/...-celestia/types/src/client_message/mod.rs → ...ia-client-types/src/client_message/mod.rs
diff --git a/...estia/types/src/client_state/da_params.rs → ...lient-types/src/client_state/da_params.rs b/...estia/types/src/client_state/da_params.rs → ...lient-types/src/client_state/da_params.rs
diff --git a/...stia/types/src/client_state/definition.rs → ...ient-types/src/client_state/definition.rs b/...stia/types/src/client_state/definition.rs → ...ient-types/src/client_state/definition.rs
diff --git a/...ov-celestia/types/src/client_state/mod.rs → ...stia-client-types/src/client_state/mod.rs b/...ov-celestia/types/src/client_state/mod.rs → ...stia-client-types/src/client_state/mod.rs
diff --git a/...ia/types/src/consensus_state/da_params.rs → ...nt-types/src/consensus_state/da_params.rs b/...ia/types/src/consensus_state/da_params.rs → ...nt-types/src/consensus_state/da_params.rs
diff --git a/...a/types/src/consensus_state/definition.rs → ...t-types/src/consensus_state/definition.rs b/...a/types/src/consensus_state/definition.rs → ...t-types/src/consensus_state/definition.rs
diff --git a/...celestia/types/src/consensus_state/mod.rs → ...a-client-types/src/consensus_state/mod.rs b/...celestia/types/src/consensus_state/mod.rs → ...a-client-types/src/consensus_state/mod.rs
diff --git a/clients/sov-celestia/types/src/lib.rs → ...ents/sov-celestia-client-types/src/lib.rs b/clients/sov-celestia/types/src/lib.rs → ...ents/sov-celestia-client-types/src/lib.rs
diff --git a/clients/sov-celestia/Cargo.toml → ...es/clients/sov-celestia-client/Cargo.toml b/clients/sov-celestia/Cargo.toml → ...es/clients/sov-celestia-client/Cargo.toml
@@ -7,7 +7,7 @@ repository   = { workspace = true }
 rust-version = { workspace = true }
 version      = { workspace = true }
 keywords     = [ "rollup", "sovereign", "ibc", "light-client" ]
-readme       = "./../README.md"
+readme       = "../../README.md"
 
 description = """
     Contains the implementation of `sov-celestia` light client, and re-exports
@@ -31,7 +31,7 @@ typed-builder = { version = "0.18.0", optional = true }
 # ibc dependencies
 ibc-core                  = { workspace = true }
 ibc-client-tendermint     = { workspace = true }
-sov-celestia-client-types = { path = "./types", default-features = false }
+sov-celestia-client-types = { workspace = true, default-features = false }
 
 # DA layer dependencies
 tendermint                       = { workspace = true }

diff --git a/...s/sov-celestia/src/client_state/common.rs → ...elestia-client/src/client_state/common.rs b/...s/sov-celestia/src/client_state/common.rs → ...elestia-client/src/client_state/common.rs
diff --git a/...ov-celestia/src/client_state/execution.rs → ...stia-client/src/client_state/execution.rs b/...ov-celestia/src/client_state/execution.rs → ...stia-client/src/client_state/execution.rs
diff --git a/...celestia/src/client_state/misbehaviour.rs → ...a-client/src/client_state/misbehaviour.rs b/...celestia/src/client_state/misbehaviour.rs → ...a-client/src/client_state/misbehaviour.rs
diff --git a/clients/sov-celestia/src/client_state/mod.rs → ...v-celestia-client/src/client_state/mod.rs b/clients/sov-celestia/src/client_state/mod.rs → ...v-celestia-client/src/client_state/mod.rs
diff --git a/...elestia/src/client_state/update_client.rs → ...-client/src/client_state/update_client.rs b/...elestia/src/client_state/update_client.rs → ...-client/src/client_state/update_client.rs
diff --git a/...v-celestia/src/client_state/validation.rs → ...tia-client/src/client_state/validation.rs b/...v-celestia/src/client_state/validation.rs → ...tia-client/src/client_state/validation.rs
diff --git a/clients/sov-celestia/src/consensus_state.rs → ...ov-celestia-client/src/consensus_state.rs b/clients/sov-celestia/src/consensus_state.rs → ...ov-celestia-client/src/consensus_state.rs
diff --git a/clients/sov-celestia/src/lib.rs → ...es/clients/sov-celestia-client/src/lib.rs b/clients/sov-celestia/src/lib.rs → ...es/clients/sov-celestia-client/src/lib.rs
diff --git a/clients/sov-types/Cargo.toml → crates/clients/sov-client-types/Cargo.toml b/clients/sov-types/Cargo.toml → crates/clients/sov-client-types/Cargo.toml
@@ -30,7 +30,7 @@ typed-builder = { version = "0.18.0", optional = true }
 
 # ibc dependencies
 ibc-core      = { workspace = true }
-sov-ibc-proto = { path = "./../../proto" }
+sov-ibc-proto = { workspace = true }
 
 [features]
 default = [ "std" ]

diff --git a/clients/sov-types/src/aggregated_proof.rs → .../sov-client-types/src/aggregated_proof.rs b/clients/sov-types/src/aggregated_proof.rs → .../sov-client-types/src/aggregated_proof.rs
diff --git a/clients/sov-types/src/client_params.rs → ...nts/sov-client-types/src/client_params.rs b/clients/sov-types/src/client_params.rs → ...nts/sov-client-types/src/client_params.rs
diff --git a/clients/sov-types/src/consensus_params.rs → .../sov-client-types/src/consensus_params.rs b/clients/sov-types/src/consensus_params.rs → .../sov-client-types/src/consensus_params.rs
diff --git a/clients/sov-types/src/error.rs → crates/clients/sov-client-types/src/error.rs b/clients/sov-types/src/error.rs → crates/clients/sov-client-types/src/error.rs
diff --git a/clients/sov-types/src/lib.rs → crates/clients/sov-client-types/src/lib.rs b/clients/sov-types/src/lib.rs → crates/clients/sov-client-types/src/lib.rs
diff --git a/modules/README.md → crates/modules/README.md b/modules/README.md → crates/modules/README.md
diff --git a/...es/sov-consensus-state-tracker/Cargo.toml → ...es/sov-consensus-state-tracker/Cargo.toml b/...es/sov-consensus-state-tracker/Cargo.toml → ...es/sov-consensus-state-tracker/Cargo.toml
@@ -36,8 +36,8 @@ sov-celestia-adapter = { workspace = true, features = [ "native" ], optional = t
 sov-modules-api      = { workspace = true }
 sov-state            = { workspace = true }
 sov-rollup-interface = { workspace = true }
-sov-ibc              = { path = "../sov-ibc" }
-sov-celestia-client  = { path = "../../clients/sov-celestia" }
+sov-ibc              = { workspace = true }
+sov-celestia-client  = { workspace = true }
 
 [features]
 default = [ "mock-da" ]

diff --git a/...onsensus-state-tracker/src/celestia_da.rs → ...onsensus-state-tracker/src/celestia_da.rs b/...onsensus-state-tracker/src/celestia_da.rs → ...onsensus-state-tracker/src/celestia_da.rs
diff --git a/...es/sov-consensus-state-tracker/src/lib.rs → ...es/sov-consensus-state-tracker/src/lib.rs b/...es/sov-consensus-state-tracker/src/lib.rs → ...es/sov-consensus-state-tracker/src/lib.rs
diff --git a/...ov-consensus-state-tracker/src/mock_da.rs → ...ov-consensus-state-tracker/src/mock_da.rs b/...ov-consensus-state-tracker/src/mock_da.rs → ...ov-consensus-state-tracker/src/mock_da.rs
diff --git a/modules/sov-ibc-transfer/Cargo.toml → crates/modules/sov-ibc-transfer/Cargo.toml b/modules/sov-ibc-transfer/Cargo.toml → crates/modules/sov-ibc-transfer/Cargo.toml
diff --git a/modules/sov-ibc-transfer/src/context.rs → ...s/modules/sov-ibc-transfer/src/context.rs b/modules/sov-ibc-transfer/src/context.rs → ...s/modules/sov-ibc-transfer/src/context.rs
diff --git a/modules/sov-ibc-transfer/src/genesis.rs → ...s/modules/sov-ibc-transfer/src/genesis.rs b/modules/sov-ibc-transfer/src/genesis.rs → ...s/modules/sov-ibc-transfer/src/genesis.rs
diff --git a/modules/sov-ibc-transfer/src/lib.rs → crates/modules/sov-ibc-transfer/src/lib.rs b/modules/sov-ibc-transfer/src/lib.rs → crates/modules/sov-ibc-transfer/src/lib.rs
diff --git a/modules/sov-ibc-transfer/src/rpc.rs → crates/modules/sov-ibc-transfer/src/rpc.rs b/modules/sov-ibc-transfer/src/rpc.rs → crates/modules/sov-ibc-transfer/src/rpc.rs
diff --git a/modules/sov-ibc-transfer/src/utils.rs → crates/modules/sov-ibc-transfer/src/utils.rs b/modules/sov-ibc-transfer/src/utils.rs → crates/modules/sov-ibc-transfer/src/utils.rs
diff --git a/modules/sov-ibc/Cargo.toml → crates/modules/sov-ibc/Cargo.toml b/modules/sov-ibc/Cargo.toml → crates/modules/sov-ibc/Cargo.toml
@@ -28,14 +28,14 @@ thiserror   = { workspace = true }
 tracing     = { workspace = true }
 
 # internal dependencies
-sov-ibc-transfer = { path = "../sov-ibc-transfer" }
+sov-ibc-transfer = { workspace = true }
 
 # ibc dependencies
 ibc-core              = { workspace = true }
 ibc-app-transfer      = { workspace = true }
 ibc-client-tendermint = { workspace = true }
 ibc-query             = { workspace = true, optional = true }
-sov-celestia-client   = { path = "../../clients/sov-celestia" }
+sov-celestia-client   = { workspace = true }
 
 # enforce version so that Risc0 compiles
 ahash = "=0.8.6"

diff --git a/modules/sov-ibc/src/call.rs → crates/modules/sov-ibc/src/call.rs b/modules/sov-ibc/src/call.rs → crates/modules/sov-ibc/src/call.rs
diff --git a/modules/sov-ibc/src/clients/context.rs → ...es/modules/sov-ibc/src/clients/context.rs b/modules/sov-ibc/src/clients/context.rs → ...es/modules/sov-ibc/src/clients/context.rs
diff --git a/modules/sov-ibc/src/clients/mod.rs → crates/modules/sov-ibc/src/clients/mod.rs b/modules/sov-ibc/src/clients/mod.rs → crates/modules/sov-ibc/src/clients/mod.rs
diff --git a/modules/sov-ibc/src/codec.rs → crates/modules/sov-ibc/src/codec.rs b/modules/sov-ibc/src/codec.rs → crates/modules/sov-ibc/src/codec.rs
diff --git a/modules/sov-ibc/src/context.rs → crates/modules/sov-ibc/src/context.rs b/modules/sov-ibc/src/context.rs → crates/modules/sov-ibc/src/context.rs
diff --git a/modules/sov-ibc/src/event.rs → crates/modules/sov-ibc/src/event.rs b/modules/sov-ibc/src/event.rs → crates/modules/sov-ibc/src/event.rs
diff --git a/modules/sov-ibc/src/genesis.rs → crates/modules/sov-ibc/src/genesis.rs b/modules/sov-ibc/src/genesis.rs → crates/modules/sov-ibc/src/genesis.rs
diff --git a/modules/sov-ibc/src/lib.rs → crates/modules/sov-ibc/src/lib.rs b/modules/sov-ibc/src/lib.rs → crates/modules/sov-ibc/src/lib.rs
diff --git a/modules/sov-ibc/src/router.rs → crates/modules/sov-ibc/src/router.rs b/modules/sov-ibc/src/router.rs → crates/modules/sov-ibc/src/router.rs
diff --git a/modules/sov-ibc/src/rpc/context.rs → crates/modules/sov-ibc/src/rpc/context.rs b/modules/sov-ibc/src/rpc/context.rs → crates/modules/sov-ibc/src/rpc/context.rs
diff --git a/modules/sov-ibc/src/rpc/helpers.rs → crates/modules/sov-ibc/src/rpc/helpers.rs b/modules/sov-ibc/src/rpc/helpers.rs → crates/modules/sov-ibc/src/rpc/helpers.rs
diff --git a/modules/sov-ibc/src/rpc/methods.rs → crates/modules/sov-ibc/src/rpc/methods.rs b/modules/sov-ibc/src/rpc/methods.rs → crates/modules/sov-ibc/src/rpc/methods.rs
diff --git a/modules/sov-ibc/src/rpc/mod.rs → crates/modules/sov-ibc/src/rpc/mod.rs b/modules/sov-ibc/src/rpc/mod.rs → crates/modules/sov-ibc/src/rpc/mod.rs
diff --git a/proto/compiler/Cargo.toml → ...s/proto/sov-ibc-proto-compiler/Cargo.toml b/proto/compiler/Cargo.toml → ...s/proto/sov-ibc-proto-compiler/Cargo.toml
diff --git a/proto/compiler/IBC_GO_COMMIT → ...roto/sov-ibc-proto-compiler/IBC_GO_COMMIT b/proto/compiler/IBC_GO_COMMIT → ...roto/sov-ibc-proto-compiler/IBC_GO_COMMIT
diff --git a/proto/compiler/src/cmd.rs → ...s/proto/sov-ibc-proto-compiler/src/cmd.rs b/proto/compiler/src/cmd.rs → ...s/proto/sov-ibc-proto-compiler/src/cmd.rs
diff --git a/proto/compiler/src/main.rs → .../proto/sov-ibc-proto-compiler/src/main.rs b/proto/compiler/src/main.rs → .../proto/sov-ibc-proto-compiler/src/main.rs
diff --git a/proto/compiler/sync-protobuf.sh → ...o/sov-ibc-proto-compiler/sync-protobuf.sh b/proto/compiler/sync-protobuf.sh → ...o/sov-ibc-proto-compiler/sync-protobuf.sh
diff --git a/proto/Cargo.toml → crates/proto/sov-ibc-proto/Cargo.toml b/proto/Cargo.toml → crates/proto/sov-ibc-proto/Cargo.toml
diff --git a/proto/README.md → crates/proto/sov-ibc-proto/README.md b/proto/README.md → crates/proto/sov-ibc-proto/README.md
diff --git a/proto/definitions/buf.lock → .../proto/sov-ibc-proto/definitions/buf.lock b/proto/definitions/buf.lock → .../proto/sov-ibc-proto/definitions/buf.lock
diff --git a/proto/definitions/buf.yaml → .../proto/sov-ibc-proto/definitions/buf.yaml b/proto/definitions/buf.yaml → .../proto/sov-ibc-proto/definitions/buf.yaml
diff --git a/.../sovereign/tendermint/v1/tendermint.proto → .../sovereign/tendermint/v1/tendermint.proto b/.../sovereign/tendermint/v1/tendermint.proto → .../sovereign/tendermint/v1/tendermint.proto
diff --git a/...lightclients/sovereign/v1/sovereign.proto → ...lightclients/sovereign/v1/sovereign.proto b/...lightclients/sovereign/v1/sovereign.proto → ...lightclients/sovereign/v1/sovereign.proto
diff --git a/...efinitions/sovereign/types/v1/types.proto → ...efinitions/sovereign/types/v1/types.proto b/...efinitions/sovereign/types/v1/types.proto → ...efinitions/sovereign/types/v1/types.proto
diff --git a/proto/src/lib.rs → crates/proto/sov-ibc-proto/src/lib.rs b/proto/src/lib.rs → crates/proto/sov-ibc-proto/src/lib.rs
diff --git a/...c.lightclients.sovereign.tendermint.v1.rs → ...c.lightclients.sovereign.tendermint.v1.rs b/...c.lightclients.sovereign.tendermint.v1.rs → ...c.lightclients.sovereign.tendermint.v1.rs
diff --git a/...tclients.sovereign.tendermint.v1.serde.rs → ...tclients.sovereign.tendermint.v1.serde.rs b/...tclients.sovereign.tendermint.v1.serde.rs → ...tclients.sovereign.tendermint.v1.serde.rs
diff --git a/...rc/prost/ibc.lightclients.sovereign.v1.rs → ...rc/prost/ibc.lightclients.sovereign.v1.rs b/...rc/prost/ibc.lightclients.sovereign.v1.rs → ...rc/prost/ibc.lightclients.sovereign.v1.rs
diff --git a/...st/ibc.lightclients.sovereign.v1.serde.rs → ...st/ibc.lightclients.sovereign.v1.serde.rs b/...st/ibc.lightclients.sovereign.v1.serde.rs → ...st/ibc.lightclients.sovereign.v1.serde.rs
diff --git a/proto/src/prost/proto_descriptor.bin → ...-ibc-proto/src/prost/proto_descriptor.bin b/proto/src/prost/proto_descriptor.bin → ...-ibc-proto/src/prost/proto_descriptor.bin
diff --git a/proto/src/prost/sovereign.types.v1.rs → ...ibc-proto/src/prost/sovereign.types.v1.rs b/proto/src/prost/sovereign.types.v1.rs → ...ibc-proto/src/prost/sovereign.types.v1.rs
diff --git a/proto/src/prost/sovereign.types.v1.serde.rs → ...oto/src/prost/sovereign.types.v1.serde.rs b/proto/src/prost/sovereign.types.v1.serde.rs → ...oto/src/prost/sovereign.types.v1.serde.rs
diff --git a/mocks/Cargo.toml → crates/test/sov-ibc-mocks/Cargo.toml b/mocks/Cargo.toml → crates/test/sov-ibc-mocks/Cargo.toml
diff --git a/mocks/README.md → crates/test/sov-ibc-mocks/README.md b/mocks/README.md → crates/test/sov-ibc-mocks/README.md
diff --git a/mocks/celestia_rollup_config.toml → ...sov-ibc-mocks/celestia_rollup_config.toml b/mocks/celestia_rollup_config.toml → ...sov-ibc-mocks/celestia_rollup_config.toml
diff --git a/mocks/src/configs.rs → crates/test/sov-ibc-mocks/src/configs.rs b/mocks/src/configs.rs → crates/test/sov-ibc-mocks/src/configs.rs
diff --git a/mocks/src/cosmos/app.rs → crates/test/sov-ibc-mocks/src/cosmos/app.rs b/mocks/src/cosmos/app.rs → crates/test/sov-ibc-mocks/src/cosmos/app.rs
diff --git a/mocks/src/cosmos/builder.rs → .../test/sov-ibc-mocks/src/cosmos/builder.rs b/mocks/src/cosmos/builder.rs → .../test/sov-ibc-mocks/src/cosmos/builder.rs
diff --git a/mocks/src/cosmos/configs.rs → .../test/sov-ibc-mocks/src/cosmos/configs.rs b/mocks/src/cosmos/configs.rs → .../test/sov-ibc-mocks/src/cosmos/configs.rs
diff --git a/mocks/src/cosmos/core.rs → crates/test/sov-ibc-mocks/src/cosmos/core.rs b/mocks/src/cosmos/core.rs → crates/test/sov-ibc-mocks/src/cosmos/core.rs
diff --git a/mocks/src/cosmos/manual.rs → ...s/test/sov-ibc-mocks/src/cosmos/manual.rs b/mocks/src/cosmos/manual.rs → ...s/test/sov-ibc-mocks/src/cosmos/manual.rs
diff --git a/mocks/src/cosmos/mod.rs → crates/test/sov-ibc-mocks/src/cosmos/mod.rs b/mocks/src/cosmos/mod.rs → crates/test/sov-ibc-mocks/src/cosmos/mod.rs
diff --git a/mocks/src/cosmos/runner.rs → ...s/test/sov-ibc-mocks/src/cosmos/runner.rs b/mocks/src/cosmos/runner.rs → ...s/test/sov-ibc-mocks/src/cosmos/runner.rs
diff --git a/mocks/src/cosmos/utils.rs → ...es/test/sov-ibc-mocks/src/cosmos/utils.rs b/mocks/src/cosmos/utils.rs → ...es/test/sov-ibc-mocks/src/cosmos/utils.rs
diff --git a/mocks/src/lib.rs → crates/test/sov-ibc-mocks/src/lib.rs b/mocks/src/lib.rs → crates/test/sov-ibc-mocks/src/lib.rs
diff --git a/mocks/src/relayer/builder.rs → ...test/sov-ibc-mocks/src/relayer/builder.rs b/mocks/src/relayer/builder.rs → ...test/sov-ibc-mocks/src/relayer/builder.rs
diff --git a/mocks/src/relayer/context.rs → ...test/sov-ibc-mocks/src/relayer/context.rs b/mocks/src/relayer/context.rs → ...test/sov-ibc-mocks/src/relayer/context.rs
diff --git a/mocks/src/relayer/handle/cosmos.rs → ...ov-ibc-mocks/src/relayer/handle/cosmos.rs b/mocks/src/relayer/handle/cosmos.rs → ...ov-ibc-mocks/src/relayer/handle/cosmos.rs
diff --git a/mocks/src/relayer/handle/mod.rs → ...t/sov-ibc-mocks/src/relayer/handle/mod.rs b/mocks/src/relayer/handle/mod.rs → ...t/sov-ibc-mocks/src/relayer/handle/mod.rs
diff --git a/mocks/src/relayer/handle/rollup.rs → ...ov-ibc-mocks/src/relayer/handle/rollup.rs b/mocks/src/relayer/handle/rollup.rs → ...ov-ibc-mocks/src/relayer/handle/rollup.rs
diff --git a/mocks/src/relayer/mod.rs → crates/test/sov-ibc-mocks/src/relayer/mod.rs b/mocks/src/relayer/mod.rs → crates/test/sov-ibc-mocks/src/relayer/mod.rs
diff --git a/mocks/src/relayer/msgs/cosmos.rs → .../sov-ibc-mocks/src/relayer/msgs/cosmos.rs b/mocks/src/relayer/msgs/cosmos.rs → .../sov-ibc-mocks/src/relayer/msgs/cosmos.rs
diff --git a/mocks/src/relayer/msgs/mod.rs → ...est/sov-ibc-mocks/src/relayer/msgs/mod.rs b/mocks/src/relayer/msgs/mod.rs → ...est/sov-ibc-mocks/src/relayer/msgs/mod.rs
diff --git a/mocks/src/relayer/msgs/rollup.rs → .../sov-ibc-mocks/src/relayer/msgs/rollup.rs b/mocks/src/relayer/msgs/rollup.rs → .../sov-ibc-mocks/src/relayer/msgs/rollup.rs
diff --git a/mocks/src/relayer/relay.rs → ...s/test/sov-ibc-mocks/src/relayer/relay.rs b/mocks/src/relayer/relay.rs → ...s/test/sov-ibc-mocks/src/relayer/relay.rs
diff --git a/mocks/src/sovereign/da_service.rs → ...sov-ibc-mocks/src/sovereign/da_service.rs b/mocks/src/sovereign/da_service.rs → ...sov-ibc-mocks/src/sovereign/da_service.rs
diff --git a/mocks/src/sovereign/manual.rs → ...est/sov-ibc-mocks/src/sovereign/manual.rs b/mocks/src/sovereign/manual.rs → ...est/sov-ibc-mocks/src/sovereign/manual.rs
diff --git a/mocks/src/sovereign/mod.rs → ...s/test/sov-ibc-mocks/src/sovereign/mod.rs b/mocks/src/sovereign/mod.rs → ...s/test/sov-ibc-mocks/src/sovereign/mod.rs
diff --git a/mocks/src/sovereign/rollup.rs → ...est/sov-ibc-mocks/src/sovereign/rollup.rs b/mocks/src/sovereign/rollup.rs → ...est/sov-ibc-mocks/src/sovereign/rollup.rs
diff --git a/mocks/src/sovereign/runner.rs → ...est/sov-ibc-mocks/src/sovereign/runner.rs b/mocks/src/sovereign/runner.rs → ...est/sov-ibc-mocks/src/sovereign/runner.rs
diff --git a/mocks/src/sovereign/runtime/config.rs → ...ibc-mocks/src/sovereign/runtime/config.rs b/mocks/src/sovereign/runtime/config.rs → ...ibc-mocks/src/sovereign/runtime/config.rs
diff --git a/mocks/src/sovereign/runtime/mod.rs → ...ov-ibc-mocks/src/sovereign/runtime/mod.rs b/mocks/src/sovereign/runtime/mod.rs → ...ov-ibc-mocks/src/sovereign/runtime/mod.rs
diff --git a/mocks/src/tests/client.rs → ...es/test/sov-ibc-mocks/src/tests/client.rs b/mocks/src/tests/client.rs → ...es/test/sov-ibc-mocks/src/tests/client.rs
diff --git a/mocks/src/tests/mod.rs → crates/test/sov-ibc-mocks/src/tests/mod.rs b/mocks/src/tests/mod.rs → crates/test/sov-ibc-mocks/src/tests/mod.rs
diff --git a/mocks/src/tests/transfer.rs → .../test/sov-ibc-mocks/src/tests/transfer.rs b/mocks/src/tests/transfer.rs → .../test/sov-ibc-mocks/src/tests/transfer.rs
diff --git a/mocks/src/utils/mod.rs → crates/test/sov-ibc-mocks/src/utils/mod.rs b/mocks/src/utils/mod.rs → crates/test/sov-ibc-mocks/src/utils/mod.rs
diff --git a/mocks/src/utils/mutex.rs → crates/test/sov-ibc-mocks/src/utils/mutex.rs b/mocks/src/utils/mutex.rs → crates/test/sov-ibc-mocks/src/utils/mutex.rs
diff --git a/nix/sov-celestia-cw.nix b/nix/sov-celestia-cw.nix
@@ -48,10 +48,7 @@ let
         installPhase = ''
             mkdir -p $out $out/vendor
 
-            cp -r ${../clients} $out/clients
-            cp -r ${../modules} $out/modules
-            cp -r ${../mocks} $out/mocks
-            cp -r ${../proto} $out/proto
+            cp -r ${../crates} $out/crates
 
             cp -r ${sovereign-sdk-src} $out/vendor/sovereign-sdk
 
@@ -75,7 +72,7 @@ let
                 "risc0-cycle-utils-0.3.0" = "sha256-5dA62v1eqfyZBny4s3YlC2Tty7Yfd/OAVGfTlLBgypk=";
                 "rockbound-1.0.0" = "sha256-aDrNegRfsSwiNw4XLsE4rpUYDZn2N59UJbGZ6mpY180=";
                 "tendermint-0.32.0" = "sha256-FtY7a+hBvQryATrs3mykCWFRe8ABTT6cuf5oh9IBElQ=";
-                "cosmos-sdk-proto-0.22.0-pre" = "sha256-r7zoHmk12iTdsyJ/4rRgD5HDeDSiNcs/HlS7eGi+NbE=";
+                "cosmos-sdk-proto-0.22.0-pre" = "sha256-nRfcAbjFcvAqool+6heYK8joiU5YaSWITnO6S5MRM1E=";
             };
         };