@aztec/end-to-end 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.21

package/README.md

@@ -22,3 +22,5 @@ yarn test:integration
 which will spawn the two processes.
 
 You can also run this by `docker-compose up` which will spawn 2 different containers for Anvil and the test runner.
+
+You can run a single test by running `yarn test:compose <test_name>`.

package/dest/bench/utils.d.ts

@@ -0,0 +1,70 @@
+import { type AztecNode, BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js';
+import { BenchmarkingContract } from '@aztec/noir-contracts.js/Benchmarking';
+import { type PXEService } from '@aztec/pxe';
+import type { MetricsType } from '@aztec/telemetry-client';
+import type { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
+import { type EndToEndContext, type SetupOptions } from '../fixtures/utils.js';
+/**
+ * Setup for benchmarks. Initializes a remote node with a single account and deploys a benchmark contract.
+ */
+export declare function benchmarkSetup(opts: Partial<SetupOptions> & {
+    /** What metrics to export */ metrics: (MetricsType | MetricFilter)[];
+    /** Where to output the benchmark data (defaults to BENCH_OUTPUT or bench.json) */
+    benchOutput?: string;
+}): Promise<{
+    telemetry: BenchmarkTelemetryClient;
+    context: EndToEndContext;
+    contract: BenchmarkingContract;
+    sequencer: import("@aztec/sequencer-client").SequencerClient;
+}>;
+type MetricFilter = {
+    source: MetricsType;
+    transform: (value: number) => number;
+    name: string;
+    unit?: string;
+};
+/**
+ * Creates and returns a directory with the current job name and a random number.
+ * @param index - Index to merge into the dir path.
+ * @returns A path to a created dir.
+ */
+export declare function makeDataDirectory(index: number): string;
+/**
+ * Returns the size in disk of a folder.
+ * @param path - Path to the folder.
+ * @returns Size in bytes.
+ */
+export declare function getFolderSize(path: string): number;
+/**
+ * Returns a call to the benchmark contract. Each call has a private execution (account entrypoint),
+ * a nested private call (create_note), a public call (increment_balance), and a nested public
+ * call (broadcast). These include emitting one private note and one public log, two storage
+ * reads and one write.
+ * @param index - Index of the call within a block.
+ * @param context - End to end context.
+ * @param contract - Benchmarking contract.
+ * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
+ * @returns A BatchCall instance.
+ */
+export declare function makeCall(index: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute: boolean): Promise<BatchCall>;
+/**
+ * Assembles and sends multiple transactions simultaneously to the node in context.
+ * Each tx is the result of calling makeCall.
+ * @param txCount - How many txs to send
+ * @param context - End to end context.
+ * @param contract - Target contract.
+ * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
+ * @returns Array of sent txs.
+ */
+export declare function sendTxs(txCount: number, context: EndToEndContext, contract: BenchmarkingContract, heavyPublicCompute?: boolean): Promise<SentTx[]>;
+export declare function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpts?: WaitOpts): Promise<void>;
+/**
+ * Creates a new PXE
+ * @param node - Node to connect the pxe to.
+ * @param contract - Benchmark contract to add to the pxe.
+ * @param startingBlock - First l2 block to process.
+ * @returns The new PXE.
+ */
+export declare function createNewPXE(node: AztecNode, contract: BenchmarkingContract, startingBlock?: number): Promise<PXEService>;
+export {};
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/bench/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAwB,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAG9G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,KAAK,UAAU,EAA2C,MAAM,YAAY,CAAC;AACtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAA4C,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAOxH,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;;;;;GAoBF;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;AA0CF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,UAK9C;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKlD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,oBAAoB,EAC9B,kBAAkB,EAAE,OAAO,sBAc5B;AAED;;;;;;;;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,CAChC,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,oBAAoB,EAC9B,aAAa,GAAE,MAA6B,GAC3C,OAAO,CAAC,UAAU,CAAC,CAerB"}

package/dest/bench/utils.js

@@ -106,14 +106,21 @@ function getMetricValues(points) {
  * @param index - Index of the call within a block.
  * @param context - End to end context.
  * @param contract - Benchmarking contract.
+ * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns A BatchCall instance.
- */ export async function makeCall(index, context, contract) {
+ */ export async function makeCall(index, context, contract, heavyPublicCompute) {
     const owner = context.wallet.getAddress();
     const sender = owner;
-    return new BatchCall(context.wallet, [
-        await contract.methods.create_note(owner, sender, index + 1).request(),
-        await contract.methods.increment_balance(owner, index + 1).request()
-    ]);
+    if (heavyPublicCompute) {
+        return new BatchCall(context.wallet, [
+            await contract.methods.sha256_hash_2048(randomBytesAsBigInts(2048)).request()
+        ]);
+    } else {
+        return new BatchCall(context.wallet, [
+            await contract.methods.create_note(owner, sender, index + 1).request(),
+            await contract.methods.increment_balance(owner, index + 1).request()
+        ]);
+    }
 }
 /**
  * Assembles and sends multiple transactions simultaneously to the node in context.
@@ -121,9 +128,10 @@ function getMetricValues(points) {
  * @param txCount - How many txs to send
  * @param context - End to end context.
  * @param contract - Target contract.
+ * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns Array of sent txs.
- */ export async function sendTxs(txCount, context, contract) {
-    const calls = await timesParallel(txCount, (index)=>makeCall(index, context, contract));
+ */ export async function sendTxs(txCount, context, contract, heavyPublicCompute = false) {
+    const calls = await timesParallel(txCount, (index)=>makeCall(index, context, contract, heavyPublicCompute));
     context.logger.info(`Creating ${txCount} txs`);
     const provenTxs = await Promise.all(calls.map((call)=>call.prove({
             skipPublicSimulation: true
@@ -144,14 +152,22 @@ export async function waitTxs(txs, context, txWaitOpts) {
  * @returns The new PXE.
  */ export async function createNewPXE(node, contract, startingBlock = INITIAL_L2_BLOCK_NUM) {
     const l1Contracts = await node.getL1ContractAddresses();
+    const { l1ChainId, protocolVersion } = await node.getNodeInfo();
     const pxeConfig = {
         l2StartingBlock: startingBlock,
         l2BlockPollingIntervalMS: 100,
         dataDirectory: undefined,
         dataStoreMapSizeKB: 1024 * 1024,
-        l1Contracts
+        l1Contracts,
+        l1ChainId,
+        version: protocolVersion
     };
     const pxe = await createPXEService(node, pxeConfig);
     await pxe.registerContract(contract);
     return pxe;
 }
+function randomBytesAsBigInts(length) {
+    return [
+        ...Array(length)
+    ].map((_)=>BigInt(Math.floor(Math.random() * 255)));
+}

package/dest/e2e_blacklist_token_contract/blacklist_token_contract_test.d.ts

@@ -0,0 +1,46 @@
+import { type AccountWallet, type CompleteAddress, Fr, type Logger, type TxHash } from '@aztec/aztec.js';
+import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
+import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { TokenSimulator } from '../simulators/token_simulator.js';
+export declare class Role {
+    private isAdmin;
+    private isMinter;
+    private isBlacklisted;
+    withAdmin(): this;
+    withMinter(): this;
+    withBlacklisted(): this;
+    toNoirStruct(): {
+        is_admin: boolean;
+        is_minter: boolean;
+        is_blacklisted: boolean;
+    };
+}
+export declare class BlacklistTokenContractTest {
+    #private;
+    static DELAY: number;
+    private snapshotManager;
+    logger: Logger;
+    wallets: AccountWallet[];
+    accounts: CompleteAddress[];
+    asset: TokenBlacklistContract;
+    tokenSim: TokenSimulator;
+    badAccount: DocsExampleContract;
+    admin: AccountWallet;
+    other: AccountWallet;
+    blacklisted: AccountWallet;
+    constructor(testName: string);
+    mineBlocks(amount?: number): Promise<void>;
+    /**
+     * Adds two state shifts to snapshot manager.
+     * 1. Add 3 accounts.
+     * 2. Publicly deploy accounts, deploy token contract and a "bad account".
+     */
+    applyBaseSnapshots(): Promise<void>;
+    setup(): Promise<void>;
+    snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
+    teardown(): Promise<void>;
+    addPendingShieldNoteToPXE(contract: TokenBlacklistContract, wallet: AccountWallet, amount: bigint, secretHash: Fr, txHash: TxHash): Promise<void>;
+    applyMintSnapshot(): Promise<void>;
+}
+//# sourceMappingURL=blacklist_token_contract_test.d.ts.map

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

@@ -0,0 +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,KAAK,eAAe,EACpB,EAAE,EACF,KAAK,MAAM,EACX,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF,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;;IAGrC,MAAM,CAAC,KAAK,SAAK;IAEjB,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,sBAAsB,CAAC;IAC/B,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;IAEjC,KAAK,EAAG,aAAa,CAAC;IACtB,KAAK,EAAG,aAAa,CAAC;IACtB,WAAW,EAAG,aAAa,CAAC;gBAEhB,QAAQ,EAAE,MAAM;IAKtB,UAAU,CAAC,MAAM,GAAE,MAAyC;IAMlE;;;;OAIG;IACG,kBAAkB;IA0DlB,KAAK;IAIX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAQR,yBAAyB,CAC7B,QAAQ,EAAE,sBAAsB,EAChC,MAAM,EAAE,aAAa,EACrB,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,9 +1,10 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { ExtendedNote, Fr, Note, computeSecretHash, createLogger } from '@aztec/aztec.js';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
+import { Fr, computeSecretHash, createLogger } from '@aztec/aztec.js';
+import { MAX_NOTE_HASHES_PER_TX } from '@aztec/constants';
 import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 import { jest } from '@jest/globals';
-import { addAccounts, createSnapshotManager, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 export class Role {
@@ -62,11 +63,8 @@ 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', addAccounts(3, this.logger), async ({ accountKeys }, { pxe })=>{
-            this.wallets = await Promise.all(accountKeys.map(async (ak)=>{
-                const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-                return account.getWallet();
-            }));
+        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), async ({ deployedAccounts }, { pxe })=>{
+            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
             this.admin = this.wallets[0];
             this.other = this.wallets[1];
             this.blacklisted = this.wallets[2];
@@ -105,17 +103,19 @@ export class BlacklistTokenContractTest {
     async teardown() {
         await this.snapshotManager.teardown();
     }
-    async addPendingShieldNoteToPXE(accountIndex, amount, secretHash, txHash) {
-        const note = new Note([
-            new Fr(amount),
-            secretHash
-        ]);
-        const extendedNote = new ExtendedNote(note, this.accounts[accountIndex].address, this.asset.address, TokenBlacklistContract.storage.pending_shields.slot, TokenBlacklistContract.notes.TransparentNote.id, txHash);
-        await this.wallets[accountIndex].addNote(extendedNote);
+    #toBoundedVec(arr, maxLen) {
+        return {
+            len: arr.length,
+            storage: arr.concat(new Array(maxLen - arr.length).fill(new Fr(0)))
+        };
+    }
+    async addPendingShieldNoteToPXE(contract, wallet, amount, secretHash, txHash) {
+        const txEffects = await wallet.getTxEffect(txHash);
+        await contract.methods.deliver_transparent_note(contract.address, amount, secretHash, txHash.hash, this.#toBoundedVec(txEffects.data.noteHashes, MAX_NOTE_HASHES_PER_TX), txEffects.data.nullifiers[0], wallet.getAddress()).simulate();
     }
     async applyMintSnapshot() {
         await this.snapshotManager.snapshot('mint', async ()=>{
-            const { asset, accounts } = this;
+            const { asset, accounts, wallets } = 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().wait();
@@ -129,7 +129,7 @@ export class BlacklistTokenContractTest {
             const secret = Fr.random();
             const secretHash = await computeSecretHash(secret);
             const receipt = await asset.methods.mint_private(amount, secretHash).send().wait();
-            await this.addPendingShieldNoteToPXE(0, amount, secretHash, receipt.txHash);
+            await this.addPendingShieldNoteToPXE(asset, wallets[0], amount, secretHash, receipt.txHash);
             const txClaim = asset.methods.redeem_shield(accounts[0].address, amount, secret).send();
             await txClaim.wait({
                 debug: true

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.d.ts

@@ -0,0 +1,47 @@
+import type { AztecNodeConfig } from '@aztec/aztec-node';
+import { type AccountWallet, AztecAddress, type AztecNode, CheatCodes, type CompleteAddress, EthAddress, type Logger, type PXE } from '@aztec/aztec.js';
+import { type ViemPublicClient } from '@aztec/ethereum';
+import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
+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;
+    wallets: AccountWallet[];
+    accounts: CompleteAddress[];
+    aztecNode: AztecNode;
+    pxe: PXE;
+    aztecNodeConfig: AztecNodeConfig;
+    publicClient: ViemPublicClient | undefined;
+    user1Wallet: AccountWallet;
+    user2Wallet: AccountWallet;
+    crossChainTestHarness: CrossChainTestHarness;
+    ethAccount: EthAddress;
+    ownerAddress: AztecAddress;
+    l2Token: TokenContract;
+    l2Bridge: TokenBridgeContract;
+    rollup: any;
+    inbox: any;
+    outbox: any;
+    cheatcodes: CheatCodes;
+    constructor(testName: string);
+    assumeProven(): Promise<void>;
+    setup(): Promise<void>;
+    snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
+    teardown(): Promise<void>;
+    applyBaseSnapshots(): Promise<void>;
+    toCrossChainContext(): CrossChainContext;
+}
+type CrossChainContext = {
+    l2Token: AztecAddress;
+    l2Bridge: AztecAddress;
+    tokenPortal: EthAddress;
+    underlying: EthAddress;
+    ethAccount: EthAddress;
+    ownerAddress: AztecAddress;
+    inbox: EthAddress;
+    outbox: EthAddress;
+};
+export {};
+//# sourceMappingURL=cross_chain_messaging_test.d.ts.map

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

@@ -0,0 +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,UAAU,EACV,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EAET,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,gBAAgB,EAAqC,MAAM,iBAAiB,CAAC;AAE3F,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAK3E,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,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,SAAS,EAAG,SAAS,CAAC;IACtB,GAAG,EAAG,GAAG,CAAC;IACV,eAAe,EAAG,eAAe,CAAC;IAElC,YAAY,EAAG,gBAAgB,GAAG,SAAS,CAAC;IAE5C,WAAW,EAAG,aAAa,CAAC;IAC5B,WAAW,EAAG,aAAa,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,MAAM,EAAG,GAAG,CAAC;IACb,KAAK,EAAG,GAAG,CAAC;IACZ,MAAM,EAAG,GAAG,CAAC;IACb,UAAU,EAAG,UAAU,CAAC;gBAEZ,QAAQ,EAAE,MAAM;IAKtB,YAAY;IAIZ,KAAK;IAQX,QAAQ,YACA,MAAM,SACL,CAAC,OAAO,EAAE,iBAAiB,KAAK,QAAQ,CAAC,CAAC,YACxC,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,QAAQ,IAAI,CAAC,KACtE,QAAQ,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,kBAAkB;IAiHxB,mBAAmB,IAAI,iBAAiB;CAYzC;AAED,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,WAAW,EAAE,UAAU,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC"}

package/dest/e2e_cross_chain_messaging/cross_chain_messaging_test.js

@@ -1,12 +1,12 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { AztecAddress, EthAddress, createLogger } from '@aztec/aztec.js';
-import { createL1Clients } from '@aztec/ethereum';
-import { InboxAbi, OutboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+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 { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { getContract } from 'viem';
 import { MNEMONIC } from '../fixtures/fixtures.js';
-import { addAccounts, createSnapshotManager, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 export class CrossChainMessagingTest {
@@ -28,20 +28,20 @@ export class CrossChainMessagingTest {
     rollup;
     inbox;
     outbox;
+    cheatcodes;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
         this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath);
     }
     async assumeProven() {
-        await this.rollup.write.setAssumeProvenThroughBlockNumber([
-            await this.rollup.read.getPendingBlockNumber()
-        ]);
+        await this.cheatcodes.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
     }
     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);
     }
     snapshot = (name, apply, restore = ()=>Promise.resolve())=>this.snapshotManager.snapshot(name, apply, restore);
     async teardown() {
@@ -50,11 +50,8 @@ export class CrossChainMessagingTest {
     async applyBaseSnapshots() {
         // Note that we are using the same `pxe`, `aztecNodeConfig` and `aztecNode` across all snapshots.
         // This is to not have issues with different networks.
-        await this.snapshotManager.snapshot('3_accounts', addAccounts(3, this.logger), async ({ accountKeys }, { pxe, aztecNodeConfig, aztecNode, deployL1ContractsValues })=>{
-            this.wallets = await Promise.all(accountKeys.map(async (ak)=>{
-                const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-                return account.getWallet();
-            }));
+        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({
@@ -73,9 +70,23 @@ export class CrossChainMessagingTest {
             // 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.l1RpcUrl, MNEMONIC);
+            const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+            const underlyingERC20Address = await deployL1Contract(walletClient, publicClient, TestERC20Abi, TestERC20Bytecode, [
+                'Underlying',
+                'UND',
+                walletClient.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);
+            this.crossChainTestHarness = await CrossChainTestHarness.new(this.aztecNode, this.pxe, publicClient, walletClient, this.wallets[0], this.logger, underlyingERC20Address);
             this.logger.verbose(`L2 token deployed to: ${this.crossChainTestHarness.l2Token.address}`);
             return this.toCrossChainContext();
         }, async (crossChainContext)=>{
@@ -85,7 +96,7 @@ export class CrossChainMessagingTest {
             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.l1RpcUrl, MNEMONIC);
+            const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
             const inbox = getContract({
                 address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
                 abi: InboxAbi,

package/dest/e2e_deploy_contract/deploy_test.d.ts

@@ -0,0 +1,28 @@
+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';
+export declare class DeployTest {
+    private snapshotManager;
+    private wallets;
+    logger: Logger;
+    pxe: PXE;
+    wallet: AccountWallet;
+    aztecNode: AztecNode;
+    constructor(testName: string);
+    setup(): Promise<this>;
+    teardown(): Promise<void>;
+    private applyInitialAccountSnapshot;
+    registerContract<T extends ContractBase>(wallet: Wallet, contractArtifact: ContractArtifactClass<T>, opts?: {
+        salt?: Fr;
+        publicKeys?: PublicKeys;
+        initArgs?: any[];
+        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>;
+    artifact: ContractArtifact;
+};
+//# sourceMappingURL=deploy_test.d.ts.map

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

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

package/dest/e2e_deploy_contract/deploy_test.js

@@ -1,6 +1,6 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { Fr, createLogger, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
-import { addAccounts, createSnapshotManager } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 export class DeployTest {
     snapshotManager;
@@ -23,11 +23,8 @@ export class DeployTest {
         await this.snapshotManager.teardown();
     }
     async applyInitialAccountSnapshot() {
-        await this.snapshotManager.snapshot('initial_account', addAccounts(1, this.logger), async ({ accountKeys }, { pxe })=>{
-            this.wallets = await Promise.all(accountKeys.map(async (ak)=>{
-                const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-                return account.getWallet();
-            }));
+        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];
         });

package/dest/e2e_epochs/epochs_test.d.ts

@@ -0,0 +1,51 @@
+import { AztecNodeService } from '@aztec/aztec-node';
+import { type Logger } from '@aztec/aztec.js';
+import { ChainMonitor } from '@aztec/aztec.js/ethereum';
+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 { 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'>>;
+/**
+ * Tests building of epochs using fast block times and short epochs.
+ * Spawns an aztec node and a prover node with fake proofs.
+ * Sequencer is allowed to build empty blocks.
+ */
+export declare class EpochsTestContext {
+    context: EndToEndContext;
+    l1Client: PublicClient;
+    rollup: RollupContract;
+    constants: L1RollupConstants;
+    logger: Logger;
+    monitor: ChainMonitor;
+    proverDelayer: Delayer;
+    sequencerDelayer: Delayer;
+    proverNodes: ProverNode[];
+    nodes: AztecNodeService[];
+    static setup(opts?: EpochsTestOpts): Promise<EpochsTestContext>;
+    setup(opts?: EpochsTestOpts): Promise<void>;
+    teardown(): Promise<void>;
+    createProverNode(): Promise<ProverNode>;
+    createNonValidatorNode(): Promise<AztecNodeService>;
+    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 for the aztec node to sync to the target block number. */
+    waitForNodeToSync(blockNumber: number, type: 'finalised' | 'historic'): Promise<void>;
+    /** Verifies whether the given block number is found on the aztec node. */
+    verifyHistoricBlock(blockNumber: L2BlockNumber, expectedSuccess: boolean): Promise<void>;
+}
+//# sourceMappingURL=epochs_test.d.ts.map

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

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