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

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 = 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
@@ -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,35 +1,37 @@
 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, 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;
-    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>;

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;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;gBAE1C,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,EAAE,qBAAqB,GAAE,OAAO,CAAC,qBAAqB,CAAM;IAQ3G,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;CAuFzB"}

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js

@@ -1,6 +1,5 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { AztecAddress, EthAddress, createLogger } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec/testing';
+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';
@@ -13,65 +12,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 +78,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);
+            this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.wallet);
+            this.l2Bridge = await 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,7 +98,7 @@ 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;

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,7 +27,6 @@ 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> = {

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;gBAE3B,QAAQ,EAAE,MAAM;IAKtB,KAAK;IAQL,QAAQ;YAIA,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;CAYd;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"}

package/dest/e2e_deploy_contract/deploy_test.js

@@ -1,11 +1,11 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { Fr, createLogger, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { createLogger } from '@aztec/aztec.js/log';
 import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 export class DeployTest {
     snapshotManager;
     logger;
-    pxe;
     wallet;
     defaultAccountAddress;
     aztecNode;
@@ -17,7 +17,7 @@ export class DeployTest {
     async setup() {
         await this.applyInitialAccountSnapshot();
         const context = await this.snapshotManager.setup();
-        ({ pxe: this.pxe, aztecNode: this.aztecNode } = context);
+        ({ aztecNode: this.aztecNode, wallet: this.wallet } = context);
         this.aztecNodeAdmin = context.aztecNode;
         return this;
     }
@@ -25,11 +25,9 @@ export class DeployTest {
         await this.snapshotManager.teardown();
     }
     async applyInitialAccountSnapshot() {
-        await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), async ({ deployedAccounts }, { pxe })=>{
-            const wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            this.wallet = wallets[0];
-            this.defaultAccountAddress = this.wallet.getAddress();
+        await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), ({ deployedAccounts })=>{
+            this.defaultAccountAddress = deployedAccounts[0].address;
+            return Promise.resolve();
         });
     }
     async registerContract(wallet, contractArtifact, opts = {}) {
@@ -37,18 +35,11 @@ export class DeployTest {
         const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
             constructorArgs: initArgs ?? [],
             constructorArtifact: constructorName,
-            salt,
+            salt: salt ?? Fr.random(),
             publicKeys,
             deployer
         });
-        await wallet.registerContract({
-            artifact: contractArtifact.artifact,
-            instance
-        });
+        await wallet.registerContract(instance, contractArtifact.artifact);
         return contractArtifact.at(instance.address, wallet);
     }
-    async registerRandomAccount() {
-        const completeAddress = await this.pxe.registerAccount(Fr.random(), Fr.random());
-        return completeAddress.address;
-    }
 }

package/dest/e2e_epochs/epochs_test.d.ts

@@ -1,10 +1,13 @@
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { Fr, type Logger, type Wallet } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { EpochCache } from '@aztec/epoch-cache';
 import { type ExtendedViemWalletClient } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, type Delayer } from '@aztec/ethereum/test';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
-import { ProverNode } from '@aztec/prover-node';
+import { ProverNode, type ProverNodeConfig } from '@aztec/prover-node';
 import { type SequencerClient, type SequencerEvents } from '@aztec/sequencer-client';
 import { EthAddress, type L2BlockNumber } from '@aztec/stdlib/block';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
