@aztec/end-to-end 0.78.1 → 0.80.0

package/src/fixtures/snapshot_manager.ts

@@ -2,23 +2,25 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { type InitialAccountData, deployFundedSchnorrAccounts, generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import {
-  AnvilTestWatcher,
   type AztecAddress,
   BatchCall,
-  type Capsule,
-  CheatCodes,
   type CompleteAddress,
   type ContractFunctionInteraction,
-  type DeployL1ContractsReturnType,
-  type FunctionCall,
   type Logger,
   type PXE,
   type Wallet,
   getContractClassFromArtifact,
 } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
+import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
 import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/server';
-import { type DeployL1ContractsArgs, createL1Clients, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
+import {
+  type DeployL1ContractsArgs,
+  type DeployL1ContractsReturnType,
+  createL1Clients,
+  getL1ContractsConfigEnvVars,
+  l1Artifacts,
+} from '@aztec/ethereum';
 import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { asyncMap } from '@aztec/foundation/async-map';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -306,16 +308,6 @@ async function setupFromFresh(
   }
   aztecNodeConfig.blobSinkUrl = `http://localhost:${blobSinkPort}`;
 
-  // Setup blob sink service
-  const blobSink = await createBlobSinkServer({
-    port: blobSinkPort,
-    dataStoreConfig: {
-      dataDirectory: aztecNodeConfig.dataDirectory,
-      dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
-    },
-  });
-  await blobSink.start();
-
   // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
   logger.verbose('Starting anvil...');
   const res = await startAnvil({ l1BlockTime: opts.ethereumSlotDuration });
@@ -401,6 +393,22 @@ async function setupFromFresh(
 
   const telemetry = getEndToEndTestTelemetryClient(opts.metricsPort);
 
+  // Setup blob sink service
+  const blobSink = await createBlobSinkServer(
+    {
+      l1ChainId: aztecNodeConfig.l1ChainId,
+      l1RpcUrls: aztecNodeConfig.l1RpcUrls,
+      rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+      port: blobSinkPort,
+      dataStoreConfig: {
+        dataDirectory: aztecNodeConfig.dataDirectory,
+        dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
+      },
+    },
+    telemetry,
+  );
+  await blobSink.start();
+
   logger.verbose('Creating and synching an aztec node...');
   const dateProvider = new TestDateProvider();
   const aztecNode = await AztecNodeService.createAndSync(
@@ -475,15 +483,6 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
     JSON.parse(readFileSync(`${statePath}/accounts.json`, 'utf-8'), reviver) || [];
   const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
 
-  const blobSink = await createBlobSinkServer({
-    port: blobSinkPort,
-    dataStoreConfig: {
-      dataDirectory: statePath,
-      dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
-    },
-  });
-  await blobSink.start();
-
   // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
   const { anvil, rpcUrl } = await startAnvil();
   aztecNodeConfig.l1RpcUrls = [rpcUrl];
@@ -515,9 +514,24 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
   );
   await watcher.start();
 
-  logger.verbose('Creating aztec node...');
   const telemetry = initTelemetryClient(getTelemetryConfig());
   const dateProvider = new TestDateProvider();
+  const blobSink = await createBlobSinkServer(
+    {
+      l1ChainId: aztecNodeConfig.l1ChainId,
+      l1RpcUrls: aztecNodeConfig.l1RpcUrls,
+      rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+      port: blobSinkPort,
+      dataStoreConfig: {
+        dataDirectory: statePath,
+        dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
+      },
+    },
+    telemetry,
+  );
+  await blobSink.start();
+
+  logger.verbose('Creating aztec node...');
   const aztecNode = await AztecNodeService.createAndSync(
     aztecNodeConfig,
     { telemetry, dateProvider },
@@ -604,14 +618,12 @@ export async function publicDeployAccounts(
   const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
   const alreadyRegistered = (await sender.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered;
 
-  const fns: ContractFunctionInteraction[] = await Promise.all([
+  const calls: ContractFunctionInteraction[] = await Promise.all([
     ...(!alreadyRegistered ? [registerContractClass(sender, SchnorrAccountContractArtifact)] : []),
     ...instances.map(instance => deployInstance(sender, instance!)),
   ]);
-  const calls: FunctionCall[] = await Promise.all(fns.map(fn => fn.request()));
-  const capsules: Capsule[] = fns.map(fn => fn.getCapsules()).flat();
 
   const batch = new BatchCall(sender, calls);
-  batch.addCapsules(capsules);
+
   await batch.send().wait({ proven: waitUntilProven });
 }

package/src/fixtures/utils.ts

@@ -10,13 +10,10 @@ import { type Archiver, createArchiver } from '@aztec/archiver';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import {
   type AccountWalletWithSecretKey,
-  AnvilTestWatcher,
   type AztecAddress,
   type AztecNode,
   BatchCall,
-  CheatCodes,
   type ContractMethod,
-  type DeployL1ContractsReturnType,
   FeeJuicePaymentMethod,
   type Logger,
   type PXE,
@@ -25,20 +22,22 @@ import {
   createAztecNodeClient,
   createLogger,
   createPXEClient,
-  deployL1Contracts,
   makeFetch,
   waitForPXE,
 } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
+import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
 import type { BBNativePrivateKernelProver } from '@aztec/bb-prover';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/server';
 import { FEE_JUICE_INITIAL_MINT, GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH } from '@aztec/constants';
 import {
   type DeployL1ContractsArgs,
+  type DeployL1ContractsReturnType,
   ForwarderContract,
   NULL_KEY,
   createL1Clients,
+  deployL1Contracts,
   getL1ContractsConfigEnvVars,
   isAnvilTestChain,
   l1Artifacts,
@@ -408,12 +407,6 @@ export async function setup(
     return await setupWithRemoteEnvironment(publisherHdAccount!, config, logger, numberOfAccounts);
   }
 
-  // Blob sink service - blobs get posted here and served from here
-  const blobSinkPort = await getPort();
-  const blobSink = await createBlobSinkServer({ port: blobSinkPort });
-  await blobSink.start();
-  config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
-
   const initialFundedAccounts =
     opts.initialFundedAccounts ??
     (await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts));
@@ -475,6 +468,22 @@ export async function setup(
 
   await watcher.start();
 
+  const telemetry = getTelemetryClient(opts.telemetryConfig);
+
+  // Blob sink service - blobs get posted here and served from here
+  const blobSinkPort = await getPort();
+  const blobSink = await createBlobSinkServer(
+    {
+      l1ChainId: config.l1ChainId,
+      l1RpcUrls: config.l1RpcUrls,
+      rollupAddress: config.l1Contracts.rollupAddress,
+      port: blobSinkPort,
+    },
+    telemetry,
+  );
+  await blobSink.start();
+  config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
+
   logger.verbose('Creating and synching an aztec node...');
 
   const acvmConfig = await getACVMConfig(logger);
@@ -490,8 +499,6 @@ export async function setup(
   }
   config.l1PublishRetryIntervalMS = 100;
 
-  const telemetry = getTelemetryClient(opts.telemetryConfig);
-
   const blobSinkClient = createBlobSinkClient(config);
   const aztecNode = await AztecNodeService.createAndSync(
     config,
@@ -628,10 +635,8 @@ export async function ensureAccountsPubliclyDeployed(sender: Wallet, accountsToD
   if (!(await sender.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
     await (await registerContractClass(sender, SchnorrAccountContractArtifact)).send().wait();
   }
-  const requests = await Promise.all(
-    instances.map(async instance => (await deployInstance(sender, instance!)).request()),
-  );
-  const batch = new BatchCall(sender, [...requests]);
+  const requests = await Promise.all(instances.map(async instance => await deployInstance(sender, instance!)));
+  const batch = new BatchCall(sender, requests);
   await batch.send().wait();
 }
 // docs:end:public_deploy_accounts

package/src/sample-dapp/deploy.mjs

@@ -2,7 +2,9 @@
 import { getInitialTestAccountsWallets } from '@aztec/accounts/testing';
 import { Contract, createPXEClient, loadContractArtifact, waitForPXE } from '@aztec/aztec.js';
 // docs:end:deploy-imports
+// docs:start:import_artifact
 import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+// docs:end:import_artifact
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
 import { writeFileSync } from 'fs';

package/src/shared/cross_chain_test_harness.ts

@@ -15,10 +15,14 @@ import {
   type SiblingPath,
   type TxReceipt,
   type Wallet,
-  deployL1Contract,
   retryUntil,
 } from '@aztec/aztec.js';
-import type { L1ContractAddresses, ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import {
+  type L1ContractAddresses,
+  type ViemPublicClient,
+  type ViemWalletClient,
+  deployL1Contract,
+} from '@aztec/ethereum';
 import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';

package/src/shared/uniswap_l1_l2.ts

@@ -2,7 +2,6 @@ import {
   type AccountWallet,
   AztecAddress,
   type AztecNode,
-  type CheatCodes,
   EthAddress,
   Fr,
   type Logger,
@@ -10,6 +9,7 @@ import {
   computeAuthWitMessageHash,
   generateClaimSecret,
 } from '@aztec/aztec.js';
+import { CheatCodes } from '@aztec/aztec.js/testing';
 import {
   type DeployL1ContractsReturnType,
   type ViemPublicClient,

package/src/simulators/lending_simulator.ts

@@ -1,5 +1,6 @@
 // Convenience struct to hold an account's address and secret that can easily be passed around.
-import { AztecAddress, type CheatCodes, Fr } from '@aztec/aztec.js';
+import { AztecAddress, Fr } from '@aztec/aztec.js';
+import { CheatCodes } from '@aztec/aztec.js/testing';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import type { TestDateProvider } from '@aztec/foundation/timer';
 import type { RollupAbi } from '@aztec/l1-artifacts';

package/src/simulators/token_simulator.ts

@@ -97,10 +97,10 @@ export class TokenSimulator {
 
   async checkPublic() {
     // public calls
-    const calls = [await this.token.methods.total_supply().request()];
-    for (const address of this.accounts) {
-      calls.push(await this.token.methods.balance_of_public(address).request());
-    }
+    const calls = [
+      this.token.methods.total_supply(),
+      ...this.accounts.map(address => this.token.methods.balance_of_public(address)),
+    ];
 
     const results = (
       await Promise.all(chunk(calls, 4).map(batch => new BatchCall(this.defaultWallet, batch).simulate()))
@@ -126,10 +126,7 @@ export class TokenSimulator {
       }
     }
 
-    const defaultCalls = [];
-    for (const address of defaultLookups) {
-      defaultCalls.push(await this.token.methods.balance_of_private(address).request());
-    }
+    const defaultCalls = defaultLookups.map(address => this.token.methods.balance_of_private(address));
     const results = (
       await Promise.all(chunk(defaultCalls, 4).map(batch => new BatchCall(this.defaultWallet, batch).simulate()))
     ).flat();

package/src/spartan/setup_test_wallets.ts

@@ -50,7 +50,7 @@ export async function setupTestWalletsWithTokens(
 export async function deployTestWalletWithTokens(
   pxeUrl: string,
   nodeUrl: string,
-  l1RpcUrl: string,
+  l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
   mintAmount: bigint,
   logger: Logger,
@@ -71,7 +71,7 @@ export async function deployTestWalletWithTokens(
 
   const claims = await Promise.all(
     fundedAccounts.map(a =>
-      bridgeL1FeeJuice(l1RpcUrl, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger),
+      bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger),
     ),
   );
 
@@ -97,7 +97,7 @@ export async function deployTestWalletWithTokens(
 }
 
 async function bridgeL1FeeJuice(
-  l1RpcUrl: string,
+  l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
   pxe: PXE,
   recipient: AztecAddress,
@@ -105,7 +105,7 @@ async function bridgeL1FeeJuice(
   log: Logger,
 ) {
   const { l1ChainId } = await pxe.getNodeInfo();
-  const chain = createEthereumChain([l1RpcUrl], l1ChainId);
+  const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
   const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);

package/src/spartan/utils.ts

@@ -1,5 +1,5 @@
 import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js';
-import type { RollupCheatCodes } from '@aztec/aztec.js/ethereum';
+import type { RollupCheatCodes } from '@aztec/aztec.js/testing';
 import type { Logger } from '@aztec/foundation/log';
 import type { SequencerConfig } from '@aztec/sequencer-client';
 
@@ -86,6 +86,49 @@ export function setupEnvironment(env: unknown): EnvConfig {
   return config;
 }
 
+/**
+ * @param path - The path to the script, relative to the project root
+ * @param args - The arguments to pass to the script
+ * @param logger - The logger to use
+ * @returns The exit code of the script
+ */
+function runScript(path: string, args: string[], logger: Logger, env?: Record<string, string>) {
+  const childProcess = spawn(path, args, {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env: env ? { ...process.env, ...env } : process.env,
+  });
+  return new Promise<number>((resolve, reject) => {
+    childProcess.on('close', (code: number | null) => resolve(code ?? 0));
+    childProcess.on('error', reject);
+    childProcess.stdout?.on('data', (data: Buffer) => {
+      logger.info(data.toString());
+    });
+    childProcess.stderr?.on('data', (data: Buffer) => {
+      logger.error(data.toString());
+    });
+  });
+}
+
+export function getAztecBin() {
+  return path.join(getGitProjectRoot(), 'yarn-project/aztec/dest/bin/index.js');
+}
+
+/**
+ * Runs the Aztec binary
+ * @param args - The arguments to pass to the Aztec binary
+ * @param logger - The logger to use
+ * @param env - Optional environment variables to set for the process
+ * @returns The exit code of the Aztec binary
+ */
+export function runAztecBin(args: string[], logger: Logger, env?: Record<string, string>) {
+  return runScript('node', [getAztecBin(), ...args], logger, env);
+}
+
+export function runProjectScript(script: string, args: string[], logger: Logger, env?: Record<string, string>) {
+  const scriptPath = script.startsWith('/') ? script : path.join(getGitProjectRoot(), script);
+  return runScript(scriptPath, args, logger, env);
+}
+
 export async function startPortForward({
   resource,
   namespace,
@@ -128,7 +171,6 @@ export async function startPortForward({
         }
         const portNumber = parseInt(str.slice(port + 1));
         logger.info(`Port forward connected: ${portNumber}`);
-        logger.info(`Port forward connected: ${portNumber}`);
         resolve(portNumber);
       } else {
         logger.silent(str);
@@ -580,3 +622,19 @@ export async function rollAztecPods(namespace: string) {
   await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=validator' });
   await waitForResourceByLabel({ resource: 'pods', namespace: namespace, label: 'app=pxe' });
 }
+
+/**
+ * Returns the absolute path to the git repository root
+ */
+export function getGitProjectRoot(): string {
+  try {
+    const rootDir = execSync('git rev-parse --show-toplevel', {
+      encoding: 'utf-8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+
+    return rootDir;
+  } catch (error) {
+    throw new Error(`Failed to determine git project root: ${error}`);
+  }
+}