Merge branch 'staging' into feat/verify-agg-proof-on-chain

Author: MarcosNicolau

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -150,17 +150,27 @@ contract AlignedProofAggregationService is
     /// @param _risc0VerifierAddress The new address for the Risc0 verifier contract
     function setRisc0VerifierAddress(address _risc0VerifierAddress) external onlyOwner {
         risc0VerifierAddress = _risc0VerifierAddress;
+        emit Risc0VerifierAddressUpdated(_risc0VerifierAddress);
     }
 
     /// @notice Sets the image id of the Risc0 program
     /// @param _risc0AggregatorProgramImageId The new imageid for the Risc0 aggregator program
     function setRisc0AggregatorProgramImageId(bytes32 _risc0AggregatorProgramImageId) external onlyOwner {
         risc0AggregatorProgramImageId = _risc0AggregatorProgramImageId;
+        emit Risc0AggregatorProgramImageIdUpdated(_risc0AggregatorProgramImageId);
+    }
+
+    /// @notice Sets the address of the SP1 verifier contract
+    /// @param _sp1VerifierAddress The new address for the SP1 verifier contract
+    function setSP1VerifierAddress(address _sp1VerifierAddress) external onlyOwner {
+        sp1VerifierAddress = _sp1VerifierAddress;
+        emit SP1VerifierAddressUpdated(_sp1VerifierAddress);
     }
 
     /// @notice Sets the vk hash of the sp1 program
     /// @param _sp1AggregatorProgramVKHash The new vk hash for the sp1 aggregator program
     function setSP1AggregatorProgramVKHash(bytes32 _sp1AggregatorProgramVKHash) external onlyOwner {
         sp1AggregatorProgramVKHash = _sp1AggregatorProgramVKHash;
+        emit SP1AggregatorProgramVKHashUpdated(_sp1AggregatorProgramVKHash);
     }
 }

contracts/src/core/AlignedProofAggregationService.sol

@@ -1,6 +1,22 @@
 pragma solidity ^0.8.12;
 
 interface IAlignedProofAggregationService {
+
+    /// @notice event that gets emitted after a successful aggregated proof verification
+    event AggregatedProofVerified(bytes32 indexed merkleRoot, bytes32 blobVersionedHash);
+
+    /// @notice Event emitted when the Risc0 verifier address is updated
+    event Risc0VerifierAddressUpdated(address indexed newAddress);
+    
+    /// @notice Event emitted when the SP1 verifier address is updated
+    event SP1VerifierAddressUpdated(address indexed newAddress);
+    
+    /// @notice Event emitted when the Risc0 aggregator program image ID is updated
+    event Risc0AggregatorProgramImageIdUpdated(bytes32 indexed newImageId);
+    
+    /// @notice Event emitted when the SP1 aggregator program VK hash is updated
+    event SP1AggregatorProgramVKHashUpdated(bytes32 indexed newVKHash);
+
     /// @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
@@ -18,8 +34,21 @@ interface IAlignedProofAggregationService {
         view
         returns (bool);
 
-    /// @notice event that gets emitted after a successful aggregated proof verification
-    event AggregatedProofVerified(bytes32 indexed merkleRoot, bytes32 blobVersionedHash);
+    /// @notice Sets the address of the Risc0 verifier contract
+    /// @param _risc0VerifierAddress The new address for the Risc0 verifier contract
+    function setRisc0VerifierAddress(address _risc0VerifierAddress) external;
+
+    /// @notice Sets the image id of the Risc0 program
+    /// @param _risc0AggregatorProgramImageId The new imageid for the Risc0 aggregator program
+    function setRisc0AggregatorProgramImageId(bytes32 _risc0AggregatorProgramImageId) external;
+
+    /// @notice Sets the address of the SP1 verifier contract
+    /// @param _sp1VerifierAddress The new address for the SP1 verifier contract
+    function setSP1VerifierAddress(address _sp1VerifierAddress) external;
+
+    /// @notice Sets the vk hash of the sp1 program
+    /// @param _sp1AggregatorProgramVKHash The new vk hash for the sp1 aggregator program
+    function setSP1AggregatorProgramVKHash(bytes32 _sp1AggregatorProgramVKHash) external;
 
     error OnlyAlignedAggregator(address sender);
 }

contracts/src/core/IAlignedProofAggregationService.sol

@@ -2,8 +2,8 @@ defmodule AlignedProofAggregationService do
   require Logger
 
   @aligned_config_file System.get_env("ALIGNED_PROOF_AGG_CONFIG_FILE")
-  @verifyRisc0_solidity_signature "0x015f8668"
-  @verifySp1_solidity_signature "0x39c94cbf"
+  @verifyRisc0_solidity_signature "0x54687ccf"
+  @verifySp1_solidity_signature "0xf6e04ac4"
 
   config_file_path =
     case @aligned_config_file do