@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.5476d83

package/dest/bench/utils.js

@@ -1,12 +1,8 @@
-import { BatchCall, INITIAL_L2_BLOCK_NUM } from '@aztec/aztec.js';
-import { mean, stdDev, timesParallel } from '@aztec/foundation/collection';
-import { randomInt } from '@aztec/foundation/crypto';
-import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking';
-import { createPXEService } from '@aztec/pxe/server';
-import { writeFileSync } from 'fs';
-import { mkdirpSync } from 'fs-extra';
-import { globSync } from 'glob';
-import { join } from 'path';
+import { BatchCall } from '@aztec/aztec.js/contracts';
+import { mean, stdDev, times } from '@aztec/foundation/collection';
+import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
+import { mkdirSync, writeFileSync } from 'fs';
+import path from 'path';
 import { setup } from '../fixtures/utils.js';
 /**
  * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
@@ -17,7 +13,10 @@ import { setup } from '../fixtures/utils.js';
             benchmark: true
         }
     });
-    const contract = await BenchmarkingContract.deploy(context.wallet).send().deployed();
+    const defaultAccountAddress = context.accounts[0];
+    const contract = await BenchmarkingContract.deploy(context.wallet).send({
+        from: defaultAccountAddress
+    }).deployed();
     context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
     const sequencer = context.aztecNode.getSequencer();
     const telemetry = context.telemetryClient;
@@ -28,7 +27,13 @@ import { setup } from '../fixtures/utils.js';
         await telemetry.flush();
         const data = telemetry.getMeters();
         const formatted = formatMetricsForGithubBenchmarkAction(data, opts.metrics);
+        if (formatted.length === 0) {
+            throw new Error(`No benchmark data generated. Please review your test setup.`);
+        }
         const benchOutput = opts.benchOutput ?? process.env.BENCH_OUTPUT ?? 'bench.json';
+        mkdirSync(path.dirname(benchOutput), {
+            recursive: true
+        });
         writeFileSync(benchOutput, JSON.stringify(formatted));
         context.logger.info(`Wrote ${data.length} metrics to ${benchOutput}`);
         await origTeardown();
@@ -76,28 +81,6 @@ function getMetricValues(points) {
         };
     }
 }
-/**
- * Creates and returns a directory with the current job name and a random number.
- * @param index - Index to merge into the dir path.
- * @returns A path to a created dir.
- */ export function makeDataDirectory(index) {
-    const testName = expect.getState().currentTestName.split(' ')[0].replaceAll('/', '_');
-    const db = join('data', testName, index.toString(), `${randomInt(99)}`);
-    mkdirpSync(db);
-    return db;
-}
-/**
- * Returns the size in disk of a folder.
- * @param path - Path to the folder.
- * @returns Size in bytes.
- */ export function getFolderSize(path) {
-    return globSync('**', {
-        stat: true,
-        cwd: path,
-        nodir: true,
-        withFileTypes: true
-    }).reduce((accum, file)=>accum + file.size, 0);
-}
 /**
  * Returns a call to the benchmark contract. Each call has a private execution (account entrypoint),
  * a nested private call (create_note), a public call (increment_balance), and a nested public
@@ -108,17 +91,16 @@ function getMetricValues(points) {
  * @param contract - Benchmarking contract.
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns A BatchCall instance.
- */ export async function makeCall(index, context, contract, heavyPublicCompute) {
-    const owner = context.wallet.getAddress();
-    const sender = owner;
+ */ function makeCall(index, context, contract, heavyPublicCompute) {
+    const [owner] = context.accounts;
     if (heavyPublicCompute) {
         return new BatchCall(context.wallet, [
-            await contract.methods.sha256_hash_2048(randomBytesAsBigInts(2048)).request()
+            contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))
         ]);
     } else {
         return new BatchCall(context.wallet, [
-            await contract.methods.create_note(owner, sender, index + 1).request(),
-            await contract.methods.increment_balance(owner, index + 1).request()
+            contract.methods.create_note(owner, index + 1),
+            contract.methods.increment_balance(owner, index + 1)
         ]);
     }
 }
@@ -130,42 +112,20 @@ function getMetricValues(points) {
  * @param contract - Target contract.
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns Array of sent txs.
- */ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
-    const calls = await timesParallel(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
+ */ export function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
+    const calls = times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
     context.logger.info(`Creating ${txCount} txs`);
-    const provenTxs = await Promise.all(calls.map((call)=>call.prove({
-            skipPublicSimulation: true
-        })));
+    const [from] = context.accounts;
     context.logger.info(`Sending ${txCount} txs`);
-    return provenTxs.map((tx)=>tx.send());
+    return calls.map((call)=>call.send({
+            from
+        }));
 }
 export async function waitTxs(txs, context, txWaitOpts) {
     context.logger.info(`Awaiting ${txs.length} txs to be mined`);
     await Promise.all(txs.map((tx)=>tx.wait(txWaitOpts)));
     context.logger.info(`All ${txs.length} txs have been mined`);
 }
-/**
- * Creates a new PXE
- * @param node - Node to connect the pxe to.
- * @param contract - Benchmark contract to add to the pxe.
- * @param startingBlock - First l2 block to process.
- * @returns The new PXE.
- */ export async function createNewPXE(node, contract, startingBlock = INITIAL_L2_BLOCK_NUM) {
-    const l1Contracts = await node.getL1ContractAddresses();
-    const { l1ChainId, protocolVersion } = await node.getNodeInfo();
-    const pxeConfig = {
-        l2StartingBlock: startingBlock,
-        l2BlockPollingIntervalMS: 100,
-        dataDirectory: undefined,
-        dataStoreMapSizeKB: 1024 * 1024,
-        l1Contracts,
-        l1ChainId,
-        version: protocolVersion
-    };
-    const pxe = await createPXEService(node, pxeConfig);
-    await pxe.registerContract(contract);
-    return pxe;
-}
 function randomBytesAsBigInts(length) {
     return [
         ...Array(length)

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts

@@ -1,6 +1,13 @@
-import { type AccountWallet, type CompleteAddress, Fr, type Logger, type TxHash } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { TxHash } from '@aztec/aztec.js/tx';
+import type { CheatCodes } from '@aztec/aztec/testing';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
+import type { SequencerClient } from '@aztec/sequencer-client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class Role {
@@ -17,20 +24,21 @@ export declare class Role {
     };
 }
 export declare class BlacklistTokenContractTest {
-    #private;
-    static DELAY: number;
+    static CHANGE_ROLES_DELAY: number;
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
-    accounts: CompleteAddress[];
+    wallet: TestWallet;
     asset: TokenBlacklistContract;
     tokenSim: TokenSimulator;
-    badAccount: DocsExampleContract;
-    admin: AccountWallet;
-    other: AccountWallet;
-    blacklisted: AccountWallet;
+    badAccount: InvalidAccountContract;
+    cheatCodes: CheatCodes;
+    sequencer: SequencerClient;
+    aztecNode: AztecNode;
+    adminAddress: AztecAddress;
+    otherAddress: AztecAddress;
+    blacklistedAddress: AztecAddress;
     constructor(testName: string);
-    mineBlocks(amount?: number): Promise<void>;
+    crossTimestampOfChange(): Promise<void>;
     /**
      * Adds two state shifts to snapshot manager.
      * 1. Add 3 accounts.
@@ -40,7 +48,7 @@ export declare class BlacklistTokenContractTest {
     setup(): Promise<void>;
     snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
     teardown(): Promise<void>;
-    addPendingShieldNoteToPXE(contract: TokenBlacklistContract, wallet: AccountWallet, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
+    addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
     applyMintSnapshot(): Promise<void>;
 }
-//# sourceMappingURL=blacklist_token_contract_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFFTCxLQUFLLGlCQUFpQixFQUl2QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUlsRSxxQkFBYSxJQUFJO0lBQ2YsT0FBTyxDQUFDLE9BQU8sQ0FBUztJQUN4QixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxhQUFhLENBQVM7SUFFOUIsU0FBUyxTQUdSO0lBRUQsVUFBVSxTQUdUO0lBRUQsZUFBZSxTQUdkO0lBRUQsWUFBWTs7OztNQUlYO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFckMsTUFBTSxDQUFDLGtCQUFrQixTQUFTO0lBRWxDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFHM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkE4RHZCO0lBRUssS0FBSyxrQkFFVjtJQUVELFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssaUJBQWlCLGtCQWtFdEI7Q0FDRiJ9

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS;IAKT,UAAU;IAKV,eAAe;IAKf,YAAY;;;;;CAKb;AAED,qBAAa,0BAA0B;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;IAEjC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA0DlB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAmExB"}
+{"version":3,"file":"blacklist_token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAI5D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,IAAI;IACf,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAE9B,SAAS,SAGR;IAED,UAAU,SAGT;IAED,eAAe,SAGd;IAED,YAAY;;;;MAIX;CACF;AAED,qBAAa,0BAA0B;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,sBAAsB,CAAC;IACpC,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,EAAG,eAAe,CAAC;IAC5B,SAAS,EAAG,SAAS,CAAC;IAEtB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;IAElC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAEK,sBAAsB,kBAM3B;IAED;;;;OAIG;IACG,kBAAkB,kBA8DvB;IAEK,KAAK,kBAEV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM,iBAcf;IAEK,iBAAiB,kBAkEtB;CACF"}

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js

@@ -1,8 +1,8 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { Fr, computeSecretHash, createLogger } from '@aztec/aztec.js';
-import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { computeSecretHash } from '@aztec/aztec.js/crypto';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createLogger } from '@aztec/aztec.js/log';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { jest } from '@jest/globals';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
@@ -34,27 +34,26 @@ export class Role {
     }
 }
 export class BlacklistTokenContractTest {
-    // A low delay is really poor ux, but we need to keep it low for the tests to run "quickly".
     // This value MUST match the same value that we have in the contract
-    static DELAY = 2;
+    static CHANGE_ROLES_DELAY = 86400;
     snapshotManager;
     logger;
-    wallets = [];
-    accounts = [];
+    wallet;
     asset;
     tokenSim;
     badAccount;
-    admin;
-    other;
-    blacklisted;
+    cheatCodes;
+    sequencer;
+    aztecNode;
+    adminAddress;
+    otherAddress;
+    blacklistedAddress;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
         this.snapshotManager = createSnapshotManager(`e2e_blacklist_token_contract/${testName}`, dataPath);
     }
-    async mineBlocks(amount = BlacklistTokenContractTest.DELAY) {
-        for(let i = 0; i < amount; ++i){
-            await this.asset.methods.get_roles(this.admin.getAddress()).send().wait();
-        }
+    async crossTimestampOfChange() {
+        await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
     }
     /**
    * Adds two state shifts to snapshot manager.
@@ -63,37 +62,54 @@ export class BlacklistTokenContractTest {
    */ async applyBaseSnapshots() {
         // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
         jest.setTimeout(120_000);
-        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), async ({ deployedAccounts }, { pxe })=>{
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.admin = this.wallets[0];
-            this.other = this.wallets[1];
-            this.blacklisted = this.wallets[2];
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
+        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { cheatCodes, aztecNode, sequencer, wallet })=>{
+            this.cheatCodes = cheatCodes;
+            this.aztecNode = aztecNode;
+            this.sequencer = sequencer;
+            this.wallet = wallet;
+            this.adminAddress = deployedAccounts[0].address;
+            this.otherAddress = deployedAccounts[1].address;
+            this.blacklistedAddress = deployedAccounts[2].address;
+            return Promise.resolve();
         });
         await this.snapshotManager.snapshot('e2e_blacklist_token_contract', async ()=>{
             // Create the token contract state.
             // Move this account thing to addAccounts above?
             this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 3));
+            await publicDeployAccounts(this.wallet, [
+                this.adminAddress,
+                this.otherAddress,
+                this.blacklistedAddress
+            ]);
             this.logger.verbose(`Deploying TokenContract...`);
-            this.asset = await TokenBlacklistContract.deploy(this.admin, this.admin.getAddress()).send().deployed();
+            this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
+                from: this.adminAddress
+            }).deployed();
             this.logger.verbose(`Token deployed to ${this.asset.address}`);
             this.logger.verbose(`Deploying bad account...`);
