@aztec/end-to-end 0.82.2 → 0.82.3-nightly.20250403

package/src/shared/capture_private_execution_steps.ts

@@ -2,7 +2,12 @@
  * This module exposes the ability to capture the private exection steps that go into our "Client IVC" prover.
  * These are used for debugging and benchmarking barretenberg (the prover component).
  */
-import type { ContractFunctionInteraction } from '@aztec/aztec.js/contracts';
+import type {
+  ContractFunctionInteraction,
+  DeployMethod,
+  DeployOptions,
+  ProfileMethodOptions,
+} from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/foundation/log';
 import { serializeWitness } from '@aztec/noir-noirc_abi';
 import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
@@ -17,27 +22,59 @@ const logger = createLogger('e2e:capture-private-execution-steps');
 // Longer term we won't use this hacked together msgpack format
 // Leaving duplicated as this eventually bb will provide a serialization
 // helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory: string, executionSteps: PrivateExecutionStep[]) {
+async function _createClientIvcProofFiles(
+  directory: string,
+  executionSteps: PrivateExecutionStep[],
+  rawWitnesses: boolean = false,
+) {
   const acirPath = path.join(directory, 'acir.msgpack');
   const witnessPath = path.join(directory, 'witnesses.msgpack');
   await fs.writeFile(acirPath, encode(executionSteps.map(map => map.bytecode)));
   await fs.writeFile(witnessPath, encode(executionSteps.map(map => serializeWitness(map.witness))));
+  let rawWitnessesPath;
+  if (rawWitnesses) {
+    rawWitnessesPath = path.join(directory, 'witnesses.json');
+    await fs.writeFile(rawWitnessesPath, JSON.stringify(executionSteps.map(step => Object.fromEntries(step.witness))));
+  }
   return {
     acirPath,
     witnessPath,
+    rawWitnessesPath,
   };
 }
 
