diff --git a/Cargo.lock b/Cargo.lock
index a4ff27151a..b2aa597e95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3836,6 +3836,7 @@ dependencies = [
 [[package]]
 name = "create-output-dir"
 version = "1.0.0"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "anyhow",
  "core-foundation 0.10.0",
@@ -4548,7 +4549,29 @@ dependencies = [
  "cairo-lang-semantic",
  "cairo-lang-syntax",
  "cairo-lang-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
+ "itertools 0.12.1",
+ "serde",
+ "smol_str",
+ "starknet",
+ "starknet-crypto 0.7.2",
+ "tracing",
+]
+
+[[package]]
+name = "dojo-lang"
+version = "1.1.2"
+source = "git+https://github.com/dojoengine/dojo?rev=86bb5ae#86bb5aea7c2210d31ba16ecdfd45146aa665cd5e"
+dependencies = [
+ "anyhow",
+ "cairo-lang-defs",
+ "cairo-lang-diagnostics",
+ "cairo-lang-filesystem",
+ "cairo-lang-plugins",
+ "cairo-lang-semantic",
+ "cairo-lang-syntax",
+ "cairo-lang-utils",
+ "dojo-types 1.1.2 (git+https://github.com/dojoengine/dojo?rev=86bb5ae)",
  "itertools 0.12.1",
  "serde",
  "smol_str",
@@ -4563,7 +4586,7 @@ version = "1.1.2"
 dependencies = [
  "cairo-lang-language-server",
  "clap",
- "dojo-lang",
+ "dojo-lang 1.1.2",
 ]
 
 [[package]]
@@ -4627,6 +4650,28 @@ dependencies = [
  "thiserror 1.0.63",
 ]
 
+[[package]]
+name = "dojo-types"
+version = "1.1.2"
+source = "git+https://github.com/dojoengine/dojo?rev=86bb5ae#86bb5aea7c2210d31ba16ecdfd45146aa665cd5e"
+dependencies = [
+ "anyhow",
+ "cainome 0.4.11",
+ "crypto-bigint",
+ "hex",
+ "indexmap 2.5.0",
+ "itertools 0.12.1",
+ "num-traits 0.2.19",
+ "regex",
+ "serde",
+ "serde_json",
+ "starknet",
+ "starknet-crypto 0.7.2",
+ "strum 0.25.0",
+ "strum_macros 0.25.3",
+ "thiserror 1.0.63",
+]
+
 [[package]]
 name = "dojo-utils"
 version = "1.1.2"
@@ -4653,7 +4698,7 @@ dependencies = [
  "async-trait",
  "cainome 0.4.11",
  "cairo-lang-starknet-classes",
- "dojo-types",
+ "dojo-types 1.1.2",
  "futures",
  "hex",
  "hex-literal",
@@ -12385,6 +12430,7 @@ dependencies = [
 [[package]]
 name = "scarb"
 version = "2.9.2"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -12416,7 +12462,7 @@ dependencies = [
  "derive_builder",
  "dialoguer",
  "directories",
- "dojo-lang",
+ "dojo-lang 1.1.2 (git+https://github.com/dojoengine/dojo?rev=86bb5ae)",
  "dunce",
  "flate2",
  "fs4",
@@ -12437,9 +12483,9 @@ dependencies = [
  "redb",
  "reqwest 0.11.27",
  "scarb-build-metadata",
- "scarb-metadata 1.13.0",
- "scarb-proc-macro-server-types 0.1.0",
- "scarb-stable-hash 1.0.0",
+ "scarb-metadata 1.13.0 (git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480)",
+ "scarb-proc-macro-server-types 0.1.0 (git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480)",
+ "scarb-stable-hash 1.0.0 (git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480)",
  "scarb-ui",
  "semver 1.0.23",
  "serde",
@@ -12469,6 +12515,7 @@ dependencies = [
 [[package]]
 name = "scarb-build-metadata"
 version = "2.9.2"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "cargo_metadata",
 ]
@@ -12476,31 +12523,34 @@ dependencies = [
 [[package]]
 name = "scarb-metadata"
 version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a8b71f63999dbb6d269fbc6fd61310016ab3a160fb13e52a6511a2b904359f0"
 dependencies = [
  "camino",
- "derive_builder",
  "semver 1.0.23",
  "serde",
  "serde_json",
- "thiserror 2.0.11",
+ "thiserror 1.0.63",
 ]
 
 [[package]]
 name = "scarb-metadata"
 version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a8b71f63999dbb6d269fbc6fd61310016ab3a160fb13e52a6511a2b904359f0"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "camino",
+ "derive_builder",
  "semver 1.0.23",
  "serde",
  "serde_json",
- "thiserror 1.0.63",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
 name = "scarb-proc-macro-server-types"
 version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cb73a7fb2681885d05a1d918f95b179c034fb5d5a57adfbb718f36946fe5ade"
 dependencies = [
  "cairo-lang-macro",
  "serde",
@@ -12510,8 +12560,7 @@ dependencies = [
 [[package]]
 name = "scarb-proc-macro-server-types"
 version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb73a7fb2681885d05a1d918f95b179c034fb5d5a57adfbb718f36946fe5ade"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "cairo-lang-macro",
  "serde",
@@ -12521,6 +12570,8 @@ dependencies = [
 [[package]]
 name = "scarb-stable-hash"
 version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1902536b23a05dd165d3992865870aaf1b0650317767cbf171ed2ca5903732a9"
 dependencies = [
  "data-encoding",
  "xxhash-rust",
@@ -12529,8 +12580,7 @@ dependencies = [
 [[package]]
 name = "scarb-stable-hash"
 version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1902536b23a05dd165d3992865870aaf1b0650317767cbf171ed2ca5903732a9"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "data-encoding",
  "xxhash-rust",
@@ -12539,13 +12589,14 @@ dependencies = [
 [[package]]
 name = "scarb-ui"
 version = "0.1.5"
+source = "git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480#22aa38f53de205af25bf73b3ffc2c5334999d480"
 dependencies = [
  "anyhow",
  "camino",
  "clap",
  "console",
  "indicatif",
- "scarb-metadata 1.13.0",
+ "scarb-metadata 1.13.0 (git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480)",
  "serde",
  "serde_json",
  "tracing-core",
@@ -13249,7 +13300,7 @@ dependencies = [
  "colored",
  "dojo-bindgen",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "katana-rpc-api",
@@ -13257,7 +13308,7 @@ dependencies = [
  "notify",
  "reqwest 0.11.27",
  "scarb",
- "scarb-metadata 1.13.0",
+ "scarb-metadata 1.13.0 (git+https://github.com/dojoengine/scarb?rev=22aa38f53de205af25bf73b3ffc2c5334999d480)",
  "scarb-ui",
  "semver 1.0.23",
  "serde",
@@ -13290,7 +13341,7 @@ dependencies = [
  "colored",
  "colored_json",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "futures",
@@ -14822,7 +14873,7 @@ dependencies = [
  "async-trait",
  "camino",
  "crypto-bigint",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-world",
  "futures",
  "futures-util",
@@ -14856,7 +14907,7 @@ dependencies = [
  "chrono",
  "convert_case 0.6.0",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "katana-runner",
@@ -14892,7 +14943,7 @@ dependencies = [
  "camino",
  "crypto-bigint",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "futures",
@@ -14945,7 +14996,7 @@ dependencies = [
  "crypto-bigint",
  "data-url",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "futures-channel",
@@ -14979,7 +15030,7 @@ version = "1.1.2"
 dependencies = [
  "anyhow",
  "chrono",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-world",
  "futures",
  "indexmap 2.5.0",
@@ -15019,7 +15070,7 @@ dependencies = [
  "chrono",
  "ctrlc",
  "dojo-metrics",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "either",
@@ -15102,7 +15153,7 @@ dependencies = [
  "crypto-bigint",
  "data-url",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.1.2",
  "dojo-utils",
  "dojo-world",
  "futures-channel",
@@ -15134,7 +15185,7 @@ version = "1.1.2"
 dependencies = [
  "cainome 0.4.11",
  "crypto-bigint",
- "dojo-types",
+ "dojo-types 1.1.2",
  "indexmap 2.5.0",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 856d53d9c6..be0e9d381d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -208,12 +208,9 @@ rpassword = "7.2.0"
 rstest = "0.18.2"
 rstest_reuse = "0.6.0"
 salsa = "0.16.1"
-scarb = { path = "../../swm/scarb/scarb" }
-scarb-metadata = { path = "../../swm/scarb/scarb-metadata" }
-scarb-ui = { path = "../../swm/scarb/utils/scarb-ui" }
-#scarb = { git = "https://github.com/dojoengine/scarb", rev = "da5f683adbd25361d080c2d9f624924aa9f112d1" }
-#scarb-metadata = { git = "https://github.com/dojoengine/scarb", rev = "da5f683adbd25361d080c2d9f624924aa9f112d1" }
-#scarb-ui = { git = "https://github.com/dojoengine/scarb", rev = "da5f683adbd25361d080c2d9f624924aa9f112d1" }
+scarb = { git = "https://github.com/dojoengine/scarb", rev = "22aa38f53de205af25bf73b3ffc2c5334999d480" }
+scarb-metadata = { git = "https://github.com/dojoengine/scarb", rev = "22aa38f53de205af25bf73b3ffc2c5334999d480" }
+scarb-ui = { git = "https://github.com/dojoengine/scarb", rev = "22aa38f53de205af25bf73b3ffc2c5334999d480" }
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "arbitrary_precision" ] }