Sync main

.cargo/config.toml

@@ -1,13 +1,12 @@
 [env]
-CAIRO_NATIVE_RUNTIME_LIBRARY = "./libcairo_native_runtime.a"
 LLVM_SYS_191_PREFIX = "/usr/lib/llvm-19/"
 MLIR_SYS_190_PREFIX = "/usr/lib/llvm-19/"
 TABLEGEN_190_PREFIX = "/usr/lib/llvm-19/"
 
 # Use `lld` for linking instead of `ld`, since we run out of memory while linking with `ld` on
 # 16-cores linux machines, see:
 # https://nnethercote.github.io/perf-book/build-configuration.html#linking.
-# TODO: remove this once `rust` stabilizes `lld` as the default linker, currently only on nightly:
+# TODO(Gilad): remove this once `rust` stabilizes `lld` as the default linker, currently only on nightly:
 # https://github.com/rust-lang/rust/issues/39915#issuecomment-618726211
-[target.x86_64-unknown-linux-gnu]
+[target.'cfg(all(target_os = "linux"))']
 rustflags = ["-Clink-arg=-fuse-ld=lld"]

.dockerignore

@@ -1,6 +1,6 @@
 /data
 /deployments
 /logs
-/target
+**/target/
 .git
 !crates/papyrus_load_test/resources

.github/actions/bootstrap/action.yml

@@ -1,7 +1,17 @@
+name: Bootstrap
+description: Install dependencies.
+
+inputs:
+  extra_rust_toolchains:
+    description: "Extra toolchains to install, but aren't used by default"
+    required: false
+
 runs:
   using: "composite"
   steps:
     - name: Install rust.
       uses: ./.github/actions/install_rust
+      with:
+        extra_rust_toolchains: ${{ inputs.extra_rust_toolchains }}
     - name: Install cairo native.
       uses: ./.github/actions/setup_native_deps

.github/actions/install_rust/action.yml

@@ -1,9 +1,30 @@
-name: Bootsrap rust installation
+name: Bootstrap rust installation
 description: Setup rust environment and its components, also caching the build results.
 
+inputs:
+  extra_rust_toolchains:
+    description: "Extra toolchains to install, but aren't used by default"
+    required: false
+
 runs:
   using: "composite"
   steps:
     - uses: moonrepo/setup-rust@v1
+      name: Install Rust toolchain and binaries
       with:
         cache-base: main(-v[0-9].*)?
+        inherit-toolchain: true
+        bins: taplo-cli@0.9.3, cargo-machete
+        # Install additional non-default toolchains (for rustfmt for example), NOP if input omitted.
+        channel: ${{ inputs.extra_rust_toolchains }}
+      env:
+        RUSTFLAGS: "-C link-arg=-fuse-ld=lld"
+
+    # This installation is _not_ cached, but takes a couple seconds: it's downloading prepackaged
+    # binaries.
+    # TODO(Gilad): once we migrate to a cached Docker image, we can remove this step and just
+    # install it during dependencies.sh (which we don't do now since dependencies.sh isn't cached).
+    - name: Install Anvil
+      uses: foundry-rs/foundry-toolchain@v1
+      with:
+          version: v0.3.0

.github/workflows/blockifier_ci.yml

@@ -22,39 +22,66 @@ on:
     paths:
       # Other than code-related changes, all changes related to the native-blockifier build-and-push
       # process should trigger the build (e.g., changes to the Dockerfile, build scripts, etc.).
+      - '.github/actions/bootstrap/action.yml'
       - '.github/workflows/blockifier_ci.yml'
       - '.github/workflows/upload_artifacts_workflow.yml'
       - 'build_native_in_docker.sh'
       - 'Cargo.lock'
       - 'Cargo.toml'
       - 'crates/blockifier/**'
+      - 'crates/blockifier_test_utils/**'
       - 'crates/native_blockifier/**'
+      - 'crates/starknet_sierra_multicompile/build.rs'
       - 'scripts/build_native_blockifier.sh'
       - 'scripts/dependencies.sh'
       - 'scripts/install_build_tools.sh'
       - 'scripts/sequencer-ci.Dockerfile'
 
+env:
+  RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
+
 # On PR events, cancel existing CI runs on this same PR for this workflow.
