Skip to content

Use generic names for AggregateVerifier intervals #444

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

Merged
0x00101010 merged 1 commit into from
Sep 21, 2026
+8 −8
Merged

Use generic names for AggregateVerifier intervals #444

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"src/L1/proofs/AggregateVerifier.sol:AggregateVerifier": {
"initCodeHash": "0x91a51808e37fa282a974cb5028e0ba517e04c903ce594b393cfda9dcc5408188",
"sourceCodeHash": "0x360867cf77ce89209c177d55c286fdca1309924cd36c23b7b5da2971089bcef2"
"sourceCodeHash": "0xdace3db84a70b9fd9bc4dd508184bc01af55568e78974381188fde5ddbb3509a"
},
"src/L1/proofs/AnchorStateRegistry.sol:AnchorStateRegistry": {
"initCodeHash": "0xedf834940e0e600739722d1548955d6888e85144d165ad738353e136da000190",
Expand Down
14 changes: 7 additions & 7 deletions src/L1/proofs/AggregateVerifier.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@ contract AggregateVerifier is Clone, ReentrancyGuard, ISemver {

// The block number must be one block interval after the starting block number. The interval
// is selected on the starting block so the game chain stays contiguous across the speedup.
(uint256 slowBlockInterval,) = _intervalsAt(startingOutputRoot.l2SequenceNumber, firstFastBlock);
if (l2SequenceNumber() != startingOutputRoot.l2SequenceNumber + slowBlockInterval) {
revert UnexpectedBlockNumber(startingOutputRoot.l2SequenceNumber + slowBlockInterval, l2SequenceNumber());
(uint256 blockInterval,) = _intervalsAt(startingOutputRoot.l2SequenceNumber, firstFastBlock);
if (l2SequenceNumber() != startingOutputRoot.l2SequenceNumber + blockInterval) {
revert UnexpectedBlockNumber(startingOutputRoot.l2SequenceNumber + blockInterval, l2SequenceNumber());
}

// Set the game as initialized.
Expand Down Expand Up @@ -809,7 +809,7 @@ contract AggregateVerifier is Clone, ReentrancyGuard, ISemver {
/// only games starting on slow blocks.
/// @dev Selection is on the starting block rather than the ending block so the game chain stays
/// contiguous across the activation: every game satisfies
/// `end == parent.end + slowBlockInterval` for the interval its own start selects. Exactly one
/// `end == parent.end + blockInterval` for the interval its own start selects. Exactly one
/// game straddles the activation and is proven under the slow-block interval, which is
/// correct because provers apply fork rules per block by timestamp.
/// @param startingBlock The starting L2 block number of the game.
Expand Down Expand Up @@ -1154,10 +1154,10 @@ contract AggregateVerifier is Clone, ReentrancyGuard, ISemver {
bytes32 startingRoot = intermediateRootIndex == 0
? startingOutputRoot.root.raw()
: intermediateOutputRoot(intermediateRootIndex - 1);
(, uint256 slowIntermediateBlockInterval) = intervalsForStartingBlock(startingOutputRoot.l2SequenceNumber);
(, uint256 intermediateBlockInterval) = intervalsForStartingBlock(startingOutputRoot.l2SequenceNumber);
uint64 startingL2SequenceNumber =
uint64(startingOutputRoot.l2SequenceNumber + intermediateRootIndex * slowIntermediateBlockInterval);
uint64 endingL2SequenceNumber = startingL2SequenceNumber + uint64(slowIntermediateBlockInterval);
uint64(startingOutputRoot.l2SequenceNumber + intermediateRootIndex * intermediateBlockInterval);
uint64 endingL2SequenceNumber = startingL2SequenceNumber + uint64(intermediateBlockInterval);
return (startingRoot, startingL2SequenceNumber, endingL2SequenceNumber);
}

Expand Down
Loading