Merge branch 'main' into feat/save-config-for-restarts

Author: Mohiiit

.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/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 \