diff --git a/Cargo.lock b/Cargo.lock
index f198594a9..20a177593 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -557,7 +557,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-casm"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -570,7 +570,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-compiler"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -595,7 +595,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-debug"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-utils",
 ]
@@ -603,7 +603,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-defs"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -619,7 +619,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-diagnostics"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -630,7 +630,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-doc"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-filesystem",
@@ -645,7 +645,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-eq-solver"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
@@ -654,7 +654,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-filesystem"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -669,7 +669,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-formatter"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -688,7 +688,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-language-server"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -728,7 +728,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -793,7 +793,7 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf"
 [[package]]
 name = "cairo-lang-parser"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -812,7 +812,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-plugins"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -830,7 +830,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-proc-macros"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -840,7 +840,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-project"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -852,7 +852,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-runner"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "ark-ff",
  "ark-secp256k1",
@@ -883,7 +883,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-semantic"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -908,7 +908,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-utils",
@@ -934,7 +934,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-ap-change"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -949,7 +949,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-gas"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -964,7 +964,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-generator"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -987,7 +987,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-to-casm"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "assert_matches",
  "cairo-lang-casm",
@@ -1007,7 +1007,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-type-size"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -1016,7 +1016,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1045,7 +1045,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet-classes"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-casm",
  "cairo-lang-sierra",
@@ -1067,7 +1067,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -1082,7 +1082,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax-codegen"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "genco",
  "xshell",
@@ -1091,7 +1091,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-plugin"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1117,7 +1117,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-runner"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1139,7 +1139,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-utils"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "cairo-lang-formatter",
  "cairo-lang-utils",
@@ -1151,7 +1151,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-utils"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=80df2b83f55537d1dd9dee68c82d7745b11612fa#80df2b83f55537d1dd9dee68c82d7745b11612fa"
+source = "git+https://github.com/starkware-libs/cairo?rev=81224a52cbb796c39f5f38560766fbdd78392b62#81224a52cbb796c39f5f38560766fbdd78392b62"
 dependencies = [
  "env_logger",
  "hashbrown 0.14.5",
diff --git a/Cargo.toml b/Cargo.toml
index df8c477cb..fc4f4da5d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,30 +35,30 @@ anyhow = "1"
 assert_fs = "1"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["http2"] }
-cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "80df2b83f55537d1dd9dee68c82d7745b11612fa", features = ["env_logger"] }
+cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "81224a52cbb796c39f5f38560766fbdd78392b62", features = ["env_logger"] }
 camino = { version = "1", features = ["serde1"] }
 cargo_metadata = ">=0.18"
 clap = { version = "4", features = ["derive", "env", "string"] }
@@ -141,7 +141,7 @@ zip = { version = "0.6", default-features = false, features = ["deflate"] }
 zstd = "0.13"
 
 [profile.release]
-lto = true
+#lto = true
 
 [profile.ci]
 inherits = "test"
diff --git a/extensions/scarb-doc/src/metadata/compilation.rs b/extensions/scarb-doc/src/metadata/compilation.rs
index 5b80e2301..b7d1468d1 100644
--- a/extensions/scarb-doc/src/metadata/compilation.rs
+++ b/extensions/scarb-doc/src/metadata/compilation.rs
@@ -1,7 +1,7 @@
 use scarb_metadata::{
     CompilationUnitComponentMetadata, CompilationUnitMetadata, Metadata, PackageId, PackageMetadata,
 };
