@aztec/end-to-end 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/src/test-wallet/worker_wallet.ts

@@ -0,0 +1,216 @@
+import type { CallIntent, IntentInnerHash } from '@aztec/aztec.js/authorization';
+import type { InteractionWaitOptions, SendReturn } from '@aztec/aztec.js/contracts';
+import type {
+  Aliased,
+  AppCapabilities,
+  BatchResults,
+  BatchedMethod,
+  ContractClassMetadata,
+  ContractMetadata,
+  ExecuteUtilityOptions,
+  PrivateEvent,
+  PrivateEventFilter,
+  ProfileOptions,
+  SendOptions,
+  SimulateOptions,
+  TxSimulationResultWithAppOffset,
+  Wallet,
+  WalletCapabilities,
+} from '@aztec/aztec.js/wallet';
+import type { ChainInfo } from '@aztec/entrypoints/interfaces';
+import type { Fq, Fr } from '@aztec/foundation/curves/bn254';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import { promiseWithResolvers } from '@aztec/foundation/promise';
+import { type ApiSchema, getSchemaReturnType } from '@aztec/foundation/schemas';
+import { sleep } from '@aztec/foundation/sleep';
+import { NodeConnector, TransportClient } from '@aztec/foundation/transport';
+import type { PXEConfig } from '@aztec/pxe/config';
+import type { ContractArtifact, EventMetadataDefinition, FunctionCall } from '@aztec/stdlib/abi';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstancePreimage } from '@aztec/stdlib/contract';
+import type { ExecutionPayload, TxProfileResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
+import { Tx } from '@aztec/stdlib/tx';
+
+import { Worker } from 'worker_threads';
+
+import { WorkerWalletSchema } from './worker_wallet_schema.js';
+
+type WorkerMsg = { fn: string; args: string };
+
+const log = createLogger('e2e:test-wallet:worker-wallet');
+
+const WORKER_READY_TIMEOUT_MS = 120_000;
+
+/**
+ * Wallet implementation that offloads all work to a worker thread.
+ * Implements the Wallet interface by proxying calls over a transport layer
+ * using JSON serialization with Zod schema parsing on both ends.
+ */
+export class WorkerWallet implements Wallet {
+  private constructor(
+    private worker: Worker,
+    private client: TransportClient<WorkerMsg>,
+  ) {}
+
+  /**
+   * Creates a WorkerWallet by spawning a worker thread that creates a TestWallet internally.
+   * @param nodeUrl - URL of the Aztec node to connect to.
+   * @param pxeConfig - Optional PXE configuration overrides.
+   * @returns A WorkerWallet ready to use.
+   */
+  static async create(nodeUrl: string, pxeConfig?: Partial<PXEConfig>): Promise<WorkerWallet> {
+    // replace stc/ with dest/ so the wallet works in Jest tests
+    const workerUrl = new URL('./wallet_worker_script.js', import.meta.url);
+    workerUrl.pathname = workerUrl.pathname.replace('/src/', '/dest/');
+    // remove JEST_WORKER_ID so the worker uses pino-pretty transport instead of Jest's raw output.
+    const { JEST_WORKER_ID: _, ...parentEnv } = process.env;
+    const worker = new Worker(workerUrl, {
+      workerData: { nodeUrl, pxeConfig },
+      env: {
+        ...parentEnv,
+        ...(process.stderr.isTTY || process.env.FORCE_COLOR ? { FORCE_COLOR: '1' } : {}),
+        LOG_LEVEL: process.env.WORKER_LOG_LEVEL ?? 'info',
+      },
+    });
+
+    const connector = new NodeConnector(worker);
+    const client = new TransportClient<WorkerMsg>(connector);
+    await client.open();
+
+    const wallet = new WorkerWallet(worker, client);
+
+    const { promise: workerDied, reject: rejectWorkerDied } = promiseWithResolvers<void>();
+    // reject if the worker exits or errors before the warmup completes.
+    const onError = (err: Error): void => {
+      worker.off('exit', onExit!);
+      rejectWorkerDied(new Error(`Worker wallet thread error: ${err.message}`));
+    };
+
+    const onExit = (code: number): void => {
+      worker.off('error', onError!);
+      rejectWorkerDied(new Error(`Worker wallet thread exited with code ${code} before becoming ready`));
+    };
+
+    worker.once('error', onError);
+    worker.once('exit', onExit);
+
+    const timeout = sleep(WORKER_READY_TIMEOUT_MS).then(() => {
+      throw new Error(`Worker wallet creation timed out after ${WORKER_READY_TIMEOUT_MS / 1000}s`);
+    });
+
+    try {
+      // wait for worker wallet to start
+      await Promise.race([wallet.getChainInfo(), workerDied, timeout]);
+    } catch (err) {
+      log.error('Worker wallet creation failed, cleaning up', { error: String(err) });
+      client.close();
+      await worker.terminate();
+      throw err;
+    } finally {
+      worker.off('error', onError);
+      worker.off('exit', onExit);
+    }
+
+    return wallet;
+  }
+
+  private async callRaw(fn: string, ...args: any[]): Promise<string | undefined> {
+    const argsJson = jsonStringify(args);
+    return (await this.client.request({ fn, args: argsJson })) as string | undefined;
+  }
+
+  private async call(fn: string, ...args: any[]): Promise<any> {
+    const resultJson = await this.callRaw(fn, ...args);
+    const methodSchema = (WorkerWalletSchema as ApiSchema)[fn];
+    // Void-returning methods (e.g. registerContract) serialize to `undefined` on the worker side, which
+    // JSON.parse cannot handle; hand it straight to the schema, whose `z.void()` output accepts undefined.
+    return getSchemaReturnType(methodSchema).parseAsync(resultJson === undefined ? undefined : JSON.parse(resultJson));
+  }
+
+  getChainInfo(): Promise<ChainInfo> {
+    return this.call('getChainInfo');
+  }
+
+  getContractMetadata(address: AztecAddress): Promise<ContractMetadata> {
+    return this.call('getContractMetadata', address);
+  }
+
+  getContractClassMetadata(id: Fr): Promise<ContractClassMetadata> {
+    return this.call('getContractClassMetadata', id);
+  }
+
+  getPrivateEvents<T>(
+    eventMetadata: EventMetadataDefinition,
+    eventFilter: PrivateEventFilter,
+  ): Promise<PrivateEvent<T>[]> {
+    return this.call('getPrivateEvents', eventMetadata, eventFilter);
+  }
+
+  registerSender(address: AztecAddress, alias?: string): Promise<AztecAddress> {
+    return this.call('registerSender', address, alias);
+  }
+
+  getAddressBook(): Promise<Aliased<AztecAddress>[]> {
+    return this.call('getAddressBook');
+  }
+
+  getAccounts(): Promise<Aliased<AztecAddress>[]> {
+    return this.call('getAccounts');
+  }
+
+  registerContract(instance: ContractInstancePreimage, artifact?: ContractArtifact, secretKey?: Fr): Promise<void> {
+    return this.call('registerContract', instance, artifact, secretKey);
+  }
+
+  registerContractClass(artifact: ContractArtifact): Promise<void> {
+    return this.call('registerContractClass', artifact);
+  }
+
+  simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset> {
+    return this.call('simulateTx', exec, opts);
+  }
+
+  executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult> {
+    return this.call('executeUtility', call, opts);
+  }
+
+  profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult> {
+    return this.call('profileTx', exec, opts);
+  }
+
+  sendTx<W extends InteractionWaitOptions = undefined>(
+    exec: ExecutionPayload,
+    opts: SendOptions<W>,
+  ): Promise<SendReturn<W>> {
+    return this.call('sendTx', exec, opts);
+  }
+
+  proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<Tx> {
+    return this.call('proveTx', exec, opts);
+  }
+
+  /** Registers an account inside the worker's TestWallet, populating its accounts map. */
+  registerAccount(secret: Fr, salt: Fr, signingKey: Fq): Promise<AztecAddress> {
+    return this.call('registerAccount', secret, salt, signingKey);
+  }
+
+  createAuthWit(from: AztecAddress, messageHashOrIntent: IntentInnerHash | CallIntent): Promise<AuthWitness> {
+    return this.call('createAuthWit', from, messageHashOrIntent);
+  }
+
+  requestCapabilities(manifest: AppCapabilities): Promise<WalletCapabilities> {
+    return this.call('requestCapabilities', manifest);
+  }
+
+  batch<const T extends readonly BatchedMethod[]>(methods: T): Promise<BatchResults<T>> {
+    return this.call('batch', methods);
+  }
+
+  /** Shuts down the worker thread and closes the transport. */
+  async stop(): Promise<void> {
+    this.client.close();
+    await this.worker.terminate();
+  }
+}

package/src/test-wallet/worker_wallet_schema.ts

@@ -0,0 +1,14 @@
+import { ExecutionPayloadSchema, SendOptionsSchema, WalletSchema } from '@aztec/aztec.js/wallet';
+import type { ApiSchema } from '@aztec/foundation/schemas';
+import { schemas } from '@aztec/foundation/schemas';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Tx } from '@aztec/stdlib/tx';
+
+import { z } from 'zod';
+
+/** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */
+export const WorkerWalletSchema: ApiSchema = {
+  ...WalletSchema,
+  proveTx: z.function({ input: z.tuple([ExecutionPayloadSchema, SendOptionsSchema]), output: Tx.schema }),
+  registerAccount: z.function({ input: z.tuple([schemas.Fr, schemas.Fr, schemas.Fq]), output: AztecAddress.schema }),
+};

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts

