Skip to content

Commit

Permalink
Update cairo-lang deps to v2.9.0 dev.0 (#1858)
Browse files Browse the repository at this point in the history
* update rust version

* update rust version in CI

* update cairo-lang version to 2.9.0-dev.0

* update Changelog

* update Changelog

---------

Co-authored-by: pefontana <[email protected]>
  • Loading branch information
pefontana and pefontana authored Oct 21, 2024
1 parent d388218 commit efecd4f
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 66 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#### Upcoming Changes

* chore: bump `cairo-lang-` dependencies to 2.9.0-dev.0 [#1858](https://github.com/lambdaclass/cairo-vm/pull/1858/files)

* chore: update Rust required version to 1.81.0 [#1857](https://github.com/lambdaclass/cairo-vm/pull/1857)

* feat(BREAKING): [#1824](https://github.com/lambdaclass/cairo-vm/pull/1824)[#1838](https://github.com/lambdaclass/cairo-vm/pull/1838):
Expand Down
107 changes: 54 additions & 53 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ thiserror-no-std = { version = "2.0.2", default-features = false }
bitvec = { version = "1", default-features = false, features = ["alloc"] }

# Dependencies for cairo-1-hints feature
cairo-lang-starknet = { version = "2.8.0", default-features = false }
cairo-lang-casm = { version = "2.8.0", default-features = false }
cairo-lang-starknet = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-casm = { version = "2.9.0-dev.0", default-features = false }

cairo-lang-starknet-classes = { version = "2.8.0", default-features = false }
cairo-lang-compiler = { version = "=2.8.0", default-features = false }
cairo-lang-sierra-to-casm = { version = "2.8.0", default-features = false }
cairo-lang-sierra = { version = "2.8.0", default-features = false }
cairo-lang-runner = { version = "2.8.0", default-features = false }
cairo-lang-utils = { version = "=2.8.0", default-features = false }
cairo-lang-starknet-classes = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-compiler = { version = "=2.9.0-dev.0", default-features = false }
cairo-lang-sierra-to-casm = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-sierra = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-runner = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-utils = { version = "=2.9.0-dev.0", default-features = false }

# TODO: check these dependencies for wasm compatibility
ark-ff = { version = "0.4.2", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ $(CAIRO_2_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra
# ======================

CAIRO_2_REPO_DIR = cairo2
CAIRO_2_VERSION = 2.8.0
CAIRO_2_VERSION = 2.9.0-dev.0

build-cairo-2-compiler-macos:
@if [ ! -d "$(CAIRO_2_REPO_DIR)" ]; then \
Expand Down
6 changes: 3 additions & 3 deletions cairo1-run/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ keywords.workspace = true
cairo-vm = { workspace = true, features = ["std", "cairo-1-hints", "clap"] }
serde_json = { workspace = true }

cairo-lang-sierra-type-size = { version = "2.8.0", default-features = false }
cairo-lang-sierra-ap-change = { version = "2.8.0", default-features = false }
cairo-lang-sierra-gas = { version = "2.8.0", default-features = false }
cairo-lang-sierra-type-size = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-sierra-ap-change = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-sierra-gas = { version = "2.9.0-dev.0", default-features = false }
cairo-lang-starknet-classes.workspace = true
cairo-lang-sierra-to-casm.workspace = true
cairo-lang-compiler.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion cairo1-run/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ TRACES:=$(patsubst $(CAIRO_1_FOLDER)/%.cairo, $(CAIRO_1_FOLDER)/%.trace, $(CAIRO
MEMORY:=$(patsubst $(CAIRO_1_FOLDER)/%.cairo, $(CAIRO_1_FOLDER)/%.memory, $(CAIRO_1_PROGRAMS))

deps:
git clone --depth=1 -b v2.8.0 https://github.com/starkware-libs/cairo.git \
git clone --depth=1 -b v2.9.0-dev.0 https://github.com/starkware-libs/cairo.git \
&& mv cairo/corelib/ . \
&& rm -rf cairo/

Expand Down

0 comments on commit efecd4f

Please sign in to comment.