-export async function capturePrivateExecutionStepsIfEnvSet(label: string, interaction: ContractFunctionInteraction) {
+export async function capturePrivateExecutionStepsIfEnvSet(
+  label: string,
+  interaction: ContractFunctionInteraction | DeployMethod,
+  opts?: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>,
+  expectedSteps?: number,
+) {
   // Not included in env_var.ts as internal to e2e tests.
   const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
   if (ivcFolder) {
-    logger.info(`Capturing client ivc execution steps for ${label}`);
-    const result = await interaction.profile({ profileMode: 'execution-steps' });
+    const profileMode = ['execution-steps', 'full'].includes(process.env.PROFILE_MODE ?? '')
+      ? (process.env.PROFILE_MODE as 'full' | 'execution-steps')
+      : 'execution-steps';
+    logger.info(`Capturing client ivc execution profile for ${label} in mode ${profileMode}`);
+    const result = await interaction.profile({
+      ...opts,
+      profileMode: profileMode,
+    });
+    if (expectedSteps !== undefined && result.executionSteps.length !== expectedSteps) {
+      throw new Error(`Expected ${expectedSteps} execution steps, got ${result.executionSteps.length}`);
+    }
     const resultsDirectory = path.join(ivcFolder, label);
     logger.info(`Writing private execution steps to ${resultsDirectory}`);
     await fs.mkdir(resultsDirectory, { recursive: true });
-    await _createClientIvcProofFiles(resultsDirectory, result.executionSteps);
+    await fs.writeFile(
+      path.join(resultsDirectory, 'steps.json'),
+      JSON.stringify(
+        result.executionSteps.map(step => ({ fnName: step.functionName, gateCount: step.gateCount })),
+        null,
+        2,
+      ),
+    );
+    await _createClientIvcProofFiles(resultsDirectory, result.executionSteps, profileMode === 'full');
     logger.info(`Wrote private execution steps to ${resultsDirectory}`);
   }
 }

package/src/shared/cross_chain_test_harness.ts

@@ -121,6 +121,17 @@ export async function deployAndInitializeTokenAndBridgeContracts(
 }
 // docs:end:deployAndInitializeTokenAndBridgeContracts
 
+export type CrossChainContext = {
+  l2Token: AztecAddress;
+  l2Bridge: AztecAddress;
+  tokenPortal: EthAddress;
+  underlying: EthAddress;
+  ethAccount: EthAddress;
+  ownerAddress: AztecAddress;
+  inbox: EthAddress;
+  outbox: EthAddress;
+};
+
 /**
  * A Class for testing cross chain interactions, contains common interactions
  * shared between cross chain tests.
@@ -314,8 +325,8 @@ export class CrossChainTestHarness {
     expect(balance).toBe(expectedBalance);
   }
 
-  getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1: EthAddress = EthAddress.ZERO): Fr {
-    return this.l1TokenPortalManager.getL2ToL1MessageLeaf(
+  async getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1: EthAddress = EthAddress.ZERO): Promise<Fr> {
+    return await this.l1TokenPortalManager.getL2ToL1MessageLeaf(
       withdrawAmount,
       this.ethAccount,
       this.l2Bridge.address,
@@ -363,5 +374,18 @@ export class CrossChainTestHarness {
     await this.mintTokensPublicOnL2(0n);
     await this.mintTokensPublicOnL2(0n);
   }
+
+  toCrossChainContext(): CrossChainContext {
+    return {
+      l2Token: this.l2Token.address,
+      l2Bridge: this.l2Bridge.address,
+      tokenPortal: this.tokenPortalAddress,
+      underlying: this.underlyingERC20Address,
+      ethAccount: this.ethAccount,
+      ownerAddress: this.ownerAddress,
+      inbox: this.l1ContractAddresses.inboxAddress,
+      outbox: this.l1ContractAddresses.outboxAddress,
+    };
+  }
 }
 // docs:end:cross_chain_test_harness

package/src/shared/uniswap_l1_l2.ts

@@ -101,7 +101,7 @@ export const uniswapL1L2TestSuite = (
     const minimumOutputAmount = 0n;
 
     let cheatCodes: CheatCodes;
-
+    let version: number;
     beforeAll(async () => {
       ({
         aztecNode,
@@ -123,7 +123,7 @@ export const uniswapL1L2TestSuite = (
         deployL1ContractsValues.publicClient,
         deployL1ContractsValues.l1ContractAddresses.rollupAddress,
       );
-
+      version = Number(await rollup.getVersion());
       ownerAddress = ownerWallet.getAddress();
       // sponsorAddress = sponsorWallet.getAddress();
       ownerEthAddress = EthAddress.fromString((await walletClient.getAddresses())[0]);
@@ -261,7 +261,7 @@ export const uniswapL1L2TestSuite = (
 
       const swapPrivateLeaf = sha256ToField([
         uniswapL2Contract.address,
-        new Fr(1), // aztec version
+        new Fr(version), // aztec version
         EthAddress.fromString(uniswapPortal.address).toBuffer32(),
         new Fr(publicClient.chain.id), // chain id
         swapPrivateContent,
@@ -276,7 +276,7 @@ export const uniswapL1L2TestSuite = (
 
       const withdrawLeaf = sha256ToField([
         wethCrossChainHarness.l2Bridge.address,
-        new Fr(1), // aztec version
+        new Fr(version), // aztec version
         wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
         new Fr(publicClient.chain.id), // chain id
         withdrawContent,
@@ -849,7 +849,7 @@ export const uniswapL1L2TestSuite = (
 
       const swapPrivateLeaf = sha256ToField([
         uniswapL2Contract.address,
-        new Fr(1), // aztec version
+        new Fr(version), // aztec version
         EthAddress.fromString(uniswapPortal.address).toBuffer32(),
         new Fr(publicClient.chain.id), // chain id
         swapPrivateContent,
@@ -864,7 +864,7 @@ export const uniswapL1L2TestSuite = (
 
       const withdrawLeaf = sha256ToField([
         wethCrossChainHarness.l2Bridge.address,
-        new Fr(1), // aztec version
+        new Fr(version), // aztec version
         wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
         new Fr(publicClient.chain.id), // chain id
         withdrawContent,
@@ -979,7 +979,7 @@ export const uniswapL1L2TestSuite = (
 
       const swapPublicLeaf = sha256ToField([
         uniswapL2Contract.address,
-        new Fr(1), // aztec version
+        new Fr(version), // aztec version
         EthAddress.fromString(uniswapPortal.address).toBuffer32(),
         new Fr(publicClient.chain.id), // chain id
         swapPublicContent,
@@ -994,7 +994,7 @@ export const uniswapL1L2TestSuite = (
 
       const withdrawLeaf = sha256ToField([
         wethCrossChainHarness.l2Bridge.address,
-        new Fr(1), // aztec version
+        new Fr(version), // aztec version
         wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
         new Fr(publicClient.chain.id), // chain id
         withdrawContent,