@aztec/end-to-end 0.82.2 → 0.82.3-nightly.20250403

package/dest/fixtures/token_utils.js

@@ -1,5 +1,6 @@
-// docs:start:token_utils
+import { BatchCall } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+// docs:start:token_utils
 export async function deployToken(adminWallet, initialAdminBalance, logger) {
     logger.info(`Deploying Token contract...`);
     const contract = await TokenContract.deploy(adminWallet, adminWallet.getAddress(), 'TokenName', 'TokenSymbol', 18).send().deployed();
@@ -25,3 +26,15 @@ export async function expectTokenBalance(wallet, token, owner, expectedBalance,
     logger.info(`Account ${owner} balance: ${balance}`);
     expect(balance).toBe(expectedBalance);
 }
+export async function mintNotes(sender, 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 from = sender.getAddress(); // we are setting from to sender here because we need a sender to calculate the tag
+        const actions = toMint.map((amt)=>asset.methods.mint_to_private(from, recipient, amt));
+        await new BatchCall(sender, actions).send().wait();
+    }
+    return noteAmounts.reduce((prev, curr)=>prev + curr, 0n);
+}

package/dest/fixtures/utils.d.ts

@@ -147,10 +147,6 @@ export declare function getBalancesFn(symbol: string, method: ContractMethod, lo
 })[]) => 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 canonical Fee Juice contract to a running instance.
