Merge e11e128 into b77e8fd

Author: JuArce

.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

.gitignore

@@ -12,6 +12,7 @@ batcher/aligned/batch_inclusion_responses/*
 **/broadcast
 volume
 config-files/*.last_processed_batch.json
+config-files/*.last_aggregated_block.json
 
 nonce_*.bin
 

.gitmodules

@@ -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

Makefile

@@ -75,6 +75,10 @@ anvil_deploy_eigen_contracts:
 	@echo "Deploying Eigen Contracts..."
 	. contracts/scripts/anvil/deploy_eigen_contracts.sh
 
+anvil_deploy_sp1_contracts:
+	@echo "Deploying SP1 Contracts..."
+	. contracts/scripts/anvil/deploy_sp1_contracts.sh
+
 anvil_deploy_aligned_contracts:
 	@echo "Deploying Aligned Contracts..."
 	. contracts/scripts/anvil/deploy_aligned_contracts.sh
@@ -146,6 +150,13 @@ anvil_start_with_more_prefunded_accounts:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json --block-time 7 -a 2000
 
+__AGGREGATION_MODE__: ## ____
+start_proof_aggregator_local: ## Start the proof aggregator locally using Mock Verifier Contract
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator-mock.yaml
+
+start_proof_aggregator_local_with_proving: ## Start the proof aggregator locally using SP1 Verifier Contract
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
+
 _AGGREGATOR_:
 
 build_aggregator:
@@ -584,7 +595,6 @@ aligned_get_user_balance_holesky:
 		--network holesky \
 		--user_addr $(USER_ADDR)
 
-
 __GENERATE_PROOFS__:
  # TODO add a default proving system
 
@@ -684,6 +694,10 @@ upgrade_batcher_payment_service: ## Upgrade BatcherPayments contract. Parameters
 	@echo "Upgrading BatcherPayments Contract on $(NETWORK) network..."
 	@. contracts/scripts/.env.$(NETWORK) && . contracts/scripts/upgrade_batcher_payment_service.sh
 
+deploy_proof_aggregator:
+	@echo "Deploying ProofAggregator contract on $(NETWORK) network..."
+	@. contracts/scripts/.env.$(NETWORK) && . contracts/scripts/deploy_proof_aggregator.sh
+
 build_aligned_contracts:
 	@cd contracts/src/core && forge build