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

package/dest/e2e_p2p/p2p_network.js

@@ -1,26 +1,33 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { ChainMonitor } from '@aztec/aztec.js/ethereum';
-import { L1TxUtilsWithBlobs, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-contracts.js/Spam';
-import { createBootstrapNodeFromPrivateKey } from '@aztec/p2p/mocks';
+import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
+import { getGenesisValues } from '@aztec/world-state/testing';
 import getPort from 'get-port';
 import { getContract } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import { ATTESTER_PRIVATE_KEYS_START_INDEX, PROPOSER_PRIVATE_KEYS_START_INDEX, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
-import { addAccounts, createSnapshotManager } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 import { getPrivateKeyFromIndex } from '../fixtures/utils.js';
 import { getEndToEndTestTelemetryClient } from '../fixtures/with_telemetry_utils.js';
 // Use a fixed bootstrap node private key so that we can re-use the same snapshot and the nodes can find each other
 const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f20670603a756ad8d84f2c94263a6427c591';
 const l1ContractsConfig = getL1ContractsConfigEnvVars();
 export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
+export const SHORTENED_BLOCK_TIME_CONFIG = {
+    aztecSlotDuration: 12,
+    ethereumSlotDuration: 4
+};
 export class P2PNetworkTest {
-    bootstrapNode;
+    bootstrapNodeEnr;
     bootNodePort;
     numberOfNodes;
+    metricsPort;
     snapshotManager;
     baseAccount;
     logger;
@@ -30,22 +37,26 @@ export class P2PNetworkTest {
     attesterPublicKeys;
     proposerPrivateKeys;
     peerIdPrivateKeys;
-    bootstrapNodeEnr;
+    deployedAccounts;
+    prefilledPublicData;
     // The re-execution test needs a wallet and a spam contract
     wallet;
     spamContract;
+    bootstrapNode;
     cleanupInterval;
     gasUtils;
-    constructor(testName, bootstrapNode, bootNodePort, numberOfNodes, initialValidatorConfig, // If set enable metrics collection
-    metricsPort, assumeProvenThrough){
-        this.bootstrapNode = bootstrapNode;
+    constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfNodes, initialValidatorConfig, // If set enable metrics collection
+    metricsPort){
+        this.bootstrapNodeEnr = bootstrapNodeEnr;
         this.bootNodePort = bootNodePort;
         this.numberOfNodes = numberOfNodes;
+        this.metricsPort = metricsPort;
         this.attesterPrivateKeys = [];
         this.attesterPublicKeys = [];
         this.proposerPrivateKeys = [];
         this.peerIdPrivateKeys = [];
-        this.bootstrapNodeEnr = '';
+        this.deployedAccounts = [];
+        this.prefilledPublicData = [];
         this.cleanupInterval = undefined;
         this.gasUtils = undefined;
         this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
@@ -54,26 +65,35 @@ export class P2PNetworkTest {
         this.proposerPrivateKeys = generatePrivateKeys(PROPOSER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
         this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
         this.attesterPublicKeys = this.attesterPrivateKeys.map((privateKey)=>privateKeyToAccount(privateKey).address);
-        this.bootstrapNodeEnr = bootstrapNode.getENR().encodeTxt();
         this.snapshotManager = createSnapshotManager(`e2e_p2p_network/${testName}`, process.env.E2E_DATA_PATH, {
             ...initialValidatorConfig,
-            ethereumSlotDuration: l1ContractsConfig.ethereumSlotDuration,
+            ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
+            aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
+            aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
+            aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
             salt: 420,
-            metricsPort: metricsPort
+            metricsPort: metricsPort,
+            numberOfInitialFundedAccounts: 1
         }, {
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
-            aztecEpochProofClaimWindowInL2Slots: initialValidatorConfig.aztecEpochProofClaimWindowInL2Slots ?? l1ContractsConfig.aztecEpochProofClaimWindowInL2Slots,
-            assumeProvenThrough: assumeProvenThrough ?? Number.MAX_SAFE_INTEGER,
+            ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
+            aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
+            aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
             initialValidators: []
         });
     }
-    static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, assumeProvenThrough }) {
+    static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig }) {
         const port = basePort || await getPort();
-        const telemetry = getEndToEndTestTelemetryClient(metricsPort);
-        const bootstrapNode = await createBootstrapNodeFromPrivateKey(BOOTSTRAP_NODE_PRIVATE_KEY, port, telemetry);
-        const bootstrapNodeEnr = bootstrapNode.getENR().encodeTxt();
+        const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
+        const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
         const initialValidatorConfig = await createValidatorConfig(initialConfig ?? {}, bootstrapNodeEnr);
-        return new P2PNetworkTest(testName, bootstrapNode, port, numberOfNodes, initialValidatorConfig, metricsPort, assumeProvenThrough);
+        return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort);
+    }
+    get fundedAccount() {
+        if (!this.deployedAccounts[0]) {
+            throw new Error('Call snapshot t.setupAccount to create a funded account.');
+        }
+        return this.deployedAccounts[0];
     }
     /**
    * Start a loop to sync the mock system time with the L1 block time
@@ -100,6 +120,12 @@ export class P2PNetworkTest {
         dateProvider.setTime(Number(timestamp.timestamp) * 1000);
     }
     async applyBaseSnapshots() {
+        await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig })=>{
+            const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
+            this.bootstrapNode = await createBootstrapNodeFromPrivateKey(BOOTSTRAP_NODE_PRIVATE_KEY, this.bootNodePort, telemetry, aztecNodeConfig);
+            // Overwrite enr with updated info
+            this.bootstrapNodeEnr = this.bootstrapNode.getENR().encodeTxt();
+        });
         await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider })=>{
             const rollup = getContract({
                 address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
@@ -149,7 +175,7 @@ export class P2PNetworkTest {
             const timestamp = await rollup.read.getTimestampForSlot([
                 slotsInEpoch
             ]);
-            const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrl);
+            const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
             try {
                 await cheatCodes.warp(Number(timestamp));
             } catch (err) {
@@ -169,12 +195,10 @@ export class P2PNetworkTest {
         });
     }
     async setupAccount() {
-        await this.snapshotManager.snapshot('setup-account', addAccounts(1, this.logger, false), async ({ accountKeys }, ctx)=>{
-            const wallets = await Promise.all(accountKeys.map(async (ak)=>{
-                const account = await getSchnorrAccount(ctx.pxe, ak[0], ak[1], 1);
-                return account.getWallet();
-            }));
-            this.wallet = wallets[0];
+        await this.snapshotManager.snapshot('setup-account', deployAccounts(1, this.logger, false), async ({ deployedAccounts }, { pxe })=>{
+            this.deployedAccounts = deployedAccounts;
+            const [account] = deployedAccounts;
+            this.wallet = await getSchnorrWalletWithSecretKey(pxe, account.secret, account.signingKey, account.salt);
         });
     }
     async deploySpamContract() {
@@ -212,6 +236,7 @@ export class P2PNetworkTest {
     }
     async setup() {
         this.ctx = await this.snapshotManager.setup();
+        this.prefilledPublicData = (await getGenesisValues(this.ctx.initialFundedAccounts.map((a)=>a.address))).prefilledPublicData;
         this.startSyncMockSystemTimeInterval();
         this.gasUtils = new L1TxUtilsWithBlobs(this.ctx.deployL1ContractsValues.publicClient, this.ctx.deployL1ContractsValues.walletClient, this.logger, {
             gasLimitBufferPercentage: 20,
@@ -221,8 +246,7 @@ export class P2PNetworkTest {
             checkIntervalMs: 100,
             stallTimeMs: 1000
         });
-        this.monitor = new ChainMonitor(RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues));
-        this.monitor.start();
+        this.monitor = new ChainMonitor(RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues)).start();
     }
     async stopNodes(nodes) {
         this.logger.info('Stopping nodes');
@@ -235,7 +259,7 @@ export class P2PNetworkTest {
     }
     async teardown() {
         this.monitor.stop();
-        await this.bootstrapNode.stop();
+        await this.bootstrapNode?.stop();
         await this.snapshotManager.teardown();
         if (this.cleanupInterval) {
             clearInterval(this.cleanupInterval);

package/dest/e2e_p2p/shared.d.ts

@@ -0,0 +1,10 @@
+import type { InitialAccountData } from '@aztec/accounts/testing';
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { type Logger, type SentTx } from '@aztec/aztec.js';
+import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import type { NodeContext } from '../fixtures/setup_p2p_test.js';
+export declare const submitComplexTxsTo: (logger: Logger, spamContract: SpamContract, numTxs: number, opts?: {
+    callPublic?: boolean;
+}) => Promise<SentTx[]>;
+export declare const createPXEServiceAndSubmitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<NodeContext>;
+//# sourceMappingURL=shared.d.ts.map

package/dest/e2e_p2p/shared.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAwB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAmBrB,CAAC"}

package/dest/e2e_p2p/shared.js

@@ -1,5 +1,5 @@
-import { CompleteAddress, TxStatus } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
+import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { TxStatus } from '@aztec/aztec.js';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
@@ -24,16 +24,15 @@ export const submitComplexTxsTo = async (logger, spamContract, numTxs, opts = {}
     return txs;
 };
 // creates an instance of the PXE and submit a given number of transactions to it.
-export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs)=>{
+export const createPXEServiceAndSubmitTransactions = async (logger, node, numTxs, fundedAccount)=>{
     const rpcConfig = getRpcConfig();
     const pxeService = await createPXEService(node, rpcConfig, true);
-    const secretKey = Fr.random();
-    const completeAddress = await CompleteAddress.fromSecretKeyAndPartialAddress(secretKey, Fr.random());
-    await pxeService.registerAccount(secretKey, completeAddress.partialAddress);
-    const txs = await submitTxsTo(pxeService, numTxs, logger);
+    const account = await getSchnorrAccount(pxeService, fundedAccount.secret, fundedAccount.signingKey, fundedAccount.salt);
+    await account.register();
+    const wallet = await account.getWallet();
+    const txs = await submitTxsTo(pxeService, numTxs, wallet, logger);
     return {
         txs,
-        account: completeAddress.address,
         pxeService,
         node
     };

package/dest/e2e_prover/e2e_prover_test.d.ts

@@ -0,0 +1,56 @@
+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 ClientProtocolCircuitVerifier } from '@aztec/bb-prover';
+import type { BlobSinkServer } from '@aztec/blob-sink/server';
+import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import type { PXEService } from '@aztec/pxe';
+import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { TokenSimulator } from '../simulators/token_simulator.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.
+ * We configure this instance with all of the accounts and contracts.
+ * We then prove and verify transactions created via this full prover PXE.
+ */
+export declare class FullProverTest {
+    private minNumberOfTxsPerBlock;
+    private realProofs;
+    static TOKEN_NAME: string;
+    static TOKEN_SYMBOL: string;
+    static TOKEN_DECIMALS: bigint;
+    private snapshotManager;
+    logger: Logger;
+    deployedAccounts: InitialAccountData[];
+    wallets: AccountWalletWithSecretKey[];
+    accounts: CompleteAddress[];
+    fakeProofsAsset: TokenContract;
+    tokenSim: TokenSimulator;
+    aztecNode: AztecNode;
+    pxe: PXEService;
+    cheatCodes: CheatCodes;
+    blobSink: BlobSinkServer;
+    private provenComponents;
+    private bbConfigCleanup?;
+    private acvmConfigCleanup?;
+    circuitProofVerifier?: ClientProtocolCircuitVerifier;
+    provenAssets: TokenContract[];
+    private context;
+    private proverNode;
+    private simulatedProverNode;
+    l1Contracts: DeployL1ContractsReturnType;
+    proverAddress: EthAddress;
+    constructor(testName: string, minNumberOfTxsPerBlock: number, coinbase: EthAddress, realProofs?: boolean);
+    /**
+     * Adds two state shifts to snapshot manager.
+     * 1. Add 2 accounts.
+     * 2. Publicly deploy accounts, deploy token contract
+     */
+    applyBaseSnapshots(): Promise<void>;
+    setup(): Promise<this>;
+    private mintL1ERC20;
+    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/e2e_prover/e2e_prover_test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"e2e_prover_test.d.ts","sourceRoot":"","sources":["../../src/e2e_prover/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,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,2BAA2B,EAChC,UAAU,EACV,KAAK,MAAM,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAqB,KAAK,6BAA6B,EAAuB,MAAM,kBAAkB,CAAC;AAE9G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAQ7C,OAAO,EAEL,KAAK,iBAAiB,EAIvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AASlE;;;;;GAKG;AAEH,qBAAa,cAAc;IA4BvB,OAAO,CAAC,sBAAsB;IAE9B,OAAO,CAAC,UAAU;IA7BpB,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,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;IAW3B;;;;OAIG;IACG,kBAAkB;IAqDlB,KAAK;YA0JG,WAAW;IAQzB,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;IAeR,iBAAiB;IAiDjB,cAAc;CA4BrB"}

package/dest/e2e_prover/e2e_prover_test.js

@@ -1,21 +1,21 @@
-import { SchnorrAccountContractArtifact, getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { createArchiver } from '@aztec/archiver';
-import { EthAddress, Fr, createLogger, deployL1Contract } from '@aztec/aztec.js';
+import { EthAddress, createLogger, deployL1Contract } from '@aztec/aztec.js';
 import { BBCircuitVerifier, 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 { 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 { addAccounts, createSnapshotManager, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { getPrivateKeyFromIndex, setupPXEService } from '../fixtures/utils.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 const { E2E_DATA_PATH: dataPath } = process.env;
-const SALT = 1;
 /**
  * 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.
@@ -29,7 +29,7 @@ const SALT = 1;
     static TOKEN_DECIMALS = 18n;
     snapshotManager;
     logger;
-    keys;
+    deployedAccounts;
     wallets;
     accounts;
     fakeProofsAsset;
@@ -51,7 +51,7 @@ const SALT = 1;
     constructor(testName, minNumberOfTxsPerBlock, coinbase, realProofs = true){
         this.minNumberOfTxsPerBlock = minNumberOfTxsPerBlock;
         this.realProofs = realProofs;
-        this.keys = [];
+        this.deployedAccounts = [];
         this.wallets = [];
         this.accounts = [];
         this.provenComponents = [];
@@ -62,21 +62,16 @@ const SALT = 1;
             startProverNode: true,
             fundRewardDistributor: true,
             coinbase
-        }, {
-            assumeProvenThrough: undefined
-        });
+        }, {});
     }
     /**
    * Adds two state shifts to snapshot manager.
    * 1. Add 2 accounts.
    * 2. Publicly deploy accounts, deploy token contract
    */ async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('2_accounts', addAccounts(2, this.logger), async ({ accountKeys }, { pxe })=>{
-            this.keys = accountKeys;
-            this.wallets = await Promise.all(accountKeys.map(async (ak)=>{
-                const account = await getSchnorrAccount(pxe, ak[0], ak[1], SALT);
-                return account.getWallet();
-            }));
+        await this.snapshotManager.snapshot('2_accounts', deployAccounts(2, this.logger), async ({ deployedAccounts }, { pxe })=>{
+            this.deployedAccounts = deployedAccounts;
+            this.wallets = await Promise.all(deployedAccounts.map((a)=>getSchnorrWalletWithSecretKey(pxe, a.secret, a.signingKey, a.salt)));
             this.accounts = this.wallets.map((w)=>w.getCompleteAddress());
             this.wallets.forEach((w, i)=>this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
         });
@@ -101,6 +96,8 @@ const SALT = 1;
     }
     async setup() {
         this.context = await this.snapshotManager.setup();
+        // We don't wish to mark as proven automatically, so we set the flag to false
+        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);
         const blobSinkClient = createBlobSinkClient({
@@ -149,10 +146,10 @@ const SALT = 1;
             this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
             await result.pxe.registerContract(this.fakeProofsAsset);
             for(let i = 0; i < 2; i++){
-                await result.pxe.registerAccount(this.keys[i][0], this.wallets[i].getCompleteAddress().partialAddress);
-                await this.pxe.registerAccount(this.keys[i][0], this.wallets[i].getCompleteAddress().partialAddress);
+                await result.pxe.registerAccount(this.deployedAccounts[i].secret, this.wallets[i].getCompleteAddress().partialAddress);
+                await this.pxe.registerAccount(this.deployedAccounts[i].secret, this.wallets[i].getCompleteAddress().partialAddress);
             }
-            const account = await getSchnorrAccount(result.pxe, this.keys[0][0], this.keys[0][1], SALT);
+            const account = await getSchnorrAccount(result.pxe, this.deployedAccounts[0].secret, this.deployedAccounts[0].signingKey, this.deployedAccounts[0].salt);
             await result.pxe.registerContract({
                 instance: account.getInstance(),
                 artifact: SchnorrAccountContractArtifact
@@ -188,27 +185,26 @@ const SALT = 1;
             ...this.context.aztecNodeConfig,
             proverCoordinationNodeUrl: undefined,
             dataDirectory: undefined,
-            proverId: new Fr(81),
+            proverId: this.proverAddress.toField(),
             realProofs: this.realProofs,
             proverAgentCount: 2,
             publisherPrivateKey: `0x${proverNodePrivateKey.toString('hex')}`,
             proverNodeMaxPendingJobs: 100,
             proverNodeMaxParallelBlocksPerEpoch: 32,
             proverNodePollingIntervalMs: 100,
-            quoteProviderBasisPointFee: 100,
-            quoteProviderBondAmount: 1000n,
-            proverMinimumEscrowAmount: 3000n,
-            proverTargetEscrowAmount: 6000n,
             txGatheringTimeoutMs: 60000,
             txGatheringIntervalMs: 1000,
             txGatheringMaxParallelRequests: 100
         };
+        const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map((a)=>a.address));
         this.proverNode = await createProverNode(proverConfig, {
             aztecNodeTxProvider: this.aztecNode,
             archiver: archiver,
             blobSinkClient
+        }, {
+            prefilledPublicData
         });
-        await this.proverNode.start();
+        this.proverNode.start();
         this.logger.warn(`Proofs are now enabled`);
         return this;
     }

package/dest/e2e_token_contract/token_contract_test.d.ts

@@ -0,0 +1,29 @@
+import { type AccountWallet, type CompleteAddress, type Logger } from '@aztec/aztec.js';
+import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
+import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
+import { TokenSimulator } from '../simulators/token_simulator.js';
+export declare class TokenContractTest {
+    static TOKEN_NAME: string;
+    static TOKEN_SYMBOL: string;
+    static TOKEN_DECIMALS: bigint;
+    private snapshotManager;
+    logger: Logger;
+    wallets: AccountWallet[];
+    accounts: CompleteAddress[];
+    asset: TokenContract;
+    tokenSim: TokenSimulator;
+    badAccount: DocsExampleContract;
+    constructor(testName: string);
+    /**
+     * 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>;
+    applyMintSnapshot(): Promise<void>;
+}
+//# sourceMappingURL=token_contract_test.d.ts.map

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

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

package/dest/e2e_token_contract/token_contract_test.js

@@ -1,9 +1,9 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+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 { jest } from '@jest/globals';
-import { addAccounts, createSnapshotManager, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
+import { createSnapshotManager, deployAccounts, publicDeployAccounts } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
 import { TokenSimulator } from '../simulators/token_simulator.js';
 const { E2E_DATA_PATH: dataPath, METRICS_PORT: metricsPort } = process.env;
@@ -31,11 +31,8 @@ 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', 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.accounts = this.wallets.map((w)=>w.getCompleteAddress());
         });
         await this.snapshotManager.snapshot('e2e_token_contract', async ()=>{

package/dest/fixtures/fixtures.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+export declare const METRICS_PORT = 4318;
+export declare const shouldCollectMetrics: () => 4318 | undefined;
+export declare const TEST_PEER_CHECK_INTERVAL_MS = 1000;
+export declare const MNEMONIC = "test test test test test test test test test test test junk";
+export declare const privateKey: Buffer;
+export declare const privateKey2: Buffer;
+export declare const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
+export declare const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
+export declare const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
+export declare const DUPLICATE_NULLIFIER_ERROR: RegExp;
+export declare const NO_L1_TO_L2_MSG_ERROR: RegExp;
+export declare const STATIC_CALL_STATE_MODIFICATION_ERROR: RegExp;
+export declare const STATIC_CONTEXT_ASSERTION_ERROR: RegExp;
+export declare const DEFAULT_BLOB_SINK_PORT = "5052";
+//# sourceMappingURL=fixtures.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../src/fixtures/fixtures.ts"],"names":[],"mappings":";;AAAA,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,oBAAoB,wBAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD,eAAO,MAAM,QAAQ,gEAAgE,CAAC;AACtF,eAAO,MAAM,UAAU,QAAyF,CAAC;AACjH,eAAO,MAAM,WAAW,QAAyF,CAAC;AAGlH,eAAO,MAAM,oBAAoB,uEAAuE,CAAC;AACzG,eAAO,MAAM,mBAAmB,kEAAkE,CAAC;AACnG,eAAO,MAAM,qBAAqB,+EAA+E,CAAC;AAElH,eAAO,MAAM,yBAAyB,QAA6D,CAAC;AACpG,eAAO,MAAM,qBAAqB,QACwE,CAAC;AAC3G,eAAO,MAAM,oCAAoC,QAC+B,CAAC;AACjF,eAAO,MAAM,8BAA8B,QAAkE,CAAC;AAE9G,eAAO,MAAM,sBAAsB,SAAS,CAAC"}

package/dest/fixtures/fixtures.js

@@ -10,8 +10,8 @@ export const MNEMONIC = 'test test test test test test test test test test test
 export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80', 'hex');
 export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');
 /// Common errors
-export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with underflow 'hi == high'";
-export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'hi == high'";
+export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
+export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
 export const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): Make these a fixed error after transition.
 export const DUPLICATE_NULLIFIER_ERROR = /dropped|duplicate nullifier|reverted|Nullifier collision/;

package/dest/fixtures/get_acvm_config.d.ts

@@ -0,0 +1,8 @@
+import type { Logger } from '@aztec/aztec.js';
+export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
+export declare function getACVMConfig(logger: Logger): Promise<{
+    acvmWorkingDirectory: string;
+    acvmBinaryPath: string;
+    cleanup: () => Promise<void>;
+} | undefined>;
+//# sourceMappingURL=get_acvm_config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get_acvm_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_acvm_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAM9C,OAAO,EAAE,0CAA0C,EAAE,MAAM,uCAAuC,CAAC;AAWnG,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CACxD;IACE,oBAAoB,EAAE,MAAM,CAAC;IAC7B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,GACD,SAAS,CACZ,CAkCA"}

package/dest/fixtures/get_acvm_config.js

@@ -20,11 +20,16 @@ export async function getACVMConfig(logger) {
         const directoryToCleanup = ACVM_WORKING_DIRECTORY ? undefined : tempWorkingDirectory;
         const cleanup = async ()=>{
             if (directoryToCleanup) {
-                // logger(`Cleaning up ACVM temp directory ${directoryToCleanup}`);
-                await fs.rm(directoryToCleanup, {
-                    recursive: true,
-                    force: true
-                });
+                try {
+                    logger.info(`Cleaning up ACVM temp directory ${directoryToCleanup}`);
+                    await fs.rm(directoryToCleanup, {
+                        recursive: true,
+                        force: true,
+                        maxRetries: 3
+                    });
+                } catch (err) {
+                    logger.warn(`Failed to delete ACVM temp directory at ${directoryToCleanup}: ${err}`);
+                }
             }
         };
         return {

package/dest/fixtures/get_bb_config.d.ts

@@ -0,0 +1,6 @@
+import { type Logger } from '@aztec/aztec.js';
+import type { BBConfig } from '@aztec/bb-prover';
+export declare const getBBConfig: (logger: Logger) => Promise<(BBConfig & {
+    cleanup: () => Promise<void>;
+}) | undefined>;
+//# sourceMappingURL=get_bb_config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get_bb_config.d.ts","sourceRoot":"","sources":["../../src/fixtures/get_bb_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAcjD,eAAO,MAAM,WAAW,WACd,MAAM,KACb,QAAQ,CAAC,QAAQ,GAAG;IAAE,OAAO,EAAE,MAAM,QAAQ,IAAI,CAAC,CAAA;CAAE,CAAC,GAAG,SAAS,CAoCnE,CAAC"}

package/dest/fixtures/get_bb_config.js

@@ -24,10 +24,15 @@ export const getBBConfig = async (logger)=>{
         ].includes(BB_SKIP_CLEANUP);
         const cleanup = async ()=>{
             if (directoryToCleanup && !bbSkipCleanup) {
-                await fs.rm(directoryToCleanup, {
-                    recursive: true,
-                    force: true
-                });
+                try {
+                    await fs.rm(directoryToCleanup, {
+                        recursive: true,
+                        force: true,
+                        maxRetries: 3
+                    });
+                } catch (err) {
+                    logger.warn(`Failed to delete bb working directory at ${directoryToCleanup}: ${err}`);
+                }
             }
         };
         return {

package/dest/fixtures/index.d.ts

@@ -0,0 +1,6 @@
+export * from './fixtures.js';
+export * from './logging.js';
+export * from './utils.js';
+export * from './token_utils.js';
+export * from './with_telemetry_utils.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fixtures/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC"}

package/dest/fixtures/l1_to_l2_messaging.d.ts

@@ -0,0 +1,13 @@
+import type { L1ContractAddresses, ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import { Fr } from '@aztec/foundation/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+export declare function sendL1ToL2Message(message: {
+    recipient: AztecAddress;
+    content: Fr;
+    secretHash: Fr;
+}, ctx: {
+    walletClient: ViemWalletClient;
+    publicClient: ViemPublicClient;
+    l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress'>;
+}): Promise<Fr[]>;
+//# sourceMappingURL=l1_to_l2_messaging.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"l1_to_l2_messaging.d.ts","sourceRoot":"","sources":["../../src/fixtures/l1_to_l2_messaging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC/F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE;IAAE,SAAS,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAA;CAAE,EACjE,GAAG,EAAE;IACH,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,gBAAgB,CAAC;IAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;CAChE,iBAmCF"}

package/dest/fixtures/l1_to_l2_messaging.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
 import { InboxAbi } from '@aztec/l1-artifacts';
 import { expect } from '@jest/globals';
 import { decodeEventLog, getContract } from 'viem';

package/dest/fixtures/logging.d.ts

@@ -0,0 +1,8 @@
+/** Returns whether metrics logging should be enabled by default, checking env vars CI and BENCHMARK. */
+export declare function isMetricsLoggingRequested(): boolean;
+/**
+ * Configures an NDJSON logger to output entries to a local file that have an `eventName` associated.
+ * Idempotent and automatically called by `setup` if CI or BENCHMARK env vars are set.
+ */
+export declare function setupMetricsLogger(filename: string): void;
+//# sourceMappingURL=logging.d.ts.map