fix: update sandbox setup

Author: LHerskind

yarn-project/aztec.js/package.json

@@ -77,10 +77,12 @@
     "@aztec/circuits.js": "workspace:^",
     "@aztec/ethereum": "workspace:^",
     "@aztec/foundation": "workspace:^",
+    "@aztec/l1-artifacts": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/types": "workspace:^",
     "axios": "^1.7.2",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.0",
+    "viem": "^2.7.15"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",

yarn-project/aztec.js/src/index.ts

@@ -39,6 +39,7 @@ export { ContractDeployer } from './deployment/index.js';
 
 export {
   AztecAddressLike,
+  Watcher,
   CheatCodes,
   EthAddressLike,
   EthCheatCodes,

yarn-project/aztec.js/src/utils/cheat_codes.ts

@@ -54,6 +54,20 @@ export class EthCheatCodes {
     return await (await fetch(this.rpcUrl, content)).json();
   }
 
+  /**
+   * Get the auto mine status of the underlying chain
+   * @returns True if automine is on, false otherwise
+   */
+  public async isAutoMining(): Promise<boolean> {
+    try {
+      const res = await this.rpcCall('anvil_getAutomine', []);
+      return res.result;
+    } catch (err) {
+      this.logger.error(`Calling "anvil_getAutomine" failed with:`, err);
+    }
+    return false;
+  }
+
   /**
    * Get the current blocknumber
    * @returns The current block number

yarn-project/aztec.js/src/utils/index.ts

@@ -5,3 +5,4 @@ export * from './cheat_codes.js';
 export * from './authwit.js';
 export * from './pxe.js';
 export * from './account.js';
+export * from './watcher.js';

yarn-project/end-to-end/src/fixtures/watcher.ts yarn-project/aztec.js/src/utils/watcher.ts

@@ -6,6 +6,9 @@ import { RollupAbi } from '@aztec/l1-artifacts';
 import { type GetContractReturnType, type HttpTransport, type PublicClient, getAddress, getContract } from 'viem';
 import type * as chains from 'viem/chains';
 
+/**
+ * Represents a watcher for a rollup contract. It periodically checks if a slot is filled and mines if necessary.
+ */
 export class Watcher {
   private rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, chains.Chain>>;
 
@@ -27,13 +30,20 @@ export class Watcher {
     this.logger.info(`Watcher created for rollup at ${rollupAddress}`);
   }
 
-  start() {
+  async start() {
     if (this.filledRunningPromise) {
       throw new Error('Watcher already watching for filled slot');
     }
-    this.filledRunningPromise = new RunningPromise(() => this.mineIfSlotFilled(), 1000);
-    this.filledRunningPromise.start();
-    this.logger.info(`Watcher started`);
+
+    const isAutoMining = await this.cheatcodes.isAutoMining();
+
+    if (isAutoMining) {
+      this.filledRunningPromise = new RunningPromise(() => this.mineIfSlotFilled(), 1000);
+      this.filledRunningPromise.start();
+      this.logger.info(`Watcher started`);
+    } else {
+      this.logger.info(`Watcher not started because not auto mining`);
+    }
   }
 
   async stop() {

yarn-project/aztec.js/tsconfig.json

@@ -18,6 +18,9 @@
     {
       "path": "../foundation"
     },
+    {
+      "path": "../l1-artifacts"
+    },
     {
       "path": "../protocol-contracts"
     },

yarn-project/aztec/src/cli/cli.ts

@@ -53,6 +53,7 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
       const { aztecNodeConfig, node, pxe, stop } = await createSandbox({
         enableGas: sandboxOptions.enableGas,
         l1Mnemonic: options.l1Mnemonic,
+        l1RpcUrl: options.l1RpcUrl,
       });
 
       // Deploy test accounts by default

yarn-project/aztec/src/sandbox.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env -S node --no-warnings
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { SignerlessWallet } from '@aztec/aztec.js';
+import { EthCheatCodes, SignerlessWallet, Watcher } from '@aztec/aztec.js';
 import { DefaultMultiCallEntrypoint } from '@aztec/aztec.js/entrypoint';
 import { type AztecNode } from '@aztec/circuit-types';
 import { deployCanonicalAuthRegistry, deployCanonicalKeyRegistry, deployCanonicalL2FeeJuice } from '@aztec/cli/misc';
@@ -166,8 +166,21 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
     aztecNodeConfig.validatorPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   }
 
+  let watcher: Watcher | undefined = undefined;
   if (!aztecNodeConfig.p2pEnabled) {
-    await deployContractsToL1(aztecNodeConfig, hdAccount);
+    const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, hdAccount);
+
+    const chain = aztecNodeConfig.l1RpcUrl
+      ? createEthereumChain(aztecNodeConfig.l1RpcUrl, aztecNodeConfig.l1ChainId)
+      : { chainInfo: localAnvil };
+
+    const publicClient = createPublicClient({
+      chain: chain.chainInfo,
+      transport: httpViemTransport(aztecNodeConfig.l1RpcUrl),
+    });
+
+    watcher = new Watcher(new EthCheatCodes(aztecNodeConfig.l1RpcUrl), l1ContractAddresses.rollupAddress, publicClient);
+    await watcher.start();
   }
 
   const client = await createAndStartTelemetryClient(getTelemetryClientConfig());
@@ -191,6 +204,7 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}) {
   const stop = async () => {
     await pxe.stop();
     await node.stop();
+    await watcher?.stop();
   };
 
   return { node, pxe, aztecNodeConfig, stop };

yarn-project/end-to-end/src/fixtures/index.ts

@@ -1,4 +1,3 @@
 export * from './fixtures.js';
 export * from './logging.js';
 export * from './utils.js';
-export * from './watcher.js';

yarn-project/end-to-end/src/fixtures/snapshot_manager.ts

@@ -15,6 +15,7 @@ import {
   type PXE,
   SignerlessWallet,
   type Wallet,
+  Watcher,
 } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
 import { DefaultMultiCallEntrypoint } from '@aztec/aztec.js/entrypoint';
@@ -41,7 +42,6 @@ import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
 import { setupL1Contracts } from './setup_l1_contracts.js';
 import { deployCanonicalAuthRegistry, deployCanonicalKeyRegistry, getPrivateKeyFromIndex } from './utils.js';
-import { Watcher } from './watcher.js';
 
 export type SubsystemsContext = {
   anvil: Anvil;
@@ -346,7 +346,7 @@ async function setupFromFresh(
     deployL1ContractsValues.l1ContractAddresses.rollupAddress,
     deployL1ContractsValues.publicClient,
   );
-  watcher.start();
+  await watcher.start();
 
   logger.verbose('Creating pxe...');
   const pxeConfig = getPXEServiceConfig();
@@ -424,7 +424,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
     aztecNodeConfig.l1Contracts.rollupAddress,
     publicClient,
   );
-  watcher.start();
+  await watcher.start();
 
   logger.verbose('Creating aztec node...');
   const telemetry = await createAndStartTelemetryClient(getTelemetryConfig());

yarn-project/end-to-end/src/fixtures/utils.ts

@@ -19,6 +19,7 @@ import {
   type SentTx,
   SignerlessWallet,
   type Wallet,
+  Watcher,
   createAztecNodeClient,
   createDebugLogger,
   createPXEClient,
@@ -87,7 +88,6 @@ import { MNEMONIC } from './fixtures.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
 import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
-import { Watcher } from './watcher.js';
 
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 
@@ -456,10 +456,7 @@ export async function setup(
     deployL1ContractsValues.publicClient,
   );
 
-  // If we are NOT using wall time, we should start the watcher to jump in time as needed.
-  if (!opts.l1BlockTime) {
-    watcher.start();
-  }
+  await watcher.start();
 
   const wallets = numberOfAccounts > 0 ? await createAccounts(pxe, numberOfAccounts) : [];
   const cheatCodes = CheatCodes.create(config.l1RpcUrl, pxe!);

yarn-project/yarn.lock

@@ -186,6 +186,7 @@ __metadata:
     "@aztec/circuits.js": "workspace:^"
     "@aztec/ethereum": "workspace:^"
     "@aztec/foundation": "workspace:^"
+    "@aztec/l1-artifacts": "workspace:^"
     "@aztec/protocol-contracts": "workspace:^"
     "@aztec/types": "workspace:^"
     "@jest/globals": ^29.5.0
@@ -204,6 +205,7 @@ __metadata:
     tslib: ^2.4.0
     typescript: ^5.0.4
     util: ^0.12.5
+    viem: ^2.7.15
     webpack: ^5.88.2
     webpack-cli: ^5.1.4
   languageName: unknown