Merge branch 'tomas/crates-dir' (#2386)

* origin/tomas/crates-dir: `mv crates/shared crates/namada` and update paths git: ignore the old proto artifact changelog: add #2386 fix relative paths move most sub-crates into crates dir
anoma · Jan 16, 2024 · c5f8ff0 · c5f8ff0
2 parents 14b80a0 + 5e66c0b
commit c5f8ff0
Show file tree

Hide file tree

Showing 447 changed files with 89 additions and 77 deletions.
diff --git a/.changelog/unreleased/improvements/2386-crates-dir.md b/.changelog/unreleased/improvements/2386-crates-dir.md
@@ -0,0 +1,2 @@
+- Moved Rust crates into a crates sub-dir.
+  ([\#2386](https://github.com/anoma/namada/pull/2386))
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,7 @@ target/
 wasm/*.wasm
 
 # app version string file
-/apps/version.rs
+/crates/apps/version.rs
+
+# Hidden to stop from re-appearing. Moved to `tx/src/proto/generated/types.rs`.
+core/src/proto/generated/types.rs
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,38 +2,38 @@
 resolver = "2"
 
 members = [
-  "account",
-  "apps",
-  "benches",
-  "core",
-  "encoding_spec",
-  "ethereum_bridge",
-  "light_sdk",
-  "macros",
+  "crates/account",
+  "crates/apps",
+  "crates/benches",
+  "crates/core",
+  "crates/encoding_spec",
+  "crates/ethereum_bridge",
+  "crates/gas",
+  "crates/governance",
+  "crates/ibc",
+  "crates/light_sdk",
+  "crates/macros",
+  "crates/macros",
+  "crates/merkle_tree",
+  "crates/parameters",
+  "crates/proof_of_stake",
+  "crates/sdk",
+  "crates/namada",
+  "crates/shielded_token",
+  "crates/state",
+  "crates/storage",
+  "crates/test_utils",
+  "crates/tests",
+  "crates/token",
+  "crates/trans_token",
+  "crates/tx_env",
+  "crates/tx_prelude",
+  "crates/tx",
+  "crates/vm_env",
+  "crates/vote_ext",
+  "crates/vp_env",
+  "crates/vp_prelude",
   "examples",
-  "gas",
-  "governance",
-  "ibc",
-  "macros",
-  "merkle_tree",
-  "parameters",
-  "proof_of_stake",
-  "sdk",
-  "shared",
-  "shielded_token",
-  "state",
-  "storage",
-  "test_utils",
-  "tests",
-  "token",
-  "trans_token",
-  "tx",
-  "tx_env",
-  "tx_prelude",
-  "vm_env",
-  "vote_ext",
-  "vp_env",
-  "vp_prelude",
 ]
 
 # wasm packages have to be built separately

diff --git a/Makefile b/Makefile
@@ -33,11 +33,11 @@ endif
 audit-ignores += RUSTSEC-2021-0076
 
 # Workspace crates
-crates := namada_core
-crates += namada
+crates := namada
 crates += namada_account
 crates += namada_apps
 crates += namada_benchmarks
+crates += namada_core
 crates += namada_encoding_spec
 crates += namada_ethereum_bridge
 crates += namada_gas
@@ -95,7 +95,7 @@ check:
 check-mainnet:
 	$(cargo) check --workspace --features "mainnet"
 
-# Check that every crate can be built with default features and that shared crate
+# Check that every crate can be built with default features and that namada crate
 # can be built for wasm
 check-crates:
 	$(foreach p,$(crates), echo "Checking $(p)" && cargo +$(nightly) check -Z unstable-options --tests -p $(p) && ) \

diff --git a/account/Cargo.toml → crates/account/Cargo.toml b/account/Cargo.toml → crates/account/Cargo.toml
diff --git a/account/src/lib.rs → crates/account/src/lib.rs b/account/src/lib.rs → crates/account/src/lib.rs
diff --git a/account/src/storage.rs → crates/account/src/storage.rs b/account/src/storage.rs → crates/account/src/storage.rs
diff --git a/account/src/storage_key.rs → crates/account/src/storage_key.rs b/account/src/storage_key.rs → crates/account/src/storage_key.rs
diff --git a/account/src/types.rs → crates/account/src/types.rs b/account/src/types.rs → crates/account/src/types.rs
diff --git a/apps/Cargo.toml → crates/apps/Cargo.toml b/apps/Cargo.toml → crates/apps/Cargo.toml
@@ -61,7 +61,7 @@ integration = []
 
 
 [dependencies]
-namada = {path = "../shared", features = ["multicore", "http-client", "tendermint-rpc", "std"]}
+namada = {path = "../namada", features = ["multicore", "http-client", "tendermint-rpc", "std"]}
 namada_sdk = {path = "../sdk", default-features = false, features = ["wasm-runtime", "download-params", "std", "rand"]}
 namada_test_utils = {path = "../test_utils", optional = true}
 
@@ -149,7 +149,7 @@ rocksdb = { workspace = true }
 
 [dev-dependencies]
 assert_matches = "1.5.0"
-namada = {path = "../shared", default-features = false, features = ["testing", "wasm-runtime"]}
+namada = {path = "../namada", default-features = false, features = ["testing", "wasm-runtime"]}
 namada_test_utils = {path = "../test_utils"}
 bit-set.workspace = true
 proptest.workspace = true

diff --git a/apps/build.rs → crates/apps/build.rs b/apps/build.rs → crates/apps/build.rs
diff --git a/apps/proto → crates/apps/proto b/apps/proto → crates/apps/proto
diff --git a/apps/src/bin/namada-client/main.rs → crates/apps/src/bin/namada-client/main.rs b/apps/src/bin/namada-client/main.rs → crates/apps/src/bin/namada-client/main.rs
diff --git a/apps/src/bin/namada-node/cli.rs → crates/apps/src/bin/namada-node/cli.rs b/apps/src/bin/namada-node/cli.rs → crates/apps/src/bin/namada-node/cli.rs
diff --git a/apps/src/bin/namada-node/main.rs → crates/apps/src/bin/namada-node/main.rs b/apps/src/bin/namada-node/main.rs → crates/apps/src/bin/namada-node/main.rs
diff --git a/apps/src/bin/namada-relayer/main.rs → crates/apps/src/bin/namada-relayer/main.rs b/apps/src/bin/namada-relayer/main.rs → crates/apps/src/bin/namada-relayer/main.rs
diff --git a/apps/src/bin/namada-wallet/README.md → crates/apps/src/bin/namada-wallet/README.md b/apps/src/bin/namada-wallet/README.md → crates/apps/src/bin/namada-wallet/README.md
diff --git a/apps/src/bin/namada-wallet/main.rs → crates/apps/src/bin/namada-wallet/main.rs b/apps/src/bin/namada-wallet/main.rs → crates/apps/src/bin/namada-wallet/main.rs
diff --git a/apps/src/bin/namada/cli.rs → crates/apps/src/bin/namada/cli.rs b/apps/src/bin/namada/cli.rs → crates/apps/src/bin/namada/cli.rs
diff --git a/apps/src/bin/namada/main.rs → crates/apps/src/bin/namada/main.rs b/apps/src/bin/namada/main.rs → crates/apps/src/bin/namada/main.rs
diff --git a/apps/src/lib/bench_utils.rs → crates/apps/src/lib/bench_utils.rs b/apps/src/lib/bench_utils.rs → crates/apps/src/lib/bench_utils.rs
@@ -106,7 +106,7 @@ use crate::facade::tendermint_proto::google::protobuf::Timestamp;
 use crate::node::ledger::shell::Shell;
 use crate::wallet::{defaults, CliWalletUtils};
 
-pub const WASM_DIR: &str = "../wasm";
+pub const WASM_DIR: &str = "../../wasm";
 
 pub const ALBERT_PAYMENT_ADDRESS: &str = "albert_payment";
 pub const ALBERT_SPENDING_KEY: &str = "albert_spending";
@@ -571,7 +571,8 @@ impl BenchShell {
 }
 
 pub fn generate_foreign_key_tx(signer: &SecretKey) -> Tx {
-    let wasm_code = std::fs::read("../wasm_for_tests/tx_write.wasm").unwrap();
+    let wasm_code =
+        std::fs::read("../../wasm_for_tests/tx_write.wasm").unwrap();
 
     let mut tx = Tx::from_type(namada::tx::data::TxType::Decrypted(
         namada::tx::data::DecryptedTx::Decrypted,

diff --git a/apps/src/lib/cli.rs → crates/apps/src/lib/cli.rs b/apps/src/lib/cli.rs → crates/apps/src/lib/cli.rs
diff --git a/apps/src/lib/cli/api.rs → crates/apps/src/lib/cli/api.rs b/apps/src/lib/cli/api.rs → crates/apps/src/lib/cli/api.rs
diff --git a/apps/src/lib/cli/client.rs → crates/apps/src/lib/cli/client.rs b/apps/src/lib/cli/client.rs → crates/apps/src/lib/cli/client.rs
diff --git a/apps/src/lib/cli/context.rs → crates/apps/src/lib/cli/context.rs b/apps/src/lib/cli/context.rs → crates/apps/src/lib/cli/context.rs
diff --git a/apps/src/lib/cli/relayer.rs → crates/apps/src/lib/cli/relayer.rs b/apps/src/lib/cli/relayer.rs → crates/apps/src/lib/cli/relayer.rs
diff --git a/apps/src/lib/cli/utils.rs → crates/apps/src/lib/cli/utils.rs b/apps/src/lib/cli/utils.rs → crates/apps/src/lib/cli/utils.rs
diff --git a/apps/src/lib/cli/wallet.rs → crates/apps/src/lib/cli/wallet.rs b/apps/src/lib/cli/wallet.rs → crates/apps/src/lib/cli/wallet.rs
diff --git a/apps/src/lib/client/mod.rs → crates/apps/src/lib/client/mod.rs b/apps/src/lib/client/mod.rs → crates/apps/src/lib/client/mod.rs
diff --git a/apps/src/lib/client/rpc.rs → crates/apps/src/lib/client/rpc.rs b/apps/src/lib/client/rpc.rs → crates/apps/src/lib/client/rpc.rs
diff --git a/apps/src/lib/client/tx.rs → crates/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs → crates/apps/src/lib/client/tx.rs
diff --git a/apps/src/lib/client/utils.rs → crates/apps/src/lib/client/utils.rs b/apps/src/lib/client/utils.rs → crates/apps/src/lib/client/utils.rs
diff --git a/.../src/lib/config/ethereum_bridge/ledger.rs → .../src/lib/config/ethereum_bridge/ledger.rs b/.../src/lib/config/ethereum_bridge/ledger.rs → .../src/lib/config/ethereum_bridge/ledger.rs
diff --git a/apps/src/lib/config/ethereum_bridge/mod.rs → ...pps/src/lib/config/ethereum_bridge/mod.rs b/apps/src/lib/config/ethereum_bridge/mod.rs → ...pps/src/lib/config/ethereum_bridge/mod.rs
diff --git a/apps/src/lib/config/genesis.rs → crates/apps/src/lib/config/genesis.rs b/apps/src/lib/config/genesis.rs → crates/apps/src/lib/config/genesis.rs
diff --git a/apps/src/lib/config/genesis/chain.rs → crates/apps/src/lib/config/genesis/chain.rs b/apps/src/lib/config/genesis/chain.rs → crates/apps/src/lib/config/genesis/chain.rs
@@ -801,6 +801,8 @@ mod test {
     fn test_finalize_is_deterministic() {
         // Load the localnet templates
         let templates_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
             .parent()
             .unwrap()
             .join("genesis/localnet");

diff --git a/apps/src/lib/config/genesis/templates.rs → .../apps/src/lib/config/genesis/templates.rs b/apps/src/lib/config/genesis/templates.rs → .../apps/src/lib/config/genesis/templates.rs
@@ -937,6 +937,8 @@ mod tests {
     #[test]
     fn test_validate_localnet_genesis_templates() {
         let templates_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
             .parent()
             .unwrap()
             .join("genesis/localnet");
@@ -950,6 +952,8 @@ mod tests {
     #[test]
     fn test_validate_starter_genesis_templates() {
         let templates_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .parent()
+            .unwrap()
             .parent()
             .unwrap()
             .join("genesis/starter");

diff --git a/apps/src/lib/config/genesis/transactions.rs → ...ps/src/lib/config/genesis/transactions.rs b/apps/src/lib/config/genesis/transactions.rs → ...ps/src/lib/config/genesis/transactions.rs
diff --git a/apps/src/lib/config/genesis/utils.rs → crates/apps/src/lib/config/genesis/utils.rs b/apps/src/lib/config/genesis/utils.rs → crates/apps/src/lib/config/genesis/utils.rs
diff --git a/apps/src/lib/config/global.rs → crates/apps/src/lib/config/global.rs b/apps/src/lib/config/global.rs → crates/apps/src/lib/config/global.rs
diff --git a/apps/src/lib/config/mod.rs → crates/apps/src/lib/config/mod.rs b/apps/src/lib/config/mod.rs → crates/apps/src/lib/config/mod.rs
diff --git a/apps/src/lib/config/utils.rs → crates/apps/src/lib/config/utils.rs b/apps/src/lib/config/utils.rs → crates/apps/src/lib/config/utils.rs
diff --git a/apps/src/lib/logging.rs → crates/apps/src/lib/logging.rs b/apps/src/lib/logging.rs → crates/apps/src/lib/logging.rs
diff --git a/apps/src/lib/mod.rs → crates/apps/src/lib/mod.rs b/apps/src/lib/mod.rs → crates/apps/src/lib/mod.rs
diff --git a/apps/src/lib/node/ledger/abortable.rs → crates/apps/src/lib/node/ledger/abortable.rs b/apps/src/lib/node/ledger/abortable.rs → crates/apps/src/lib/node/ledger/abortable.rs
diff --git a/apps/src/lib/node/ledger/broadcaster.rs → ...s/apps/src/lib/node/ledger/broadcaster.rs b/apps/src/lib/node/ledger/broadcaster.rs → ...s/apps/src/lib/node/ledger/broadcaster.rs
diff --git a/...ib/node/ledger/ethereum_oracle/control.rs → ...ib/node/ledger/ethereum_oracle/control.rs b/...ib/node/ledger/ethereum_oracle/control.rs → ...ib/node/ledger/ethereum_oracle/control.rs
diff --git a/...lib/node/ledger/ethereum_oracle/events.rs → ...lib/node/ledger/ethereum_oracle/events.rs b/...lib/node/ledger/ethereum_oracle/events.rs → ...lib/node/ledger/ethereum_oracle/events.rs
diff --git a/...rc/lib/node/ledger/ethereum_oracle/mod.rs → ...rc/lib/node/ledger/ethereum_oracle/mod.rs b/...rc/lib/node/ledger/ethereum_oracle/mod.rs → ...rc/lib/node/ledger/ethereum_oracle/mod.rs
diff --git a/...reum_oracle/test_tools/events_endpoint.rs → ...reum_oracle/test_tools/events_endpoint.rs b/...reum_oracle/test_tools/events_endpoint.rs → ...reum_oracle/test_tools/events_endpoint.rs
diff --git a/.../ledger/ethereum_oracle/test_tools/mod.rs → .../ledger/ethereum_oracle/test_tools/mod.rs b/.../ledger/ethereum_oracle/test_tools/mod.rs → .../ledger/ethereum_oracle/test_tools/mod.rs
diff --git a/apps/src/lib/node/ledger/mod.rs → crates/apps/src/lib/node/ledger/mod.rs b/apps/src/lib/node/ledger/mod.rs → crates/apps/src/lib/node/ledger/mod.rs
diff --git a/.../src/lib/node/ledger/shell/block_alloc.rs → .../src/lib/node/ledger/shell/block_alloc.rs b/.../src/lib/node/ledger/shell/block_alloc.rs → .../src/lib/node/ledger/shell/block_alloc.rs
diff --git a/...b/node/ledger/shell/block_alloc/states.rs → ...b/node/ledger/shell/block_alloc/states.rs b/...b/node/ledger/shell/block_alloc/states.rs → ...b/node/ledger/shell/block_alloc/states.rs
diff --git a/...shell/block_alloc/states/decrypted_txs.rs → ...shell/block_alloc/states/decrypted_txs.rs b/...shell/block_alloc/states/decrypted_txs.rs → ...shell/block_alloc/states/decrypted_txs.rs
diff --git a/...shell/block_alloc/states/encrypted_txs.rs → ...shell/block_alloc/states/encrypted_txs.rs b/...shell/block_alloc/states/encrypted_txs.rs → ...shell/block_alloc/states/encrypted_txs.rs
diff --git a/.../shell/block_alloc/states/protocol_txs.rs → .../shell/block_alloc/states/protocol_txs.rs b/.../shell/block_alloc/states/protocol_txs.rs → .../shell/block_alloc/states/protocol_txs.rs
diff --git a/...c/lib/node/ledger/shell/finalize_block.rs → ...c/lib/node/ledger/shell/finalize_block.rs b/...c/lib/node/ledger/shell/finalize_block.rs → ...c/lib/node/ledger/shell/finalize_block.rs
diff --git a/apps/src/lib/node/ledger/shell/governance.rs → ...s/src/lib/node/ledger/shell/governance.rs b/apps/src/lib/node/ledger/shell/governance.rs → ...s/src/lib/node/ledger/shell/governance.rs
diff --git a/apps/src/lib/node/ledger/shell/init_chain.rs → ...s/src/lib/node/ledger/shell/init_chain.rs b/apps/src/lib/node/ledger/shell/init_chain.rs → ...s/src/lib/node/ledger/shell/init_chain.rs
diff --git a/apps/src/lib/node/ledger/shell/mod.rs → crates/apps/src/lib/node/ledger/shell/mod.rs b/apps/src/lib/node/ledger/shell/mod.rs → crates/apps/src/lib/node/ledger/shell/mod.rs
@@ -1618,6 +1618,8 @@ mod test_utils {
         while current_path.file_name().unwrap() != "apps" {
             current_path.pop();
         }
+        // Two-dirs up to root
+        current_path.pop();
         current_path.pop();
         current_path
     }

diff --git a/...lib/node/ledger/shell/prepare_proposal.rs → ...lib/node/ledger/shell/prepare_proposal.rs b/...lib/node/ledger/shell/prepare_proposal.rs → ...lib/node/ledger/shell/prepare_proposal.rs
diff --git a/...lib/node/ledger/shell/process_proposal.rs → ...lib/node/ledger/shell/process_proposal.rs b/...lib/node/ledger/shell/process_proposal.rs → ...lib/node/ledger/shell/process_proposal.rs
diff --git a/apps/src/lib/node/ledger/shell/queries.rs → ...apps/src/lib/node/ledger/shell/queries.rs b/apps/src/lib/node/ledger/shell/queries.rs → ...apps/src/lib/node/ledger/shell/queries.rs
diff --git a/apps/src/lib/node/ledger/shell/stats.rs → ...s/apps/src/lib/node/ledger/shell/stats.rs b/apps/src/lib/node/ledger/shell/stats.rs → ...s/apps/src/lib/node/ledger/shell/stats.rs
diff --git a/...c/lib/node/ledger/shell/testing/client.rs → ...c/lib/node/ledger/shell/testing/client.rs b/...c/lib/node/ledger/shell/testing/client.rs → ...c/lib/node/ledger/shell/testing/client.rs
diff --git a/.../src/lib/node/ledger/shell/testing/mod.rs → .../src/lib/node/ledger/shell/testing/mod.rs b/.../src/lib/node/ledger/shell/testing/mod.rs → .../src/lib/node/ledger/shell/testing/mod.rs
diff --git a/...src/lib/node/ledger/shell/testing/node.rs → ...src/lib/node/ledger/shell/testing/node.rs b/...src/lib/node/ledger/shell/testing/node.rs → ...src/lib/node/ledger/shell/testing/node.rs
diff --git a/...rc/lib/node/ledger/shell/testing/utils.rs → ...rc/lib/node/ledger/shell/testing/utils.rs b/...rc/lib/node/ledger/shell/testing/utils.rs → ...rc/lib/node/ledger/shell/testing/utils.rs
diff --git a/apps/src/lib/node/ledger/shell/utils.rs → ...s/apps/src/lib/node/ledger/shell/utils.rs b/apps/src/lib/node/ledger/shell/utils.rs → ...s/apps/src/lib/node/ledger/shell/utils.rs
diff --git a/.../lib/node/ledger/shell/vote_extensions.rs → .../lib/node/ledger/shell/vote_extensions.rs b/.../lib/node/ledger/shell/vote_extensions.rs → .../lib/node/ledger/shell/vote_extensions.rs
diff --git a/...shell/vote_extensions/bridge_pool_vext.rs → ...shell/vote_extensions/bridge_pool_vext.rs b/...shell/vote_extensions/bridge_pool_vext.rs → ...shell/vote_extensions/bridge_pool_vext.rs
diff --git a/...edger/shell/vote_extensions/eth_events.rs → ...edger/shell/vote_extensions/eth_events.rs b/...edger/shell/vote_extensions/eth_events.rs → ...edger/shell/vote_extensions/eth_events.rs
diff --git a/...r/shell/vote_extensions/val_set_update.rs → ...r/shell/vote_extensions/val_set_update.rs b/...r/shell/vote_extensions/val_set_update.rs → ...r/shell/vote_extensions/val_set_update.rs
diff --git a/.../src/lib/node/ledger/shims/abcipp_shim.rs → .../src/lib/node/ledger/shims/abcipp_shim.rs b/.../src/lib/node/ledger/shims/abcipp_shim.rs → .../src/lib/node/ledger/shims/abcipp_shim.rs
diff --git a/...ib/node/ledger/shims/abcipp_shim_types.rs → ...ib/node/ledger/shims/abcipp_shim_types.rs b/...ib/node/ledger/shims/abcipp_shim_types.rs → ...ib/node/ledger/shims/abcipp_shim_types.rs
diff --git a/apps/src/lib/node/ledger/shims/mod.rs → crates/apps/src/lib/node/ledger/shims/mod.rs b/apps/src/lib/node/ledger/shims/mod.rs → crates/apps/src/lib/node/ledger/shims/mod.rs
diff --git a/apps/src/lib/node/ledger/storage/mod.rs → ...s/apps/src/lib/node/ledger/storage/mod.rs b/apps/src/lib/node/ledger/storage/mod.rs → ...s/apps/src/lib/node/ledger/storage/mod.rs
diff --git a/apps/src/lib/node/ledger/storage/rocksdb.rs → ...ps/src/lib/node/ledger/storage/rocksdb.rs b/apps/src/lib/node/ledger/storage/rocksdb.rs → ...ps/src/lib/node/ledger/storage/rocksdb.rs
diff --git a/apps/src/lib/node/ledger/tendermint_node.rs → ...ps/src/lib/node/ledger/tendermint_node.rs b/apps/src/lib/node/ledger/tendermint_node.rs → ...ps/src/lib/node/ledger/tendermint_node.rs
diff --git a/apps/src/lib/node/mod.rs → crates/apps/src/lib/node/mod.rs b/apps/src/lib/node/mod.rs → crates/apps/src/lib/node/mod.rs
diff --git a/apps/src/lib/wallet/defaults.rs → crates/apps/src/lib/wallet/defaults.rs b/apps/src/lib/wallet/defaults.rs → crates/apps/src/lib/wallet/defaults.rs
diff --git a/apps/src/lib/wallet/mod.rs → crates/apps/src/lib/wallet/mod.rs b/apps/src/lib/wallet/mod.rs → crates/apps/src/lib/wallet/mod.rs
diff --git a/apps/src/lib/wallet/pre_genesis.rs → crates/apps/src/lib/wallet/pre_genesis.rs b/apps/src/lib/wallet/pre_genesis.rs → crates/apps/src/lib/wallet/pre_genesis.rs
diff --git a/apps/src/lib/wallet/store.rs → crates/apps/src/lib/wallet/store.rs b/apps/src/lib/wallet/store.rs → crates/apps/src/lib/wallet/store.rs
diff --git a/apps/src/lib/wasm_loader/mod.rs → crates/apps/src/lib/wasm_loader/mod.rs b/apps/src/lib/wasm_loader/mod.rs → crates/apps/src/lib/wasm_loader/mod.rs
diff --git a/benches/Cargo.toml → crates/benches/Cargo.toml b/benches/Cargo.toml → crates/benches/Cargo.toml
@@ -40,7 +40,7 @@ path = "host_env.rs"
 [dependencies]
 
 [dev-dependencies]
-namada = { path = "../shared", features = ["rand", "testing"] }
+namada = { path = "../namada", features = ["rand", "testing"] }
 namada_apps = { path = "../apps", features = ["benches"] }
 masp_primitives.workspace = true
 borsh.workspace = true

diff --git a/benches/README.md → crates/benches/README.md b/benches/README.md → crates/benches/README.md
diff --git a/benches/host_env.rs → crates/benches/host_env.rs b/benches/host_env.rs → crates/benches/host_env.rs
diff --git a/benches/native_vps.rs → crates/benches/native_vps.rs b/benches/native_vps.rs → crates/benches/native_vps.rs
diff --git a/benches/process_wrapper.rs → crates/benches/process_wrapper.rs b/benches/process_wrapper.rs → crates/benches/process_wrapper.rs
diff --git a/benches/txs.rs → crates/benches/txs.rs b/benches/txs.rs → crates/benches/txs.rs
diff --git a/benches/vps.rs → crates/benches/vps.rs b/benches/vps.rs → crates/benches/vps.rs
diff --git a/core/Cargo.toml → crates/core/Cargo.toml b/core/Cargo.toml → crates/core/Cargo.toml
diff --git a/...optest-regressions/ledger/storage/mod.txt → ...optest-regressions/ledger/storage/mod.txt b/...optest-regressions/ledger/storage/mod.txt → ...optest-regressions/ledger/storage/mod.txt
diff --git a/...regressions/ledger/storage/wl_storage.txt → ...regressions/ledger/storage/wl_storage.txt b/...regressions/ledger/storage/wl_storage.txt → ...regressions/ledger/storage/wl_storage.txt
diff --git a/core/src/bytes.rs → crates/core/src/bytes.rs b/core/src/bytes.rs → crates/core/src/bytes.rs
diff --git a/core/src/hints.rs → crates/core/src/hints.rs b/core/src/hints.rs → crates/core/src/hints.rs
diff --git a/core/src/ledger/eth_bridge/mod.rs → crates/core/src/ledger/eth_bridge/mod.rs b/core/src/ledger/eth_bridge/mod.rs → crates/core/src/ledger/eth_bridge/mod.rs
diff --git a/core/src/ledger/inflation.rs → crates/core/src/ledger/inflation.rs b/core/src/ledger/inflation.rs → crates/core/src/ledger/inflation.rs
diff --git a/core/src/ledger/mod.rs → crates/core/src/ledger/mod.rs b/core/src/ledger/mod.rs → crates/core/src/ledger/mod.rs
diff --git a/core/src/ledger/replay_protection.rs → crates/core/src/ledger/replay_protection.rs b/core/src/ledger/replay_protection.rs → crates/core/src/ledger/replay_protection.rs
diff --git a/core/src/lib.rs → crates/core/src/lib.rs b/core/src/lib.rs → crates/core/src/lib.rs
diff --git a/core/src/types/account.rs → crates/core/src/types/account.rs b/core/src/types/account.rs → crates/core/src/types/account.rs
diff --git a/core/src/types/address.rs → crates/core/src/types/address.rs b/core/src/types/address.rs → crates/core/src/types/address.rs
diff --git a/core/src/types/address/raw.rs → crates/core/src/types/address/raw.rs b/core/src/types/address/raw.rs → crates/core/src/types/address/raw.rs
diff --git a/core/src/types/chain.rs → crates/core/src/types/chain.rs b/core/src/types/chain.rs → crates/core/src/types/chain.rs
diff --git a/core/src/types/dec.rs → crates/core/src/types/dec.rs b/core/src/types/dec.rs → crates/core/src/types/dec.rs
diff --git a/core/src/types/eth_abi.rs → crates/core/src/types/eth_abi.rs b/core/src/types/eth_abi.rs → crates/core/src/types/eth_abi.rs
diff --git a/core/src/types/eth_bridge_pool.rs → crates/core/src/types/eth_bridge_pool.rs b/core/src/types/eth_bridge_pool.rs → crates/core/src/types/eth_bridge_pool.rs
diff --git a/core/src/types/ethereum_events.rs → crates/core/src/types/ethereum_events.rs b/core/src/types/ethereum_events.rs → crates/core/src/types/ethereum_events.rs
diff --git a/core/src/types/ethereum_structs.rs → crates/core/src/types/ethereum_structs.rs b/core/src/types/ethereum_structs.rs → crates/core/src/types/ethereum_structs.rs
diff --git a/core/src/types/hash.rs → crates/core/src/types/hash.rs b/core/src/types/hash.rs → crates/core/src/types/hash.rs
diff --git a/core/src/types/ibc.rs → crates/core/src/types/ibc.rs b/core/src/types/ibc.rs → crates/core/src/types/ibc.rs
diff --git a/core/src/types/internal.rs → crates/core/src/types/internal.rs b/core/src/types/internal.rs → crates/core/src/types/internal.rs
diff --git a/core/src/types/keccak.rs → crates/core/src/types/keccak.rs b/core/src/types/keccak.rs → crates/core/src/types/keccak.rs
diff --git a/core/src/types/key/common.rs → crates/core/src/types/key/common.rs b/core/src/types/key/common.rs → crates/core/src/types/key/common.rs
diff --git a/core/src/types/key/ed25519.rs → crates/core/src/types/key/ed25519.rs b/core/src/types/key/ed25519.rs → crates/core/src/types/key/ed25519.rs
diff --git a/core/src/types/key/mod.rs → crates/core/src/types/key/mod.rs b/core/src/types/key/mod.rs → crates/core/src/types/key/mod.rs
diff --git a/core/src/types/key/secp256k1.rs → crates/core/src/types/key/secp256k1.rs b/core/src/types/key/secp256k1.rs → crates/core/src/types/key/secp256k1.rs
diff --git a/core/src/types/masp.rs → crates/core/src/types/masp.rs b/core/src/types/masp.rs → crates/core/src/types/masp.rs
diff --git a/core/src/types/mod.rs → crates/core/src/types/mod.rs b/core/src/types/mod.rs → crates/core/src/types/mod.rs
diff --git a/core/src/types/parameters.rs → crates/core/src/types/parameters.rs b/core/src/types/parameters.rs → crates/core/src/types/parameters.rs
diff --git a/core/src/types/sign.rs → crates/core/src/types/sign.rs b/core/src/types/sign.rs → crates/core/src/types/sign.rs
diff --git a/core/src/types/storage.rs → crates/core/src/types/storage.rs b/core/src/types/storage.rs → crates/core/src/types/storage.rs
diff --git a/core/src/types/string_encoding.rs → crates/core/src/types/string_encoding.rs b/core/src/types/string_encoding.rs → crates/core/src/types/string_encoding.rs
diff --git a/core/src/types/time.rs → crates/core/src/types/time.rs b/core/src/types/time.rs → crates/core/src/types/time.rs
diff --git a/core/src/types/token.rs → crates/core/src/types/token.rs b/core/src/types/token.rs → crates/core/src/types/token.rs
diff --git a/core/src/types/uint.rs → crates/core/src/types/uint.rs b/core/src/types/uint.rs → crates/core/src/types/uint.rs
diff --git a/core/src/types/validity_predicate.rs → crates/core/src/types/validity_predicate.rs b/core/src/types/validity_predicate.rs → crates/core/src/types/validity_predicate.rs
diff --git a/core/src/types/voting_power.rs → crates/core/src/types/voting_power.rs b/core/src/types/voting_power.rs → crates/core/src/types/voting_power.rs
diff --git a/encoding_spec/Cargo.toml → crates/encoding_spec/Cargo.toml b/encoding_spec/Cargo.toml → crates/encoding_spec/Cargo.toml
@@ -16,7 +16,7 @@ version.workspace = true
 default = []
 
 [dependencies]
-namada = { path = "../shared", features = ["rand", "tendermint-rpc", "download-params"] }
+namada = { path = "../namada", features = ["rand", "tendermint-rpc", "download-params"] }
 borsh.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true

diff --git a/encoding_spec/README.md → crates/encoding_spec/README.md b/encoding_spec/README.md → crates/encoding_spec/README.md
diff --git a/encoding_spec/src/main.rs → crates/encoding_spec/src/main.rs b/encoding_spec/src/main.rs → crates/encoding_spec/src/main.rs
diff --git a/ethereum_bridge/Cargo.toml → crates/ethereum_bridge/Cargo.toml b/ethereum_bridge/Cargo.toml → crates/ethereum_bridge/Cargo.toml
diff --git a/ethereum_bridge/src/lib.rs → crates/ethereum_bridge/src/lib.rs b/ethereum_bridge/src/lib.rs → crates/ethereum_bridge/src/lib.rs
diff --git a/ethereum_bridge/src/oracle.rs → crates/ethereum_bridge/src/oracle.rs b/ethereum_bridge/src/oracle.rs → crates/ethereum_bridge/src/oracle.rs
diff --git a/ethereum_bridge/src/oracle/config.rs → crates/ethereum_bridge/src/oracle/config.rs b/ethereum_bridge/src/oracle/config.rs → crates/ethereum_bridge/src/oracle/config.rs
diff --git a/ethereum_bridge/src/protocol/mod.rs → crates/ethereum_bridge/src/protocol/mod.rs b/ethereum_bridge/src/protocol/mod.rs → crates/ethereum_bridge/src/protocol/mod.rs
diff --git a/...rotocol/transactions/bridge_pool_roots.rs → ...rotocol/transactions/bridge_pool_roots.rs b/...rotocol/transactions/bridge_pool_roots.rs → ...rotocol/transactions/bridge_pool_roots.rs
diff --git a/.../transactions/ethereum_events/eth_msgs.rs → .../transactions/ethereum_events/eth_msgs.rs b/.../transactions/ethereum_events/eth_msgs.rs → .../transactions/ethereum_events/eth_msgs.rs
diff --git a/...ol/transactions/ethereum_events/events.rs → ...ol/transactions/ethereum_events/events.rs b/...ol/transactions/ethereum_events/events.rs → ...ol/transactions/ethereum_events/events.rs
diff --git a/...tocol/transactions/ethereum_events/mod.rs → ...tocol/transactions/ethereum_events/mod.rs b/...tocol/transactions/ethereum_events/mod.rs → ...tocol/transactions/ethereum_events/mod.rs
diff --git a/...m_bridge/src/protocol/transactions/mod.rs → ...m_bridge/src/protocol/transactions/mod.rs b/...m_bridge/src/protocol/transactions/mod.rs → ...m_bridge/src/protocol/transactions/mod.rs
diff --git a/..._bridge/src/protocol/transactions/read.rs → ..._bridge/src/protocol/transactions/read.rs b/..._bridge/src/protocol/transactions/read.rs → ..._bridge/src/protocol/transactions/read.rs
diff --git a/...ridge/src/protocol/transactions/update.rs → ...ridge/src/protocol/transactions/update.rs b/...ridge/src/protocol/transactions/update.rs → ...ridge/src/protocol/transactions/update.rs
diff --git a/...bridge/src/protocol/transactions/utils.rs → ...bridge/src/protocol/transactions/utils.rs b/...bridge/src/protocol/transactions/utils.rs → ...bridge/src/protocol/transactions/utils.rs
diff --git a/.../transactions/validator_set_update/mod.rs → .../transactions/validator_set_update/mod.rs b/.../transactions/validator_set_update/mod.rs → .../transactions/validator_set_update/mod.rs
diff --git a/...bridge/src/protocol/transactions/votes.rs → ...bridge/src/protocol/transactions/votes.rs b/...bridge/src/protocol/transactions/votes.rs → ...bridge/src/protocol/transactions/votes.rs
diff --git a/...rc/protocol/transactions/votes/storage.rs → ...rc/protocol/transactions/votes/storage.rs b/...rc/protocol/transactions/votes/storage.rs → ...rc/protocol/transactions/votes/storage.rs
diff --git a/...src/protocol/transactions/votes/update.rs → ...src/protocol/transactions/votes/update.rs b/...src/protocol/transactions/votes/update.rs → ...src/protocol/transactions/votes/update.rs
diff --git a/ethereum_bridge/src/protocol/validation.rs → ...thereum_bridge/src/protocol/validation.rs b/ethereum_bridge/src/protocol/validation.rs → ...thereum_bridge/src/protocol/validation.rs
diff --git a/.../protocol/validation/bridge_pool_roots.rs → .../protocol/validation/bridge_pool_roots.rs b/.../protocol/validation/bridge_pool_roots.rs → .../protocol/validation/bridge_pool_roots.rs
diff --git a/...rc/protocol/validation/ethereum_events.rs → ...rc/protocol/validation/ethereum_events.rs b/...rc/protocol/validation/ethereum_events.rs → ...rc/protocol/validation/ethereum_events.rs
diff --git a/...otocol/validation/validator_set_update.rs → ...otocol/validation/validator_set_update.rs b/...otocol/validation/validator_set_update.rs → ...otocol/validation/validator_set_update.rs
diff --git a/ethereum_bridge/src/storage/bridge_pool.rs → ...thereum_bridge/src/storage/bridge_pool.rs b/ethereum_bridge/src/storage/bridge_pool.rs → ...thereum_bridge/src/storage/bridge_pool.rs
diff --git a/..._bridge/src/storage/eth_bridge_queries.rs → ..._bridge/src/storage/eth_bridge_queries.rs b/..._bridge/src/storage/eth_bridge_queries.rs → ..._bridge/src/storage/eth_bridge_queries.rs
diff --git a/ethereum_bridge/src/storage/mod.rs → crates/ethereum_bridge/src/storage/mod.rs b/ethereum_bridge/src/storage/mod.rs → crates/ethereum_bridge/src/storage/mod.rs
diff --git a/ethereum_bridge/src/storage/parameters.rs → ...ethereum_bridge/src/storage/parameters.rs b/ethereum_bridge/src/storage/parameters.rs → ...ethereum_bridge/src/storage/parameters.rs
diff --git a/ethereum_bridge/src/storage/proof.rs → crates/ethereum_bridge/src/storage/proof.rs b/ethereum_bridge/src/storage/proof.rs → crates/ethereum_bridge/src/storage/proof.rs
diff --git a/ethereum_bridge/src/storage/vote_tallies.rs → ...hereum_bridge/src/storage/vote_tallies.rs b/ethereum_bridge/src/storage/vote_tallies.rs → ...hereum_bridge/src/storage/vote_tallies.rs
diff --git a/ethereum_bridge/src/storage/vp.rs → crates/ethereum_bridge/src/storage/vp.rs b/ethereum_bridge/src/storage/vp.rs → crates/ethereum_bridge/src/storage/vp.rs
diff --git a/...reum_bridge/src/storage/vp/bridge_pool.rs → ...reum_bridge/src/storage/vp/bridge_pool.rs b/...reum_bridge/src/storage/vp/bridge_pool.rs → ...reum_bridge/src/storage/vp/bridge_pool.rs
diff --git a/..._bridge/src/storage/vp/ethereum_bridge.rs → ..._bridge/src/storage/vp/ethereum_bridge.rs b/..._bridge/src/storage/vp/ethereum_bridge.rs → ..._bridge/src/storage/vp/ethereum_bridge.rs
diff --git a/ethereum_bridge/src/storage/whitelist.rs → .../ethereum_bridge/src/storage/whitelist.rs b/ethereum_bridge/src/storage/whitelist.rs → .../ethereum_bridge/src/storage/whitelist.rs
diff --git a/...reum_bridge/src/storage/wrapped_erc20s.rs → ...reum_bridge/src/storage/wrapped_erc20s.rs b/...reum_bridge/src/storage/wrapped_erc20s.rs → ...reum_bridge/src/storage/wrapped_erc20s.rs
diff --git a/ethereum_bridge/src/test_utils.rs → crates/ethereum_bridge/src/test_utils.rs b/ethereum_bridge/src/test_utils.rs → crates/ethereum_bridge/src/test_utils.rs
diff --git a/gas/Cargo.toml → crates/gas/Cargo.toml b/gas/Cargo.toml → crates/gas/Cargo.toml
diff --git a/gas/src/lib.rs → crates/gas/src/lib.rs b/gas/src/lib.rs → crates/gas/src/lib.rs
diff --git a/governance/Cargo.toml → crates/governance/Cargo.toml b/governance/Cargo.toml → crates/governance/Cargo.toml
diff --git a/governance/src/cli/mod.rs → crates/governance/src/cli/mod.rs b/governance/src/cli/mod.rs → crates/governance/src/cli/mod.rs
diff --git a/governance/src/cli/offline.rs → crates/governance/src/cli/offline.rs b/governance/src/cli/offline.rs → crates/governance/src/cli/offline.rs
diff --git a/governance/src/cli/onchain.rs → crates/governance/src/cli/onchain.rs b/governance/src/cli/onchain.rs → crates/governance/src/cli/onchain.rs
diff --git a/governance/src/cli/validation.rs → crates/governance/src/cli/validation.rs b/governance/src/cli/validation.rs → crates/governance/src/cli/validation.rs
diff --git a/governance/src/lib.rs → crates/governance/src/lib.rs b/governance/src/lib.rs → crates/governance/src/lib.rs
diff --git a/governance/src/parameters.rs → crates/governance/src/parameters.rs b/governance/src/parameters.rs → crates/governance/src/parameters.rs
diff --git a/governance/src/pgf/cli/mod.rs → crates/governance/src/pgf/cli/mod.rs b/governance/src/pgf/cli/mod.rs → crates/governance/src/pgf/cli/mod.rs
diff --git a/governance/src/pgf/cli/steward.rs → crates/governance/src/pgf/cli/steward.rs b/governance/src/pgf/cli/steward.rs → crates/governance/src/pgf/cli/steward.rs
diff --git a/governance/src/pgf/inflation.rs → crates/governance/src/pgf/inflation.rs b/governance/src/pgf/inflation.rs → crates/governance/src/pgf/inflation.rs
diff --git a/governance/src/pgf/mod.rs → crates/governance/src/pgf/mod.rs b/governance/src/pgf/mod.rs → crates/governance/src/pgf/mod.rs
diff --git a/governance/src/pgf/parameters.rs → crates/governance/src/pgf/parameters.rs b/governance/src/pgf/parameters.rs → crates/governance/src/pgf/parameters.rs
diff --git a/governance/src/pgf/storage/keys.rs → crates/governance/src/pgf/storage/keys.rs b/governance/src/pgf/storage/keys.rs → crates/governance/src/pgf/storage/keys.rs
diff --git a/governance/src/pgf/storage/mod.rs → crates/governance/src/pgf/storage/mod.rs b/governance/src/pgf/storage/mod.rs → crates/governance/src/pgf/storage/mod.rs
diff --git a/governance/src/pgf/storage/steward.rs → crates/governance/src/pgf/storage/steward.rs b/governance/src/pgf/storage/steward.rs → crates/governance/src/pgf/storage/steward.rs
diff --git a/governance/src/storage/keys.rs → crates/governance/src/storage/keys.rs b/governance/src/storage/keys.rs → crates/governance/src/storage/keys.rs
diff --git a/governance/src/storage/mod.rs → crates/governance/src/storage/mod.rs b/governance/src/storage/mod.rs → crates/governance/src/storage/mod.rs
diff --git a/governance/src/storage/proposal.rs → crates/governance/src/storage/proposal.rs b/governance/src/storage/proposal.rs → crates/governance/src/storage/proposal.rs
diff --git a/governance/src/storage/vote.rs → crates/governance/src/storage/vote.rs b/governance/src/storage/vote.rs → crates/governance/src/storage/vote.rs
diff --git a/governance/src/utils.rs → crates/governance/src/utils.rs b/governance/src/utils.rs → crates/governance/src/utils.rs
diff --git a/ibc/Cargo.toml → crates/ibc/Cargo.toml b/ibc/Cargo.toml → crates/ibc/Cargo.toml
diff --git a/ibc/src/actions.rs → crates/ibc/src/actions.rs b/ibc/src/actions.rs → crates/ibc/src/actions.rs
diff --git a/ibc/src/context/client.rs → crates/ibc/src/context/client.rs b/ibc/src/context/client.rs → crates/ibc/src/context/client.rs
diff --git a/ibc/src/context/common.rs → crates/ibc/src/context/common.rs b/ibc/src/context/common.rs → crates/ibc/src/context/common.rs
diff --git a/ibc/src/context/execution.rs → crates/ibc/src/context/execution.rs b/ibc/src/context/execution.rs → crates/ibc/src/context/execution.rs
diff --git a/ibc/src/context/mod.rs → crates/ibc/src/context/mod.rs b/ibc/src/context/mod.rs → crates/ibc/src/context/mod.rs
diff --git a/ibc/src/context/router.rs → crates/ibc/src/context/router.rs b/ibc/src/context/router.rs → crates/ibc/src/context/router.rs
diff --git a/ibc/src/context/storage.rs → crates/ibc/src/context/storage.rs b/ibc/src/context/storage.rs → crates/ibc/src/context/storage.rs
diff --git a/ibc/src/context/token_transfer.rs → crates/ibc/src/context/token_transfer.rs b/ibc/src/context/token_transfer.rs → crates/ibc/src/context/token_transfer.rs
diff --git a/ibc/src/context/transfer_mod.rs → crates/ibc/src/context/transfer_mod.rs b/ibc/src/context/transfer_mod.rs → crates/ibc/src/context/transfer_mod.rs
diff --git a/ibc/src/context/validation.rs → crates/ibc/src/context/validation.rs b/ibc/src/context/validation.rs → crates/ibc/src/context/validation.rs
diff --git a/ibc/src/lib.rs → crates/ibc/src/lib.rs b/ibc/src/lib.rs → crates/ibc/src/lib.rs
diff --git a/ibc/src/storage.rs → crates/ibc/src/storage.rs b/ibc/src/storage.rs → crates/ibc/src/storage.rs
diff --git a/light_sdk/Cargo.toml → crates/light_sdk/Cargo.toml b/light_sdk/Cargo.toml → crates/light_sdk/Cargo.toml
diff --git a/light_sdk/src/lib.rs → crates/light_sdk/src/lib.rs b/light_sdk/src/lib.rs → crates/light_sdk/src/lib.rs
diff --git a/light_sdk/src/reading/account.rs → crates/light_sdk/src/reading/account.rs b/light_sdk/src/reading/account.rs → crates/light_sdk/src/reading/account.rs
diff --git a/light_sdk/src/reading/governance.rs → crates/light_sdk/src/reading/governance.rs b/light_sdk/src/reading/governance.rs → crates/light_sdk/src/reading/governance.rs
diff --git a/light_sdk/src/reading/mod.rs → crates/light_sdk/src/reading/mod.rs b/light_sdk/src/reading/mod.rs → crates/light_sdk/src/reading/mod.rs
diff --git a/light_sdk/src/reading/pgf.rs → crates/light_sdk/src/reading/pgf.rs b/light_sdk/src/reading/pgf.rs → crates/light_sdk/src/reading/pgf.rs
diff --git a/light_sdk/src/reading/pos.rs → crates/light_sdk/src/reading/pos.rs b/light_sdk/src/reading/pos.rs → crates/light_sdk/src/reading/pos.rs
diff --git a/light_sdk/src/reading/tx.rs → crates/light_sdk/src/reading/tx.rs b/light_sdk/src/reading/tx.rs → crates/light_sdk/src/reading/tx.rs
diff --git a/light_sdk/src/transaction/account.rs → crates/light_sdk/src/transaction/account.rs b/light_sdk/src/transaction/account.rs → crates/light_sdk/src/transaction/account.rs
diff --git a/light_sdk/src/transaction/bridge.rs → crates/light_sdk/src/transaction/bridge.rs b/light_sdk/src/transaction/bridge.rs → crates/light_sdk/src/transaction/bridge.rs
diff --git a/light_sdk/src/transaction/governance.rs → ...s/light_sdk/src/transaction/governance.rs b/light_sdk/src/transaction/governance.rs → ...s/light_sdk/src/transaction/governance.rs
diff --git a/light_sdk/src/transaction/ibc.rs → crates/light_sdk/src/transaction/ibc.rs b/light_sdk/src/transaction/ibc.rs → crates/light_sdk/src/transaction/ibc.rs
diff --git a/light_sdk/src/transaction/mod.rs → crates/light_sdk/src/transaction/mod.rs b/light_sdk/src/transaction/mod.rs → crates/light_sdk/src/transaction/mod.rs
diff --git a/light_sdk/src/transaction/pgf.rs → crates/light_sdk/src/transaction/pgf.rs b/light_sdk/src/transaction/pgf.rs → crates/light_sdk/src/transaction/pgf.rs
diff --git a/light_sdk/src/transaction/pos.rs → crates/light_sdk/src/transaction/pos.rs b/light_sdk/src/transaction/pos.rs → crates/light_sdk/src/transaction/pos.rs
diff --git a/light_sdk/src/transaction/transfer.rs → crates/light_sdk/src/transaction/transfer.rs b/light_sdk/src/transaction/transfer.rs → crates/light_sdk/src/transaction/transfer.rs
diff --git a/light_sdk/src/transaction/wrapper.rs → crates/light_sdk/src/transaction/wrapper.rs b/light_sdk/src/transaction/wrapper.rs → crates/light_sdk/src/transaction/wrapper.rs
diff --git a/light_sdk/src/writing/mod.rs → crates/light_sdk/src/writing/mod.rs b/light_sdk/src/writing/mod.rs → crates/light_sdk/src/writing/mod.rs
diff --git a/macros/Cargo.toml → crates/macros/Cargo.toml b/macros/Cargo.toml → crates/macros/Cargo.toml
diff --git a/macros/src/lib.rs → crates/macros/src/lib.rs b/macros/src/lib.rs → crates/macros/src/lib.rs
diff --git a/merkle_tree/Cargo.toml → crates/merkle_tree/Cargo.toml b/merkle_tree/Cargo.toml → crates/merkle_tree/Cargo.toml
diff --git a/merkle_tree/src/eth_bridge_pool.rs → crates/merkle_tree/src/eth_bridge_pool.rs b/merkle_tree/src/eth_bridge_pool.rs → crates/merkle_tree/src/eth_bridge_pool.rs
diff --git a/merkle_tree/src/ics23_specs.rs → crates/merkle_tree/src/ics23_specs.rs b/merkle_tree/src/ics23_specs.rs → crates/merkle_tree/src/ics23_specs.rs
diff --git a/merkle_tree/src/lib.rs → crates/merkle_tree/src/lib.rs b/merkle_tree/src/lib.rs → crates/merkle_tree/src/lib.rs
diff --git a/shared/.gitignore → crates/namada/.gitignore b/shared/.gitignore → crates/namada/.gitignore
diff --git a/shared/Cargo.toml → crates/namada/Cargo.toml b/shared/Cargo.toml → crates/namada/Cargo.toml
diff --git a/...optest-regressions/ledger/storage/mod.txt → ...optest-regressions/ledger/storage/mod.txt b/...optest-regressions/ledger/storage/mod.txt → ...optest-regressions/ledger/storage/mod.txt
diff --git a/shared/src/ledger/governance/mod.rs → crates/namada/src/ledger/governance/mod.rs b/shared/src/ledger/governance/mod.rs → crates/namada/src/ledger/governance/mod.rs
diff --git a/shared/src/ledger/governance/utils.rs → crates/namada/src/ledger/governance/utils.rs b/shared/src/ledger/governance/utils.rs → crates/namada/src/ledger/governance/utils.rs
diff --git a/shared/src/ledger/ibc/mod.rs → crates/namada/src/ledger/ibc/mod.rs b/shared/src/ledger/ibc/mod.rs → crates/namada/src/ledger/ibc/mod.rs
diff --git a/shared/src/ledger/mod.rs → crates/namada/src/ledger/mod.rs b/shared/src/ledger/mod.rs → crates/namada/src/ledger/mod.rs
diff --git a/...tive_vp/ethereum_bridge/bridge_pool_vp.rs → ...tive_vp/ethereum_bridge/bridge_pool_vp.rs b/...tive_vp/ethereum_bridge/bridge_pool_vp.rs → ...tive_vp/ethereum_bridge/bridge_pool_vp.rs
diff --git a/...c/ledger/native_vp/ethereum_bridge/mod.rs → ...c/ledger/native_vp/ethereum_bridge/mod.rs b/...c/ledger/native_vp/ethereum_bridge/mod.rs → ...c/ledger/native_vp/ethereum_bridge/mod.rs
diff --git a/...c/ledger/native_vp/ethereum_bridge/nut.rs → ...c/ledger/native_vp/ethereum_bridge/nut.rs b/...c/ledger/native_vp/ethereum_bridge/nut.rs → ...c/ledger/native_vp/ethereum_bridge/nut.rs
diff --git a/...rc/ledger/native_vp/ethereum_bridge/vp.rs → ...rc/ledger/native_vp/ethereum_bridge/vp.rs b/...rc/ledger/native_vp/ethereum_bridge/vp.rs → ...rc/ledger/native_vp/ethereum_bridge/vp.rs
diff --git a/shared/src/ledger/native_vp/ibc/context.rs → ...amada/src/ledger/native_vp/ibc/context.rs b/shared/src/ledger/native_vp/ibc/context.rs → ...amada/src/ledger/native_vp/ibc/context.rs
diff --git a/shared/src/ledger/native_vp/ibc/mod.rs → ...es/namada/src/ledger/native_vp/ibc/mod.rs b/shared/src/ledger/native_vp/ibc/mod.rs → ...es/namada/src/ledger/native_vp/ibc/mod.rs
diff --git a/shared/src/ledger/native_vp/masp.rs → crates/namada/src/ledger/native_vp/masp.rs b/shared/src/ledger/native_vp/masp.rs → crates/namada/src/ledger/native_vp/masp.rs
diff --git a/shared/src/ledger/native_vp/mod.rs → crates/namada/src/ledger/native_vp/mod.rs b/shared/src/ledger/native_vp/mod.rs → crates/namada/src/ledger/native_vp/mod.rs
diff --git a/shared/src/ledger/native_vp/multitoken.rs → ...namada/src/ledger/native_vp/multitoken.rs b/shared/src/ledger/native_vp/multitoken.rs → ...namada/src/ledger/native_vp/multitoken.rs
diff --git a/shared/src/ledger/native_vp/parameters.rs → ...namada/src/ledger/native_vp/parameters.rs b/shared/src/ledger/native_vp/parameters.rs → ...namada/src/ledger/native_vp/parameters.rs
diff --git a/shared/src/ledger/native_vp/slash_fund.rs → ...namada/src/ledger/native_vp/slash_fund.rs b/shared/src/ledger/native_vp/slash_fund.rs → ...namada/src/ledger/native_vp/slash_fund.rs
diff --git a/shared/src/ledger/pgf/mod.rs → crates/namada/src/ledger/pgf/mod.rs b/shared/src/ledger/pgf/mod.rs → crates/namada/src/ledger/pgf/mod.rs
diff --git a/shared/src/ledger/pgf/utils.rs → crates/namada/src/ledger/pgf/utils.rs b/shared/src/ledger/pgf/utils.rs → crates/namada/src/ledger/pgf/utils.rs
diff --git a/shared/src/ledger/pos/mod.rs → crates/namada/src/ledger/pos/mod.rs b/shared/src/ledger/pos/mod.rs → crates/namada/src/ledger/pos/mod.rs
diff --git a/shared/src/ledger/pos/vp.rs → crates/namada/src/ledger/pos/vp.rs b/shared/src/ledger/pos/vp.rs → crates/namada/src/ledger/pos/vp.rs
diff --git a/shared/src/ledger/protocol/mod.rs → crates/namada/src/ledger/protocol/mod.rs b/shared/src/ledger/protocol/mod.rs → crates/namada/src/ledger/protocol/mod.rs
@@ -875,7 +875,7 @@ where
                                 // avoid crashing the ledger (required
                                 // `UnwindSafe`
                                 // and `RefUnwindSafe` in
-                                // shared/src/ledger/pos/vp.rs)
+                                // namada/src/ledger/pos/vp.rs)
                                 let keys_changed_ref = &keys_changed;
                                 let result = pos_ref
                                     .validate_tx(

diff --git a/shared/src/ledger/storage/mod.rs → crates/namada/src/ledger/storage/mod.rs b/shared/src/ledger/storage/mod.rs → crates/namada/src/ledger/storage/mod.rs
diff --git a/shared/src/ledger/vp_host_fns.rs → crates/namada/src/ledger/vp_host_fns.rs b/shared/src/ledger/vp_host_fns.rs → crates/namada/src/ledger/vp_host_fns.rs
diff --git a/shared/src/lib.rs → crates/namada/src/lib.rs b/shared/src/lib.rs → crates/namada/src/lib.rs
diff --git a/shared/src/types/ibc/mod.rs → crates/namada/src/types/ibc/mod.rs b/shared/src/types/ibc/mod.rs → crates/namada/src/types/ibc/mod.rs
diff --git a/shared/src/types/key/mod.rs → crates/namada/src/types/key/mod.rs b/shared/src/types/key/mod.rs → crates/namada/src/types/key/mod.rs
diff --git a/shared/src/types/mod.rs → crates/namada/src/types/mod.rs b/shared/src/types/mod.rs → crates/namada/src/types/mod.rs
diff --git a/shared/src/vm/host_env.rs → crates/namada/src/vm/host_env.rs b/shared/src/vm/host_env.rs → crates/namada/src/vm/host_env.rs
diff --git a/shared/src/vm/memory.rs → crates/namada/src/vm/memory.rs b/shared/src/vm/memory.rs → crates/namada/src/vm/memory.rs
diff --git a/shared/src/vm/mod.rs → crates/namada/src/vm/mod.rs b/shared/src/vm/mod.rs → crates/namada/src/vm/mod.rs
diff --git a/shared/src/vm/prefix_iter.rs → crates/namada/src/vm/prefix_iter.rs b/shared/src/vm/prefix_iter.rs → crates/namada/src/vm/prefix_iter.rs
diff --git a/shared/src/vm/types.rs → crates/namada/src/vm/types.rs b/shared/src/vm/types.rs → crates/namada/src/vm/types.rs
diff --git a/...d/src/vm/wasm/compilation_cache/common.rs → ...a/src/vm/wasm/compilation_cache/common.rs b/...d/src/vm/wasm/compilation_cache/common.rs → ...a/src/vm/wasm/compilation_cache/common.rs
diff --git a/shared/src/vm/wasm/compilation_cache/mod.rs → ...mada/src/vm/wasm/compilation_cache/mod.rs b/shared/src/vm/wasm/compilation_cache/mod.rs → ...mada/src/vm/wasm/compilation_cache/mod.rs
diff --git a/shared/src/vm/wasm/compilation_cache/tx.rs → ...amada/src/vm/wasm/compilation_cache/tx.rs b/shared/src/vm/wasm/compilation_cache/tx.rs → ...amada/src/vm/wasm/compilation_cache/tx.rs
diff --git a/shared/src/vm/wasm/compilation_cache/vp.rs → ...amada/src/vm/wasm/compilation_cache/vp.rs b/shared/src/vm/wasm/compilation_cache/vp.rs → ...amada/src/vm/wasm/compilation_cache/vp.rs
diff --git a/shared/src/vm/wasm/host_env.rs → crates/namada/src/vm/wasm/host_env.rs b/shared/src/vm/wasm/host_env.rs → crates/namada/src/vm/wasm/host_env.rs
diff --git a/shared/src/vm/wasm/memory.rs → crates/namada/src/vm/wasm/memory.rs b/shared/src/vm/wasm/memory.rs → crates/namada/src/vm/wasm/memory.rs
diff --git a/shared/src/vm/wasm/mod.rs → crates/namada/src/vm/wasm/mod.rs b/shared/src/vm/wasm/mod.rs → crates/namada/src/vm/wasm/mod.rs
diff --git a/shared/src/vm/wasm/run.rs → crates/namada/src/vm/wasm/run.rs b/shared/src/vm/wasm/run.rs → crates/namada/src/vm/wasm/run.rs
diff --git a/parameters/Cargo.toml → crates/parameters/Cargo.toml b/parameters/Cargo.toml → crates/parameters/Cargo.toml
diff --git a/parameters/src/lib.rs → crates/parameters/src/lib.rs b/parameters/src/lib.rs → crates/parameters/src/lib.rs
diff --git a/parameters/src/storage.rs → crates/parameters/src/storage.rs b/parameters/src/storage.rs → crates/parameters/src/storage.rs
diff --git a/proof_of_stake/Cargo.toml → crates/proof_of_stake/Cargo.toml b/proof_of_stake/Cargo.toml → crates/proof_of_stake/Cargo.toml
diff --git a/...f_of_stake/proptest-regressions/tests.txt → ...f_of_stake/proptest-regressions/tests.txt b/...f_of_stake/proptest-regressions/tests.txt → ...f_of_stake/proptest-regressions/tests.txt
diff --git a/...ptest-regressions/tests/state_machine.txt → ...ptest-regressions/tests/state_machine.txt b/...ptest-regressions/tests/state_machine.txt → ...ptest-regressions/tests/state_machine.txt
diff --git a/proof_of_stake/src/epoched.rs → crates/proof_of_stake/src/epoched.rs b/proof_of_stake/src/epoched.rs → crates/proof_of_stake/src/epoched.rs
diff --git a/proof_of_stake/src/error.rs → crates/proof_of_stake/src/error.rs b/proof_of_stake/src/error.rs → crates/proof_of_stake/src/error.rs
diff --git a/proof_of_stake/src/lib.rs → crates/proof_of_stake/src/lib.rs b/proof_of_stake/src/lib.rs → crates/proof_of_stake/src/lib.rs
diff --git a/proof_of_stake/src/parameters.rs → crates/proof_of_stake/src/parameters.rs b/proof_of_stake/src/parameters.rs → crates/proof_of_stake/src/parameters.rs
diff --git a/proof_of_stake/src/pos_queries.rs → crates/proof_of_stake/src/pos_queries.rs b/proof_of_stake/src/pos_queries.rs → crates/proof_of_stake/src/pos_queries.rs
diff --git a/proof_of_stake/src/queries.rs → crates/proof_of_stake/src/queries.rs b/proof_of_stake/src/queries.rs → crates/proof_of_stake/src/queries.rs
diff --git a/proof_of_stake/src/rewards.rs → crates/proof_of_stake/src/rewards.rs b/proof_of_stake/src/rewards.rs → crates/proof_of_stake/src/rewards.rs
diff --git a/proof_of_stake/src/slashing.rs → crates/proof_of_stake/src/slashing.rs b/proof_of_stake/src/slashing.rs → crates/proof_of_stake/src/slashing.rs
diff --git a/proof_of_stake/src/storage.rs → crates/proof_of_stake/src/storage.rs b/proof_of_stake/src/storage.rs → crates/proof_of_stake/src/storage.rs
diff --git a/proof_of_stake/src/storage_key.rs → crates/proof_of_stake/src/storage_key.rs b/proof_of_stake/src/storage_key.rs → crates/proof_of_stake/src/storage_key.rs
diff --git a/proof_of_stake/src/tests/helpers.rs → crates/proof_of_stake/src/tests/helpers.rs b/proof_of_stake/src/tests/helpers.rs → crates/proof_of_stake/src/tests/helpers.rs
diff --git a/proof_of_stake/src/tests/mod.rs → crates/proof_of_stake/src/tests/mod.rs b/proof_of_stake/src/tests/mod.rs → crates/proof_of_stake/src/tests/mod.rs
diff --git a/proof_of_stake/src/tests/state_machine.rs → ...proof_of_stake/src/tests/state_machine.rs b/proof_of_stake/src/tests/state_machine.rs → ...proof_of_stake/src/tests/state_machine.rs
diff --git a/proof_of_stake/src/tests/state_machine_v2.rs → ...of_of_stake/src/tests/state_machine_v2.rs b/proof_of_stake/src/tests/state_machine_v2.rs → ...of_of_stake/src/tests/state_machine_v2.rs
diff --git a/proof_of_stake/src/tests/test_helper_fns.rs → ...oof_of_stake/src/tests/test_helper_fns.rs b/proof_of_stake/src/tests/test_helper_fns.rs → ...oof_of_stake/src/tests/test_helper_fns.rs
diff --git a/proof_of_stake/src/tests/test_pos.rs → crates/proof_of_stake/src/tests/test_pos.rs b/proof_of_stake/src/tests/test_pos.rs → crates/proof_of_stake/src/tests/test_pos.rs
diff --git a/...f_stake/src/tests/test_slash_and_redel.rs → ...f_stake/src/tests/test_slash_and_redel.rs b/...f_stake/src/tests/test_slash_and_redel.rs → ...f_stake/src/tests/test_slash_and_redel.rs
diff --git a/proof_of_stake/src/tests/test_validator.rs → ...roof_of_stake/src/tests/test_validator.rs b/proof_of_stake/src/tests/test_validator.rs → ...roof_of_stake/src/tests/test_validator.rs
diff --git a/proof_of_stake/src/tests/utils.rs → crates/proof_of_stake/src/tests/utils.rs b/proof_of_stake/src/tests/utils.rs → crates/proof_of_stake/src/tests/utils.rs
diff --git a/proof_of_stake/src/types/mod.rs → crates/proof_of_stake/src/types/mod.rs b/proof_of_stake/src/types/mod.rs → crates/proof_of_stake/src/types/mod.rs
diff --git a/proof_of_stake/src/types/rev_order.rs → crates/proof_of_stake/src/types/rev_order.rs b/proof_of_stake/src/types/rev_order.rs → crates/proof_of_stake/src/types/rev_order.rs
diff --git a/proof_of_stake/src/validator_set_update.rs → ...roof_of_stake/src/validator_set_update.rs b/proof_of_stake/src/validator_set_update.rs → ...roof_of_stake/src/validator_set_update.rs
diff --git a/sdk/Cargo.toml → crates/sdk/Cargo.toml b/sdk/Cargo.toml → crates/sdk/Cargo.toml
diff --git a/sdk/src/args.rs → crates/sdk/src/args.rs b/sdk/src/args.rs → crates/sdk/src/args.rs
diff --git a/sdk/src/control_flow/mod.rs → crates/sdk/src/control_flow/mod.rs b/sdk/src/control_flow/mod.rs → crates/sdk/src/control_flow/mod.rs
diff --git a/sdk/src/control_flow/time.rs → crates/sdk/src/control_flow/time.rs b/sdk/src/control_flow/time.rs → crates/sdk/src/control_flow/time.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Moved Rust crates into a crates sub-dir.
		([\#2386](https://github.com/anoma/namada/pull/2386))