From 7ce7eb838470ca10ee8b2f8c31f20a68f8f7dc21 Mon Sep 17 00:00:00 2001
From: "remy.baranx@gmail.com" <remy.baranx@gmail.com>
Date: Thu, 20 Feb 2025 12:53:23 +0100
Subject: [PATCH] point to remybar/scarb branch

---
 Cargo.lock | 107 +++++++++++++++++++++++++++++++++++++++--------------
 Cargo.toml |  10 +++--
 2 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 72e00729f6..261197ea1f 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/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 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.2.1",
+ "itertools 0.12.1",
+ "serde",
+ "smol_str",
+ "starknet",
+ "starknet-crypto 0.7.2",
+ "tracing",
+]
+
+[[package]]
+name = "dojo-lang"
+version = "1.2.1"
+source = "git+https://github.com/remybar/dojo?branch=fix-enum_options_storage#e754f8617543a6212b9c4b1e2887ac5f23c35372"
+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.2.1 (git+https://github.com/remybar/dojo?branch=fix-enum_options_storage)",
  "itertools 0.12.1",
  "serde",
  "smol_str",
@@ -4563,7 +4586,7 @@ version = "1.2.1"
 dependencies = [
  "cairo-lang-language-server",
  "clap",
- "dojo-lang",
+ "dojo-lang 1.2.1",
 ]
 
 [[package]]
@@ -4627,6 +4650,28 @@ dependencies = [
  "thiserror 1.0.63",
 ]
 
+[[package]]
+name = "dojo-types"
+version = "1.2.1"
+source = "git+https://github.com/remybar/dojo?branch=fix-enum_options_storage#e754f8617543a6212b9c4b1e2887ac5f23c35372"
+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.2.1"
@@ -4653,7 +4698,7 @@ dependencies = [
  "async-trait",
  "cainome 0.4.11",
  "cairo-lang-starknet-classes",
- "dojo-types",
+ "dojo-types 1.2.1",
  "futures",
  "hex",
  "hex-literal",
@@ -12387,6 +12432,7 @@ dependencies = [
 [[package]]
 name = "scarb"
 version = "2.9.2"
+source = "git+https://github.com/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -12418,7 +12464,7 @@ dependencies = [
  "derive_builder",
  "dialoguer",
  "directories",
- "dojo-lang",
+ "dojo-lang 1.2.1 (git+https://github.com/remybar/dojo?branch=fix-enum_options_storage)",
  "dunce",
  "flate2",
  "fs4",
@@ -12439,9 +12485,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/remybar/scarb?rev=bc88f87)",
+ "scarb-proc-macro-server-types 0.1.0 (git+https://github.com/remybar/scarb?rev=bc88f87)",
+ "scarb-stable-hash 1.0.0 (git+https://github.com/remybar/scarb?rev=bc88f87)",
  "scarb-ui",
  "semver 1.0.23",
  "serde",
@@ -12471,6 +12517,7 @@ dependencies = [
 [[package]]
 name = "scarb-build-metadata"
 version = "2.9.2"
+source = "git+https://github.com/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 dependencies = [
  "cargo_metadata",
 ]
@@ -12478,31 +12525,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/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 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",
@@ -12512,8 +12562,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/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 dependencies = [
  "cairo-lang-macro",
  "serde",
@@ -12523,6 +12572,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",
@@ -12531,8 +12582,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/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 dependencies = [
  "data-encoding",
  "xxhash-rust",
@@ -12541,13 +12591,14 @@ dependencies = [
 [[package]]
 name = "scarb-ui"
 version = "0.1.5"
+source = "git+https://github.com/remybar/scarb?rev=bc88f87#bc88f879b39c90bec9164e84df6a1aee4c6bfccd"
 dependencies = [
  "anyhow",
  "camino",
  "clap",
  "console",
  "indicatif",
- "scarb-metadata 1.13.0",
+ "scarb-metadata 1.13.0 (git+https://github.com/remybar/scarb?rev=bc88f87)",
  "serde",
  "serde_json",
  "tracing-core",
@@ -13251,7 +13302,7 @@ dependencies = [
  "colored",
  "dojo-bindgen",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "katana-rpc-api",
@@ -13259,7 +13310,7 @@ dependencies = [
  "notify",
  "reqwest 0.11.27",
  "scarb",
- "scarb-metadata 1.13.0",
+ "scarb-metadata 1.13.0 (git+https://github.com/remybar/scarb?rev=bc88f87)",
  "scarb-ui",
  "semver 1.0.23",
  "serde",
@@ -13292,7 +13343,7 @@ dependencies = [
  "colored",
  "colored_json",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "futures",
@@ -14824,7 +14875,7 @@ dependencies = [
  "async-trait",
  "camino",
  "crypto-bigint",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-world",
  "futures",
  "futures-util",
@@ -14858,7 +14909,7 @@ dependencies = [
  "chrono",
  "convert_case 0.6.0",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "katana-runner",
@@ -14894,7 +14945,7 @@ dependencies = [
  "camino",
  "crypto-bigint",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "futures",
@@ -14947,7 +14998,7 @@ dependencies = [
  "crypto-bigint",
  "data-url",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "futures-channel",
@@ -14981,7 +15032,7 @@ version = "1.2.1"
 dependencies = [
  "anyhow",
  "chrono",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-world",
  "futures",
  "indexmap 2.5.0",
@@ -15021,7 +15072,7 @@ dependencies = [
  "chrono",
  "ctrlc",
  "dojo-metrics",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "either",
@@ -15104,7 +15155,7 @@ dependencies = [
  "crypto-bigint",
  "data-url",
  "dojo-test-utils",
- "dojo-types",
+ "dojo-types 1.2.1",
  "dojo-utils",
  "dojo-world",
  "futures-channel",
@@ -15136,7 +15187,7 @@ version = "1.2.1"
 dependencies = [
  "cainome 0.4.11",
  "crypto-bigint",
- "dojo-types",
+ "dojo-types 1.2.1",
  "indexmap 2.5.0",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 50291d80f6..75276ac645 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -213,9 +213,13 @@ salsa = "0.16.1"
 #scarb-metadata = { git = "https://github.com/dojoengine/scarb", rev = "22aa38f53de205af25bf73b3ffc2c5334999d480" }
 #scarb-ui = { git = "https://github.com/dojoengine/scarb", rev = "22aa38f53de205af25bf73b3ffc2c5334999d480" }
 
-scarb = { path = "/Users/remybaranx/pro/projets/contribs/dojo/scarb/scarb" }
-scarb-metadata = { path = "/Users/remybaranx/pro/projets/contribs/dojo/scarb/scarb-metadata" }
-scarb-ui = { path = "/Users/remybaranx/pro/projets/contribs/dojo/scarb/utils/scarb-ui" }
+scarb = { git = "https://github.com/remybar/scarb", rev = "bc88f87" }
+scarb-metadata = { git = "https://github.com/remybar/scarb", rev = "bc88f87" }
+scarb-ui = { git = "https://github.com/remybar/scarb", rev = "bc88f87" }
+
+#scarb = { path = "/Users/remybaranx/pro/projets/contribs/dojo/scarb/scarb" }
+#scarb-metadata = { path = "/Users/remybaranx/pro/projets/contribs/dojo/scarb/scarb-metadata" }
+#scarb-ui = { path = "/Users/remybaranx/pro/projets/contribs/dojo/scarb/utils/scarb-ui" }
 
 semver = "1.0.5"
 serde = { version = "1.0", features = [ "derive" ] }