@@ -1,54 +0,0 @@
-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 {
-    private isAdmin;
-    private isMinter;
-    private isBlacklisted;
-    withAdmin(): this;
-    withMinter(): this;
-    withBlacklisted(): this;
-    toNoirStruct(): {
-        is_admin: boolean;
-        is_minter: boolean;
-        is_blacklisted: boolean;
-    };
-}
-export declare class BlacklistTokenContractTest {
-    static CHANGE_ROLES_DELAY: number;
-    private snapshotManager;
-    logger: Logger;
-    wallet: TestWallet;
-    asset: TokenBlacklistContract;
-    tokenSim: TokenSimulator;
-    badAccount: InvalidAccountContract;
-    cheatCodes: CheatCodes;
-    sequencer: SequencerClient;
-    aztecNode: AztecNode;
-    adminAddress: AztecAddress;
-    otherAddress: AztecAddress;
-    blacklistedAddress: AztecAddress;
-    constructor(testName: string);
-    crossTimestampOfChange(): Promise<void>;
-    /**
-     * Adds two state shifts to snapshot manager.
-     * 1. Add 3 accounts.
-     * 2. Publicly deploy accounts, deploy token contract and a "bad account".
-     */
-    applyBaseSnapshots(): 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>;
-    addPendingShieldNoteToPXE(contract: TokenBlacklistContract, recipient: AztecAddress, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
-    applyMintSnapshot(): Promise<void>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfYmxhY2tsaXN0X3Rva2VuX2NvbnRyYWN0L2JsYWNrbGlzdF90b2tlbl9jb250cmFjdF90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDNUMsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXZELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhDQUE4QyxDQUFDO0FBQ3RGLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSTVELE9BQU8sRUFFTCxLQUFLLGlCQUFpQixFQUl2QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUlsRSxxQkFBYSxJQUFJO0lBQ2YsT0FBTyxDQUFDLE9BQU8sQ0FBUztJQUN4QixPQUFPLENBQUMsUUFBUSxDQUFTO0lBQ3pCLE9BQU8sQ0FBQyxhQUFhLENBQVM7SUFFOUIsU0FBUyxTQUdSO0lBRUQsVUFBVSxTQUdUO0lBRUQsZUFBZSxTQUdkO0lBRUQsWUFBWTs7OztNQUlYO0NBQ0Y7QUFFRCxxQkFBYSwwQkFBMEI7SUFFckMsTUFBTSxDQUFDLGtCQUFrQixTQUFTO0lBRWxDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLEtBQUssRUFBRyxzQkFBc0IsQ0FBQztJQUMvQixRQUFRLEVBQUcsY0FBYyxDQUFDO0lBQzFCLFVBQVUsRUFBRyxzQkFBc0IsQ0FBQztJQUNwQyxVQUFVLEVBQUcsVUFBVSxDQUFDO0lBQ3hCLFNBQVMsRUFBRyxlQUFlLENBQUM7SUFDNUIsU0FBUyxFQUFHLFNBQVMsQ0FBQztJQUV0QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsa0JBQWtCLEVBQUcsWUFBWSxDQUFDO0lBRWxDLFlBQVksUUFBUSxFQUFFLE1BQU0sRUFHM0I7SUFFSyxzQkFBc0Isa0JBTTNCO0lBRUQ7Ozs7T0FJRztJQUNHLGtCQUFrQixrQkE4RHZCO0lBRUssS0FBSyxrQkFFVjtJQUVELFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQUViO0lBRUsseUJBQXlCLENBQzdCLFFBQVEsRUFBRSxzQkFBc0IsRUFDaEMsU0FBUyxFQUFFLFlBQVksRUFDdkIsTUFBTSxFQUFFLE1BQU0sRUFDZCxVQUFVLEVBQUUsRUFBRSxFQUNkLE1BQU0sRUFBRSxNQUFNLGlCQWNmO0lBRUssaUJBQWlCLGtCQWtFdEI7Q0FDRiJ9

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

@@ -1 +0,0 @@
-{"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,185 +0,0 @@
-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';
-const { E2E_DATA_PATH: dataPath } = process.env;
-export class Role {
-    isAdmin = false;
-    isMinter = false;
-    isBlacklisted = false;
-    withAdmin() {
-        this.isAdmin = true;
-        return this;
-    }
-    withMinter() {
-        this.isMinter = true;
-        return this;
-    }
-    withBlacklisted() {
-        this.isBlacklisted = true;
-        return this;
-    }
-    toNoirStruct() {
-        // We need to use lowercase identifiers as those are what the noir interface expects
-        // eslint-disable-next-line camelcase
-        return {
-            is_admin: this.isAdmin,
-            is_minter: this.isMinter,
-            is_blacklisted: this.isBlacklisted
-        };
-    }
-}
-export class BlacklistTokenContractTest {
-    // This value MUST match the same value that we have in the contract
-    static CHANGE_ROLES_DELAY = 86400;
-    snapshotManager;
-    logger;
-    wallet;
-    asset;
-    tokenSim;
-    badAccount;
-    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 crossTimestampOfChange() {
-        await this.cheatCodes.warpL2TimeAtLeastBy(this.sequencer, this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
-    }
-    /**
-   * Adds two state shifts to snapshot manager.
-   * 1. Add 3 accounts.
-   * 2. Publicly deploy accounts, deploy token contract and a "bad account".
-   */ 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), ({ 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.wallet, [
-                this.adminAddress,
-                this.otherAddress,
-                this.blacklistedAddress
-            ]);
-            this.logger.verbose(`Deploying TokenContract...`);
-            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 InvalidAccountContract.deploy(this.wallet).send({
-                from: this.adminAddress
-            }).deployed();
-            this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
-            await this.crossTimestampOfChange();
-            return {
-                tokenContractAddress: this.asset.address,
-                badAccountAddress: this.badAccount.address
-            };
-        }, async ({ tokenContractAddress, badAccountAddress })=>{
-            // Restore the token contract state.
-            this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
-            this.logger.verbose(`Token contract address: ${this.asset.address}`);
-            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.adminAddress).simulate({
-                from: this.adminAddress
-            })).toEqual(new Role().withAdmin().toNoirStruct());
-        });
-    }
-    async setup() {
-        await this.snapshotManager.setup();
-    }
-    snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
-    async teardown() {
-        await this.snapshotManager.teardown();
-    }
-    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 } = this;
-            const amount = 10000n;
-            const adminMinterRole = new Role().withAdmin().withMinter();
-            await this.asset.methods.update_roles(this.adminAddress, adminMinterRole.toNoirStruct()).send({
-                from: this.adminAddress
-            }).wait();
-            const blacklistRole = new Role().withBlacklisted();
-            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(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({
-                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, 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(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(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,41 +0,0 @@
-import type { AztecNodeConfig } from '@aztec/aztec-node';
-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;
-    aztecNode: AztecNode;
-    aztecNodeConfig: AztecNodeConfig;
-    aztecNodeAdmin: AztecNodeAdmin;
-    ctx: SubsystemsContext;
-    l1Client: ExtendedViemWalletClient | undefined;
-    wallet: TestWallet;
-    ownerAddress: AztecAddress;
-    user1Address: AztecAddress;
-    user2Address: AztecAddress;
-    crossChainTestHarness: CrossChainTestHarness;
-    ethAccount: EthAddress;
-    l2Token: TokenContract;
-    l2Bridge: TokenBridgeContract;
-    inbox: any;
-    outbox: any;
-    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>;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSywyQkFBMkIsRUFDaEMsS0FBSyx3QkFBd0IsRUFHOUIsTUFBTSxpQkFBaUIsQ0FBQztBQUV6QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDL0QsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDM0UsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDdEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFLNUQsT0FBTyxFQUVMLEtBQUssaUJBQWlCLEVBSXZCLE1BQU0saUNBQWlDLENBQUM7QUFDekMsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFJOUUscUJBQWEsdUJBQXVCO0lBQ2xDLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQzFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGVBQWUsRUFBRyxlQUFlLENBQUM7SUFDbEMsY0FBYyxFQUFHLGNBQWMsQ0FBQztJQUNoQyxHQUFHLEVBQUcsaUJBQWlCLENBQUM7SUFFeEIsUUFBUSxFQUFHLHdCQUF3QixHQUFHLFNBQVMsQ0FBQztJQUVoRCxNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLHFCQUFxQixFQUFHLHFCQUFxQixDQUFDO0lBQzlDLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFDeEIsT0FBTyxFQUFHLGFBQWEsQ0FBQztJQUN4QixRQUFRLEVBQUcsbUJBQW1CLENBQUM7SUFFL0IsS0FBSyxFQUFHLEdBQUcsQ0FBQztJQUNaLE1BQU0sRUFBRyxHQUFHLENBQUM7SUFDYixVQUFVLEVBQUcsVUFBVSxDQUFDO0lBRXhCLHVCQUF1QixFQUFHLDJCQUEyQixDQUFDO0lBRXRELFlBQVksUUFBUSxFQUFFLE1BQU0sRUFBRSxJQUFJLEdBQUUsWUFBaUIsRUFBRSxxQkFBcUIsR0FBRSxPQUFPLENBQUMscUJBQXFCLENBQU0sRUFNaEg7SUFFSyxZQUFZLGtCQUVqQjtJQUVLLEtBQUssa0JBUVY7SUFFRCxRQUFRLEdBQUksQ0FBQyw4SkFJMkQ7SUFFbEUsUUFBUSxrQkFFYjtJQUVLLGtCQUFrQixrQkF1RnZCO0NBQ0YifQ==

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

@@ -1 +0,0 @@
-{"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"}

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js

@@ -1,108 +0,0 @@
-import { EthAddress } from '@aztec/aztec.js/addresses';
-import { createLogger } from '@aztec/aztec.js/log';
-import { createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
-import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
-import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
-import { getContract } from 'viem';
-import { MNEMONIC } from '../fixtures/fixtures.js';
-import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
-import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
-const { E2E_DATA_PATH: dataPath } = process.env;
-export class CrossChainMessagingTest {
-    snapshotManager;
-    logger;
-    aztecNode;
-    aztecNodeConfig;
-    aztecNodeAdmin;
-    ctx;
-    l1Client;
-    wallet;
-    ownerAddress;
-    user1Address;
-    user2Address;
-    crossChainTestHarness;
-    ethAccount;
-    l2Token;
-    l2Bridge;
-    inbox;
-    outbox;
-    cheatCodes;
-    deployL1ContractsValues;
-    constructor(testName, opts = {}, deployL1ContractsArgs = {}){
-        this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
-            initialValidators: [],
-            ...deployL1ContractsArgs
-        });
-    }
-    async assumeProven() {
-        await this.cheatCodes.rollup.markAsProven();
-    }
-    async setup() {
-        this.ctx = await this.snapshotManager.setup();
-        this.aztecNode = this.ctx.aztecNode;
-        this.wallet = this.ctx.wallet;
-        this.aztecNodeConfig = this.ctx.aztecNodeConfig;
-        this.cheatCodes = this.ctx.cheatCodes;
-        this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
-        this.aztecNodeAdmin = this.ctx.aztecNode;
-    }
-    snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
-    async teardown() {
-        await this.snapshotManager.teardown();
-    }
-    async applyBaseSnapshots() {
-        // Note that we are using the same `wallet`, `aztecNodeConfig` and `aztecNode` across all snapshots.
-        // This is to not have issues with different networks.
-        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { wallet, aztecNodeConfig, aztecNode })=>{
-            [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map((a)=>a.address);
-            this.wallet = wallet;
-            this.aztecNode = aztecNode;
-            this.aztecNodeConfig = aztecNodeConfig;
-            return Promise.resolve();
-        });
-        await this.snapshotManager.snapshot('e2e_cross_chain_messaging', async ()=>{
-            // Create the token contract state.
-            // Move this account thing to addAccounts above?
-            this.logger.verbose(`Public deploy accounts...`);
-            await publicDeployAccounts(this.wallet, [
-                this.ownerAddress,
-                this.user1Address,
-                this.user2Address
-            ]);
-            this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-            const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
-                'Underlying',
-                'UND',
-                this.l1Client.account.address
-            ]).then(({ address })=>address);
-            this.logger.verbose(`Setting up cross chain harness...`);
-            this.crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.l1Client, this.wallet, this.ownerAddress, this.logger, underlyingERC20Address);
-            this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
-            return this.crossChainTestHarness.toCrossChainContext();
-        }, (crossChainContext)=>{
-            this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
-            this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
-            // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
-            this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
-            const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
-            const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-            const inbox = getContract({
-                address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
-                abi: InboxAbi,
-                client: l1Client
-            });
-            const outbox = getContract({
-                address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
-                abi: OutboxAbi,
-                client: l1Client
-            });
-            this.crossChainTestHarness = new CrossChainTestHarness(this.aztecNode, this.logger, this.l2Token, this.l2Bridge, this.ethAccount, tokenPortalAddress, crossChainContext.underlying, l1Client, this.aztecNodeConfig.l1Contracts, this.wallet, this.ownerAddress);
-            this.l1Client = l1Client;
-            this.inbox = inbox;
-            this.outbox = outbox;
-            return Promise.resolve();
-        });
-    }
-}