@aztec/end-to-end 3.0.0-nightly.20250910 → 3.0.0-nightly.20250912

package/dest/bench/client_flows/client_flows_benchmark.d.ts

@@ -1,4 +1,4 @@
-import { type AccountWallet, AccountWalletWithSecretKey, AztecAddress, type AztecNode, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, type FeePaymentMethod, type Logger, type PXE, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, type FeePaymentMethod, type Logger, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, type Wallet } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type DeployL1ContractsArgs } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -8,24 +8,25 @@ import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TestWallet } from '@aztec/test-wallet';
 import { type SubsystemsContext } from '../../fixtures/snapshot_manager.js';
 import { type SetupOptions } from '../../fixtures/utils.js';
 import { CrossChainTestHarness } from '../../shared/cross_chain_test_harness.js';
 import { type GasBridgingTestHarness } from '../../shared/gas_portal_test_harness.js';
 import { type ClientFlowsConfig } from './config.js';
 export type AccountType = 'ecdsar1' | 'schnorr';
-export type FeePaymentMethodGetter = (wallet: Wallet) => Promise<FeePaymentMethod>;
+export type FeePaymentMethodGetter = (wallet: Wallet, sender: AztecAddress) => Promise<FeePaymentMethod>;
 export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 export declare class ClientFlowsBenchmark {
     private snapshotManager;
     logger: Logger;
-    pxe: PXE;
+    private pxe;
     aztecNode: AztecNode;
     cheatCodes: CheatCodes;
     context: SubsystemsContext;
     chainMonitor: ChainMonitor;
     feeJuiceBridgeTestHarness: GasBridgingTestHarness;
-    adminWallet: AccountWallet;
+    adminWallet: TestWallet;
     adminAddress: AztecAddress;
     sequencerAddress: AztecAddress;
     coinbase: EthAddress;
@@ -36,7 +37,8 @@ export declare class ClientFlowsBenchmark {
     amm: AMMContract;
     liquidityToken: TokenContract;
     sponsoredFPC: SponsoredFPCContract;
-    userPXE: PXE;
+    userWallet: TestWallet;
+    private userPXE;
     realProofs: boolean;
     paymentMethods: Record<BenchmarkingFeePaymentMethod, {
         forWallet: FeePaymentMethodGetter;
@@ -50,7 +52,7 @@ export declare class ClientFlowsBenchmark {
     mintAndBridgeFeeJuice(address: AztecAddress): Promise<void>;
     /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
     mintPrivateBananas(amount: bigint, address: AztecAddress): Promise<void>;
-    createBenchmarkingAccountManager(pxe: PXE, type: 'ecdsar1' | 'schnorr'): Promise<import("@aztec/aztec.js").AccountManager>;
+    createBenchmarkingAccountManager(wallet: TestWallet, type: 'ecdsar1' | 'schnorr'): Promise<import("@aztec/aztec.js").AccountManager>;
     applyBaseSnapshots(): Promise<void>;
     applyInitialAccountsSnapshot(): Promise<void>;
     applySetupFeeJuiceSnapshot(): Promise<void>;
@@ -58,12 +60,12 @@ export declare class ClientFlowsBenchmark {
     applyDeployCandyBarTokenSnapshot(): Promise<void>;
     applyFPCSetupSnapshot(): Promise<void>;
     applyDeploySponsoredFPCSnapshot(): Promise<void>;
-    createCrossChainTestHarness(owner: AccountWallet): Promise<CrossChainTestHarness>;
-    createAndFundBenchmarkingWallet(accountType: AccountType): Promise<AccountWalletWithSecretKey>;
+    createCrossChainTestHarness(owner: AztecAddress): Promise<CrossChainTestHarness>;
+    createAndFundBenchmarkingAccountOnUserWallet(accountType: AccountType): Promise<AztecAddress>;
     applyDeployAmmSnapshot(): Promise<void>;
-    getBridgedFeeJuicePaymentMethodForWallet(wallet: Wallet): Promise<FeeJuicePaymentMethodWithClaim>;
-    getPrivateFPCPaymentMethodForWallet(wallet: Wallet): Promise<PrivateFeePaymentMethod>;
-    getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet): Promise<SponsoredFeePaymentMethod>;
-    getFeeJuicePaymentMethodForWallet(wallet: Wallet): Promise<FeeJuicePaymentMethod>;
+    getBridgedFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress): Promise<FeeJuicePaymentMethodWithClaim>;
+    getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress): Promise<PrivateFeePaymentMethod>;
+    getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet, _sender: AztecAddress): Promise<SponsoredFeePaymentMethod>;
+    getFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress): Promise<FeeJuicePaymentMethod>;
 }
 //# sourceMappingURL=client_flows_benchmark.d.ts.map

