@aztec/end-to-end 0.84.0 → 0.85.0

package/src/e2e_token_contract/token_contract_test.ts

@@ -1,6 +1,6 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { type AccountWallet, type AztecNode, type CompleteAddress, type Logger, createLogger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { InvalidAccountContract } from '@aztec/noir-contracts.js/InvalidAccount';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
 import { jest } from '@jest/globals';
@@ -27,7 +27,7 @@ export class TokenContractTest {
   accounts: CompleteAddress[] = [];
   asset!: TokenContract;
   tokenSim!: TokenSimulator;
-  badAccount!: DocsExampleContract;
+  badAccount!: InvalidAccountContract;
   node!: AztecNode;
 
   constructor(testName: string) {
@@ -77,7 +77,7 @@ export class TokenContractTest {
         this.logger.verbose(`Token deployed to ${asset.address}`);
 
         this.logger.verbose(`Deploying bad account...`);
-        this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+        this.badAccount = await InvalidAccountContract.deploy(this.wallets[0]).send().deployed();
         this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
         return { tokenContractAddress: asset.address, badAccountAddress: this.badAccount.address };
@@ -94,7 +94,7 @@ export class TokenContractTest {
           this.accounts.map(a => a.address),
         );
 
-        this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());

package/src/fixtures/fixtures.ts

@@ -18,7 +18,7 @@ export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with
 export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
 export const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): Make these a fixed error after transition.
-export const DUPLICATE_NULLIFIER_ERROR = /dropped|duplicate nullifier|reverted|Nullifier collision/;
+export const DUPLICATE_NULLIFIER_ERROR = /dropped|nullifier|reverted/i;
 export const NO_L1_TO_L2_MSG_ERROR =
   /No non-nullified L1 to L2 message found for message hash|Tried to consume nonexistent L1-to-L2 message/;
 export const STATIC_CALL_STATE_MODIFICATION_ERROR =

package/src/fixtures/snapshot_manager.ts

@@ -414,7 +414,7 @@ async function setupFromFresh(
     {
       l1ChainId: aztecNodeConfig.l1ChainId,
       l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-      rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+      l1Contracts: aztecNodeConfig.l1Contracts,
       port: blobSinkPort,
       dataDirectory: aztecNodeConfig.dataDirectory,
       dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
@@ -537,7 +537,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
     {
       l1ChainId: aztecNodeConfig.l1ChainId,
       l1RpcUrls: aztecNodeConfig.l1RpcUrls,
-      rollupAddress: aztecNodeConfig.l1Contracts.rollupAddress,
+      l1Contracts: aztecNodeConfig.l1Contracts,
       port: blobSinkPort,
       dataDirectory: statePath,
       dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,

package/src/fixtures/utils.ts

@@ -491,7 +491,7 @@ export async function setup(
       {
         l1ChainId: config.l1ChainId,
         l1RpcUrls: config.l1RpcUrls,
-        rollupAddress: config.l1Contracts.rollupAddress,
+        l1Contracts: config.l1Contracts,
         port: blobSinkPort,
         dataDirectory: config.dataDirectory,
         dataStoreMapSizeKB: config.dataStoreMapSizeKB,

package/src/guides/up_quick_start.sh

@@ -4,6 +4,7 @@
 set -eux
 
 export WALLET_DATA_DIRECTORY=$(mktemp -d)/up_quick_start
+export PXE_PROVER="none"
 
 function on_exit {
   echo "Cleaning up $WALLET_DATA_DIRECTORY..."

package/src/shared/capture_private_execution_steps.ts

@@ -22,24 +22,14 @@ 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[],
-  rawWitnesses: boolean = false,
-) {
+async function _createClientIvcProofFiles(directory: string, executionSteps: PrivateExecutionStep[]) {
   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,
   };
 }
 
@@ -51,21 +41,24 @@ export async function capturePrivateExecutionStepsIfEnvSet(
 ) {
   // Not included in env_var.ts as internal to e2e tests.
   const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
-  if (ivcFolder) {
-    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 });
+  if (!ivcFolder) {
+    return;
+  }
+  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 });
+  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 });
+  // Write the client IVC files read by the prover.
+  await _createClientIvcProofFiles(resultsDirectory, result.executionSteps);
+  if (profileMode === 'full') {
+    // If we have gate counts, write the steps in human-readable format.
     await fs.writeFile(
       path.join(resultsDirectory, 'steps.json'),
       JSON.stringify(
@@ -74,7 +67,11 @@ export async function capturePrivateExecutionStepsIfEnvSet(
         2,
       ),
     );
-    await _createClientIvcProofFiles(resultsDirectory, result.executionSteps, profileMode === 'full');
-    logger.info(`Wrote private execution steps to ${resultsDirectory}`);
+    // In full mode, we also write the raw witnesses in a more human-readable format.
+    await fs.writeFile(
+      path.join(resultsDirectory, 'witnesses.json'),
+      JSON.stringify(result.executionSteps.map(step => Object.fromEntries(step.witness))),
+    );
   }
+  logger.info(`Wrote private execution steps to ${resultsDirectory}`);
 }

package/src/shared/cross_chain_test_harness.ts

@@ -232,8 +232,10 @@ export class CrossChainTestHarness {
       address: this.l1TokenManager.tokenAddress.toString(),
       client: this.walletClient,
     });
-    await contract.write.mint([this.ethAccount.toString(), amount]);
-    expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(amount);
+    const balanceBefore = await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString());
+    const hash = await contract.write.mint([this.ethAccount.toString(), amount]);
+    await this.publicClient.waitForTransactionReceipt({ hash });
+    expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(balanceBefore + amount);
   }
 
   getL1BalanceOf(address: EthAddress) {

package/src/spartan/setup_test_wallets.ts

@@ -73,7 +73,8 @@ export async function deployTestWalletWithTokens(
     fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), undefined, logger)),
   );
 
-  // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+  // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
+  await advanceL2Block(node);
   await advanceL2Block(node);
   await advanceL2Block(node);