Merge branch 'refs/heads/staging' into fix-go-lint

JuArce · JuArce · commit 20b07dce9d29 · 2025-06-05T13:31:22.000-03:00
# Conflicts:
#	examples/validating-public-input/contracts/src/FibonacciValidator.sol
diff --git a/Makefile b/Makefile
@@ -3,6 +3,18 @@
 SHELL := /bin/bash
 OS := $(shell uname -s)
 
+NETWORK ?= devnet # devnet | holesky-stage | holesky
+ifeq ($(NETWORK),holesky)
+	RPC_URL ?= https://ethereum-holesky-rpc.publicnode.com
+	BEACON_URL ?= https://eth-beacon-chain-holesky.drpc.org/rest/
+else ifeq ($(ENVIRONMENT), holesky-stage)
+	RPC_URL ?= https://ethereum-holesky-rpc.publicnode.com
+	BEACON_URL ?= https://eth-beacon-chain-holesky.drpc.org/rest/
+else
+	RPC_URL ?= http://localhost:8545
+	BEACON_URL ?= http://localhost:58801
+endif
+
 CONFIG_FILE?=config-files/config.yaml
 export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
@@ -190,29 +202,29 @@ start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Sta
 start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
 	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
 
-verify_aggregated_proof_sp1_holesky_stage: 
-	@echo "Verifying SP1 in aggregated proofs on holesky..."
+verify_aggregated_proof_sp1: 
+	@echo "Verifying SP1 in aggregated proofs on $(NETWORK)..."
 	@cd batcher/aligned/ && \
 	cargo run verify-agg-proof \
-		--network holesky-stage \
+		--network $(NETWORK) \
 		--from-block $(FROM_BLOCK) \
 		--proving_system SP1 \
 		--public_input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
 		--program-id-file ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.vk \
 		--beacon_url $(BEACON_URL) \
-		--rpc_url https://ethereum-holesky-rpc.publicnode.com
+		--rpc_url $(RPC_URL)
 
-verify_aggregated_proof_risc0_holesky_stage: 
-	@echo "Verifying RISC0 in aggregated proofs on holesky..."
+verify_aggregated_proof_risc0: 
+	@echo "Verifying RISC0 in aggregated proofs on $(NETWORK)..."
 	@cd batcher/aligned/ && \
 	cargo run verify-agg-proof \
-		--network holesky-stage \
+		--network $(NETWORK) \
 		--from-block $(FROM_BLOCK) \
 		--proving_system Risc0 \
 		--program-id-file ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id_2_0.bin \
 		--public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_2_0.pub \
 		--beacon_url $(BEACON_URL) \
-		--rpc_url https://ethereum-holesky-rpc.publicnode.com
+		--rpc_url $(RPC_URL)
 
 install_aggregation_mode: ## Install the aggregation mode with proving enabled
 	cargo install --path aggregation_mode --features prove,gpu --bin proof_aggregator
@@ -457,10 +469,6 @@ build_batcher_client:
 batcher/target/release/aligned:
 	@cd batcher/aligned && cargo b --release
 
-
-RPC_URL=http://localhost:8545
-NETWORK=devnet # devnet | holesky-stage | holesky
-
 batcher_send_sp1_task:
 	@echo "Sending SP1 fibonacci task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
diff --git a/config-files/config-aggregator-docker.yaml b/config-files/config-aggregator-docker.yaml
@@ -22,8 +22,8 @@ bls:
 ## Aggregator Configurations
 aggregator:
   server_ip_port_address: 0.0.0.0:8090
-  bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
-  avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+  bls_public_key_compendium_address: '0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44'
+  avs_service_manager_address: '0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690'
   enable_metrics: true
   metrics_ip_port_address: 0.0.0.0:9091
   telemetry_ip_port_address: localhost:4001
diff --git a/config-files/config-aggregator-ethereum-package.yaml b/config-files/config-aggregator-ethereum-package.yaml
@@ -22,8 +22,8 @@ bls:
 ## Aggregator Configurations
 aggregator:
   server_ip_port_address: localhost:8090
-  bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
-  avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+  bls_public_key_compendium_address: '0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44'
+  avs_service_manager_address: '0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690'
   enable_metrics: true
   metrics_ip_port_address: localhost:9091
   telemetry_ip_port_address: localhost:4001
diff --git a/config-files/config-aggregator.yaml b/config-files/config-aggregator.yaml
@@ -29,8 +29,8 @@ bls:
 ## Aggregator Configurations
 aggregator:
   server_ip_port_address: localhost:8090
