Merge branch 'staging' into refactor/update-l2-example

Author: maximopalopoli

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

@@ -89,9 +89,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.88.0
+          components: rustfmt, clippy
+          override: true
+
       - 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: |

Makefile

@@ -284,8 +284,8 @@ verify_aggregated_proof_sp1:
 		--rpc-url $(RPC_URL) \
 		--from-block $(FROM_BLOCK) \
 		--proving-system SP1 \
-		--vk ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.vk \
-		--public-input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub
+		--vk-hash ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.vk \
+		--public-inputs ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub
 
 proof_aggregator_install: ## Install the aggregation mode with proving enabled
 	cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator_gpu --locked
@@ -325,6 +325,11 @@ agg_mode_gateway_send_payment:
 	 --network devnet \
 	 --rpc-url http://localhost:8545
 
+agg_mode_gateway_send_sp1_proof:
+	@cargo run --manifest-path aggregation_mode/cli/Cargo.toml -- submit sp1 \
+		--proof scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
+		--vk scripts/test_files/sp1/sp1_fibonacci_5_0_0_vk.bin \
+		--private-key "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
 
 agg_mode_install_cli: ## Install the aggregation mode CLI
 	@cargo install --path aggregation_mode/cli