Skip to content

Commit

Permalink
Merge branch 'main' into add-main-outout
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Fontana authored and Pedro Fontana committed Feb 27, 2024
2 parents fb716e5 + bdcfb1f commit ee04f5c
Show file tree
Hide file tree
Showing 164 changed files with 494 additions and 424 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
steps:
- uses: dangoslen/changelog-enforcer@v3
with:
skipLabels: pipelines,coverage
skipLabels: pipelines,tests,documentation
57 changes: 57 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,23 @@ env:
PROPTEST_CASES: 100

jobs:

# We need to use the same files across all jobs or else hashing will fail
upload_proof_programs_symlinks:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Create proof_programs symlinks
run: make create-proof-programs-symlinks
- uses: actions/upload-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/*.cairo

build-programs:
needs: upload_proof_programs_symlinks
strategy:
matrix:
# NOTE: we build cairo_bench_programs so clippy can check the benchmarks too
Expand All @@ -41,6 +57,11 @@ jobs:
with:
fetch-depth: 0

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Fetch from cache
uses: actions/cache@v3
id: cache-programs
Expand Down Expand Up @@ -91,6 +112,11 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Fetch test programs
uses: actions/cache/restore@v3
Expand Down Expand Up @@ -143,9 +169,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Format
run: make check-fmt


- name: Fetch programs
uses: actions/cache/restore@v3
with:
Expand Down Expand Up @@ -181,6 +213,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Fetch programs
uses: actions/cache/restore@v3
with:
Expand Down Expand Up @@ -228,6 +265,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Fetch programs
uses: actions/cache/restore@v3
with:
Expand Down Expand Up @@ -314,6 +356,11 @@ jobs:
with:
fetch-depth: 0

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Check cache
uses: actions/cache@v3
id: trace-cache
Expand Down Expand Up @@ -381,6 +428,11 @@ jobs:
path: target/release/cairo-vm-cli
fail-on-cache-miss: true

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Fetch programs
uses: actions/cache/restore@v3
with:
Expand Down Expand Up @@ -496,6 +548,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- uses: actions/download-artifact@master
with:
name: proof_programs
path: cairo_programs/proof_programs/

- name: Fetch traces for cairo-lang
uses: actions/cache/restore@v3
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ cairo-vm-pypy-env/*
cairo1-run/corelib/
cairo-vm-cli/air_input.pub
ensure-no_std/Cargo.lock
cairo_programs/proof_programs/*.cairo

!vm/src/tests/cairo_pie_test_output.json
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@

#### Upcoming Changes

#### [1.0.0-rc1] - 2024-02-23

* Bump `starknet-types-core` dependency version to 0.0.9 [#1628](https://github.com/lambdaclass/cairo-vm/pull/1628)

* feat: Implement `Display` for `MemorySegmentManager`[#1606](https://github.com/lambdaclass/cairo-vm/pull/1606)

* fix: make Felt252DictEntryUpdate work with MaybeRelocatable instead of only Felt [#1624](https://github.com/lambdaclass/cairo-vm/pull/1624).

* chore: bump `cairo-lang-` dependencies to 2.5.4 [#1629](https://github.com/lambdaclass/cairo-vm/pull/1629)

* chore: bump `cairo-lang-` dependencies to 2.5.3 [#1596](https://github.com/lambdaclass/cairo-vm/pull/1596)

* refactor: Refactor `cairo1-run` crate [#1601](https://github.com/lambdaclass/cairo-vm/pull/1601)
Expand All @@ -22,6 +30,8 @@
* Add instructions to the proof_mode header to copy return values to the output segment before initiating the infinite loop
* Output builtin is now always included when running cairo 1 programs in proof_mode

* feat: deserialize AIR private input [#1589](https://github.com/lambdaclass/cairo-vm/pull/1589)

* feat(BREAKING): Remove unecessary conversion functions between `Felt` & `BigUint`/`BigInt` [#1562](https://github.com/lambdaclass/cairo-vm/pull/1562)
* Remove the following functions:
* felt_from_biguint
Expand Down
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@ Enhancement suggestions are tracked as [GitHub issues](https://github.com/lambda
- `merge`
- `wip`

### Labels

We recommend using the corresponding labels for each PR's purpose, the most commonly used labels include:

- `documentation`: Improvements or additions to documentation
- `tests`: Implementation of tests
- `pipelines`: Improving CI/CD workflows
- `enhancement`: Implementation of new features
- `performance`: Performance-related improvements

## Attribution
This guide is based on the **contributing.md**. [Make your own](https://contributing.md/)!
Loading

0 comments on commit ee04f5c

Please sign in to comment.