- */
-export declare function setupCanonicalFeeJuice(pxe: PXE): Promise<void>;
 /**
  * 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.

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}

package/dest/fixtures/utils.js

@@ -2,13 +2,13 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { deployFundedSchnorrAccounts, generateSchnorrAccounts, getDeployedTestAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
 import { createArchiver } from '@aztec/archiver';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { BatchCall, FeeJuicePaymentMethod, SignerlessWallet, createAztecNodeClient, createLogger, createPXEClient, makeFetch, waitForPXE } from '@aztec/aztec.js';
+import { BatchCall, SignerlessWallet, createAztecNodeClient, createLogger, createPXEClient, makeFetch, waitForPXE } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
 import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee/testing';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { createBlobSinkServer } from '@aztec/blob-sink/server';
-import { FEE_JUICE_INITIAL_MINT, GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH, SPONSORED_FPC_SALT } from '@aztec/constants';
 import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import { ForwarderContract, NULL_KEY, createL1Clients, deployL1Contracts, getL1ContractsConfigEnvVars, isAnvilTestChain, l1Artifacts } from '@aztec/ethereum';
 import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
@@ -17,16 +17,14 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { retryUntil } from '@aztec/foundation/retry';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createProverNode } from '@aztec/prover-node';
 import { createPXEServiceWithSimulationProvider, getPXEServiceConfig } from '@aztec/pxe/server';
 import { WASMSimulator } from '@aztec/simulator/client';
 import { SimulationProviderRecorderWrapper } from '@aztec/simulator/testing';
 import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
-import { Gas } from '@aztec/stdlib/gas';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -34,7 +32,6 @@ import fs from 'fs/promises';
 import getPort from 'get-port';
 import { tmpdir } from 'os';
 import * as path from 'path';
-import { inspect } from 'util';
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
@@ -71,7 +68,6 @@ export const getPrivateKeyFromIndex = (index)=>{
 };
 export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, chain = foundry)=>{
     const l1Data = await deployL1Contracts(l1RpcUrls, account, chain, logger, {
-        l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
         vkTreeRoot: getVKTreeRoot(),
         protocolContractTreeRoot,
         genesisArchiveRoot: args.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
@@ -155,7 +151,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     };
     const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient);
     const teardown = ()=>Promise.resolve();
-    await setupCanonicalFeeJuice(pxeClient);
     logger.verbose('Constructing available wallets from already registered accounts...');
     const initialFundedAccounts = await getDeployedTestAccounts(pxeClient);
     const wallets = await getDeployedTestAccountsWallets(pxeClient);
@@ -191,221 +186,226 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  */ export async function setup(numberOfAccounts = 1, opts = {
     customForwarderContractAddress: EthAddress.ZERO
 }, pxeOpts = {}, chain = foundry) {
-    const config = {
-        ...getConfigEnvVars(),
-        ...opts
-    };
-    config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
-    // For tests we only want proving enabled if specifically requested
-    config.realProofs = !!opts.realProofs;
-    const logger = getLogger();
-    // Create a temp directory for any services that need it and cleanup later
-    const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
-    await fs.mkdir(directoryToCleanup, {
-        recursive: true
-    });
-    if (!config.dataDirectory) {
-        config.dataDirectory = directoryToCleanup;
-    }
     let anvil;
-    if (!config.l1RpcUrls?.length) {
-        if (!isAnvilTestChain(chain.id)) {
-            throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
+    try {
+        const config = {
+            ...getConfigEnvVars(),
+            ...opts
+        };
+        config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
+        // For tests we only want proving enabled if specifically requested
+        config.realProofs = !!opts.realProofs;
+        // Only enforce the time table if requested
+        config.enforceTimeTable = !!opts.enforceTimeTable;
+        const logger = getLogger();
+        // Create a temp directory for any services that need it and cleanup later
+        const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
+        await fs.mkdir(directoryToCleanup, {
+            recursive: true
+        });
+        if (!config.dataDirectory) {
+            config.dataDirectory = directoryToCleanup;
         }
+        if (!config.l1RpcUrls?.length) {
+            if (!isAnvilTestChain(chain.id)) {
+                throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
+            }
+            if (PXE_URL) {
+                throw new Error(`PXE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
+            }
+            const res = await startAnvil({
+                l1BlockTime: opts.ethereumSlotDuration
+            });
+            anvil = res.anvil;
+            config.l1RpcUrls = [
+                res.rpcUrl
+            ];
+        }
+        // Enable logging metrics to a local file named after the test suite
+        if (isMetricsLoggingRequested()) {
+            const filename = path.join('log', getJobName() + '.jsonl');
+            logger.info(`Logging metrics to ${filename}`);
+            setupMetricsLogger(filename);
+        }
+        const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls);
+        if (opts.stateLoad) {
+            await ethCheatCodes.loadChainState(opts.stateLoad);
+        }
+        if (opts.l1StartTime) {
+            await ethCheatCodes.warp(opts.l1StartTime);
+        }
+        let publisherPrivKey = undefined;
+        let publisherHdAccount = undefined;
+        if (config.publisherPrivateKey && config.publisherPrivateKey != NULL_KEY) {
+            publisherHdAccount = privateKeyToAccount(config.publisherPrivateKey);
+        } else if (!MNEMONIC) {
+            throw new Error(`Mnemonic not provided and no publisher private key`);
+        } else {
+            publisherHdAccount = mnemonicToAccount(MNEMONIC, {
+                addressIndex: 0
+            });
+            const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
+            publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+            config.publisherPrivateKey = `0x${publisherPrivKey.toString('hex')}`;
+        }
+        // Made as separate values such that keys can change, but for test they will be the same.
+        config.validatorPrivateKey = config.publisherPrivateKey;
         if (PXE_URL) {
-            throw new Error(`PXE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
+            // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
+            return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
         }
-        const res = await startAnvil({
-            l1BlockTime: opts.ethereumSlotDuration
-        });
-        anvil = res.anvil;
-        config.l1RpcUrls = [
-            res.rpcUrl
-        ];
-    }
-    // Enable logging metrics to a local file named after the test suite
-    if (isMetricsLoggingRequested()) {
-        const filename = path.join('log', getJobName() + '.jsonl');
-        logger.info(`Logging metrics to ${filename}`);
-        setupMetricsLogger(filename);
-    }
-    const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls);
-    if (opts.stateLoad) {
-        await ethCheatCodes.loadChainState(opts.stateLoad);
-    }
-    if (opts.l1StartTime) {
-        await ethCheatCodes.warp(opts.l1StartTime);
-    }
-    let publisherPrivKey = undefined;
-    let publisherHdAccount = undefined;
-    if (config.publisherPrivateKey && config.publisherPrivateKey != NULL_KEY) {
-        publisherHdAccount = privateKeyToAccount(config.publisherPrivateKey);
-    } else if (!MNEMONIC) {
-        throw new Error(`Mnemonic not provided and no publisher private key`);
-    } else {
-        publisherHdAccount = mnemonicToAccount(MNEMONIC, {
-            addressIndex: 0
-        });
-        const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
-        publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
-        config.publisherPrivateKey = `0x${publisherPrivKey.toString('hex')}`;
-    }
-    // Made as separate values such that keys can change, but for test they will be the same.
-    config.validatorPrivateKey = config.publisherPrivateKey;
-    if (PXE_URL) {
-        // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
-        return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
-    }
-    const initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts);
-    const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
-    const deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
-        ...opts,
-        genesisArchiveRoot,
-        genesisBlockHash
-    }, chain);
-    config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
-    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}`);
-    }
-    if (opts.l2StartTime) {
-        // This should only be used in synching test or when you need to have a stable
-        // timestamp for the first l2 block.
-        await ethCheatCodes.warp(opts.l2StartTime);
-    }
-    const dateProvider = new TestDateProvider();
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient, dateProvider);
-    await watcher.start();
-    const telemetry = getTelemetryClient(opts.telemetryConfig);
-    // Blob sink service - blobs get posted here and served from here
-    const blobSinkPort = await getPort();
-    const blobSink = await createBlobSinkServer({
-        l1ChainId: config.l1ChainId,
-        l1RpcUrls: config.l1RpcUrls,
-        rollupAddress: config.l1Contracts.rollupAddress,
-        port: blobSinkPort,
-        dataDirectory: config.dataDirectory,
-        dataStoreMapSizeKB: config.dataStoreMapSizeKB
-    }, telemetry);
-    await blobSink.start();
-    config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
-    logger.verbose('Creating and synching an aztec node...');
-    const acvmConfig = await getACVMConfig(logger);
-    if (acvmConfig) {
-        config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
-        config.acvmBinaryPath = acvmConfig.acvmBinaryPath;
-    }
-    const bbConfig = await getBBConfig(logger);
-    if (bbConfig) {
-        config.bbBinaryPath = bbConfig.bbBinaryPath;
-        config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
-    }
-    config.l1PublishRetryIntervalMS = 100;
-    const blobSinkClient = createBlobSinkClient(config);
-    const aztecNode = await AztecNodeService.createAndSync(config, {
-        dateProvider,
-        blobSinkClient,
-        telemetry
-    }, {
-        prefilledPublicData
-    });
-    const sequencer = aztecNode.getSequencer();
-    if (sequencer) {
-        const publisher = sequencer.sequencer.publisher;
-        publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
-    }
-    let proverNode = undefined;
-    if (opts.startProverNode) {
-        logger.verbose('Creating and syncing a simulated prover node...');
-        const proverNodePrivateKey = getPrivateKeyFromIndex(2);
-        const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
-        proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')));
-    }
-    logger.verbose('Creating a pxe...');
-    const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
-    if (!config.skipProtocolContracts) {
-        logger.verbose('Setting up Fee Juice...');
-        await setupCanonicalFeeJuice(pxe);
-    }
-    const accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
-    const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
-    if (initialFundedAccounts.length < numberOfAccounts) {
-        // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
-        throw new Error(`Unable to deploy ${numberOfAccounts} accounts. Only ${initialFundedAccounts.length} accounts were funded.`);
-    }
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
-    const teardown = async ()=>{
-        await pxeTeardown();
-        if (aztecNode instanceof AztecNodeService) {
-            await aztecNode?.stop();
+        const initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts);
+        const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
+        const deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
+            ...opts,
+            genesisArchiveRoot,
+            genesisBlockHash,
+            feeJuicePortalInitialBalance: fundingNeeded
+        }, chain);
+        config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
+        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}`);
         }
