Skip to content

Commit 1e61ec5

Browse files
committed
Merge main and update deploy
2 parents e9a4014 + 1369e88 commit 1e61ec5

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

contracts/src/core/AlignedProofAggregationService.sol

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,7 @@ contract AlignedProofAggregationService is
7878
revert InvalidVerifyingProgram(verifierProgramCommitment, SP1_ID, allowedVerifiersProvingSystem[verifierProgramCommitment]);
7979
}
8080

81-
// In dev mode, proofs are mocked, so we skip the verification part
82-
if (_isSP1VerificationEnabled()) {
83-
ISP1Verifier(sp1VerifierAddress).verifyProof(verifierProgramCommitment, sp1PublicValues, sp1ProofBytes);
84-
}
81+
ISP1Verifier(sp1VerifierAddress).verifyProof(verifierProgramCommitment, sp1PublicValues, sp1ProofBytes);
8582

8683
isMerkleRootVerified[merkleRoot] = true;
8784
emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
@@ -97,13 +94,10 @@ contract AlignedProofAggregationService is
9794
revert InvalidVerifyingProgram(verifierProgramCommitment, RISC0_ID, allowedVerifiersProvingSystem[verifierProgramCommitment]);
9895
}
9996

100-
// In dev mode, proofs are mocked, so we skip the verification part
101-
if (_isRisc0VerificationEnabled()) {
102-
bytes32 risc0JournalDigest = sha256(risc0JournalBytes);
103-
IRiscZeroVerifier(risc0VerifierAddress).verify(
104-
risc0ReceiptSeal, verifierProgramCommitment, risc0JournalDigest
105-
);
106-
}
97+
bytes32 risc0JournalDigest = sha256(risc0JournalBytes);
98+
IRiscZeroVerifier(risc0VerifierAddress).verify(
99+
risc0ReceiptSeal, verifierProgramCommitment, risc0JournalDigest
100+
);
107101

108102
isMerkleRootVerified[merkleRoot] = true;
109103
emit AggregatedProofVerified(merkleRoot, blobVersionedHash);
@@ -136,14 +130,6 @@ contract AlignedProofAggregationService is
136130
return isMerkleRootVerified[merkleRoot];
137131
}
138132

139-
function _isSP1VerificationEnabled() internal view returns (bool) {
140-
return sp1VerifierAddress != VERIFIER_MOCK_ADDRESS;
141-
}
142-
143-
function _isRisc0VerificationEnabled() internal view returns (bool) {
144-
return risc0VerifierAddress != VERIFIER_MOCK_ADDRESS;
145-
}
146-
147133
function _authorizeUpgrade(address newImplementation)
148134
internal
149135
override

0 commit comments

Comments
 (0)