@@ -35,6 +38,7 @@ export declare class EpochsTestContext {
     constants: L1RollupConstants;
     logger: Logger;
     monitor: ChainMonitor;
+    epochCache: EpochCache;
     proverDelayer: Delayer;
     sequencerDelayer: Delayer;
     proverNodes: ProverNode[];
@@ -51,7 +55,9 @@ export declare class EpochsTestContext {
     };
     setup(opts?: EpochsTestOpts): Promise<void>;
     teardown(): Promise<void>;
-    createProverNode(): Promise<ProverNode>;
+    createProverNode(opts?: {
+        dontStart?: boolean;
+    } & Partial<ProverNodeConfig>): Promise<ProverNode>;
     createNonValidatorNode(opts?: Partial<AztecNodeConfig>): Promise<AztecNodeService>;
     createValidatorNode(privateKeys: `0x${string}`[], opts?: Partial<AztecNodeConfig> & {
         txDelayerMaxInclusionTimeIntoSlot?: number;

package/dest/e2e_epochs/epochs_test.d.ts.map

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

package/dest/e2e_epochs/epochs_test.js

@@ -1,11 +1,17 @@
 import { AztecNodeService } from '@aztec/aztec-node';
-import { Fr, MerkleTreeId, getContractInstanceFromInstantiationParams, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
+import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { MerkleTreeId } from '@aztec/aztec.js/trees';
+import { EpochCache } from '@aztec/epoch-cache';
 import { DefaultL1ContractsConfig, createExtendedL1Client } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, DelayedTxUtils, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { withLogNameSuffix } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+import { sleep } from '@aztec/foundation/sleep';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
 import { SequencerState } from '@aztec/sequencer-client';
@@ -30,6 +36,7 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
     constants;
     logger;
     monitor;
+    epochCache;
     proverDelayer;
     sequencerDelayer;
     proverNodes = [];
@@ -81,9 +88,6 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
             // using the prover's eth address if the proverId is used for something in the rollup contract
             // Use numeric EthAddress for deterministic prover id
             proverId: EthAddress.fromNumber(1),
-            // This must be enough so that the tx from the prover is delayed properly,
-            // but not so much to hang the sequencer and timeout the teardown
-            txPropagationMaxQueryAttempts: opts.txPropagationMaxQueryAttempts ?? 12,
             worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
             exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
             slasherFlavor: 'none',
@@ -99,6 +103,9 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
         this.logger = context.logger;
         this.l1Client = context.deployL1ContractsValues.l1Client;
         this.rollup = RollupContract.getFromConfig(context.config);
+        this.epochCache = await EpochCache.create(this.rollup, context.config, {
+            dateProvider: context.dateProvider
+        });
         // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
         this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();
         // This is hideous.
@@ -126,15 +133,17 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
         await Promise.all(this.nodes.map((node)=>tryStop(node, this.logger)));
         await this.context.teardown();
     }
-    async createProverNode() {
+    async createProverNode(opts = {}) {
         this.logger.warn('Creating and syncing a simulated prover node...');
         const proverNodePrivateKey = this.getNextPrivateKey();
         const suffix = (this.proverNodes.length + 1).toString();
         const proverNode = await withLogNameSuffix(suffix, ()=>createAndSyncProverNode(proverNodePrivateKey, {
-                ...this.context.config,
-                proverId: EthAddress.fromNumber(parseInt(suffix, 10))
+                ...this.context.config
             }, {
-                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex'))
+                dataDirectory: join(this.context.config.dataDirectory, randomBytes(8).toString('hex')),
+                proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
+                dontStart: opts.dontStart,
+                ...opts
             }, this.context.aztecNode, undefined, {
                 dateProvider: this.context.dateProvider
             }));
@@ -255,10 +264,7 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
             publicKeys: undefined,
             deployer: undefined
         });
-        await wallet.registerContract({
-            artifact: SpamContract.artifact,
-            instance
-        });
+        await wallet.registerContract(instance, SpamContract.artifact);
         return SpamContract.at(instance.address, wallet);
     }
     /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */ async createL1Client() {
@@ -318,7 +324,7 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
                 sequencer.getSequencer().on(eventName, (args)=>{
                     const evt = makeEvent(i, eventName, args);
                     failEvents.push(evt);
-                    this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, evt);
+                    this.logger.error(`Failed event ${eventName} from sequencer ${sequencerIndex}`, undefined, evt);
                 });
             });
         });