@aztec/end-to-end 3.0.0-nightly.20251211 → 3.0.0-nightly.20251213

package/dest/fixtures/snapshot_manager.js

@@ -10,6 +10,7 @@ import { createBlobSinkServer } from '@aztec/blob-sink/server';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { deployMulticall3 } from '@aztec/ethereum/contracts';
+import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { asyncMap } from '@aztec/foundation/async-map';
 import { SecretValue } from '@aztec/foundation/config';
@@ -18,6 +19,8 @@ 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 { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import { getPXEConfig } from '@aztec/pxe/server';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
@@ -34,7 +37,6 @@ 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, getSponsoredFPCAddress } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 export function createSnapshotManager(testName, dataPath, config = {}, deployL1ContractsArgs = {
@@ -244,13 +246,14 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     });
     const publisherPrivKeyRaw = hdAccount.getHdKey().privateKey;
     const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+    const publisherPrivKeyHex = `0x${publisherPrivKey.toString('hex')}`;
     const l1Client = createExtendedL1Client([
         aztecNodeConfig.l1RpcUrls[0]
     ], hdAccount, foundry);
     const validatorPrivKey = getPrivateKeyFromIndex(0);
     const proverNodePrivateKey = getPrivateKeyFromIndex(0);
     aztecNodeConfig.publisherPrivateKeys = [
-        new SecretValue(`0x${publisherPrivKey.toString('hex')}`)
+        new SecretValue(publisherPrivKeyHex)
     ];
     aztecNodeConfig.validatorPrivateKeys = new SecretValue([
         `0x${validatorPrivKey.toString('hex')}`
@@ -269,7 +272,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const dateProvider = new TestDateProvider();
     const ethCheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider);
     // Deploy our L1 contracts.
-    logger.verbose('Deploying L1 contracts...');
+    logger.verbose('Deploying Aztec L1 contracts...');
     if (opts.l1StartTime) {
         await ethCheatCodes.warp(opts.l1StartTime, {
             resetBlockInterval: true
@@ -278,15 +281,20 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const initialFundedAccounts = await generateSchnorrAccounts(numberOfInitialFundedAccounts);
     const sponsoredFPCAddress = await getSponsoredFPCAddress();
     const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address).concat(sponsoredFPCAddress), opts.initialAccountFeeJuice);
+    const vkTreeRoot = getVKTreeRoot();
     await deployMulticall3(l1Client, logger);
-    const deployL1ContractsValues = await setupL1Contracts(aztecNodeConfig.l1RpcUrls[0], hdAccount, logger, {
+    // Define args, defaulted to our environment variables.
+    const args = {
         ...getL1ContractsConfigEnvVars(),
+        ...deployL1ContractsArgs,
+        vkTreeRoot,
         genesisArchiveRoot,
+        protocolContractsHash,
+        initialValidators: opts.initialValidators,
         feeJuicePortalInitialBalance: fundingNeeded,
-        salt: opts.salt,
-        ...deployL1ContractsArgs,
-        initialValidators: opts.initialValidators
-    });
+        realVerifier: false
+    };
+    const deployL1ContractsValues = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], publisherPrivKeyHex, foundry.id, args);
     aztecNodeConfig.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
     aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;
     const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
@@ -301,7 +309,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
         aztecNodeConfig.bbBinaryPath = bbConfig.bbBinaryPath;
         aztecNodeConfig.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
     }