-        if (proverNode) {
-            await proverNode.stop();
+        if (opts.l2StartTime) {
+            // This should only be used in synching test or when you need to have a stable
+            // timestamp for the first l2 block.
+            await ethCheatCodes.warp(opts.l2StartTime);
         }
-        if (acvmConfig?.cleanup) {
-            // remove the temp directory created for the acvm
-            logger.verbose(`Cleaning up ACVM state`);
-            await acvmConfig.cleanup();
+        const dateProvider = new TestDateProvider();
+        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient, dateProvider);
+        await watcher.start();
+        const telemetry = getTelemetryClient(opts.telemetryConfig);
+        // Blob sink service - blobs get posted here and served from here
+        const blobSinkPort = await getPort();
+        const blobSink = await createBlobSinkServer({
+            l1ChainId: config.l1ChainId,
+            l1RpcUrls: config.l1RpcUrls,
+            rollupAddress: config.l1Contracts.rollupAddress,
+            port: blobSinkPort,
+            dataDirectory: config.dataDirectory,
+            dataStoreMapSizeKB: config.dataStoreMapSizeKB
+        }, telemetry);
+        await blobSink.start();
+        config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
+        logger.verbose('Creating and synching an aztec node...');
+        const acvmConfig = await getACVMConfig(logger);
+        if (acvmConfig) {
+            config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
+            config.acvmBinaryPath = acvmConfig.acvmBinaryPath;
         }
-        if (bbConfig?.cleanup) {
-            // remove the temp directory created for the acvm
-            logger.verbose(`Cleaning up BB state`);
-            await bbConfig.cleanup();
+        const bbConfig = await getBBConfig(logger);
+        if (bbConfig) {
+            config.bbBinaryPath = bbConfig.bbBinaryPath;
+            config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
         }
-        await anvil?.stop().catch((err)=>getLogger().error(err));
-        await watcher.stop();
-        await blobSink?.stop();
-        if (directoryToCleanup) {
-            try {
-                logger.verbose(`Cleaning up data directory at ${directoryToCleanup}`);
-                await fs.rm(directoryToCleanup, {
-                    recursive: true,
-                    force: true,
-                    maxRetries: 3
-                });
-            } catch (err) {
-                logger.warn(`Failed to delete data directory at ${directoryToCleanup}: ${err}`);
-            }
+        config.l1PublishRetryIntervalMS = 100;
+        const blobSinkClient = createBlobSinkClient(config);
+        const aztecNode = await AztecNodeService.createAndSync(config, {
+            dateProvider,
+            blobSinkClient,
+            telemetry
+        }, {
+            prefilledPublicData
+        });
+        const sequencer = aztecNode.getSequencer();
+        if (sequencer) {
+            const publisher = sequencer.sequencer.publisher;
+            publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
         }
-    };
-    return {
-        aztecNode,
-        aztecNodeAdmin: aztecNode,
-        blobSink,
-        cheatCodes,
-        config,
-        dateProvider,
-        deployL1ContractsValues,
-        initialFundedAccounts,
-        logger,
-        proverNode,
-        pxe,
-        sequencer,
-        teardown,
-        telemetryClient: telemetry,
-        wallet: wallets[0],
-        wallets,
-        watcher
-    };
+        let proverNode = undefined;
+        if (opts.startProverNode) {
+            logger.verbose('Creating and syncing a simulated prover node...');
+            const proverNodePrivateKey = getPrivateKeyFromIndex(2);
+            const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
+            proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')));
+        }
+        logger.verbose('Creating a pxe...');
+        const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
+        const accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
+        const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
+        if (initialFundedAccounts.length < numberOfAccounts) {
+            // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
+            throw new Error(`Unable to deploy ${numberOfAccounts} accounts. Only ${initialFundedAccounts.length} accounts were funded.`);
+        }
+        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
+        const teardown = async ()=>{
+            await pxeTeardown();
+            if (aztecNode instanceof AztecNodeService) {
+                await aztecNode?.stop();
+            }
+            if (proverNode) {
+                await proverNode.stop();
+            }
+            if (acvmConfig?.cleanup) {
+                // remove the temp directory created for the acvm
+                logger.verbose(`Cleaning up ACVM state`);
+                await acvmConfig.cleanup();
+            }
+            if (bbConfig?.cleanup) {
+                // remove the temp directory created for the acvm
+                logger.verbose(`Cleaning up BB state`);
+                await bbConfig.cleanup();
+            }
+            await anvil?.stop().catch((err)=>getLogger().error(err));
+            await watcher.stop();
+            await blobSink?.stop();
+            if (directoryToCleanup) {
+                try {
+                    logger.verbose(`Cleaning up data directory at ${directoryToCleanup}`);
+                    await fs.rm(directoryToCleanup, {
+                        recursive: true,
+                        force: true,
+                        maxRetries: 3
+                    });
+                } catch (err) {
+                    logger.warn(`Failed to delete data directory at ${directoryToCleanup}: ${err}`);
+                }
+            }
+        };
+        return {
+            aztecNode,
+            aztecNodeAdmin: aztecNode,
+            blobSink,
+            cheatCodes,
+            config,
+            dateProvider,
+            deployL1ContractsValues,
+            initialFundedAccounts,
+            logger,
+            proverNode,
+            pxe,
+            sequencer,
+            teardown,
+            telemetryClient: telemetry,
+            wallet: wallets[0],
+            wallets,
+            watcher
+        };
+    } catch (err) {
+        // TODO: Just hoisted anvil for now to ensure cleanup. Prob need to hoist the rest.
+        await anvil?.stop();
+        throw err;
+    }
 }
 /**
  * Registers the contract class used for test accounts and publicly deploys the instances requested.
@@ -482,28 +482,6 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
     const diffs = outputs.map((output, i)=>output - initialValues[i]);
     expect(diffs).toEqual(expectedDiffs);
 }
-/**
- * Deploy the canonical Fee Juice contract to a running instance.
- */ export async function setupCanonicalFeeJuice(pxe) {
-    // "deploy" the Fee Juice as it contains public functions
-    const feeJuicePortalAddress = (await pxe.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
-    const wallet = new SignerlessWallet(pxe);
-    const feeJuice = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
-    try {
-        const paymentMethod = new FeeJuicePaymentMethod(ProtocolContractAddress.FeeJuice);
-        await feeJuice.methods.initialize(feeJuicePortalAddress, FEE_JUICE_INITIAL_MINT).send({
-            fee: {
-                paymentMethod,
-                gasSettings: {
-                    teardownGasLimits: Gas.empty()
-                }
-            }
-        }).wait();
-        getLogger().info(`Fee Juice successfully setup. Portal address: ${feeJuicePortalAddress}`);
-    } catch (error) {
-        getLogger().warn(`Fee Juice might have already been setup. Got error: ${inspect(error)}.`);
-    }
-}
 /**
  * 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.
@@ -517,8 +495,8 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
 /**
  * Deploy a sponsored FPC contract to a running instance.
  */ export async function setupSponsoredFPC(pxe) {
-    const { l1ChainId: chainId, protocolVersion } = await pxe.getNodeInfo();
-    const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+    const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
+    const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
     // Make the contract pay for the deployment fee itself
     const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
     const deployed = await SponsoredFPCContract.deploy(deployer).send({

package/dest/sample-dapp/contracts.js

@@ -1,10 +1,10 @@
-// docs:start:imports
-import { AztecAddress } from '@aztec/aztec.js';
+import { AztecAddress, Contract } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { readFileSync } from 'fs';
-// docs:end:imports
+// This syntax is helpful for the referencing tutorial
+const TokenContractArtifact = TokenContract.artifact;
 // docs:start:get-tokens
 export async function getToken(wallet) {
     const addresses = JSON.parse(readFileSync('addresses.json'));
-    return TokenContract.at(AztecAddress.fromString(addresses.token), wallet);
+    return Contract.at(AztecAddress.fromString(addresses.token), TokenContractArtifact, wallet);
 } // docs:end:get-tokens

package/dest/shared/capture_private_execution_steps.d.ts

@@ -2,6 +2,6 @@
  * This module exposes the ability to capture the private exection steps that go into our "Client IVC" prover.
  * These are used for debugging and benchmarking barretenberg (the prover component).
  */
-import type { ContractFunctionInteraction } from '@aztec/aztec.js/contracts';
-export declare function capturePrivateExecutionStepsIfEnvSet(label: string, interaction: ContractFunctionInteraction): Promise<void>;
+import type { ContractFunctionInteraction, DeployMethod, DeployOptions, ProfileMethodOptions } from '@aztec/aztec.js/contracts';
+export declare function capturePrivateExecutionStepsIfEnvSet(label: string, interaction: ContractFunctionInteraction | DeployMethod, opts?: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>, expectedSteps?: number): Promise<void>;
 //# sourceMappingURL=capture_private_execution_steps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"capture_private_execution_steps.d.ts","sourceRoot":"","sources":["../../src/shared/capture_private_execution_steps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AA0B7E,wBAAsB,oCAAoC,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,2BAA2B,iBAYjH"}
+{"version":3,"file":"capture_private_execution_steps.d.ts","sourceRoot":"","sources":["../../src/shared/capture_private_execution_steps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AAoCnC,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,IAAI,CAAC,EAAE,IAAI,CAAC,oBAAoB,GAAG,aAAa,EAAE,aAAa,CAAC,EAChE,aAAa,CAAC,EAAE,MAAM,iBA8BvB"}