+# Also, create different concurrency groups for different pushed commits, on push events.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
+  group: >
+    ${{ github.workflow }}-
+    ${{ github.ref }}-
+    ${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
-  feature-combo-builds:
-    runs-on: starkware-ubuntu-20-04-medium
+  test-without-features:
+    runs-on: starkware-ubuntu-24.04-medium
     steps:
       - uses: actions/checkout@v4
-        with:
-          # required to clone native as a gitsubmodule
-          submodules: recursive
-          fetch-depth: 0
       - uses: ./.github/actions/bootstrap
       # No features - build blockifier without features activated by dependencies in the workspace.
-      - run: cargo build -p blockifier
       - run: cargo test -p blockifier
+      - run: cargo build -p blockifier
+
+  test-with-transaction-serde-feature:
+    runs-on: starkware-ubuntu-24.04-medium
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/bootstrap
       # transaction_serde is not activated by any workspace crate; test the build.
-      - run: cargo build -p blockifier --features transaction_serde
       - run: cargo test -p blockifier --features transaction_serde
+      - run: cargo build -p blockifier --features transaction_serde
+
+  test-with-cairo-native-feature:
+    runs-on: starkware-ubuntu-24.04-medium
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/bootstrap
       # cairo_native is not activated by any workspace crate; test the build.
       - run: cargo build -p blockifier --features cairo_native
       - run: cargo test -p blockifier --features cairo_native
+
+  test-with-tracing-feature:
+      runs-on: starkware-ubuntu-24.04-medium
+      steps:
+        - uses: actions/checkout@v4
+        - uses: ./.github/actions/bootstrap
+        # tracing is not activated by any workspace crate; test the build.
+        - run: cargo build -p blockifier --features tracing
+        - run: cargo test -p blockifier --features tracing

.github/workflows/blockifier_compiled_cairo.yml

@@ -9,20 +9,27 @@ on:
     paths:
       - 'Cargo.toml'
       - '.github/workflows/blockifier_compiled_cairo.yml'
-      - 'crates/blockifier/feature_contracts/**'
-      - 'crates/blockifier/src/test_utils/cairo_compile.rs'
-      - 'crates/blockifier/tests/feature_contracts_compatibility_test.rs'
-      - 'crates/blockifier/tests/requirements.txt'
+      - 'crates/blockifier_test_utils/cairo_compile.rs'
+      - 'crates/blockifier_test_utils/resources/feature_contracts/**'
+      - 'crates/blockifier_test_utils/tests/feature_contracts_compatibility_test.rs'
+      - 'crates/blockifier_test_utils/tests/requirements.txt'
       - 'scripts/dependencies.sh'
 
+env:
+  RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
+
 # On PR events, cancel existing CI runs on this same PR for this workflow.
+# Also, create different concurrency groups for different pushed commits, on push events.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
+  group: >
+    ${{ github.workflow }}-
+    ${{ github.ref }}-
+    ${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   verify_cairo_file_dependencies:
-    runs-on: starkware-ubuntu-20-04-medium
+    runs-on: starkware-ubuntu-24.04-medium
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/bootstrap
@@ -65,5 +72,5 @@ jobs:
       - name: Verify cairo contract recompilation (both cairo versions).
         run:
           cd sequencer &&
-          pip install -r crates/blockifier/tests/requirements.txt &&
-          cargo test -p blockifier --test feature_contracts_compatibility_test --features testing -- --include-ignored
+          pip install -r crates/blockifier_test_utils/tests/requirements.txt &&
+          cargo test -p blockifier_test_utils --test feature_contracts_compatibility_test -- --include-ignored --nocapture

.github/workflows/blockifier_post-merge.yml

@@ -13,7 +13,7 @@ on:
 jobs:
   if_merged:
     if: github.event.pull_request.merged == true
-    runs-on: starkware-ubuntu-20-04-medium
+    runs-on: starkware-ubuntu-24.04-medium
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/bootstrap
@@ -29,5 +29,5 @@ jobs:
         run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
 
       - run: |
-          pip install -r crates/blockifier/tests/requirements.txt
+          pip install -r crates/blockifier_test_utils/tests/requirements.txt
           cargo test -p blockifier -p native_blockifier -- --include-ignored

.github/workflows/blockifier_reexecution_ci.yml

@@ -19,14 +19,21 @@ on:
       - 'scripts/install_build_tools.sh'
       - 'scripts/sequencer-ci.Dockerfile'
 
+env:
+  RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
+
 # On PR events, cancel existing CI runs on this same PR for this workflow.
+# Also, create different concurrency groups for different pushed commits, on push events.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
+  group: >
+    ${{ github.workflow }}-
+    ${{ github.ref }}-
+    ${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   blockifier_reexecution:
-    runs-on: starkware-ubuntu-latest-medium
+    runs-on: starkware-ubuntu-24.04-medium
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/bootstrap
@@ -41,4 +48,4 @@ jobs:
       # Run blockifier re-execution tests.
       - run: cargo test --release -p blockifier_reexecution -- --include-ignored
       # Compile the rpc-tests, without running them.
-      - run: cargo test -p blockifier_reexecution --features blockifier_regression_https_testing --no-run
+      - run: cargo test --release -p blockifier_reexecution --features blockifier_regression_https_testing --no-run

.github/workflows/clean_stale_prs.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   stale:
     name: 🧹 Clean up stale issues and PRs
-    runs-on: starkware-ubuntu-latest-small
+    runs-on: starkware-ubuntu-24.04-small
     steps:
       - name: 🚀 Run stale
         uses: actions/stale@v3

.github/workflows/committer_cli_push.yml → .github/workflows/committer_and_os_cli_push.yml

@@ -1,4 +1,4 @@
-name: Committer-CLI-push
+name: Committer-And-OS-CLI-push
 
 on:
   push:
@@ -7,15 +7,6 @@ on:
       - main-v[0-9].**
     tags:
       - v[0-9].**
-    paths:
-      - '.github/workflows/committer_cli_push.yml'
-      - 'Cargo.toml'
-      - 'Cargo.lock'
-      - 'crates/committer_cli/**'
-      - 'crates/starknet_api/**'
-      - 'crates/starknet_committer/**'
-      - 'crates/starknet_patricia/**'
-      - 'scripts/dependencies.sh'
 
   pull_request:
     types:
@@ -25,23 +16,34 @@ on:
       - auto_merge_enabled
       - edited
     paths:
-      - '.github/workflows/committer_cli_push.yml'
+      - '.github/workflows/committer_and_os_cli_push.yml'
+      - 'build_native_in_docker.sh'
+      - 'docker-ci/images/sequencer-ci.Dockerfile'
       - 'Cargo.toml'
       - 'Cargo.lock'
-      - 'crates/committer_cli/**'
+      - 'crates/starknet_committer_and_os_cli/**'
       - 'crates/starknet_api/**'
       - 'crates/starknet_committer/**'
+      - 'crates/starknet_os/**'
       - 'crates/starknet_patricia/**'
+      - 'rust-toolchain.toml'
       - 'scripts/dependencies.sh'
 
+env:
+  RUSTFLAGS: "-D warnings -C link-arg=-fuse-ld=lld"
+
 # On PR events, cancel existing CI runs on this same PR for this workflow.
+# Also, create different concurrency groups for different pushed commits, on push events.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }}
+  group: >
+    ${{ github.workflow }}-
+    ${{ github.ref }}-
+    ${{ github.event_name == 'pull_request' && 'PR' || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   gcs-push:
-    runs-on: starkware-ubuntu-20-04-medium
+    runs-on: starkware-ubuntu-24.04-medium
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/bootstrap
@@ -61,7 +63,7 @@ jobs:
         run: echo "SHORT_HASH=${COMMIT_SHA:0:7}" >> $GITHUB_ENV
 
       - name: Build CLI binary
-        run: ./build_native_in_docker.sh cargo build -p committer_cli -r --bin committer_cli --target-dir CLI_TARGET
+        run: ./build_native_in_docker.sh rustup toolchain install && cargo build -p starknet_committer_and_os_cli -r --bin starknet_committer_and_os_cli --target-dir CLI_TARGET
 
       - id: auth
         uses: "google-github-actions/auth@v2"
@@ -72,5 +74,5 @@ jobs:
         id: upload_file
         uses: "google-github-actions/upload-cloud-storage@v2"
         with:
-          path: "CLI_TARGET/release/committer_cli"
+          path: "CLI_TARGET/release/starknet_committer_and_os_cli"
           destination: "committer-products-external/${{ env.SHORT_HASH }}/release/"