Merge branch 'main' into fix/vm-reverts

Author: heemankv

.env.e2e

@@ -1,4 +1,5 @@
 RUST_LOG=info
+CARGO_TARGET_DIR=target
 #### AWS CONFIG ####
 AWS_ACCESS_KEY_ID=test
 AWS_SECRET_ACCESS_KEY=test
@@ -11,15 +12,16 @@ AWS_DEFAULT_REGION=localhost
 ## MONGODB ##
 
 MADARA_ORCHESTRATOR_DATABASE_NAME=orchestrator
-MADARA_ORCHESTRATOR_MADARA_VERSION=0.13.3
+MADARA_ORCHESTRATOR_MADARA_VERSION=0.14.0
 
 #### PROVER ####
 
 
 #### BATCHING ####
-MADARA_ORCHESTRATOR_MAX_BATCH_TIME_SECONDS=30
+MADARA_ORCHESTRATOR_MAX_BATCH_TIME_SECONDS=90
 MADARA_ORCHESTRATOR_MAX_BATCH_SIZE=40
 MADARA_ORCHESTRATOR_BATCHING_LOCK_DURATION_SECONDS=3600
+MADARA_ORCHESTRATOR_MAX_BLOCKS_PER_SNOS_BATCH=10 # Need to add this since Pathfinder doesn't store builtin weights
 
 ## ATLANTIC ##
 
@@ -29,8 +31,9 @@ MADARA_ORCHESTRATOR_ATLANTIC_MOCK_FACT_HASH=true # Whether to use mock fact regi
 MADARA_ORCHESTRATOR_ATLANTIC_PROVER_TYPE="herodotus" # ("herodotus" | "starkware")
 MADARA_ORCHESTRATOR_ATLANTIC_SETTLEMENT_LAYER="ethereum" # ("ethereum" | "starknet")
 MADARA_ORCHESTRATOR_ATLANTIC_VERIFIER_CONTRACT_ADDRESS=0x07ec0D28e50322Eb0C159B9090ecF3aeA8346DFe
-MADARA_ORCHESTRATOR_ATLANTIC_CAIRO_VM=python
+MADARA_ORCHESTRATOR_ATLANTIC_CAIRO_VM=rust # use Rust CairoVM with 0.14.0 aggregator
 MADARA_ORCHESTRATOR_ATLANTIC_RESULT=proof-generation
+
 #### SETTLEMENT ####
 
 ## ETHEREUM ##

.github/actions/setup-rust/action.yml

@@ -50,10 +50,35 @@ runs:
     - name: Install dependencies
       shell: bash
       run: |
-        sudo apt-get update -y && sudo apt-get install -y \
-          clang llvm libudev-dev protobuf-compiler gcc g++ build-essential libssl-dev pkg-config curl wget git libgmp3-dev netcat-openbsd
+        # Install LLVM 19 using Makefile target
+        make install-llvm19 SUDO=sudo CODENAME=jammy
+
+        # Set LLVM environment variables for Cairo Native
+        echo "MLIR_SYS_190_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
+        echo "LLVM_SYS_191_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
+        echo "TABLEGEN_190_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
+
+        # Configure linker search paths for Cairo Native runtime compilation
+        echo "LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu:/lib" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu:/lib" >> $GITHUB_ENV
+
+        # Set up clang-19 as default clang for Cairo Native
+        sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-19/bin/clang-19 100
+        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-19/bin/clang++ 100
+
+        # Also set explicit compiler environment variables for Cairo Native runtime
+        # Note: clang-19 handles both C and C++ compilation
+        echo "CC=clang-19" >> $GITHUB_ENV
+        echo "CXX=clang-19" >> $GITHUB_ENV
+
+        # Configure linker for clang - use lld-19 for Cairo Native runtime compilation
+        # These flags are passed to clang when it invokes the linker
+        echo "LDFLAGS=-fuse-ld=lld-19" >> $GITHUB_ENV
+
+        # Add LLVM 19 binaries to PATH
+        echo "/usr/lib/llvm-19/bin" >> $GITHUB_PATH
 
     - name: Setup mold
       uses: rui314/setup-mold@v1
       with:
-        make-default: true
+        make-default: false # Don't make mold the default - Cairo Native runtime compilation needs lld-19

.github/workflows/task-build-and-publish-release.yml

@@ -103,9 +103,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
+
       - name: Build Docker Image and Publish
         id: push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           push: true

.github/workflows/task-build-artifacts.yml

@@ -76,7 +76,7 @@ jobs:
           echo "artifacts-pr=$ARTIFACTS_PR" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: useblacksmith/setup-docker-builder@v1
 
       - name: Build Docker image
         id: push

.github/workflows/task-build-manual-and-publish.yml

@@ -78,9 +78,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
+
       - name: Build Docker Image and Publish
         id: push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           push: true

.github/workflows/task-build-nightly-and-publish.yml

@@ -84,9 +84,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: useblacksmith/setup-docker-builder@v1
+
       - name: Build Docker Image and Publish
         id: push
-        uses: docker/build-push-action@v6
+        uses: useblacksmith/build-push-action@v2
         with:
           context: .
           push: true

.github/workflows/task-lint-cargo.yml

@@ -33,7 +33,14 @@ jobs:
         run: yes | make artifacts
 
       - name: Cargo fmt
-        run: cargo fmt -- --check
+        run: |
+          cargo fmt -- --check
+
+          # TODO(mehul 21/11/2025, hotfix): This is a temporary fix to ensure that the madara is fmt checked.
+          # Madara does not belong to the toplevel workspace, so we need to lint it separately.
+          # Remove this once we add madara back to toplevel workspace. 
+          cd madara
+          cargo fmt -- --check
 
       - name: Python Cairo setup (before clippy)
         uses: ./.github/actions/setup-python-cairo

.github/workflows/task-test-end-to-end.yml

@@ -24,6 +24,9 @@ on:
         description: "Hash used to retrieve the cairo artifacts"
         required: true
         type: string
+    secrets:
+      ETHEREUM_SEPOLIA_RPC:
+        required: true
 
 jobs:
   test-end-to-end:
@@ -141,6 +144,7 @@ jobs:
         env:
           # the self hosted runner has a different region so we override it here
           AWS_REGION: us-east-1
+          MADARA_ORCHESTRATOR_ETHEREUM_SETTLEMENT_RPC_URL: ${{ secrets.ETHEREUM_SEPOLIA_RPC }}
           MADARA_ORCHESTRATOR_ATLANTIC_API_KEY: ${{ secrets.MADARA_ORCHESTRATOR_ATLANTIC_API_KEY }}
         run: |
           RUST_LOG=info cargo test \

.github/workflows/task-test-madara.yml

@@ -94,6 +94,8 @@ jobs:
           PROPTEST_CASES: ${{ inputs.proptest-cases }}
           LLVM_PROFILE_FILE: "madara-%p-%m.profraw"
           ANVIL_URL: ${{ env.ANVIL_DEFAULT_URL }}
+          # Cairo Native runtime compilation: use lld instead of mold
+          LDFLAGS: "-fuse-ld=lld-19"
         run: |
           export COVERAGE_BIN=$(realpath target/release/madara)
           rm -f target/madara-* lcov.info

.gitignore

@@ -27,6 +27,9 @@ artifacts.tar.gz
 **/target/
 # These are backup files generated by rustfmt
 **/*.rs.bk
+# Cargo build cache files
+**/.rustc_info.json
+**/.future-incompat-report.json
 
 # generated contracts for rpc-tests
 counter*/