@aztec/aztec 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/src/{sandbox → local-network}/banana_fpc.ts

@@ -1,12 +1,11 @@
-import { type InitialAccountData, getInitialTestAccounts } from '@aztec/accounts/testing';
-import type { Wallet } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
+import { type InitialAccountData, getInitialTestAccountsData } from '@aztec/accounts/testing';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn } from '@aztec/foundation/log';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type ContractInstanceWithAddress, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { type ContractInstanceWithAddress, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 
 const BANANA_COIN_SALT = new Fr(0);
 const bananaCoinArgs = {
@@ -23,7 +22,7 @@ function getBananaAdmin(initialAccounts: InitialAccountData[]): AztecAddress {
 
 async function getBananaCoinInstance(initialAccounts: InitialAccountData[]): Promise<ContractInstanceWithAddress> {
   const admin = getBananaAdmin(initialAccounts);
-  return await getContractInstanceFromDeployParams(TokenContract.artifact, {
+  return await getContractInstanceFromInstantiationParams(TokenContract.artifact, {
     constructorArgs: [admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal],
     salt: BANANA_COIN_SALT,
   });
@@ -36,7 +35,7 @@ export async function getBananaCoinAddress(initialAccounts: InitialAccountData[]
 async function getBananaFPCInstance(initialAccounts: InitialAccountData[]): Promise<ContractInstanceWithAddress> {
   const bananaCoin = await getBananaCoinAddress(initialAccounts);
   const admin = getBananaAdmin(initialAccounts);
-  return await getContractInstanceFromDeployParams(FPCContract.artifact, {
+  return await getContractInstanceFromInstantiationParams(FPCContract.artifact, {
     constructorArgs: [bananaCoin, admin],
     salt: BANANA_FPC_SALT,
   });
@@ -46,15 +45,15 @@ export async function getBananaFPCAddress(initialAccounts: InitialAccountData[])
   return (await getBananaFPCInstance(initialAccounts)).address;
 }
 
-export async function setupBananaFPC(initialAccounts: InitialAccountData[], deployer: Wallet, log: LogFn) {
+export async function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn) {
   const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
   const admin = getBananaAdmin(initialAccounts);
   const [bananaCoin, fpc] = await Promise.all([
-    TokenContract.deploy(deployer, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal)
-      .send({ contractAddressSalt: BANANA_COIN_SALT, universalDeploy: true })
+    TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal)
+      .send({ from: admin, contractAddressSalt: BANANA_COIN_SALT, universalDeploy: true })
       .deployed(),
-    FPCContract.deploy(deployer, bananaCoinAddress, admin)
-      .send({ contractAddressSalt: BANANA_FPC_SALT, universalDeploy: true })
+    FPCContract.deploy(wallet, bananaCoinAddress, admin)
+      .send({ from: admin, contractAddressSalt: BANANA_FPC_SALT, universalDeploy: true })
       .deployed(),
   ]);
 
@@ -62,22 +61,18 @@ export async function setupBananaFPC(initialAccounts: InitialAccountData[], depl
   log(`FPC: ${fpc.address}`);
 }
 
-export async function getDeployedBananaCoinAddress(pxe: PXE) {
-  const initialAccounts = await getInitialTestAccounts();
-  const bananaCoin = await getBananaCoinAddress(initialAccounts);
-  const contracts = await pxe.getContracts();
-  if (!contracts.find(c => c.equals(bananaCoin))) {
-    throw new Error('BananaCoin not deployed.');
-  }
-  return bananaCoin;
+export async function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet) {
+  const initialAccounts = await getInitialTestAccountsData();
+  const bananaCoin = await getBananaCoinInstance(initialAccounts);
+  // The following is no-op if the contract is already registered
+  await wallet.registerContract(bananaCoin, TokenContract.artifact);
+  return bananaCoin.address;
 }
 
-export async function getDeployedBananaFPCAddress(pxe: PXE) {
-  const initialAccounts = await getInitialTestAccounts();
+export async function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet) {
+  const initialAccounts = await getInitialTestAccountsData();
   const fpc = await getBananaFPCInstance(initialAccounts);
-  const contracts = await pxe.getContracts();
-  if (!contracts.find(c => c.equals(fpc.address))) {
-    throw new Error('BananaFPC not deployed.');
-  }
+  // The following is no-op if the contract is already registered
+  await wallet.registerContract(fpc, FPCContract.artifact);
   return fpc.address;
 }

package/src/local-network/index.ts

@@ -0,0 +1,7 @@
+export * from './local-network.js';
+
+export {
+  registerDeployedBananaCoinInWalletAndGetAddress,
+  registerDeployedBananaFPCInWalletAndGetAddress,
+} from './banana_fpc.js';
+export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';

package/src/local-network/local-network.ts

@@ -0,0 +1,222 @@
+#!/usr/bin/env -S node --no-warnings
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { AztecNodeService } from '@aztec/aztec-node';
+import { type AztecNodeConfig, getConfigEnvVars } from '@aztec/aztec-node/config';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createLogger } from '@aztec/aztec.js/log';
+import { type BlobClientInterface, createBlobClient } from '@aztec/blob-client/client';
+import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { waitForPublicClient } from '@aztec/ethereum/client';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { NULL_KEY } from '@aztec/ethereum/constants';
+import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { EthCheatCodes } from '@aztec/ethereum/test';
+import { SecretValue } from '@aztec/foundation/config';
+import { EthAddress } from '@aztec/foundation/eth-address';
+import type { LogFn } from '@aztec/foundation/log';
+import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
+import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import {
+  type TelemetryClient,
+  getConfigEnvVars as getTelemetryClientConfig,
+  initTelemetryClient,
+} from '@aztec/telemetry-client';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { getGenesisValues } from '@aztec/world-state/testing';
+
+import { type Hex, createPublicClient, fallback, http as httpViemTransport } from 'viem';
+import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
+import { foundry } from 'viem/chains';
+
+import { createAccountLogs } from '../cli/util.js';
+import { DefaultMnemonic } from '../mnemonic.js';
+import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
+import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
+import { getSponsoredFPCAddress } from './sponsored_fpc.js';
+
+const logger = createLogger('local-network');
+
+const localAnvil = foundry;
+
+/**
+ * Function to deploy our L1 contracts to the local network L1
+ * @param aztecNodeConfig - The Aztec Node Config
+ * @param hdAccount - Account for publishing L1 contracts
+ */
+export async function deployContractsToL1(
+  aztecNodeConfig: AztecNodeConfig,
+  privateKey: Hex,
+  opts: {
+    assumeProvenThroughBlockNumber?: number;
+    genesisArchiveRoot?: Fr;
+    feeJuicePortalInitialBalance?: bigint;
+  } = {},
+) {
+  await waitForPublicClient(aztecNodeConfig);
+
+  const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
+    ...getL1ContractsConfigEnvVars(), // TODO: We should not need to be loading config from env again, caller should handle this
+    ...aztecNodeConfig,
+    vkTreeRoot: getVKTreeRoot(),
+    protocolContractsHash,
+    genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
+    feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
+    aztecTargetCommitteeSize: 0, // no committee in local network
+    slasherFlavor: 'none', // no slashing in local network
+    realVerifier: false,
+  });
+
+  aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
+  aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
+
+  return aztecNodeConfig.l1Contracts;
+}
+
+/** Local network settings. */
+export type LocalNetworkConfig = AztecNodeConfig & {
+  /** Mnemonic used to derive the L1 deployer private key.*/
+  l1Mnemonic: string;
+  /** Whether to deploy test accounts on local network start.*/
+  testAccounts: boolean;
+};
+
+/**
+ * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
+ * Does not start any HTTP services nor populate any initial accounts.
+ * @param config - Optional local network settings.
+ */
+export async function createLocalNetwork(config: Partial<LocalNetworkConfig> = {}, userLog: LogFn) {
+  // local network is meant for test envs. We should only need one l1RpcUrl
+  const l1RpcUrl = config.l1RpcUrls?.[0];
+  if (!l1RpcUrl) {
+    throw new Error('An L1 RPC URL is required');
+  }
+  if ((config.l1RpcUrls?.length || 0) > 1) {
+    logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
+  }
+  const aztecNodeConfig: AztecNodeConfig = { ...getConfigEnvVars(), ...config };
+  const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
+  if (
+    aztecNodeConfig.publisherPrivateKeys == undefined ||
+    !aztecNodeConfig.publisherPrivateKeys.length ||
+    aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY
+  ) {
+    const privKey = hdAccount.getHdKey().privateKey;
+    aztecNodeConfig.publisherPrivateKeys = [new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const)];
+  }
+  if (!aztecNodeConfig.validatorPrivateKeys?.getValue().length) {
+    const privKey = hdAccount.getHdKey().privateKey;
+    aztecNodeConfig.validatorPrivateKeys = new SecretValue([`0x${Buffer.from(privKey!).toString('hex')}`]);
+  }
+  aztecNodeConfig.coinbase = EthAddress.fromString(
+    privateKeyToAddress(aztecNodeConfig.validatorPrivateKeys.getValue()[0]),
+  );
+
+  const initialAccounts = await (async () => {
+    if (config.testAccounts === true || config.testAccounts === undefined) {
+      if (aztecNodeConfig.p2pEnabled) {
+        userLog(`Not setting up test accounts as we are connecting to a network`);
+      } else {
+        userLog(`Setting up test accounts`);
+        return await getInitialTestAccountsData();
+      }
+    }
+    return [];
+  })();
+
+  const bananaFPC = await getBananaFPCAddress(initialAccounts);
+  const sponsoredFPC = await getSponsoredFPCAddress();
+  const fundedAddresses = initialAccounts.length
+    ? [...initialAccounts.map(a => a.address), bananaFPC, sponsoredFPC]
+    : [];
+  const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
+
+  let watcher: AnvilTestWatcher | undefined = undefined;
+  const dateProvider = new TestDateProvider();
+  if (!aztecNodeConfig.p2pEnabled) {
+    const l1ContractAddresses = await deployContractsToL1(
+      aztecNodeConfig,
+      aztecNodeConfig.validatorPrivateKeys.getValue()[0],
+      {
+        assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
+        genesisArchiveRoot,
+        feeJuicePortalInitialBalance: fundingNeeded,
+      },
+    );
+
+    const chain =
+      aztecNodeConfig.l1RpcUrls.length > 0
+        ? createEthereumChain([l1RpcUrl], aztecNodeConfig.l1ChainId)
+        : { chainInfo: localAnvil };
+
+    const publicClient = createPublicClient({
+      chain: chain.chainInfo,
+      transport: fallback([httpViemTransport(l1RpcUrl)]) as any,
+    });
+
+    watcher = new AnvilTestWatcher(
+      new EthCheatCodes([l1RpcUrl], dateProvider),
+      l1ContractAddresses.rollupAddress,
+      publicClient,
+      dateProvider,
+    );
+    watcher.setisLocalNetwork(true);
+    await watcher.start();
+  }
+
+  const telemetry = await initTelemetryClient(getTelemetryClientConfig());
+  // Create a local blob client client inside the local network, no http connectivity
+  const blobClient = createBlobClient();
+  const node = await createAztecNode(aztecNodeConfig, { telemetry, blobClient, dateProvider }, { prefilledPublicData });
+
+  if (initialAccounts.length) {
+    const PXEConfig = { proverEnabled: aztecNodeConfig.realProofs };
+    const wallet = await TestWallet.create(node, PXEConfig);
+
+    userLog('Setting up funded test accounts...');
+    const accountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccounts);
+    const accountsWithSecrets = accountManagers.map((manager, i) => ({
+      account: manager,
+      secretKey: initialAccounts[i].secret,
+    }));
+    const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
+    userLog(accLogs.join(''));
+
+    await setupBananaFPC(initialAccounts, wallet, userLog);
+
+    userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
+
+    // We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
+    await wallet.stop();
+  }
+
+  const stop = async () => {
+    await node.stop();
+    await watcher?.stop();
+  };
+
+  return { node, stop };
+}
+
+/**
+ * Create and start a new Aztec RPC HTTP Server
+ * @param config - Optional Aztec node settings.
+ */
+export async function createAztecNode(
+  config: Partial<AztecNodeConfig> = {},
+  deps: { telemetry?: TelemetryClient; blobClient?: BlobClientInterface; dateProvider?: DateProvider } = {},
+  options: { prefilledPublicData?: PublicDataTreeLeaf[] } = {},
+) {
+  // TODO(#12272): will clean this up. This is criminal.
+  const { l1Contracts, ...rest } = getConfigEnvVars();
+  const aztecNodeConfig: AztecNodeConfig = {
+    ...rest,
+    ...config,
+    l1Contracts: { ...l1Contracts, ...config.l1Contracts },
+  };
+  const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
+  return node;
+}

package/src/local-network/sponsored_fpc.ts

@@ -0,0 +1,26 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import {
+  type ContractInstanceWithAddress,
+  getContractInstanceFromInstantiationParams,
+} from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { SPONSORED_FPC_SALT } from '@aztec/constants';
+import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
+
+async function getSponsoredFPCInstance(): Promise<ContractInstanceWithAddress> {
+  return await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+    salt: new Fr(SPONSORED_FPC_SALT),
+  });
+}
+
+export async function getSponsoredFPCAddress(): Promise<AztecAddress> {
+  return (await getSponsoredFPCInstance()).address;
+}
+
+export async function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress> {
+  const fpc = await getSponsoredFPCInstance();
+  // The following is no-op if the contract is already registered
+  await wallet.registerContract(fpc, SponsoredFPCContract.artifact);
+  return fpc.address;
+}

package/src/testing/anvil_test_watcher.ts

@@ -0,0 +1,166 @@
+import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import type { ViemClient } from '@aztec/ethereum/types';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import { type Logger, createLogger } from '@aztec/foundation/log';
+import { RunningPromise } from '@aztec/foundation/running-promise';
+import type { TestDateProvider } from '@aztec/foundation/timer';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+
+import { type GetContractReturnType, getAddress, getContract } from 'viem';
+
+/**
+ * Represents a watcher for a rollup contract.
+ *
+ * It started on a network like anvil where time traveling is allowed, and auto-mine is turned on
+ * it will periodically check if the current slot have already been filled, e.g., there was an L2
+ * block within the slot. And if so, it will time travel into the next slot.
+ */
+export class AnvilTestWatcher {
+  private isLocalNetwork: boolean = false;
+
+  private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
+  private rollupCheatCodes: RollupCheatCodes;
+  private l2SlotDuration!: number;
+
+  private filledRunningPromise?: RunningPromise;
+  private syncDateProviderPromise?: RunningPromise;
+  private markingAsProvenRunningPromise?: RunningPromise;
+
+  private logger: Logger = createLogger(`aztecjs:utils:watcher`);
+
+  private isMarkingAsProven = true;
+
+  constructor(
+    private cheatcodes: EthCheatCodes,
+    rollupAddress: EthAddress,
+    l1Client: ViemClient,
+    private dateProvider?: TestDateProvider,
+  ) {
+    this.rollup = getContract({
+      address: getAddress(rollupAddress.toString()),
+      abi: RollupAbi,
+      client: l1Client,
+    });
+
+    this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
+      rollupAddress,
+    });
+
+    this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
+  }
+
+  setIsMarkingAsProven(isMarkingAsProven: boolean) {
+    this.logger.warn(`Watcher is now ${isMarkingAsProven ? 'marking' : 'not marking'} blocks as proven`);
+    this.isMarkingAsProven = isMarkingAsProven;
+  }
+
+  setisLocalNetwork(isLocalNetwork: boolean) {
+    this.isLocalNetwork = isLocalNetwork;
+  }
+
+  async start() {
+    if (this.filledRunningPromise) {
+      throw new Error('Watcher already watching for filled slot');
+    }
+
+    const config = await this.rollupCheatCodes.getConfig();
+    this.l2SlotDuration = config.slotDuration;
+
+    // If auto mining is not supported (e.g., we are on a real network), then we
+    // will simple do nothing. But if on an anvil or the like, this make sure that
+    // the local network and tests don't break because time is frozen and we never get to
+    // the next slot.
+    const isAutoMining = await this.cheatcodes.isAutoMining();
+
+    if (isAutoMining) {
+      this.filledRunningPromise = new RunningPromise(() => this.warpTimeIfNeeded(), this.logger, 200);
+      this.filledRunningPromise.start();
+      this.syncDateProviderPromise = new RunningPromise(() => this.syncDateProviderToL1IfBehind(), this.logger, 200);
+      this.syncDateProviderPromise.start();
+      this.markingAsProvenRunningPromise = new RunningPromise(() => this.markAsProven(), this.logger, 200);
+      this.markingAsProvenRunningPromise.start();
+      this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
+    } else {
+      this.logger.info(`Watcher not started because not auto mining`);
+    }
+  }
+
+  async stop() {
+    await this.filledRunningPromise?.stop();
+    await this.syncDateProviderPromise?.stop();
+    await this.markingAsProvenRunningPromise?.stop();
+  }
+
+  async trigger() {
+    await this.filledRunningPromise?.trigger();
+    await this.syncDateProviderPromise?.trigger();
+    await this.markingAsProvenRunningPromise?.trigger();
+  }
+
+  async markAsProven() {
+    if (!this.isMarkingAsProven) {
+      return;
+    }
+    await this.rollupCheatCodes.markAsProven();
+  }
+
+  async syncDateProviderToL1IfBehind() {
+    // this doesn't apply to the local network, because we don't have a date provider in the local network
+    if (!this.dateProvider) {
+      return;
+    }
+
+    const l1Time = (await this.cheatcodes.timestamp()) * 1000;
+    const wallTime = this.dateProvider.now();
+    if (l1Time > wallTime) {
+      this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
+      this.dateProvider.setTime(l1Time);
+    } else if (l1Time + Number(this.l2SlotDuration) * 1000 < wallTime) {
+      this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to wall time`);
+      await this.cheatcodes.warp(Math.ceil(wallTime / 1000));
+    }
+  }
+
+  async warpTimeIfNeeded() {
+    try {
+      const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
+      const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
+      const checkpointLog = await this.rollup.read.getCheckpoint([pendingCheckpointNumber]);
+      const nextSlot = SlotNumber(currentSlot + 1);
+      const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([BigInt(nextSlot)]));
+
+      if (BigInt(currentSlot) === checkpointLog.slotNumber) {
+        // We should jump to the next slot
+        try {
+          await this.cheatcodes.warp(nextSlotTimestamp, {
+            resetBlockInterval: true,
+          });
+        } catch (e) {
+          this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+        }
+
+        this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
+        return;
+      }
+
+      // If we are not in local network, we don't need to warp time
+      if (!this.isLocalNetwork) {
+        return;
+      }
+
+      const currentTimestamp = this.dateProvider?.now() ?? Date.now();
+      if (currentTimestamp > nextSlotTimestamp * 1000) {
+        try {
+          await this.cheatcodes.warp(nextSlotTimestamp, { resetBlockInterval: true });
+        } catch (e) {
+          this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+        }
+
+        this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
+      }
+    } catch {
+      this.logger.error('mineIfSlotFilled failed');
+    }
+  }
+}

package/src/testing/cheat_codes.ts

@@ -0,0 +1,79 @@
+import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { retryUntil } from '@aztec/foundation/retry';
+import type { DateProvider } from '@aztec/foundation/timer';
+import type { SequencerClient } from '@aztec/sequencer-client';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+
+/**
+ * A class that provides utility functions for interacting with the chain.
+ * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
+ * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
+ * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
+ */
+export class CheatCodes {
+  constructor(
+    /** Cheat codes for L1.*/
+    public eth: EthCheatCodes,
+    /** Cheat codes for the Aztec Rollup contract on L1. */
+    public rollup: RollupCheatCodes,
+  ) {}
+
+  static async create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): 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);
+  }
+
+  /**
+   * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
+   * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
+   * by the slot number, which advances in fixed intervals.
+   * This is useful for testing time-dependent contract behavior.
+   * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
+   * @param node - The Aztec node used to query if a new block has been mined.
+   * @param targetTimestamp - The target timestamp to warp to (in seconds)
+   */
+  async warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number) {
+    const currentL2BlockNumber: BlockNumber = await node.getBlockNumber();
+
+    // We warp the L1 timestamp
+    await this.eth.warp(targetTimestamp, { resetBlockInterval: true });
+
+    // Wait until an L2 block is mined
+    const sequencer = sequencerClient.getSequencer();
+    const minTxsPerBlock = sequencer.getConfig().minTxsPerBlock;
+    sequencer.updateConfig({ minTxsPerBlock: 0 });
+
+    await retryUntil(
+      async () => {
+        const newL2BlockNumber: BlockNumber = await node.getBlockNumber();
+        return newL2BlockNumber > currentL2BlockNumber;
+      },
+      'new block after warping L2 time',
+      36,
+      1,
+    );
+
+    // Restore original minTxsPerBlock
+    sequencer.updateConfig({ minTxsPerBlock });
+  }
+
+  /**
+   * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
+   * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
+   * number, which advances in fixed intervals.
+   * This is useful for testing time-dependent contract behavior.
+   * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
+   * @param node - The Aztec node used to query if a new block has been mined.
+   * @param duration - The duration to advance time by (in seconds)
+   */
+  async warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number) {
+    const currentTimestamp = await this.eth.timestamp();
+    const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
+    await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
+  }
+}

package/src/testing/index.ts

@@ -0,0 +1,3 @@
+export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+export { CheatCodes } from './cheat_codes.js';

package/dest/cli/chain_l2_config.d.ts

@@ -1,19 +0,0 @@
-export type NetworkNames = 'testnet-ignition';
-export type L2ChainConfig = {
-    l1ChainId: number;
-    ethereumSlotDuration: number;
-    aztecSlotDuration: number;
-    aztecEpochDuration: number;
-    aztecProofSubmissionWindow: number;
-    testAccounts: boolean;
-    p2pEnabled: boolean;
-    p2pBootstrapNodes: string[];
-    registryAddress: string;
-    seqMinTxsPerBlock: number;
-    seqMaxTxsPerBlock: number;
-};
-export declare const testnetIgnitionL2ChainConfig: L2ChainConfig;
-export declare function getBootnodes(networkName: NetworkNames): Promise<any>;
-export declare function getL2ChainConfig(networkName: NetworkNames): Promise<L2ChainConfig | undefined>;
-export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): Promise<void>;
-//# sourceMappingURL=chain_l2_config.d.ts.map

package/dest/cli/chain_l2_config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAY1C,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAQ3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAOpG;AAUD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAgB/E"}