@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.03f7ef2

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js

@@ -1,7 +1,8 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { AztecAddress, CheatCodes, EthAddress, createLogger } from '@aztec/aztec.js';
-import { createL1Clients, deployL1Contract } from '@aztec/ethereum';
-import { InboxAbi, OutboxAbi, RollupAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
+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-contract';
+import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { getContract } from 'viem';
@@ -12,117 +13,97 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class CrossChainMessagingTest {
     snapshotManager;
     logger;
-    wallets = [];
-    accounts = [];
     aztecNode;
-    pxe;
     aztecNodeConfig;
-    publicClient;
-    user1Wallet;
-    user2Wallet;
+    aztecNodeAdmin;
+    ctx;
+    l1Client;
+    wallet;
+    ownerAddress;
+    user1Address;
+    user2Address;
     crossChainTestHarness;
     ethAccount;
-    ownerAddress;
     l2Token;
     l2Bridge;
-    rollup;
     inbox;
     outbox;
-    cheatcodes;
-    constructor(testName){
+    cheatCodes;
+    deployL1ContractsValues;
+    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(await this.rollup.read.getPendingBlockNumber());
+        await this.cheatCodes.rollup.markAsProven();
     }
     async setup() {
-        const { aztecNode, pxe, aztecNodeConfig } = await this.snapshotManager.setup();
-        this.aztecNode = aztecNode;
-        this.pxe = pxe;
-        this.aztecNodeConfig = aztecNodeConfig;
-        this.cheatcodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
+        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, deployL1ContractsValues })=>{
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            this.rollup = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-                abi: RollupAbi,
-                client: deployL1ContractsValues.walletClient
-            });
-            this.user1Wallet = this.wallets[0];
-            this.user2Wallet = this.wallets[1];
-            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.wallets[0], this.accounts.slice(0, 3));
-            const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
-            const underlyingERC20Address = await deployL1Contract(walletClient, publicClient, TestERC20Abi, TestERC20Bytecode, [
+            await publicDeployAccounts(this.wallet, [
+                this.ownerAddress,
+                this.user1Address,
+                this.user2Address
+            ]);
+            this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+            const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
                 'Underlying',
                 'UND',
-                walletClient.account.address
+                this.l1Client.account.address
             ]).then(({ address })=>address);
-            const underlyingERC20 = getContract({
-                address: underlyingERC20Address.toString(),
-                abi: TestERC20Abi,
-                client: walletClient
-            });
-            // allow anyone to mint
-            await underlyingERC20.write.setFreeForAll([
-                true
-            ], {});
             this.logger.verbose(`Setting up cross chain harness...`);
-            this.crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.pxe, publicClient, walletClient, this.wallets[0], 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.toCrossChainContext();
-        }, async (crossChainContext)=>{
-            this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.user1Wallet);
-            this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.user1Wallet);
+            return this.crossChainTestHarness.toCrossChainContext();
+        }, (crossChainContext)=>{
+            this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
+            this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
             // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
             this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
-            this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
             const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
-            const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+            const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
             const inbox = getContract({
                 address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
                 abi: InboxAbi,
-                client: walletClient
+                client: l1Client
             });
             const outbox = getContract({
                 address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
                 abi: OutboxAbi,
-                client: walletClient
+                client: l1Client
             });
-            this.crossChainTestHarness = new CrossChainTestHarness(this.aztecNode, this.pxe, this.logger, this.l2Token, this.l2Bridge, this.ethAccount, tokenPortalAddress, crossChainContext.underlying, publicClient, walletClient, this.aztecNodeConfig.l1Contracts, this.user1Wallet);
-            this.publicClient = publicClient;
+            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();
         });
     }
-    toCrossChainContext() {
-        return {
-            l2Token: this.crossChainTestHarness.l2Token.address,
-            l2Bridge: this.crossChainTestHarness.l2Bridge.address,
-            tokenPortal: this.crossChainTestHarness.tokenPortalAddress,
-            underlying: this.crossChainTestHarness.underlyingERC20Address,
-            ethAccount: this.crossChainTestHarness.ethAccount,
-            ownerAddress: this.crossChainTestHarness.ownerAddress,
-            inbox: this.crossChainTestHarness.l1ContractAddresses.inboxAddress,
-            outbox: this.crossChainTestHarness.l1ContractAddresses.outboxAddress
-        };
-    }
 }

package/dest/e2e_deploy_contract/deploy_test.d.ts

@@ -1,12 +1,21 @@
-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 { StatefulTestContract } from '@aztec/noir-contracts.js/StatefulTest';
+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;
-    private wallets;
     logger: Logger;
-    pxe: PXE;
-    wallet: AccountWallet;
+    wallet: TestWallet;
+    defaultAccountAddress: AztecAddress;
     aztecNode: AztecNode;
+    aztecNodeAdmin: AztecNodeAdmin;
     constructor(testName: string);
     setup(): Promise<this>;
     teardown(): Promise<void>;
