diff --git a/.env.example b/.env.example
index a9c98b98a..9379cb43e 100644
--- a/.env.example
+++ b/.env.example
@@ -10,8 +10,8 @@ MONGO_DATABASE_NAME=Kakarot-Testnet-0
 # Starknet Environment
 STARKNET_NETWORK=
 ## Katana specific configurations
-KATANA_ACCOUNT_ADDRESS=0x01b44e32c8edbcada35fa7ae6f1f44bbc16657f442b7b19286812e1976c34d83
-KATANA_PRIVATE_KEY=0x05b8e27acc53020ed612507af8245cbffafd8aa588b79decaee1acf99a1c5cc2
+KATANA_ACCOUNT_ADDRESS=0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca
+KATANA_PRIVATE_KEY=0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a
 ## Madara account address and private key
 MADARA_ACCOUNT_ADDRESS=0x3
 MADARA_PRIVATE_KEY=0x00c1cf1490de1352865301bb8705143f3ef938f97fdf892f1090dcb5ac7bcd1d
diff --git a/Cargo.lock b/Cargo.lock
index 7f659d1f9..59829f3e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -865,14 +865,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bincode"
-version = "2.0.0-rc.3"
-source = "git+https://github.com/bincode-org/bincode.git?tag=v2.0.0-rc.3#aada4bb4cb457677a4b8e47572ae7ca8dd44927c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.68.1"
@@ -1049,11 +1041,11 @@ dependencies = [
  "ark-secp256k1",
  "ark-secp256r1",
  "cached",
- "cairo-felt 0.9.1",
- "cairo-lang-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-runner 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-starknet 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-felt 0.9.1 (git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1)",
+ "cairo-lang-casm 2.4.0",
+ "cairo-lang-runner 2.4.0",
+ "cairo-lang-starknet 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "cairo-vm 0.9.1",
  "ctor",
  "derive_more",
@@ -1069,7 +1061,7 @@ dependencies = [
  "serde_json",
  "sha3",
  "starknet-crypto 0.5.2",
- "starknet_api",
+ "starknet_api 0.6.0",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "thiserror",
@@ -1077,20 +1069,20 @@ dependencies = [
 
 [[package]]
 name = "blockifier"
-version = "0.4.0-rc9.2"
-source = "git+https://github.com/dojoengine/blockifier?rev=e6e9c90#e6e9c902ce699269e38aecda49dc50bd11a9bec0"
+version = "0.5.0-dev.0"
+source = "git+https://github.com/dojoengine/blockifier?rev=8860946#886094680ea5ead4ba1227f46172e02468901488"
 dependencies = [
  "ark-ec",
  "ark-ff 0.4.2",
  "ark-secp256k1",
  "ark-secp256r1",
  "cached",
- "cairo-felt 0.8.2",
- "cairo-lang-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-runner 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-vm 0.8.2",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
+ "cairo-lang-casm 2.5.4",
+ "cairo-lang-runner 2.5.4",
+ "cairo-lang-starknet 2.5.4",
+ "cairo-lang-utils 2.5.4",
+ "cairo-vm 0.9.2",
  "ctor",
  "derive_more",
  "indexmap 2.2.2",
@@ -1105,7 +1097,7 @@ dependencies = [
  "serde_json",
  "sha3",
  "starknet-crypto 0.5.2",
- "starknet_api",
+ "starknet_api 0.7.0-dev.0",
  "strum 0.24.1",
  "strum_macros 0.24.3",
  "thiserror",
@@ -1350,14 +1342,14 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
 [[package]]
 name = "cainome"
-version = "0.1.5"
-source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta#86b83226e66e75932db157668329b0cf61b471f9"
+version = "0.2.3"
+source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5#54df2a4114c0c61359c2f1a70bc7e5fb57d9eaf2"
 dependencies = [
  "anyhow",
  "async-trait",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
+ "cainome-cairo-serde",
+ "cainome-parser",
+ "cainome-rs",
  "cainome-rs-macro",
  "camino",
  "clap",
@@ -1365,63 +1357,31 @@ dependencies = [
  "convert_case 0.6.0",
  "serde",
  "serde_json",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "thiserror",
- "tokio",
  "tracing",
  "tracing-subscriber",
  "url",
 ]
 
-[[package]]
-name = "cainome"
-version = "0.1.5"
-source = "git+https://github.com/cartridge-gg/cainome?rev=950e487#950e4871b735a1b4a7ba7e7561b9a15f5a43dbed"
-dependencies = [
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=950e487)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=950e487)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=950e487)",
-]
-
 [[package]]
 name = "cainome-cairo-serde"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta#86b83226e66e75932db157668329b0cf61b471f9"
+source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5#54df2a4114c0c61359c2f1a70bc7e5fb57d9eaf2"
 dependencies = [
- "starknet 0.8.0",
- "thiserror",
-]
-
-[[package]]
-name = "cainome-cairo-serde"
-version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?rev=950e487#950e4871b735a1b4a7ba7e7561b9a15f5a43dbed"
-dependencies = [
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "thiserror",
 ]
 
 [[package]]
 name = "cainome-parser"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta#86b83226e66e75932db157668329b0cf61b471f9"
+source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5#54df2a4114c0c61359c2f1a70bc7e5fb57d9eaf2"
 dependencies = [
  "convert_case 0.6.0",
  "quote",
  "serde_json",
- "starknet 0.8.0",
- "syn 2.0.48",
- "thiserror",
-]
-
-[[package]]
-name = "cainome-parser"
-version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?rev=950e487#950e4871b735a1b4a7ba7e7561b9a15f5a43dbed"
-dependencies = [
- "quote",
- "serde_json",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "syn 2.0.48",
  "thiserror",
 ]
@@ -1429,31 +1389,15 @@ dependencies = [
 [[package]]
 name = "cainome-rs"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta#86b83226e66e75932db157668329b0cf61b471f9"
+source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5#54df2a4114c0c61359c2f1a70bc7e5fb57d9eaf2"
 dependencies = [
  "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
+ "cainome-cairo-serde",
+ "cainome-parser",
  "proc-macro2",
  "quote",
  "serde_json",
- "starknet 0.8.0",
- "syn 2.0.48",
- "thiserror",
-]
-
-[[package]]
-name = "cainome-rs"
-version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome?rev=950e487#950e4871b735a1b4a7ba7e7561b9a15f5a43dbed"
-dependencies = [
- "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=950e487)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome?rev=950e487)",
- "proc-macro2",
- "quote",
- "serde_json",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "syn 2.0.48",
  "thiserror",
 ]
@@ -1461,24 +1405,24 @@ dependencies = [
 [[package]]
 name = "cainome-rs-macro"
 version = "0.1.0"
-source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta#86b83226e66e75932db157668329b0cf61b471f9"
+source = "git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5#54df2a4114c0c61359c2f1a70bc7e5fb57d9eaf2"
 dependencies = [
  "anyhow",
- "cainome-cairo-serde 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
- "cainome-parser 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
- "cainome-rs 0.1.0 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
+ "cainome-cairo-serde",
+ "cainome-parser",
+ "cainome-rs",
  "proc-macro2",
  "quote",
  "serde_json",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "syn 2.0.48",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-felt"
-version = "0.8.2"
-source = "git+https://github.com/dojoengine/cairo-rs.git?rev=262b7eb4b11ab165a2a936a5f914e78aa732d4a2#262b7eb4b11ab165a2a936a5f914e78aa732d4a2"
+version = "0.9.1"
+source = "git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1#e14bb1590ece9b4e960761ad89a85f52b419a4fb"
 dependencies = [
  "lazy_static",
  "num-bigint",
@@ -1490,7 +1434,7 @@ dependencies = [
 [[package]]
 name = "cairo-felt"
 version = "0.9.1"
-source = "git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1#e14bb1590ece9b4e960761ad89a85f52b419a4fb"
+source = "git+https://github.com/dojoengine/cairo-rs.git?rev=1031381#10313816b4ba7891e3c8ba90f6d0068a9149d682"
 dependencies = [
  "lazy_static",
  "num-bigint",
@@ -1502,10 +1446,9 @@ dependencies = [
 [[package]]
 name = "cairo-lang-casm"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850dc1d46d5bfb64c5ed0bc7ccd4821e4d4c36a8f2678a897df7c2bfaefe6fc"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.4.0",
  "indoc 2.0.4",
  "num-bigint",
  "num-traits 0.2.17",
@@ -1518,38 +1461,35 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-casm"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ceb71a4cbf5b474bd671c79b2c05e8168a97199bfea1c01ef63b1bdaac3db03"
 dependencies = [
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-utils 2.5.4",
  "indoc 2.0.4",
  "num-bigint",
  "num-traits 0.2.17",
  "parity-scale-codec",
- "parity-scale-codec-derive",
- "schemars",
  "serde",
- "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-compiler"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e6360b6735eeff503c6103520fef7410ca2c5a5ae90584822baa326607721ac"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
  "anyhow",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-lowering 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-project 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-generator 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-defs 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-lowering 2.4.0",
+ "cairo-lang-parser 2.4.0",
+ "cairo-lang-project 2.4.0",
+ "cairo-lang-semantic 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-sierra-generator 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "itertools 0.11.0",
  "salsa",
  "thiserror",
@@ -1557,22 +1497,22 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-compiler"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95c1aab3213462c5b7c21508f1a4330bdf0766c90e6dd4ed79b0002c2b96a715"
 dependencies = [
  "anyhow",
- "cairo-lang-defs 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-lowering 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-parser 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-project 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-semantic 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-generator 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "itertools 0.11.0",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-lowering 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-project 2.5.4",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-generator 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "salsa",
  "thiserror",
 ]
@@ -1580,32 +1520,31 @@ dependencies = [
 [[package]]
 name = "cairo-lang-debug"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c190deb7ba826a462fa7339e482d5e2df78d329435f4988b15f7752e033b5ac"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.4.0",
 ]
 
 [[package]]
 name = "cairo-lang-debug"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03623ba892200c6b3c55fab260d4aa0bff833d6bcecdb1fb022565ac00d5a683"
 dependencies = [
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-utils 2.5.4",
 ]
 
 [[package]]
 name = "cairo-lang-defs"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42a34d9952b04fa0c96fafd08d170097fb5075ff81826a034ef9faa70556de8"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-parser 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "itertools 0.11.0",
  "salsa",
  "smol_str",
@@ -1613,15 +1552,16 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-defs"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09131755b08a485322656e061ad05602215a198dd4a2daf3897e64dc76e7544e"
 dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-parser 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "itertools 0.11.0",
  "salsa",
  "smol_str",
@@ -1630,53 +1570,52 @@ dependencies = [
 [[package]]
 name = "cairo-lang-diagnostics"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c399832f9fc462cd51687a415c391ead4b99ee48c54cad5c8e1d5004ff6520c7"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "itertools 0.11.0",
 ]
 
 [[package]]
 name = "cairo-lang-diagnostics"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b8185cc9472c648ac9db970ce558595c71259eebd55d25a502fe569cb871448"
 dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "itertools 0.11.0",
 ]
 
 [[package]]
 name = "cairo-lang-eq-solver"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d73846e0dec2a204bc429f7421020fc6a98ae48f20f0cfa2aa1091b78221d6ce"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.4.0",
  "good_lp",
 ]
 
 [[package]]
 name = "cairo-lang-eq-solver"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae71750096b64d4dd54dd2c39ef50651bb4aff4bc829e3d07549a5035620e0a"
 dependencies = [
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-utils 2.5.4",
  "good_lp",
 ]
 
 [[package]]
 name = "cairo-lang-filesystem"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f15f4a10963dcd5baa0386632c5ce4136d54f93d6c71cc16a49cbcbf774ee2"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "path-clean",
  "salsa",
  "serde",
@@ -1685,11 +1624,12 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-filesystem"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1819ef5a5396df695dcec993500c46bc44c309590b503da26965c873dfe8a84a"
 dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "path-clean",
  "salsa",
  "serde",
@@ -1698,39 +1638,39 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-formatter"
-version = "2.4.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ecbe94310d9b52ff654be27099c00aafb22c54857c32bc48754567114a4e09"
+checksum = "d4cfea8cf064ff275b469e2f92c7dfd1e296f00013f4fb59d852299d3c872f65"
 dependencies = [
  "anyhow",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "diffy",
  "ignore",
  "itertools 0.11.0",
  "salsa",
  "serde",
  "smol_str",
+ "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5547bb3e13841a840b4faad3eb7fe7c39b525220f708973b71b1b9077747758b"
-dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-proc-macros 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+dependencies = [
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-defs 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-parser 2.4.0",
+ "cairo-lang-proc-macros 2.4.0",
+ "cairo-lang-semantic 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "id-arena",
  "indexmap 2.2.2",
  "itertools 0.11.0",
@@ -1744,20 +1684,20 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-lowering"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
-dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-defs 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-parser 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-proc-macros 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-semantic 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0968f0da6117dca1a70d6ac7d2e252d8b1710f333458c54ce08dbef1c0323881"
+dependencies = [
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-proc-macros 2.5.4",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "id-arena",
- "indexmap 2.2.2",
  "itertools 0.11.0",
  "log",
  "num-bigint",
@@ -1770,14 +1710,13 @@ dependencies = [
 [[package]]
 name = "cairo-lang-parser"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197445f8db467e28dbeddc573047dd8f2a0ef3fcc3d1c32575162d4cf79988df"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax-codegen 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-syntax-codegen 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "colored",
  "itertools 0.11.0",
  "num-bigint",
@@ -1789,14 +1728,15 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-parser"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae556e49c0a90d30e52f068b0fb5ed4d419766661d3713a1644f3894a9255a5a"
 dependencies = [
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax-codegen 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-syntax-codegen 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "colored",
  "itertools 0.11.0",
  "num-bigint",
@@ -1809,15 +1749,14 @@ dependencies = [
 [[package]]
 name = "cairo-lang-plugins"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3ea747577bd93e4791bdd57744dfddbc4b99ce056fffb5fd41340759642f91"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-defs 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-parser 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "indent",
  "indoc 2.0.4",
  "itertools 0.11.0",
@@ -1827,15 +1766,16 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-plugins"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d319f3e84ff679159f97e3baa1d918d369ba9e3ade5ad490e0a9e4eca19591"
 dependencies = [
- "cairo-lang-defs 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-parser 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "indent",
  "indoc 2.0.4",
  "itertools 0.11.0",
@@ -1846,20 +1786,20 @@ dependencies = [
 [[package]]
 name = "cairo-lang-proc-macros"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cc59c40344194d2cc825071080d887826dcf0df37de71e58fc8aa4c344bb84"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-debug 2.4.0",
  "quote",
  "syn 2.0.48",
 ]
 
 [[package]]
 name = "cairo-lang-proc-macros"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fef002aac874d76492eb9577dab663f9a84fe4584b4215c7ebfda7d025fcadae"
 dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-debug 2.5.4",
  "quote",
  "syn 2.0.48",
 ]
@@ -1867,11 +1807,10 @@ dependencies = [
 [[package]]
 name = "cairo-lang-project"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312b65dec1d0b8e1b420d7b464c0c771f18301177376432681c05c30f5ef9604"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "serde",
  "smol_str",
  "thiserror",
@@ -1880,11 +1819,12 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-project"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f384c26e6907de9c94b44051e386498159e8c9e1567b9b1eae9c22e16ff17e5"
 dependencies = [
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "serde",
  "smol_str",
  "thiserror",
@@ -1894,22 +1834,21 @@ dependencies = [
 [[package]]
 name = "cairo-lang-runner"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2376aa33117e2feae26ca030e8b6b5ec7c6c1edfc599885d1157d92f3fc413a"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
  "ark-ff 0.4.2",
  "ark-secp256k1",
  "ark-secp256r1",
  "ark-std 0.4.0",
- "cairo-felt 0.8.2",
- "cairo-lang-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-ap-change 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-to-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-type-size 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-vm 0.8.2",
+ "cairo-felt 0.9.1 (git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1)",
+ "cairo-lang-casm 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-sierra-ap-change 2.4.0",
+ "cairo-lang-sierra-to-casm 2.4.0",
+ "cairo-lang-sierra-type-size 2.4.0",
+ "cairo-lang-starknet 2.4.0",
+ "cairo-lang-utils 2.4.0",
+ "cairo-vm 0.9.1",
  "itertools 0.11.0",
  "keccak",
  "num-bigint",
@@ -1920,46 +1859,48 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-runner"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95ccd9dce6f931508a21ac4d29965dadcaf7c22bbf2a237239763128b8647a53"
 dependencies = [
  "ark-ff 0.4.2",
  "ark-secp256k1",
  "ark-secp256r1",
  "ark-std 0.4.0",
- "cairo-felt 0.9.1",
- "cairo-lang-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-ap-change 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-to-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-type-size 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-starknet 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-vm 0.9.1",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
+ "cairo-lang-casm 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-ap-change 2.5.4",
+ "cairo-lang-sierra-generator 2.5.4",
+ "cairo-lang-sierra-to-casm 2.5.4",
+ "cairo-lang-sierra-type-size 2.5.4",
+ "cairo-lang-starknet 2.5.4",
+ "cairo-lang-utils 2.5.4",
+ "cairo-vm 0.9.2",
  "itertools 0.11.0",
  "keccak",
  "num-bigint",
  "num-integer",
  "num-traits 0.2.17",
+ "smol_str",
+ "starknet-crypto 0.6.1",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-semantic"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e18c57cd10bcf69b427b901ce058268d21f65f5199b33e36b72b02ba7ceff74"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-plugins 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-proc-macros 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-test-utils",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-defs 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-parser 2.4.0",
+ "cairo-lang-plugins 2.4.0",
+ "cairo-lang-proc-macros 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "id-arena",
  "indoc 2.0.4",
  "itertools 0.11.0",
@@ -1972,18 +1913,20 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-semantic"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
-dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-defs 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-parser 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-plugins 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-proc-macros 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "311434caae9542b7c442ac69a04e3c8eaa477654f215abe0bd7dfd3c0de70669"
+dependencies = [
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-plugins 2.5.4",
+ "cairo-lang-proc-macros 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-test-utils",
+ "cairo-lang-utils 2.5.4",
  "id-arena",
  "indoc 2.0.4",
  "itertools 0.11.0",
@@ -1997,11 +1940,10 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84cf029a71e0176992cc401f7f182dc92e14a51662b1576240a7ecc79efac6bc"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
  "anyhow",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.4.0",
  "const-fnv1a-hash",
  "convert_case 0.6.0",
  "derivative",
@@ -2021,11 +1963,13 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52c00c34fcaf97bbc4111d1631af8c65838841a38b3502b5bbc04355b7d46982"
 dependencies = [
  "anyhow",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
+ "cairo-lang-utils 2.5.4",
  "const-fnv1a-hash",
  "convert_case 0.6.0",
  "derivative",
@@ -2046,73 +1990,74 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-ap-change"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "529ed2d8d14ef4c2d77e45db597425488e194b8ab1d3210742a1c54d78743407"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-eq-solver 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-type-size 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-eq-solver 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-sierra-type-size 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "itertools 0.11.0",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-ap-change"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c99a0be021b359c51383cce4372cb1061f7d53438d80f208c56af2154583c98e"
 dependencies = [
- "cairo-lang-eq-solver 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-type-size 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-eq-solver 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-type-size 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "itertools 0.11.0",
+ "num-traits 0.2.17",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-gas"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0cbe3dd4f663d7df902a2f10cf52990d62f178741fe1494de51f08bb89b7aa6"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-eq-solver 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-type-size 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-eq-solver 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-sierra-type-size 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "itertools 0.11.0",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-gas"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f273d4de9d30e556e72ebe2751f9ed6bf3d84a70f6c76f52b178c24cddb12e43"
 dependencies = [
- "cairo-lang-eq-solver 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-type-size 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-eq-solver 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-type-size 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "itertools 0.11.0",
+ "num-traits 0.2.17",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-generator"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5bed52b240e1546b08e075493b2df4030dba2199e019d36f52da1423f2c653"
-dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-lowering 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+dependencies = [
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-defs 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-lowering 2.4.0",
+ "cairo-lang-parser 2.4.0",
+ "cairo-lang-semantic 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "indexmap 2.2.2",
  "itertools 0.11.0",
  "num-bigint",
@@ -2123,20 +2068,20 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-generator"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
-dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-defs 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-lowering 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-parser 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-semantic 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "indexmap 2.2.2",
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "734f72e9e8b1ec7a96208aa8dfba87ca1614188e3646ae67c519afe707569490"
+dependencies = [
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-lowering 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "itertools 0.11.0",
  "num-bigint",
  "once_cell",
@@ -2147,17 +2092,16 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-to-casm"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc16661a7a78f885f6b5a4fdb3c7463d9ee3f6bca83266b4f2b956e65579ec72"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
  "assert_matches",
- "cairo-felt 0.8.2",
- "cairo-lang-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-ap-change 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-gas 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-type-size 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-felt 0.9.1 (git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1)",
+ "cairo-lang-casm 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-sierra-ap-change 2.4.0",
+ "cairo-lang-sierra-gas 2.4.0",
+ "cairo-lang-sierra-type-size 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "indoc 2.0.4",
  "itertools 0.11.0",
  "num-bigint",
@@ -2167,17 +2111,18 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-to-casm"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "842ae37ee3f1cd06b926aceb480fd70b84300aae82e9606b876678d30c21649a"
 dependencies = [
  "assert_matches",
- "cairo-felt 0.9.1",
- "cairo-lang-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-ap-change 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-gas 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-type-size 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
+ "cairo-lang-casm 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-ap-change 2.5.4",
+ "cairo-lang-sierra-gas 2.5.4",
+ "cairo-lang-sierra-type-size 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "indoc 2.0.4",
  "itertools 0.11.0",
  "num-bigint",
@@ -2188,42 +2133,41 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-type-size"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3fa025f6bc1c8d4556c9fc4609fb6f27071470ed47eb3bd0b5f9a159e51124"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-utils 2.4.0",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-type-size"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f969cbaf81f3beb1dc693674fc792a815bf8fc13471227020a5faf309d5faf80"
 dependencies = [
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-utils 2.5.4",
 ]
 
 [[package]]
 name = "cairo-lang-starknet"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5523d9c5b8e7c98afb2907c2cf4821a251d94fc42d37940063a9f2adbea05f"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
  "anyhow",
- "cairo-felt 0.8.2",
- "cairo-lang-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-compiler 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-lowering 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-generator 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-to-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-felt 0.9.1 (git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1)",
+ "cairo-lang-casm 2.4.0",
+ "cairo-lang-compiler 2.4.0",
+ "cairo-lang-defs 2.4.0",
+ "cairo-lang-diagnostics 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-lowering 2.4.0",
+ "cairo-lang-semantic 2.4.0",
+ "cairo-lang-sierra 2.4.0",
+ "cairo-lang-sierra-generator 2.4.0",
+ "cairo-lang-sierra-to-casm 2.4.0",
+ "cairo-lang-syntax 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "const_format",
  "convert_case 0.6.0",
  "indent",
@@ -2243,23 +2187,25 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-starknet"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cd2d120f39369c7bd7d124dee638c250495054030d01d4e1d1b88f0063bd80"
 dependencies = [
  "anyhow",
- "cairo-felt 0.9.1",
- "cairo-lang-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-compiler 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-defs 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-diagnostics 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-lowering 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-semantic 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-generator 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-sierra-to-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-syntax 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
+ "cairo-lang-casm 2.5.4",
+ "cairo-lang-compiler 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-lowering 2.5.4",
+ "cairo-lang-plugins 2.5.4",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-generator 2.5.4",
+ "cairo-lang-sierra-to-casm 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "const_format",
  "convert_case 0.6.0",
  "indent",
@@ -2280,12 +2226,11 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c8e9b19fa724135353470ee3452605f82edfec17a7dd4e8388d77152ea4fbd2"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-debug 2.4.0",
+ "cairo-lang-filesystem 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "num-bigint",
  "num-traits 0.2.17",
  "salsa",
@@ -2295,12 +2240,13 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "552d3438fec55832976bc7c7d7490100e8ce7385d3f3f1539f9a46fffa2197c6"
 dependencies = [
- "cairo-lang-debug 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-filesystem 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "num-bigint",
  "num-traits 0.2.17",
  "salsa",
@@ -2311,8 +2257,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax-codegen"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a50c3a5dc5d890a523122e40dac59f3a430952cec73fe7312dd266ad865f049"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
  "genco",
  "xshell",
@@ -2320,8 +2265,9 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax-codegen"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dab4d07bd78658f0fdc3fd20f1236bc3e6ebdd8a8fc72ece95a5dd03b7a09da"
 dependencies = [
  "genco",
  "xshell",
@@ -2329,24 +2275,24 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-test-plugin"
-version = "2.4.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed848115b9422014027b4c352ed6589a886e767efb4a11667de32a45be8edd52"
+checksum = "ab5e416a932754f190de2de011f3b3eb20dcb8093fb073cad15a8e70be833c3d"
 dependencies = [
  "anyhow",
- "cairo-felt 0.8.2",
- "cairo-lang-compiler 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-lowering 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-generator 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
+ "cairo-lang-compiler 2.5.4",
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-lowering 2.5.4",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-generator 2.5.4",
+ "cairo-lang-starknet 2.5.4",
+ "cairo-lang-syntax 2.5.4",
+ "cairo-lang-utils 2.5.4",
  "indoc 2.0.4",
  "itertools 0.11.0",
  "num-bigint",
@@ -2356,11 +2302,11 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-test-utils"
-version = "2.4.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d8dfdf2e7e7db2d8eea86046870d00fbb40269c1c812ee4683580d07bfafe2"
+checksum = "77ab221aa0119b6e613992127687a1352a896d30a2e55a9295c52eb9598bcc78"
 dependencies = [
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.5.4",
  "colored",
  "log",
  "pretty_assertions",
@@ -2369,44 +2315,44 @@ dependencies = [
 [[package]]
 name = "cairo-lang-utils"
 version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88969fe46417affe9628bd039865693431837807eb981115f02756a35f488489"
+source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
 dependencies = [
- "env_logger",
  "indexmap 2.2.2",
  "itertools 0.11.0",
- "log",
  "num-bigint",
  "num-traits 0.2.17",
  "parity-scale-codec",
  "schemars",
  "serde",
- "time",
 ]
 
 [[package]]
 name = "cairo-lang-utils"
-version = "2.4.0"
-source = "git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0#dd644b8ecdb62e67192d6c138a5558469ff72a98"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12d0939f42d40fb1d975cae073d7d4f82d83de4ba2149293115525245425f909"
 dependencies = [
+ "env_logger",
+ "hashbrown 0.14.3",
  "indexmap 2.2.2",
  "itertools 0.11.0",
+ "log",
  "num-bigint",
  "num-traits 0.2.17",
- "parity-scale-codec",
  "schemars",
  "serde",
+ "time",
 ]
 
 [[package]]
 name = "cairo-vm"
-version = "0.8.2"
-source = "git+https://github.com/dojoengine/cairo-rs.git?rev=262b7eb4b11ab165a2a936a5f914e78aa732d4a2#262b7eb4b11ab165a2a936a5f914e78aa732d4a2"
+version = "0.9.1"
+source = "git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1#e14bb1590ece9b4e960761ad89a85f52b419a4fb"
 dependencies = [
  "anyhow",
- "bincode 2.0.0-rc.3 (git+https://github.com/bincode-org/bincode.git?tag=v2.0.0-rc.3)",
+ "bincode 2.0.0-rc.3",
  "bitvec 1.0.1",
- "cairo-felt 0.8.2",
+ "cairo-felt 0.9.1 (git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1)",
  "generic-array 0.14.7",
  "hashbrown 0.14.3",
  "hex",
@@ -2423,19 +2369,19 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "sha3",
- "starknet-crypto 0.5.2",
+ "starknet-crypto 0.6.1",
  "thiserror-no-std",
 ]
 
 [[package]]
 name = "cairo-vm"
-version = "0.9.1"
-source = "git+https://github.com/kkrt-labs/cairo-vm.git?branch=v0.9.1#e14bb1590ece9b4e960761ad89a85f52b419a4fb"
+version = "0.9.2"
+source = "git+https://github.com/dojoengine/cairo-rs.git?rev=1031381#10313816b4ba7891e3c8ba90f6d0068a9149d682"
 dependencies = [
  "anyhow",
- "bincode 2.0.0-rc.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 2.0.0-rc.3",
  "bitvec 1.0.1",
- "cairo-felt 0.9.1",
+ "cairo-felt 0.9.1 (git+https://github.com/dojoengine/cairo-rs.git?rev=1031381)",
  "generic-array 0.14.7",
  "hashbrown 0.14.3",
  "hex",
@@ -2453,6 +2399,7 @@ dependencies = [
  "sha2 0.10.8",
  "sha3",
  "starknet-crypto 0.6.1",
+ "starknet-curve 0.4.0",
  "thiserror-no-std",
 ]
 
@@ -2904,7 +2851,7 @@ dependencies = [
 [[package]]
 name = "create-output-dir"
 version = "1.0.0"
-source = "git+https://github.com/software-mansion/scarb?tag=v2.4.0#cba988e685f2f9b07a8ea0b5f056009f91c6c9ed"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.5.0#c531a6e509dbb8b43f1c2d37f9d74a7b1bf7243d"
 dependencies = [
  "anyhow",
  "core-foundation",
@@ -3546,25 +3493,25 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
 [[package]]
 name = "dojo-lang"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
- "cairo-lang-compiler 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-debug 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-diagnostics 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-lowering 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-parser 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-plugins 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-project 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-generator 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-syntax 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-compiler 2.5.4",
+ "cairo-lang-debug 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-lowering 2.5.4",
+ "cairo-lang-parser 2.5.4",
+ "cairo-lang-plugins 2.5.4",
+ "cairo-lang-project 2.5.4",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-sierra-generator 2.5.4",
+ "cairo-lang-starknet 2.5.4",
+ "cairo-lang-syntax 2.5.4",
  "cairo-lang-test-plugin",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.5.4",
  "camino",
  "convert_case 0.6.0",
  "directories",
@@ -3573,6 +3520,7 @@ dependencies = [
  "indoc 1.0.9",
  "itertools 0.10.5",
  "lazy_static",
+ "num-traits 0.2.17",
  "once_cell",
  "salsa",
  "scarb",
@@ -3581,7 +3529,7 @@ dependencies = [
  "serde_json",
  "serde_with 2.3.3",
  "smol_str",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "thiserror",
  "tracing",
  "url",
@@ -3589,16 +3537,16 @@ dependencies = [
 
 [[package]]
 name = "dojo-test-utils"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "assert_fs",
  "async-trait",
- "cairo-lang-compiler 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-project 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-compiler 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-project 2.5.4",
+ "cairo-lang-starknet 2.5.4",
  "camino",
  "dojo-lang",
  "dojo-world",
@@ -3613,7 +3561,7 @@ dependencies = [
  "serde_json",
  "serde_with 2.3.3",
  "smol_str",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "thiserror",
  "tokio",
  "toml 0.7.8",
@@ -3623,15 +3571,15 @@ dependencies = [
 
 [[package]]
 name = "dojo-types"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "crypto-bigint 0.5.5",
  "hex",
  "itertools 0.10.5",
  "serde",
  "serde_json",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "strum 0.25.0",
  "strum_macros 0.25.3",
  "thiserror",
@@ -3639,15 +3587,15 @@ dependencies = [
 
 [[package]]
 name = "dojo-world"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "async-trait",
- "cainome 0.1.5 (git+https://github.com/cartridge-gg/cainome?rev=950e487)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-project 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cainome",
+ "cairo-lang-filesystem 2.5.4",
+ "cairo-lang-project 2.5.4",
+ "cairo-lang-starknet 2.5.4",
  "camino",
  "convert_case 0.6.0",
  "dojo-types",
@@ -3657,7 +3605,7 @@ dependencies = [
  "serde_json",
  "serde_with 2.3.3",
  "smol_str",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "starknet-crypto 0.6.1",
  "thiserror",
  "tokio",
@@ -3762,9 +3710,9 @@ dependencies = [
  "blockifier 0.4.0-rc6",
  "build-utils",
  "bytes",
- "cairo-lang-casm 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-starknet 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
- "cairo-lang-utils 2.4.0 (git+https://github.com/kkrt-labs/cairo.git?branch=v2.4.0)",
+ "cairo-lang-casm 2.4.0",
+ "cairo-lang-starknet 2.4.0",
+ "cairo-lang-utils 2.4.0",
  "cairo-vm 0.9.1",
  "cargo-emit",
  "ctor",
@@ -3785,7 +3733,7 @@ dependencies = [
  "serde_yaml",
  "starknet 0.6.0",
  "starknet-crypto 0.6.1",
- "starknet_api",
+ "starknet_api 0.6.0",
  "thiserror",
  "tokio",
  "tracing",
@@ -6602,8 +6550,8 @@ dependencies = [
  "async-trait",
  "auto_impl",
  "bytes",
- "cainome 0.1.5 (git+https://github.com/cartridge-gg/cainome.git?tag=v0.2.5-legacy-beta)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cainome",
+ "cairo-lang-starknet 2.5.4",
  "dojo-test-utils",
  "dotenv",
  "ef-testing",
@@ -6630,9 +6578,9 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with 2.3.3",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "starknet-crypto 0.6.1",
- "starknet_api",
+ "starknet_api 0.6.0",
  "testcontainers",
  "thiserror",
  "tokio",
@@ -6647,15 +6595,15 @@ dependencies = [
 
 [[package]]
 name = "katana-core"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "async-trait",
- "blockifier 0.4.0-rc9.2",
- "cairo-lang-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-vm 0.8.2",
+ "blockifier 0.5.0-dev.0",
+ "cairo-lang-casm 2.5.4",
+ "cairo-lang-starknet 2.5.4",
+ "cairo-vm 0.9.2",
  "convert_case 0.6.0",
  "ethers",
  "flate2",
@@ -6666,12 +6614,13 @@ dependencies = [
  "katana-provider",
  "lazy_static",
  "parking_lot 0.12.1",
+ "primitive-types",
  "rand 0.8.5",
  "serde",
  "serde_json",
  "serde_with 2.3.3",
- "starknet 0.8.0",
- "starknet_api",
+ "starknet 0.9.0",
+ "starknet_api 0.7.0-dev.0",
  "thiserror",
  "tokio",
  "tracing",
@@ -6680,12 +6629,12 @@ dependencies = [
 
 [[package]]
 name = "katana-db"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
- "blockifier 0.4.0-rc9.2",
- "cairo-vm 0.8.2",
+ "blockifier 0.5.0-dev.0",
+ "cairo-vm 0.9.2",
  "katana-primitives",
  "page_size",
  "parking_lot 0.12.1",
@@ -6693,38 +6642,39 @@ dependencies = [
  "reth-libmdbx 0.1.0-alpha.13",
  "serde",
  "serde_json",
- "starknet_api",
+ "starknet_api 0.7.0-dev.0",
  "tempfile",
  "thiserror",
 ]
 
 [[package]]
 name = "katana-executor"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
- "blockifier 0.4.0-rc9.2",
+ "blockifier 0.5.0-dev.0",
  "convert_case 0.6.0",
+ "futures",
  "katana-primitives",
  "katana-provider",
  "parking_lot 0.12.1",
- "starknet 0.8.0",
- "starknet_api",
+ "starknet 0.9.0",
+ "starknet_api 0.7.0-dev.0",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "katana-primitives"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
- "blockifier 0.4.0-rc9.2",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-vm 0.8.2",
+ "blockifier 0.5.0-dev.0",
+ "cairo-lang-starknet 2.5.4",
+ "cairo-vm 0.9.2",
  "derive_more",
  "ethers",
  "flate2",
@@ -6734,8 +6684,9 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with 2.3.3",
- "starknet 0.8.0",
- "starknet_api",
+ "starknet 0.9.0",
+ "starknet-crypto 0.6.1",
+ "starknet_api 0.7.0-dev.0",
  "strum 0.25.0",
  "strum_macros 0.25.3",
  "thiserror",
@@ -6743,8 +6694,8 @@ dependencies = [
 
 [[package]]
 name = "katana-provider"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "auto_impl",
@@ -6752,7 +6703,7 @@ dependencies = [
  "katana-db",
  "katana-primitives",
  "parking_lot 0.12.1",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "thiserror",
  "tokio",
  "tracing",
@@ -6760,11 +6711,11 @@ dependencies = [
 
 [[package]]
 name = "katana-rpc"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-starknet 2.5.4",
  "flate2",
  "futures",
  "hex",
@@ -6781,8 +6732,8 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with 2.3.3",
- "starknet 0.8.0",
- "starknet_api",
+ "starknet 0.9.0",
+ "starknet_api 0.7.0-dev.0",
  "thiserror",
  "tokio",
  "tower",
@@ -6792,51 +6743,52 @@ dependencies = [
 
 [[package]]
 name = "katana-rpc-api"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "jsonrpsee 0.16.3",
  "katana-core",
  "katana-primitives",
  "katana-rpc-types",
- "starknet 0.8.0",
+ "starknet 0.9.0",
 ]
 
 [[package]]
 name = "katana-rpc-types"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "derive_more",
  "ethers",
+ "futures",
  "jsonrpsee 0.16.3",
  "katana-core",
  "katana-primitives",
  "katana-provider",
  "serde",
  "serde_with 2.3.3",
- "starknet 0.8.0",
+ "starknet 0.9.0",
  "thiserror",
 ]
 
 [[package]]
 name = "katana-rpc-types-builder"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "anyhow",
  "katana-executor",
  "katana-primitives",
  "katana-provider",
  "katana-rpc-types",
- "starknet 0.8.0",
+ "starknet 0.9.0",
 ]
 
 [[package]]
 name = "katana-tasks"
-version = "0.5.1-alpha.5"
-source = "git+https://github.com/dojoengine/dojo?rev=dfe390#dfe390aff156e46f375c8d789a12e3ea1137e4b6"
+version = "0.6.0-alpha.2"
+source = "git+https://github.com/dojoengine/dojo?tag=v0.6.0-alpha.2#db0c4d783c3626a8d69d5035e2ae352595d86763"
 dependencies = [
  "futures",
  "rayon",
@@ -7692,9 +7644,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.9"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
+checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
 dependencies = [
  "arrayvec",
  "bitvec 1.0.1",
@@ -7707,11 +7659,11 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.9"
+version = "3.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
+checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
 dependencies = [
- "proc-macro-crate 2.0.0",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -9622,21 +9574,22 @@ dependencies = [
 
 [[package]]
 name = "scarb"
-version = "2.4.0"
-source = "git+https://github.com/software-mansion/scarb?tag=v2.4.0#cba988e685f2f9b07a8ea0b5f056009f91c6c9ed"
+version = "2.5.0"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.5.0#c531a6e509dbb8b43f1c2d37f9d74a7b1bf7243d"
 dependencies = [
  "anyhow",
  "async-trait",
- "cairo-lang-compiler 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-defs 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-filesystem 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-compiler 2.5.4",
+ "cairo-lang-defs 2.5.4",
+ "cairo-lang-diagnostics 2.5.4",
+ "cairo-lang-filesystem 2.5.4",
  "cairo-lang-formatter",
- "cairo-lang-semantic 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-sierra-to-casm 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-semantic 2.5.4",
+ "cairo-lang-sierra 2.5.4",
+ "cairo-lang-sierra-to-casm 2.5.4",
+ "cairo-lang-starknet 2.5.4",
  "cairo-lang-test-plugin",
- "cairo-lang-utils 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-utils 2.5.4",
  "camino",
  "clap",
  "clap-verbosity-flag",
@@ -9684,7 +9637,7 @@ dependencies = [
  "url",
  "walkdir",
  "which",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
  "xxhash-rust",
  "zip",
  "zstd 0.13.0",
@@ -9692,16 +9645,16 @@ dependencies = [
 
 [[package]]
 name = "scarb-build-metadata"
-version = "2.4.0"
-source = "git+https://github.com/software-mansion/scarb?tag=v2.4.0#cba988e685f2f9b07a8ea0b5f056009f91c6c9ed"
+version = "2.5.0"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.5.0#c531a6e509dbb8b43f1c2d37f9d74a7b1bf7243d"
 dependencies = [
  "cargo_metadata",
 ]
 
 [[package]]
 name = "scarb-metadata"
-version = "1.9.0"
-source = "git+https://github.com/software-mansion/scarb?tag=v2.4.0#cba988e685f2f9b07a8ea0b5f056009f91c6c9ed"
+version = "1.10.0"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.5.0#c531a6e509dbb8b43f1c2d37f9d74a7b1bf7243d"
 dependencies = [
  "camino",
  "derive_builder 0.13.0",
@@ -9713,8 +9666,8 @@ dependencies = [
 
 [[package]]
 name = "scarb-ui"
-version = "0.1.2"
-source = "git+https://github.com/software-mansion/scarb?tag=v2.4.0#cba988e685f2f9b07a8ea0b5f056009f91c6c9ed"
+version = "0.1.3"
+source = "git+https://github.com/software-mansion/scarb?tag=v2.5.0#c531a6e509dbb8b43f1c2d37f9d74a7b1bf7243d"
 dependencies = [
  "anyhow",
  "camino",
@@ -9953,7 +9906,7 @@ dependencies = [
  "serde",
  "serde_json",
  "starknet 0.6.0",
- "starknet_api",
+ "starknet_api 0.6.0",
  "thiserror",
  "tracing",
 ]
@@ -10492,18 +10445,18 @@ dependencies = [
 
 [[package]]
 name = "starknet"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb139c5e6f6c6da627080e33cc00b3fc1c9733403034ca1ee9c42a95c337c7f"
+checksum = "36f8002bf3d750dd2c0434aca8b5e88e2438cd6c452f4c18f34d0a8a9f42cb1a"
 dependencies = [
- "starknet-accounts 0.7.0",
- "starknet-contract 0.7.0",
- "starknet-core 0.8.1",
+ "starknet-accounts 0.8.0",
+ "starknet-contract 0.8.0",
+ "starknet-core 0.9.0",
  "starknet-crypto 0.6.1",
  "starknet-ff",
  "starknet-macros",
- "starknet-providers 0.8.0",
- "starknet-signers 0.6.0",
+ "starknet-providers 0.9.0",
+ "starknet-signers 0.7.0",
 ]
 
 [[package]]
@@ -10522,15 +10475,15 @@ dependencies = [
 
 [[package]]
 name = "starknet-accounts"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3743932c80ad2a5868c2dd4ef729de4e12060c88e73e4bb678a5f8e51b105e53"
+checksum = "e8e39a5807a735343493781dd5e640c4af838de470b0a73f420bed642fdc2ff1"
 dependencies = [
  "async-trait",
  "auto_impl",
- "starknet-core 0.8.1",
- "starknet-providers 0.8.0",
- "starknet-signers 0.6.0",
+ "starknet-core 0.9.0",
+ "starknet-providers 0.9.0",
+ "starknet-signers 0.7.0",
  "thiserror",
 ]
 
@@ -10551,16 +10504,16 @@ dependencies = [
 
 [[package]]
 name = "starknet-contract"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e55aac528c5376e1626d5a8d4daaf280bfd08f909dadc729e5b009203d6ec21"
+checksum = "b4996991356cd0e9499c663680eba7e77de4109e4995f652c1608899a65c09ee"
 dependencies = [
  "serde",
  "serde_json",
  "serde_with 2.3.3",
- "starknet-accounts 0.7.0",
- "starknet-core 0.8.1",
- "starknet-providers 0.8.0",
+ "starknet-accounts 0.8.0",
+ "starknet-core 0.9.0",
+ "starknet-providers 0.9.0",
  "thiserror",
 ]
 
@@ -10582,24 +10535,6 @@ dependencies = [
  "starknet-ff",
 ]
 
-[[package]]
-name = "starknet-core"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1da8287d38c2c1253c95c915c8d28d4ef4722f8c200e264133e1ba60bdadef7c"
-dependencies = [
- "base64 0.21.7",
- "flate2",
- "hex",
- "serde",
- "serde_json",
- "serde_json_pythonic",
- "serde_with 2.3.3",
- "sha3",
- "starknet-crypto 0.6.1",
- "starknet-ff",
-]
-
 [[package]]
 name = "starknet-core"
 version = "0.9.0"
@@ -10734,9 +10669,9 @@ dependencies = [
 
 [[package]]
 name = "starknet-providers"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b08084f36ff7f11743ec71f33f0b11d439cbe0524058def299eb47de1ef1c28"
+checksum = "6a4bd1c262936543d6d14d299f476585e8c9625a4e284d9255b54f1c2e68e64a"
 dependencies = [
  "async-trait",
  "auto_impl",
@@ -10747,7 +10682,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with 2.3.3",
- "starknet-core 0.8.1",
+ "starknet-core 0.9.0",
  "thiserror",
  "url",
 ]
@@ -10770,16 +10705,16 @@ dependencies = [
 
 [[package]]
 name = "starknet-signers"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91919d8f318f0b5bcc4ff5849fbd3fb46adaaa72e0bf204742bab7c822425ff4"
+checksum = "8c5eb659e66b56ceafb9025cd601226d8f34d273f1b826cd4053ab6333ff0898"
 dependencies = [
  "async-trait",
  "auto_impl",
  "crypto-bigint 0.5.5",
  "eth-keystore",
  "rand 0.8.5",
- "starknet-core 0.8.1",
+ "starknet-core 0.9.0",
  "starknet-crypto 0.6.1",
  "thiserror",
 ]
@@ -10790,11 +10725,33 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f9d0c42ef835df4cb8fc0468825aa5ad2825da927a89d5346ec0ef74573f158"
 dependencies = [
- "cairo-lang-starknet 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cairo-lang-starknet 2.5.4",
+ "derive_more",
+ "hex",
+ "indexmap 2.2.2",
+ "once_cell",
+ "primitive-types",
+ "serde",
+ "serde_json",
+ "starknet-crypto 0.5.2",
+ "strum 0.24.1",
+ "strum_macros 0.24.3",
+ "thiserror",
+]
+
+[[package]]
+name = "starknet_api"
+version = "0.7.0-dev.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88969610ab6ea9391e0e05a3e7c38acc49dc1cb49941b93ca52814075002b92f"
+dependencies = [
+ "cairo-lang-starknet 2.5.4",
  "derive_more",
  "hex",
  "indexmap 2.2.2",
  "once_cell",
+ "parity-scale-codec",
+ "parity-scale-codec-derive",
  "primitive-types",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 3d4c4ea58..0adb17461 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,17 +19,17 @@ license = "MIT"
 
 [dependencies]
 # Starknet dependencies
-cainome = { git = "https://github.com/cartridge-gg/cainome.git", tag = "v0.2.5-legacy-beta", default-features = false, features = [
+cainome = { git = "https://github.com/cartridge-gg/cainome.git", tag = "v0.2.5", default-features = false, features = [
   "abigen-rs",
 ] }
-cairo-lang-starknet = { version = "2.4.0", default-features = false }
+cairo-lang-starknet = { version = "2.5.4", default-features = false }
 ef-testing = { git = "https://github.com/kkrt-labs/ef-tests.git", rev = "e7d0f3e", default-features = false, features = [
   "v0",
 ], optional = true }
 sequencer = { git = "https://github.com/kkrt-labs/ef-tests.git", rev = "e7d0f3e", default-features = false, optional = true }
-starknet = { version = "0.8.0", default-features = false }
+starknet = { version = "0.9.0", default-features = false }
 starknet-crypto = { version = "0.6.1", default-features = false }
-starknet_api = { version = "0.6.0-rc3", default-features = false }
+starknet_api = { version = "0.6.0", default-features = false }
 
 # Ethereum dependencies
 alloy-rlp = { version = "0.3", default-features = false }
@@ -81,21 +81,21 @@ walkdir = { version = "2.3.3", default-features = false }
 # Otherwise, underlying dependencies of dojo will not be patched and we will get a compilation error
 # see https://github.com/dojoengine/dojo/issues/563
 # When making changes to the rev, please also update to make file to the same rev in the `install-katana` rule.
-dojo-test-utils = { git = 'https://github.com/dojoengine/dojo', rev = "dfe390", default-features = false }
-katana-core = { git = 'https://github.com/dojoengine/dojo', rev = "dfe390", features = [
+dojo-test-utils = { git = 'https://github.com/dojoengine/dojo', tag = "v0.6.0-alpha.2", default-features = false }
+katana-core = { git = 'https://github.com/dojoengine/dojo', tag = "v0.6.0-alpha.2", features = [
   "messaging",
 ] }
-katana-primitives = { git = 'https://github.com/dojoengine/dojo', rev = "dfe390", default-features = false, features = [
+katana-primitives = { git = 'https://github.com/dojoengine/dojo', tag = "v0.6.0-alpha.2", default-features = false, features = [
   "serde",
 ] }
 
 
 [patch."https://github.com/starkware-libs/blockifier"]
-blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "e6e9c90" }
+blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "8860946" }
 
 [patch.crates-io]
-cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "262b7eb4b11ab165a2a936a5f914e78aa732d4a2" }
-cairo-vm = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "262b7eb4b11ab165a2a936a5f914e78aa732d4a2" }
+cairo-felt = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" }
+cairo-vm = { git = "https://github.com/dojoengine/cairo-rs.git", rev = "1031381" }
 
 [dev-dependencies]
 rstest = { version = "0.18.1", default-features = false }
diff --git a/Makefile b/Makefile
index 5734a0ef3..ee780b63e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,17 +40,17 @@ docker-down:
 	docker compose down -v --remove-orphans && docker compose rm
 
 install-katana:
-	cargo install --git https://github.com/dojoengine/dojo --locked --rev fe8f23 katana
+	cargo install --git https://github.com/dojoengine/dojo --locked --tag v0.6.0-alpha.2 katana
 
-katana-genesis:
+katana-genesis: install-katana
 	rm -fr .katana/ && mkdir .katana
 	cargo run --bin katana_genesis --features testing
 
 # Runs Katana with Kakarot deployed on top.
-run-katana: install-katana katana-genesis
-	katana --disable-fee --chain-id=KKRT --genesis .katana/genesis.json
+run-katana: katana-genesis
+	katana --disable-fee --chain-id=kkrt --genesis .katana/genesis.json
 
-test: install-katana katana-genesis load-env
+test: katana-genesis load-env
 	cargo test --all --features testing
 
 test-coverage: katana-genesis load-env
diff --git a/docker-compose.madara.yaml b/docker-compose.madara.yaml
index 9c1d72bf1..e363e47fd 100644
--- a/docker-compose.madara.yaml
+++ b/docker-compose.madara.yaml
@@ -2,7 +2,7 @@ version: "3.2"
 
 services:
   starknet:
-    image: greged93/madara:v0.6.0
+    image: gchr.io/keep-starknet-strange/madara:v0.7.0
     ports:
       - 9615:9615
       - 30333:30333
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9ff94c1ba..100abbb6d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,20 +2,20 @@ version: "3.2"
 
 services:
   starknet:
-    image: greged93/katana:v0.4.4
+    image: ghcr.io/dojoengine/dojo:v0.6.0-alpha.2
     command:
       - katana
-      - --block-time
-      - "6000"
       - --disable-fee
       - --validate-max-steps
       - "16777216"
       - --invoke-max-steps
       - "16777216"
-      - --gas-price
-      - "1"
+      - --eth-gas-price
+      - "0"
+      - --strk-gas-price
+      - "0"
       - --chain-id
-      - "KKRT"
+      - "kkrt"
     ports:
       - "5050:5050"
     networks:
@@ -27,8 +27,8 @@ services:
     # Always pull the latest image, until we use release tags
     pull_policy: always
     environment:
-      - ACCOUNT_ADDRESS=0x517ececd29116499f4a1b64b094da79ba08dfd54a3edaa316134c41f8160973
-      - PRIVATE_KEY=0x1800000000300000180000000000030000000000003006001800006600
+      - ACCOUNT_ADDRESS=0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca
+      - PRIVATE_KEY=0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a
       - EVM_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
       - RPC_URL=http://starknet:5050
     volumes:
@@ -36,7 +36,7 @@ services:
       - deployments:/app/kakarot/deployments
     depends_on:
       starknet:
-        condition: service_healthy
+        condition: service_started
     restart: on-failure
     networks:
       - internal
@@ -62,7 +62,7 @@ services:
         condition: service_completed_successfully
 
   kakarot-rpc:
-    image: ghcr.io/kkrt-labs/kakarot-rpc/node:latest
+    image: eliastazartes/kakarot-rpc:latest
     # Always pull the latest image, until we use release tags
     # TODO: use release tags
     pull_policy: always
@@ -85,7 +85,7 @@ services:
       - internal
 
   apibara-dna:
-    image: quay.io/apibara/starknet:1.2.0
+    image: quay.io/apibara/starknet:1.4.0
     command:
       - start
       - --rpc=http://starknet:5050
@@ -102,7 +102,7 @@ services:
       kakarot-deployer:
         condition: service_completed_successfully
       starknet:
-        condition: service_healthy
+        condition: service_started
 
   ### MongoDB with Mongo Express
   mongo:
@@ -153,7 +153,7 @@ services:
       clone-repo:
         condition: service_completed_successfully
       starknet:
-        condition: service_healthy
+        condition: service_started
       kakarot-deployer:
         condition: service_completed_successfully
 
diff --git a/docker/hive/Dockerfile b/docker/hive/Dockerfile
index 3361329aa..37838145a 100644
--- a/docker/hive/Dockerfile
+++ b/docker/hive/Dockerfile
@@ -39,7 +39,7 @@ RUN git clone -v "https://github.com/kkrt-labs/kakarot-indexer.git"
 FROM mongo:6.0.8 as mongo
 
 # Ethereum RPC Server
-FROM ghcr.io/kkrt-labs/kakarot-rpc/node:v0.2.3-3 as rpc
+FROM ghcr.io/kkrt-labs/kakarot-rpc/node:v0.2.3-4 as rpc
 
 FROM debian:bookworm-slim as base
 # Install any necessary dependencies
diff --git a/lib/kakarot b/lib/kakarot
index 5f2d942d8..80d99d0a7 160000
--- a/lib/kakarot
+++ b/lib/kakarot
@@ -1 +1 @@
-Subproject commit 5f2d942d87225d85962a160b313e97818f4d358e
+Subproject commit 80d99d0a7451517f8c308161db318a16509ebbaa
diff --git a/src/eth_provider/provider.rs b/src/eth_provider/provider.rs
index 24da8c77a..f1a62a806 100644
--- a/src/eth_provider/provider.rs
+++ b/src/eth_provider/provider.rs
@@ -22,6 +22,7 @@ use reth_rpc_types::ValueOrArray;
 use reth_rpc_types::{Block, BlockTransactions, RichBlock};
 use reth_rpc_types::{SyncInfo, SyncStatus};
 use starknet::core::types::BlockId as StarknetBlockId;
+use starknet::core::types::BroadcastedInvokeTransaction;
 use starknet::core::types::SyncStatusType;
 use starknet::core::types::ValueOutOfRangeError;
 use starknet::core::utils::get_storage_var_address;
@@ -505,14 +506,15 @@ where
         #[cfg(not(feature = "testing"))]
         {
             let hash = transaction_signed.hash();
-            self.starknet_provider.add_invoke_transaction(transaction).await?;
+            self.starknet_provider.add_invoke_transaction(BroadcastedInvokeTransaction::V1(transaction)).await?;
             Ok(hash)
         }
         // If we are currently testing, we need to return the starknet hash in order
         // to be able to wait for the transaction to be mined.
         #[cfg(feature = "testing")]
         {
-            let res = self.starknet_provider.add_invoke_transaction(transaction).await?;
+            let res =
+                self.starknet_provider.add_invoke_transaction(BroadcastedInvokeTransaction::V1(transaction)).await?;
             Ok(B256::from_slice(&res.transaction_hash.to_bytes_be()[..]))
         }
     }
@@ -564,9 +566,24 @@ where
 
         let value = into_via_try_wrapper!(request.value.unwrap_or_default());
 
+        // TODO: replace this by into_via_wrapper!(request.nonce.unwrap_or_default())
+        //  when we can simulate the transaction instead of calling `eth_call`
+        let nonce = {
+            match request.nonce {
+                Some(nonce) => into_via_wrapper!(nonce),
+                None => match request.from {
+                    None => FieldElement::ZERO,
+                    Some(address) => {
+                        into_via_try_wrapper!(self.transaction_count(address, block_id).await?)
+                    }
+                },
+            }
+        };
+
         let kakarot_contract = KakarotCoreReader::new(*KAKAROT_ADDRESS, &self.starknet_provider);
         let call_output = kakarot_contract
             .eth_call(
+                &nonce,
                 &from,
                 &to,
                 &gas_limit,
diff --git a/src/eth_provider/starknet/kakarot_core.rs b/src/eth_provider/starknet/kakarot_core.rs
index 439f1d258..65587e5e3 100644
--- a/src/eth_provider/starknet/kakarot_core.rs
+++ b/src/eth_provider/starknet/kakarot_core.rs
@@ -6,7 +6,7 @@ use dotenv::dotenv;
 use lazy_static::lazy_static;
 use reth_primitives::{Address, Transaction, TransactionSigned};
 use starknet::{
-    core::{types::BroadcastedInvokeTransaction, utils::get_contract_address},
+    core::{types::BroadcastedInvokeTransactionV1, utils::get_contract_address},
     macros::selector,
 };
 use starknet_crypto::FieldElement;
@@ -66,13 +66,11 @@ pub(crate) fn to_starknet_transaction(
     transaction: &TransactionSigned,
     chain_id: u64,
     signer: Address,
-) -> EthProviderResult<BroadcastedInvokeTransaction> {
+) -> EthProviderResult<BroadcastedInvokeTransactionV1> {
     let starknet_address = starknet_address(signer);
 
     let nonce = FieldElement::from(transaction.nonce());
 
-    let max_fee = (u64::MAX).into();
-
     // Step: Signature
     // Extract the signature from the Ethereum Transaction
     // and place it in the Starknet signature InvokeTransaction vector
@@ -108,7 +106,8 @@ pub(crate) fn to_starknet_transaction(
     ];
     execute_calldata.append(&mut signed_data.into_iter().map(FieldElement::from).collect());
 
-    Ok(BroadcastedInvokeTransaction {
+    let max_fee = (u64::MAX).into();
+    Ok(BroadcastedInvokeTransactionV1 {
         max_fee,
         signature,
         nonce,
diff --git a/src/models/felt.rs b/src/models/felt.rs
index 87a6c9fc6..ab543617e 100644
--- a/src/models/felt.rs
+++ b/src/models/felt.rs
@@ -1,4 +1,4 @@
-use reth_primitives::{Address, B256, U256};
+use reth_primitives::{Address, B256, U256, U64};
 use starknet::core::types::FieldElement;
 
 use crate::models::errors::ConversionError;
@@ -49,6 +49,14 @@ impl From<Address> for Felt252Wrapper {
     }
 }
 
+#[allow(clippy::fallible_impl_from)]
+impl From<U64> for Felt252Wrapper {
+    fn from(value: U64) -> Self {
+        let felt = FieldElement::from(value.to::<u64>());
+        Self(felt)
+    }
+}
+
 impl TryFrom<Felt252Wrapper> for Address {
     type Error = ConversionError;
 
diff --git a/src/test_utils/hive/mod.rs b/src/test_utils/hive/mod.rs
index 23664ac5d..2acd255c1 100644
--- a/src/test_utils/hive/mod.rs
+++ b/src/test_utils/hive/mod.rs
@@ -105,7 +105,7 @@ impl HiveGenesisConfig {
                 Ok((
                     ContractAddress::new(starknet_address),
                     GenesisContractJson {
-                        class: proxy_class_hash.0.into(),
+                        class: Some(proxy_class_hash.0.into()),
                         balance: Some(EthersU256::from_big_endian(&info.balance.to_be_bytes::<32>())),
                         nonce: None,
                         storage: Some(kakarot_account_storage.into_iter().collect()),
diff --git a/src/test_utils/katana/genesis.rs b/src/test_utils/katana/genesis.rs
index 155968133..888db5de3 100644
--- a/src/test_utils/katana/genesis.rs
+++ b/src/test_utils/katana/genesis.rs
@@ -65,6 +65,20 @@ pub struct KatanaGenesisBuilder<T> {
     status: PhantomData<T>,
 }
 
+// Copy pasted from Dojo repository as it is part of the Katana binary
+// https://github.com/dojoengine/dojo/blob/main/bin/katana/src/utils.rs#L6
+fn parse_seed(seed: &str) -> [u8; 32] {
+    let seed = seed.as_bytes();
+
+    if seed.len() >= 32 {
+        unsafe { *(seed[..32].as_ptr() as *const [u8; 32]) }
+    } else {
+        let mut actual_seed = [0u8; 32];
+        seed.iter().enumerate().for_each(|(i, b)| actual_seed[i] = *b);
+        actual_seed
+    }
+}
+
 impl<T> KatanaGenesisBuilder<T> {
     pub fn update_state<State>(self) -> KatanaGenesisBuilder<State> {
         KatanaGenesisBuilder {
@@ -82,6 +96,7 @@ impl<T> KatanaGenesisBuilder<T> {
     pub fn with_dev_allocation(mut self, amount: u16) -> Self {
         let dev_allocations = DevAllocationsGenerator::new(amount)
             .with_balance(DEFAULT_PREFUNDED_ACCOUNT_BALANCE)
+            .with_seed(parse_seed("0"))
             .generate()
             .into_iter()
             .map(|(address, account)| {
@@ -89,7 +104,8 @@ impl<T> KatanaGenesisBuilder<T> {
                     address,
                     GenesisAccountJson {
                         public_key: account.public_key,
-                        balance: Some(account.balance),
+                        private_key: Some(account.private_key),
+                        balance: account.balance,
                         nonce: account.nonce,
                         class: None,
                         storage: account.storage.clone(),
@@ -218,7 +234,7 @@ impl KatanaGenesisBuilder<Loaded> {
         .collect::<HashMap<_, _>>();
 
         let kakarot = GenesisContractJson {
-            class: kakarot_class_hash,
+            class: Some(kakarot_class_hash),
             balance: None,
             nonce: None,
             storage: Some(kakarot_storage),
@@ -249,8 +265,12 @@ impl KatanaGenesisBuilder<Initialized> {
         .into_iter()
         .collect::<HashMap<_, _>>();
 
-        let eoa =
-            GenesisContractJson { class: proxy_class_hash, balance: None, nonce: None, storage: Some(eoa_storage) };
+        let eoa = GenesisContractJson {
+            class: Some(proxy_class_hash),
+            balance: None,
+            nonce: None,
+            storage: Some(eoa_storage),
+        };
 
         let starknet_address = self.compute_starknet_address(evm_address)?;
         self.contracts.insert(starknet_address, eoa);
diff --git a/src/test_utils/katana/mod.rs b/src/test_utils/katana/mod.rs
index db78ff50b..a83eb0dbc 100644
--- a/src/test_utils/katana/mod.rs
+++ b/src/test_utils/katana/mod.rs
@@ -5,8 +5,8 @@ use std::str::FromStr as _;
 use std::sync::Arc;
 
 use dojo_test_utils::sequencer::{Environment, SequencerConfig, StarknetConfig, TestSequencer};
+use katana_primitives::block::GasPrices;
 use katana_primitives::chain::ChainId;
-use katana_primitives::genesis::allocation::{DevAllocationsGenerator, GenesisAllocation};
 use katana_primitives::genesis::json::GenesisJson;
 use katana_primitives::genesis::Genesis;
 use reth_primitives::B256;
@@ -21,16 +21,7 @@ use super::mongo::mock_database;
 fn load_genesis() -> Genesis {
     let path = Path::new(env!("CARGO_MANIFEST_DIR")).join(".katana/genesis.json");
     let genesis_json = GenesisJson::load(path).expect("Failed to load genesis.json, run `make katana-genesis`");
-    let mut genesis = Genesis::try_from(genesis_json).expect("Failed to convert GenesisJson to Genesis");
-
-    let dev_allocations = DevAllocationsGenerator::new(10)
-        .generate()
-        .into_iter()
-        .map(|(address, account)| (address, Into::<GenesisAllocation>::into(account)))
-        .collect::<Vec<_>>();
-    genesis.extend_allocations(dev_allocations);
-
-    genesis
+    Genesis::try_from(genesis_json).expect("Failed to convert GenesisJson to Genesis")
 }
 
 /// Returns a `StarknetConfig` instance customized for Kakarot.
@@ -43,7 +34,7 @@ pub fn katana_config() -> StarknetConfig {
             chain_id: ChainId::parse("kakatest").unwrap(),
             invoke_max_steps: max_steps,
             validate_max_steps: max_steps,
-            gas_price: 1,
+            gas_price: GasPrices { eth: 1, strk: 0 },
         },
         genesis: load_genesis(),
         ..Default::default()