-    const telemetry = getEndToEndTestTelemetryClient(opts.metricsPort);
+    const telemetry = await getEndToEndTestTelemetryClient(opts.metricsPort);
     // Setup blob sink service
     const blobSink = await createBlobSinkServer({
         l1ChainId: aztecNodeConfig.l1ChainId,
@@ -399,7 +407,7 @@ export function createSnapshotManager(testName, dataPath, config = {}, deployL1C
     const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
     const watcher = new AnvilTestWatcher(ethCheatCodes, aztecNodeConfig.l1Contracts.rollupAddress, l1Client, dateProvider);
     await watcher.start();
-    const telemetry = initTelemetryClient(getTelemetryConfig());
+    const telemetry = await initTelemetryClient(getTelemetryConfig());
     const blobSink = await createBlobSinkServer({
         l1ChainId: aztecNodeConfig.l1ChainId,
         l1RpcUrls: aztecNodeConfig.l1RpcUrls,

package/dest/fixtures/utils.d.ts

@@ -2,16 +2,16 @@ import { type InitialAccountData } from '@aztec/accounts/testing';
 import { type AztecNodeConfig } from '@aztec/aztec-node';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { type ContractMethod } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
 import { type Logger } from '@aztec/aztec.js/log';
 import { type AztecNode } from '@aztec/aztec.js/node';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
 import { type BlobSinkServer } from '@aztec/blob-sink/server';
-import { type DeployL1ContractsArgs, type DeployL1ContractsReturnType, type Operator } from '@aztec/ethereum/deploy-l1-contracts';
+import { type DeployAztecL1ContractsReturnType, type Operator, type ZKPassportArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { EthCheatCodes, startAnvil } from '@aztec/ethereum/test';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
-import { Fr } from '@aztec/foundation/curves/bn254';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { MockGossipSubNetwork } from '@aztec/p2p/test-helpers';
@@ -23,456 +23,10 @@ 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 { TestWallet } from '@aztec/test-wallet/server';
-import { type Chain } from 'viem';
+import { type Chain } from 'viem/chains';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 export { startAnvil };
 export declare const getPrivateKeyFromIndex: (index: number) => Buffer<ArrayBufferLike> | null;
-export declare const setupL1Contracts: (l1RpcUrls: string[], account: {
-    address: `0x${string}`;
-    nonceManager?: import("viem").NonceManager | undefined;
-    sign: (parameters: {
-        hash: `0x${string}`;
-    }) => Promise<`0x${string}`>;
-    signAuthorization?: ((parameters: import("viem").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>) | undefined;
-    signMessage: ({ message }: {
-        message: import("viem").SignableMessage;
-    }) => Promise<`0x${string}`>;
-    signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
-        serializer?: serializer | undefined;
-    } | undefined) => Promise<`0x${string}`>;
-    signTypedData: <const typedData extends Record<string, unknown> | {
-        [x: string]: readonly import("viem").TypedDataParameter[];
-        [x: `address[${string}]`]: undefined;
-        [x: `bool[${string}]`]: undefined;
-        [x: `bytes10[${string}]`]: undefined;
-        [x: `bytes11[${string}]`]: undefined;
-        [x: `bytes12[${string}]`]: undefined;
-        [x: `bytes13[${string}]`]: undefined;
-        [x: `bytes14[${string}]`]: undefined;
-        [x: `bytes15[${string}]`]: undefined;
-        [x: `bytes16[${string}]`]: undefined;
-        [x: `bytes17[${string}]`]: undefined;
-        [x: `bytes18[${string}]`]: undefined;
-        [x: `bytes19[${string}]`]: undefined;
-        [x: `bytes1[${string}]`]: undefined;
-        [x: `bytes20[${string}]`]: undefined;
-        [x: `bytes21[${string}]`]: undefined;
-        [x: `bytes22[${string}]`]: undefined;
-        [x: `bytes23[${string}]`]: undefined;
-        [x: `bytes24[${string}]`]: undefined;
-        [x: `bytes25[${string}]`]: undefined;
-        [x: `bytes26[${string}]`]: undefined;
-        [x: `bytes27[${string}]`]: undefined;
-        [x: `bytes28[${string}]`]: undefined;
-        [x: `bytes29[${string}]`]: undefined;
-        [x: `bytes2[${string}]`]: undefined;
-        [x: `bytes30[${string}]`]: undefined;
-        [x: `bytes31[${string}]`]: undefined;
-        [x: `bytes32[${string}]`]: undefined;
-        [x: `bytes3[${string}]`]: undefined;
-        [x: `bytes4[${string}]`]: undefined;
-        [x: `bytes5[${string}]`]: undefined;
-        [x: `bytes6[${string}]`]: undefined;
-        [x: `bytes7[${string}]`]: undefined;
-        [x: `bytes8[${string}]`]: undefined;
-        [x: `bytes9[${string}]`]: undefined;
-        [x: `bytes[${string}]`]: undefined;
-        [x: `function[${string}]`]: undefined;
-        [x: `int104[${string}]`]: undefined;
-        [x: `int112[${string}]`]: undefined;
-        [x: `int120[${string}]`]: undefined;
-        [x: `int128[${string}]`]: undefined;
-        [x: `int136[${string}]`]: undefined;
-        [x: `int144[${string}]`]: undefined;
-        [x: `int152[${string}]`]: undefined;
-        [x: `int160[${string}]`]: undefined;
-        [x: `int168[${string}]`]: undefined;
-        [x: `int16[${string}]`]: undefined;
-        [x: `int176[${string}]`]: undefined;
-        [x: `int184[${string}]`]: undefined;
-        [x: `int192[${string}]`]: undefined;
-        [x: `int200[${string}]`]: undefined;
-        [x: `int208[${string}]`]: undefined;
-        [x: `int216[${string}]`]: undefined;
-        [x: `int224[${string}]`]: undefined;
-        [x: `int232[${string}]`]: undefined;
-        [x: `int240[${string}]`]: undefined;
-        [x: `int248[${string}]`]: undefined;
-        [x: `int24[${string}]`]: undefined;
-        [x: `int256[${string}]`]: undefined;
-        [x: `int32[${string}]`]: undefined;
-        [x: `int40[${string}]`]: undefined;
-        [x: `int48[${string}]`]: undefined;
-        [x: `int56[${string}]`]: undefined;
-        [x: `int64[${string}]`]: undefined;
-        [x: `int72[${string}]`]: undefined;
-        [x: `int80[${string}]`]: undefined;
-        [x: `int88[${string}]`]: undefined;
-        [x: `int8[${string}]`]: undefined;
-        [x: `int96[${string}]`]: undefined;
-        [x: `int[${string}]`]: undefined;
-        [x: `string[${string}]`]: undefined;
-        [x: `uint104[${string}]`]: undefined;
-        [x: `uint112[${string}]`]: undefined;
-        [x: `uint120[${string}]`]: undefined;
-        [x: `uint128[${string}]`]: undefined;
-        [x: `uint136[${string}]`]: undefined;
-        [x: `uint144[${string}]`]: undefined;
-        [x: `uint152[${string}]`]: undefined;
-        [x: `uint160[${string}]`]: undefined;
-        [x: `uint168[${string}]`]: undefined;
-        [x: `uint16[${string}]`]: undefined;
-        [x: `uint176[${string}]`]: undefined;
-        [x: `uint184[${string}]`]: undefined;
-        [x: `uint192[${string}]`]: undefined;
-        [x: `uint200[${string}]`]: undefined;
-        [x: `uint208[${string}]`]: undefined;
-        [x: `uint216[${string}]`]: undefined;
-        [x: `uint224[${string}]`]: undefined;
-        [x: `uint232[${string}]`]: undefined;
-        [x: `uint240[${string}]`]: undefined;
-        [x: `uint248[${string}]`]: undefined;
-        [x: `uint24[${string}]`]: undefined;
-        [x: `uint256[${string}]`]: undefined;
-        [x: `uint32[${string}]`]: undefined;
-        [x: `uint40[${string}]`]: undefined;
-        [x: `uint48[${string}]`]: undefined;
-        [x: `uint56[${string}]`]: undefined;
-        [x: `uint64[${string}]`]: undefined;
-        [x: `uint72[${string}]`]: undefined;
-        [x: `uint80[${string}]`]: undefined;
-        [x: `uint88[${string}]`]: undefined;
-        [x: `uint8[${string}]`]: undefined;
-        [x: `uint96[${string}]`]: undefined;
-        [x: `uint[${string}]`]: undefined;
-        address?: undefined;
-        bool?: undefined;
-        bytes?: undefined;
-        bytes1?: undefined;
-        bytes10?: undefined;
-        bytes11?: undefined;
-        bytes12?: undefined;
-        bytes13?: undefined;
-        bytes14?: undefined;
-        bytes15?: undefined;
-        bytes16?: undefined;
-        bytes17?: undefined;
-        bytes18?: undefined;
-        bytes19?: undefined;
-        bytes2?: undefined;
-        bytes20?: undefined;
-        bytes21?: undefined;
-        bytes22?: undefined;
-        bytes23?: undefined;
-        bytes24?: undefined;
-        bytes25?: undefined;
-        bytes26?: undefined;
-        bytes27?: undefined;
-        bytes28?: undefined;
-        bytes29?: undefined;
-        bytes3?: undefined;
-        bytes30?: undefined;
-        bytes31?: undefined;
-        bytes32?: undefined;
-        bytes4?: undefined;
-        bytes5?: undefined;
-        bytes6?: undefined;
-        bytes7?: undefined;
-        bytes8?: undefined;
-        bytes9?: undefined;
-        int104?: undefined;
-        int112?: undefined;
-        int120?: undefined;
-        int128?: undefined;
-        int136?: undefined;
-        int144?: undefined;
-        int152?: undefined;
-        int16?: undefined;
-        int160?: undefined;
-        int168?: undefined;
-        int176?: undefined;
-        int184?: undefined;
-        int192?: undefined;
-        int200?: undefined;
-        int208?: undefined;
-        int216?: undefined;
-        int224?: undefined;
-        int232?: undefined;
-        int24?: undefined;
-        int240?: undefined;
-        int248?: undefined;
-        int256?: undefined;
-        int32?: undefined;
-        int40?: undefined;
-        int48?: undefined;
-        int56?: undefined;
-        int64?: undefined;
-        int72?: undefined;
-        int8?: undefined;
-        int80?: undefined;
-        int88?: undefined;
-        int96?: undefined;
-        string?: undefined;
-        uint104?: undefined;
-        uint112?: undefined;
-        uint120?: undefined;
-        uint128?: undefined;
-        uint136?: undefined;
-        uint144?: undefined;
-        uint152?: undefined;
-        uint16?: undefined;
-        uint160?: undefined;
-        uint168?: undefined;
-        uint176?: undefined;
-        uint184?: undefined;
-        uint192?: undefined;
-        uint200?: undefined;
-        uint208?: undefined;
-        uint216?: undefined;
-        uint224?: undefined;
-        uint232?: undefined;
-        uint24?: undefined;
-        uint240?: undefined;
-        uint248?: undefined;
-        uint256?: undefined;
-        uint32?: undefined;
-        uint40?: undefined;
-        uint48?: undefined;
-        uint56?: undefined;
-        uint64?: undefined;
-        uint72?: undefined;
-        uint8?: undefined;
-        uint80?: undefined;
-        uint88?: undefined;
-        uint96?: undefined;
-    }, primaryType extends "EIP712Domain" | keyof typedData = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<`0x${string}`>;
-    publicKey: `0x${string}`;
-    source: "hd";
-    type: "local";
-    getHdKey: () => import("viem").HDKey;
-} | {
-    address: `0x${string}`;
-    nonceManager?: import("viem").NonceManager | undefined;
-    sign: (parameters: {
-        hash: `0x${string}`;
-    }) => Promise<`0x${string}`>;
-    signAuthorization: (parameters: import("viem").AuthorizationRequest) => Promise<import("viem/accounts").SignAuthorizationReturnType>;
-    signMessage: ({ message }: {
-        message: import("viem").SignableMessage;
-    }) => Promise<`0x${string}`>;
-    signTransaction: <serializer extends import("viem").SerializeTransactionFn<import("viem").TransactionSerializable> = import("viem").SerializeTransactionFn<import("viem").TransactionSerializable>, transaction extends Parameters<serializer>[0] = Parameters<serializer>[0]>(transaction: transaction, options?: {
-        serializer?: serializer | undefined;
-    } | undefined) => Promise<`0x${string}`>;
-    signTypedData: <const typedData extends Record<string, unknown> | {
-        [x: string]: readonly import("viem").TypedDataParameter[];
-        [x: `address[${string}]`]: undefined;
-        [x: `bool[${string}]`]: undefined;
-        [x: `bytes10[${string}]`]: undefined;
-        [x: `bytes11[${string}]`]: undefined;
-        [x: `bytes12[${string}]`]: undefined;
-        [x: `bytes13[${string}]`]: undefined;
-        [x: `bytes14[${string}]`]: undefined;
-        [x: `bytes15[${string}]`]: undefined;
-        [x: `bytes16[${string}]`]: undefined;
-        [x: `bytes17[${string}]`]: undefined;
-        [x: `bytes18[${string}]`]: undefined;
-        [x: `bytes19[${string}]`]: undefined;
-        [x: `bytes1[${string}]`]: undefined;
-        [x: `bytes20[${string}]`]: undefined;
-        [x: `bytes21[${string}]`]: undefined;
-        [x: `bytes22[${string}]`]: undefined;
-        [x: `bytes23[${string}]`]: undefined;
-        [x: `bytes24[${string}]`]: undefined;
-        [x: `bytes25[${string}]`]: undefined;
-        [x: `bytes26[${string}]`]: undefined;
-        [x: `bytes27[${string}]`]: undefined;
-        [x: `bytes28[${string}]`]: undefined;
-        [x: `bytes29[${string}]`]: undefined;
-        [x: `bytes2[${string}]`]: undefined;
-        [x: `bytes30[${string}]`]: undefined;
-        [x: `bytes31[${string}]`]: undefined;
-        [x: `bytes32[${string}]`]: undefined;
-        [x: `bytes3[${string}]`]: undefined;
-        [x: `bytes4[${string}]`]: undefined;
-        [x: `bytes5[${string}]`]: undefined;
-        [x: `bytes6[${string}]`]: undefined;
-        [x: `bytes7[${string}]`]: undefined;
-        [x: `bytes8[${string}]`]: undefined;
-        [x: `bytes9[${string}]`]: undefined;
-        [x: `bytes[${string}]`]: undefined;
-        [x: `function[${string}]`]: undefined;
-        [x: `int104[${string}]`]: undefined;
-        [x: `int112[${string}]`]: undefined;
-        [x: `int120[${string}]`]: undefined;
-        [x: `int128[${string}]`]: undefined;
-        [x: `int136[${string}]`]: undefined;
-        [x: `int144[${string}]`]: undefined;
-        [x: `int152[${string}]`]: undefined;
-        [x: `int160[${string}]`]: undefined;
-        [x: `int168[${string}]`]: undefined;
-        [x: `int16[${string}]`]: undefined;
-        [x: `int176[${string}]`]: undefined;
-        [x: `int184[${string}]`]: undefined;
-        [x: `int192[${string}]`]: undefined;
-        [x: `int200[${string}]`]: undefined;
-        [x: `int208[${string}]`]: undefined;
-        [x: `int216[${string}]`]: undefined;
-        [x: `int224[${string}]`]: undefined;
-        [x: `int232[${string}]`]: undefined;
-        [x: `int240[${string}]`]: undefined;
-        [x: `int248[${string}]`]: undefined;
-        [x: `int24[${string}]`]: undefined;
-        [x: `int256[${string}]`]: undefined;
-        [x: `int32[${string}]`]: undefined;
-        [x: `int40[${string}]`]: undefined;
-        [x: `int48[${string}]`]: undefined;
-        [x: `int56[${string}]`]: undefined;
-        [x: `int64[${string}]`]: undefined;
-        [x: `int72[${string}]`]: undefined;
-        [x: `int80[${string}]`]: undefined;
-        [x: `int88[${string}]`]: undefined;
-        [x: `int8[${string}]`]: undefined;
-        [x: `int96[${string}]`]: undefined;
-        [x: `int[${string}]`]: undefined;
-        [x: `string[${string}]`]: undefined;
-        [x: `uint104[${string}]`]: undefined;
-        [x: `uint112[${string}]`]: undefined;
-        [x: `uint120[${string}]`]: undefined;
-        [x: `uint128[${string}]`]: undefined;
-        [x: `uint136[${string}]`]: undefined;
-        [x: `uint144[${string}]`]: undefined;
-        [x: `uint152[${string}]`]: undefined;
-        [x: `uint160[${string}]`]: undefined;
-        [x: `uint168[${string}]`]: undefined;
-        [x: `uint16[${string}]`]: undefined;
-        [x: `uint176[${string}]`]: undefined;
-        [x: `uint184[${string}]`]: undefined;
-        [x: `uint192[${string}]`]: undefined;
-        [x: `uint200[${string}]`]: undefined;
-        [x: `uint208[${string}]`]: undefined;
-        [x: `uint216[${string}]`]: undefined;
-        [x: `uint224[${string}]`]: undefined;
-        [x: `uint232[${string}]`]: undefined;
-        [x: `uint240[${string}]`]: undefined;
-        [x: `uint248[${string}]`]: undefined;
-        [x: `uint24[${string}]`]: undefined;
-        [x: `uint256[${string}]`]: undefined;
-        [x: `uint32[${string}]`]: undefined;
-        [x: `uint40[${string}]`]: undefined;
-        [x: `uint48[${string}]`]: undefined;
-        [x: `uint56[${string}]`]: undefined;
-        [x: `uint64[${string}]`]: undefined;
-        [x: `uint72[${string}]`]: undefined;
-        [x: `uint80[${string}]`]: undefined;
-        [x: `uint88[${string}]`]: undefined;
-        [x: `uint8[${string}]`]: undefined;
-        [x: `uint96[${string}]`]: undefined;
-        [x: `uint[${string}]`]: undefined;
-        address?: undefined;
-        bool?: undefined;
-        bytes?: undefined;
-        bytes1?: undefined;
-        bytes10?: undefined;
-        bytes11?: undefined;
-        bytes12?: undefined;
-        bytes13?: undefined;
-        bytes14?: undefined;
-        bytes15?: undefined;
-        bytes16?: undefined;
-        bytes17?: undefined;
-        bytes18?: undefined;
-        bytes19?: undefined;
-        bytes2?: undefined;
-        bytes20?: undefined;
-        bytes21?: undefined;
-        bytes22?: undefined;
-        bytes23?: undefined;
-        bytes24?: undefined;
-        bytes25?: undefined;
-        bytes26?: undefined;
-        bytes27?: undefined;
-        bytes28?: undefined;
-        bytes29?: undefined;
-        bytes3?: undefined;
-        bytes30?: undefined;
-        bytes31?: undefined;
-        bytes32?: undefined;
-        bytes4?: undefined;
-        bytes5?: undefined;
-        bytes6?: undefined;
-        bytes7?: undefined;
-        bytes8?: undefined;
-        bytes9?: undefined;
-        int104?: undefined;
-        int112?: undefined;
-        int120?: undefined;
-        int128?: undefined;
-        int136?: undefined;
-        int144?: undefined;
-        int152?: undefined;
-        int16?: undefined;
-        int160?: undefined;
-        int168?: undefined;
-        int176?: undefined;
-        int184?: undefined;
-        int192?: undefined;
-        int200?: undefined;
-        int208?: undefined;
-        int216?: undefined;
-        int224?: undefined;
-        int232?: undefined;
-        int24?: undefined;
-        int240?: undefined;
-        int248?: undefined;
-        int256?: undefined;
-        int32?: undefined;
-        int40?: undefined;
-        int48?: undefined;
-        int56?: undefined;
-        int64?: undefined;
-        int72?: undefined;
-        int8?: undefined;
-        int80?: undefined;
-        int88?: undefined;
-        int96?: undefined;
-        string?: undefined;
-        uint104?: undefined;
-        uint112?: undefined;
-        uint120?: undefined;
-        uint128?: undefined;
-        uint136?: undefined;
-        uint144?: undefined;
-        uint152?: undefined;
-        uint16?: undefined;
-        uint160?: undefined;
-        uint168?: undefined;
-        uint176?: undefined;
-        uint184?: undefined;
-        uint192?: undefined;
-        uint200?: undefined;
-        uint208?: undefined;
-        uint216?: undefined;
-        uint224?: undefined;
-        uint232?: undefined;
-        uint24?: undefined;
-        uint240?: undefined;
-        uint248?: undefined;
-        uint256?: undefined;
-        uint32?: undefined;
-        uint40?: undefined;
-        uint48?: undefined;
-        uint56?: undefined;
-        uint64?: undefined;
-        uint72?: undefined;
-        uint8?: undefined;
-        uint80?: undefined;
-        uint88?: undefined;
-        uint96?: undefined;
-    }, primaryType extends "EIP712Domain" | keyof typedData = keyof typedData>(parameters: import("viem").TypedDataDefinition<typedData, primaryType>) => Promise<`0x${string}`>;
-    publicKey: `0x${string}`;
-    source: "privateKey";
-    type: "local";
-}, logger: Logger, args?: Partial<DeployL1ContractsArgs>, chain?: Chain) => Promise<DeployL1ContractsReturnType>;
 /**
  * Sets up Private eXecution Environment (PXE) and returns the corresponding test wallet.
  * @param aztecNode - An instance of Aztec Node.
@@ -502,17 +56,13 @@ export type SetupOptions = {
     /** Whether to enable metrics collection, if undefined, metrics collection is disabled */
     metricsPort?: number | undefined;
     /** Previously deployed contracts on L1 */
-    deployL1ContractsValues?: DeployL1ContractsReturnType;
-    /** Whether to skip deployment of protocol contracts (auth registry, etc) */
-    skipProtocolContracts?: boolean;
+    deployL1ContractsValues?: DeployAztecL1ContractsReturnType;
     /** Initial fee juice for default accounts */
     initialAccountFeeJuice?: Fr;
     /** Number of initial accounts funded with fee juice */
     numberOfInitialFundedAccounts?: number;
     /** Data of the initial funded accounts */
     initialFundedAccounts?: InitialAccountData[];
-    /** Salt to use in L1 contract deployment */
-    salt?: number;
     /** An initial set of validators */
     initialValidators?: (Operator & {
         privateKey: `0x${string}`;
@@ -523,8 +73,6 @@ export type SetupOptions = {
     l2StartTime?: number;
     /** Whether to start a prover node */
     startProverNode?: boolean;
-    /** Whether to fund the rewardDistributor */
-    fundRewardDistributor?: boolean;
     /** Manual config for the telemetry client */
     telemetryConfig?: Partial<TelemetryClientConfig> & {
         benchmark?: boolean;
@@ -545,6 +93,8 @@ export type SetupOptions = {
     anvilPort?: number;
     /** Key to use for publishing L1 contracts */
     l1PublisherKey?: SecretValue<`0x${string}`>;
+    /** ZkPassport configuration (domain, scope, mock verifier) */
+    zkPassportArgs?: ZKPassportArgs;
 } & Partial<AztecNodeConfig>;
 /** Context for an end-to-end test as returned by the `setup` function */
 export type EndToEndContext = {
@@ -556,8 +106,8 @@ export type EndToEndContext = {
     proverNode: ProverNode | undefined;
     /** A client to the sequencer service (undefined if connected to remote environment) */
     sequencer: SequencerClient | undefined;
-    /** Return values from deployL1Contracts function. */
-    deployL1ContractsValues: DeployL1ContractsReturnType;
+    /** Return values from deployAztecL1Contracts function. */
+    deployL1ContractsValues: DeployAztecL1ContractsReturnType;
     /** The Aztec Node configuration. */
     config: AztecNodeConfig;
     /** The data for the initial funded accounts. */
@@ -637,4 +187,4 @@ export declare function waitForProvenChain(node: AztecNode, targetBlock?: BlockN
 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=data:application/json;base64,{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fixtures/utils.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBdUQsTUFBTSx5QkFBeUIsQ0FBQztBQUV2SCxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNDLE1BQU0sbUJBQW1CLENBQUM7QUFDN0YsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBYSxLQUFLLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRTNFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1QyxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFzQyxNQUFNLHNCQUFzQixDQUFDO0FBQzFGLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVwRSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQXdCLE1BQU0seUJBQXlCLENBQUM7QUFNcEYsT0FBTyxFQUNMLEtBQUssZ0NBQWdDLEVBQ3JDLEtBQUssUUFBUSxFQUNiLEtBQUssY0FBYyxFQUVwQixNQUFNLDJDQUEyQyxDQUFDO0FBQ25ELE9BQU8sRUFFTCxhQUFhLEVBR2IsVUFBVSxFQUNYLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLFdBQVcsRUFBZSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQU12RCxPQUFPLEVBQWdCLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0s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