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

package/dest/fixtures/snapshot_manager.js

@@ -1,17 +1,21 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { deployFundedSchnorrAccounts, generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { AnvilTestWatcher, BatchCall, CheatCodes, getContractClassFromArtifact } from '@aztec/aztec.js';
-import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
+import { BatchCall, DefaultWaitForProvenOpts, EthAddress, getContractClassFromArtifact, waitForProven } from '@aztec/aztec.js';
+import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
+import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
-import { createL1Clients, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
+import { createExtendedL1Client, deployMulticall3, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { asyncMap } from '@aztec/foundation/async-map';
+import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
+import { tryRmDir } from '@aztec/foundation/fs';
 import { createLogger } from '@aztec/foundation/log';
 import { resolver, reviver } from '@aztec/foundation/serialize';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
@@ -20,13 +24,13 @@ import fs from 'fs/promises';
 import getPort from 'get-port';
 import { tmpdir } from 'os';
 import path, { join } from 'path';
-import { getContract } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
-import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
+import { foundry } from 'viem/chains';
+import { MNEMONIC, TEST_MAX_TX_POOL_SIZE, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
 import { setupL1Contracts } from './setup_l1_contracts.js';
-import { createAndSyncProverNode, getLogger, getPrivateKeyFromIndex } from './utils.js';
+import { createAndSyncProverNode, getLogger, getPrivateKeyFromIndex, getSponsoredFPCAddress } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 export function createSnapshotManager(testName, dataPath, config = {}, deployL1ContractsArgs = {
     initialValidators: []
@@ -176,28 +180,19 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     if (!context) {
         return;
     }
+    const logger = getLogger();
     try {
-        getLogger().info('Tearing down subsystems');
-        await context.proverNode?.stop();
-        await context.aztecNode.stop();
+        logger.info('Tearing down subsystems');
+        await tryStop(context.proverNode);
+        await tryStop(context.aztecNode);
         await context.acvmConfig?.cleanup();
         await context.bbConfig?.cleanup();
-        await context.anvil.stop();
-        await context.watcher.stop();
-        await context.blobSink.stop();
-        if (context.directoryToCleanup) {
-            try {
-                await fs.rm(context.directoryToCleanup, {
-                    recursive: true,
-                    force: true,
-                    maxRetries: 3
-                });
-            } catch (err) {
-                getLogger().warn(`Failed to delete tmp directory ${context.directoryToCleanup}: ${err}`);
-            }
-        }
+        await tryStop(context.anvil);
+        await tryStop(context.watcher);
+        await tryStop(context.blobSink);
+        await tryRmDir(context.directoryToCleanup, logger);
     } catch (err) {
-        getLogger().error('Error during teardown', err);
+        logger.error('Error during teardown', err);
     }
 }
 /**
@@ -209,6 +204,9 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
 }) {
     logger.verbose(`Initializing state...`);
     const blobSinkPort = await getPort();
+    // Default to no slashing
+    opts.slasherFlavor ??= 'none';
+    deployL1ContractsArgs.slasherFlavor ??= opts.slasherFlavor;
     // Fetch the AztecNode config.
     // TODO: For some reason this is currently the union of a bunch of subsystems. That needs fixing.
     const aztecNodeConfig = {
@@ -216,6 +214,15 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         ...opts
     };
     aztecNodeConfig.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
+    aztecNodeConfig.maxTxPoolSize = opts.maxTxPoolSize ?? TEST_MAX_TX_POOL_SIZE;
+    // Only enable proving if specifically requested.
+    aztecNodeConfig.realProofs = !!opts.realProofs;
+    // Only enforce the time table if requested
+    aztecNodeConfig.enforceTimeTable = !!opts.enforceTimeTable;
+    // Only set the target committee size if it is explicitly set
+    aztecNodeConfig.aztecTargetCommitteeSize = opts.aztecTargetCommitteeSize ?? 0;
+    aztecNodeConfig.listenAddress = '127.0.0.1';
+    deployL1ContractsArgs.aztecTargetCommitteeSize ??= aztecNodeConfig.aztecTargetCommitteeSize;
     // Create a temp directory for all ephemeral state and cleanup afterwards
     const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
     await fs.mkdir(directoryToCleanup, {
@@ -226,16 +233,25 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     } else {
         aztecNodeConfig.dataDirectory = statePath;
     }
-    aztecNodeConfig.blobSinkUrl = `http://localhost:${blobSinkPort}`;
-    // Setup blob sink service
-    const blobSink = await createBlobSinkServer({
-        port: blobSinkPort,
-        dataStoreConfig: {
-            dataDirectory: aztecNodeConfig.dataDirectory,
-            dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB
-        }
+    aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
+    const hdAccount = mnemonicToAccount(MNEMONIC, {
+        addressIndex: 0
     });
-    await blobSink.start();
+    const publisherPrivKeyRaw = hdAccount.getHdKey().privateKey;
+    const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+    const l1Client = createExtendedL1Client([
+        aztecNodeConfig.l1RpcUrls[0]
+    ], hdAccount, foundry);
+    const validatorPrivKey = getPrivateKeyFromIndex(0);
+    const proverNodePrivateKey = getPrivateKeyFromIndex(0);
+    aztecNodeConfig.publisherPrivateKeys = [
+        new SecretValue(`0x${publisherPrivKey.toString('hex')}`)
+    ];
+    aztecNodeConfig.validatorPrivateKeys = new SecretValue([
+        `0x${validatorPrivKey.toString('hex')}`
+    ]);
+    aztecNodeConfig.coinbase = opts.coinbase ?? EthAddress.fromString(`${hdAccount.address}`);
+    logger.info(`Setting up environment with config`, aztecNodeConfig);
     // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
     logger.verbose('Starting anvil...');
     const res = await startAnvil({
@@ -245,57 +261,30 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     aztecNodeConfig.l1RpcUrls = [
         res.rpcUrl
     ];
+    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
     // Deploy our L1 contracts.
     logger.verbose('Deploying L1 contracts...');
-    const hdAccount = mnemonicToAccount(MNEMONIC, {
-        accountIndex: 0
-    });
-    const publisherPrivKeyRaw = hdAccount.getHdKey().privateKey;
-    const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
-    const validatorPrivKey = getPrivateKeyFromIndex(0);
-    const proverNodePrivateKey = getPrivateKeyFromIndex(0);
-    aztecNodeConfig.publisherPrivateKey = `0x${publisherPrivKey.toString('hex')}`;
-    aztecNodeConfig.validatorPrivateKey = `0x${validatorPrivKey.toString('hex')}`;
-    const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
     if (opts.l1StartTime) {
-        await ethCheatCodes.warp(opts.l1StartTime);
+        await ethCheatCodes.warp(opts.l1StartTime, {
+            resetBlockInterval: true
+        });
     }
     const initialFundedAccounts = await generateSchnorrAccounts(numberOfInitialFundedAccounts);
-    const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice);
+    const sponsoredFPCAddress = await getSponsoredFPCAddress();
+    const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), opts.initialAccountFeeJuice);
+    await deployMulticall3(l1Client, logger);
     const deployL1ContractsValues = await setupL1Contracts(aztecNodeConfig.l1RpcUrls[0], hdAccount, logger, {
         ...getL1ContractsConfigEnvVars(),
         genesisArchiveRoot,
-        genesisBlockHash,
+        feeJuicePortalInitialBalance: fundingNeeded,
         salt: opts.salt,
         ...deployL1ContractsArgs,
         initialValidators: opts.initialValidators
     });
     aztecNodeConfig.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
-    aztecNodeConfig.l1PublishRetryIntervalMS = 100;
-    if (opts.fundRewardDistributor) {
-        // Mints block rewards for 10000 blocks to the rewardDistributor contract
-        const rewardDistributor = getContract({
-            address: deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
-            abi: l1Artifacts.rewardDistributor.contractAbi,
-            client: deployL1ContractsValues.publicClient
-        });
-        const blockReward = await rewardDistributor.read.BLOCK_REWARD();
-        const mintAmount = 10_000n * blockReward;
-        const feeJuice = getContract({
-            address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
-            abi: l1Artifacts.feeAsset.contractAbi,
-            client: deployL1ContractsValues.walletClient
-        });
-        const rewardDistributorMintTxHash = await feeJuice.write.mint([
-            rewardDistributor.address,
-            mintAmount
-        ], {});
-        await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-            hash: rewardDistributorMintTxHash
-        });
-        logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
-    }
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient);
+    aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;
+    const dateProvider = new TestDateProvider();
+    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
     await watcher.start();
     const acvmConfig = await getACVMConfig(logger);
     if (acvmConfig) {
@@ -308,8 +297,17 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
     }
     const telemetry = getEndToEndTestTelemetryClient(opts.metricsPort);
-    logger.verbose('Creating and synching an aztec node...');
-    const dateProvider = new TestDateProvider();
+    // Setup blob sink service
+    const blobSink = await createBlobSinkServer({
+        l1ChainId: aztecNodeConfig.l1ChainId,
+        l1RpcUrls: aztecNodeConfig.l1RpcUrls,
+        l1Contracts: aztecNodeConfig.l1Contracts,
+        port: blobSinkPort,
+        dataDirectory: aztecNodeConfig.dataDirectory,
+        dataStoreMapSizeKb: aztecNodeConfig.dataStoreMapSizeKb
+    }, telemetry);
+    await blobSink.start();
+    logger.info('Creating and synching an aztec node...');
     const aztecNode = await AztecNodeService.createAndSync(aztecNodeConfig, {
         telemetry,
         dateProvider
@@ -318,12 +316,18 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     });
     let proverNode = undefined;
     if (opts.startProverNode) {
-        logger.verbose('Creating and syncing a simulated prover node...');
-        proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')), prefilledPublicData);
+        logger.verbose('Creating and syncing a simulated prover node with p2p disabled...');
+        proverNode = await createAndSyncProverNode(`0x${proverNodePrivateKey.toString('hex')}`, aztecNodeConfig, {
+            ...aztecNodeConfig.proverNodeConfig,
+            dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')),
+            p2pEnabled: false
+        }, aztecNode, prefilledPublicData);
     }
     logger.verbose('Creating pxe...');
     const pxeConfig = getPXEServiceConfig();
     pxeConfig.dataDirectory = statePath ?? path.join(directoryToCleanup, randomBytes(8).toString('hex'));
+    // Only enable proving if specifically requested.
+    pxeConfig.proverEnabled = !!opts.realProofs;
     const pxe = await createPXEService(aztecNode, pxeConfig);
     const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
     if (statePath) {
@@ -335,6 +339,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         anvil,
         aztecNode,
         pxe,
+        sequencer: aztecNode.getSequencer(),
         acvmConfig,
         bbConfig,
         deployL1ContractsValues,
@@ -361,16 +366,9 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const aztecNodeConfig = JSON.parse(readFileSync(`${statePath}/aztec_node_config.json`, 'utf-8'), reviver);
     aztecNodeConfig.dataDirectory = statePath;
     aztecNodeConfig.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;
+    aztecNodeConfig.listenAddress = '127.0.0.1';
     const initialFundedAccounts = JSON.parse(readFileSync(`${statePath}/accounts.json`, 'utf-8'), reviver) || [];
     const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
-    const blobSink = await createBlobSinkServer({
-        port: blobSinkPort,
-        dataStoreConfig: {
-            dataDirectory: statePath,
-            dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB
-        }
-    });
-    await blobSink.start();
     // Start anvil. We go via a wrapper script to ensure if the parent dies, anvil dies.
     const { anvil, rpcUrl } = await startAnvil();
     aztecNodeConfig.l1RpcUrls = [
@@ -392,12 +390,21 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
     }
     logger.verbose('Creating ETH clients...');
-    const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), aztecNodeConfig.l1Contracts.rollupAddress, publicClient);
+    const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
+    const dateProvider = new TestDateProvider();
+    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls), aztecNodeConfig.l1Contracts.rollupAddress, l1Client, dateProvider);
     await watcher.start();
-    logger.verbose('Creating aztec node...');
     const telemetry = initTelemetryClient(getTelemetryConfig());
-    const dateProvider = new TestDateProvider();
+    const blobSink = await createBlobSinkServer({
+        l1ChainId: aztecNodeConfig.l1ChainId,
+        l1RpcUrls: aztecNodeConfig.l1RpcUrls,
+        l1Contracts: aztecNodeConfig.l1Contracts,
+        port: blobSinkPort,
+        dataDirectory: statePath,
+        dataStoreMapSizeKb: aztecNodeConfig.dataStoreMapSizeKb
+    }, telemetry);
+    await blobSink.start();
+    logger.verbose('Creating aztec node...');
     const aztecNode = await AztecNodeService.createAndSync(aztecNodeConfig, {
         telemetry,
         dateProvider
@@ -409,7 +416,11 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         logger.verbose('Creating and syncing a simulated prover node...');
         const proverNodePrivateKey = getPrivateKeyFromIndex(2);
         const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
-        proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')), prefilledPublicData);
+        proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, aztecNodeConfig, {
+            ...aztecNodeConfig.proverNodeConfig,
+            dataDirectory: path.join(directoryToCleanup, randomBytes(8).toString('hex')),
+            p2pEnabled: false
+        }, aztecNode, prefilledPublicData);
     }
     logger.verbose('Creating pxe...');
     const pxeConfig = getPXEServiceConfig();
@@ -421,13 +432,14 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         anvil,
         aztecNode,
         pxe,
+        sequencer: aztecNode.getSequencer(),
         acvmConfig,
         bbConfig,
         proverNode,
         deployL1ContractsValues: {
-            walletClient,
-            publicClient,
-            l1ContractAddresses: aztecNodeConfig.l1Contracts
+            l1Client,
+            l1ContractAddresses: aztecNodeConfig.l1Contracts,
+            rollupVersion: aztecNodeConfig.rollupVersion
         },
         watcher,
         cheatCodes,
@@ -446,9 +458,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         }
         logger.verbose('Deploying accounts funded with fee juice...');
         const deployedAccounts = initialFundedAccounts.slice(0, numberOfAccounts);
-        await deployFundedSchnorrAccounts(pxe, deployedAccounts, {
-            proven: waitUntilProven
-        });
+        await deployFundedSchnorrAccounts(pxe, deployedAccounts, undefined, waitUntilProven ? DefaultWaitForProvenOpts : undefined);
         return {
             deployedAccounts
         };
@@ -458,22 +468,28 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
  * Use this when you need to make a public call to an account contract, such as for requesting a public authwit.
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
- */ export async function publicDeployAccounts(sender, accountsToDeploy, waitUntilProven = false) {
+ * @param waitUntilProven - Whether to wait for the tx to be proven.
+ * @param pxeOrNode - PXE or AztecNode to wait for proven.
+ */ export async function publicDeployAccounts(sender, accountsToDeploy, waitUntilProven = false, pxeOrNode) {
     const accountAddressesToDeploy = accountsToDeploy.map((a)=>'address' in a ? a.address : a);
     const instances = (await Promise.all(accountAddressesToDeploy.map((account)=>sender.getContractMetadata(account)))).map((metadata)=>metadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
     const alreadyRegistered = (await sender.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered;
-    const fns = await Promise.all([
+    const calls = await Promise.all([
         ...!alreadyRegistered ? [
-            registerContractClass(sender, SchnorrAccountContractArtifact)
+            publishContractClass(sender, SchnorrAccountContractArtifact)
         ] : [],
-        ...instances.map((instance)=>deployInstance(sender, instance))
+        ...instances.map((instance)=>publishInstance(sender, instance))
     ]);
-    const calls = await Promise.all(fns.map((fn)=>fn.request()));
-    const capsules = fns.map((fn)=>fn.getCapsules()).flat();
     const batch = new BatchCall(sender, calls);
-    batch.addCapsules(capsules);
-    await batch.send().wait({
-        proven: waitUntilProven
-    });
+    const txReceipt = await batch.send({
+        from: accountAddressesToDeploy[0]
+    }).wait();
+    if (waitUntilProven) {
+        if (!pxeOrNode) {
+            throw new Error('Need to provide a PXE or AztecNode to wait for proven.');
+        } else {
+            await waitForProven(pxeOrNode, txReceipt);
+        }
+    }
 }

package/dest/fixtures/token_utils.d.ts

@@ -1,6 +1,7 @@
-import type { AztecAddress, Logger, Wallet } from '@aztec/aztec.js';
+import { type AztecAddress, type Logger, type Wallet } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-export declare function deployToken(adminWallet: Wallet, initialAdminBalance: bigint, logger: Logger): Promise<TokenContract>;
-export declare function mintTokensToPrivate(token: TokenContract, minterWallet: Wallet, recipient: AztecAddress, amount: bigint): Promise<void>;
+export declare function deployToken(adminWallet: Wallet, deployerAddress: AztecAddress, initialAdminBalance: bigint, logger: Logger): Promise<TokenContract>;
+export declare function mintTokensToPrivate(token: TokenContract, minter: AztecAddress, minterWallet: Wallet, recipient: AztecAddress, amount: bigint): Promise<void>;
 export declare function expectTokenBalance(wallet: Wallet, token: TokenContract, owner: AztecAddress, expectedBalance: bigint, logger: Logger): Promise<void>;
+export declare function mintNotes(sender: Wallet, minter: AztecAddress, recipient: AztecAddress, asset: TokenContract, noteAmounts: bigint[]): Promise<bigint>;
 //# sourceMappingURL=token_utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"token_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/token_utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,0BAcjG;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,iBAKf;AAGD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,iBAOf"}
+{"version":3,"file":"token_utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/token_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAa,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,YAAY,EAC7B,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM,0BAef;AAED,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,YAAY,EACpB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,iBAIf;AAGD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,YAAY,EACnB,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,iBAOf;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,YAAY,EACvB,KAAK,EAAE,aAAa,EACpB,WAAW,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,MAAM,CAAC,CAWjB"}

package/dest/fixtures/token_utils.js

@@ -1,19 +1,23 @@
-// docs:start:token_utils
+import { BatchCall } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-export async function deployToken(adminWallet, initialAdminBalance, logger) {
+// docs:start:token_utils
+export async function deployToken(adminWallet, deployerAddress, initialAdminBalance, logger) {
     logger.info(`Deploying Token contract...`);
-    const contract = await TokenContract.deploy(adminWallet, adminWallet.getAddress(), 'TokenName', 'TokenSymbol', 18).send().deployed();
+    const contract = await TokenContract.deploy(adminWallet, deployerAddress, 'TokenName', 'TokenSymbol', 18).send({
+        from: deployerAddress
+    }).deployed();
     if (initialAdminBalance > 0n) {
         // Minter is minting to herself so contract as minter is the same as contract as recipient
-        await mintTokensToPrivate(contract, adminWallet, adminWallet.getAddress(), initialAdminBalance);
+        await mintTokensToPrivate(contract, deployerAddress, adminWallet, deployerAddress, initialAdminBalance);
     }
     logger.info('L2 contract deployed');
     return contract;
 }
-export async function mintTokensToPrivate(token, minterWallet, recipient, amount) {
+export async function mintTokensToPrivate(token, minter, minterWallet, recipient, amount) {
     const tokenAsMinter = await TokenContract.at(token.address, minterWallet);
-    const from = minterWallet.getAddress(); // we are setting from to minter here because we need a sender to calculate the tag
-    await tokenAsMinter.methods.mint_to_private(from, recipient, amount).send().wait();
+    await tokenAsMinter.methods.mint_to_private(recipient, amount).send({
+        from: minter
+    }).wait();
 }
 // docs:end:token_utils
 export async function expectTokenBalance(wallet, token, owner, expectedBalance, logger) {
@@ -25,3 +29,16 @@ export async function expectTokenBalance(wallet, token, owner, expectedBalance,
     logger.info(`Account ${owner} balance: ${balance}`);
     expect(balance).toBe(expectedBalance);
 }
+export async function mintNotes(sender, minter, recipient, asset, noteAmounts) {
+    // We can only mint 4 notes at a time, since that's the maximum number of calls our entrypoints allow
+    // TODO(#13024): mint as many notes as possible in a single tx
+    const notesPerIteration = 4;
+    for(let mintedNotes = 0; mintedNotes < noteAmounts.length; mintedNotes += notesPerIteration){
+        const toMint = noteAmounts.slice(mintedNotes, mintedNotes + notesPerIteration);
+        const actions = toMint.map((amt)=>asset.methods.mint_to_private(recipient, amt));
+        await new BatchCall(sender, actions).send({
+            from: minter
+        }).wait();
+    }
+    return noteAmounts.reduce((prev, curr)=>prev + curr, 0n);
+}

package/dest/fixtures/utils.d.ts

@@ -1,21 +1,23 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { type InitialAccountData } from '@aztec/accounts/testing';
 import { type AztecNodeConfig } from '@aztec/aztec-node';
-import { type AccountWalletWithSecretKey, AnvilTestWatcher, type AztecAddress, type AztecNode, CheatCodes, type ContractMethod, type DeployL1ContractsReturnType, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
-import type { BBNativePrivateKernelProver } from '@aztec/bb-prover';
+import { type AccountWalletWithSecretKey, type AztecAddress, type AztecNode, type ContractMethod, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
+import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { type BlobSinkServer } from '@aztec/blob-sink/server';
-import { type DeployL1ContractsArgs, ForwarderContract } from '@aztec/ethereum';
-import { startAnvil } from '@aztec/ethereum/test';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, type Operator } from '@aztec/ethereum';
+import { EthCheatCodes, startAnvil } from '@aztec/ethereum/test';
+import { SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { type ProverNode } from '@aztec/prover-node';
+import type { DataStoreConfig } from '@aztec/kv-store/config';
+import { MockGossipSubNetwork } from '@aztec/p2p/test-helpers';
+import { type ProverNode, type ProverNodeConfig, type ProverNodeDeps } from '@aztec/prover-node';
 import { type PXEService, type PXEServiceConfig } from '@aztec/pxe/server';
 import type { SequencerClient } from '@aztec/sequencer-client';
+import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient, type TelemetryClientConfig } from '@aztec/telemetry-client';
-import { type Chain, type HDAccount, type Hex, type PrivateKeyAccount } from 'viem';
+import { type Chain, type HDAccount, type PrivateKeyAccount } from 'viem';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 export { startAnvil };
 export declare const getPrivateKeyFromIndex: (index: number) => Buffer | null;
@@ -24,13 +26,11 @@ export declare const setupL1Contracts: (l1RpcUrls: string[], account: HDAccount
  * Sets up Private eXecution Environment (PXE).
  * @param aztecNode - An instance of Aztec Node.
  * @param opts - Partial configuration for the PXE service.
- * @param firstPrivKey - The private key of the first account to be created.
  * @param logger - The logger to be used.
  * @param useLogSuffix - Whether to add a randomly generated suffix to the PXE debug logs.
- * @param proofCreator - An optional proof creator to use
- * @returns Private eXecution Environment (PXE), accounts, wallets and logger.
+ * @returns Private eXecution Environment (PXE), logger and teardown function.
  */
-export declare function setupPXEService(aztecNode: AztecNode, opts?: Partial<PXEServiceConfig>, logger?: Logger, useLogSuffix?: boolean, proofCreator?: BBNativePrivateKernelProver): Promise<{
+export declare function setupPXEService(aztecNode: AztecNode, opts?: Partial<PXEServiceConfig>, logger?: Logger, useLogSuffix?: boolean): Promise<{
     /**
      * The PXE instance.
      */
@@ -63,7 +63,9 @@ export type SetupOptions = {
     /** Salt to use in L1 contract deployment */
     salt?: number;
     /** An initial set of validators */
-    initialValidators?: EthAddress[];
+    initialValidators?: (Operator & {
+        privateKey: `0x${string}`;
+    })[];
     /** Anvil Start time */
     l1StartTime?: number;
     /** The anvil time where we should at the earliest be seeing L2 blocks */
@@ -78,11 +80,27 @@ export type SetupOptions = {
     };
     /** Public data that will be inserted in the tree in genesis */
     genesisPublicData?: PublicDataTreeLeaf[];
+    /** Specific config for the prover node, if set. */
+    proverNodeConfig?: Partial<ProverNodeConfig>;
+    /** Whether to use a mock gossip sub network for p2p clients. */
+    mockGossipSubNetwork?: boolean;
+    /** Whether to disable the anvil test watcher (can still be manually started) */
+    disableAnvilTestWatcher?: boolean;
+    /** Whether to enable anvil automine during deployment of L1 contracts (consider defaulting this to true). */
+    automineL1Setup?: boolean;
+    /** How many accounts to seed and unlock in anvil. */
+    anvilAccounts?: number;
+    /** Port to start anvil (defaults to 8545) */
+    anvilPort?: number;
+    /** Key to use for publishing L1 contracts */
+    l1PublisherKey?: SecretValue<`0x${string}`>;
 } & Partial<AztecNodeConfig>;
 /** Context for an end-to-end test as returned by the `setup` function */
 export type EndToEndContext = {
     /** The Aztec Node service or client a connected to it. */
     aztecNode: AztecNode;
+    /** Client to the Aztec Node admin interface (undefined if connected to remote environment) */
+    aztecNodeAdmin?: AztecNodeAdmin;
     /** The prover node service (only set if startProverNode is true) */
     proverNode: ProverNode | undefined;
     /** A client to the sequencer service (undefined if connected to remote environment) */
@@ -95,14 +113,17 @@ export type EndToEndContext = {
     config: AztecNodeConfig;
     /** The data for the initial funded accounts. */
     initialFundedAccounts: InitialAccountData[];
+    wallets: AccountWalletWithSecretKey[];
     /** The first wallet to be used. */
     wallet: AccountWalletWithSecretKey;
-    /** The wallets to be used. */
-    wallets: AccountWalletWithSecretKey[];
+    /** The accounts to be used. */
+    accounts: AztecAddress[];
     /** Logger instance named as the current test. */
     logger: Logger;
     /** The cheat codes. */
     cheatCodes: CheatCodes;
+    /** The cheat codes for L1 */
+    ethCheatCodes: EthCheatCodes;
     /** The anvil test watcher (undefined if connected to remote environment) */
     watcher: AnvilTestWatcher | undefined;
     /** Allows tweaking current system time, used by the epoch cache only (undefined if connected to remote environment) */
@@ -111,6 +132,10 @@ export type EndToEndContext = {
     blobSink: BlobSinkServer | undefined;
     /** Telemetry client */
     telemetryClient: TelemetryClient | undefined;
+    /** Mock gossip sub network used for gossipping messages (only if mockGossipSubNetwork was set to true in opts) */
+    mockGossipSubNetwork: MockGossipSubNetwork | undefined;
+    /** Prefilled public data used for setting up nodes. */
+    prefilledPublicData: PublicDataTreeLeaf[] | undefined;
     /** Function to stop the started services. */
     teardown: () => Promise<void>;
 };
@@ -127,7 +152,7 @@ export declare function setup(numberOfAccounts?: number, opts?: SetupOptions, px
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  */
-export declare function ensureAccountsPubliclyDeployed(sender: Wallet, accountsToDeploy: Wallet[]): Promise<void>;
+export declare function ensureAccountContractsPublished(sender: Wallet, accountsToDeploy: Wallet[]): Promise<void>;
 /**
  * Sets the timestamp of the next block.
  * @param rpcUrl - rpc url of the blockchain instance to connect to
@@ -140,16 +165,34 @@ export declare function setNextBlockTimestamp(rpcUrl: string, timestamp: number)
  */
 export declare function getLogger(): Logger;
 export type BalancesFn = ReturnType<typeof getBalancesFn>;
-export declare function getBalancesFn(symbol: string, method: ContractMethod, logger: any): (...addresses: (AztecAddress | {
+export declare function getBalancesFn(symbol: string, method: ContractMethod, from: AztecAddress, logger: any): (...addresses: (AztecAddress | {
     address: AztecAddress;
 })[]) => Promise<bigint[]>;
 export declare function expectMapping<K, V>(fn: (...k: K[]) => Promise<V[]>, inputs: K[], expectedOutputs: V[]): Promise<void>;
 export declare function expectMappingDelta<K, V extends number | bigint>(initialValues: V[], fn: (...k: K[]) => Promise<V[]>, inputs: K[], expectedDiffs: V[]): Promise<void>;
 /**
- * Deploy the protocol contracts to a running instance.
+ * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
+ * but by conventions its address is computed with a salt of 0.
+ * @returns The address of the sponsored FPC contract
+ */
+export declare function getSponsoredFPCInstance(): Promise<ContractInstanceWithAddress>;
+/**
+ * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
+ * but by conventions its address is computed with a salt of 0.
+ * @returns The address of the sponsored FPC contract
+ */
+export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
+/**
+ * Deploy a sponsored FPC contract to a running instance.
+ */
+export declare function setupSponsoredFPC(pxe: PXE): Promise<ContractInstanceWithAddress>;
+/**
+ * Registers the SponsoredFPC in this PXE instance
+ * @param pxe - The pxe client
  */
-export declare function setupCanonicalFeeJuice(pxe: PXE): Promise<void>;
+export declare function registerSponsoredFPC(pxe: PXE): Promise<void>;
 export declare function waitForProvenChain(node: AztecNode, targetBlock?: number, timeoutSec?: number, intervalSec?: number): Promise<void>;
-export declare function createAndSyncProverNode(proverNodePrivateKey: `0x${string}`, aztecNodeConfig: AztecNodeConfig, aztecNode: AztecNode, dataDirectory: string, prefilledPublicData?: PublicDataTreeLeaf[]): Promise<ProverNode>;
-export declare function createForwarderContract(aztecNodeConfig: AztecNodeConfig, privateKey: `0x${string}`, rollupAddress: Hex): Promise<ForwarderContract>;
+export declare function createAndSyncProverNode(proverNodePrivateKey: `0x${string}`, aztecNodeConfig: AztecNodeConfig, proverNodeConfig: Partial<ProverNodeConfig> & Pick<DataStoreConfig, 'dataDirectory'> & {
+    dontStart?: boolean;
+}, aztecNode: AztecNode | undefined, prefilledPublicData?: PublicDataTreeLeaf[], proverNodeDeps?: ProverNodeDeps): Promise<ProverNode>;
 //# sourceMappingURL=utils.d.ts.map