chore: address rebase issue

AztecProtocol · Sep 17, 2024 · de0c384 · de0c384
1 parent 48624fc
commit de0c384
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/l1-contracts/src/core/Rollup.sol b/l1-contracts/src/core/Rollup.sol
@@ -390,7 +390,7 @@ contract Rollup is Leonidas, IRollup, ITestRollup {
    * @return bytes32 - The archive root of the block
    */
   function archiveAt(uint256 _blockNumber) external view override(IRollup) returns (bytes32) {
-    if (_blockNumber < pendingBlockCount) {
+    if (_blockNumber <= tips.pendingBlockNumber) {
       return blocks[_blockNumber].archive;
     }
     return bytes32(0);

diff --git a/yarn-project/end-to-end/src/e2e_synching.test.ts b/yarn-project/end-to-end/src/e2e_synching.test.ts
@@ -448,11 +448,11 @@ describe('e2e_l1_with_wall_time', () => {
         client: opts.deployL1ContractsValues!.walletClient,
       });
 
-      const pendingCount = await rollup.read.pendingBlockCount();
-      await rollup.write.setAssumeProvenUntilBlockNumber([pendingCount - BigInt(variant.blockCount) / 2n]);
+      const pendingBlockNumber = await rollup.read.getPendingBlockNumber();
+      await rollup.write.setAssumeProvenThroughBlockNumber([pendingBlockNumber - BigInt(variant.blockCount) / 2n]);
 
       const timeliness = await rollup.read.TIMELINESS_PROVING_IN_SLOTS();
-      const [, , slot] = await rollup.read.blocks([await rollup.read.provenBlockCount()]);
+      const [, , slot] = await rollup.read.blocks([(await rollup.read.getProvenBlockNumber()) + 1n]);
       const timeJumpTo = await rollup.read.getTimestampForSlot([slot + timeliness]);
 
       await opts.cheatCodes!.eth.warp(Number(timeJumpTo));