Skip to content

refactor: drop the external self-call in verifyBatchInclusion #2300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xrlawrence wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

refactor: drop the external self-call in verifyBatchInclusion #2300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions contracts/src/core/AlignedLayerServiceManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,29 @@ contract AlignedLayerServiceManager is
uint256 verificationDataBatchIndex,
address senderAddress
) external view onlyWhenNotPaused(2) returns (bool) {
return
_verifyBatchInclusion(
proofCommitment,
pubInputCommitment,
provingSystemAuxDataCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex,
senderAddress
);
}

function _verifyBatchInclusion(
bytes32 proofCommitment,
bytes32 pubInputCommitment,
bytes32 provingSystemAuxDataCommitment,
bytes20 proofGeneratorAddr,
bytes32 batchMerkleRoot,
bytes memory merkleProof,
uint256 verificationDataBatchIndex,
address senderAddress
) internal view returns (bool) {
bytes32 batchIdentifier;
if (senderAddress == address(0)) {
batchIdentifier = batchMerkleRoot;
Expand Down Expand Up @@ -310,16 +333,17 @@ contract AlignedLayerServiceManager is
bytes memory merkleProof,
uint256 verificationDataBatchIndex
) external view onlyWhenNotPaused(2) returns (bool) {
return this.verifyBatchInclusion(
proofCommitment,
pubInputCommitment,
provingSystemAuxDataCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex,
address(0)
);
return
_verifyBatchInclusion(
proofCommitment,
pubInputCommitment,
provingSystemAuxDataCommitment,
proofGeneratorAddr,
batchMerkleRoot,
merkleProof,
verificationDataBatchIndex,
address(0)
);
}


Expand Down