feat: ProofAggregationService risc0 verification

Author: MarcosNicolau

.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

contracts/lib/risc0-ethereum

@@ -6,3 +6,4 @@ forge-std/=lib/forge-std/src/
 @openzeppelin/contracts/=lib/eigenlayer-middleware/lib/openzeppelin-contracts/contracts/
 @openzeppelin-upgrades/contracts/=lib/eigenlayer-middleware/lib/openzeppelin-contracts-upgradeable/contracts/
 @sp1-contracts/=lib/sp1-contracts/contracts/src/
+@risc0-contracts/=lib/risc0-ethereum/contracts/src/

contracts/remappings.txt

@@ -6,14 +6,14 @@ import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/Ownabl
 import {UUPSUpgradeable} from "@openzeppelin-upgrades/contracts/proxy/utils/UUPSUpgradeable.sol";
 import {IAlignedProofAggregationService} from "./IAlignedProofAggregationService.sol";
 import {ISP1Verifier} from "@sp1-contracts/ISP1Verifier.sol";
+import {IRiscZeroVerifier} from "@risc0-contracts/IRiscZeroVerifier.sol";
 
 contract AlignedProofAggregationService is
     IAlignedProofAggregationService,
     Initializable,
     OwnableUpgradeable,
     UUPSUpgradeable
 {
-
     /// @notice Map the merkle root to a boolean to indicate it was verified
     mapping(bytes32 => bool) public aggregatedProofs;
 
@@ -24,6 +24,8 @@ contract AlignedProofAggregationService is
     ///      https://docs.succinct.xyz/onchain-verification/contract-addresses
     address public sp1VerifierAddress;
 
+    address public risc0VerifierAddress;
+
     /// @notice The address of the Wallet that is allowed to call the verify function.
     address public alignedAggregatorAddress;
 
@@ -46,7 +48,7 @@ contract AlignedProofAggregationService is
         sp1VerifierAddress = _sp1VerifierAddress;
     }
 
-    function verify(
+    function verifySP1(
         bytes32 blobVersionedHash,
         bytes32 sp1ProgramVKey,
         bytes calldata sp1PublicValues,
@@ -55,18 +57,40 @@ contract AlignedProofAggregationService is
         (bytes32 merkleRoot) = abi.decode(sp1PublicValues, (bytes32));
 
         // In dev mode, poofs are mocked, so we skip the verification part
-        if (_isVerificationEnabled()) {
+        if (_isSP1VerificationEnabled()) {
             ISP1Verifier(sp1VerifierAddress).verifyProof(sp1ProgramVKey, sp1PublicValues, sp1ProofBytes);
         }
 
         aggregatedProofs[merkleRoot] = true;
         emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
     }
 
-    function _isVerificationEnabled() internal view returns (bool) {
+    function verifyRisc0(
+        bytes32 blobVersionedHash,
+        bytes calldata risc0ReceiptSeal,
+        bytes32 risc0ImageId,
+        bytes calldata risc0JournalBytes
+    ) public onlyAlignedAggregator {
+        (bytes32 merkleRoot) = abi.decode(risc0JournalBytes, (bytes32));
+
+        // In dev mode, poofs are mocked, so we skip the verification part
+        if (_isRisc0VerificationEnabled()) {
+            bytes32 risc0JournalDigest = sha256(risc0JournalBytes);
+            IRiscZeroVerifier(risc0VerifierAddress).verify(risc0ReceiptSeal, risc0ImageId, risc0JournalDigest);
+        }
+
+        aggregatedProofs[merkleRoot] = true;
+        emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
+    }
+
+    function _isSP1VerificationEnabled() internal view returns (bool) {
         return sp1VerifierAddress != VERIFIER_MOCK_ADDRESS;
     }
 
+    function _isRisc0VerificationEnabled() internal view returns (bool) {
+        return risc0VerifierAddress != VERIFIER_MOCK_ADDRESS;
+    }
+
     function _authorizeUpgrade(address newImplementation)
         internal
         override

contracts/src/core/AlignedProofAggregationService.sol

@@ -1,25 +1,29 @@
 pragma solidity ^0.8.12;
 
 interface IAlignedProofAggregationService {
-
     /// @notice Method to verify an aggregated proof from aligned
     /// @dev This function is called by the aligned proof aggregator after collecting the proofs and aggregating them
     /// to be verified on-chain. We expect the blobTransactionHash to be called before
     /// @param blobVersionedHash the versioned hash of the blob transaction that contains the leaves that compose the merkle root.
     /// @param sp1ProgramVKey Public verifying key
     /// @param sp1PublicValues Values used to perform the execution
     /// @param sp1ProofBytes Groth16 proof
-    function verify(
+    function verifySP1(
         bytes32 blobVersionedHash,
         bytes32 sp1ProgramVKey,
         bytes calldata sp1PublicValues,
         bytes calldata sp1ProofBytes
     ) external;
 
+    function verifyRisc0(
+        bytes32 blobVersionedHash,
+        bytes calldata risc0ReceiptSeal,
+        bytes32 risc0ImageId,
+        bytes calldata risc0JournalBytes
+    ) external;
+
     /// @notice event that gets emitted after a successful aggregated proof verification
-    event AggregatedProofVerified(
-        bytes32 indexed merkleRoot, bytes32 blobVersionedHash
-    );
+    event AggregatedProofVerified(bytes32 indexed merkleRoot, bytes32 blobVersionedHash);
 
     error OnlyAlignedAggregator(address sender);
 }