@aztec/end-to-end 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/dest/bench/utils.d.ts

@@ -1,6 +1,5 @@
-import { type AztecNode, type SentTx, type WaitOpts } from '@aztec/aztec.js';
+import { type SentTx, type WaitOpts } from '@aztec/aztec.js/contracts';
 import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
-import { type PXEService } from '@aztec/pxe/server';
 import type { MetricsType } from '@aztec/telemetry-client';
 import type { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
@@ -15,7 +14,7 @@ export declare function benchmarkSetup(opts: Partial<SetupOptions> & {
     telemetry: BenchmarkTelemetryClient;
     context: EndToEndContext;
     contract: BenchmarkingContract;
-    sequencer: import("@aztec/sequencer-client").SequencerClient;
+    sequencer: import("../../../sequencer-client/dest/index.js").SequencerClient;
 }>;
 type MetricFilter = {
     source: MetricsType;
@@ -39,15 +38,7 @@ export type GithubActionBenchmarkResult = {
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns Array of sent txs.
  */
-export declare function sendTxs(txCount: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute?: boolean): Promise<SentTx[]>;
+export declare function sendTxs(txCount: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute?: boolean): SentTx[];
 export declare function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts): Promise<void>;
-/**
- * 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 declare function createNewPXE(node: AztecNode, contract: BenchmarkingContract): Promise<PXEService>;
 export {};
-//# sourceMappingURL=utils.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9iZW5jaC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQWEsS0FBSyxNQUFNLEVBQUUsS0FBSyxRQUFRLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUVsRixPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUNsRixPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBNEMsd0JBQXdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUt4SCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsS0FBSyxZQUFZLEVBQVMsTUFBTSxzQkFBc0IsQ0FBQztBQUV0Rjs7R0FFRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLElBQUksRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLEdBQUc7SUFDNUIsNkJBQTZCLENBQUMsT0FBTyxFQUFFLENBQUMsV0FBVyxHQUFHLFlBQVksQ0FBQyxFQUFFLENBQUM7SUFDdEUsa0ZBQWtGO0lBQ2xGLFdBQVcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN0Qjs7Ozs7R0F5QkY7QUFFRCxLQUFLLFlBQVksR0FBRztJQUNsQixNQUFNLEVBQUUsV0FBVyxDQUFDO0lBQ3BCLFNBQVMsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUFNLEtBQUssTUFBTSxDQUFDO0lBQ3JDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDZixDQUFDO0FBR0YsTUFBTSxNQUFNLDJCQUEyQixHQUFHO0lBQ3hDLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLEtBQUssQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNoQixDQUFDO0FBNkRGOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQWdCLE9BQU8sQ0FDckIsT0FBTyxFQUFFLE1BQU0sRUFDZixPQUFPLEVBQUUsZUFBZSxFQUN4QixRQUFRLEVBQUUsb0JBQW9CLEVBQzlCLGtCQUFrQixHQUFFLE9BQWUsR0FDbEMsTUFBTSxFQUFFLENBTVY7QUFFRCx3QkFBc0IsT0FBTyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLFVBQVUsQ0FBQyxFQUFFLFFBQVEsaUJBSTNGIn0=

package/dest/bench/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAExF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,mBAAmB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GA0BF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AA6DF;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAMnB;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiBvG"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAElF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAKxH,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAS,MAAM,sBAAsB,CAAC;AAEtF;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG;IAC5B,6BAA6B,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAAC;IACtE,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;;;;;GAyBF;AAED,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAGF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AA6DF;;;;;;;;GAQG;AACH,wBAAgB,OAAO,CACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,MAAM,EAAE,CAMV;AAED,wBAAsB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,QAAQ,iBAI3F"}

package/dest/bench/utils.js

@@ -1,7 +1,6 @@
-import { BatchCall } from '@aztec/aztec.js';
+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 { createPXEService } from '@aztec/pxe/server';
 import { mkdirSync, writeFileSync } from 'fs';
 import path from 'path';
 import { setup } from '../fixtures/utils.js';
@@ -14,8 +13,9 @@ import { setup } from '../fixtures/utils.js';
             benchmark: true
         }
     });
+    const defaultAccountAddress = context.accounts[0];
     const contract = await BenchmarkingContract.deploy(context.wallet).send({
-        from: context.wallet.getAddress()
+        from: defaultAccountAddress
     }).deployed();
     context.logger.info(`Deployed benchmarking contract at ${contract.address}`);
     const sequencer = context.aztecNode.getSequencer();
@@ -92,10 +92,10 @@ function getMetricValues(points) {
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns A BatchCall instance.
  */ function makeCall(index, context, contract, heavyPublicCompute) {
-    const owner = context.wallet.getAddress();
+    const [owner] = context.accounts;
     if (heavyPublicCompute) {
         return new BatchCall(context.wallet, [
-            contract.methods.sha256_hash_2048(randomBytesAsBigInts(2048))
+            contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))
         ]);
     } else {
         return new BatchCall(context.wallet, [
@@ -112,44 +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) {
+ */ 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({
-            from: context.wallet.getAddress()
-        })));
+    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) {
-    const l1Contracts = await node.getL1ContractAddresses();
-    const { l1ChainId, rollupVersion } = await node.getNodeInfo();
-    const pxeConfig = {
-        l2BlockBatchSize: 50,
-        l2BlockPollingIntervalMS: 100,
-        dataDirectory: undefined,
-        dataStoreMapSizeKB: 1024 * 1024,
-        l1Contracts,
-        l1ChainId,
-        rollupVersion
-    };
-    // docs:start:PXEcreate
-    const pxe = await createPXEService(node, pxeConfig);
-    // docs:end:PXEcreate
-    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,8 +1,13 @@
-import { type AccountWallet, AztecAddress, type AztecNode, type CompleteAddress, Fr, type Logger, type PXE, type TxHash } from '@aztec/aztec.js';
+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 {
@@ -22,20 +27,15 @@ export declare class BlacklistTokenContractTest {
     static CHANGE_ROLES_DELAY: number;
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
-    pxe: PXE;
-    accounts: CompleteAddress[];
+    wallet: TestWallet;
     asset: TokenBlacklistContract;
     tokenSim: TokenSimulator;
     badAccount: InvalidAccountContract;
     cheatCodes: CheatCodes;
     sequencer: SequencerClient;
     aztecNode: AztecNode;
-    admin: AccountWallet;
     adminAddress: AztecAddress;
-    other: AccountWallet;
     otherAddress: AztecAddress;
-    blacklisted: AccountWallet;
     blacklistedAddress: AztecAddress;
     constructor(testName: string);
     crossTimestampOfChange(): Promise<void>;
@@ -51,4 +51,4 @@ export declare class BlacklistTokenContractTest {
     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,YAAY,EACZ,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,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;AAI/D,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;IAErC,MAAM,CAAC,kBAAkB,SAAS;IAElC,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,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,KAAK,EAAG,aAAa,CAAC;IACtB,YAAY,EAAG,YAAY,CAAC;IAC5B,KAAK,EAAG,aAAa,CAAC;IACtB,YAAY,EAAG,YAAY,CAAC;IAC5B,WAAW,EAAG,aAAa,CAAC;IAC5B,kBAAkB,EAAG,YAAY,CAAC;gBAEtB,QAAQ,EAAE,MAAM;IAKtB,sBAAsB;IAQ5B;;;;OAIG;IACG,kBAAkB;IAoElB,KAAK;IAIX,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,EAAE,EACd,MAAM,EAAE,MAAM;IAgBV,iBAAiB;CAqExB"}
+{"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,5 +1,6 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { Fr, computeSecretHash, createLogger } from '@aztec/aztec.js';
+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';
@@ -37,20 +38,15 @@ export class BlacklistTokenContractTest {
     static CHANGE_ROLES_DELAY = 86400;
     snapshotManager;
     logger;
-    wallets = [];
-    pxe;
-    accounts = [];
+    wallet;
     asset;
     tokenSim;
     badAccount;
     cheatCodes;
     sequencer;
     aztecNode;
-    admin;
     adminAddress;
-    other;
     otherAddress;
-    blacklisted;
     blacklistedAddress;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
@@ -66,32 +62,32 @@ 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, cheatCodes, aztecNode, sequencer })=>{
-            this.pxe = pxe;
+        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.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.admin = this.wallets[0];
-            this.adminAddress = this.admin.getAddress();
-            this.other = this.wallets[1];
-            this.otherAddress = this.other.getAddress();
-            this.blacklisted = this.wallets[2];
-            this.blacklistedAddress = this.blacklisted.getAddress();
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
+            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.admin, 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.adminAddress).send({
+            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.admin).send({
+            this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({
                 from: this.adminAddress
             }).deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
@@ -102,10 +98,14 @@ export class BlacklistTokenContractTest {
             };
         }, 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.admin, this.adminAddress, this.logger, this.accounts.map((a)=>a.address));
-            this.badAccount = await InvalidAccountContract.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.adminAddress).simulate({
                 from: this.adminAddress
@@ -120,29 +120,29 @@ export class BlacklistTokenContractTest {
         await this.snapshotManager.teardown();
     }
     async addPendingShieldNoteToPXE(contract, recipient, amount, secretHash, txHash) {
-        const txEffects = await this.pxe.getTxEffect(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({
+            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({
+            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.admin.getAddress()).simulate({
+            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({
+            await asset.methods.mint_public(this.adminAddress, amount).send({
                 from: this.adminAddress
             }).wait();
             this.logger.verbose(`Minting ${amount} privately...`);
@@ -151,8 +151,8 @@ export class BlacklistTokenContractTest {
             const receipt = await asset.methods.mint_private(amount, secretHash).send({
                 from: this.adminAddress
             }).wait();
-            await this.addPendingShieldNoteToPXE(asset, wallets[0].getAddress(), amount, secretHash, receipt.txHash);
-            const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send({
+            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();
@@ -161,21 +161,21 @@ export class BlacklistTokenContractTest {
                 amount
             };
         }, async ({ amount })=>{
-            const { asset, accounts: [{ address }], tokenSim } = this;
-            tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate({
-                from: address
+            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({
-                from: address
+            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));
+            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
             const totalSupply = await asset.methods.total_supply().simulate({
-                from: address
+                from: this.adminAddress
             });
             this.logger.verbose(`Total supply: ${totalSupply}`);
             expect(totalSupply).toEqual(tokenSim.totalSupply);

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts

@@ -1,39 +1,42 @@
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import { type AccountWallet, AztecAddress, type AztecNode, type CompleteAddress, EthAddress, type Logger, type PXE } from '@aztec/aztec.js';
+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 DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
+import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType } from '@aztec/ethereum/deploy-l1-contracts';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 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;
-    accounts: CompleteAddress[];
     aztecNode: AztecNode;
-    pxe: PXE;
     aztecNodeConfig: AztecNodeConfig;
     aztecNodeAdmin: AztecNodeAdmin;
+    ctx: SubsystemsContext;
     l1Client: ExtendedViemWalletClient | undefined;
-    user1Wallet: AccountWallet;
+    wallet: TestWallet;
+    ownerAddress: AztecAddress;
     user1Address: AztecAddress;
-    user2Wallet: AccountWallet;
     user2Address: AztecAddress;
     crossChainTestHarness: CrossChainTestHarness;
     ethAccount: EthAddress;
-    ownerAddress: AztecAddress;
     l2Token: TokenContract;
     l2Bridge: TokenBridgeContract;
     inbox: any;
     outbox: any;
     cheatCodes: CheatCodes;
     deployL1ContractsValues: DeployL1ContractsReturnType;
-    constructor(testName: string);
+    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=cross_chain_messaging_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3Jvc3NfY2hhaW5fbWVzc2FnaW5nX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfY3Jvc3NfY2hhaW5fbWVzc2FnaW5nL2Nyb3NzX2NoYWluX21lc3NhZ2luZ190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSywyQkFBMkIsRUFFakMsTUFBTSxxQ0FBcUMsQ0FBQztBQUM3QyxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXRFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUs1RCxPQUFPLEVBRUwsS0FBSyxpQkFBaUIsRUFJdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUk5RSxxQkFBYSx1QkFBdUI7SUFDbEMsT0FBTyxDQUFDLGVBQWUsQ0FBbUI7SUFDMUMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFNBQVMsRUFBRyxTQUFTLENBQUM7SUFDdEIsZUFBZSxFQUFHLGVBQWUsQ0FBQztJQUNsQyxjQUFjLEVBQUcsY0FBYyxDQUFDO0lBQ2hDLEdBQUcsRUFBRyxpQkFBaUIsQ0FBQztJQUV4QixRQUFRLEVBQUcsd0JBQXdCLEdBQUcsU0FBUyxDQUFDO0lBRWhELE1BQU0sRUFBRyxVQUFVLENBQUM7SUFDcEIsWUFBWSxFQUFHLFlBQVksQ0FBQztJQUM1QixZQUFZLEVBQUcsWUFBWSxDQUFDO0lBQzVCLFlBQVksRUFBRyxZQUFZLENBQUM7SUFDNUIscUJBQXFCLEVBQUcscUJBQXFCLENBQUM7SUFDOUMsVUFBVSxFQUFHLFVBQVUsQ0FBQztJQUN4QixPQUFPLEVBQUcsYUFBYSxDQUFDO0lBQ3hCLFFBQVEsRUFBRyxtQkFBbUIsQ0FBQztJQUUvQixLQUFLLEVBQUcsR0FBRyxDQUFDO0lBQ1osTUFBTSxFQUFHLEdBQUcsQ0FBQztJQUNiLFVBQVUsRUFBRyxVQUFVLENBQUM7SUFFeEIsdUJBQXVCLEVBQUcsMkJBQTJCLENBQUM7SUFFdEQsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRSxZQUFpQixFQUFFLHFCQUFxQixHQUFFLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBTSxFQU1oSDtJQUVLLFlBQVksa0JBRWpCO0lBRUssS0FBSyxrQkFRVjtJQUVELFFBQVEsR0FBSSxDQUFDLDhKQUkyRDtJQUVsRSxRQUFRLGtCQUViO0lBRUssa0JBQWtCLGtCQXVGdkI7Q0FDRiJ9

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,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EAET,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EACL,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;AAKtE,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,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAClC,cAAc,EAAG,cAAc,CAAC;IAEhC,QAAQ,EAAG,wBAAwB,GAAG,SAAS,CAAC;IAEhD,WAAW,EAAG,aAAa,CAAC;IAC5B,YAAY,EAAG,YAAY,CAAC;IAC5B,WAAW,EAAG,aAAa,CAAC;IAC5B,YAAY,EAAG,YAAY,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,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;IAExB,uBAAuB,EAAG,2BAA2B,CAAC;gBAE1C,QAAQ,EAAE,MAAM;IAKtB,YAAY;IAIZ,KAAK;IAUX,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,kBAAkB;CAiGzB"}
+{"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;AAElD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,EAEjC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,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,7 +1,7 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { AztecAddress, EthAddress, createLogger } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec/testing';
-import { createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { createLogger } from '@aztec/aztec.js/log';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contracts';
 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';
@@ -13,65 +13,65 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class CrossChainMessagingTest {
     snapshotManager;
     logger;
-    accounts = [];
     aztecNode;
-    pxe;
     aztecNodeConfig;
     aztecNodeAdmin;
+    ctx;
     l1Client;
-    user1Wallet;
+    wallet;
+    ownerAddress;
     user1Address;
-    user2Wallet;
     user2Address;
     crossChainTestHarness;
     ethAccount;
-    ownerAddress;
     l2Token;
     l2Bridge;
     inbox;
     outbox;
     cheatCodes;
     deployL1ContractsValues;
-    constructor(testName){
+    constructor(testName, opts = {}, deployL1ContractsArgs = {}){
         this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
-        this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath);
+        this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
+            initialValidators: [],
+            ...deployL1ContractsArgs
+        });
     }
     async assumeProven() {
         await this.cheatCodes.rollup.markAsProven();
     }
     async setup() {
-        const { aztecNode, pxe, aztecNodeConfig, deployL1ContractsValues } = await this.snapshotManager.setup();
-        this.aztecNode = aztecNode;
-        this.pxe = pxe;
-        this.aztecNodeConfig = aztecNodeConfig;
-        this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
-        this.deployL1ContractsValues = deployL1ContractsValues;
-        this.aztecNodeAdmin = aztecNode;
+        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 `pxe`, `aztecNodeConfig` and `aztecNode` across all snapshots.
+        // 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), async ({ deployedAccounts }, { pxe, aztecNodeConfig, aztecNode })=>{
-            const wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.accounts = wallets.map((w)=>w.getCompleteAddress());
-            wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            this.user1Wallet = wallets[0];
-            this.user1Address = this.user1Wallet.getAddress();
-            this.user2Wallet = wallets[1];
-            this.user2Address = this.user2Wallet.getAddress();
-            this.pxe = pxe;
+        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.user1Wallet, this.accounts.slice(0, 3));
+            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',
@@ -79,15 +79,14 @@ export class CrossChainMessagingTest {
                 this.l1Client.account.address
             ]).then(({ address })=>address);
             this.logger.verbose(`Setting up cross chain harness...`);
-            this.crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.pxe, this.l1Client, this.user1Wallet, this.user1Address, this.logger, underlyingERC20Address);
+            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();
-        }, async (crossChainContext)=>{
-            this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.user1Wallet);
-            this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.user1Wallet);
+        }, (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());
-            this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
             const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
             const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
             const inbox = getContract({
@@ -100,10 +99,11 @@ export class CrossChainMessagingTest {
                 abi: OutboxAbi,
                 client: l1Client
             });
-            this.crossChainTestHarness = new CrossChainTestHarness(this.aztecNode, this.pxe, this.logger, this.l2Token, this.l2Bridge, this.ethAccount, tokenPortalAddress, crossChainContext.underlying, l1Client, this.aztecNodeConfig.l1Contracts, this.user1Wallet, this.user1Address);
+            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();
         });
     }
 }

package/dest/e2e_deploy_contract/deploy_test.d.ts

@@ -1,11 +1,18 @@
-import { type AccountWallet, type AztecAddress, type AztecNode, type ContractArtifact, type ContractBase, Fr, type Logger, type PXE, type PublicKeys, type Wallet } from '@aztec/aztec.js';
+import type { ContractArtifact } from '@aztec/aztec.js/abi';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type ContractBase } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { PublicKeys } from '@aztec/aztec.js/keys';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
 import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet/server';
 export declare class DeployTest {
     private snapshotManager;
     logger: Logger;
-    pxe: PXE;
-    wallet: AccountWallet;
+    wallet: TestWallet;
     defaultAccountAddress: AztecAddress;
     aztecNode: AztecNode;
     aztecNodeAdmin: AztecNodeAdmin;
@@ -20,11 +27,10 @@ export declare class DeployTest {
         constructorName?: string;
         deployer?: AztecAddress;
     }): Promise<T>;
-    registerRandomAccount(): Promise<AztecAddress>;
 }
 export type StatefulContractCtorArgs = Parameters<StatefulTestContract['methods']['constructor']>;
 export type ContractArtifactClass<T extends ContractBase> = {
-    at(address: AztecAddress, wallet: Wallet): Promise<T>;
+    at(address: AztecAddress, wallet: Wallet): T;
     artifact: ContractArtifact;
 };
-//# sourceMappingURL=deploy_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfZGVwbG95X2NvbnRyYWN0L2RlcGxveV90ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUE4QyxNQUFNLDJCQUEyQixDQUFDO0FBQzFHLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUN2RixPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQU01RCxxQkFBYSxVQUFVO0lBQ3JCLE9BQU8sQ0FBQyxlQUFlLENBQW1CO0lBQ25DLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixNQUFNLEVBQUcsVUFBVSxDQUFDO0lBQ3BCLHFCQUFxQixFQUFHLFlBQVksQ0FBQztJQUNyQyxTQUFTLEVBQUcsU0FBUyxDQUFDO0lBQ3RCLGNBQWMsRUFBRyxjQUFjLENBQUM7SUFFdkMsWUFBWSxRQUFRLEVBQUUsTUFBTSxFQUczQjtJQUVLLEtBQUssa0JBTVY7SUFFSyxRQUFRLGtCQUViO1lBRWEsMkJBQTJCO0lBT25DLGdCQUFnQixDQUFDLENBQUMsU0FBUyxZQUFZLEVBQzNDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsZ0JBQWdCLEVBQUUscUJBQXFCLENBQUMsQ0FBQyxDQUFDLEVBQzFDLElBQUksR0FBRTtRQUNKLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNWLFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztRQUN4QixRQUFRLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQztRQUNqQixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDekIsUUFBUSxDQUFDLEVBQUUsWUFBWSxDQUFDO0tBQ3BCLEdBQ0wsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQVdaO0NBQ0Y7QUFFRCxNQUFNLE1BQU0sd0JBQXdCLEdBQUcsVUFBVSxDQUFDLG9CQUFvQixDQUFDLFNBQVMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7QUFFbEcsTUFBTSxNQUFNLHFCQUFxQixDQUFDLENBQUMsU0FBUyxZQUFZLElBQUk7SUFDMUQsRUFBRSxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sR0FBRyxDQUFDLENBQUM7SUFDN0MsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0NBQzVCLENBQUMifQ==

package/dest/e2e_deploy_contract/deploy_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_test.d.ts","sourceRoot":"","sources":["../../src/e2e_deploy_contract/deploy_test.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,UAAU,EACf,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,qBAAa,UAAU;IACrB,OAAO,CAAC,eAAe,CAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,aAAa,CAAC;IACvB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;gBAE3B,QAAQ,EAAE,MAAM;IAKtB,KAAK;IAQL,QAAQ;YAIA,2BAA2B;IAanC,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAC3C,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAC1C,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,EAAE,CAAC;QACV,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;KACpB,GACL,OAAO,CAAC,CAAC,CAAC;IAaP,qBAAqB,IAAI,OAAO,CAAC,YAAY,CAAC;CAIrD;AAED,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAElG,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,YAAY,IAAI;IAC1D,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACtD,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"deploy_test.d.ts","sourceRoot":"","sources":["../../src/e2e_deploy_contract/deploy_test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAA8C,MAAM,2BAA2B,CAAC;AAC1G,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,UAAU;IACrB,OAAO,CAAC,eAAe,CAAmB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAG,UAAU,CAAC;IACpB,qBAAqB,EAAG,YAAY,CAAC;IACrC,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAEvC,YAAY,QAAQ,EAAE,MAAM,EAG3B;IAEK,KAAK,kBAMV;IAEK,QAAQ,kBAEb;YAEa,2BAA2B;IAOnC,gBAAgB,CAAC,CAAC,SAAS,YAAY,EAC3C,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAC1C,IAAI,GAAE;QACJ,IAAI,CAAC,EAAE,EAAE,CAAC;QACV,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;KACpB,GACL,OAAO,CAAC,CAAC,CAAC,CAWZ;CACF;AAED,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;AAElG,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,YAAY,IAAI;IAC1D,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;IAC7C,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC"}