@aztec/end-to-end 5.0.0-rc.1 → 5.0.0

package/dest/fixtures/setup.js

@@ -1,5 +1,5 @@
 import { generateSchnorrAccounts } from '@aztec/accounts/testing';
-import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
+import { createAztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
 import { Fr } from '@aztec/aztec.js/fields';
@@ -12,14 +12,13 @@ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { NULL_KEY } from '@aztec/ethereum/constants';
 import { deployMulticall3 } from '@aztec/ethereum/contracts';
 import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
-import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
+import { EthCheatCodesWithState, startAnvil, warmBlobKzg } from '@aztec/ethereum/test';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { tryRmDir } from '@aztec/foundation/fs';
 import { withLoggerBindings } from '@aztec/foundation/log/server';
 import { retryUntil } from '@aztec/foundation/retry';
-import { sleep } from '@aztec/foundation/sleep';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
@@ -46,6 +45,8 @@ import { MNEMONIC, TEST_MAX_PENDING_TX_POOL_COUNT, TEST_PEER_CHECK_INTERVAL_MS }
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
 import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
+import { getStandardContractGenesisNullifiers } from './standard_contracts_genesis.js';
+import { testSpan } from './timing.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 export { startAnvil };
 let telemetry = undefined;
@@ -81,11 +82,13 @@ export const getPrivateKeyFromIndex = (index)=>{
 /**
  * Sets up Private eXecution Environment (PXE) and returns the corresponding test wallet.
  * @param aztecNode - An instance of Aztec Node.
+ * @param nodeDebug - The node's debug API, used to register public function signatures for named traces; pass
+ *   `undefined` when the node does not expose it.
  * @param opts - Partial configuration for the PXE.
  * @param logger - The logger to be used.
  * @param actor - Actor label to include in log output (e.g., 'pxe-test').
  * @returns A test wallet, logger and teardown function.
- */ export async function setupPXEAndGetWallet(aztecNode, opts = {}, logger = getLogger(), actor) {
+ */ export async function setupPXEAndGetWallet(aztecNode, nodeDebug, opts = {}, logger = getLogger(), actor) {
     const PXEConfig = {
         ...getPXEConfig(),
         ...opts
@@ -99,7 +102,8 @@ export const getPrivateKeyFromIndex = (index)=>{
     }
     const teardown = configuredDataDirectory ? ()=>Promise.resolve() : ()=>tryRmDir(PXEConfig.dataDirectory);
     const wallet = await TestWallet.create(aztecNode, PXEConfig, {
-        loggerActorLabel: actor
+        loggerActorLabel: actor,
+        nodeDebug
     });
     return {
         wallet,
@@ -131,12 +135,32 @@ export const getPrivateKeyFromIndex = (index)=>{
  * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
  * @param opts - Options to pass to the node initialization and to the setup script.
  * @param pxeOpts - Options to pass to the PXE initialization.
- */ export async function setup(numberOfAccounts = 1, opts = {}, pxeOpts = {}, chain = foundry) {
+ */ export function setup(numberOfAccounts = 1, opts = {}, pxeOpts = {}, chain = foundry) {
+    // Tag the top-level env spin-up with the prover mode (none → fake → real), the largest config-driven
+    // swing in setup cost, so the three factories are comparable on the span leaderboard. The internals
+    // (anvil / l1-deploy / sequencer-start / pxe / wallet:create) decompose this further.
+    const proverMode = opts.realProofs ? 'real' : opts.startProverNode ? 'fake' : 'none';
+    return testSpan(`setup:env:${proverMode}`, async ()=>{
+        const ctx = await setupInner(numberOfAccounts, opts, pxeOpts, chain);
+        if (process.env.EXIT_E2E_AFTER_SETUP) {
+            ctx.logger.info('EXIT_E2E_AFTER_SETUP is set; aborting before the test body runs');
+            throw new Error('EXIT_E2E_AFTER_SETUP');
+        }
+        return ctx;
+    });
+}
+async function setupInner(numberOfAccounts, opts, pxeOpts, chain) {
     assertContractArtifactsVersion();
+    const logger = getLogger();
     let anvil;
     try {
         opts.aztecTargetCommitteeSize ??= 0;
         opts.slasherEnabled ??= false;
+        // Mine the L1 setup txs (Multicall3 + rollup contract deployment) immediately instead of
+        // waiting on anvil's block interval — this is the dominant cost of e2e setup. Suites that
+        // assert on genesis-relative L1 timing can opt out by passing `automineL1Setup: false`.
+        opts.automineL1Setup ??= true;
+        logger.trace('Starting e2e test setup');
         const config = {
             ...getConfigEnvVars(),
             ...opts
@@ -151,7 +175,6 @@ export const getPrivateKeyFromIndex = (index)=>{
         config.enableDelayer = true;
         config.listenAddress = '127.0.0.1';
         config.minTxPoolAgeMs = opts.minTxPoolAgeMs ?? 0;
-        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, {
@@ -165,18 +188,19 @@ export const getPrivateKeyFromIndex = (index)=>{
             if (!isAnvilTestChain(chain.id)) {
                 throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
             }
-            const res = await startAnvil({
-                l1BlockTime: opts.ethereumSlotDuration,
-                accounts: opts.anvilAccounts,
-                port: opts.anvilPort ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : undefined),
-                slotsInAnEpoch: opts.anvilSlotsInAnEpoch,
-                dateProvider
-            });
+            const res = await testSpan('setup:env:anvil', ()=>startAnvil({
+                    l1BlockTime: opts.ethereumSlotDuration,
+                    accounts: opts.anvilAccounts,
+                    port: opts.anvilPort ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : undefined),
+                    slotsInAnEpoch: opts.anvilSlotsInAnEpoch,
+                    dateProvider
+                }));
             anvil = res.anvil;
             config.l1RpcUrls = [
                 res.rpcUrl
             ];
         }
+        logger.trace('Started anvil and L1 RPC client');
         // Enable logging metrics to a local file named after the test suite
         if (isMetricsLoggingRequested()) {
             const filename = path.join('log', getJobName() + '.jsonl');
@@ -192,6 +216,7 @@ export const getPrivateKeyFromIndex = (index)=>{
                 resetBlockInterval: true
             });
         }
+        logger.trace('Initialized L1 cheat codes and applied state/time overrides');
         let publisherPrivKeyHex = undefined;
         let publisherHdAccount = undefined;
         if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
@@ -216,6 +241,7 @@ export const getPrivateKeyFromIndex = (index)=>{
         if (config.coinbase === undefined) {
             config.coinbase = EthAddress.fromString(publisherHdAccount.address);
         }
+        logger.trace('Resolved L1 publisher account');
         // The accounts setup creates itself: `numberOfAccounts` initializerless accounts, generated here and
         // funded at genesis so they are immediately usable.
         const defaultAccounts = await generateSchnorrAccounts(numberOfAccounts);
@@ -230,14 +256,31 @@ export const getPrivateKeyFromIndex = (index)=>{
             const sponsoredFPCAddress = await getSponsoredFPCAddress();
             addressesToFund.push(sponsoredFPCAddress);
         }
+        // Fund any extra addresses whose value depends on the just-generated accounts (e.g. an FPC admin'd
+        // by a default account), so a test can genesis-fund them instead of bridging fee juice during setup.
+        if (opts.computeExtraGenesisFundedAddresses) {
+            addressesToFund.push(...await opts.computeExtraGenesisFundedAddresses(defaultAccounts));
+        }
+        logger.trace('Generated test accounts to fund at genesis');
+        // Preload the standard contracts (AuthRegistry, PublicChecks, HandshakeRegistry) so their `ensure*Published` setup
+        // helpers short-circuit their publish txs. The archiver flag seeds the bytecode/instance into every spawned node's
+        // contract store; the genesis nullifiers make the AVM's deployment-nullifier check pass when they are called. Both
+        // must go together (flag alone would recreate the publish-collision bug), so the flag lives here beside the seeding.
+        config.testPreloadStandardContracts = true;
+        const standardContractNullifiers = await getStandardContractGenesisNullifiers();
         const genesisTimestamp = BigInt(Math.floor(Date.now() / 1000));
-        const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(addressesToFund, opts.initialAccountFeeJuice, opts.genesisPublicData, genesisTimestamp);
+        const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(addressesToFund, opts.initialAccountFeeJuice, opts.genesisPublicData, genesisTimestamp, standardContractNullifiers);
+        logger.trace('Computed genesis values');
         const wasAutomining = await ethCheatCodes.isAutoMining();
         const enableAutomine = opts.automineL1Setup && !wasAutomining && isAnvilTestChain(chain.id);
         if (enableAutomine) {
             await ethCheatCodes.setAutomine(true);
         }
         const l1Client = createExtendedL1Client(config.l1RpcUrls, publisherHdAccount, chain);
+        // Warm both KZG trusted setups (ours + anvil's) in parallel
+        if (anvil && isAnvilTestChain(chain.id)) {
+            await warmBlobKzg(l1Client, logger);
+        }
         // Deploy Multicall3 if running locally
         await deployMulticall3(l1Client, logger);
         // Force viem to refresh its nonce cache to avoid "nonce too low" errors in subsequent transactions
@@ -245,17 +288,18 @@ export const getPrivateKeyFromIndex = (index)=>{
         await l1Client.getTransactionCount({
             address: l1Client.account.address
         });
-        const deployL1ContractsValues = await deployAztecL1Contracts(config.l1RpcUrls[0], publisherPrivKeyHex, chain.id, {
-            ...getL1ContractsConfigEnvVars(),
-            ...opts,
-            ...opts.l1ContractsArgs,
-            vkTreeRoot: getVKTreeRoot(),
-            protocolContractsHash,
-            genesisArchiveRoot,
-            initialValidators: opts.initialValidators,
-            feeJuicePortalInitialBalance: fundingNeeded,
-            realVerifier: false
-        });
+        logger.trace('Deployed Multicall3');
+        const deployL1ContractsValues = await testSpan('setup:env:l1-deploy', ()=>deployAztecL1Contracts(config.l1RpcUrls[0], publisherPrivKeyHex, chain.id, {
+                ...getL1ContractsConfigEnvVars(),
+                ...opts,
+                ...opts.l1ContractsArgs,
+                vkTreeRoot: getVKTreeRoot(),
+                protocolContractsHash,
+                genesisArchiveRoot,
+                initialValidators: opts.initialValidators,
+                feeJuicePortalInitialBalance: fundingNeeded,
+                realVerifier: false
+            }));
         Object.assign(config, deployL1ContractsValues.l1ContractAddresses);
         config.rollupVersion = deployL1ContractsValues.rollupVersion;
         // Propagate L1-contracts-config overrides back to the node config so the archiver's
@@ -275,9 +319,24 @@ export const getPrivateKeyFromIndex = (index)=>{
                 }
             }
         }
+        // Deploy any test-specific L1 contracts while automine is still on and before the node starts,
+        // so they mine instantly rather than paying the L1 block interval once the sequencer is live.
+        let extraL1DeployResult = undefined;
+        if (opts.deployExtraL1Contracts) {
+            logger.trace('Running deployExtraL1Contracts hook');
+            extraL1DeployResult = await opts.deployExtraL1Contracts({
+                l1Client,
+                deployL1ContractsValues,
+                logger
+            });
+            // The hook reused `l1Client` to send deploy txs, so refresh viem's nonce cache to avoid a
+            // stale cached nonce for later transactions on the publisher account.
+            await l1Client.getTransactionCount({
+                address: l1Client.account.address
+            });
+        }
         if (enableAutomine) {
-            await ethCheatCodes.setAutomine(false);
-            await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
+            await ethCheatCodes.startIntervalMiningWithFreshBlock(config.ethereumSlotDuration);
         }
         // In compose mode (no local anvil), sync dateProvider to L1 time since it may have drifted
         // ahead of system time. When running with a local anvil, the dateProvider is kept in sync via
@@ -290,20 +349,30 @@ export const getPrivateKeyFromIndex = (index)=>{
                 resetBlockInterval: true
             });
         }
-        // Use metricsPort-based telemetry if provided, otherwise use the regular telemetry client
-        const telemetryClient = opts.metricsPort ? await getEndToEndTestTelemetryClient(opts.metricsPort) : await getTelemetryClient(opts.telemetryConfig);
-        await setupSharedBlobStorage(config);
-        logger.verbose('Creating and synching an aztec node', config);
-        const acvmConfig = await getACVMConfig(logger);
+        logger.trace('Deployed L1 rollup contracts');
+        // These boot steps are independent and write disjoint config keys, so run them concurrently:
+        // telemetry returns a client (no config write), shared blob storage writes blobFileStore* keys,
+        // and the ACVM/BB config resolvers write their own acvm*/bb* keys.
+        const [telemetryClient, , acvmConfig, bbConfig] = await Promise.all([
+            // Use metricsPort-based telemetry if provided, otherwise use the regular telemetry client
+            opts.metricsPort ? getEndToEndTestTelemetryClient(opts.metricsPort) : getTelemetryClient(opts.telemetryConfig),
+            setupSharedBlobStorage(config),
+            getACVMConfig(logger),
+            getBBConfig(logger)
+        ]);
+        logger.trace('Created telemetry client');
+        logger.trace('Set up shared blob storage');
         if (acvmConfig) {
             config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
             config.acvmBinaryPath = acvmConfig.acvmBinaryPath;
         }
-        const bbConfig = await getBBConfig(logger);
+        logger.trace('Resolved ACVM config');
         if (bbConfig) {
             config.bbBinaryPath = bbConfig.bbBinaryPath;
             config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
         }
+        logger.trace('Resolved Barretenberg config');
+        logger.verbose('Creating and synching an aztec node', config);
         let mockGossipSubNetwork;
         let p2pClientDeps = undefined;
         if (opts.mockGossipSubNetwork) {
@@ -312,25 +381,6 @@ export const getPrivateKeyFromIndex = (index)=>{
                 p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork)
             };
         }
-        // Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
-        // To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
-        const originalMinTxsPerBlock = config.minTxsPerBlock;
-        if (originalMinTxsPerBlock === undefined) {
-            throw new Error('minTxsPerBlock is undefined in e2e test setup');
-        }
-        const originalBuildCheckpointIfEmpty = config.buildCheckpointIfEmpty ?? false;
-        // Allow an empty checkpoint so the empty block can be built; leave untouched when not advancing.
-        const advancePastGenesis = (opts.advancePastGenesis ?? true) && !opts.skipInitialSequencer;
-        config.minTxsPerBlock = advancePastGenesis ? 0 : originalMinTxsPerBlock;
-        // Pipelining is always on: the proposer builds during slot N-1 for slot N. A tx submitted at slot N
-        // start arrives after that build, so forcing minTxsPerBlock=1 would stall the chain on alternating
-        // slots -- hence empty checkpoints are allowed (minTxsPerBlock=0) while advancing past genesis.
-        // Automine is unaffected: its runBuild clamps mempool builds to Math.max(minTxsPerBlock ?? 1, 1) and
-        // still requires minValidTxs: 1.
-        const shouldTemporarilyBuildEmptyCheckpoints = advancePastGenesis && config.useAutomineSequencer !== true;
-        if (shouldTemporarilyBuildEmptyCheckpoints) {
-            config.buildCheckpointIfEmpty = true;
-        }
         config.p2pEnabled = opts.mockGossipSubNetwork || config.p2pEnabled;
         config.p2pIp = opts.p2pIp ?? config.p2pIp ?? '127.0.0.1';
         if (!config.disableValidator) {
@@ -351,17 +401,19 @@ export const getPrivateKeyFromIndex = (index)=>{
                 bootstrapNodes: []
             }
         } : config;
-        const aztecNodeService = await withLoggerBindings({
-            actor: 'node-0'
-        }, ()=>AztecNodeService.createAndSync(initialNodeConfig, {
-                dateProvider,
-                telemetry: telemetryClient,
-                p2pClientDeps
-            }, {
-                genesis,
-                dontStartSequencer: opts.skipInitialSequencer
-            }));
+        logger.trace('Prepared aztec node config');
+        const aztecNodeService = await testSpan('setup:env:sequencer-start', ()=>withLoggerBindings({
+                actor: 'node-0'
+            }, ()=>createAztecNodeService(initialNodeConfig, {
+                    dateProvider,
+                    telemetry: telemetryClient,
+                    p2pClientDeps
+                }, {
+                    genesis,
+                    dontStartSequencer: opts.skipInitialSequencer
+                })));
         const sequencerClient = aztecNodeService.getSequencer();
+        logger.trace('Created and synced aztec node');
         let proverNode = undefined;
         if (opts.startProverNode) {
             logger.verbose('Creating and syncing a simulated prover node...');
@@ -374,16 +426,17 @@ export const getPrivateKeyFromIndex = (index)=>{
                     aztecNodeService
                 ]
             };
-            ({ proverNode } = await createAndSyncProverNode(proverNodePrivateKeyHex, config, {
-                ...config.proverNodeConfig,
-                dataDirectory: proverNodeDataDirectory
-            }, {
-                dateProvider,
-                p2pClientDeps,
-                telemetry: telemetryClient
-            }, {
-                genesis
-            }));
+            ({ proverNode } = await testSpan('setup:env:prover-node', ()=>createAndSyncProverNode(proverNodePrivateKeyHex, config, {
+                    ...config.proverNodeConfig,
+                    dataDirectory: proverNodeDataDirectory
+                }, {
+                    dateProvider,
+                    p2pClientDeps,
+                    telemetry: telemetryClient
+                }, {
+                    genesis
+                })));
+            logger.trace('Created prover node');
         }
         const sequencerDelayer = sequencerClient?.getDelayer();
         const proverDelayer = proverNode?.getProverNode()?.getDelayer();
@@ -395,80 +448,57 @@ export const getPrivateKeyFromIndex = (index)=>{
         pxeConfig.dataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
         // For tests we only want proving enabled if specifically requested
         pxeConfig.proverEnabled = !!pxeOpts.proverEnabled;
-        const wallet = await TestWallet.create(aztecNodeService, pxeConfig, {
-            loggerActorLabel: 'pxe-0',
-            ...opts.pxeCreationOptions
-        });
+        const wallet = await testSpan('setup:env:pxe', ()=>TestWallet.create(aztecNodeService, pxeConfig, {
+                loggerActorLabel: 'pxe-0',
+                // In-process node implements the debug API, so register public function signatures for named traces.
+                nodeDebug: aztecNodeService,
+                ...opts.pxeCreationOptions
+            }));
         if (opts.walletMinFeePadding !== undefined) {
             wallet.setMinFeePadding(opts.walletMinFeePadding);
         }
-        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNodeService, dateProvider, aztecNodeService.getAutomineSequencer());
+        logger.trace('Created PXE and test wallet');
+        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNodeService, dateProvider);
+        logger.trace('Created cheat codes');
         if (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0 || opts.initialValidators && opts.initialValidators.length > 0) {
             // We need to advance such that the committee is set up.
             await cheatCodes.rollup.advanceToEpoch(EpochNumber.fromBigInt(BigInt(await cheatCodes.rollup.getEpoch()) + BigInt(config.lagInEpochsForValidatorSet + 1)));
             await cheatCodes.rollup.setupEpoch();
             await cheatCodes.rollup.debugRollup();
+            logger.trace('Advanced chain to set up validator committee');
         }
         let accounts = [];
         // Create the default accounts. They are initializerless, so this is a PXE-side operation (registration
         // + a simulated store call) with no on-chain tx, independent of the sequencer.
         if (numberOfAccounts > 0) {
             logger.info(`Creating ${numberOfAccounts} initializerless test accounts`);
-            await createFundedInitializerlessAccounts(wallet, defaultAccounts);
+            await testSpan('wallet:create', ()=>createFundedInitializerlessAccounts(wallet, defaultAccounts));
             accounts = defaultAccounts.map((a)=>a.address);
         }
-        // Advancing past genesis needs a running sequencer to build the empty block; advancePastGenesis is
-        // already false when skipInitialSequencer is set.
-        if (advancePastGenesis) {
-            logger.info('Mining an empty block to progress past genesis');
-            const automine = aztecNodeService.getAutomineSequencer();
-            if (automine) {
-                await automine.buildEmptyBlock();
-            }
-            while(await aztecNodeService.getBlockNumber() === 0){
-                await sleep(2000);
-            }
-        } else if (opts.skipInitialSequencer) {
-            logger.info('Sequencer not started on initial node, skipping block progression');
-        }
-        // Now we restore the original minTxsPerBlock setting if we changed it.
-        if (sequencerClient) {
-            const sequencer = sequencerClient.getSequencer();
-            if (config.minTxsPerBlock !== originalMinTxsPerBlock) {
-                sequencer.updateConfig({
-                    minTxsPerBlock: originalMinTxsPerBlock
-                });
-            }
-            if (shouldTemporarilyBuildEmptyCheckpoints) {
-                sequencer.updateConfig({
-                    buildCheckpointIfEmpty: originalBuildCheckpointIfEmpty
-                });
-                config.buildCheckpointIfEmpty = originalBuildCheckpointIfEmpty;
-            }
-        }
-        const teardown = async ()=>{
-            try {
-                await tryStop(wallet, logger);
-                await tryStop(aztecNodeService, logger);
-                await tryStop(proverNode, logger);
-                if (acvmConfig?.cleanup) {
-                    await acvmConfig.cleanup();
-                }
-                if (bbConfig?.cleanup) {
-                    await bbConfig.cleanup();
-                }
-                await tryStop(anvil, logger);
-                await tryRmDir(directoryToCleanup, logger);
-            } catch (err) {
-                logger.error(`Error during e2e test teardown`, err);
-            } finally{
+        logger.trace('Created funded test accounts');
+        const teardown = ()=>testSpan('teardown:env', async ()=>{
                 try {
-                    await telemetryClient.stop();
+                    await tryStop(wallet, logger);
+                    await tryStop(aztecNodeService, logger);
+                    await tryStop(proverNode, logger);
+                    if (acvmConfig?.cleanup) {
+                        await acvmConfig.cleanup();
+                    }
+                    if (bbConfig?.cleanup) {
+                        await bbConfig.cleanup();
+                    }
+                    await tryStop(anvil, logger);
+                    await tryRmDir(directoryToCleanup, logger);
                 } catch (err) {
-                    logger.error(`Error during telemetry client stop`, err);
+                    logger.error(`Error during e2e test teardown`, err);
+                } finally{
+                    try {
+                        await telemetryClient.stop();
+                    } catch (err) {
+                        logger.error(`Error during telemetry client stop`, err);
+                    }
                 }
-            }
-        };
+            });
         return {
             anvil,
             aztecNode: aztecNodeService,
@@ -484,6 +514,7 @@ export const getPrivateKeyFromIndex = (index)=>{
             logger,
             mockGossipSubNetwork,
             genesis,
+            extraL1DeployResult,
             proverNode,
             sequencerDelayer,
             proverDelayer,
@@ -542,7 +573,7 @@ export const getPrivateKeyFromIndex = (index)=>{
  */ export async function registerSponsoredFPC(wallet) {
     await wallet.registerContract(await getSponsoredFPCInstance(), SponsoredFPCContract.artifact);
 }
-export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, intervalSec = 1) {
+export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, intervalSec = 0.25) {
     targetBlock ??= await node.getBlockNumber();
     await retryUntil(async ()=>await node.getBlockNumber('proven') >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
 }
@@ -553,7 +584,7 @@ export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, int
     return withLoggerBindings({
         actor: 'prover-0'
     }, async ()=>{
-        const proverNode = await AztecNodeService.createAndSync({
+        const proverNode = await createAztecNodeService({
             ...baseConfig,
             ...configOverrides,
             p2pPort: 0,
@@ -605,18 +636,20 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
  * required so revert messages from AuthRegistry calls can be enriched (otherwise assertion strings
  * surface as generic "Assertion failed:" and tests that match on the real message fail).
  */ export async function ensureAuthRegistryPublished(wallet, from) {
-    const { instance, contractClass } = await getStandardAuthRegistry();
-    if (!(await wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered) {
-        await (await publishContractClass(wallet, AuthRegistryArtifact)).send({
-            from
-        });
-    }
-    if (!(await wallet.getContractMetadata(instance.address)).isContractPublished) {
-        await publishInstance(wallet, instance).send({
-            from
-        });
-    }
-    await wallet.registerContract(instance, AuthRegistryArtifact);
+    await testSpan('setup:auth-registry', async ()=>{
+        const { instance, contractClass } = await getStandardAuthRegistry();
+        if (!(await wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered) {
+            await (await publishContractClass(wallet, AuthRegistryArtifact)).send({
+                from
+            });
+        }
+        if (!(await wallet.getContractMetadata(instance.address)).isContractPublished) {
+            await publishInstance(wallet, instance).send({
+                from
+            });
+        }
+        await wallet.registerContract(instance, AuthRegistryArtifact);
+    });
 }
 /**
  * Registers the public_checks contract class and publishes its standard instance if not already

package/dest/fixtures/setup_p2p_test.d.ts

@@ -31,4 +31,4 @@ export declare function createProverNode(config: AztecNodeConfig, tcpPort: numbe
 }>;
 export declare function createP2PConfig(config: AztecNodeConfig, bootstrapNodeEnr?: string, port?: number, dataDirectory?: string): Promise<AztecNodeConfig>;
 export declare function createValidatorConfig(config: CreateNodeConfig, bootstrapNodeEnr?: string, port?: number, addressIndex?: number | number[], dataDirectory?: string): Promise<AztecNodeConfig>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfcDJwX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9zZXR1cF9wMnBfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBSzNFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBVzdELGVBQU8sTUFBTSxpQ0FBaUMsSUFBSSxDQUFDO0FBT25ELHdCQUFnQixtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLEdBQUcsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQU83RjtBQUVELHdCQUFzQixXQUFXLENBQy9CLE1BQU0sRUFBRSxlQUFlLEdBQUc7SUFBRSxrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFFLEVBQzFELFlBQVksRUFBRSxZQUFZLEVBQzFCLGdCQUFnQixFQUFFLE1BQU0sRUFDeEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsT0FBTyxDQUFDLEVBQUUsV0FBVyxFQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sRUFDcEIsV0FBVyxTQUFJLEVBQ2YsaUJBQWlCLFNBQUksR0FDcEIsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FtQzdCO0FBRUQsd0VBQXdFO0FBQ3hFLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLEdBQUc7SUFDL0MsOENBQThDO0lBQzlDLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLHdFQUF3RTtJQUN4RSxtQkFBbUIsQ0FBQyxFQUFFLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDcEMsb0ZBQW9GO0lBQ3BGLHlDQUF5QyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ25ELHVFQUF1RTtJQUN2RSwwQkFBMEIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUN0QyxDQUFDO0FBRUYsNkVBQTZFO0FBQzdFLHdCQUFzQixVQUFVLENBQzlCLE1BQU0sRUFBRSxnQkFBZ0IsRUFDeEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDakMsWUFBWSxFQUFFLE1BQU0sR0FBRyxNQUFNLEVBQUUsRUFDL0IsT0FBTyxDQUFDLEVBQUUsV0FBVyxFQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sNkJBWXJCO0FBRUQsK0VBQStFO0FBQy9FLHdCQUFzQixzQkFBc0IsQ0FDMUMsVUFBVSxFQUFFLGVBQWUsRUFDM0IsWUFBWSxFQUFFLFlBQVksRUFDMUIsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDakMsT0FBTyxDQUFDLEVBQUUsV0FBVyxFQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sNkJBY3JCO0FBRUQsd0JBQXNCLGdCQUFnQixDQUNwQyxNQUFNLEVBQUUsZUFBZSxFQUN2QixPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUNqQyxZQUFZLEVBQUUsTUFBTSxFQUNwQixJQUFJLEVBQUU7SUFBRSxZQUFZLEVBQUUsWUFBWSxDQUFBO0NBQUUsRUFDcEMsT0FBTyxDQUFDLEVBQUUsV0FBVyxFQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sR0FDbkIsT0FBTyxDQUFDO0lBQUUsVUFBVSxFQUFFLGdCQUFnQixDQUFBO0NBQUUsQ0FBQyxDQWdCM0M7QUFFRCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEVBQUUsZUFBZSxFQUN2QixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sRUFDekIsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUNiLGFBQWEsQ0FBQyxFQUFFLE1BQU0sNEJBZ0J2QjtBQUVELHdCQUFzQixxQkFBcUIsQ0FDekMsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sRUFDekIsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUNiLFlBQVksR0FBRSxNQUFNLEdBQUcsTUFBTSxFQUFNLEVBQ25DLGFBQWEsQ0FBQyxFQUFFLE1BQU0sNEJBb0J2QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfcDJwX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9zZXR1cF9wMnBfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxnQkFBZ0IsRUFBMEIsTUFBTSxtQkFBbUIsQ0FBQztBQUtuRyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQVc3RCxlQUFPLE1BQU0saUNBQWlDLElBQUksQ0FBQztBQU9uRCx3QkFBZ0IsbUJBQW1CLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxHQUFHLEtBQUssTUFBTSxFQUFFLEVBQUUsQ0FPN0Y7QUFFRCx3QkFBc0IsV0FBVyxDQUMvQixNQUFNLEVBQUUsZUFBZSxHQUFHO0lBQUUsa0JBQWtCLENBQUMsRUFBRSxPQUFPLENBQUE7Q0FBRSxFQUMxRCxZQUFZLEVBQUUsWUFBWSxFQUMxQixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLFFBQVEsRUFBRSxNQUFNLEVBQ2hCLFlBQVksRUFBRSxNQUFNLEVBQ3BCLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLEVBQ3BCLFdBQVcsU0FBSSxFQUNmLGlCQUFpQixTQUFJLEdBQ3BCLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBbUM3QjtBQUVELHdFQUF3RTtBQUN4RSxNQUFNLE1BQU0sZ0JBQWdCLEdBQUcsZUFBZSxHQUFHO0lBQy9DLDhDQUE4QztJQUM5QyxrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUM3Qix3RUFBd0U7SUFDeEUsbUJBQW1CLENBQUMsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQ3BDLG9GQUFvRjtJQUNwRix5Q0FBeUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuRCx1RUFBdUU7SUFDdkUsMEJBQTBCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDdEMsQ0FBQztBQUVGLDZFQUE2RTtBQUM3RSx3QkFBc0IsVUFBVSxDQUM5QixNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLFlBQVksRUFBRSxZQUFZLEVBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2pDLFlBQVksRUFBRSxNQUFNLEdBQUcsTUFBTSxFQUFFLEVBQy9CLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLDZCQVlyQjtBQUVELCtFQUErRTtBQUMvRSx3QkFBc0Isc0JBQXNCLENBQzFDLFVBQVUsRUFBRSxlQUFlLEVBQzNCLFlBQVksRUFBRSxZQUFZLEVBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2pDLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLDZCQWNyQjtBQUVELHdCQUFzQixnQkFBZ0IsQ0FDcEMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDakMsWUFBWSxFQUFFLE1BQU0sRUFDcEIsSUFBSSxFQUFFO0lBQUUsWUFBWSxFQUFFLFlBQVksQ0FBQTtDQUFFLEVBQ3BDLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLEdBQ25CLE9BQU8sQ0FBQztJQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQTtDQUFFLENBQUMsQ0FnQjNDO0FBRUQsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEVBQ3pCLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixhQUFhLENBQUMsRUFBRSxNQUFNLDRCQWdCdkI7QUFFRCx3QkFBc0IscUJBQXFCLENBQ3pDLE1BQU0sRUFBRSxnQkFBZ0IsRUFDeEIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEVBQ3pCLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixZQUFZLEdBQUUsTUFBTSxHQUFHLE1BQU0sRUFBTSxFQUNuQyxhQUFhLENBQUMsRUFBRSxNQUFNLDRCQW9CdkIifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAW7D,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAOnD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,GAAG;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,EACf,iBAAiB,SAAI,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B;AAED,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG;IAC/C,8CAA8C;IAC9C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,oFAAoF;IACpF,yCAAyC,CAAC,EAAE,MAAM,CAAC;IACnD,uEAAuE;IACvE,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,CAAC;AAEF,6EAA6E;AAC7E,wBAAsB,UAAU,CAC9B,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,EAC/B,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAYrB;AAED,+EAA+E;AAC/E,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAcrB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE;IAAE,YAAY,EAAE,YAAY,CAAA;CAAE,EACpC,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAgB3C;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,4BAgBvB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,gBAAgB,EACxB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAM,GAAG,MAAM,EAAM,EACnC,aAAa,CAAC,EAAE,MAAM,4BAoBvB"}
+{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAA0B,MAAM,mBAAmB,CAAC;AAKnG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAW7D,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAOnD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,GAAG;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,EACf,iBAAiB,SAAI,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B;AAED,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG;IAC/C,8CAA8C;IAC9C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,oFAAoF;IACpF,yCAAyC,CAAC,EAAE,MAAM,CAAC;IACnD,uEAAuE;IACvE,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,CAAC;AAEF,6EAA6E;AAC7E,wBAAsB,UAAU,CAC9B,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,EAC/B,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAYrB;AAED,+EAA+E;AAC/E,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAcrB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE;IAAE,YAAY,EAAE,YAAY,CAAA;CAAE,EACpC,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAgB3C;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,4BAgBvB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,gBAAgB,EACxB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAM,GAAG,MAAM,EAAM,EACnC,aAAa,CAAC,EAAE,MAAM,4BAoBvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -1,6 +1,6 @@
 /**
  * Test fixtures and utilities to set up and run a test using multiple validators
- */ import { AztecNodeService } from '@aztec/aztec-node';
+ */ import { createAztecNodeService } from '@aztec/aztec-node';
 import { range } from '@aztec/foundation/array';
 import { SecretValue } from '@aztec/foundation/config';
 import { withLoggerBindings } from '@aztec/foundation/log/server';
@@ -53,7 +53,7 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
     }, async ()=>{
         const validatorConfig = await createValidatorConfig(config, bootstrapNode, tcpPort, addressIndex, dataDirectory);
         const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
-        return await AztecNodeService.createAndSync(validatorConfig, {
+        return await createAztecNodeService(validatorConfig, {
             telemetry,
             dateProvider
         }, {
@@ -75,7 +75,7 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
             sequencerPublisherPrivateKeys: []
         };
         const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
-        return await AztecNodeService.createAndSync(config, {
+        return await createAztecNodeService(config, {
             telemetry,
             dateProvider
         }, {

package/dest/fixtures/standard_contracts_genesis.d.ts

@@ -0,0 +1,16 @@
+import type { Fr } from '@aztec/foundation/curves/bn254';
+/**
+ * Computes the genesis nullifiers that pre-publish the standard contracts (AuthRegistry, PublicChecks,
+ * HandshakeRegistry) in e2e environments, mirroring the nullifiers their on-chain publish txs would emit. Per contract:
+ * - `siloNullifier(ContractClassRegistry, classId)` — the class-registration nullifier that `ContractClassRegistry.publish` pushes.
+ * - `siloNullifier(ContractInstanceRegistry, instanceAddress)` — the instance-deployment nullifier that
+ *   `ContractInstanceRegistry.publish_for_public_execution` pushes, using the contract's real derived address (standard
+ *   contracts are deployed at artifact-derived addresses, not magic protocol addresses).
+ *
+ * Seed these into the genesis nullifier tree (as the 5th `getGenesisValues` arg) alongside the archiver's
+ * `testPreloadStandardContracts` preload: the store preload makes the `ensure*Published` guards short-circuit, and these
+ * nullifiers make the AVM's deployment-nullifier check pass when the contracts are called. Every e2e node genesis that
+ * feeds an L1 `genesisArchiveRoot` must seed the same set, or the world-state root diverges from the deployed rollup.
+ */
+export declare function getStandardContractGenesisNullifiers(): Promise<Fr[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRfY29udHJhY3RzX2dlbmVzaXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9zdGFuZGFyZF9jb250cmFjdHNfZ2VuZXNpcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUt6RDs7Ozs7Ozs7Ozs7O0dBWUc7QUFDSCx3QkFBc0Isb0NBQW9DLElBQUksT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBUzFFIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"standard_contracts_genesis.d.ts","sourceRoot":"","sources":["../../src/fixtures/standard_contracts_genesis.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKzD;;;;;;;;;;;;GAYG;AACH,wBAAsB,oCAAoC,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAS1E"}

package/dest/fixtures/standard_contracts_genesis.js

@@ -0,0 +1,25 @@
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { getPublishableStandardContracts } from '@aztec/standard-contracts';
+import { siloNullifier } from '@aztec/stdlib/hash';
+/**
+ * Computes the genesis nullifiers that pre-publish the standard contracts (AuthRegistry, PublicChecks,
+ * HandshakeRegistry) in e2e environments, mirroring the nullifiers their on-chain publish txs would emit. Per contract:
+ * - `siloNullifier(ContractClassRegistry, classId)` — the class-registration nullifier that `ContractClassRegistry.publish` pushes.
+ * - `siloNullifier(ContractInstanceRegistry, instanceAddress)` — the instance-deployment nullifier that
+ *   `ContractInstanceRegistry.publish_for_public_execution` pushes, using the contract's real derived address (standard
+ *   contracts are deployed at artifact-derived addresses, not magic protocol addresses).
+ *
+ * Seed these into the genesis nullifier tree (as the 5th `getGenesisValues` arg) alongside the archiver's
+ * `testPreloadStandardContracts` preload: the store preload makes the `ensure*Published` guards short-circuit, and these
+ * nullifiers make the AVM's deployment-nullifier check pass when the contracts are called. Every e2e node genesis that
+ * feeds an L1 `genesisArchiveRoot` must seed the same set, or the world-state root diverges from the deployed rollup.
+ */ export async function getStandardContractGenesisNullifiers() {
+    const classRegistry = ProtocolContractAddress.ContractClassRegistry;
+    const instanceRegistry = ProtocolContractAddress.ContractInstanceRegistry;
+    const nullifiers = [];
+    for (const { contractClass, address } of (await getPublishableStandardContracts())){
+        nullifiers.push(await siloNullifier(classRegistry, contractClass.id));
+        nullifiers.push(await siloNullifier(instanceRegistry, address.toField()));
+    }
+    return nullifiers;
+}