Merge pull request #2474 from eqlabs/krisztian/stateful-state-diff-co…

…mpression feat(executor): upgrade blockifier for Starknet 0.13.4
eqlabs · Jan 16, 2025 · 1dbfeb9 · 1dbfeb9
2 parents 95f5966 + 4439172
commit 1dbfeb9
Show file tree

Hide file tree

Showing 33 changed files with 4,744 additions and 1,930 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,17 +58,18 @@ axum = "0.7.5"
 base64 = "0.13.1"
 bincode = "2.0.0-rc.3"
 bitvec = "1.0.1"
-blockifier = { git = "https://github.com/eqlabs/sequencer", branch = "eqlabs/main-v0.13.2" }
+blockifier = { git = "https://github.com/starkware-libs/sequencer", branch = "main-v0.13.4" }
 bloomfilter = "1.0.12"
 bytes = "1.4.0"
 cached = "0.44.0"
-cairo-lang-starknet-classes = "=2.7.0"
+# This one needs to match the version used by blockifier
+cairo-lang-starknet-classes = "=2.10.0-rc.0"
 # This one needs to match the version used by blockifier
 cairo-vm = "=1.0.1"
-casm-compiler-v1_0_0-alpha6 = { git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-alpha.6" }
-casm-compiler-v1_0_0-rc0 = { git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-rc0" }
-casm-compiler-v1_1_1 = "=1.1.1"
-casm-compiler-v2 = "=2.7.0"
+casm-compiler-v1_0_0-alpha6 = { package = "cairo-lang-starknet", git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-alpha.6" }
+casm-compiler-v1_0_0-rc0 = { package = "cairo-lang-starknet", git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-rc0" }
+casm-compiler-v1_1_1 = { package = "cairo-lang-starknet", version = "=1.1.1" }
+casm-compiler-v2 = { package = "cairo-lang-starknet", version = "=2.10.0-rc.0" }
 clap = "4.1.13"
 console-subscriber = "0.1.10"
 const-decoder = "0.3.0"
@@ -125,9 +126,9 @@ serde_with = "3.7.0"
 sha2 = "0.10.7"
 sha3 = "0.10"
 # This one needs to match the version used by blockifier
-starknet_api = { git = "https://github.com/eqlabs/sequencer", branch = "eqlabs/main-v0.13.2" }
+starknet_api = { git = "https://github.com/starkware-libs/sequencer", branch = "main-v0.13.4" }
 # This one needs to match the version used by blockifier
-starknet-types-core = "=0.1.5"
+starknet-types-core = "=0.1.7"
 syn = "1.0"
 tempfile = "3.8"
 test-log = { version = "0.2.12", features = ["trace"] }

diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -9,10 +9,10 @@ rust-version = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 cairo-lang-starknet-classes = { workspace = true }
-casm-compiler-v1_0_0-alpha6 = { package = "cairo-lang-starknet", git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-alpha.6" }
-casm-compiler-v1_0_0-rc0 = { package = "cairo-lang-starknet", git = "https://github.com/starkware-libs/cairo", tag = "v1.0.0-rc0" }
-casm-compiler-v1_1_1 = { package = "cairo-lang-starknet", version = "=1.1.1" }
-casm-compiler-v2 = { package = "cairo-lang-starknet", version = "=2.7.0" }
+casm-compiler-v1_0_0-alpha6 = { workspace = true }
+casm-compiler-v1_0_0-rc0 = { workspace = true }
+casm-compiler-v1_1_1 = { workspace = true }
+casm-compiler-v2 = { workspace = true }
 num-bigint = { workspace = true }
 pathfinder-common = { path = "../common" }
 pathfinder-crypto = { path = "../crypto" }

diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
@@ -10,6 +10,7 @@ rust-version = { workspace = true }
 anyhow = { workspace = true }
 blockifier = { workspace = true }
 cached = { workspace = true }
+cairo-lang-starknet-classes = { workspace = true }
 cairo-vm = { workspace = true }
 pathfinder-common = { path = "../common" }
 pathfinder-crypto = { path = "../crypto" }