package/dest/bench/client_flows/client_flows_benchmark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client_flows_benchmark.d.ts","sourceRoot":"","sources":["../../../src/bench/client_flows/client_flows_benchmark.ts"],"names":[],"mappings":"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"}

package/dest/bench/client_flows/client_flows_benchmark.js

@@ -1,6 +1,4 @@
-import { EcdsaRAccountContractArtifact, getEcdsaRAccount } from '@aztec/accounts/ecdsa';
-import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { AccountWalletWithSecretKey, FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
+import { FeeJuicePaymentMethod, FeeJuicePaymentMethodWithClaim, PrivateFeePaymentMethod, SponsoredFeePaymentMethod, createLogger } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -18,6 +16,7 @@ import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { TestWallet } from '@aztec/test-wallet';
 import { MNEMONIC } from '../../fixtures/fixtures.js';
 import { createSnapshotManager, deployAccounts } from '../../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
@@ -36,8 +35,8 @@ export class ClientFlowsBenchmark {
     context;
     chainMonitor;
     feeJuiceBridgeTestHarness;
-    // The admin that aids in the setup of the test
     adminWallet;
+    // The admin that aids in the setup of the test
     adminAddress;
     // Aztec Node config
     sequencerAddress;
@@ -55,7 +54,8 @@ export class ClientFlowsBenchmark {
     liquidityToken;
     // Sponsored FPC contract
     sponsoredFPC;
-    // PXE used by the benchmarking user. It can be set up with client-side proving enabled
+    // PXE and Wallet used by the benchmarking user. It can be set up with client-side proving enabled
+    userWallet;
     userPXE;
     realProofs = [
         'true',
@@ -125,42 +125,38 @@ export class ClientFlowsBenchmark {
         const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate({
             from: this.adminAddress
         });
-        await mintTokensToPrivate(this.bananaCoin, this.adminAddress, this.adminWallet, address, amount);
+        await mintTokensToPrivate(this.bananaCoin, this.adminAddress, address, amount);
         const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate({
             from: this.adminAddress
         });
         expect(balanceAfter).toEqual(balanceBefore + amount);
     }
-    async createBenchmarkingAccountManager(pxe, type) {
-        const benchysSecretKey = Fr.random();
+    createBenchmarkingAccountManager(wallet, type) {
+        const benchysSecret = Fr.random();
         const salt = Fr.random();
         let benchysPrivateSigningKey;
-        let benchysAccountManager;
         if (type === 'schnorr') {
-            benchysPrivateSigningKey = deriveSigningKey(benchysSecretKey);
-            benchysAccountManager = await getSchnorrAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
+            benchysPrivateSigningKey = deriveSigningKey(benchysSecret);
+            return wallet.createSchnorrAccount(benchysSecret, salt, benchysPrivateSigningKey);
         } else if (type === 'ecdsar1') {
             benchysPrivateSigningKey = randomBytes(32);
-            benchysAccountManager = await getEcdsaRAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
+            return wallet.createECDSARAccount(benchysSecret, salt, benchysPrivateSigningKey);
         } else {
             throw new Error(`Unknown account type: ${type}`);
         }
-        await benchysAccountManager.register();
-        return benchysAccountManager;
     }
     async applyBaseSnapshots() {
         await this.applyInitialAccountsSnapshot();
         await this.applySetupFeeJuiceSnapshot();
     }
     async applyInitialAccountsSnapshot() {
-        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(2, this.logger), async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig })=>{
+        await this.snapshotManager.snapshot('initial_accounts', deployAccounts(2, this.logger), async ({ deployedAccounts: [{ address: adminAddress }, { address: sequencerAddress }] }, { wallet, pxe, aztecNode, aztecNodeConfig })=>{
             this.pxe = pxe;
+            this.adminWallet = wallet;
             this.aztecNode = aztecNode;
             this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
-            const deployedWallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            [this.adminWallet] = deployedWallets;
-            this.adminAddress = this.adminWallet.getAddress();
-            this.sequencerAddress = deployedWallets[1].getAddress();
+            this.adminAddress = adminAddress;
+            this.sequencerAddress = sequencerAddress;
             const canonicalFeeJuice = await getCanonicalFeeJuice();
             this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
             this.coinbase = EthAddress.random();
@@ -176,6 +172,7 @@ export class ClientFlowsBenchmark {
                     prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied')
                 }
             });
+            this.userWallet = new TestWallet(this.userPXE);
         });
     }
     async applySetupFeeJuiceSnapshot() {
@@ -254,29 +251,28 @@ export class ClientFlowsBenchmark {
             l1Client.account.address
         ]).then(({ address })=>address);
         this.logger.verbose(`Setting up cross chain harness...`);
-        const crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.pxe, l1Client, owner, owner.getAddress(), this.logger, underlyingERC20Address);
+        const crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.pxe, l1Client, this.adminWallet, owner, this.logger, underlyingERC20Address);
         this.logger.verbose(`L2 token deployed to: ${crossChainTestHarness.l2Token.address}`);
         return crossChainTestHarness;
     }
-    async createAndFundBenchmarkingWallet(accountType) {
-        const benchysAccountManager = await this.createBenchmarkingAccountManager(this.pxe, accountType);
-        const benchysWallet = await benchysAccountManager.getWallet();
+    async createAndFundBenchmarkingAccountOnUserWallet(accountType) {
+        const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
+        const benchysAccount = await benchysAccountManager.getAccount();
         const benchysAddress = benchysAccountManager.getAddress();
         const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
-        const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysWallet, claim);
+        const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysAddress, claim);
         await benchysAccountManager.deploy({
             fee: {
                 paymentMethod
             }
         }).wait();
-        // Register benchy on the user's PXE, where we're going to be interacting from
-        await this.userPXE.registerContract({
-            instance: benchysAccountManager.getInstance(),
-            artifact: accountType === 'ecdsar1' ? EcdsaRAccountContractArtifact : SchnorrAccountContractArtifact
+        // Register benchy on the user's Wallet, where we're going to be interacting from
+        const accountManager = await this.userWallet.createAccount({
+            secret: benchysAccount.getSecretKey(),
+            salt: new Fr(benchysAccount.salt),
+            contract: benchysAccountManager.getAccountContract()
         });
-        await this.userPXE.registerAccount(benchysWallet.getSecretKey(), benchysWallet.getCompleteAddress().partialAddress);
-        const entrypoint = await benchysAccountManager.getAccount();
-        return new AccountWalletWithSecretKey(this.userPXE, entrypoint, benchysWallet.getSecretKey(), benchysAccountManager.salt);
+        return accountManager.getAddress();
     }
     async applyDeployAmmSnapshot() {
         await this.snapshotManager.snapshot('deploy_amm', async ()=>{
@@ -299,17 +295,17 @@ export class ClientFlowsBenchmark {
             this.amm = await AMMContract.at(ammAddress, this.adminWallet);
         });
     }
-    async getBridgedFeeJuicePaymentMethodForWallet(wallet) {
-        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(wallet.getAddress());
-        return new FeeJuicePaymentMethodWithClaim(wallet, claim);
+    async getBridgedFeeJuicePaymentMethodForWallet(_wallet, sender) {
+        const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(sender);
+        return new FeeJuicePaymentMethodWithClaim(sender, claim);
     }
-    getPrivateFPCPaymentMethodForWallet(wallet) {
-        return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, wallet));
+    getPrivateFPCPaymentMethodForWallet(wallet, sender) {
+        return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet));
     }