-            this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+            this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
+                from: this.adminAddress
+            }).deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
-            await this.mineBlocks();
+            await this.crossTimestampOfChange();
             return {
                 tokenContractAddress: this.asset.address,
                 badAccountAddress: this.badAccount.address
             };
         }, async ({ tokenContractAddress, badAccountAddress })=>{
             // Restore the token contract state.
-            this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallets[0]);
+            this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
             this.logger.verbose(`Token contract address: ${this.asset.address}`);
-            this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+            this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
+                this.adminAddress,
+                this.otherAddress,
+                this.blacklistedAddress
+            ]);
+            this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
             this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
-            expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(new Role().withAdmin().toNoirStruct());
+            expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
+                from: this.adminAddress
+            })).toEqual(new Role().withAdmin().toNoirStruct());
         });
     }
     async setup() {
@@ -103,52 +119,64 @@ export class BlacklistTokenContractTest {
     async teardown() {
         await this.snapshotManager.teardown();
     }
-    #toBoundedVec(arr, maxLen) {
-        return {
-            len: arr.length,
-            storage: arr.concat(new Array(maxLen - arr.length).fill(new Fr(0)))
-        };
-    }
-    async addPendingShieldNoteToPXE(contract, wallet, amount, secretHash, txHash) {
-        const txEffects = await wallet.getTxEffect(txHash);
-        await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, this.#toBoundedVec(txEffects.data.noteHashes, MAX_NOTE_HASHES_PER_TX), txEffects.data.nullifiers[0], wallet.getAddress()).simulate();
+    async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
+        const txEffects = await this.aztecNode.getTxEffect(txHash);
+        await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, txEffects.data.noteHashes, txEffects.data.nullifiers[0], recipient).simulate({
+            from: recipient
+        });
     }
     async applyMintSnapshot() {
         await this.snapshotManager.snapshot('mint', async ()=>{
-            const { asset, accounts, wallets } = this;
+            const { asset } = this;
             const amount = 10000n;
             const adminMinterRole = new Role().withAdmin().withMinter();
-            await this.asset.withWallet(this.admin).methods.update_roles(this.admin.getAddress(), adminMinterRole.toNoirStruct()).send().wait();
+            await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
+                from: this.adminAddress
+            }).wait();
             const blacklistRole = new Role().withBlacklisted();
-            await this.asset.withWallet(this.admin).methods.update_roles(this.blacklisted.getAddress(), blacklistRole.toNoirStruct()).send().wait();
-            await this.mineBlocks(); // This gets us past the block of change
-            expect(await this.asset.methods.get_roles(this.admin.getAddress()).simulate()).toEqual(adminMinterRole.toNoirStruct());
+            await this.asset.methods.update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct()).send({
+                from: this.adminAddress
+            }).wait();
+            await this.crossTimestampOfChange();
+            expect(await this.asset.methods.get_roles(this.adminAddress).simulate({
+                from: this.adminAddress
+            })).toEqual(adminMinterRole.toNoirStruct());
             this.logger.verbose(`Minting ${amount} publicly...`);
