@aztec/aztec 0.0.1-commit.2448fdb → 0.0.1-commit.2606882

package/src/testing/cheat_codes.ts

@@ -2,6 +2,7 @@ import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 import { SlotNumber } from '@aztec/foundation/branded-types';
 import { createLogger } from '@aztec/foundation/log';
 import type { DateProvider } from '@aztec/foundation/timer';
+import type { AutomineSequencer } from '@aztec/sequencer-client';
 import type { AztecNode, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
 
 /**
@@ -18,15 +19,22 @@ export class CheatCodes {
     public eth: EthCheatCodes,
     /** Cheat codes for the Aztec Rollup contract on L1. */
     public rollup: RollupCheatCodes,
+    /** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */
+    private automine?: AutomineSequencer,
   ) {}
 
-  static async create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes> {
+  static async create(
+    rpcUrls: string[],
+    node: AztecNode,
+    dateProvider: DateProvider,
+    automine?: AutomineSequencer,
+  ): Promise<CheatCodes> {
     const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
     const rollupCheatCodes = new RollupCheatCodes(
       ethCheatCodes,
       await node.getNodeInfo().then(n => n.l1ContractAddresses),
     );
-    return new CheatCodes(ethCheatCodes, rollupCheatCodes);
+    return new CheatCodes(ethCheatCodes, rollupCheatCodes, automine);
   }
 
   /**
@@ -36,7 +44,7 @@ export class CheatCodes {
    * @param node - The Aztec node used to force an empty block to be mined.
    * @param targetTimestamp - The target timestamp to warp to (in seconds)
    */
-  async warpL2TimeAtLeastTo(node: AztecNodeDebug, targetTimestamp: bigint | number) {
+  async warpL2TimeAtLeastTo(node: AztecNode & AztecNodeDebug, targetTimestamp: bigint | number) {
     const targetBigInt = BigInt(targetTimestamp);
     const currentTimestamp = BigInt(await this.eth.lastBlockTimestamp());
 
@@ -46,10 +54,20 @@ export class CheatCodes {
       );
     }
 
+    // AutomineSequencer owns time control through its serial queue — delegate to keep warps atomic
+    // with respect to any in-flight build, and avoid the mineBlock-loop hack below.
+    // `warpTo` internally builds an empty L2 checkpoint, which auto-mines exactly one L1 block at
+    // the target slot boundary, so no separate `node.mineBlock()` is needed here.
+    if (this.automine) {
+      await this.automine.warpTo(Number(targetBigInt));
+      return;
+    }
+
     const currentSlot = await this.rollup.getSlot();
     const targetSlot = await this.rollup.getSlotAt(targetBigInt);
 
     let effectiveTimestamp = targetBigInt;
+    let effectiveTargetSlot = targetSlot;
 
     if (targetSlot <= currentSlot) {
       // Target lands in the same (or earlier) slot — auto-adjust to the next slot's start.
@@ -60,10 +78,32 @@ export class CheatCodes {
           `Auto-adjusting to start of slot ${nextSlot} at timestamp ${nextSlotTimestamp}.`,
       );
       effectiveTimestamp = nextSlotTimestamp;
+      effectiveTargetSlot = nextSlot;
     }
 
     await this.eth.warp(effectiveTimestamp, { resetBlockInterval: true });
-    await node.mineBlock();
+
+    // The sequencer's polling loop may have a `work()` cycle in flight that captured pre-warp slot/timestamp values
+    // just before our warp landed. That cycle would mine an L2 block at the stale slot — the L1 sync prunes such a
+    // block from the canonical chain, but it lingers in local world state and the PXE will use it as the anchor for
+    // subsequent txs, leading to `expiration_timestamp` values that are already in the past relative to L1. Mine
+    // until we observe an L2 block at (or past) the post-warp slot, ensuring the next tx anchors to a fresh block.
+    const maxAttempts = 5;
+    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+      await node.mineBlock();
+      const blockData = await node.getBlockData('latest');
+      const blockSlot = blockData?.header.globalVariables.slotNumber;
+      if (blockSlot !== undefined && BigInt(blockSlot) >= BigInt(effectiveTargetSlot)) {
+        return;
+      }
+      this.logger.warn(
+        `warpL2TimeAtLeastTo: mined L2 block at slot ${blockSlot}, expected at least ${effectiveTargetSlot}. ` +
+          `Retrying mineBlock (attempt ${attempt}/${maxAttempts}).`,
+      );
+    }
+    throw new Error(
+      `warpL2TimeAtLeastTo: failed to mine an L2 block at or past slot ${effectiveTargetSlot} after ${maxAttempts} attempts.`,
+    );
   }
 
   /**
@@ -73,13 +113,20 @@ export class CheatCodes {
    * @param node - The Aztec node used to force an empty block to be mined.
    * @param duration - The duration to advance time by (in seconds)
    */
