@aztec/end-to-end 3.0.0-nightly.20251123 → 3.0.0-nightly.20251125

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/dest/e2e_epochs/epochs_test.js +3 -3
  2. package/dest/e2e_fees/bridging_race.notest.js +1 -1
  3. package/dest/e2e_fees/fees_test.js +1 -1
  4. package/dest/e2e_l1_publisher/write_json.js +2 -2
  5. package/dest/fixtures/utils.js +1 -1
  6. package/dest/shared/uniswap_l1_l2.js +11 -11
  7. package/dest/simulators/lending_simulator.js +1 -1
  8. package/package.json +38 -38
  9. package/src/e2e_epochs/epochs_test.ts +3 -3
  10. package/src/e2e_fees/bridging_race.notest.ts +1 -1
  11. package/src/e2e_fees/fees_test.ts +1 -1
  12. package/src/e2e_l1_publisher/write_json.ts +2 -2
  13. package/src/fixtures/utils.ts +1 -1
  14. package/src/shared/uniswap_l1_l2.ts +11 -11
  15. package/src/simulators/lending_simulator.ts +1 -1
package/dest/e2e_epochs/epochs_test.js CHANGED
@@ -217,11 +217,11 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
217
217
  return start;
218
218
  }
219
219
  /** Waits until the given L2 block number is mined. */ async waitUntilL2BlockNumber(target, timeout = 60) {
220
- await retryUntil(()=>Promise.resolve(target <= this.monitor.l2BlockNumber), `Wait until L2 block ${target}`, timeout, 0.1);
220
+ await retryUntil(()=>Promise.resolve(target <= this.monitor.checkpointNumber), `Wait until L2 block ${target}`, timeout, 0.1);
221
221
  }
222
222
  /** Waits until the given L2 block number is marked as proven. */ async waitUntilProvenL2BlockNumber(t, timeout = 60) {
223
- await retryUntil(()=>Promise.resolve(t <= this.monitor.l2ProvenBlockNumber), `Wait proven L2 block ${t}`, timeout, 0.1);
224
- return this.monitor.l2ProvenBlockNumber;
223
+ await retryUntil(()=>Promise.resolve(t <= this.monitor.provenCheckpointNumber), `Wait proven L2 block ${t}`, timeout, 0.1);
224
+ return this.monitor.provenCheckpointNumber;
225
225
  }
226
226
  /** Waits until the last slot of the proof submission window for a given epoch. */ async waitUntilLastSlotOfProofSubmissionWindow(epochNumber) {
227
227
  const deadline = getProofSubmissionDeadlineTimestamp(BigInt(epochNumber), this.constants);
package/dest/e2e_fees/bridging_race.notest.js CHANGED
@@ -45,7 +45,7 @@ describe('e2e_fees bridging_race', ()=>{
45
45
  const origApprove = l1TokenManager.approve.bind(l1TokenManager);
46
46
  l1TokenManager.approve = async (amount, address, addressName = '')=>{
47
47
  await origApprove(amount, address, addressName);
48
- const sleepTime = (Number(t.chainMonitor.l2BlockTimestamp) + AZTEC_SLOT_DURATION) * 1000 - Date.now() - 500;
48
+ const sleepTime = (Number(t.chainMonitor.checkpointTimestamp) + AZTEC_SLOT_DURATION) * 1000 - Date.now() - 500;
49
49
  logger.info(`Sleeping for ${sleepTime}ms until near end of L2 slot before sending L1 fee juice to L2 inbox`);
50
50
  await sleep(sleepTime);
51
51
  };
package/dest/e2e_fees/fees_test.js CHANGED
@@ -99,7 +99,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
99
99
  }
100
100
  }
101
101
  async getBlockRewards() {
102
- const blockReward = await this.rollupContract.getBlockReward();
102
+ const blockReward = await this.rollupContract.getCheckpointReward();
103
103
  const rewardConfig = await this.rollupContract.getRewardConfig();
104
104
  const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(EthAddress.fromString(rewardConfig.rewardDistributor));
105
105
  const toDistribute = balance > blockReward ? blockReward : balance;
package/dest/e2e_l1_publisher/write_json.js CHANGED
@@ -23,13 +23,13 @@ const AZTEC_GENERATE_TEST_DATA = !!process.env.AZTEC_GENERATE_TEST_DATA;
23
23
  messages: {
24
24
  l2ToL1Messages: block.body.txEffects.flatMap((txEffect)=>txEffect.l2ToL1Msgs).map((value)=>asHex(value))
25
25
  },
26
- block: {
26
+ checkpoint: {
27
27
  // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
28
28
  // This should not be a problem for testing as long as the values are not larger than u32.
29
29
  archive: asHex(block.archive.root),
30
30
  blobCommitments: getPrefixedEthBlobCommitments(blobs),
31
31
  batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
32
- blockNumber: block.number,
32
+ checkpointNumber: block.number,
33
33
  body: `0x${block.body.toBuffer().toString('hex')}`,
34
34
  header: {
35
35
  lastArchiveRoot: asHex(block.header.lastArchive.root),
package/dest/fixtures/utils.js CHANGED
@@ -281,7 +281,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
281
281
  if (opts.fundRewardDistributor) {
282
282
  // Mints block rewards for 10000 blocks to the rewardDistributor contract
283
283
  const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
284
- const blockReward = await rollup.getBlockReward();
284
+ const blockReward = await rollup.getCheckpointReward();
285
285
  const mintAmount = 10_000n * blockReward;
286
286
  const feeJuice = getContract({
287
287
  address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
package/dest/shared/uniswap_l1_l2.js CHANGED
@@ -159,7 +159,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
159
159
  // ensure that uniswap contract didn't eat the funds.
160
160
  await wethCrossChainHarness.expectPublicBalanceOnL2(uniswapL2Contract.address, 0n);
161
161
  // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
162
- await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
162
+ await cheatCodes.rollup.markAsProven(await rollup.getCheckpointNumber());
163
163
  // 5. Consume L2 to L1 message by calling uniswapPortal.swap_private()
164
164
  logger.info('Execute withdraw and swap on the uniswapPortal!');
165
165
  const daiL1BalanceOfPortalBeforeSwap = await daiCrossChainHarness.getL1BalanceOf(daiCrossChainHarness.tokenPortalAddress);
@@ -170,12 +170,12 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
170
170
  const withdrawL2MessageIndex = withdrawResult.leafIndex;
171
171
  const withdrawSiblingPath = withdrawResult.siblingPath;
172
172
  const withdrawMessageMetadata = {
173
- _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber),
173
+ _checkpointNumber: BigInt(l2UniswapInteractionReceipt.blockNumber),
174
174
  _leafIndex: BigInt(withdrawL2MessageIndex),
175
175
  _path: withdrawSiblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
176
176
  };
177
177
  const swapPrivateMessageMetadata = {
178
- _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber),
178
+ _checkpointNumber: BigInt(l2UniswapInteractionReceipt.blockNumber),
179
179
  _leafIndex: BigInt(swapPrivateL2MessageIndex),
180
180
  _path: swapPrivateSiblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
181
181
  };
@@ -357,14 +357,14 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
357
357
  // withdrawLeaf,
358
358
  // );
359
359
  // const withdrawMessageMetadata = {
360
- // _l2BlockNumber: BigInt(uniswapL2Interaction.blockNumber!),
360
+ // _checkpointNumber: BigInt(uniswapL2Interaction.blockNumber!),
361
361
  // _leafIndex: BigInt(withdrawL2MessageIndex),
362
362
  // _path: withdrawSiblingPath
363
363
  // .toBufferArray()
364
364
  // .map((buf: Buffer) => `0x${buf.toString('hex')}`) as readonly `0x${string}`[],
365
365
  // };
366
366
  // const swapPrivateMessageMetadata = {
367
- // _l2BlockNumber: BigInt(uniswapL2Interaction.blockNumber!),
367
+ // _checkpointNumber: BigInt(uniswapL2Interaction.blockNumber!),
368
368
  // _leafIndex: BigInt(swapPrivateL2MessageIndex),
369
369
  // _path: swapPrivateSiblingPath
370
370
  // .toBufferArray()
@@ -569,19 +569,19 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
569
569
  const withdrawL2MessageIndex = withdrawResult.leafIndex;
570
570
  const withdrawSiblingPath = withdrawResult.siblingPath;
571
571
  const withdrawMessageMetadata = {
572
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
572
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber),
573
573
  _leafIndex: BigInt(withdrawL2MessageIndex),
574
574
  _path: withdrawSiblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
575
575
  };
576
576
  const swapPrivateMessageMetadata = {
577
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
577
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber),
578
578
  _leafIndex: BigInt(swapPrivateL2MessageIndex),
579
579
  _path: swapPrivateSiblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
580
580
  };
581
581
  // ensure that user's funds were burnt
582
582
  await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
583
583
  // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
584
- await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
584
+ await cheatCodes.rollup.markAsProven(await rollup.getCheckpointNumber());
585
585
  // On L1 call swap_public!
586
586
  logger.info('call swap_public on L1');
587
587
  const swapArgs = [
@@ -655,19 +655,19 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
655
655
  const withdrawL2MessageIndex = withdrawResult.leafIndex;
656
656
  const withdrawSiblingPath = withdrawResult.siblingPath;
657
657
  const withdrawMessageMetadata = {
658
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
658
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber),
659
659
  _leafIndex: BigInt(withdrawL2MessageIndex),
660
660
  _path: withdrawSiblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
661
661
  };
662
662
  const swapPublicMessageMetadata = {
663
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber),
663
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber),
664
664
  _leafIndex: BigInt(swapPublicL2MessageIndex),
665
665
  _path: swapPublicSiblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
666
666
  };
667
667
  // check weth balance of owner on L2 (we first bridged `wethAmountToBridge` into L2 and now withdrew it!)
668
668
  await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
669
669
  // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
670
- await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
670
+ await cheatCodes.rollup.markAsProven(await rollup.getCheckpointNumber());
671
671
  // Call swap_private on L1
672
672
  logger.info('Execute withdraw and swap on the uniswapPortal!');
673
673
  const swapArgs = [
package/dest/simulators/lending_simulator.js CHANGED
@@ -93,7 +93,7 @@ const computeMultiplier = (rate, dt)=>{
93
93
  if (dateProvider) {
94
94
  dateProvider.setTime(this.time * 1000);
95
95
  }
96
- await this.cc.rollup.markAsProven(await this.rollup.getBlockNumber());
96
+ await this.cc.rollup.markAsProven(await this.rollup.getCheckpointNumber());
97
97
  this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
98
98
  }
99
99
  depositPrivate(from, onBehalfOf, amount) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/end-to-end",
3
- "version": "3.0.0-nightly.20251123",
3
+ "version": "3.0.0-nightly.20251125",
4
4
  "type": "module",
5
5
  "exports": "./dest/index.js",
6
6
  "inherits": [
@@ -25,43 +25,43 @@
25
25
  "formatting": "run -T prettier --check ./src && run -T eslint ./src"
26
26
  },
27
27
  "dependencies": {
28
- "@aztec/accounts": "3.0.0-nightly.20251123",
29
- "@aztec/archiver": "3.0.0-nightly.20251123",
30
- "@aztec/aztec": "3.0.0-nightly.20251123",
31
- "@aztec/aztec-node": "3.0.0-nightly.20251123",
32
- "@aztec/aztec.js": "3.0.0-nightly.20251123",
33
- "@aztec/bb-prover": "3.0.0-nightly.20251123",
34
- "@aztec/bb.js": "3.0.0-nightly.20251123",
35
- "@aztec/blob-lib": "3.0.0-nightly.20251123",
36
- "@aztec/blob-sink": "3.0.0-nightly.20251123",
37
- "@aztec/bot": "3.0.0-nightly.20251123",
38
- "@aztec/cli": "3.0.0-nightly.20251123",
39
- "@aztec/constants": "3.0.0-nightly.20251123",
40
- "@aztec/entrypoints": "3.0.0-nightly.20251123",
41
- "@aztec/epoch-cache": "3.0.0-nightly.20251123",
42
- "@aztec/ethereum": "3.0.0-nightly.20251123",
43
- "@aztec/foundation": "3.0.0-nightly.20251123",
44
- "@aztec/kv-store": "3.0.0-nightly.20251123",
45
- "@aztec/l1-artifacts": "3.0.0-nightly.20251123",
46
- "@aztec/merkle-tree": "3.0.0-nightly.20251123",
47
- "@aztec/node-keystore": "3.0.0-nightly.20251123",
48
- "@aztec/noir-contracts.js": "3.0.0-nightly.20251123",
49
- "@aztec/noir-noirc_abi": "3.0.0-nightly.20251123",
50
- "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251123",
51
- "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251123",
52
- "@aztec/p2p": "3.0.0-nightly.20251123",
53
- "@aztec/protocol-contracts": "3.0.0-nightly.20251123",
54
- "@aztec/prover-client": "3.0.0-nightly.20251123",
55
- "@aztec/prover-node": "3.0.0-nightly.20251123",
56
- "@aztec/pxe": "3.0.0-nightly.20251123",
57
- "@aztec/sequencer-client": "3.0.0-nightly.20251123",
58
- "@aztec/simulator": "3.0.0-nightly.20251123",
59
- "@aztec/slasher": "3.0.0-nightly.20251123",
60
- "@aztec/stdlib": "3.0.0-nightly.20251123",
61
- "@aztec/telemetry-client": "3.0.0-nightly.20251123",
62
- "@aztec/test-wallet": "3.0.0-nightly.20251123",
63
- "@aztec/validator-client": "3.0.0-nightly.20251123",
64
- "@aztec/world-state": "3.0.0-nightly.20251123",
28
+ "@aztec/accounts": "3.0.0-nightly.20251125",
29
+ "@aztec/archiver": "3.0.0-nightly.20251125",
30
+ "@aztec/aztec": "3.0.0-nightly.20251125",
31
+ "@aztec/aztec-node": "3.0.0-nightly.20251125",
32
+ "@aztec/aztec.js": "3.0.0-nightly.20251125",
33
+ "@aztec/bb-prover": "3.0.0-nightly.20251125",
34
+ "@aztec/bb.js": "3.0.0-nightly.20251125",
35
+ "@aztec/blob-lib": "3.0.0-nightly.20251125",
36
+ "@aztec/blob-sink": "3.0.0-nightly.20251125",
37
+ "@aztec/bot": "3.0.0-nightly.20251125",
38
+ "@aztec/cli": "3.0.0-nightly.20251125",
39
+ "@aztec/constants": "3.0.0-nightly.20251125",
40
+ "@aztec/entrypoints": "3.0.0-nightly.20251125",
41
+ "@aztec/epoch-cache": "3.0.0-nightly.20251125",
42
+ "@aztec/ethereum": "3.0.0-nightly.20251125",
43
+ "@aztec/foundation": "3.0.0-nightly.20251125",
44
+ "@aztec/kv-store": "3.0.0-nightly.20251125",
45
+ "@aztec/l1-artifacts": "3.0.0-nightly.20251125",
46
+ "@aztec/merkle-tree": "3.0.0-nightly.20251125",
47
+ "@aztec/node-keystore": "3.0.0-nightly.20251125",
48
+ "@aztec/noir-contracts.js": "3.0.0-nightly.20251125",
49
+ "@aztec/noir-noirc_abi": "3.0.0-nightly.20251125",
50
+ "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251125",
51
+ "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251125",
52
+ "@aztec/p2p": "3.0.0-nightly.20251125",
53
+ "@aztec/protocol-contracts": "3.0.0-nightly.20251125",
54
+ "@aztec/prover-client": "3.0.0-nightly.20251125",
55
+ "@aztec/prover-node": "3.0.0-nightly.20251125",
56
+ "@aztec/pxe": "3.0.0-nightly.20251125",
57
+ "@aztec/sequencer-client": "3.0.0-nightly.20251125",
58
+ "@aztec/simulator": "3.0.0-nightly.20251125",
59
+ "@aztec/slasher": "3.0.0-nightly.20251125",
60
+ "@aztec/stdlib": "3.0.0-nightly.20251125",
61
+ "@aztec/telemetry-client": "3.0.0-nightly.20251125",
62
+ "@aztec/test-wallet": "3.0.0-nightly.20251125",
63
+ "@aztec/validator-client": "3.0.0-nightly.20251125",
64
+ "@aztec/world-state": "3.0.0-nightly.20251125",
65
65
  "@iarna/toml": "^2.2.5",
66
66
  "@jest/globals": "^30.0.0",
67
67
  "@noble/curves": "=1.0.0",
package/src/e2e_epochs/epochs_test.ts CHANGED
@@ -293,7 +293,7 @@ export class EpochsTestContext {
293
293
  /** Waits until the given L2 block number is mined. */
294
294
  public async waitUntilL2BlockNumber(target: number, timeout = 60) {
295
295
  await retryUntil(
296
- () => Promise.resolve(target <= this.monitor.l2BlockNumber),
296
+ () => Promise.resolve(target <= this.monitor.checkpointNumber),
297
297
  `Wait until L2 block ${target}`,
298
298
  timeout,
299
299
  0.1,
@@ -303,12 +303,12 @@ export class EpochsTestContext {
303
303
  /** Waits until the given L2 block number is marked as proven. */
304
304
  public async waitUntilProvenL2BlockNumber(t: number, timeout = 60) {
305
305
  await retryUntil(
306
- () => Promise.resolve(t <= this.monitor.l2ProvenBlockNumber),
306
+ () => Promise.resolve(t <= this.monitor.provenCheckpointNumber),
307
307
  `Wait proven L2 block ${t}`,
308
308
  timeout,
309
309
  0.1,
310
310
  );
311
- return this.monitor.l2ProvenBlockNumber;
311
+ return this.monitor.provenCheckpointNumber;
312
312
  }
313
313
 
314
314
  /** Waits until the last slot of the proof submission window for a given epoch. */
package/src/e2e_fees/bridging_race.notest.ts CHANGED
@@ -60,7 +60,7 @@ describe('e2e_fees bridging_race', () => {
60
60
  const origApprove = l1TokenManager.approve.bind(l1TokenManager);
61
61
  l1TokenManager.approve = async (amount: bigint, address: Hex, addressName = '') => {
62
62
  await origApprove(amount, address, addressName);
63
- const sleepTime = (Number(t.chainMonitor.l2BlockTimestamp) + AZTEC_SLOT_DURATION) * 1000 - Date.now() - 500;
63
+ const sleepTime = (Number(t.chainMonitor.checkpointTimestamp) + AZTEC_SLOT_DURATION) * 1000 - Date.now() - 500;
64
64
  logger.info(`Sleeping for ${sleepTime}ms until near end of L2 slot before sending L1 fee juice to L2 inbox`);
65
65
  await sleep(sleepTime);
66
66
  };
package/src/e2e_fees/fees_test.ts CHANGED
@@ -136,7 +136,7 @@ export class FeesTest {
136
136
  }
137
137
 
138
138
  async getBlockRewards() {
139
- const blockReward = await this.rollupContract.getBlockReward();
139
+ const blockReward = await this.rollupContract.getCheckpointReward();
140
140
  const rewardConfig = await this.rollupContract.getRewardConfig();
141
141
 
142
142
  const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
package/src/e2e_l1_publisher/write_json.ts CHANGED
@@ -41,13 +41,13 @@ export async function writeJson(
41
41
  messages: {
42
42
  l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(value => asHex(value)),
43
43
  },
44
- block: {
44
+ checkpoint: {
45
45
  // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
46
46
  // This should not be a problem for testing as long as the values are not larger than u32.
47
47
  archive: asHex(block.archive.root),
48
48
  blobCommitments: getPrefixedEthBlobCommitments(blobs),
49
49
  batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
50
- blockNumber: block.number,
50
+ checkpointNumber: block.number,
51
51
  body: `0x${block.body.toBuffer().toString('hex')}`,
52
52
  header: {
53
53
  lastArchiveRoot: asHex(block.header.lastArchive.root),
package/src/fixtures/utils.ts CHANGED
@@ -499,7 +499,7 @@ export async function setup(
499
499
  deployL1ContractsValues.l1ContractAddresses.rollupAddress,
500
500
  );
501
501
 
502
- const blockReward = await rollup.getBlockReward();
502
+ const blockReward = await rollup.getCheckpointReward();
503
503
  const mintAmount = 10_000n * (blockReward as bigint);
504
504
 
505
505
  const feeJuice = getContract({
package/src/shared/uniswap_l1_l2.ts CHANGED
@@ -262,7 +262,7 @@ export const uniswapL1L2TestSuite = (
262
262
  await wethCrossChainHarness.expectPublicBalanceOnL2(uniswapL2Contract.address, 0n);
263
263
 
264
264
  // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
265
- await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
265
+ await cheatCodes.rollup.markAsProven(await rollup.getCheckpointNumber());
266
266
 
267
267
  // 5. Consume L2 to L1 message by calling uniswapPortal.swap_private()
268
268
  logger.info('Execute withdraw and swap on the uniswapPortal!');
@@ -287,7 +287,7 @@ export const uniswapL1L2TestSuite = (
287
287
  const withdrawSiblingPath = withdrawResult!.siblingPath;
288
288
 
289
289
  const withdrawMessageMetadata = {
290
- _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber!),
290
+ _checkpointNumber: BigInt(l2UniswapInteractionReceipt.blockNumber!),
291
291
  _leafIndex: BigInt(withdrawL2MessageIndex),
292
292
  _path: withdrawSiblingPath
293
293
  .toBufferArray()
@@ -295,7 +295,7 @@ export const uniswapL1L2TestSuite = (
295
295
  };
296
296
 
297
297
  const swapPrivateMessageMetadata = {
298
- _l2BlockNumber: BigInt(l2UniswapInteractionReceipt.blockNumber!),
298
+ _checkpointNumber: BigInt(l2UniswapInteractionReceipt.blockNumber!),
299
299
  _leafIndex: BigInt(swapPrivateL2MessageIndex),
300
300
  _path: swapPrivateSiblingPath
301
301
  .toBufferArray()
@@ -506,7 +506,7 @@ export const uniswapL1L2TestSuite = (
506
506
  // );
507
507
 
508
508
  // const withdrawMessageMetadata = {
509
- // _l2BlockNumber: BigInt(uniswapL2Interaction.blockNumber!),
509
+ // _checkpointNumber: BigInt(uniswapL2Interaction.blockNumber!),
510
510
  // _leafIndex: BigInt(withdrawL2MessageIndex),
511
511
  // _path: withdrawSiblingPath
512
512
  // .toBufferArray()
@@ -514,7 +514,7 @@ export const uniswapL1L2TestSuite = (
514
514
  // };
515
515
 
516
516
  // const swapPrivateMessageMetadata = {
517
- // _l2BlockNumber: BigInt(uniswapL2Interaction.blockNumber!),
517
+ // _checkpointNumber: BigInt(uniswapL2Interaction.blockNumber!),
518
518
  // _leafIndex: BigInt(swapPrivateL2MessageIndex),
519
519
  // _path: swapPrivateSiblingPath
520
520
  // .toBufferArray()
@@ -872,7 +872,7 @@ export const uniswapL1L2TestSuite = (
872
872
  const withdrawSiblingPath = withdrawResult!.siblingPath;
873
873
 
874
874
  const withdrawMessageMetadata = {
875
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
875
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber!),
876
876
  _leafIndex: BigInt(withdrawL2MessageIndex),
877
877
  _path: withdrawSiblingPath
878
878
  .toBufferArray()
@@ -880,7 +880,7 @@ export const uniswapL1L2TestSuite = (
880
880
  };
881
881
 
882
882
  const swapPrivateMessageMetadata = {
883
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
883
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber!),
884
884
  _leafIndex: BigInt(swapPrivateL2MessageIndex),
885
885
  _path: swapPrivateSiblingPath
886
886
  .toBufferArray()
@@ -891,7 +891,7 @@ export const uniswapL1L2TestSuite = (
891
891
  await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
892
892
 
893
893
  // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
894
- await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
894
+ await cheatCodes.rollup.markAsProven(await rollup.getCheckpointNumber());
895
895
 
896
896
  // On L1 call swap_public!
897
897
  logger.info('call swap_public on L1');
@@ -1007,7 +1007,7 @@ export const uniswapL1L2TestSuite = (
1007
1007
  const withdrawSiblingPath = withdrawResult!.siblingPath;
1008
1008
 
1009
1009
  const withdrawMessageMetadata = {
1010
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
1010
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber!),
1011
1011
  _leafIndex: BigInt(withdrawL2MessageIndex),
1012
1012
  _path: withdrawSiblingPath
1013
1013
  .toBufferArray()
@@ -1015,7 +1015,7 @@ export const uniswapL1L2TestSuite = (
1015
1015
  };
1016
1016
 
1017
1017
  const swapPublicMessageMetadata = {
1018
- _l2BlockNumber: BigInt(withdrawReceipt.blockNumber!),
1018
+ _checkpointNumber: BigInt(withdrawReceipt.blockNumber!),
1019
1019
  _leafIndex: BigInt(swapPublicL2MessageIndex),
1020
1020
  _path: swapPublicSiblingPath
1021
1021
  .toBufferArray()
@@ -1026,7 +1026,7 @@ export const uniswapL1L2TestSuite = (
1026
1026
  await wethCrossChainHarness.expectPublicBalanceOnL2(ownerAddress, 0n);
1027
1027
 
1028
1028
  // Since the outbox is only consumable when the block is proven, we need to set the block to be proven
1029
- await cheatCodes.rollup.markAsProven(await rollup.getBlockNumber());
1029
+ await cheatCodes.rollup.markAsProven(await rollup.getCheckpointNumber());
1030
1030
 
1031
1031
  // Call swap_private on L1
1032
1032
  logger.info('Execute withdraw and swap on the uniswapPortal!');
package/src/simulators/lending_simulator.ts CHANGED
@@ -112,7 +112,7 @@ export class LendingSimulator {
112
112
  if (dateProvider) {
113
113
  dateProvider.setTime(this.time * 1000);
114
114
  }
115
- await this.cc.rollup.markAsProven(await this.rollup.getBlockNumber());
115
+ await this.cc.rollup.markAsProven(await this.rollup.getCheckpointNumber());
116
116
  this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
117
117
  }
118
118