-
Notifications
You must be signed in to change notification settings - Fork 284
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
375482f
commit e000b09
Showing
34 changed files
with
802 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,54 @@ | ||
| type TimeConstants = { | ||
| // REFACTOR: This file should go in a package lower in the dependency graph. | ||
|
|
||
| export type EpochConstants = { | ||
| l1GenesisBlock: bigint; | ||
| l1GenesisTime: bigint; | ||
| epochDuration: number; | ||
| slotDuration: number; | ||
| }; | ||
|
|
||
| /** Returns the slot number for a given timestamp. */ | ||
| export function getSlotAtTimestamp(ts: bigint, constants: Pick<TimeConstants, 'l1GenesisTime' | 'slotDuration'>) { | ||
| export function getSlotAtTimestamp(ts: bigint, constants: Pick<EpochConstants, 'l1GenesisTime' | 'slotDuration'>) { | ||
| return ts < constants.l1GenesisTime ? 0n : (ts - constants.l1GenesisTime) / BigInt(constants.slotDuration); | ||
| } | ||
|
|
||
| /** Returns the epoch number for a given timestamp. */ | ||
| export function getEpochNumberAtTimestamp(ts: bigint, constants: TimeConstants) { | ||
| export function getEpochNumberAtTimestamp( | ||
| ts: bigint, | ||
| constants: Pick<EpochConstants, 'epochDuration' | 'slotDuration' | 'l1GenesisTime'>, | ||
| ) { | ||
| return getSlotAtTimestamp(ts, constants) / BigInt(constants.epochDuration); | ||
| } | ||
|
|
||
| /** Returns the range of slots (inclusive) for a given epoch number. */ | ||
| export function getSlotRangeForEpoch(epochNumber: bigint, constants: Pick<TimeConstants, 'epochDuration'>) { | ||
| /** Returns the range of L2 slots (inclusive) for a given epoch number. */ | ||
| export function getSlotRangeForEpoch(epochNumber: bigint, constants: Pick<EpochConstants, 'epochDuration'>) { | ||
| const startSlot = epochNumber * BigInt(constants.epochDuration); | ||
| return [startSlot, startSlot + BigInt(constants.epochDuration) - 1n]; | ||
| } | ||
|
|
||
| /** Returns the range of L1 timestamps (inclusive) for a given epoch number. */ | ||
| export function getTimestampRangeForEpoch(epochNumber: bigint, constants: TimeConstants) { | ||
| export function getTimestampRangeForEpoch( | ||
| epochNumber: bigint, | ||
| constants: Pick<EpochConstants, 'l1GenesisTime' | 'slotDuration' | 'epochDuration'>, | ||
| ) { | ||
| const [startSlot, endSlot] = getSlotRangeForEpoch(epochNumber, constants); | ||
| return [ | ||
| constants.l1GenesisTime + startSlot * BigInt(constants.slotDuration), | ||
| constants.l1GenesisTime + endSlot * BigInt(constants.slotDuration), | ||
| ]; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the range of L1 blocks (inclusive) for a given epoch number. | ||
| * @remarks This assumes no time warp has happened. | ||
| */ | ||
| export function getL1BlockRangeForEpoch( | ||
| epochNumber: bigint, | ||
| constants: Pick<EpochConstants, 'l1GenesisBlock' | 'epochDuration' | 'slotDuration'>, | ||
| ) { | ||
| const epochDurationInL1Blocks = BigInt(constants.epochDuration) * BigInt(constants.slotDuration); | ||
| return [ | ||
| epochNumber * epochDurationInL1Blocks + constants.l1GenesisBlock, | ||
| (epochNumber + 1n) * epochDurationInL1Blocks + constants.l1GenesisBlock - 1n, | ||
| ]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| import { type EpochConstants, getTimestampRangeForEpoch } from '@aztec/archiver/epoch'; | ||
| import { type DebugLogger, retryUntil } from '@aztec/aztec.js'; | ||
| import { RollupContract } from '@aztec/ethereum/contracts'; | ||
| import { type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test'; | ||
|
|
||
| import { type PublicClient } from 'viem'; | ||
|
|
||
| import { type EndToEndContext, setup } from './fixtures/utils.js'; | ||
|
|
||
| // Tests building of epochs using fast block times and short epochs. | ||
| // Spawns an aztec node and a prover node with fake proofs. | ||
| // Sequencer is allowed to build empty blocks. | ||
| describe('e2e_epochs', () => { | ||
| let context: EndToEndContext; | ||
| let l1Client: PublicClient; | ||
| let rollup: RollupContract; | ||
| let constants: EpochConstants; | ||
| let logger: DebugLogger; | ||
| let proverDelayer: Delayer; | ||
| let sequencerDelayer: Delayer; | ||
|
|
||
| let l2BlockNumber: number = 0; | ||
| let l2ProvenBlockNumber: number = 0; | ||
| let l1BlockNumber: number; | ||
| let handle: NodeJS.Timeout; | ||
|
|
||
| const EPOCH_DURATION = 4; | ||
| const L1_BLOCK_TIME = 3; | ||
| const L2_SLOT_DURATION_IN_L1_BLOCKS = 2; | ||
|
|
||
| beforeAll(async () => { | ||
| // Set up system without any account nor protocol contracts | ||
| // and with faster block times and shorter epochs. | ||
| context = await setup(0, { | ||
| assumeProvenThrough: undefined, | ||
| skipProtocolContracts: true, | ||
| salt: 1, | ||
| aztecEpochDuration: EPOCH_DURATION, | ||
| aztecSlotDuration: L1_BLOCK_TIME * L2_SLOT_DURATION_IN_L1_BLOCKS, | ||
| ethereumSlotDuration: L1_BLOCK_TIME, | ||
| aztecEpochProofClaimWindowInL2Slots: EPOCH_DURATION / 2, | ||
| minTxsPerBlock: 0, | ||
| realProofs: false, | ||
| startProverNode: true, | ||
| }); | ||
|
|
||
| logger = context.logger; | ||
| l1Client = context.deployL1ContractsValues.publicClient; | ||
| rollup = RollupContract.getFromConfig(context.config); | ||
|
|
||
| // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one. | ||
| // We could refactor this out to an utility if we want to use this in other tests. | ||
| handle = setInterval(async () => { | ||
| const newL1BlockNumber = Number(await l1Client.getBlockNumber({ cacheTime: 0 })); | ||
| if (l1BlockNumber === newL1BlockNumber) { | ||
| return; | ||
| } | ||
| const block = await l1Client.getBlock({ blockNumber: BigInt(newL1BlockNumber), includeTransactions: false }); | ||
| const timestamp = block.timestamp; | ||
| l1BlockNumber = newL1BlockNumber; | ||
|
|
||
| let msg = `L1 block ${newL1BlockNumber} mined at ${timestamp}`; | ||
|
|
||
| const newL2BlockNumber = Number(await rollup.getBlockNumber()); | ||
| if (l2BlockNumber !== newL2BlockNumber) { | ||
| const epochNumber = await rollup.getEpochNumber(BigInt(newL2BlockNumber)); | ||
| msg += ` with new L2 block ${newL2BlockNumber} for epoch ${epochNumber}`; | ||
| l2BlockNumber = newL2BlockNumber; | ||
| } | ||
|
|
||
| const newL2ProvenBlockNumber = Number(await rollup.getProvenBlockNumber()); | ||
| if (l2ProvenBlockNumber !== newL2ProvenBlockNumber) { | ||
| const epochNumber = await rollup.getEpochNumber(BigInt(newL2ProvenBlockNumber)); | ||
| msg += ` with proof up to L2 block ${newL2ProvenBlockNumber} for epoch ${epochNumber}`; | ||
| l2ProvenBlockNumber = newL2ProvenBlockNumber; | ||
| } | ||
| logger.info(msg); | ||
| }, 200); | ||
|
|
||
| // The "as any" cast sucks, but it saves us from having to define test-only types for the provernode | ||
| // and sequencer that are exactly like the real ones but with the publisher exposed. We should | ||
| // do it if we see the this pattern popping up in more places. | ||
| proverDelayer = (context.proverNode as any).publisher.delayer; | ||
| sequencerDelayer = (context.sequencer as any).sequencer.publisher.delayer; | ||
| expect(proverDelayer).toBeDefined(); | ||
| expect(sequencerDelayer).toBeDefined(); | ||
|
|
||
| // Constants used for time calculation | ||
| constants = { | ||
| epochDuration: EPOCH_DURATION, | ||
| slotDuration: L1_BLOCK_TIME * L2_SLOT_DURATION_IN_L1_BLOCKS, | ||
| l1GenesisBlock: await rollup.getL1StartBlock(), | ||
| l1GenesisTime: await rollup.getL1GenesisTime(), | ||
| }; | ||
|
|
||
| logger.info(`L2 genesis at L1 block ${constants.l1GenesisBlock} (timestamp ${constants.l1GenesisTime})`); | ||
| }); | ||
|
|
||
| afterAll(async () => { | ||
| clearInterval(handle); | ||
| await context.teardown(); | ||
| }); | ||
|
|
||
| /** Waits until the epoch begins (ie until the immediately previous L1 block is mined). */ | ||
| const waitUntilEpochStarts = async (epoch: number) => { | ||
| const [start] = getTimestampRangeForEpoch(BigInt(epoch), constants); | ||
| logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`); | ||
| await waitUntilL1Timestamp(l1Client, start - BigInt(L1_BLOCK_TIME)); | ||
| return start; | ||
| }; | ||
|
|
||
| /** Waits until the given L2 block number is mined. */ | ||
| const waitUntilL2BlockNumber = async (target: number) => { | ||
| await retryUntil(() => Promise.resolve(target === l2BlockNumber), `Wait until L2 block ${l2BlockNumber}`, 60, 0.1); | ||
| }; | ||
|
|
||
| it('does not allow submitting proof after epoch end', async () => { | ||
| await waitUntilEpochStarts(1); | ||
| const blockNumberAtEndOfEpoch0 = Number(await rollup.getBlockNumber()); | ||
| logger.info(`Starting epoch 1 after L2 block ${blockNumberAtEndOfEpoch0}`); | ||
|
|
||
| // Hold off prover tx until end of next epoch! | ||
| const [epoch2Start] = getTimestampRangeForEpoch(2n, constants); | ||
| proverDelayer.pauseNextTxUntilTimestamp(epoch2Start); | ||
| logger.info(`Delayed prover tx until epoch 2 starts at ${epoch2Start}`); | ||
|
|
||
| // Wait until the last block of epoch 1 is published and then hold off the sequencer | ||
| await waitUntilL2BlockNumber(blockNumberAtEndOfEpoch0 + EPOCH_DURATION); | ||
| sequencerDelayer.pauseNextTxUntilTimestamp(epoch2Start + BigInt(L1_BLOCK_TIME)); | ||
|
|
||
| // Next sequencer to publish a block should trigger a rollback to block 1 | ||
| await waitUntilL1Timestamp(l1Client, epoch2Start + BigInt(L1_BLOCK_TIME)); | ||
| expect(await rollup.getBlockNumber()).toEqual(1n); | ||
| expect(await rollup.getSlotNumber()).toEqual(8n); | ||
|
|
||
| // The prover tx should have been rejected, and mined strictly before the one that triggered the rollback | ||
| const lastProverTxHash = proverDelayer.getTxs().at(-1); | ||
| const lastProverTxReceipt = await l1Client.getTransactionReceipt({ hash: lastProverTxHash! }); | ||
| expect(lastProverTxReceipt.status).toEqual('reverted'); | ||
|
|
||
| const lastL2BlockTxHash = sequencerDelayer.getTxs().at(-1); | ||
| const lastL2BlockTxReceipt = await l1Client.getTransactionReceipt({ hash: lastL2BlockTxHash! }); | ||
| expect(lastL2BlockTxReceipt.status).toEqual('success'); | ||
| expect(lastL2BlockTxReceipt.blockNumber).toBeGreaterThan(lastProverTxReceipt!.blockNumber); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.