-  async warpL2TimeAtLeastBy(node: AztecNodeDebug, duration: bigint | number) {
+  async warpL2TimeAtLeastBy(node: AztecNode & AztecNodeDebug, duration: bigint | number) {
     if (BigInt(duration) <= 0n) {
       throw new Error(`warpL2TimeAtLeastBy: duration must be positive, got ${duration} seconds.`);
     }
 
-    const currentTimestamp = await this.eth.lastBlockTimestamp();
-    const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
+    // Advance relative to whichever clock leads. A live sequencer mines L2 blocks at slot boundaries that can run
+    // ahead of anvil's L1 timestamp, so basing the target on L1 alone would advance the L2 timestamp by less than
+    // `duration`. Anchoring to the latest L2 block timestamp when it leads guarantees the post-warp L2 block is at
+    // least `duration` ahead of the current one.
+    const currentL1Timestamp = BigInt(await this.eth.lastBlockTimestamp());
+    const latestBlockData = await node.getBlockData('latest');
+    const latestL2Timestamp = latestBlockData ? BigInt(latestBlockData.header.globalVariables.timestamp) : 0n;
+    const baseTimestamp = latestL2Timestamp > currentL1Timestamp ? latestL2Timestamp : currentL1Timestamp;
+    const targetTimestamp = baseTimestamp + BigInt(duration);
     await this.warpL2TimeAtLeastTo(node, targetTimestamp);
   }
 }

package/src/testing/epoch_test_settler.ts

