Merge remote-tracking branch 'aligned/testnet' into mina

Author: MarcosNicolau

.github/pull_request_template.md

@@ -27,5 +27,5 @@ Please delete options that are not relevant.
 - [ ] Has a known issue
   - [Link to the open issue addressing it]() 
 - [ ] If your PR changes the Operator compatibility (Ex: Upgrade prover versions)
-  - [ ] This PR adds compatibility for operator for both versions and do not change batcher/docs/examples
+  - [ ] This PR adds compatibility for operator for both versions and do not change crates/docs/examples
   - [ ] This PR updates batcher and docs/examples to the newer version. This requires the operator are already updated to be compatible

.github/workflows/build-and-test-go.yml

@@ -2,7 +2,9 @@ name: build-go-projects
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:

.github/workflows/build-and-test-rust.yml

@@ -2,12 +2,15 @@ name: build-and-test-rust-projects
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
-      - "batcher/**"
-      - ".github/workflows/build-rust.yml"
+      - "crates/**"
+      - "aggregation_mode/**"
+      - ".github/workflows/build-and-test-rust.yml"
 
 jobs:
   build:
@@ -19,51 +22,105 @@ jobs:
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: 1.86.0
           components: rustfmt, clippy
           override: true
+
+      # Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
+      - name: Install sp1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          source /home/runner/.bashrc
+           ~/.sp1/bin/sp1up
+
+      - name: Install risc0 toolchain
+        run: |
+          curl -L https://risczero.com/install | bash
+          source ~/.bashrc
+          ~/.risc0/bin/rzup install
+
       - name: Cache Rust dependencies
         uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            batcher/target
+            crates/target
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
-      - name: Check formatting of Rust projects
+
+      - name: Check formatting
         run: |
-          cd batcher
+          cd crates
           cargo fmt --all -- --check
+
       - name: Run Clippy
         run: |
-          cd batcher
+          cd crates
           cargo clippy --all -- -D warnings
-      - name: Build Rust projects
+
+      - name: Build Batcher
+        run: |
+          cd crates
+          cargo build --all
+
+      - name: Check formatting of AggregationMode
+        run: |
+          cd aggregation_mode
+          cargo fmt --all -- --check
+
+      - name: Build AggregationMode # We build before clippy to generate the ELF
         run: |
-          cd batcher
+          cd aggregation_mode
           cargo build --all
 
+      - name: Run Clippy on AggregationMode
+        run: |
+          cd aggregation_mode
+          # We need to skip the build as clippy does not support the riscv32im-risc0-zkvm-elf target
+          RISC0_SKIP_BUILD=1 cargo clippy --all -- -D warnings
+
   test:
     runs-on: aligned-runner
     needs: build
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+
       - name: foundry-toolchain
         uses: foundry-rs/[email protected]
+
+      # Reference: https://github.com/succinctlabs/sp1/actions/runs/8886659400/workflow#L61-L65
+      - name: Install sp1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          source /home/runner/.bashrc
+           ~/.sp1/bin/sp1up
+
+      - name: Install risc0 toolchain
+        run: |
+          curl -L https://risczero.com/install | bash
+          source ~/.bashrc
+          ~/.risc0/bin/rzup install
+
       - name: Cache Rust dependencies
         uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
-            batcher/target
+            crates/target
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
-      - name: Run tests
+
+      - name: Run Batcher tests
+        run: |
+          cd crates
+          cargo test --all
+
+      - name: Run AggregationMode tests
         run: |
-          cd batcher
+          cd aggregation_mode
           cargo test --all

.github/workflows/build-contracts.yml

@@ -1,7 +1,9 @@
 name: Build contracts
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:

.github/workflows/foundry-gas-diff.yml

@@ -3,7 +3,8 @@ name: Report gas diff
 on:
   push:
     branches:
-      - main
+      - testnet
+      - staging
   pull_request:
     # Run only for changes in specific files.
      paths:

.github/workflows/golangci-lint.yml

@@ -2,8 +2,8 @@ name: golangci-lint
 on:
   push:
     branches:
-      - master
-      - main
+      - testnet
+      - staging
   pull_request:
     paths:
       - 'operator/**'
@@ -26,13 +26,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v8
         with:
           # Require: The version of golangci-lint to use.
           # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
           # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
-          version: v1.54
+          version: v2.1.6
           args: --timeout=5m

.github/workflows/lint-contracts.yml

@@ -1,7 +1,9 @@
 name: Lint contracts
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
         run: make build_batcher_client
 
       - name: Rename binary
-        run: mv batcher/target/release/aligned ${{ matrix.artifact_name }}
+        run: mv crates/target/release/aligned ${{ matrix.artifact_name }}
 
       - name: Release
         uses: softprops/action-gh-release@v2

.github/workflows/test-merkle-tree.yml

@@ -2,7 +2,9 @@ name: test-merkle-tree
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:

.github/workflows/test-risc-zero.yml

@@ -2,7 +2,9 @@ name: test-risc-zero
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths: