@aztec/end-to-end 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/e2e_p2p/shared.js

@@ -1,24 +1,28 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { TxStatus } from '@aztec/aztec.js';
+import { Fr, TxStatus, getContractInstanceFromInstantiationParams, retryUntil } from '@aztec/aztec.js';
+import { timesAsync, unique } from '@aztec/foundation/collection';
+import { pluralize } from '@aztec/foundation/string';
+import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
+import { getRoundForOffense } from '@aztec/slasher';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
-export const submitComplexTxsTo = async (logger, spamContract, numTxs, opts = {})=>{
+export const submitComplexTxsTo = async (logger, from, spamContract, numTxs, opts = {})=>{
     const txs = [];
     const seed = 1234n;
     const spamCount = 15;
     for(let i = 0; i < numTxs; i++){
         const tx = spamContract.methods.spam(seed + BigInt(i * spamCount), spamCount, !!opts.callPublic).send({
-            skipPublicSimulation: true
+            from
         });
         const txHash = await tx.getTxHash();
-        logger.info(`Tx sent with hash ${txHash}`);
+        logger.info(`Tx sent with hash ${txHash.toString()}`);
         const receipt = await tx.getReceipt();
         expect(receipt).toEqual(expect.objectContaining({
             status: TxStatus.PENDING,
             error: ''
         }));
-        logger.info(`Receipt received for ${txHash}`);
+        logger.info(`Receipt received for ${txHash.toString()}`);
         txs.push(tx);
     }
     return txs;
@@ -26,7 +30,10 @@ export const submitComplexTxsTo = async (logger, spamContract, numTxs, opts = {}
 // creates an instance of the PXE and submit a given number of transactions to it.
 export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs, fundedAccount)=>{
     const rpcConfig = getRpcConfig();
-    const pxeService = await createPXEService(node, rpcConfig, true);
+    rpcConfig.proverEnabled = false;
+    const pxeService = await createPXEService(node, rpcConfig, {
+        useLogSuffix: true
+    });
     const account = await getSchnorrAccount(pxeService, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
     await account.register();
     const wallet = await account.getWallet();
@@ -37,3 +44,136 @@ export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs
         node
     };
 };
+export async function createPXEServiceAndPrepareTransactions(logger, node, numTxs, fundedAccount) {
+    const rpcConfig = getRpcConfig();
+    rpcConfig.proverEnabled = false;
+    const pxe = await createPXEService(node, rpcConfig, {
+        useLogSuffix: true
+    });
+    const account = await getSchnorrAccount(pxe, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
+    await account.register();
+    const wallet = await account.getWallet();
+    const testContractInstance = await getContractInstanceFromInstantiationParams(TestContractArtifact, {});
+    await wallet.registerContract({
+        instance: testContractInstance,
+        artifact: TestContractArtifact
+    });
+    const contract = await TestContract.at(testContractInstance.address, wallet);
+    const txs = await timesAsync(numTxs, async ()=>{
+        const tx = await contract.methods.emit_nullifier(Fr.random()).prove({
+            from: account.getAddress()
+        });
+        const txHash = tx.getTxHash();
+        logger.info(`Tx prepared with hash ${txHash}`);
+        return tx;
+    });
+    return {
+        txs,
+        pxeService: pxe,
+        node
+    };
+}
+export function awaitProposalExecution(slashingProposer, timeoutSeconds, logger) {
+    return new Promise((resolve, reject)=>{
+        const timeout = setTimeout(()=>{
+            logger.warn(`Timed out waiting for proposal execution`);
+            reject(new Error(`Timeout waiting for proposal execution after ${timeoutSeconds}s`));
+        }, timeoutSeconds * 1000);
+        if (slashingProposer.type === 'empire') {
+            const unwatch = slashingProposer.listenToPayloadSubmitted((args)=>{
+                logger.warn(`Proposal ${args.payload} from round ${args.round} executed`);
+                clearTimeout(timeout);
+                unwatch();
+                resolve(args.round);
+            });
+        } else if (slashingProposer.type === 'tally') {
+            const unwatch = slashingProposer.listenToRoundExecuted((args)=>{
+                logger.warn(`Slash from round ${args.round} executed`);
+                clearTimeout(timeout);
+                unwatch();
+                resolve(args.round);
+            });
+        } else {
+            clearTimeout(timeout);
+            reject(new Error(`Unknown slashing proposer type: ${slashingProposer.type}`));
+        }
+    });
+}
+export async function awaitCommitteeExists({ rollup, logger }) {
+    logger.info(`Waiting for committee to be set`);
+    let committee;
+    await retryUntil(async ()=>{
+        committee = await rollup.getCurrentEpochCommittee();
+        return committee && committee.length > 0;
+    }, 'non-empty committee', 60);
+    return committee;
+}
+export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount }) {
+    const targetOffenseCount = waitUntilOffenseCount ?? 1;
+    logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
+    const offenses = await retryUntil(async ()=>{
+        const offenses = await nodeAdmin.getSlashOffenses('all');
+        if (offenses.length >= targetOffenseCount) {
+            return offenses;
+        }
+    }, 'non-empty offenses', 60);
+    logger.info(`Hit ${offenses.length} offenses on rounds ${unique(offenses.map((o)=>getRoundForOffense(o, {
+            slashingRoundSize,
+            epochDuration
+        })))}`, offenses);
+    return offenses;
+}
+/**
+ * Await the committee to be slashed out of the validator set.
+ * Currently assumes that the committee is the same size as the validator set.
+ */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, dateProvider }) {
+    if (!slashingProposer) {
+        throw new Error('No slashing proposer configured. Cannot test slashing.');
+    }
+    logger.info(`Advancing epochs so we start slashing`);
+    await cheatCodes.debugRollup();
+    await cheatCodes.advanceToEpoch(await cheatCodes.getEpoch() + await rollup.getLagInEpochs() + 1n, {
+        updateDateProvider: dateProvider
+    });
+    // Await for the slash payload to be created if empire (no payload is created on tally until execution time)
+    if (slashingProposer.type === 'empire') {
+        const slashPayloadEvents = await retryUntil(async ()=>{
+            const events = await slashFactory.getSlashPayloadCreatedEvents();
+            return events.length > 0 ? events : undefined;
+        }, 'slash payload created', 120, 1);
+        expect(slashPayloadEvents.length).toBe(1);
+        // The uniqueness check is needed since a validator may be slashed more than once on the same round (eg because they let two epochs be pruned)
+        expect(unique(slashPayloadEvents[0].slashes.map((slash)=>slash.validator.toString()))).toHaveLength(committee.length);
+    }
+    const attestersPre = await rollup.getAttesters();
+    expect(attestersPre.length).toBe(committee.length);
+    for (const attester of attestersPre){
+        const attesterInfo = await rollup.getAttesterView(attester);
+        expect(attesterInfo.status).toEqual(1); // Validating
+    }
+    const timeout = slashingRoundSize * 2 * aztecSlotDuration;
+    logger.info(`Waiting for slash to be executed (timeout ${timeout}s)`);
+    await awaitProposalExecution(slashingProposer, timeout, logger);
+    // The attesters should still form the committee but they should be reduced to the "living" status
+    await cheatCodes.debugRollup();
+    const committeePostSlashing = await rollup.getCurrentEpochCommittee();
+    expect(committeePostSlashing?.length).toBe(attestersPre.length);
+    const attestersPostSlashing = await rollup.getAttesters();
+    expect(attestersPostSlashing.length).toBe(0);
+    for (const attester of attestersPre){
+        const attesterInfo = await rollup.getAttesterView(attester);
+        expect(attesterInfo.status).toEqual(2); // Living
+    }
+    logger.info(`Advancing to check current committee`);
+    await cheatCodes.debugRollup();
+    await cheatCodes.advanceToEpoch(await cheatCodes.getEpoch() + await rollup.getLagInEpochs() + 1n, {
+        updateDateProvider: dateProvider
+    });
+    await cheatCodes.debugRollup();
+    const committeeNextEpoch = await rollup.getCurrentEpochCommittee();
+    // The committee should be undefined, since the validator set is empty
+    // and the tests currently using this helper always set a target committee size.
+    expect(committeeNextEpoch).toBeUndefined();
+    const attestersNextEpoch = await rollup.getAttesters();
+    expect(attestersNextEpoch.length).toBe(0);
+}

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -1,6 +1,6 @@
-import { type AccountWallet, type CompleteAddress, type Logger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { type AccountWallet, AztecAddress, type AztecNode, type Logger } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 export declare class TokenContractTest {
@@ -9,11 +9,16 @@ export declare class TokenContractTest {
     static TOKEN_DECIMALS: bigint;
     private snapshotManager;
     logger: Logger;
-    wallets: AccountWallet[];
-    accounts: CompleteAddress[];
     asset: TokenContract;
     tokenSim: TokenSimulator;
-    badAccount: DocsExampleContract;
+    node: AztecNode;
+    badAccount: InvalidAccountContract;
+    admin: AccountWallet;
+    adminAddress: AztecAddress;
+    account1: AccountWallet;
+    account1Address: AztecAddress;
+    account2: AccountWallet;
+    account2Address: AztecAddress;
     constructor(testName: string);
     /**
      * Adds two state shifts to snapshot manager.

package/dest/e2e_token_contract/token_contract_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,UAAU,EAAG,mBAAmB,CAAC;gBAErB,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAgElB,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;IAIR,iBAAiB;CAyCxB"}
+{"version":3,"file":"token_contract_test.d.ts","sourceRoot":"","sources":["../../src/e2e_token_contract/token_contract_test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAE,YAAY,EAAE,KAAK,SAAS,EAAE,KAAK,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AAItF,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAG,aAAa,CAAC;IACtB,QAAQ,EAAG,cAAc,CAAC;IAC1B,IAAI,EAAG,SAAS,CAAC;IAEjB,UAAU,EAAG,sBAAsB,CAAC;IACpC,KAAK,EAAG,aAAa,CAAC;IACtB,YAAY,EAAG,YAAY,CAAC;IAC5B,QAAQ,EAAG,aAAa,CAAC;IACzB,eAAe,EAAG,YAAY,CAAC;IAC/B,QAAQ,EAAG,aAAa,CAAC;IACzB,eAAe,EAAG,YAAY,CAAC;gBAEnB,QAAQ,EAAE,MAAM;IAO5B;;;;OAIG;IACG,kBAAkB;IAkElB,KAAK;IAIX,QAAQ,GAAI,CAAC,EACX,MAAM,MAAM,EACZ,OAAO,CAAC,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACjD,UAAS,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAA2B,KAChG,OAAO,CAAC,IAAI,CAAC,CAAwD;IAElE,QAAQ;IAIR,iBAAiB;CAqCxB"}

package/dest/e2e_token_contract/token_contract_test.js

@@ -1,7 +1,7 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { createLogger } from '@aztec/aztec.js';
-import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import { jest } from '@jest/globals';
 import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
@@ -13,11 +13,16 @@ export class TokenContractTest {
     static TOKEN_DECIMALS = 18n;
     snapshotManager;
     logger;
-    wallets = [];
-    accounts = [];
     asset;
     tokenSim;
+    node;
     badAccount;
+    admin;
+    adminAddress;
+    account1;
+    account1Address;
+    account2;
+    account2Address;
     constructor(testName){
         this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
         this.snapshotManager = createSnapshotManager(`e2e_token_contract/${testName}`, dataPath, {
@@ -31,20 +36,29 @@ export class TokenContractTest {
    */ 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 })=>{
-            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
-            this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
+        await this.snapshotManager.snapshot('3_accounts', deployAccounts(3, this.logger), async ({ deployedAccounts }, { pxe, aztecNode })=>{
+            this.node = aztecNode;
+            const wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWallet(pxe, a.address, a.signingKey)));
+            [this.admin, this.account1, this.account2] = wallets;
+            [this.adminAddress, this.account1Address, this.account2Address] = wallets.map((w)=>w.getAddress());
         });
         await this.snapshotManager.snapshot('e2e_token_contract', 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, 2));
+            await publicDeployAccounts(this.admin, [
+                this.adminAddress,
+                this.account1Address
+            ]);
             this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send().deployed();
+            const asset = await TokenContract.deploy(this.admin, this.adminAddress, TokenContractTest.TOKEN_NAME, TokenContractTest.TOKEN_SYMBOL, TokenContractTest.TOKEN_DECIMALS).send({
+                from: this.adminAddress
+            }).deployed();
             this.logger.verbose(`Token deployed to ${asset.address}`);
             this.logger.verbose(`Deploying bad account...`);
-            this.badAccount = await DocsExampleContract.deploy(this.wallets[0]).send().deployed();
+            this.badAccount = await InvalidAccountContract.deploy(this.admin).send({
+                from: this.adminAddress
+            }).deployed();
             this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
             return {
                 tokenContractAddress: asset.address,
@@ -52,12 +66,17 @@ export class TokenContractTest {
             };
         }, async ({ tokenContractAddress, badAccountAddress })=>{
             // Restore the token contract state.
-            this.asset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
+            this.asset = await TokenContract.at(tokenContractAddress, this.admin);
             this.logger.verbose(`Token contract address: ${this.asset.address}`);
-            this.tokenSim = new TokenSimulator(this.asset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            this.badAccount = await DocsExampleContract.at(badAccountAddress, this.wallets[0]);
+            this.tokenSim = new TokenSimulator(this.asset, this.admin, this.adminAddress, this.logger, [
+                this.adminAddress,
+                this.account1Address
+            ]);
+            this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.admin);
             this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
-            expect(await this.asset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
+            expect(await this.asset.methods.get_admin().simulate({
+                from: this.adminAddress
+            })).toBe(this.adminAddress.toBigInt());
         });
     // TokenContract.artifact.functions.forEach(fn => {
     //   const sig = decodeFunctionSignature(fn.name, fn.parameters);
@@ -73,27 +92,35 @@ export class TokenContractTest {
     }
     async applyMintSnapshot() {
         await this.snapshotManager.snapshot('mint', async ()=>{
-            const { asset, wallets } = this;
+            const { asset, admin, adminAddress } = this;
             const amount = 10000n;
             this.logger.verbose(`Minting ${amount} publicly...`);
-            await asset.methods.mint_to_public(wallets[0].getAddress(), amount).send().wait();
+            await asset.methods.mint_to_public(adminAddress, amount).send({
+                from: adminAddress
+            }).wait();
             this.logger.verbose(`Minting ${amount} privately...`);
-            await mintTokensToPrivate(asset, wallets[0], wallets[0].getAddress(), amount);
+            await mintTokensToPrivate(asset, adminAddress, admin, adminAddress, amount);
             this.logger.verbose(`Minting complete.`);
             return {
                 amount
             };
         }, async ({ amount })=>{
-            const { asset, accounts: [{ address }], tokenSim } = this;
-            tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate();
+            const { asset, adminAddress, tokenSim } = this;
+            tokenSim.mintPublic(adminAddress, amount);
+            const publicBalance = await asset.methods.balance_of_public(adminAddress).simulate({
+                from: 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();
+            expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(adminAddress));
+            tokenSim.mintPrivate(adminAddress, amount);
+            const privateBalance = await asset.methods.balance_of_private(adminAddress).simulate({
+                from: adminAddress
+            });
             this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-            const totalSupply = await asset.methods.total_supply().simulate();
+            expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(adminAddress));
+            const totalSupply = await asset.methods.total_supply().simulate({
+                from: adminAddress
+            });
             this.logger.verbose(`Total supply: ${totalSupply}`);
             expect(totalSupply).toEqual(tokenSim.totalSupply);
             return Promise.resolve();

package/dest/{e2e_prover → fixtures}/e2e_prover_test.d.ts

@@ -1,11 +1,14 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
-import { type AccountWalletWithSecretKey, type AztecNode, type CheatCodes, type CompleteAddress, type DeployL1ContractsReturnType, EthAddress, type Logger } from '@aztec/aztec.js';
+import { type AccountWalletWithSecretKey, type AztecNode, type CompleteAddress, EthAddress, type Logger } from '@aztec/aztec.js';
+import { CheatCodes } from '@aztec/aztec/testing';
 import { type ClientProtocolCircuitVerifier } from '@aztec/bb-prover';
 import type { BlobSinkServer } from '@aztec/blob-sink/server';
+import type { DeployL1ContractsReturnType } from '@aztec/ethereum';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { PXEService } from '@aztec/pxe/server';
-import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import { type SubsystemsContext } from './snapshot_manager.js';
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
  * However, we then setup a second PXE with a full prover instance.
@@ -26,6 +29,7 @@ export declare class FullProverTest {
     fakeProofsAsset: TokenContract;
     tokenSim: TokenSimulator;
     aztecNode: AztecNode;
+    aztecNodeAdmin: AztecNodeAdmin;
     pxe: PXEService;
     cheatCodes: CheatCodes;
     blobSink: BlobSinkServer;
@@ -47,10 +51,9 @@ export declare class FullProverTest {
      */
     applyBaseSnapshots(): Promise<void>;
     setup(): Promise<this>;
-    private mintL1ERC20;
+    private mintFeeJuice;
     snapshot: <T>(name: string, apply: (context: SubsystemsContext) => Promise<T>, restore?: (snapshotData: T, context: SubsystemsContext) => Promise<void>) => Promise<void>;
     teardown(): Promise<void>;
     applyMintSnapshot(): Promise<void>;
-    deployVerifier(): Promise<void>;
 }
 //# sourceMappingURL=e2e_prover_test.d.ts.map

package/dest/fixtures/e2e_prover_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/e2e_prover_test.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,UAAU,EACV,KAAK,MAAM,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAEL,KAAK,6BAA6B,EAGnC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAInE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,uBAAuB,CAAC;AAU/B;;;;;GAKG;AAEH,qBAAa,cAAc;IA6BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA9BpB,MAAM,CAAC,UAAU,SAAU;IAC3B,MAAM,CAAC,YAAY,SAAS;IAC5B,MAAM,CAAC,cAAc,SAAO;IAC5B,OAAO,CAAC,eAAe,CAAmB;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,OAAO,EAAE,0BAA0B,EAAE,CAAM;IAC3C,QAAQ,EAAE,eAAe,EAAE,CAAM;IACjC,eAAe,EAAG,aAAa,CAAC;IAChC,QAAQ,EAAG,cAAc,CAAC;IAC1B,SAAS,EAAG,SAAS,CAAC;IACtB,cAAc,EAAG,cAAc,CAAC;IAChC,GAAG,EAAG,UAAU,CAAC;IACjB,UAAU,EAAG,UAAU,CAAC;IACxB,QAAQ,EAAG,cAAc,CAAC;IAC1B,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,eAAe,CAAC,CAAsB;IAC9C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;IAChD,oBAAoB,CAAC,EAAE,6BAA6B,CAAC;IACrD,YAAY,EAAE,aAAa,EAAE,CAAM;IACnC,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,mBAAmB,CAAc;IAClC,WAAW,EAAG,2BAA2B,CAAC;IAC1C,aAAa,EAAG,UAAU,CAAC;gBAGhC,QAAQ,EAAE,MAAM,EACR,sBAAsB,EAAE,MAAM,EACtC,QAAQ,EAAE,UAAU,EACZ,UAAU,UAAO;IAa3B;;;;OAIG;IACG,kBAAkB;IAwDlB,KAAK;YAkKG,YAAY;IAS1B,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;IAeR,iBAAiB;CAiDxB"}

package/dest/{e2e_prover → fixtures}/e2e_prover_test.js

@@ -1,20 +1,21 @@
 import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { createArchiver } from '@aztec/archiver';
-import { EthAddress, createLogger, deployL1Contract } from '@aztec/aztec.js';
-import { BBCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
+import { EthAddress, createLogger } from '@aztec/aztec.js';
+import { BBCircuitVerifier, QueuedIVCVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { HonkVerifierAbi, HonkVerifierBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { SecretValue } from '@aztec/foundation/config';
+import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { createProverNode } from '@aztec/prover-node';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { getContract } from 'viem';
 import { privateKeyToAddress } from 'viem/accounts';
-import { getACVMConfig } from '../fixtures/get_acvm_config.js';
-import { getBBConfig } from '../fixtures/get_bb_config.js';
-import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
-import { getPrivateKeyFromIndex, setupPXEService } from '../fixtures/utils.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
+import { getACVMConfig } from './get_acvm_config.js';
+import { getBBConfig } from './get_bb_config.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from './snapshot_manager.js';
+import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEService } from './utils.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
 /**
  * Largely taken from the e2e_token_contract test file. We deploy 2 accounts and a token contract.
@@ -35,6 +36,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
     fakeProofsAsset;
     tokenSim;
     aztecNode;
+    aztecNodeAdmin;
     pxe;
     cheatCodes;
     blobSink;
@@ -62,7 +64,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             startProverNode: true,
             fundRewardDistributor: true,
             coinbase
-        }, {});
+        }, {
+            realVerifier: realProofs
+        });
     }
     /**
    * Adds two state shifts to snapshot manager.
@@ -79,9 +83,11 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             // 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, 2), false);
+            await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 2));
             this.logger.verbose(`Deploying TokenContract...`);
-            const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send().deployed();
+            const asset = await TokenContract.deploy(this.wallets[0], this.accounts[0], FullProverTest.TOKEN_NAME, FullProverTest.TOKEN_SYMBOL, FullProverTest.TOKEN_DECIMALS).send({
+                from: this.wallets[0].getAddress()
+            }).deployed();
             this.logger.verbose(`Token deployed to ${asset.address}`);
             return {
                 tokenContractAddress: asset.address
@@ -90,8 +96,10 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             // Restore the token contract state.
             this.fakeProofsAsset = await TokenContract.at(tokenContractAddress, this.wallets[0]);
             this.logger.verbose(`Token contract address: ${this.fakeProofsAsset.address}`);
-            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallets[0], this.logger, this.accounts.map((a)=>a.address));
-            expect(await this.fakeProofsAsset.methods.get_admin().simulate()).toBe(this.accounts[0].address.toBigInt());
+            this.tokenSim = new TokenSimulator(this.fakeProofsAsset, this.wallets[0], this.wallets[0].getAddress(), this.logger, this.accounts.map((a)=>a.address));
+            expect(await this.fakeProofsAsset.methods.get_admin().simulate({
+                from: this.accounts[0].address
+            })).toBe(this.accounts[0].address.toBigInt());
         });
     }
     async setup() {
@@ -100,6 +108,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         this.context.watcher.setIsMarkingAsProven(false);
         this.simulatedProverNode = this.context.proverNode;
         ({ pxe: this.pxe, aztecNode: this.aztecNode, deployL1ContractsValues: this.l1Contracts, cheatCodes: this.cheatCodes, blobSink: this.blobSink } = this.context);
+        this.aztecNodeAdmin = this.context.aztecNode;
         const blobSinkClient = createBlobSinkClient({
             blobSinkUrl: `http://localhost:${this.blobSink.port}`
         });
@@ -119,16 +128,17 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             if (!bbConfig?.bbWorkingDirectory || !bbConfig?.bbBinaryPath) {
                 throw new Error(`Test must be run with BB native configuration`);
             }
-            this.circuitProofVerifier = await BBCircuitVerifier.new(bbConfig);
+            const verifier = await BBCircuitVerifier.new(bbConfig);
+            this.circuitProofVerifier = new QueuedIVCVerifier(bbConfig, verifier);
             this.logger.debug(`Configuring the node for real proofs...`);
-            await this.aztecNode.setConfig({
+            await this.aztecNodeAdmin.setConfig({
                 realProofs: true,
                 minTxsPerBlock: this.minNumberOfTxsPerBlock
             });
         } else {
             this.logger.debug(`Configuring the node min txs per block ${this.minNumberOfTxsPerBlock}...`);
             this.circuitProofVerifier = new TestCircuitVerifier();
-            await this.aztecNode.setConfig({
+            await this.aztecNodeAdmin.setConfig({
                 minTxsPerBlock: this.minNumberOfTxsPerBlock
             });
         }
@@ -171,7 +181,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const archiver = await createArchiver({
             ...this.context.aztecNodeConfig,
             dataDirectory: undefined
-        }, blobSinkClient, {
+        }, {
+            blobSinkClient
+        }, {
             blockUntilSync: true
         });
         // The simulated prover node (now shutdown) used private key index 2
@@ -179,24 +191,30 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         const proverNodeSenderAddress = privateKeyToAddress(new Buffer32(proverNodePrivateKey).toString());
         this.proverAddress = EthAddress.fromString(proverNodeSenderAddress);
         this.logger.verbose(`Funding prover node at ${proverNodeSenderAddress}`);
-        await this.mintL1ERC20(proverNodeSenderAddress, 100_000_000n);
+        await this.mintFeeJuice(proverNodeSenderAddress);
         this.logger.verbose('Starting prover node');
         const proverConfig = {
             ...this.context.aztecNodeConfig,
-            proverCoordinationNodeUrl: undefined,
+            txCollectionNodeRpcUrls: [],
             dataDirectory: undefined,
-            proverId: this.proverAddress.toField(),
+            proverId: this.proverAddress,
             realProofs: this.realProofs,
             proverAgentCount: 2,
-            publisherPrivateKey: `0x${proverNodePrivateKey.toString('hex')}`,
+            publisherPrivateKeys: [
+                new SecretValue(`0x${proverNodePrivateKey.toString('hex')}`)
+            ],
             proverNodeMaxPendingJobs: 100,
             proverNodeMaxParallelBlocksPerEpoch: 32,
             proverNodePollingIntervalMs: 100,
-            txGatheringTimeoutMs: 60000,
             txGatheringIntervalMs: 1000,
-            txGatheringMaxParallelRequests: 100
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 100,
+            txGatheringTimeoutMs: 24_000,
+            proverNodeFailedEpochStore: undefined,
+            proverNodeEpochProvingDelayMs: undefined
         };
-        const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address));
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress));
         this.proverNode = await createProverNode(proverConfig, {
             aztecNodeTxProvider: this.aztecNode,
             archiver: archiver,
@@ -204,23 +222,23 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }, {
             prefilledPublicData
         });
-        this.proverNode.start();
+        await this.proverNode.start();
         this.logger.warn(`Proofs are now enabled`);
         return this;
     }
-    async mintL1ERC20(recipient, amount) {
-        const erc20Address = this.context.deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress;
-        const client = this.context.deployL1ContractsValues.walletClient;
-        const erc20 = getContract({
-            abi: TestERC20Abi,
-            address: erc20Address.toString(),
+    async mintFeeJuice(recipient) {
+        const handlerAddress = this.context.deployL1ContractsValues.l1ContractAddresses.feeAssetHandlerAddress;
+        this.logger.verbose(`Minting fee juice to ${recipient} using handler at ${handlerAddress}`);
+        const client = this.context.deployL1ContractsValues.l1Client;
+        const handler = getContract({
+            abi: FeeAssetHandlerAbi,
+            address: handlerAddress.toString(),
             client
         });
-        const hash = await erc20.write.mint([
-            recipient,
-            amount
+        const hash = await handler.write.mint([
+            recipient
         ]);
-        await this.context.deployL1ContractsValues.publicClient.waitForTransactionReceipt({
+        await this.context.deployL1ContractsValues.l1Client.waitForTransactionReceipt({
             hash
         });
     }
@@ -241,13 +259,14 @@ const { E2E_DATA_PATH: dataPath } = process.env;
             const { fakeProofsAsset: asset, accounts } = this;
             const privateAmount = 10000n;
             const publicAmount = 10000n;
-            const waitOpts = {
-                proven: false
-            };
             this.logger.verbose(`Minting ${privateAmount + publicAmount} publicly...`);
-            await asset.methods.mint_to_public(accounts[0].address, privateAmount + publicAmount).send().wait(waitOpts);
+            await asset.methods.mint_to_public(accounts[0].address, privateAmount + publicAmount).send({
+                from: accounts[0].address
+            }).wait();
             this.logger.verbose(`Transferring ${privateAmount} to private...`);
-            await asset.methods.transfer_to_private(accounts[0].address, privateAmount).send().wait(waitOpts);
+            await asset.methods.transfer_to_private(accounts[0].address, privateAmount).send({
+                from: accounts[0].address
+            }).wait();
             this.logger.verbose(`Minting complete.`);
             return {
                 amount: publicAmount
@@ -255,37 +274,23 @@ const { E2E_DATA_PATH: dataPath } = process.env;
         }, async ({ amount })=>{
             const { fakeProofsAsset: asset, accounts: [{ address }], tokenSim } = this;
             tokenSim.mintPublic(address, amount);
-            const publicBalance = await asset.methods.balance_of_public(address).simulate();
+            const publicBalance = await asset.methods.balance_of_public(address).simulate({
+                from: address
+            });
             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();
+            const privateBalance = await asset.methods.balance_of_private(address).simulate({
+                from: address
+            });
             this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
             expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
-            const totalSupply = await asset.methods.total_supply().simulate();
+            const totalSupply = await asset.methods.total_supply().simulate({
+                from: address
+            });
             this.logger.verbose(`Total supply: ${totalSupply}`);
             expect(totalSupply).toEqual(tokenSim.totalSupply);
             return Promise.resolve();
         });
     }
-    async deployVerifier() {
-        if (!this.realProofs) {
-            return;
-        }
-        if (!this.circuitProofVerifier) {
-            throw new Error('No verifier');
-        }
-        const { walletClient, publicClient, l1ContractAddresses } = this.context.deployL1ContractsValues;
-        const rollup = getContract({
-            abi: RollupAbi,
-            address: l1ContractAddresses.rollupAddress.toString(),
-            client: walletClient
-        });
-        const { address: verifierAddress } = await deployL1Contract(walletClient, publicClient, HonkVerifierAbi, HonkVerifierBytecode);
-        this.logger.info(`Deployed honk verifier at ${verifierAddress}`);
-        await rollup.write.setEpochVerifier([
-            verifierAddress.toString()
-        ]);
-        this.logger.info('Rollup only accepts valid proofs now');
-    }
 }