-            await asset.methods.mint_public(accounts[0].address, amount).send().wait();
+            await asset.methods.mint_public(this.adminAddress, amount).send({
+                from: this.adminAddress
+            }).wait();
             this.logger.verbose(`Minting ${amount} privately...`);
             const secret = Fr.random();
             const secretHash = await computeSecretHash(secret);
-            const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
-            await this.addPendingShieldNoteToPXE(asset, wallets[0], amount, secretHash, receipt.txHash);
-            const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
-            await txClaim.wait({
-                debug: true
+            const receipt = await asset.methods.mint_private(amount, secretHash).send({
+                from: this.adminAddress
+            }).wait();
+            await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
+            const txClaim = asset.methods.redeem_shield(this.adminAddress, amount, secret).send({
+                from: this.adminAddress
             });
+            await txClaim.wait();
             this.logger.verbose(`Minting complete.`);
             return {
                 amount
             };
         }, async ({ amount })=>{
-            const { asset, accounts: [{ address }], tokenSim } = this;
-            tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate();
+            const { asset, tokenSim } = this;
+            tokenSim.mintPublic(this.adminAddress, amount);
+            const publicBalance = await asset.methods.balance_of_public(this.adminAddress).simulate({
+                from: this.adminAddress
+            });
             this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
-            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
-            tokenSim.mintPrivate(address, amount);
-            const privateBalance = await asset.methods.balance_of_private(address).simulate();
+            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
+            tokenSim.mintPrivate(this.adminAddress, amount);
+            const privateBalance = await asset.methods.balance_of_private(this.adminAddress).simulate({
+                from: this.adminAddress
+            });
             this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-            const totalSupply = await asset.methods.total_supply().simulate();
+            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
+            const totalSupply = await asset.methods.total_supply().simulate({
+                from: this.adminAddress
+            });
             this.logger.verbose(`Total supply: ${totalSupply}`);
             expect(totalSupply).toEqual(tokenSim.totalSupply);
             return Promise.resolve();

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts

@@ -1,47 +1,41 @@
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import { type AccountWallet, AztecAddress, type AztecNode, CheatCodes, type CompleteAddress, EthAddress, type Logger, type PXE } from '@aztec/aztec.js';
-import { type ViemPublicClient } from '@aztec/ethereum';
+import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { CheatCodes } from '@aztec/aztec/testing';
+import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import type { SetupOptions } from '../fixtures/utils.js';
 import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
 export declare class CrossChainMessagingTest {
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
-    accounts: CompleteAddress[];
     aztecNode: AztecNode;
-    pxe: PXE;
     aztecNodeConfig: AztecNodeConfig;
-    publicClient: ViemPublicClient | undefined;
-    user1Wallet: AccountWallet;
-    user2Wallet: AccountWallet;
+    aztecNodeAdmin: AztecNodeAdmin;
+    ctx: SubsystemsContext;
+    l1Client: ExtendedViemWalletClient | undefined;
+    wallet: TestWallet;
+    ownerAddress: AztecAddress;
+    user1Address: AztecAddress;
+    user2Address: AztecAddress;
     crossChainTestHarness: CrossChainTestHarness;
     ethAccount: EthAddress;
-    ownerAddress: AztecAddress;
     l2Token: TokenContract;
     l2Bridge: TokenBridgeContract;
-    rollup: any;
     inbox: any;
     outbox: any;
-    cheatcodes: CheatCodes;
-    constructor(testName: string);
+    cheatCodes: CheatCodes;
+    deployL1ContractsValues: DeployL1ContractsReturnType;
+    constructor(testName: string, opts?: SetupOptions, deployL1ContractsArgs?: Partial<DeployL1ContractsArgs>);
     assumeProven(): Promise<void>;
     setup(): Promise<void>;
     snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
     teardown(): Promise<void>;
     applyBaseSnapshots(): Promise<void>;
-    toCrossChainContext(): CrossChainContext;
 }
-type CrossChainContext = {
-    l2Token: AztecAddress;
-    l2Bridge: AztecAddress;
-    tokenPortal: EthAddress;
-    underlying: EthAddress;
-    ethAccount: EthAddress;
-    ownerAddress: AztecAddress;
-    inbox: EthAddress;
-    outbox: EthAddress;
-};
-export {};
-//# sourceMappingURL=cross_chain_messaging_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSywyQkFBMkIsRUFDaEMsS0FBSyx3QkFBd0IsRUFHOUIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDM0UsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFLNUQsT0FBTyxFQUVMLEtBQUssaUJBQWlCLEVBSXZCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJOUUscUJBQWEsdUJBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGVBQWUsRUFBRyxlQUFlLENBQUM7SUFDbEMsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxHQUFHLEVBQUcsaUJBQWlCLENBQUM7SUFFeEIsUUFBUSxFQUFHLHdCQUF3QixHQUFHLFNBQVMsQ0FBQztJQUVoRCxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLHFCQUFxQixFQUFHLHFCQUFxQixDQUFDO0lBQzlDLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFDeEIsT0FBTyxFQUFHLGFBQWEsQ0FBQztJQUN4QixRQUFRLEVBQUcsbUJBQW1CLENBQUM7SUFFL0IsS0FBSyxFQUFHLEdBQUcsQ0FBQztJQUNaLE1BQU0sRUFBRyxHQUFHLENBQUM7SUFDYixVQUFVLEVBQUcsVUFBVSxDQUFDO0lBRXhCLHVCQUF1QixFQUFHLDJCQUEyQixDQUFDO0lBRXRELFlBQVksUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEdBQUUsWUFBaUIsRUFBRSxxQkFBcUIsR0FBRSxPQUFPLENBQUMscUJBQXFCLENBQU0sRUFNaEg7SUFFSyxZQUFZLGtCQUVqQjtJQUVLLEtBQUssa0JBUVY7SUFFRCxRQUFRLEdBQUksQ0FBQyw4SkFJMkQ7SUFFbEUsUUFBUSxrQkFFYjtJQUVLLGtCQUFrQixrQkF1RnZCO0NBQ0YifQ==

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,KAAK,aAAa,EAClB,YAAY,EACZ,KAAK,SAAS,EACd,UAAU,EACV,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EAET,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,gBAAgB,EAAqC,MAAM,iBAAiB,CAAC;AAE3F,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAK3E,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAElC,YAAY,EAAG,gBAAgB,GAAG,SAAS,CAAC;IAE5C,WAAW,EAAG,aAAa,CAAC;IAC5B,WAAW,EAAG,aAAa,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,YAAY,EAAG,YAAY,CAAC;IAC5B,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,MAAM,EAAG,GAAG,CAAC;IACb,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;gBAEZ,QAAQ,EAAE,MAAM;IAKtB,YAAY;IAIZ,KAAK;IAQX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,kBAAkB;IAiHxB,mBAAmB,IAAI,iBAAiB;CAYzC;AAED,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC"}
+{"version":3,"file":"cross_chain_messaging_test.d.ts","sourceRoot":"","sources":["../../src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAG9B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAI9E,qBAAa,uBAAuB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,iBAAiB,CAAC;IAExB,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,MAAM,EAAG,UAAU,CAAC;IACpB,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,qBAAqB,EAAG,qBAAqB,CAAC;IAC9C,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,aAAa,CAAC;IACxB,QAAQ,EAAG,mBAAmB,CAAC;IAE/B,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,2BAA2B,CAAC;IAEtD,YAAY,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,EAAE,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM,EAMhH;IAEK,YAAY,kBAEjB;IAEK,KAAK,kBAQV;IAED,QAAQ,GAAI,CAAC,8JAI2D;IAElE,QAAQ,kBAEb;IAEK,kBAAkB,kBAuFvB;CACF"}