-use smol_str::{SmolStr, ToSmolStr};
+use smol_str::ToSmolStr;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 
@@ -9,7 +9,7 @@ use anyhow::{bail, Result};
 use cairo_lang_compiler::project::{AllCratesConfig, ProjectConfig, ProjectConfigContent};
 use cairo_lang_filesystem::cfg::{Cfg, CfgSet};
 use cairo_lang_filesystem::db::{
-    CrateSettings, DependencySettings, Edition, ExperimentalFeaturesConfig,
+    CrateIdentifier, CrateSettings, DependencySettings, Edition, ExperimentalFeaturesConfig,
 };
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use itertools::Itertools;
@@ -61,14 +61,14 @@ fn package_compilation_unit(
 
 fn get_dependencies(
     compilation_unit_metadata: &CompilationUnitMetadata,
-) -> OrderedHashMap<SmolStr, PathBuf> {
+) -> OrderedHashMap<CrateIdentifier, PathBuf> {
     compilation_unit_metadata
         .components
         .iter()
         .filter(|du| du.name != CORELIB_CRATE_NAME)
         .map(|cu| {
             (
-                cu.name.to_smolstr(),
+                cu.name.as_str().into(),
                 cu.source_root().to_owned().into_std_path_buf(),
             )
         })
@@ -79,7 +79,7 @@ fn get_crates_config(
     metadata: &Metadata,
     compilation_unit_metadata: &CompilationUnitMetadata,
 ) -> Result<AllCratesConfig> {
-    let crates_config: OrderedHashMap<SmolStr, CrateSettings> = compilation_unit_metadata
+    let crates_config = compilation_unit_metadata
         .components
         .iter()
         .map(|component| {
@@ -92,7 +92,7 @@ fn get_crates_config(
 
             match (pkg, cfg_result) {
                 (Some(pkg), Ok(cfg_set)) => Ok((
-                    SmolStr::from(&component.name),
+                    component.name.as_str().into(),
                     get_crate_settings_for_package(
                         &metadata.packages,
                         &compilation_unit_metadata.components,
@@ -106,7 +106,7 @@ fn get_crates_config(
                 (_, Err(e)) => bail!(e),
             }
         })
-        .collect::<Result<OrderedHashMap<SmolStr, CrateSettings>>>()?;
+        .collect::<Result<OrderedHashMap<CrateIdentifier, CrateSettings>>>()?;
 
     Ok(AllCratesConfig {
         override_map: crates_config,
diff --git a/extensions/scarb-snforge-test-collector/src/metadata.rs b/extensions/scarb-snforge-test-collector/src/metadata.rs
index ca7147e67..58424bb15 100644
--- a/extensions/scarb-snforge-test-collector/src/metadata.rs
+++ b/extensions/scarb-snforge-test-collector/src/metadata.rs
@@ -1,7 +1,8 @@
 use anyhow::{anyhow, ensure, Result};
 use cairo_lang_filesystem::cfg::{Cfg, CfgSet};
 use cairo_lang_filesystem::db::{
-    CrateSettings, DependencySettings, Edition, ExperimentalFeaturesConfig, CORELIB_CRATE_NAME,
+    CrateIdentifier, CrateSettings, DependencySettings, Edition, ExperimentalFeaturesConfig,
+    CORELIB_CRATE_NAME,
 };
 use cairo_lang_project::AllCratesConfig;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
@@ -11,7 +12,7 @@ use scarb_metadata::{
     CompilationUnitComponentMetadata, CompilationUnitMetadata, Metadata, PackageMetadata,
 };
 use serde_json::json;
-use smol_str::{SmolStr, ToSmolStr};
+use smol_str::ToSmolStr;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 
@@ -92,15 +93,14 @@ pub struct CompilationUnit<'a> {
 }
 
 impl CompilationUnit<'_> {
-    pub fn dependencies(&self) -> OrderedHashMap<SmolStr, PathBuf> {
+    pub fn dependencies(&self) -> OrderedHashMap<CrateIdentifier, PathBuf> {
         let dependencies = self
             .unit_metadata
             .components
             .iter()
-            .filter(|du| &du.name != "core")
             .map(|cu| {
                 (
-                    cu.name.to_smolstr(),
+                    cu.id.as_ref().unwrap().into(),
                     cu.source_root().to_owned().into_std_path_buf(),
                 )
             })
@@ -110,7 +110,7 @@ impl CompilationUnit<'_> {
     }
 
     pub fn crates_config_for_compilation_unit(&self) -> AllCratesConfig {
-        let crates_config: OrderedHashMap<SmolStr, CrateSettings> = self
+        let crates_config: OrderedHashMap<CrateIdentifier, CrateSettings> = self
             .unit_metadata
             .components
             .iter()
@@ -125,7 +125,7 @@ impl CompilationUnit<'_> {
                         )
                     });
                 (
-                    SmolStr::from(&component.name),
+                    component.id.as_ref().unwrap().into(),
                     get_crate_settings_for_package(
                         &self.metadata.packages,
                         &self.unit_metadata.components,
diff --git a/scarb/src/compiler/compilation_unit.rs b/scarb/src/compiler/compilation_unit.rs
index ecb33920c..14af04350 100644
--- a/scarb/src/compiler/compilation_unit.rs
+++ b/scarb/src/compiler/compilation_unit.rs
@@ -6,11 +6,13 @@ use cairo_lang_filesystem::cfg::CfgSet;
 use cairo_lang_filesystem::db::CrateIdentifier;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
-use smol_str::{SmolStr, ToSmolStr};
+use smol_str::SmolStr;
 use typed_builder::TypedBuilder;
 
 use crate::compiler::Profile;
-use crate::core::{ManifestCompilerConfig, Package, PackageId, Target, TargetKind, Workspace};
+use crate::core::{
+    ManifestCompilerConfig, Package, PackageId, PackageName, Target, TargetKind, Workspace,
+};
 use crate::flock::Filesystem;
 use scarb_stable_hash::StableHasher;
 
@@ -111,15 +113,15 @@ impl CompilationUnitComponentId {
     }
 
     pub fn to_discriminator(&self) -> Option<SmolStr> {
-        if self.package_id.is_core() {
+        if self.package_id.name == PackageName::CORE {
             None
         } else {
-            Some(self.to_crate_identifier())
+            Some(self.to_crate_identifier().into())
         }
     }
 
     pub fn to_crate_identifier(&self) -> CrateIdentifier {
-        self.package_id.to_serialized_string().to_smolstr()
+        self.package_id.to_serialized_string().into()
     }
 }
 
diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs
index 13ccf0f4e..3f7c7eee1 100644
--- a/scarb/src/compiler/db.rs
+++ b/scarb/src/compiler/db.rs
@@ -5,12 +5,13 @@ use cairo_lang_defs::db::DefsGroup;
 use cairo_lang_defs::ids::ModuleId;
 use cairo_lang_defs::plugin::MacroPlugin;
 use cairo_lang_filesystem::db::{
-    AsFilesGroupMut, CrateSettings, DependencySettings, FilesGroup, FilesGroupEx,
+    AsFilesGroupMut, CrateIdentifier, CrateSettings, DependencySettings, FilesGroup, FilesGroupEx,
 };
 use cairo_lang_filesystem::ids::CrateLongId;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
-use smol_str::{SmolStr, ToSmolStr};
+use smol_str::SmolStr;
 use std::collections::BTreeMap;
+use std::path::PathBuf;
 use std::sync::Arc;
 use tracing::trace;
 
@@ -93,10 +94,9 @@ fn inject_virtual_wrapper_lib(db: &mut RootDatabase, unit: &CairoCompilationUnit
 
     for component in components {
         let name = component.cairo_package_name();
-        let version = component.package.id.version.clone();
         let crate_id = db.intern_crate(CrateLongId::Real {
             name,
-            discriminator: Some(version).map(|v| v.to_smolstr()),
+            discriminator: component.id.to_discriminator(),
         });
         let file_stems = component
             .targets
@@ -126,19 +126,18 @@ fn inject_virtual_wrapper_lib(db: &mut RootDatabase, unit: &CairoCompilationUnit
 }
 
 fn build_project_config(unit: &CairoCompilationUnit) -> Result<ProjectConfig> {
-    let crate_roots = unit
+    let crate_roots: OrderedHashMap<CrateIdentifier, PathBuf> = unit
         .components
         .iter()
-        .filter(|component| !component.package.id.is_core())
         .map(|component| {
             (
-                component.cairo_package_name(),
+                component.id.to_crate_identifier(),
                 component.first_target().source_root().into(),
             )
         })
         .collect();
 
-    let crates_config: OrderedHashMap<SmolStr, CrateSettings> = unit
+    let crates_config: OrderedHashMap<CrateIdentifier, CrateSettings> = unit
         .components
         .iter()
         .map(|component| {
diff --git a/scarb/src/ops/compile.rs b/scarb/src/ops/compile.rs
index 3ea5a0755..8fb89e772 100644
--- a/scarb/src/ops/compile.rs
+++ b/scarb/src/ops/compile.rs
@@ -4,12 +4,11 @@ use cairo_lang_compiler::diagnostics::DiagnosticsError;
 use cairo_lang_utils::Upcast;
 use indoc::formatdoc;
 use itertools::Itertools;
-use smol_str::{SmolStr, ToSmolStr};
-use std::thread;
-
 use scarb_ui::args::FeaturesSpec;
 use scarb_ui::components::Status;
 use scarb_ui::HumanDuration;
+use smol_str::{SmolStr, ToSmolStr};
+use std::thread;
 
 use crate::compiler::db::{build_scarb_root_database, has_starknet_plugin, ScarbDatabase};
 use crate::compiler::helpers::{build_compiler_config, collect_main_crate_ids};
diff --git a/scarb/src/ops/expand.rs b/scarb/src/ops/expand.rs
index 7c285b265..dbbf0c00f 100644
--- a/scarb/src/ops/expand.rs
+++ b/scarb/src/ops/expand.rs
@@ -18,7 +18,7 @@ use cairo_lang_syntax::node::{ast, TypedStablePtr, TypedSyntaxNode};
 use cairo_lang_utils::Upcast;
 use scarb_ui::Message;
 use serde::{Serialize, Serializer};
-use smol_str::{SmolStr, ToSmolStr};
+use smol_str::SmolStr;
 use std::collections::{BTreeMap, HashSet};
 
 #[derive(Debug, Clone, Default)]
@@ -161,10 +161,9 @@ fn do_expand(
 ) -> Result<()> {
     let ScarbDatabase { db, .. } = build_scarb_root_database(compilation_unit, ws)?;
     let name = compilation_unit.main_component().cairo_package_name();
-    let version = compilation_unit.main_component().package.id.version.clone();
     let main_crate_id = db.intern_crate(CrateLongId::Real {
         name,
-        discriminator: Some(version).map(|v| v.to_smolstr()),
+        discriminator: compilation_unit.main_component().id.to_discriminator(),
     });
     let mut compiler_config = build_compiler_config(&db, compilation_unit, &[main_crate_id], ws);
     // Report diagnostics, but do not fail.