diff --git a/Cargo.lock b/Cargo.lock
index bebf29f266..edd4c36a60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1831,18 +1831,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bigdecimal"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits 0.2.19",
- "serde",
-]
-
 [[package]]
 name = "bigdecimal"
 version = "0.4.5"
@@ -2990,7 +2978,7 @@ version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bd5c8c127b9362a12ffb9dede38e792c81b4ded5a98b448baec157b745f47d1"
 dependencies = [
- "env_logger 0.11.5",
+ "env_logger",
  "hashbrown 0.14.5",
  "indexmap 2.5.0",
  "itertools 0.12.1",
@@ -4428,15 +4416,12 @@ name = "dojo-lang"
 version = "1.0.0-alpha.13"
 dependencies = [
  "anyhow",
- "assert_fs",
- "cainome",
  "cairo-lang-compiler",
  "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-formatter",
- "cairo-lang-lowering",
  "cairo-lang-parser",
  "cairo-lang-plugins",
  "cairo-lang-project",
@@ -4450,17 +4435,12 @@ dependencies = [
  "cairo-lang-utils",
  "camino",
  "convert_case 0.6.0",
- "directories",
  "dojo-test-utils",
  "dojo-types",
  "dojo-world",
- "env_logger 0.10.2",
  "indoc 1.0.9",
  "itertools 0.12.1",
- "lazy_static",
- "num-traits 0.2.19",
  "once_cell",
- "pretty_assertions",
  "regex",
  "salsa",
  "scarb",
@@ -4468,12 +4448,9 @@ dependencies = [
  "semver 1.0.23",
  "serde",
  "serde_json",
- "serde_with 3.9.0",
  "smol_str",
  "starknet 0.12.0",
- "starknet-crypto 0.7.2",
  "test-log",
- "thiserror",
  "toml 0.8.19",
  "tracing",
  "url",
@@ -4513,10 +4490,6 @@ dependencies = [
  "anyhow",
  "assert_fs",
  "async-trait",
- "cairo-lang-compiler",
- "cairo-lang-filesystem",
- "cairo-lang-project",
- "cairo-lang-starknet",
  "camino",
  "dojo-lang",
  "dojo-world",
@@ -4531,14 +4504,9 @@ dependencies = [
  "scarb-ui",
  "serde",
  "serde_json",
- "serde_with 3.9.0",
- "smol_str",
- "starknet 0.10.0",
  "starknet 0.12.0",
  "thiserror",
- "tokio",
  "toml 0.8.19",
- "tracing",
  "url",
 ]
 
@@ -4818,19 +4786,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.11.5"
@@ -8065,7 +8020,6 @@ dependencies = [
  "anyhow",
  "auto_impl",
  "futures",
- "katana-core",
  "katana-db",
  "katana-primitives",
  "katana-runner",
@@ -8194,7 +8148,6 @@ version = "1.0.0-alpha.13"
 dependencies = [
  "proc-macro2",
  "quote",
- "starknet 0.12.0",
  "syn 2.0.77",
 ]
 
@@ -8399,9 +8352,9 @@ dependencies = [
  "getrandom",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-dns",
- "libp2p-gossipsub 0.47.1",
+ "libp2p-gossipsub",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-mdns",
@@ -8410,14 +8363,14 @@ dependencies = [
  "libp2p-ping",
  "libp2p-quic",
  "libp2p-relay",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "libp2p-tcp",
  "libp2p-upnp",
  "libp2p-websocket",
  "libp2p-yamux",
  "multiaddr 0.18.1",
  "pin-project",
- "rw-stream-sink 0.4.0 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "rw-stream-sink",
  "thiserror",
 ]
 
@@ -8426,9 +8379,9 @@ name = "libp2p-allow-block-list"
 version = "0.4.1"
 source = "git+https://github.com/libp2p/rust-libp2p?rev=cdc9638#cdc9638ac1256f8a5305adb2f50a188de8874a0f"
 dependencies = [
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "void",
 ]
 
@@ -8437,38 +8390,10 @@ name = "libp2p-connection-limits"
 version = "0.4.0"
 source = "git+https://github.com/libp2p/rust-libp2p?rev=cdc9638#cdc9638ac1256f8a5305adb2f50a188de8874a0f"
 dependencies = [
- "libp2p-core 0.42.0",
- "libp2p-identity",
- "libp2p-swarm 0.45.1",
- "void",
-]
-
-[[package]]
-name = "libp2p-core"
-version = "0.41.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
+ "libp2p-core",
  "libp2p-identity",
- "multiaddr 0.18.1",
- "multihash 0.19.1",
- "multistream-select 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "once_cell",
- "parking_lot 0.12.3",
- "pin-project",
- "quick-protobuf",
- "rand",
- "rw-stream-sink 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec",
- "thiserror",
- "tracing",
- "unsigned-varint 0.8.0",
+ "libp2p-swarm",
  "void",
- "web-time",
 ]
 
 [[package]]
@@ -8483,13 +8408,13 @@ dependencies = [
  "libp2p-identity",
  "multiaddr 0.18.1",
  "multihash 0.19.1",
- "multistream-select 0.13.0 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "multistream-select",
  "once_cell",
  "parking_lot 0.12.3",
  "pin-project",
  "quick-protobuf",
  "rand",
- "rw-stream-sink 0.4.0 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "rw-stream-sink",
  "smallvec",
  "thiserror",
  "tracing",
@@ -8506,44 +8431,13 @@ dependencies = [
  "async-trait",
  "futures",
  "hickory-resolver",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "parking_lot 0.12.3",
  "smallvec",
  "tracing",
 ]
 
-[[package]]
-name = "libp2p-gossipsub"
-version = "0.46.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d665144a616dadebdc5fff186b1233488cdcd8bfb1223218ff084b6d052c94f7"
-dependencies = [
- "asynchronous-codec",
- "base64 0.21.7",
- "byteorder",
- "bytes",
- "either",
- "fnv",
- "futures",
- "futures-ticker",
- "getrandom",
- "hex_fmt",
- "instant",
- "libp2p-core 0.41.3",
- "libp2p-identity",
- "libp2p-swarm 0.44.2",
- "prometheus-client",
- "quick-protobuf",
- "quick-protobuf-codec 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand",
- "regex",
- "sha2 0.10.8",
- "smallvec",
- "tracing",
- "void",
-]
-
 [[package]]
 name = "libp2p-gossipsub"
 version = "0.47.1"
@@ -8559,12 +8453,12 @@ dependencies = [
  "futures-ticker",
  "getrandom",
  "hex_fmt",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "prometheus-client",
  "quick-protobuf",
- "quick-protobuf-codec 0.3.1 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "quick-protobuf-codec",
  "rand",
  "regex",
  "sha2 0.10.8",
@@ -8584,12 +8478,12 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "lru",
  "quick-protobuf",
- "quick-protobuf-codec 0.3.1 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "quick-protobuf-codec",
  "smallvec",
  "thiserror",
  "tracing",
@@ -8623,9 +8517,9 @@ dependencies = [
  "futures",
  "hickory-proto",
  "if-watch",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "rand",
  "smallvec",
  "socket2 0.5.7",
@@ -8640,13 +8534,13 @@ version = "0.15.0"
 source = "git+https://github.com/libp2p/rust-libp2p?rev=cdc9638#cdc9638ac1256f8a5305adb2f50a188de8874a0f"
 dependencies = [
  "futures",
- "libp2p-core 0.42.0",
- "libp2p-gossipsub 0.47.1",
+ "libp2p-core",
+ "libp2p-gossipsub",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-ping",
  "libp2p-relay",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "pin-project",
  "prometheus-client",
  "web-time",
@@ -8661,7 +8555,7 @@ dependencies = [
  "bytes",
  "curve25519-dalek",
  "futures",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "multiaddr 0.18.1",
  "multihash 0.19.1",
@@ -8685,9 +8579,9 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "rand",
  "tracing",
  "void",
@@ -8703,7 +8597,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-tls",
  "parking_lot 0.12.3",
@@ -8728,11 +8622,11 @@ dependencies = [
  "futures",
  "futures-bounded",
  "futures-timer",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "libp2p-swarm 0.45.1",
+ "libp2p-swarm",
  "quick-protobuf",
- "quick-protobuf-codec 0.3.1 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "quick-protobuf-codec",
  "rand",
  "static_assertions",
  "thiserror",
@@ -8741,28 +8635,6 @@ dependencies = [
  "web-time",
 ]
 
-[[package]]
-name = "libp2p-swarm"
-version = "0.44.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e"
-dependencies = [
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "libp2p-core 0.41.3",
- "libp2p-identity",
- "lru",
- "multistream-select 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "once_cell",
- "rand",
- "smallvec",
- "tracing",
- "void",
-]
-
 [[package]]
 name = "libp2p-swarm"
 version = "0.45.1"
@@ -8773,11 +8645,11 @@ dependencies = [
  "futures",
  "futures-timer",
  "getrandom",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm-derive",
  "lru",
- "multistream-select 0.13.0 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "multistream-select",
  "once_cell",
  "rand",
  "smallvec",
@@ -8808,7 +8680,7 @@ dependencies = [
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "socket2 0.5.7",
  "tokio",
@@ -8822,9 +8694,9 @@ source = "git+https://github.com/libp2p/rust-libp2p?rev=cdc9638#cdc9638ac1256f8a
 dependencies = [
  "futures",
  "futures-rustls",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
- "rcgen 0.11.3",
+ "rcgen",
  "ring 0.17.8",
  "rustls 0.23.13",
  "rustls-webpki 0.101.7",
@@ -8841,8 +8713,8 @@ dependencies = [
  "futures",
  "futures-timer",
  "igd-next",
- "libp2p-core 0.42.0",
- "libp2p-swarm 0.45.1",
+ "libp2p-core",
+ "libp2p-swarm",
  "tokio",
  "tracing",
  "void",
@@ -8859,13 +8731,13 @@ dependencies = [
  "futures-timer",
  "hex",
  "if-watch",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "libp2p-webrtc-utils",
  "multihash 0.19.1",
  "rand",
- "rcgen 0.11.3",
+ "rcgen",
  "serde",
  "stun 0.6.0",
  "thiserror",
@@ -8885,11 +8757,11 @@ dependencies = [
  "bytes",
  "futures",
  "hex",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-noise",
  "quick-protobuf",
- "quick-protobuf-codec 0.3.1 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "quick-protobuf-codec",
  "rand",
  "serde",
  "sha2 0.10.8",
@@ -8908,7 +8780,7 @@ dependencies = [
  "getrandom",
  "hex",
  "js-sys",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "libp2p-webrtc-utils",
  "send_wrapper 0.6.0",
@@ -8927,11 +8799,11 @@ dependencies = [
  "either",
  "futures",
  "futures-rustls",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "libp2p-identity",
  "parking_lot 0.12.3",
  "pin-project-lite",
- "rw-stream-sink 0.4.0 (git+https://github.com/libp2p/rust-libp2p?rev=cdc9638)",
+ "rw-stream-sink",
  "soketto 0.8.0",
  "thiserror",
  "tracing",
@@ -8947,7 +8819,7 @@ dependencies = [
  "bytes",
  "futures",
  "js-sys",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "parking_lot 0.12.3",
  "send_wrapper 0.6.0",
  "thiserror",
@@ -8963,7 +8835,7 @@ source = "git+https://github.com/libp2p/rust-libp2p?rev=cdc9638#cdc9638ac1256f8a
 dependencies = [
  "either",
  "futures",
- "libp2p-core 0.42.0",
+ "libp2p-core",
  "thiserror",
  "tracing",
  "yamux 0.12.1",
@@ -9451,20 +9323,6 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
 
-[[package]]
-name = "multistream-select"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19"
-dependencies = [
- "bytes",
- "futures",
- "log",
- "pin-project",
- "smallvec",
- "unsigned-varint 0.7.2",
-]
-
 [[package]]
 name = "multistream-select"
 version = "0.13.0"
@@ -10996,19 +10854,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "quick-protobuf-codec"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "quick-protobuf",
- "thiserror",
- "unsigned-varint 0.8.0",
-]
-
 [[package]]
 name = "quick-protobuf-codec"
 version = "0.3.1"
@@ -11207,19 +11052,6 @@ dependencies = [
  "yasna",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54077e1872c46788540de1ea3d7f4ccb1983d12f9aa909b234468676c1a36779"
-dependencies = [
- "pem",
- "ring 0.17.8",
- "rustls-pki-types",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "redb"
 version = "2.1.3"
@@ -12009,17 +11841,6 @@ dependencies = [
  "wait-timeout",
 ]
 
-[[package]]
-name = "rw-stream-sink"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1"
-dependencies = [
- "futures",
- "pin-project",
- "static_assertions",
-]
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.4.0"
@@ -12111,7 +11932,7 @@ version = "1.0.0-alpha.13"
 dependencies = [
  "anyhow",
  "async-trait",
- "bigdecimal 0.4.5",
+ "bigdecimal",
  "cairo-felt",
  "cairo-proof-parser",
  "celestia-rpc",
@@ -13044,7 +12865,7 @@ dependencies = [
  "anyhow",
  "assert_fs",
  "async-trait",
- "bigdecimal 0.4.5",
+ "bigdecimal",
  "cainome",
  "cairo-lang-compiler",
  "cairo-lang-defs",
@@ -13108,7 +12929,7 @@ dependencies = [
  "anyhow",
  "assert_fs",
  "async-trait",
- "bigdecimal 0.4.5",
+ "bigdecimal",
  "cainome",
  "cairo-lang-compiler",
  "cairo-lang-defs",
@@ -13149,7 +12970,6 @@ dependencies = [
  "sozo-walnut",
  "starknet 0.12.0",
  "starknet-crypto 0.7.2",
- "tee",
  "thiserror",
  "tokio",
  "toml 0.8.19",
@@ -13442,22 +13262,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "starknet"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20b9a7b7bfd87287af85854f7458b8170ba6aa59c39113436532b7ff3d2fcbd8"
-dependencies = [
- "starknet-accounts 0.9.0",
- "starknet-contract 0.9.0",
- "starknet-core 0.10.0",
- "starknet-crypto 0.6.2",
- "starknet-ff",
- "starknet-macros 0.1.7",
- "starknet-providers 0.10.0",
- "starknet-signers 0.8.0",
-]
-
 [[package]]
 name = "starknet"
 version = "0.11.0"
@@ -13468,7 +13272,7 @@ dependencies = [
  "starknet-contract 0.10.0",
  "starknet-core 0.11.1",
  "starknet-crypto 0.7.2",
- "starknet-macros 0.2.1",
+ "starknet-macros",
  "starknet-providers 0.11.0",
  "starknet-signers 0.9.0",
 ]
@@ -13483,25 +13287,11 @@ dependencies = [
  "starknet-contract 0.11.0",
  "starknet-core 0.12.0",
  "starknet-crypto 0.7.2",
- "starknet-macros 0.2.1",
+ "starknet-macros",
  "starknet-providers 0.12.0",
  "starknet-signers 0.10.0",
 ]
 
-[[package]]
-name = "starknet-accounts"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2095d7584608ae1707bd1cf2889368ab3734d9f54e4fcef4765cba1f3b3f7618"
-dependencies = [
- "async-trait",
- "auto_impl",
- "starknet-core 0.10.0",
- "starknet-providers 0.10.0",
- "starknet-signers 0.8.0",
- "thiserror",
-]
-
 [[package]]
 name = "starknet-accounts"
 version = "0.10.0"
@@ -13532,21 +13322,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "starknet-contract"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3b73d437b4d62241612d13fce612602de6684c149cccf696e76a20757e2156"
-dependencies = [
- "serde",
- "serde_json",
- "serde_with 2.3.3",
- "starknet-accounts 0.9.0",
- "starknet-core 0.10.0",
- "starknet-providers 0.10.0",
- "thiserror",
-]
-
 [[package]]
 name = "starknet-contract"
 version = "0.10.0"
@@ -13577,24 +13352,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "starknet-core"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ed286d637e34fb8ae1cd2f9615120ec8ff38d1cffd311ed7fdd497cdd2bd01f"
-dependencies = [
- "base64 0.21.7",
- "flate2",
- "hex",
- "serde",
- "serde_json",
- "serde_json_pythonic",
- "serde_with 2.3.3",
- "sha3",
- "starknet-crypto 0.6.2",
- "starknet-ff",
-]
-
 [[package]]
 name = "starknet-core"
 version = "0.11.1"
@@ -13737,22 +13494,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abf1b44ec5b18d87c1ae5f54590ca9d0699ef4dd5b2ffa66fc97f24613ec585"
 dependencies = [
  "ark-ff 0.4.2",
- "bigdecimal 0.3.1",
  "crypto-bigint",
  "getrandom",
  "hex",
- "num-bigint",
- "serde",
-]
-
-[[package]]
-name = "starknet-macros"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d549d3078bdbe775d0deaa8ddb57a19942989ce7c1f2dfd60beeb322bb4945"
-dependencies = [
- "starknet-core 0.10.0",
- "syn 2.0.77",
 ]
 
 [[package]]
@@ -13765,26 +13509,6 @@ dependencies = [
  "syn 2.0.77",
 ]
 
-[[package]]
-name = "starknet-providers"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6abf40ffcbe3b887b4d5cfc8ab73170c816b4aa78d1d4ad59abd3fb3b0f53cd"
-dependencies = [
- "async-trait",
- "auto_impl",
- "ethereum-types",
- "flate2",
- "log",
- "reqwest 0.11.27",
- "serde",
- "serde_json",
- "serde_with 2.3.3",
- "starknet-core 0.10.0",
- "thiserror",
- "url",
-]
-
 [[package]]
 name = "starknet-providers"
 version = "0.11.0"
@@ -13827,22 +13551,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "starknet-signers"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9a2bd4fd66090003c3b7f0d76476e5b63cd44f6a49ede2442673f4427d5a40"
-dependencies = [
- "async-trait",
- "auto_impl",
- "crypto-bigint",
- "eth-keystore",
- "rand",
- "starknet-core 0.10.0",
- "starknet-crypto 0.6.2",
- "thiserror",
-]
-
 [[package]]
 name = "starknet-signers"
 version = "0.9.0"
@@ -14239,12 +13947,6 @@ dependencies = [
  "xattr",
 ]
 
-[[package]]
-name = "tee"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da"
-
 [[package]]
 name = "tempfile"
 version = "3.12.0"
@@ -14269,15 +13971,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -14290,7 +13983,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
 dependencies = [
- "env_logger 0.11.5",
+ "env_logger",
  "test-log-macros",
  "tracing-subscriber",
 ]
@@ -14818,7 +14511,6 @@ dependencies = [
  "dojo-world",
  "futures",
  "futures-util",
- "libp2p-gossipsub 0.46.1",
  "num-traits 0.2.19",
  "parking_lot 0.12.3",
  "prost 0.11.9",
@@ -14847,7 +14539,6 @@ dependencies = [
  "cainome",
  "camino",
  "chrono",
- "clap",
  "crypto-bigint",
  "dojo-test-utils",
  "dojo-types",
@@ -14856,25 +14547,19 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "hashlink 0.9.1",
- "hex",
  "katana-runner",
- "lazy_static",
- "log",
  "num-traits 0.2.19",
  "once_cell",
  "reqwest 0.12.7",
  "scarb",
- "scarb-ui",
  "serde",
  "serde_json",
  "slab",
- "sozo-ops",
  "sqlx",
  "starknet 0.12.0",
  "starknet-crypto 0.7.2",
  "thiserror",
  "tokio",
- "tokio-stream",
  "tokio-util",
  "tracing",
 ]
@@ -14926,7 +14611,6 @@ dependencies = [
 name = "torii-grpc"
 version = "1.0.0-alpha.13"
 dependencies = [
- "bytes",
  "cainome",
  "camino",
  "crypto-bigint",
@@ -14936,12 +14620,9 @@ dependencies = [
  "dojo-world",
  "futures",
  "futures-util",
- "hex",
  "hyper 0.14.30",
- "itertools 0.12.1",
  "katana-runner",
  "num-traits 0.2.19",
- "parking_lot 0.12.3",
  "prost 0.11.9",
  "prost 0.12.6",
  "rand",
@@ -14949,7 +14630,6 @@ dependencies = [
  "scarb",
  "serde",
  "serde_json",
- "sozo-ops",
  "sqlx",
  "starknet 0.12.0",
  "starknet-crypto 0.7.2",
@@ -14968,7 +14648,6 @@ dependencies = [
  "torii-core",
  "tower 0.4.13",
  "tracing",
- "url",
 ]
 
 [[package]]
@@ -14976,11 +14655,9 @@ name = "torii-relay"
 version = "1.0.0-alpha.13"
 dependencies = [
  "anyhow",
- "async-trait",
  "cainome",
  "chrono",
  "crypto-bigint",
- "dojo-test-utils",
  "dojo-types",
  "dojo-world",
  "futures",
@@ -14991,8 +14668,6 @@ dependencies = [
  "libp2p-webrtc-websys",
  "libp2p-websocket-websys",
  "rand",
- "rcgen 0.13.1",
- "regex",
  "serde",
  "serde_json",
  "sqlx",
@@ -15903,7 +15578,7 @@ dependencies = [
  "log",
  "pem",
  "rand",
- "rcgen 0.11.3",
+ "rcgen",
  "regex",
  "ring 0.16.20",
  "rtcp",
@@ -15967,7 +15642,7 @@ dependencies = [
  "pem",
  "rand",
  "rand_core",
- "rcgen 0.11.3",
+ "rcgen",
  "ring 0.16.20",
  "rustls 0.21.12",
  "sec1",
diff --git a/Cargo.toml b/Cargo.toml
index 0e5ed4668d..fd827c9873 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -197,6 +197,7 @@ tempfile = "3.9.0"
 test-log = "0.2.11"
 thiserror = "1.0.32"
 tokio = { version = "1.39.2", features = [ "full" ] }
+tokio-util = "0.7.12"
 toml = "0.8"
 tower = "0.4.13"
 tower-http = "0.4.4"
diff --git a/crates/dojo-lang/Cargo.toml b/crates/dojo-lang/Cargo.toml
index 9ea864b22e..54856968ca 100644
--- a/crates/dojo-lang/Cargo.toml
+++ b/crates/dojo-lang/Cargo.toml
@@ -11,15 +11,11 @@ testing = [  ]
 
 [dependencies]
 anyhow.workspace = true
-cainome.workspace = true
 cairo-lang-compiler.workspace = true
-cairo-lang-debug.workspace = true
 cairo-lang-defs.workspace = true
 cairo-lang-diagnostics.workspace = true
 cairo-lang-filesystem.workspace = true
 cairo-lang-formatter.workspace = true
-cairo-lang-lowering.workspace = true
-cairo-lang-parser.workspace = true
 cairo-lang-plugins.workspace = true
 cairo-lang-project.workspace = true
 cairo-lang-semantic.workspace = true
@@ -31,35 +27,28 @@ cairo-lang-test-plugin.workspace = true
 cairo-lang-utils.workspace = true
 camino.workspace = true
 convert_case.workspace = true
-directories = "5"
-dojo-types = { path = "../dojo-types" }
-dojo-world = { path = "../dojo-world", features = [ "manifest", "metadata" ] }
+dojo-types.workspace = true
+dojo-world = { workspace = true, features = [ "manifest", "metadata" ] }
 indoc.workspace = true
 itertools.workspace = true
-lazy_static.workspace = true
-num-traits.workspace = true
-once_cell.workspace = true
 regex.workspace = true
-salsa.workspace = true
 scarb.workspace = true
 scarb-ui.workspace = true
 semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_with.workspace = true
 smol_str.workspace = true
 starknet.workspace = true
-starknet-crypto.workspace = true
-thiserror.workspace = true
 toml.workspace = true
 tracing.workspace = true
 url.workspace = true
 
 [dev-dependencies]
-assert_fs.workspace = true
+cairo-lang-debug.workspace = true
+cairo-lang-parser.workspace = true
 cairo-lang-semantic.workspace = true
 cairo-lang-test-utils.workspace = true
-dojo-test-utils = { path = "../dojo-test-utils" }
-env_logger = "0.10.0"
-pretty_assertions.workspace = true
+dojo-test-utils.workspace = true
+once_cell.workspace = true
+salsa.workspace = true
 test-log.workspace = true
diff --git a/crates/dojo-lang/src/lib.rs b/crates/dojo-lang/src/lib.rs
index 4ed4b70c41..234fe5eb3a 100644
--- a/crates/dojo-lang/src/lib.rs
+++ b/crates/dojo-lang/src/lib.rs
@@ -1,3 +1,5 @@
+#![warn(unused_crate_dependencies)]
+
 //! Dojo capabilities and utilities on top of Starknet.
 //!
 //! Dojo is a full stack toolchain for developing onchain games in Cairo.
diff --git a/crates/dojo-test-utils/Cargo.toml b/crates/dojo-test-utils/Cargo.toml
index ebd89181f2..9a2bd63c95 100644
--- a/crates/dojo-test-utils/Cargo.toml
+++ b/crates/dojo-test-utils/Cargo.toml
@@ -9,10 +9,6 @@ version.workspace = true
 anyhow.workspace = true
 assert_fs.workspace = true
 async-trait.workspace = true
-cairo-lang-compiler.workspace = true
-cairo-lang-filesystem.workspace = true
-cairo-lang-project.workspace = true
-cairo-lang-starknet.workspace = true
 camino.workspace = true
 dojo-lang = { path = "../dojo-lang" }
 dojo-world = { path = "../dojo-world", features = [ "manifest", "migration" ] }
@@ -23,18 +19,13 @@ katana-node.workspace = true
 katana-primitives = { path = "../katana/primitives" }
 katana-rpc = { path = "../katana/rpc/rpc" }
 katana-rpc-api = { path = "../katana/rpc/rpc-api" }
-katana-starknet = { package = "starknet", version = "=0.10.0" }
 scarb.workspace = true
 scarb-ui.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_with.workspace = true
-smol_str.workspace = true
 starknet.workspace = true
 thiserror.workspace = true
-tokio = { version = "1.28.0", features = [ "full" ] }
 toml.workspace = true
-tracing.workspace = true
 url.workspace = true
 
 [build-dependencies]
diff --git a/crates/dojo-test-utils/src/lib.rs b/crates/dojo-test-utils/src/lib.rs
index 9ec340c425..48fcaf5848 100644
--- a/crates/dojo-test-utils/src/lib.rs
+++ b/crates/dojo-test-utils/src/lib.rs
@@ -1,3 +1,5 @@
+#![warn(unused_crate_dependencies)]
+
 pub mod compiler;
 pub mod migration;
 pub mod rpc;
diff --git a/crates/katana/runner/macro/Cargo.toml b/crates/katana/runner/macro/Cargo.toml
index 45c0ce5064..a8e2689be0 100644
--- a/crates/katana/runner/macro/Cargo.toml
+++ b/crates/katana/runner/macro/Cargo.toml
@@ -11,6 +11,3 @@ proc-macro = true
 proc-macro2 = "1.0.86"
 quote = "1.0"
 syn = { version = "2.0", features = [ "fold", "full" ] }
-
-[dev-dependencies]
-starknet.workspace = true
diff --git a/crates/katana/storage/provider/Cargo.toml b/crates/katana/storage/provider/Cargo.toml
index b9c0379152..4cf24e81b8 100644
--- a/crates/katana/storage/provider/Cargo.toml
+++ b/crates/katana/storage/provider/Cargo.toml
@@ -32,7 +32,6 @@ test-utils = [ "dep:alloy-primitives", "dep:serde_json" ]
 
 [dev-dependencies]
 alloy-primitives.workspace = true
-katana-core.workspace = true
 katana-runner.workspace = true
 lazy_static.workspace = true
 rand.workspace = true
diff --git a/crates/katana/tasks/Cargo.toml b/crates/katana/tasks/Cargo.toml
index fda68dc089..cc4a897f39 100644
--- a/crates/katana/tasks/Cargo.toml
+++ b/crates/katana/tasks/Cargo.toml
@@ -11,5 +11,5 @@ rayon.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tokio-metrics = "0.3.1"
-tokio-util = { version = "0.7.11", features = [ "rt" ] }
+tokio-util = { workspace = true, features = [ "rt" ] }
 tracing.workspace = true
diff --git a/crates/sozo/ops/Cargo.toml b/crates/sozo/ops/Cargo.toml
index a3ff511a4a..0204596429 100644
--- a/crates/sozo/ops/Cargo.toml
+++ b/crates/sozo/ops/Cargo.toml
@@ -60,7 +60,6 @@ assert_fs.workspace = true
 dojo-test-utils = { workspace = true, features = [ "build-examples" ] }
 ipfs-api-backend-hyper = { git = "https://github.com/ferristseng/rust-ipfs-api", rev = "af2c17f7b19ef5b9898f458d97a90055c3605633", features = [ "with-hyper-rustls" ] }
 katana-runner.workspace = true
-tee = "0.1.0"
 
 [features]
 test-utils = [ "dep:dojo-test-utils", "dep:katana-runner" ]
diff --git a/crates/torii/client/Cargo.toml b/crates/torii/client/Cargo.toml
index 459f1b8b84..0c7f7ec51b 100644
--- a/crates/torii/client/Cargo.toml
+++ b/crates/torii/client/Cargo.toml
@@ -8,11 +8,10 @@ version.workspace = true
 [dependencies]
 async-trait.workspace = true
 crypto-bigint.workspace = true
-dojo-types = { path = "../../dojo-types" }
-dojo-world = { path = "../../dojo-world", features = [ "contracts" ] }
+dojo-types.workspace = true
+dojo-world = { workspace = true, features = [ "contracts" ] }
 futures.workspace = true
 futures-util.workspace = true
-libp2p-gossipsub = "0.46.1"
 num-traits.workspace = true
 parking_lot.workspace = true
 serde.workspace = true
@@ -21,8 +20,8 @@ starknet.workspace = true
 starknet-crypto.workspace = true
 thiserror.workspace = true
 tokio = { version = "1.32.0", features = [ "sync" ], default-features = false }
-torii-grpc = { path = "../grpc", features = [ "client" ] }
-torii-relay = { path = "../libp2p" }
+torii-grpc = { workspace = true, features = [ "client" ] }
+torii-relay = { workspace = true }
 url.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
@@ -35,5 +34,5 @@ wasm-tonic.workspace = true
 
 [dev-dependencies]
 camino.workspace = true
-dojo-world = { path = "../../dojo-world" }
+dojo-world.workspace = true
 tokio.workspace = true
diff --git a/crates/torii/core/Cargo.toml b/crates/torii/core/Cargo.toml
index d21c4c06b0..a1221b1f0d 100644
--- a/crates/torii/core/Cargo.toml
+++ b/crates/torii/core/Cargo.toml
@@ -12,39 +12,32 @@ version.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 base64.workspace = true
+bitflags = "2.6.0"
 cainome.workspace = true
 chrono.workspace = true
 crypto-bigint.workspace = true
-dojo-types = { path = "../../dojo-types" }
-dojo-world = { path = "../../dojo-world", features = [ "contracts", "manifest" ] }
+dojo-types.workspace = true
+dojo-world = { workspace = true, features = [ "contracts", "manifest" ] }
 futures-channel = "0.3.0"
 futures-util.workspace = true
 hashlink.workspace = true
-hex.workspace = true
-lazy_static.workspace = true
-log.workspace = true
 num-traits.workspace = true
 once_cell.workspace = true
 reqwest.workspace = true
-scarb-ui.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 slab = "0.4.2"
-sozo-ops.workspace = true
 sqlx.workspace = true
-starknet-crypto.workspace = true
 starknet.workspace = true
+starknet-crypto.workspace = true
 thiserror.workspace = true
 tokio = { version = "1.32.0", features = [ "sync" ], default-features = true }
-tokio-stream = "0.1.11"
-tokio-util = "0.7.7"
+tokio-util.workspace = true
 tracing.workspace = true
-clap.workspace = true
-bitflags = "2.6.0"
 
 [dev-dependencies]
 camino.workspace = true
-dojo-test-utils = { path = "../../dojo-test-utils" }
+dojo-test-utils.workspace = true
 dojo-utils.workspace = true
 katana-runner.workspace = true
 scarb.workspace = true
diff --git a/crates/torii/core/src/lib.rs b/crates/torii/core/src/lib.rs
index df6e8b3adc..fe7ae8f4bc 100644
--- a/crates/torii/core/src/lib.rs
+++ b/crates/torii/core/src/lib.rs
@@ -1,3 +1,5 @@
+#![warn(unused_crate_dependencies)]
+
 pub mod cache;
 pub mod engine;
 pub mod error;
diff --git a/crates/torii/graphql/Cargo.toml b/crates/torii/graphql/Cargo.toml
index 464dddefb6..fd7c03236e 100644
--- a/crates/torii/graphql/Cargo.toml
+++ b/crates/torii/graphql/Cargo.toml
@@ -18,33 +18,33 @@ base64.workspace = true
 cainome.workspace = true
 chrono.workspace = true
 convert_case = "0.6.0"
-dojo-types = { path = "../../dojo-types" }
+dojo-types.workspace = true
 lazy_static.workspace = true
 regex.workspace = true
 scarb-ui.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-sozo-ops.workspace = true
 sqlx.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 thiserror.workspace = true
+tokio.workspace = true
 tokio-stream = "0.1.11"
 tokio-util = "0.7.7"
-tokio.workspace = true
 toml.workspace = true
-torii-core = { path = "../core" }
+torii-core.workspace = true
 tracing.workspace = true
 url.workspace = true
 warp.workspace = true
 
 [dev-dependencies]
 camino.workspace = true
-dojo-test-utils = { path = "../../dojo-test-utils", features = [ "build-examples" ] }
+dojo-test-utils = { workspace = true, features = [ "build-examples" ] }
 dojo-utils.workspace = true
 dojo-world.workspace = true
 katana-runner.workspace = true
 scarb.workspace = true
 serial_test = "2.0.0"
-starknet-crypto.workspace = true
+sozo-ops.workspace = true
 starknet.workspace = true
+starknet-crypto.workspace = true
diff --git a/crates/torii/grpc/Cargo.toml b/crates/torii/grpc/Cargo.toml
index c4eb6021e7..492cc9da34 100644
--- a/crates/torii/grpc/Cargo.toml
+++ b/crates/torii/grpc/Cargo.toml
@@ -6,16 +6,13 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-bytes.workspace = true
-dojo-types = { path = "../../dojo-types" }
-futures-util.workspace = true
+dojo-types.workspace = true
 futures.workspace = true
+futures-util.workspace = true
 num-traits.workspace = true
-parking_lot.workspace = true
 rayon.workspace = true
-itertools.workspace = true
-starknet-crypto.workspace = true
 starknet.workspace = true
+starknet-crypto.workspace = true
 thiserror.workspace = true
 torii-core = { path = "../core", optional = true }
 
@@ -26,7 +23,6 @@ strum_macros.workspace = true
 
 # server
 dojo-world = { path = "../../dojo-world", features = [ "contracts" ] }
-hex.workspace = true
 hyper.workspace = true
 rand.workspace = true
 serde_json.workspace = true
@@ -40,7 +36,6 @@ dojo-test-utils.workspace = true
 dojo-utils.workspace = true
 katana-runner.workspace = true
 scarb.workspace = true
-sozo-ops.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 tonic-web-wasm-client.workspace = true
@@ -50,12 +45,11 @@ wasm-tonic.workspace = true
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 prost.workspace = true
 sqlx.workspace = true
-tokio-stream = "0.1.14"
 tokio.workspace = true
+tokio-stream = "0.1.14"
+tonic.workspace = true
 tonic-reflection.workspace = true
 tonic-web.workspace = true
-tonic.workspace = true
-url.workspace = true
 
 [build-dependencies]
 tonic-build.workspace = true
diff --git a/crates/torii/grpc/src/lib.rs b/crates/torii/grpc/src/lib.rs
index 1fb5da7eb7..ea54cebf02 100644
--- a/crates/torii/grpc/src/lib.rs
+++ b/crates/torii/grpc/src/lib.rs
@@ -1,3 +1,5 @@
+#![warn(unused_crate_dependencies)]
+
 #[cfg(target_arch = "wasm32")]
 extern crate wasm_prost as prost;
 #[cfg(target_arch = "wasm32")]
diff --git a/crates/torii/libp2p/Cargo.toml b/crates/torii/libp2p/Cargo.toml
index b9d14ace28..ee7abd13a1 100644
--- a/crates/torii/libp2p/Cargo.toml
+++ b/crates/torii/libp2p/Cargo.toml
@@ -13,32 +13,28 @@ rand.workspace = true
 serde.workspace = true
 # preserve order
 anyhow.workspace = true
-async-trait.workspace = true
 cainome.workspace = true
 chrono.workspace = true
 crypto-bigint.workspace = true
 dojo-types.workspace = true
 dojo-world = { path = "../../dojo-world", features = [ "contracts" ] }
 indexmap.workspace = true
-regex.workspace = true
 serde_json.workspace = true
 starknet.workspace = true
 starknet-crypto.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
-tracing-subscriber = { version = "0.3", features = [ "env-filter" ] }
 
 [dev-dependencies]
-dojo-test-utils.workspace = true
 katana-runner.workspace = true
 tempfile.workspace = true
+tokio.workspace = true
+tracing-subscriber.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 libp2p = { git = "https://github.com/libp2p/rust-libp2p", features = [ "dns", "ed25519", "gossipsub", "identify", "macros", "noise", "ping", "quic", "relay", "tcp", "tokio", "websocket", "yamux" ], rev = "cdc9638" }
 libp2p-webrtc = { git = "https://github.com/libp2p/rust-libp2p", features = [ "pem", "tokio" ], rev = "cdc9638" }
-rcgen = "0.13.1"
 sqlx.workspace = true
-tokio.workspace = true
 torii-core.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
diff --git a/crates/torii/libp2p/src/lib.rs b/crates/torii/libp2p/src/lib.rs
index 1eaf1a17bd..9d08de68c6 100644
--- a/crates/torii/libp2p/src/lib.rs
+++ b/crates/torii/libp2p/src/lib.rs
@@ -1,3 +1,5 @@
+#![warn(unused_crate_dependencies)]
+
 pub mod client;
 mod constants;
 pub mod errors;