@@ -18,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,uCAAuC,CAAC;AAMlF,qBAAa,UAAU;IACrB,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,OAAO,CAAuB;IAE/B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAG,GAAG,CAAC;IACV,MAAM,EAAG,aAAa,CAAC;IACvB,SAAS,EAAG,SAAS,CAAC;gBAEjB,QAAQ,EAAE,MAAM;IAKtB,KAAK;IAOL,QAAQ;YAIA,2BAA2B;IAYnC,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"}

package/dest/e2e_deploy_contract/deploy_test.js

@@ -1,14 +1,15 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { Fr, createLogger, getContractInstanceFromDeployParams } 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;
-    wallets = [];
     logger;
-    pxe;
     wallet;
+    defaultAccountAddress;
     aztecNode;
+    aztecNodeAdmin;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_deploy_contract:${testName}`);
         this.snapshotManager = createSnapshotManager(`e2e_deploy_contract/${testName}`, dataPath);
@@ -16,36 +17,29 @@ 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;
     }
     async teardown() {
         await this.snapshotManager.teardown();
     }
     async applyInitialAccountSnapshot() {
-        await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), async ({ deployedAccounts }, { pxe })=>{
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-            this.wallet = this.wallets[0];
+        await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), ({ deployedAccounts })=>{
+            this.defaultAccountAddress = deployedAccounts[0].address;
+            return Promise.resolve();
         });
     }
     async registerContract(wallet, contractArtifact, opts = {}) {
         const { salt, publicKeys, initArgs, constructorName, deployer } = opts;
-        const instance = await getContractInstanceFromDeployParams(contractArtifact.artifact, {
+        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,20 +1,32 @@
-import { AztecNodeService } from '@aztec/aztec-node';
-import { type Logger } from '@aztec/aztec.js';
-import { ChainMonitor } from '@aztec/aztec.js/ethereum';
+import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+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 { RollupContract } from '@aztec/ethereum/contracts';
-import { type Delayer } from '@aztec/ethereum/test';
-import { ProverNode } from '@aztec/prover-node';
-import type { L2BlockNumber } from '@aztec/stdlib/block';
-import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import type { PublicClient } from 'viem';
+import { ChainMonitor, type Delayer } from '@aztec/ethereum/test';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
+import { ProverNode, type ProverNodeConfig } from '@aztec/prover-node';
+import { type SequencerClient, type SequencerEvents } from '@aztec/sequencer-client';
+import { type BlockParameter, EthAddress } from '@aztec/stdlib/block';
+import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
-export declare const L1_BLOCK_TIME_IN_S: number;
-export declare const EPOCH_DURATION_IN_L2_SLOTS = 4;
-export declare const L2_SLOT_DURATION_IN_L1_SLOTS = 2;
 export declare const WORLD_STATE_BLOCK_HISTORY = 2;
 export declare const WORLD_STATE_BLOCK_CHECK_INTERVAL = 50;
 export declare const ARCHIVER_POLL_INTERVAL = 50;
-export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode'>>;
+export declare const DEFAULT_L1_BLOCK_TIME: number;
+export type EpochsTestOpts = Partial<SetupOptions> & {
+    numberOfAccounts?: number;
+};
+export type TrackedSequencerEvent = {
+    [K in keyof SequencerEvents]: Parameters<SequencerEvents[K]>[0] & {
+        type: K;
+        sequencerIndex: number;
+        validator: EthAddress;
+    };
+}[keyof SequencerEvents];
 /**
  * Tests building of epochs using fast block times and short epochs.
  * Spawns an aztec node and a prover node with fake proofs.
@@ -22,30 +34,61 @@ export type EpochsTestOpts = Partial<Pick<SetupOptions, 'startProverNode'>>;
  */
 export declare class EpochsTestContext {
     context: EndToEndContext;
-    l1Client: PublicClient;
+    l1Client: ExtendedViemWalletClient;
     rollup: RollupContract;
     constants: L1RollupConstants;
     logger: Logger;
     monitor: ChainMonitor;
+    epochCache: EpochCache;
     proverDelayer: Delayer;
     sequencerDelayer: Delayer;
     proverNodes: ProverNode[];
     nodes: AztecNodeService[];
+    epochDuration: number;
+    L1_BLOCK_TIME_IN_S: number;
+    L2_SLOT_DURATION_IN_S: number;
     static setup(opts?: EpochsTestOpts): Promise<EpochsTestContext>;
+    static getSlotDurations(opts?: EpochsTestOpts): {
+        l1PublishingTime: number;
+        ethereumSlotDuration: number;
+        aztecSlotDuration: number;
+        aztecEpochDuration: number;
+        aztecProofSubmissionEpochs: number;
+    };
     setup(opts?: EpochsTestOpts): Promise<void>;
     teardown(): Promise<void>;
-    createProverNode(): Promise<ProverNode>;
-    createNonValidatorNode(): Promise<AztecNodeService>;
+    createProverNode(opts?: {
+        dontStart?: boolean;
+    } & Partial<ProverNodeConfig>): Promise<ProverNode>;
+    createNonValidatorNode(opts?: Partial<AztecNodeConfig>): Promise<AztecNodeService>;
+    createValidatorNode(privateKeys: `0x${string}`[], opts?: Partial<AztecNodeConfig> & {
+        txDelayerMaxInclusionTimeIntoSlot?: number;
+        dontStartSequencer?: boolean;
+    }): Promise<AztecNodeService>;
+    private createNode;
     private getNextPrivateKey;
     /** Waits until the epoch begins (ie until the immediately previous L1 block is mined). */
     waitUntilEpochStarts(epoch: number): Promise<bigint>;
-    /** Waits until the given L2 block number is mined. */
-    waitUntilL2BlockNumber(target: number, timeout?: number): Promise<void>;
-    /** Waits until the given L2 block number is marked as proven. */
-    waitUntilProvenL2BlockNumber(t: number, timeout?: number): Promise<void>;
+    /** Waits until the given checkpoint number is mined. */
+    waitUntilCheckpointNumber(target: CheckpointNumber, timeout?: number): Promise<void>;
+    /** Waits until the given checkpoint number is marked as proven. */
+    waitUntilProvenCheckpointNumber(target: CheckpointNumber, timeout?: number): Promise<CheckpointNumber>;
+    /** Waits until the last slot of the proof submission window for a given epoch. */
+    waitUntilLastSlotOfProofSubmissionWindow(epochNumber: number | bigint): Promise<void>;
     /** Waits for the aztec node to sync to the target block number. */
-    waitForNodeToSync(blockNumber: number, type: 'finalised' | 'historic'): Promise<void>;
+    waitForNodeToSync(blockNumber: BlockNumber, type: 'proven' | 'finalized' | 'historic'): Promise<void>;
+    /** Registers the SpamContract on the given wallet. */
+    registerSpamContract(wallet: Wallet, salt?: Fr): Promise<SpamContract>;
+    /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */
+    createL1Client(): Promise<{
+        client: ExtendedViemWalletClient;
+        delayer: Delayer;
+    }>;
     /** Verifies whether the given block number is found on the aztec node. */
-    verifyHistoricBlock(blockNumber: L2BlockNumber, expectedSuccess: boolean): Promise<void>;
+    verifyHistoricBlock(blockNumber: BlockParameter, expectedSuccess: boolean): Promise<void>;
+    watchSequencerEvents(sequencers: SequencerClient[], getMetadata?: (i: number) => Record<string, any>): {
+        failEvents: TrackedSequencerEvent[];
+        stateChanges: TrackedSequencerEvent[];
+    };
 }
-//# sourceMappingURL=epochs_test.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hzX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lMmVfZXBvY2hzL2Vwb2Noc190ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRzNFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHaEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sRUFBRSxZQUFZLEVBQWtCLEtBQUssT0FBTyxFQUFxQyxNQUFNLHNCQUFzQixDQUFDO0FBQ3JILE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDdEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBZSxNQUFNLGlDQUFpQyxDQUFDO0FBTTdGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVsRSxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssZ0JBQWdCLEVBQXVCLE1BQU0sb0JBQW9CLENBQUM7QUFFNUYsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUNwQixLQUFLLGVBQWUsRUFHckIsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdEUsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQXVDLE1BQU0sNkJBQTZCLENBQUM7QUFPMUcsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUNwQixLQUFLLFlBQVksRUFJ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

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":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAM,KAAK,MAAM,EAAgD,MAAM,iBAAiB,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAkB,KAAK,OAAO,EAAwB,MAAM,sBAAsB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAuB,MAAM,oBAAoB,CAAC;AAIrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAIrE,OAAO,KAAK,EAAO,YAAY,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAC;AAG9B,eAAO,MAAM,kBAAkB,QAAsE,CAAC;AACtG,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAC5C,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAC3C,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAE5E;;;;GAIG;AACH,qBAAa,iBAAiB;IACrB,OAAO,EAAG,eAAe,CAAC;IAC1B,QAAQ,EAAG,YAAY,CAAC;IACxB,MAAM,EAAG,cAAc,CAAC;IACxB,SAAS,EAAG,iBAAiB,CAAC;IAC9B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,YAAY,CAAC;IACvB,aAAa,EAAG,OAAO,CAAC;IACxB,gBAAgB,EAAG,OAAO,CAAC;IAE3B,WAAW,EAAE,UAAU,EAAE,CAAM;IAC/B,KAAK,EAAE,gBAAgB,EAAE,CAAM;WAElB,KAAK,CAAC,IAAI,GAAE,cAAmB;IAMtC,KAAK,CAAC,IAAI,GAAE,cAAmB;IA+D/B,QAAQ;IAOR,gBAAgB;IAgBhB,sBAAsB;IAcnC,OAAO,CAAC,iBAAiB;IAKzB,0FAA0F;IAC7E,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAO/C,sDAAsD;IACzC,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAK;IAShE,iEAAiE;IACpD,4BAA4B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,SAAK;IASjE,mEAAmE;IACtD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU;IAclF,0EAA0E;IAC7D,mBAAmB,CAAC,WAAW,EAAE,aAAa,EAAE,eAAe,EAAE,OAAO;CAOtF"}
+{"version":3,"file":"epochs_test.d.ts","sourceRoot":"","sources":["../../src/e2e_epochs/epochs_test.ts"],"names":[],"mappings":"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"}