Merge 60b37dc into d603f66

Author: maximopalopoli

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

@@ -33,10 +33,6 @@ contract AlignedProofAggregationService is
     /// https://dev.risczero.com/api/blockchain-integration/contracts/verifier#contract-addresses
     address public risc0VerifierAddress;
 
-    /// @notice whether we are in dev mode or not
-    /// if the sp1 verifier address is set to this address, then we skip verification
-    address public constant VERIFIER_MOCK_ADDRESS = address(0xFF);
-
     /// The unique identifier (image ID) of the RISC Zero aggregator program.
     /// This ensures that only proofs generated by a trusted Risc0 program can be verified.
     bytes32 public risc0AggregatorProgramImageId;
@@ -73,10 +69,7 @@ contract AlignedProofAggregationService is
     {
         (bytes32 merkleRoot) = abi.decode(sp1PublicValues, (bytes32));
 
-        // In dev mode, proofs are mocked, so we skip the verification part
-        if (_isSP1VerificationEnabled()) {
-            ISP1Verifier(sp1VerifierAddress).verifyProof(sp1AggregatorProgramVKHash, sp1PublicValues, sp1ProofBytes);
-        }
+        ISP1Verifier(sp1VerifierAddress).verifyProof(sp1AggregatorProgramVKHash, sp1PublicValues, sp1ProofBytes);
 
         aggregatedProofs[merkleRoot] = true;
         emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
@@ -88,13 +81,10 @@ contract AlignedProofAggregationService is
     {
         (bytes32 merkleRoot) = abi.decode(risc0JournalBytes, (bytes32));
 
-        // In dev mode, proofs are mocked, so we skip the verification part
-        if (_isRisc0VerificationEnabled()) {
-            bytes32 risc0JournalDigest = sha256(risc0JournalBytes);
-            IRiscZeroVerifier(risc0VerifierAddress).verify(
-                risc0ReceiptSeal, risc0AggregatorProgramImageId, risc0JournalDigest
-            );
-        }
+        bytes32 risc0JournalDigest = sha256(risc0JournalBytes);
+        IRiscZeroVerifier(risc0VerifierAddress).verify(
+            risc0ReceiptSeal, risc0AggregatorProgramImageId, risc0JournalDigest
+        );
 
         aggregatedProofs[merkleRoot] = true;
         emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
@@ -125,14 +115,6 @@ contract AlignedProofAggregationService is
         return aggregatedProofs[merkleRoot];
     }
 
-    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