@@ -31,8 +31,7 @@ export class EpochTestSettler {
   }
 
   async handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean> {
-    const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
-    const blocks = checkpointedBlocks.map(b => b.block);
+    const blocks = await this.l2BlockSource.getBlocks({ epoch, onlyCheckpointed: true });
     this.log.info(
       `Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`,
       { blocks: blocks.map(b => b.toBlockInfo()) },
@@ -53,12 +52,12 @@ export class EpochTestSettler {
 
     const outHash = computeEpochOutHash(messagesInEpoch);
     if (!outHash.isZero()) {
-      await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
+      await this.rollupCheatCodes.insertOutbox(epoch, messagesInEpoch.length, outHash.toBigInt());
     } else {
       this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
     }
 
-    const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
+    const lastCheckpoint = blocks.at(-1)?.checkpointNumber;
     if (lastCheckpoint !== undefined) {
       await this.rollupCheatCodes.markAsProven(lastCheckpoint);
     } else {

package/src/testing/index.ts

@@ -1,4 +1,4 @@
-export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { AnvilTestWatcher, type AnvilTestWatcherOpts } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';

package/dest/cli/cmds/start_archiver.d.ts

@@ -1,9 +0,0 @@
-import { type ArchiverConfig } from '@aztec/archiver';
-import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type DataStoreConfig } from '@aztec/kv-store/config';
-export type { ArchiverConfig, DataStoreConfig };
-/** Starts a standalone archiver. */
-export declare function startArchiver(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers): Promise<{
-    config: ArchiverConfig & DataStoreConfig;
-}>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvY21kcy9zdGFydF9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQW9FLE1BQU0saUJBQWlCLENBQUM7QUFJeEgsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFNbEYsWUFBWSxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsQ0FBQztBQUVoRCxvQ0FBb0M7QUFDcEMsd0JBQXNCLGFBQWEsQ0FDakMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsR0FDOUIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUE7Q0FBRSxDQUFDLENBK0J2RCJ9

package/dest/cli/cmds/start_archiver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAoE,MAAM,iBAAiB,CAAC;AAIxH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAMlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CA+BvD"}

package/dest/cli/cmds/start_archiver.js

@@ -1,48 +0,0 @@
-import { archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js/log';
-import { blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
-import { getL1Config } from '@aztec/cli/config';
-import { dataConfigMappings } from '@aztec/kv-store/config';
-import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { extractRelevantOptions } from '../util.js';
-/** Starts a standalone archiver. */ export async function startArchiver(options, signalHandlers, services) {
-    const envConfig = getArchiverConfigFromEnv();
-    const cliOptions = extractRelevantOptions(options, {
-        ...archiverConfigMappings,
-        ...dataConfigMappings,
-        ...blobClientConfigMapping
-    }, 'archiver');
-    let archiverConfig = {
-        ...envConfig,
-        ...cliOptions
-    };
-    archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
-    if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
-        throw new Error('L1 registry address is required to start an Archiver');
-    }
-    const { addresses, config: l1Config } = await getL1Config(archiverConfig.l1Contracts.registryAddress, archiverConfig.l1RpcUrls, archiverConfig.l1ChainId);
-    archiverConfig.l1Contracts = addresses;
-    archiverConfig = {
-        ...archiverConfig,
-        ...l1Config
-    };
-    const telemetry = await initTelemetryClient(getTelemetryClientConfig());
-    const blobClient = createBlobClient(archiverConfig, {
-        logger: createLogger('archiver:blob-client:client')
-    });
-    const archiver = await createArchiver(archiverConfig, {
-        telemetry,
-        blobClient
-    }, {
-        blockUntilSync: true
-    });
-    services.archiver = [
-        archiver,
-        ArchiverApiSchema
-    ];
-    signalHandlers.push(archiver.stop);
-    return {
-        config: archiverConfig
-    };
-}

package/src/cli/cmds/start_archiver.ts

@@ -1,50 +0,0 @@
-import { type ArchiverConfig, archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js/log';
-import { type BlobClientConfig, blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
-import { getL1Config } from '@aztec/cli/config';
-import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
-import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-
-import { extractRelevantOptions } from '../util.js';
-
-export type { ArchiverConfig, DataStoreConfig };
-
-/** Starts a standalone archiver. */
-export async function startArchiver(
-  options: any,
-  signalHandlers: (() => Promise<void>)[],
-  services: NamespacedApiHandlers,
-): Promise<{ config: ArchiverConfig & DataStoreConfig }> {
-  const envConfig = getArchiverConfigFromEnv();
-  const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobClientConfig>(
-    options,
-    { ...archiverConfigMappings, ...dataConfigMappings, ...blobClientConfigMapping },
-    'archiver',
-  );
-
-  let archiverConfig = { ...envConfig, ...cliOptions };
-  archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
-
-  if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
-    throw new Error('L1 registry address is required to start an Archiver');
-  }
-
-  const { addresses, config: l1Config } = await getL1Config(
-    archiverConfig.l1Contracts.registryAddress,
-    archiverConfig.l1RpcUrls,
-    archiverConfig.l1ChainId,
-  );
-
-  archiverConfig.l1Contracts = addresses;
-  archiverConfig = { ...archiverConfig, ...l1Config };
-
-  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
-  const blobClient = createBlobClient(archiverConfig, { logger: createLogger('archiver:blob-client:client') });
-  const archiver = await createArchiver(archiverConfig, { telemetry, blobClient }, { blockUntilSync: true });
-  services.archiver = [archiver, ArchiverApiSchema];
-  signalHandlers.push(archiver.stop);
-
-  return { config: archiverConfig };
-}