Merge branch 'staging' into feat/proof-aggregator-upgrade-scripts

Author: MarcosNicolau

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

@@ -31,6 +31,12 @@ jobs:
           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:
@@ -70,7 +76,8 @@ jobs:
       - name: Run Clippy on AggregationMode
         run: |
           cd aggregation_mode
-          cargo clippy --all -- -D warnings
+          # 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
@@ -89,6 +96,12 @@ jobs:
           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:

.gitmodules

@@ -34,3 +34,6 @@
 [submodule "contracts/lib/sp1-contracts"]
 	path = contracts/lib/sp1-contracts
 	url = https://github.com/succinctlabs/sp1-contracts
+[submodule "contracts/lib/risc0-ethereum"]
+	path = contracts/lib/risc0-ethereum
+	url = https://github.com/risc0/risc0-ethereum

Makefile

@@ -151,11 +151,24 @@ anvil_start_with_more_prefunded_accounts:
 	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
+is_aggregator_set:
+	@if [ -z "$(AGGREGATOR)" ]; then \
+		echo "Error: AGGREGATOR is not set. Please provide arg AGGREGATOR='sp1' or 'risc0'."; \
+		exit 1; \
+	fi
+
+start_proof_aggregator_dev: is_aggregator_set ## Starts proof aggregator with mock proofs (DEV mode)
+	AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator-mock.yaml
+
+start_proof_aggregator: is_aggregator_set ## Starts proof aggregator with proving activated
+	AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
+
+start_proof_aggregator_gpu: is_aggregator_set ## Starts proof aggregator with proving + GPU acceleration (CUDA)
+	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu -- config-files/config-proof-aggregator.yaml
+
+install_aggregation_mode: ## Install the aggregation mode with proving enabled
+	cargo install --path aggregation_mode --features prove
 
 _AGGREGATOR_:
 
@@ -703,11 +716,11 @@ upgrade_proof_aggregator:
 	@. contracts/scripts/.env.$(NETWORK) && . contracts/scripts/upgrade_proof_aggregator.sh
 
 build_aligned_contracts:
-	@cd contracts/src/core && forge build
+	@cd contracts/src/core && forge build --via-ir
 
 show_aligned_error_codes:
 	@echo "\nAlignedLayerServiceManager errors:"
-	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
+	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors  
 	@echo "\nBatcherPaymentService errors:"
 	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors