refactor: change storage to merkle_root=>bool in AlignedProofAggregationService.sol

Author: JuArce

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

@@ -13,9 +13,9 @@ contract AlignedProofAggregationService is
     OwnableUpgradeable,
     UUPSUpgradeable
 {
-    /// @notice Maps the aggregated verification merkle root with the blob transaction hash that contains the leaves
-    uint64 public currentAggregatedProofNumber;
-    mapping(uint64 => AggregatedProof) public aggregatedProofs;
+
+    /// @notice Map the merkle root to a boolean to indicate it was verified
+    mapping(bytes32 => bool) public aggregatedProofs;
 
     /// @notice The address of the SP1 verifier contract.
     /// @dev This can either be a specific SP1Verifier for a specific version, or the
@@ -24,6 +24,7 @@ contract AlignedProofAggregationService is
     ///      https://docs.succinct.xyz/onchain-verification/contract-addresses
     address public sp1VerifierAddress;
 
+    /// @notice The address of the Wallet that is allowed to call the verify function.
     address public alignedAggregatorAddress;
 
     /// @notice whether we are in dev mode or not
@@ -51,43 +52,19 @@ contract AlignedProofAggregationService is
         bytes calldata sp1PublicValues,
         bytes calldata sp1ProofBytes
     ) public onlyAlignedAggregator {
-        // In dev mode, poofs are mocked, so we skip the verification part
-        if (sp1VerifierAddress == VERIFIER_MOCK_ADDRESS) {
-            (bytes32 merkleRoot) = abi.decode(sp1PublicValues, (bytes32));
-            _newAggregatedProof(merkleRoot, blobVersionedHash);
-            return;
-        }
+        (bytes32 merkleRoot) = abi.decode(sp1PublicValues, (bytes32));
 
-        try ISP1Verifier(sp1VerifierAddress).verifyProof(sp1ProgramVKey, sp1PublicValues, sp1ProofBytes) {
-            (bytes32 merkleRoot) = abi.decode(sp1PublicValues, (bytes32));
-            _newAggregatedProof(merkleRoot, blobVersionedHash);
-        } catch {
-            AggregatedProof storage proof = aggregatedProofs[currentAggregatedProofNumber];
-            proof.status = AggregatedProofStatus.Failed;
-            emit NewAggregatedProof(currentAggregatedProofNumber, AggregatedProofStatus.Failed, 0x0, 0x0);
-            currentAggregatedProofNumber += 1;
+        // In dev mode, poofs are mocked, so we skip the verification part
+        if (_isVerificationEnabled()) {
+            ISP1Verifier(sp1VerifierAddress).verifyProof(sp1ProgramVKey, sp1PublicValues, sp1ProofBytes);
         }
-    }
-
-    function markCurrentAggregatedProofAsMissed() public onlyAlignedAggregator {
-        AggregatedProof storage proof = aggregatedProofs[currentAggregatedProofNumber];
-        proof.status = AggregatedProofStatus.Missed;
-        emit NewAggregatedProof(currentAggregatedProofNumber, AggregatedProofStatus.Missed, 0x0, 0x0);
-        currentAggregatedProofNumber += 1;
-    }
 
-    function _newAggregatedProof(bytes32 merkleRoot, bytes32 blobHash) internal {
-        AggregatedProof storage proof = aggregatedProofs[currentAggregatedProofNumber];
-        proof.merkleRoot = merkleRoot;
-        proof.blobHash = blobHash;
-        proof.status = AggregatedProofStatus.Verified;
-        emit NewAggregatedProof(currentAggregatedProofNumber, AggregatedProofStatus.Verified, merkleRoot, blobHash);
-        currentAggregatedProofNumber += 1;
+        aggregatedProofs[merkleRoot] = true;
+        emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
     }
 
-    function getAggregatedProof(uint64 proofNumber) public view returns (uint8, bytes32 blobHash, bytes32 merkleRoot) {
-        AggregatedProof storage proof = aggregatedProofs[proofNumber];
-        return (uint8(proof.status), proof.blobHash, proof.merkleRoot);
+    function _isVerificationEnabled() internal view returns (bool) {
+        return sp1VerifierAddress != VERIFIER_MOCK_ADDRESS;
     }
 
     function _authorizeUpgrade(address newImplementation)

contracts/src/core/AlignedProofAggregationService.sol

@@ -1,25 +1,6 @@
 pragma solidity ^0.8.12;
 
 interface IAlignedProofAggregationService {
-    /// @notice aggregated proof status
-    /// Verified -> Verification was successful
-    /// Failed -> Verification failed
-    /// Missed -> Internal error in the aligned service could not send the aggregated proof to verify
-    enum AggregatedProofStatus {
-        Verified,
-        Failed,
-        Missed
-    }
-
-    /// @notice aggregated proof
-    /// Status -> proof status
-    /// blobHash -> the hash of the blob transaction containing the hashes of all the proofs that have been aggregated
-    /// merkleRoot -> the committed merkle root in the aggregated
-    struct AggregatedProof {
-        AggregatedProofStatus status;
-        bytes32 blobHash;
-        bytes32 merkleRoot;
-    }
 
     /// @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
@@ -35,16 +16,9 @@ interface IAlignedProofAggregationService {
         bytes calldata sp1ProofBytes
     ) external;
 
-    function getAggregatedProof(uint64 proofNumber)
-        external
-        view
-        returns (uint8 status, bytes32 blobHash, bytes32 merkleRoot);
-
-    function markCurrentAggregatedProofAsMissed() external;
-
     /// @notice event that gets emitted after a successful aggregated proof verification
-    event NewAggregatedProof(
-        uint64 indexed proofNumber, AggregatedProofStatus status, bytes32 merkleRoot, bytes32 blobVersionedHash
+    event AggregatedProofVerified(
+        bytes32 indexed merkleRoot, bytes32 blobVersionedHash
     );
 
     error OnlyAlignedAggregator(address sender);