@aztec/cli 3.0.0-nightly.20251005 → 3.0.0-nightly.20251008

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,7 +1,7 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { BatchCall, Fr, L1FeeJuicePortalManager, createAztecNodeClient, retryUntil, waitForProven } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
-import { TestWallet } from '@aztec/test-wallet';
+import { TestWallet } from '@aztec/test-wallet/server';
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 const waitOpts = {

package/dest/cmds/infrastructure/setup_l2_contract.js

@@ -2,7 +2,7 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { createAztecNodeClient } from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
     const waitOpts = {
         timeout: 180,

package/dest/cmds/l1/update_l1_validators.js

@@ -35,7 +35,9 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
     const gseAddress = await rollup.read.getGSE();
     const gse = new GSEContract(l1Client, gseAddress);
     const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
     const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -89,7 +91,9 @@ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mn
     const gseAddress = await rollup.read.getGSE();
     const gse = new GSEContract(l1Client, gseAddress);
     const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
         to: rollupAddress.toString(),
         data: encodeFunctionData({
@@ -129,7 +133,9 @@ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
     const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
         to: rollupAddress.toString(),
@@ -149,7 +155,9 @@ export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, roll
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
     const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
     dualLog(`Trying prune`);
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
         to: rollupAddress.toString(),

package/dest/config/chain_l2_config.d.ts

@@ -27,6 +27,7 @@ export type L2ChainConfig = L1ContractsConfig & Omit<SlasherConfig, 'slashValida
 };
 export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
 export declare const stagingPublicL2ChainConfig: L2ChainConfig;
+export declare const nextNetL2ChainConfig: L2ChainConfig;
 export declare const testnetL2ChainConfig: L2ChainConfig;
 export declare const ignitionL2ChainConfig: L2ChainConfig;
 export declare function getBootnodes(networkName: NetworkNames, cacheDir?: string): Promise<any>;

package/dest/config/chain_l2_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAarE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA8E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAkDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAoDlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aAgFnC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAQ9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAoBpC;AAMD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA4F/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAarE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aA8E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAkDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAkDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAoDlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,aAgFnC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAQ9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAsBpC;AAMD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA4F/E"}

package/dest/config/chain_l2_config.js

@@ -6,7 +6,7 @@ import publicIncludeMetrics from '../../public_include_metric_prefixes.json' wit
 };
 import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
-const SNAPSHOT_URL = 'https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev/snapshots';
+const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
 const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
 const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 const DefaultSlashConfig = {
@@ -54,7 +54,7 @@ export const stagingIgnitionL2ChainConfig = {
     seqMaxTxsPerBlock: 0,
     realProofs: true,
     snapshotsUrls: [
-        `${SNAPSHOT_URL}/staging-ignition/`
+        `${SNAPSHOTS_URL}/staging-ignition/`
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
@@ -119,7 +119,7 @@ export const stagingPublicL2ChainConfig = {
     seqMaxTxsPerBlock: 20,
     realProofs: true,
     snapshotsUrls: [
-        `${SNAPSHOT_URL}/staging-public/`
+        `${SNAPSHOTS_URL}/staging-public/`
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
@@ -147,6 +147,42 @@ export const stagingPublicL2ChainConfig = {
     ...DefaultSlashConfig,
     ...DefaultNetworkDBMapSizeConfig
 };
+export const nextNetL2ChainConfig = {
+    l1ChainId: 11155111,
+    testAccounts: true,
+    sponsoredFPC: true,
+    p2pEnabled: true,
+    p2pBootstrapNodes: [],
+    seqMinTxsPerBlock: 0,
+    seqMaxTxsPerBlock: 8,
+    realProofs: true,
+    snapshotsUrls: [],
+    autoUpdate: 'config-and-version',
+    autoUpdateUrl: '',
+    publicIncludeMetrics,
+    publicMetricsCollectorUrl: '',
+    publicMetricsCollectFrom: [
+        ''
+    ],
+    maxTxPoolSize: 100_000_000,
+    // Deployment stuff
+    /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
+    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
+    /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
+    /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
+    /** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+    /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+    /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
+    /** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    /** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+    /** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+    /** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+    /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
+    /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+    /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+    ...DefaultSlashConfig,
+    ...DefaultNetworkDBMapSizeConfig
+};
 export const testnetL2ChainConfig = {
     l1ChainId: 11155111,
     testAccounts: false,
@@ -157,7 +193,7 @@ export const testnetL2ChainConfig = {
     seqMaxTxsPerBlock: 20,
     realProofs: true,
     snapshotsUrls: [
-        `${SNAPSHOT_URL}/testnet/`
+        `${SNAPSHOTS_URL}/testnet/`
     ],
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
@@ -197,7 +233,7 @@ export const ignitionL2ChainConfig = {
     seqMaxTxsPerBlock: 0,
     realProofs: true,
     snapshotsUrls: [
-        'https://storage.googleapis.com/aztec-testnet/snapshots/ignition/'
+        `${SNAPSHOTS_URL}/ignition/`
     ],
     autoUpdate: 'notify',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/ignition.json',
@@ -279,6 +315,10 @@ export async function getL2ChainConfig(networkName, cacheDir) {
         config = {
             ...ignitionL2ChainConfig
         };
+    } else if (networkName === 'next-net') {
+        config = {
+            ...nextNetL2ChainConfig
+        };
     }
     if (!config) {
         return undefined;

package/dest/config/network_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAiDpC;AAED;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBA0BjF"}
+{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAiDpC;AAED;;;;;;GAMG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBAoBjF"}

package/dest/config/network_config.js

@@ -71,12 +71,7 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     }
     enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));
     enrichVar('L1_CHAIN_ID', String(networkConfig.l1ChainId));
-    // Snapshot synch only supports a single source. Take the first
-    // See A-101 for more details
-    const firstSource = networkConfig[0];
-    if (firstSource) {
-        enrichVar('SYNC_SNAPSHOTS_URL', networkConfig.snapshots.join(','));
-    }
+    enrichVar('SYNC_SNAPSHOTS_URLS', networkConfig.snapshots.join(','));
     enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', networkConfig.registryAddress.toString());
     if (networkConfig.feeAssetHandlerAddress) {
         enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());

package/dest/utils/aztec.js

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/aztec.js';
 import { FunctionType, getAllFunctionAbis, loadContractArtifact } from '@aztec/aztec.js/abi';
 import { SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
 import { encodeArgs } from './encoding.js';
@@ -34,7 +34,7 @@ import { encodeArgs } from './encoding.js';
     const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
     const result = await deployL1Contracts(chain.rpcUrls, account, chain.chainInfo, debugLogger, {
         vkTreeRoot: getVKTreeRoot(),
-        protocolContractTreeRoot,
+        protocolContractsHash,
         genesisArchiveRoot,
         salt,
         initialValidators,
@@ -74,7 +74,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
     const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(client, {
         salt,
         vkTreeRoot: getVKTreeRoot(),
-        protocolContractTreeRoot,
+        protocolContractsHash,
         genesisArchiveRoot,
         initialValidators,
         feeJuicePortalInitialBalance,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "3.0.0-nightly.20251005",
+  "version": "3.0.0-nightly.20251008",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,20 +70,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20251005",
-    "@aztec/archiver": "3.0.0-nightly.20251005",
-    "@aztec/aztec.js": "3.0.0-nightly.20251005",
-    "@aztec/constants": "3.0.0-nightly.20251005",
-    "@aztec/entrypoints": "3.0.0-nightly.20251005",
-    "@aztec/ethereum": "3.0.0-nightly.20251005",
-    "@aztec/foundation": "3.0.0-nightly.20251005",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251005",
-    "@aztec/node-lib": "3.0.0-nightly.20251005",
-    "@aztec/p2p": "3.0.0-nightly.20251005",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251005",
-    "@aztec/stdlib": "3.0.0-nightly.20251005",
-    "@aztec/test-wallet": "3.0.0-nightly.20251005",
-    "@aztec/world-state": "3.0.0-nightly.20251005",
+    "@aztec/accounts": "3.0.0-nightly.20251008",
+    "@aztec/archiver": "3.0.0-nightly.20251008",
+    "@aztec/aztec.js": "3.0.0-nightly.20251008",
+    "@aztec/constants": "3.0.0-nightly.20251008",
+    "@aztec/entrypoints": "3.0.0-nightly.20251008",
+    "@aztec/ethereum": "3.0.0-nightly.20251008",
+    "@aztec/foundation": "3.0.0-nightly.20251008",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251008",
+    "@aztec/node-lib": "3.0.0-nightly.20251008",
+    "@aztec/p2p": "3.0.0-nightly.20251008",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251008",
+    "@aztec/stdlib": "3.0.0-nightly.20251008",
+    "@aztec/test-wallet": "3.0.0-nightly.20251008",
+    "@aztec/world-state": "3.0.0-nightly.20251008",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -110,15 +110,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20251005",
-    "@aztec/bb-prover": "3.0.0-nightly.20251005",
-    "@aztec/ethereum": "3.0.0-nightly.20251005",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251005",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20251005",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251005",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251005",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251005",
-    "@aztec/stdlib": "3.0.0-nightly.20251005"
+    "@aztec/accounts": "3.0.0-nightly.20251008",
+    "@aztec/bb-prover": "3.0.0-nightly.20251008",
+    "@aztec/ethereum": "3.0.0-nightly.20251008",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251008",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251008",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251008",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251008",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251008",
+    "@aztec/stdlib": "3.0.0-nightly.20251008"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -21,7 +21,7 @@ import {
   deployL1Contract,
 } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import { TestWallet } from '@aztec/test-wallet';
+import { TestWallet } from '@aztec/test-wallet/server';
 
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -3,7 +3,7 @@ import { AccountManager, type AztecAddress, type WaitOpts, createAztecNodeClient
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 
 export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
   const waitOpts: WaitOpts = {

package/src/cmds/l1/update_l1_validators.ts

@@ -97,7 +97,7 @@ export async function addL1Validator({
 
   const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
 
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
   const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
   const merkleProofArray = merkleProof.map(proof => addLeadingHex(proof));
 
@@ -173,7 +173,7 @@ export async function addL1ValidatorViaRollup({
 
   const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
 
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
 
   const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
     to: rollupAddress.toString(),
@@ -220,7 +220,7 @@ export async function removeL1Validator({
   const account = getAccount(privateKey, mnemonic);
   const chain = createEthereumChain(rpcUrls, chainId);
   const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
 
   dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
   const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -247,7 +247,7 @@ export async function pruneRollup({
   const account = getAccount(privateKey, mnemonic);
   const chain = createEthereumChain(rpcUrls, chainId);
   const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+  const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
 
   dualLog(`Trying prune`);
   const { receipt } = await l1TxUtils.sendAndMonitorTransaction({

package/src/config/chain_l2_config.ts

@@ -10,7 +10,7 @@ import publicIncludeMetrics from '../../public_include_metric_prefixes.json' wit
 import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
 
-const SNAPSHOT_URL = 'https://pub-f4a8c34d4bb7441ebf8f48d904512180.r2.dev/snapshots';
+const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
 
 const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
 const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
@@ -99,7 +99,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
-  snapshotsUrls: [`${SNAPSHOT_URL}/staging-ignition/`],
+  snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
   maxTxPoolSize: 100_000_000, // 100MB
@@ -179,7 +179,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 20,
   realProofs: true,
-  snapshotsUrls: [`${SNAPSHOT_URL}/staging-public/`],
+  snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
   publicIncludeMetrics,
@@ -222,6 +222,58 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   ...DefaultNetworkDBMapSizeConfig,
 };
 
+export const nextNetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: true,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  p2pBootstrapNodes: [],
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 8,
+  realProofs: true,
+  snapshotsUrls: [],
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: '',
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: '',
+  publicMetricsCollectFrom: [''],
+  maxTxPoolSize: 100_000_000, // 100MB
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 32,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 48,
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+
+  ...DefaultSlashConfig,
+
+  ...DefaultNetworkDBMapSizeConfig,
+};
+
 export const testnetL2ChainConfig: L2ChainConfig = {
   l1ChainId: 11155111,
   testAccounts: false,
@@ -231,7 +283,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 20,
   realProofs: true,
-  snapshotsUrls: [`${SNAPSHOT_URL}/testnet/`],
+  snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
   maxTxPoolSize: 100_000_000, // 100MB
@@ -285,7 +337,7 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
-  snapshotsUrls: ['https://storage.googleapis.com/aztec-testnet/snapshots/ignition/'],
+  snapshotsUrls: [`${SNAPSHOTS_URL}/ignition/`],
   autoUpdate: 'notify',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/ignition.json',
   maxTxPoolSize: 100_000_000, // 100MB
@@ -383,6 +435,8 @@ export async function getL2ChainConfig(
     config = { ...stagingIgnitionL2ChainConfig };
   } else if (networkName === 'ignition') {
     config = { ...ignitionL2ChainConfig };
+  } else if (networkName === 'next-net') {
+    config = { ...nextNetL2ChainConfig };
   }
   if (!config) {
     return undefined;

package/src/config/network_config.ts

@@ -93,13 +93,7 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
 
   enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));
   enrichVar('L1_CHAIN_ID', String(networkConfig.l1ChainId));
-
-  // Snapshot synch only supports a single source. Take the first
-  // See A-101 for more details
-  const firstSource = networkConfig[0];
-  if (firstSource) {
-    enrichVar('SYNC_SNAPSHOTS_URL', networkConfig.snapshots.join(','));
-  }
+  enrichVar('SYNC_SNAPSHOTS_URLS', networkConfig.snapshots.join(','));
 
   enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', networkConfig.registryAddress.toString());
   if (networkConfig.feeAssetHandlerAddress) {

package/src/utils/aztec.ts

@@ -16,7 +16,7 @@ import { SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { NoirPackageConfig } from '@aztec/foundation/noir';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
@@ -78,7 +78,7 @@ export async function deployAztecContracts(
     debugLogger,
     {
       vkTreeRoot: getVKTreeRoot(),
-      protocolContractTreeRoot,
+      protocolContractsHash,
       genesisArchiveRoot,
       salt,
       initialValidators,
@@ -141,7 +141,7 @@ export async function deployNewRollupContracts(
     {
       salt,
       vkTreeRoot: getVKTreeRoot(),
-      protocolContractTreeRoot,
+      protocolContractsHash,
       genesisArchiveRoot,
       initialValidators,
       feeJuicePortalInitialBalance,