Merge branch 'testnet' into 1728-hotfixoperator-manage-subscription-to-events-without-panic

Author: MauroToscano

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

@@ -20,23 +20,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"
           cache: false
+
       - name: foundry-toolchain
         uses: foundry-rs/foundry-toolchain@v1.2.0
+
       - name: Build SP1 bindings
         run: make build_sp1_linux
-      - name: Build Old SP1 bindings
-        run: make build_sp1_linux_old
+
       - name: Build Risc Zero go bindings
         run: make build_risc_zero_linux
-      - name: Build Old Risc Zero go bindings
-        run: make build_risc_zero_linux_old
+
       - name: Build Merkle Tree bindings
         run: make build_merkle_tree_linux
+
       - name: Build operator
         run: go build operator/cmd/main.go
+
       - name: Build aggregator
         run: go build aggregator/cmd/main.go

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

@@ -7,6 +7,7 @@ on:
     branches: ["*"]
     paths:
       - "batcher/**"
+      - "aggregation_mode/**"
       - ".github/workflows/build-rust.yml"
 
 jobs:
@@ -22,6 +23,14 @@ jobs:
           toolchain: stable
           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: Cache Rust dependencies
         uses: actions/cache@v3
         with:
@@ -32,27 +41,54 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
-      - name: Check formatting of Rust projects
+
+      - name: Check formatting of Batcher
         run: |
           cd batcher
           cargo fmt --all -- --check
-      - name: Run Clippy
+
+      - name: Run Clippy on Batcher
         run: |
           cd batcher
           cargo clippy --all -- -D warnings
-      - name: Build Rust projects
+
+      - name: Build Batcher
         run: |
           cd batcher
           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 aggregation_mode
+          cargo build --all
+
+      - name: Run Clippy on AggregationMode
+        run: |
+          cd aggregation_mode
+          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/foundry-toolchain@v1.2.0
+
+      # 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: Cache Rust dependencies
         uses: actions/cache@v3
         with:
@@ -63,7 +99,13 @@ jobs:
           key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-rust-
-      - name: Run tests
+
+      - name: Run Batcher tests
         run: |
           cd batcher
           cargo test --all
+
+      - name: Run AggregationMode tests
+        run: |
+          cd aggregation_mode
+          cargo test --all

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

@@ -35,7 +35,7 @@ jobs:
           FOUNDRY_FUZZ_SEED: 0x${{ github.event.pull_request.base.sha || github.sha }}
 
       - name: Compare gas reports
-        uses: Rubilmax/foundry-gas-diff@v3.16
+        uses: Rubilmax/foundry-gas-diff@v3.21
         with:
           summaryQuantile: 0.9 # only display the 10% most significant gas diffs in the summary (defaults to 20%)
           sortCriteria: avg,max # sort diff rows by criteria

.github/workflows/send-proofs-docker.yml

@@ -10,7 +10,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: pull_request-${{ github.event.pull_request.number }}
+  group: ${{ github.event_name == 'merge_group' && format('merge_group-{0}', github.event.merge_group.head_sha) || format('pull_request-{0}', github.event.pull_request.number) }}
   cancel-in-progress: true
 
 jobs:

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

@@ -12,7 +12,9 @@ batcher/aligned/batch_inclusion_responses/*
 **/broadcast
 volume
 config-files/*.last_processed_batch.json
+config-files/*.last_aggregated_block.json
 
 nonce_*.bin
 
 infra/ansible/playbooks/ini/**.ini
+infra/ansible/playbooks/files/**.pem

.github/workflows/test-sp1-old.yml

@@ -31,3 +31,6 @@
 [submodule "claim_contracts/lib/openzeppelin-contracts"]
 	path = claim_contracts/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "contracts/lib/sp1-contracts"]
+	path = contracts/lib/sp1-contracts
+	url = https://github.com/succinctlabs/sp1-contracts