-  bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
-  avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+  bls_public_key_compendium_address: '0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44'
+  avs_service_manager_address: '0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690'
   enable_metrics: true
   metrics_ip_port_address: localhost:9091
   telemetry_ip_port_address: localhost:4001
@@ -49,8 +49,8 @@ aggregator:
 ## Operator Configurations
 # operator:
 #   aggregator_rpc_server_ip_port_address: localhost:8090
-#   address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
-#   earnings_receiver_address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+#   address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+#   earnings_receiver_address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
 #   delegation_approver_address: "0x0000000000000000000000000000000000000000"
 #   staker_opt_out_window_blocks: 0
 #   metadata_url: "https://yetanotherco.github.io/operator_metadata/metadata.json"
diff --git a/config-files/config-batcher-docker.yaml b/config-files/config-batcher-docker.yaml
@@ -29,5 +29,5 @@ batcher:
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001
   non_paying:
-    address: 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 # Anvil address 9
+    address: '0xa0Ee7A142d267C1f36714E4a8F75612F20a79720' # Anvil address 9
     replacement_private_key: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 # Anvil address 1
diff --git a/config-files/config-batcher-ethereum-package.yaml b/config-files/config-batcher-ethereum-package.yaml
@@ -27,5 +27,5 @@ batcher:
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001
   non_paying:
-    address: 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 # Anvil address 9
+    address: '0xa0Ee7A142d267C1f36714E4a8F75612F20a79720' # Anvil address 9
     replacement_private_key: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 # Anvil address 1
diff --git a/config-files/config-batcher.yaml b/config-files/config-batcher.yaml
@@ -29,5 +29,5 @@ batcher:
   metrics_port: 9093
   telemetry_ip_port_address: localhost:4001
   non_paying:
-    address: 0xa0Ee7A142d267C1f36714E4a8F75612F20a79720 # Anvil address 9
+    address: '0xa0Ee7A142d267C1f36714E4a8F75612F20a79720' # Anvil address 9
     replacement_private_key: ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 # Anvil address 1
diff --git a/config-files/config-operator-1.yaml b/config-files/config-operator-1.yaml
@@ -23,8 +23,8 @@ bls:
 operator:
   aggregator_rpc_server_ip_port_address: localhost:8090
   operator_tracker_ip_port_address: http://localhost:4001
-  address: 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
-  earnings_receiver_address: 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
+  address: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8'
+  earnings_receiver_address: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8'
   delegation_approver_address: '0x0000000000000000000000000000000000000000'
   staker_opt_out_window_blocks: 0
   metadata_url: 'https://yetanotherco.github.io/operator_metadata/metadata.json'
diff --git a/config-files/config-operator-2.yaml b/config-files/config-operator-2.yaml
@@ -23,8 +23,8 @@ bls:
 operator:
   aggregator_rpc_server_ip_port_address: localhost:8090
   operator_tracker_ip_port_address: http://localhost:4001
-  address: 0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
-  earnings_receiver_address: 0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+  address: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC'
+  earnings_receiver_address: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC'
   delegation_approver_address: '0x0000000000000000000000000000000000000000'
   staker_opt_out_window_blocks: 0
   metadata_url: 'https://yetanotherco.github.io/operator_metadata/metadata.json'
diff --git a/config-files/config-operator-3.yaml b/config-files/config-operator-3.yaml
@@ -23,8 +23,8 @@ bls:
 operator:
   aggregator_rpc_server_ip_port_address: localhost:8090
   operator_tracker_ip_port_address: http://localhost:4001
-  address: 0x90F79bf6EB2c4f870365E785982E1f101E93b906
-  earnings_receiver_address: 0x90F79bf6EB2c4f870365E785982E1f101E93b906
+  address: '0x90F79bf6EB2c4f870365E785982E1f101E93b906'
+  earnings_receiver_address: '0x90F79bf6EB2c4f870365E785982E1f101E93b906'
   delegation_approver_address: '0x0000000000000000000000000000000000000000'
   staker_opt_out_window_blocks: 0
   metadata_url: 'https://yetanotherco.github.io/operator_metadata/metadata.json'
diff --git a/config-files/config-operator-docker.yaml b/config-files/config-operator-docker.yaml
@@ -23,8 +23,8 @@ bls:
 operator:
   aggregator_rpc_server_ip_port_address: aggregator:8090
   operator_tracker_ip_port_address: http://localhost:3030
-  address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
-  earnings_receiver_address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+  address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+  earnings_receiver_address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
   delegation_approver_address: "0x0000000000000000000000000000000000000000"
   staker_opt_out_window_blocks: 0
   metadata_url: "https://yetanotherco.github.io/operator_metadata/metadata.json"
