Skip to content

Commit d46586b

Browse files
kkawulacptarturfranciszekjobTHenry14ksew1
authored
Bump blockifier to support Cairo 2.10.0 (#2866)
<!-- Reference any GitHub issues resolved by this PR --> Closes #2862 ## Introduced changes <!-- A brief description of the changes --> - ## Checklist <!-- Make sure all of these are complete --> - [ ] Linked relevant issue - [ ] Updated relevant documentation - [ ] Added relevant tests - [ ] Performed self-review of the code - [ ] Added changes to `CHANGELOG.md` --------- Co-authored-by: Artur Michalek <[email protected]> Co-authored-by: Fiiranek <[email protected]> Co-authored-by: Wojciech Szymczyk <[email protected]> Co-authored-by: ksew1 <[email protected]> Co-authored-by: Franciszek Job <[email protected]> Co-authored-by: Artur Michałek <[email protected]>
1 parent 0213ca1 commit d46586b

File tree

120 files changed

+2047
-1392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2047
-1392
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,8 @@ jobs:
106106
- name: nextest partition ${{ matrix.partition }}/8
107107
run: cargo nextest run --no-fail-fast --partition 'count:${{ matrix.partition }}/8' --archive-file 'nextest-archive-${{ matrix.os }}.tar.zst' e2e
108108

109-
test-scarb-2-8-3:
110-
name: Test scarb 2.8.3
111-
runs-on: ubuntu-latest
112-
steps:
113-
- uses: actions/checkout@v4
114-
- uses: dtolnay/rust-toolchain@stable
115-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
116-
- uses: software-mansion/setup-scarb@v1
117-
with:
118-
scarb-version: "2.8.3"
119-
- uses: software-mansion/setup-universal-sierra-compiler@v1
120-
121-
- name: Install cairo-coverage
122-
run: |
123-
curl -L https://raw.githubusercontent.com/software-mansion/cairo-coverage/main/scripts/install.sh | sh
124-
125-
- run: cargo test --package forge --features scarb_2_8_3 --test main e2e::coverage
126-
- run: cargo test --package forge --features scarb_2_8_3 --test main e2e::backtrace
127-
128-
test-coverage-error:
129-
name: Test coverage error
109+
test-scarb-2-7-1:
110+
name: Test scarb 2.7.1
130111
runs-on: ubuntu-latest
131112
steps:
132113
- uses: actions/checkout@v4
@@ -137,31 +118,8 @@ jobs:
137118
scarb-version: "2.7.1"
138119
- uses: software-mansion/setup-universal-sierra-compiler@v1
139120

140-
- name: Install cairo-coverage
141-
run: |
142-
curl -L https://raw.githubusercontent.com/software-mansion/cairo-coverage/main/scripts/install.sh | sh
143-
144-
- run: cargo test --package forge --features scarb_2_7_1 --test main e2e::coverage::test_fail_on_scarb_version_lt_2_8_0
145-
146-
test-contracts-artifacts:
147-
name: Test contracts artifacts
148-
runs-on: ubuntu-latest
149-
steps:
150-
- uses: actions/checkout@v4
151-
- uses: dtolnay/rust-toolchain@stable
152-
- uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab
153-
- uses: software-mansion/setup-scarb@v1
154-
with:
155-
scarb-version: "2.8.3"
156-
- uses: software-mansion/setup-universal-sierra-compiler@v1
157-
- run: |
158-
cargo test --package forge --features scarb_2_8_3 e2e::contract_artifacts
159-
- run: |
160-
cargo test --package forge --features scarb_2_8_3 e2e::features
161-
- run: |
162-
cargo test --package scarb-api --features scarb_2_8_3 get_starknet_artifacts_path
163-
- run: |
164-
cargo test --package scarb-api --features scarb_2_8_3 test_load_contracts_artifacts
121+
- run: cargo test --package forge --features scarb_2_7_1 --test main e2e::requirements::test_warning_on_scarb_version_below_recommended
122+
- run: cargo test --package forge --features scarb_2_7_1 --lib compatibility_check::tests::warning_requirements
165123

166124
test-forge-runner:
167125
name: Test Forge Runner
@@ -235,8 +193,6 @@ jobs:
235193
$DEVNET_INSTALL_DIR = "${{ github.workspace }}\crates\sncast\tests\utils\devnet"
236194
cargo install --git https://github.com/0xSpaceShard/starknet-devnet-rs.git --locked --rev ${{ env.DEVNET_REV }} --root $DEVNET_INSTALL_DIR
237195
- uses: software-mansion/setup-scarb@v1
238-
with:
239-
scarb-version: "2.7.0"
240196
- uses: software-mansion/setup-universal-sierra-compiler@v1
241197
- name: Run tests
242198
run: cargo test --release -p sncast

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scarb 2.7.0
1+
scarb 2.8.5

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2020
- `snforge clean` command - used to manage and remove files generated by snforge. It supports cleaning the following components: coverage, profile, cache, trace, all
2121
- `snforge new` now adds the `snfoundry_trace`, `coverage`, and `profile` directories to `.gitignore`.
2222
- Custom types can be used in fuzz testing by implementing the `Fuzzable` trait
23+
- Support for Cairo 2.10.0
2324

2425
#### Changed
2526

2627
- It is now required to include the `#[fuzzer]` attribute for fuzz tests to work
28+
- Scarb `2.8.5` is now the minimal recommended version. Using Starknet Foundry with versions below it is no longer officially supported and may not work.
2729

2830
#### Deprecated
2931

0 commit comments

Comments
 (0)