-    getSponsoredFPCPaymentMethodForWallet(_wallet) {
+    getSponsoredFPCPaymentMethodForWallet(_wallet, _sender) {
         return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
     }
-    getFeeJuicePaymentMethodForWallet(wallet) {
-        return Promise.resolve(new FeeJuicePaymentMethod(wallet.getAddress()));
+    getFeeJuicePaymentMethodForWallet(_wallet, sender) {
+        return Promise.resolve(new FeeJuicePaymentMethod(sender));
     }
 }

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,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;;;;;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,wBAAsB,OAAO,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,GAAE,OAAe,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CAOnB;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"}

package/dest/bench/utils.js

@@ -14,8 +14,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 +93,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, [
@@ -115,8 +116,9 @@ function getMetricValues(points) {
  */ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
     const calls = times(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
     context.logger.info(`Creating ${txCount} txs`);
+    const [from] = context.accounts;
     const provenTxs = await Promise.all(calls.map((call)=>call.prove({
-            from: context.wallet.getAddress()
+            from
         })));
     context.logger.info(`Sending ${txCount} txs`);
     return provenTxs.map((tx)=>tx.send());

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts

@@ -1,8 +1,9 @@
-import { type AccountWallet, AztecAddress, type AztecNode, type CompleteAddress, Fr, type Logger, type PXE, type TxHash } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, Fr, type Logger, type PXE, type TxHash } from '@aztec/aztec.js';
 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';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class Role {
@@ -22,20 +23,16 @@ export declare class BlacklistTokenContractTest {
     static CHANGE_ROLES_DELAY: number;
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
+    wallet: TestWallet;
     pxe: PXE;
-    accounts: CompleteAddress[];
     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>;

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,EACL,YAAY,EACZ,KAAK,SAAS,EACd,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;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIrD,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,MAAM,EAAG,UAAU,CAAC;IACpB,GAAG,EAAG,GAAG,CAAC;IACV,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;gBAEtB,QAAQ,EAAE,MAAM;IAKtB,sBAAsB;IAQ5B;;;;OAIG;IACG,kBAAkB;IAiElB,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;CAmExB"}

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.js

@@ -1,4 +1,3 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { Fr, computeSecretHash, createLogger } from '@aztec/aztec.js';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
@@ -37,20 +36,16 @@ export class BlacklistTokenContractTest {
     static CHANGE_ROLES_DELAY = 86400;
     snapshotManager;
     logger;
-    wallets = [];
+    wallet;
     pxe;
-    accounts = [];
     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 +61,33 @@ 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 })=>{
+        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), ({ deployedAccounts }, { pxe, cheatCodes, aztecNode, sequencer, wallet })=>{
             this.pxe = pxe;
             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 = await 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 = await 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
@@ -127,22 +127,22 @@ export class BlacklistTokenContractTest {
     }
     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,28 +1,27 @@
 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, type AztecNode, EthAddress, type Logger, type PXE } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { 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';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.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;
     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;

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,KAAK,SAAS,EAAE,UAAU,EAAE,KAAK,MAAM,EAAE,KAAK,GAAG,EAAgB,MAAM,iBAAiB,CAAC;AAChH,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;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAKrD,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,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,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;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;CA0FzB"}