From 68e7434fd1949f4add03f7c9256f9510e1940d89 Mon Sep 17 00:00:00 2001 From: gabrielbosio Date: Wed, 21 May 2025 17:48:56 -0300 Subject: [PATCH 1/3] Prepare for release 2.1.0 --- .github/workflows/bench.yml | 2 +- .github/workflows/cairo_1_programs.yml | 2 +- .github/workflows/fresh_run.yml | 2 +- .github/workflows/hint_accountant.yml | 2 +- .github/workflows/hyper_threading_benchmarks.yml | 2 +- .github/workflows/hyperfine.yml | 2 +- .github/workflows/iai_main.yml | 2 +- .github/workflows/iai_pr.yml | 4 ++-- .github/workflows/publish.yml | 2 +- .github/workflows/rust.yml | 12 ++++++------ CHANGELOG.md | 2 ++ Cargo.lock | 14 +++++++------- Cargo.toml | 6 +++--- 13 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index a225d576e4..4cd23ca695 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: components: rustfmt, clippy - uses: actions/checkout@v4 diff --git a/.github/workflows/cairo_1_programs.yml b/.github/workflows/cairo_1_programs.yml index 0a1f630b68..36ca95496e 100644 --- a/.github/workflows/cairo_1_programs.yml +++ b/.github/workflows/cairo_1_programs.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Set up Cargo cache uses: Swatinem/rust-cache@v2 - name: Checkout diff --git a/.github/workflows/fresh_run.yml b/.github/workflows/fresh_run.yml index 1569c0ca55..b95184380c 100644 --- a/.github/workflows/fresh_run.yml +++ b/.github/workflows/fresh_run.yml @@ -38,7 +38,7 @@ jobs: uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Install Pyenv uses: "gabrielfalcao/pyenv-action@v13" diff --git a/.github/workflows/hint_accountant.yml b/.github/workflows/hint_accountant.yml index 12ee940fe4..25dd46d916 100644 --- a/.github/workflows/hint_accountant.yml +++ b/.github/workflows/hint_accountant.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Set up Cargo cache uses: Swatinem/rust-cache@v2 - name: Checkout diff --git a/.github/workflows/hyper_threading_benchmarks.yml b/.github/workflows/hyper_threading_benchmarks.yml index 983205be7f..02d693f665 100644 --- a/.github/workflows/hyper_threading_benchmarks.yml +++ b/.github/workflows/hyper_threading_benchmarks.yml @@ -29,7 +29,7 @@ jobs: sudo apt-get install -y hyperfine - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: components: rustfmt, clippy diff --git a/.github/workflows/hyperfine.yml b/.github/workflows/hyperfine.yml index 19ff4c5fa8..59fdd6c1e2 100644 --- a/.github/workflows/hyperfine.yml +++ b/.github/workflows/hyperfine.yml @@ -74,7 +74,7 @@ jobs: - name: Install Rust if: ${{ steps.cache.outputs.cache-hit != 'true' }} - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Checkout if: ${{ steps.cache.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/iai_main.yml b/.github/workflows/iai_main.yml index 8ae2ee8c02..5bca8c1cb9 100644 --- a/.github/workflows/iai_main.yml +++ b/.github/workflows/iai_main.yml @@ -11,7 +11,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Set up cargo cache uses: Swatinem/rust-cache@v2 - name: Python3 Build diff --git a/.github/workflows/iai_pr.yml b/.github/workflows/iai_pr.yml index ac079af480..fb2a6da193 100644 --- a/.github/workflows/iai_pr.yml +++ b/.github/workflows/iai_pr.yml @@ -23,7 +23,7 @@ jobs: - name: Install Rust if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }} - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Set up cargo cache if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }} uses: Swatinem/rust-cache@v2 @@ -51,7 +51,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Set up cargo cache uses: Swatinem/rust-cache@v2 - name: Python3 Build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 64dc8a99c7..a1c0506560 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout sources uses: actions/checkout@v4 - name: Install stable toolchain - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Publish crate cairo-vm env: CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 610c38b730..dfbab11a6b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -159,7 +159,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: components: rustfmt, clippy - name: Set up cargo cache @@ -199,7 +199,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: targets: wasm32-unknown-unknown @@ -245,7 +245,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: targets: wasm32-unknown-unknown @@ -285,7 +285,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: targets: wasm32-unknown-unknown @@ -327,7 +327,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 with: components: llvm-tools-preview - name: Set up cargo cache @@ -393,7 +393,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Install Rust - uses: dtolnay/rust-toolchain@1.85.0 + uses: dtolnay/rust-toolchain@1.86.0 - name: Set up cargo cache uses: Swatinem/rust-cache@v2 - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index d4c4cc13af..0c63596604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ #### Upcoming Changes +#### [2.1.0] - 2025-05-21 + * chore: bump pip `cairo-lang` 0.13.5 [#1959](https://github.com/lambdaclass/cairo-vm/pull/1959) * fix: Use Cairo prime instead of SECP_P in WRITE_DIVMOD_SEGMENT hint [#2078](https://github.com/lambdaclass/cairo-vm/pull/2078) diff --git a/Cargo.lock b/Cargo.lock index 19ffc002cf..99b2b7b853 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -910,7 +910,7 @@ dependencies = [ [[package]] name = "cairo-vm" -version = "2.0.1" +version = "2.1.0" dependencies = [ "anyhow", "arbitrary", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "cairo-vm-cli" -version = "2.0.1" +version = "2.1.0" dependencies = [ "assert_matches", "bincode 2.0.0-rc.3", @@ -970,7 +970,7 @@ dependencies = [ [[package]] name = "cairo-vm-tracer" -version = "2.0.1" +version = "2.1.0" dependencies = [ "axum", "cairo-vm", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "cairo1-run" -version = "2.0.1" +version = "2.1.0" dependencies = [ "assert_matches", "bincode 2.0.0-rc.3", @@ -1644,7 +1644,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hint_accountant" -version = "2.0.1" +version = "2.1.0" dependencies = [ "cairo-vm", "serde", @@ -1734,7 +1734,7 @@ dependencies = [ [[package]] name = "hyper_threading" -version = "2.0.1" +version = "2.1.0" dependencies = [ "cairo-vm", "rayon", @@ -3596,7 +3596,7 @@ dependencies = [ [[package]] name = "wasm-demo" -version = "2.0.1" +version = "2.1.0" dependencies = [ "cairo-vm", "console_error_panic_hook", diff --git a/Cargo.toml b/Cargo.toml index 7290626f15..c3a3261c93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ exclude = ["ensure-no_std"] resolver = "2" [workspace.package] -version = "2.0.1" +version = "2.1.0" edition = "2021" license = "Apache-2.0" repository = "https://github.com/lambdaclass/cairo-vm/" @@ -24,8 +24,8 @@ readme = "README.md" keywords = ["starknet", "cairo", "vm", "wasm", "no_std"] [workspace.dependencies] -cairo-vm = { path = "./vm", version = "2.0.1", default-features = false } -cairo-vm-tracer = { path = "./cairo-vm-tracer", version = "2.0.1", default-features = false } +cairo-vm = { path = "./vm", version = "2.1.0", default-features = false } +cairo-vm-tracer = { path = "./cairo-vm-tracer", version = "2.1.0", default-features = false } mimalloc = { version = "0.1.37", default-features = false } num-bigint = { version = "0.4", default-features = false, features = [ "serde", From 5b291bde2a50ad615df8a22afcd461ba880335da Mon Sep 17 00:00:00 2001 From: gabrielbosio Date: Wed, 21 May 2025 18:13:59 -0300 Subject: [PATCH 2/3] Update version in Rust toolchain file --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index a492f00899..06810703e0 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,4 +1,4 @@ [toolchain] -channel = "1.85.0" +channel = "1.86.0" components = ["rustfmt", "clippy"] profile = "minimal" From 857721edd0d0146a555e4ff267288c49c73157f8 Mon Sep 17 00:00:00 2001 From: gabrielbosio Date: Wed, 21 May 2025 18:24:24 -0300 Subject: [PATCH 3/3] Fix lint issues --- cairo-vm-tracer/src/tracer.rs | 2 +- cairo-vm-tracer/src/tracer_data.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cairo-vm-tracer/src/tracer.rs b/cairo-vm-tracer/src/tracer.rs index 0edf2f9fe1..5e7e467093 100644 --- a/cairo-vm-tracer/src/tracer.rs +++ b/cairo-vm-tracer/src/tracer.rs @@ -71,7 +71,7 @@ async fn get_data(tracer_data: State) -> Json { .map(|x| { field_element_repr( &x.to_bigint(), - &BigInt::parse_bytes(PRIME_STR[2..].as_bytes(), 16).unwrap(), + &BigInt::parse_bytes(&PRIME_STR.as_bytes()[2..], 16).unwrap(), ) }) .enumerate() diff --git a/cairo-vm-tracer/src/tracer_data.rs b/cairo-vm-tracer/src/tracer_data.rs index 6b739c3ba3..c0e6a8c123 100644 --- a/cairo-vm-tracer/src/tracer_data.rs +++ b/cairo-vm-tracer/src/tracer_data.rs @@ -211,7 +211,7 @@ pub fn get_instruction_encoding( return Err(TraceDataError::InstructionIsNone(pc.to_string())); } let instruction_encoding = memory[pc].unwrap(); - let prime = BigUint::parse_bytes(prime[2..].as_bytes(), 16).unwrap(); + let prime = BigUint::parse_bytes(&prime.as_bytes()[2..], 16).unwrap(); let imm_addr = BigUint::from(pc + 1) % prime; let imm_addr = usize::try_from(imm_addr.clone())