Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(executor): upgrade blockifier for Starknet 0.13.4 #2474

Merged
merged 9 commits into from
Jan 16, 2025
Merged

feat(executor): upgrade blockifier for Starknet 0.13.4 #2474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b3fbb9c
chore(executor): upgrade blockifier to latest `main`
vbar Nov 12, 2024
5d54f79
update to new starknet_api version
sistemd Jan 2, 2025
b9104ff
feat(cargo): upgrade blockifier, starknet_api and cairo
kkovaacs Jan 7, 2025
99d68f8
chore(executor): fix compilation after blockifier upgrade
kkovaacs Jan 8, 2025
1e04c7a
fix(rpc): fix resource bound conversion for fully-specified case
kkovaacs Jan 9, 2025
451a20b
fix(re_execute): fix gas consumption comparison
kkovaacs Jan 9, 2025
ae0ceeb
Update crates/executor/src/execution_state.rs
kkovaacs Jan 10, 2025
b306103
chore(cargo): upgrade blockifier
kkovaacs Jan 14, 2025
4439172
fix(executor): fix inner call execution resources
kkovaacs Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,116 changes: 1,298 additions & 818 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"] }
Expand Down
8 changes: 4 additions & 4 deletions crates/compiler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
1 change: 1 addition & 0 deletions crates/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
Loading
Loading