diff --git a/config-files/config.yaml b/config-files/config.yaml
@@ -31,8 +31,8 @@ batcher:
 ## Aggregator Configurations
 aggregator:
   server_ip_port_address: localhost:8090
-  bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
-  avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+  bls_public_key_compendium_address: '0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44'
+  avs_service_manager_address: '0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690'
   enable_metrics: true
   metrics_ip_port_address: localhost:9091
   bls_service_task_timeout: 168h # The timeout of bls aggregation service tasks. Suggested value for prod '168h' (7 days)
@@ -41,8 +41,8 @@ aggregator:
 operator:
   aggregator_rpc_server_ip_port_address: localhost:8090
   operator_tracker_ip_port_address: http://localhost:4001
-  address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
-  earnings_receiver_address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+  address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+  earnings_receiver_address: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
   delegation_approver_address: '0x0000000000000000000000000000000000000000'
   staker_opt_out_window_blocks: 0
   metadata_url: 'https://yetanotherco.github.io/operator_metadata/metadata.json'
diff --git a/docs/2_architecture/0_supported_verifiers.md b/docs/2_architecture/0_supported_verifiers.md
@@ -6,7 +6,7 @@ The following is the list of the verifiers currently supported by Aligned:
 
 - :white_check_mark: gnark - Groth16 (with BN254) [(v0.12.0)](https://github.com/Consensys/gnark/releases/tag/v0.12.0)
 - :white_check_mark: gnark - Plonk (with BN254 and BLS12-381) [(v0.12.0)](https://github.com/Consensys/gnark/releases/tag/v0.12.0)
-- :white_check_mark: SP1 [(v4.1.3)](https://github.com/succinctlabs/sp1/releases/tag/v4.1.3)
+- :white_check_mark: SP1 [(v5.0.0)](https://github.com/succinctlabs/sp1/releases/tag/v5.0.0)
 - :white_check_mark: Risc0 [(v2.0.0)](https://github.com/risc0/risc0/releases/tag/v2.0.0)
 - 🏗️ Circom
 - 🏗️ Lambdaworks
diff --git a/examples/validating-public-input/Makefile b/examples/validating-public-input/Makefile
@@ -10,7 +10,6 @@ generate_sp1_fibonacci_proof:
 		cargo run --release && \
 		echo "Fibonacci proof, pub input and image ID generated in sp1 folder"
 
-
 submit_fibonacci_sp1_proof_devnet:
 	@cd aligned-integration && \
 	RUST_LOG=info cargo run --release -- --proving-system "SP1" --network "devnet" --rpc-url "http://localhost:8545"
@@ -44,3 +43,7 @@ deploy_fibonacci_validator:
 
 deploy_fibonacci_validator_devnet:
 	@. ./contracts/.env.devnet && . ./contracts/deploy.sh
+
+get_program_id_commitment:
+	@echo "Proof commitment for $(DATA_FILE_NAME) is:"
+	@jq '.program_id_commitment' ./aligned-integration/batch_inclusion_data/$(DATA_FILE_NAME)
diff --git a/examples/validating-public-input/README.md b/examples/validating-public-input/README.md
@@ -82,6 +82,7 @@ Contract Address: 0x90d6A3E189C70E1Cce16c29151077cB9Badb2448
 Block: 2963688
 Paid: 0.000727925005095475 ETH (727925 gas * 1.000000007 gwei)
 ```
+
 > [NOTE]  
 > The `Contract Address` listed above corresponds to a current valid deployment of the examples contract on the `holesky` testnet.
 
@@ -100,3 +101,11 @@ status                  1 (success)
 transactionHash         <TX_HASH>
 ...
 ```
+
+5. If the process fails, it could be due to mismatched commitments when verifying. Ensure that the contract commitments are updated to match the values returned in the batcher's response under `aligned_verification_data`. For example, if the SP1 or Risc0 version has changed, you'll need to update the `programIdCommitment`. To regenerate the commitment, run:
+
+```shell
+make get_program_id_commitment DATA_FILE_NAME=<DATA_FILE_NAME>
+```
+
+And update the field `fibonacciProgramIdCommitmentSp1` or `fibonacciProgramIdCommitmentRisc0` in the contract with the new value.
diff --git a/examples/validating-public-input/contracts/src/FibonacciValidator.sol b/examples/validating-public-input/contracts/src/FibonacciValidator.sol
@@ -5,9 +5,8 @@ contract FibonacciValidator {
     address public alignedServiceManager;
     address public paymentServiceAddr;
 
-    bytes32 public fibonacciProgramIdCommitmentSp1 =
-        0x68a415f41d405c3d08a6095b69482e15591de0791f56709e028b6e9b2ad03a15;
-    
+    bytes32 public fibonacciProgramIdCommitmentSp1 = 0xc91d23fc3b1d24ecb241fbd501162734584f7c9f15ee5c95c712419206797a61;
+
     bytes32 public fibonacciProgramIdCommitmentRisc0 =
         0x52075f80c0b914b6cb8d86a2827b30b1252b58f2aa0173b993188650a538d5c5;
 
@@ -20,7 +19,6 @@ contract FibonacciValidator {
         paymentServiceAddr = _paymentServiceAddr;
     }
 
-
     function verifyBatchInclusion(
         bytes32 proofCommitment,
         bytes32 pubInputCommitment,
@@ -49,51 +47,40 @@ contract FibonacciValidator {
             "Fibonacci numbers don't match with public input"
         );
 
-        (
-            bool callWasSuccessful,
-            bytes memory proofIsIncluded
-        ) = alignedServiceManager.staticcall(
-                abi.encodeWithSignature(
-                    "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
-                    proofCommitment,
-                    pubInputCommitment,
-                    programIdCommitment,
-                    proofGeneratorAddr,
-                    batchMerkleRoot,
-                    merkleProof,
-                    verificationDataBatchIndex,
-                    paymentServiceAddr
-                )
-            );
+        (bool callWasSuccessful, bytes memory proofIsIncluded) = alignedServiceManager.staticcall(
+            abi.encodeWithSignature(
+                "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
+                proofCommitment,
+                pubInputCommitment,
+                programIdCommitment,
+                proofGeneratorAddr,
+                batchMerkleRoot,
+                merkleProof,
+                verificationDataBatchIndex,
+                paymentServiceAddr
+            )
+        );
 
         require(callWasSuccessful, "static_call failed");
 
-        (uint32 n ,uint32 fibN, uint32 fibNPlusOne) = bytesToTwoUint32(pubInputBytes);
+        (uint32 n, uint32 fibN, uint32 fibNPlusOne) = bytesToTwoUint32(pubInputBytes);
 
         emit FibonacciNumbers(n, fibN, fibNPlusOne);
 
         return abi.decode(proofIsIncluded, (bool));
     }
 
-    function bytesToTwoUint32(
-        bytes memory data
-    ) public pure returns (uint32, uint32, uint32) {
+    function bytesToTwoUint32(bytes memory data) public pure returns (uint32, uint32, uint32) {
         require(data.length >= 8, "Input bytes must be at least 8 bytes long");
 
-        uint32 first = uint32(uint8(data[0])) |
-            (uint32(uint8(data[1])) << 8) |
-            (uint32(uint8(data[2])) << 16) |
-            (uint32(uint8(data[3])) << 24);
-
-        uint32 second = uint32(uint8(data[4])) |
-            (uint32(uint8(data[5])) << 8) |
-            (uint32(uint8(data[6])) << 16) |
-            (uint32(uint8(data[7])) << 24);
-        
-        uint32 third = uint32(uint8(data[8])) |
-            (uint32(uint8(data[9])) << 8) |
-            (uint32(uint8(data[10])) << 16) |
-            (uint32(uint8(data[11])) << 24);
+        uint32 first = uint32(uint8(data[0])) | (uint32(uint8(data[1])) << 8) | (uint32(uint8(data[2])) << 16)
+            | (uint32(uint8(data[3])) << 24);
+
+        uint32 second = uint32(uint8(data[4])) | (uint32(uint8(data[5])) << 8) | (uint32(uint8(data[6])) << 16)
+            | (uint32(uint8(data[7])) << 24);
+
+        uint32 third = uint32(uint8(data[8])) | (uint32(uint8(data[9])) << 8) | (uint32(uint8(data[10])) << 16)
+            | (uint32(uint8(data[11])) << 24);
 
         return (first, second, third);
     }
diff --git a/examples/zkquiz/quiz/program/Cargo.toml b/examples/zkquiz/quiz/program/Cargo.toml
@@ -5,7 +5,7 @@ name = "quiz-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.7" }
+sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v5.0.0" }
 tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2", features = [
     "sha3",
 ] }
diff --git a/examples/zkquiz/quiz/script/Cargo.lock b/examples/zkquiz/quiz/script/Cargo.lock
diff --git a/examples/zkquiz/quiz/script/Cargo.toml b/examples/zkquiz/quiz/script/Cargo.toml
