@aztec/cli 3.0.0-nightly.20250910 → 3.0.0-nightly.20250912

package/dest/cmds/devnet/bootstrap_network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAkFjB"}
+{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAsB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAsFjB"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,6 +1,7 @@
-import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
+import { TestWallet } from '@aztec/test-wallet';
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 const waitOpts = {
@@ -13,12 +14,12 @@ const provenWaitOpts = {
 };
 export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
     const pxe = await createCompatibleClient(pxeUrl, debugLog);
+    const wallet = new TestWallet(pxe);
     // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
     // so all we need to do is register them to our pxe.
-    const [accountManager] = await getInitialTestAccountsManagers(pxe);
-    await accountManager.register();
-    const wallet = await accountManager.getWallet();
-    const defaultAccountAddress = wallet.getAddress();
+    const [accountData] = await getInitialTestAccountsData();
+    const accountManager = await wallet.createSchnorrAccount(accountData.secret, accountData.salt, accountData.signingKey);
+    const defaultAccountAddress = accountManager.getAddress();
     const l1Client = createExtendedL1Client(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
     mnemonicToAccount(l1Mnemonic, {
         addressIndex
@@ -26,7 +27,7 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
     const { erc20Address, portalAddress } = await deployERC20(l1Client);
     const { token, bridge } = await deployToken(wallet, defaultAccountAddress, portalAddress);
     await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
-    const fpcAdmin = wallet.getAddress();
+    const fpcAdmin = defaultAccountAddress;
     const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
     const counter = await deployCounter(wallet, defaultAccountAddress);
     await fundFPC(pxe, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
@@ -190,19 +191,19 @@ async function fundFPC(pxe, counterAddress, wallet, defaultAccountAddress, l1Cli
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
     const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
-    const { protocolContractAddresses: { feeJuice } } = await wallet.getPXEInfo();
+    const { protocolContractAddresses: { feeJuice } } = await pxe.getNodeInfo();
     const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
-    const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Client, debugLog);
+    const feeJuicePortal = await L1FeeJuicePortalManager.new(pxe, l1Client, debugLog);
     const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, undefined, true);
     await retryUntil(async ()=>await pxe.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
     const counter = await CounterContract.at(counterAddress, wallet);
     debugLog.info('Incrementing Counter');
     // TODO (alexg) remove this once sequencer builds blocks continuously
     // advance the chain
-    await counter.methods.increment(wallet.getAddress()).send({
+    await counter.methods.increment(defaultAccountAddress).send({
         from: defaultAccountAddress
     }).wait(waitOpts);
-    await counter.methods.increment(wallet.getAddress()).send({
+    await counter.methods.increment(defaultAccountAddress).send({
         from: defaultAccountAddress
     }).wait(waitOpts);
     debugLog.info('Claiming FPC');

package/dest/cmds/infrastructure/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAwD/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAgD/E"}

package/dest/cmds/infrastructure/index.js

@@ -1,8 +1,8 @@
 import { ETHEREUM_HOSTS, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
 export function injectCommands(program, log, debugLogger) {
-    program.command('setup-protocol-contracts').description('Bootstrap the blockchain by initializing all the protocol contracts').addOption(pxeOption).option('--testAccounts', 'Deploy funded test accounts.').option('--sponsoredFPC', 'Deploy a sponsored FPC.').option('--json', 'Output the contract addresses in JSON format').option('--skipProofWait', "Don't wait for proofs to land.").action(async (options)=>{
+    program.command('setup-protocol-contracts').description('Bootstrap the blockchain by initializing all the protocol contracts').addOption(pxeOption).option('--testAccounts', 'Deploy funded test accounts.').option('--sponsoredFPC', 'Deploy a sponsored FPC.').option('--json', 'Output the contract addresses in JSON format').action(async (options)=>{
         const { setupL2Contracts } = await import('./setup_l2_contract.js');
-        await setupL2Contracts(options.rpcUrl, options.testAccounts, options.sponsoredFPC, options.json, options.skipProofWait, log);
+        await setupL2Contracts(options.rpcUrl, options.testAccounts, options.sponsoredFPC, options.json, log);
     });
     program.command('sequencers').argument('<command>', 'Command to run: list, add, remove, who-next').argument('[who]', 'Who to add/remove').description('Manages or queries registered sequencers on the L1 rollup contract.').requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
         ETHEREUM_HOSTS

package/dest/cmds/infrastructure/setup_l2_contract.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function setupL2Contracts(rpcUrl: string, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, skipProofWait: boolean, log: LogFn): Promise<void>;
+export declare function setupL2Contracts(rpcUrl: string, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, log: LogFn): Promise<void>;
 //# sourceMappingURL=setup_l2_contract.d.ts.map

package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,OAAO,EACtB,GAAG,EAAE,KAAK,iBAqCX"}
+{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,iBA8BX"}

package/dest/cmds/infrastructure/setup_l2_contract.js

@@ -1,20 +1,15 @@
-import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { createPXEClient, makeFetch } 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 { setupSponsoredFPC } from '../../utils/setup_contracts.js';
-export async function setupL2Contracts(rpcUrl, testAccounts, sponsoredFPC, json, skipProofWait, log) {
+export async function setupL2Contracts(rpcUrl, testAccounts, sponsoredFPC, json, log) {
     const waitOpts = {
         timeout: 180,
         interval: 1
     };
-    const waitForProvenOptions = !skipProofWait ? {
-        provenTimeout: 600
-    } : undefined;
     log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
-    if (waitForProvenOptions) {
-        log('setupL2Contracts: Wait for proven options' + jsonStringify(waitForProvenOptions));
-    }
     log('setupL2Contracts: Creating PXE client...');
     const pxe = createPXEClient(rpcUrl, {}, makeFetch([
         1,
@@ -23,22 +18,23 @@ export async function setupL2Contracts(rpcUrl, testAccounts, sponsoredFPC, json,
         1,
         1
     ], false));
-    let deployedAccounts = [];
+    const wallet = new TestWallet(pxe);
+    let deployedAccountManagers = [];
     if (testAccounts) {
         log('setupL2Contracts: Deploying test accounts...');
-        deployedAccounts = await getInitialTestAccounts();
-        await deployFundedSchnorrAccounts(pxe, deployedAccounts, waitOpts);
+        const initialAccountsData = await getInitialTestAccountsData();
+        deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
     }
     if (sponsoredFPC) {
         log('setupL2Contracts: Setting up sponsored FPC...');
-        await setupSponsoredFPC(pxe, log, waitOpts, waitForProvenOptions);
+        await setupSponsoredFPC(pxe, log);
     }
     if (json) {
         const toPrint = {
             ...ProtocolContractAddress
         };
-        deployedAccounts.forEach((a, i)=>{
-            toPrint[`testAccount${i}`] = a.address;
+        deployedAccountManagers.forEach((a, i)=>{
+            toPrint[`testAccount${i}`] = a.getAddress();
         });
         log(JSON.stringify(toPrint, null, 2));
     }

package/dest/cmds/l1/deploy_l1_contracts.d.ts

@@ -1,4 +1,4 @@
 import { type EthAddress } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, createVerificationJson: string | false, initialValidators: EthAddress[], realVerifier: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
+export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, createVerificationJson: string | false, initialValidators: EthAddress[], realVerifier: boolean, flushEntryQueue: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
 //# sourceMappingURL=deploy_l1_contracts.d.ts.map

package/dest/cmds/l1/deploy_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAM,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6DpB"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAM,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,eAAe,EAAE,OAAO,EACxB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA8DpB"}

package/dest/cmds/l1/deploy_l1_contracts.js

@@ -1,13 +1,13 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { Fr } from '@aztec/aztec.js';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { SecretValue } from '@aztec/foundation/config';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { deployAztecContracts } from '../../utils/aztec.js';
 import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
-export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, acceleratedTestDeployments, json, createVerificationJson, initialValidators, realVerifier, log, debugLogger) {
+export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, acceleratedTestDeployments, json, createVerificationJson, initialValidators, realVerifier, flushEntryQueue, log, debugLogger) {
     const config = getL1ContractsConfigEnvVars();
-    const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+    const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
     const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
     const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
     const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
@@ -16,7 +16,7 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
             withdrawer: a,
             bn254SecretKey: new SecretValue(Fr.random().toBigInt())
         }));
-    const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidatorOperators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, realVerifier, createVerificationJson, debugLogger);
+    const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidatorOperators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, realVerifier, createVerificationJson, flushEntryQueue, debugLogger);
     if (json) {
         log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[
                 k,

package/dest/cmds/l1/deploy_new_rollup.js

@@ -1,11 +1,11 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { deployNewRollupContracts } from '../../utils/aztec.js';
 import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
 export async function deployNewRollup(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, json, initialValidators, realVerifier, log, debugLogger) {
     const config = getL1ContractsConfigEnvVars();
-    const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+    const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
     const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
     const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
     const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);

package/dest/cmds/l1/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAghB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAkhB/E"}

package/dest/cmds/l1/index.js

@@ -8,10 +8,10 @@ const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum h
 ]).makeOptionMandatory(true).argParser((arg)=>arg.split(',').map((url)=>url.trim()));
 const networkOption = new Option('--network <string>', 'Network to execute against').env('NETWORK');
 export function injectCommands(program, log, debugLogger) {
-    program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).option('--real-verifier', 'Deploy the real verifier', false).option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false).action(async (options)=>{
+    program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).option('--real-verifier', 'Deploy the real verifier', false).option('--flush-entry-queue', 'Whether to flush the entry queue after adding initial validators', false).option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false).action(async (options)=>{
         const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
-        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, options.createVerificationJson, initialValidators, options.realVerifier, log, debugLogger);
+        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, options.createVerificationJson, initialValidators, options.realVerifier, options.flushEntryQueue, log, debugLogger);
     });
     program.command('deploy-new-rollup').description('Deploys a new rollup contract and adds it to the registry (if you are the owner).').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', MNEMONIC ?? 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--real-verifier', 'Deploy the real verifier', false).action(async (options)=>{
         const { deployNewRollup } = await import('./deploy_new_rollup.js');

package/dest/cmds/l1/update_l1_validators.js

@@ -208,7 +208,7 @@ export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }) {
     log(`Committee: ${committee?.map((v)=>v.toString()).join(', ')}`);
     const archive = await rollup.archive();
     log(`Archive: ${archive}`);
-    const epochNum = await rollup.getEpochNumber();
+    const epochNum = await rollup.getCurrentEpochNumber();
     log(`Current epoch: ${epochNum}`);
     const slot = await rollup.getSlotNumber();
     log(`Current slot: ${slot}`);

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;AAOrE,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,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,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;IAGpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEJ,eAAO,MAAM,4BAA4B,EAAE,aAwD1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aA4ExC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA4ElC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAgC9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkBpC;AAuBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAyF/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;AAOrE,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,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,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;IAGpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAoCJ,eAAO,MAAM,4BAA4B,EAAE,aAqC1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAmDlC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAgC9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkBpC;AAuBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA0F/E"}

package/dest/config/chain_l2_config.js

@@ -5,6 +5,32 @@ import path, { dirname, join } from 'path';
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
     type: 'json'
 };
+const DefaultSlashConfig = {
+    /** Tally-style slashing */ slasherFlavor: 'tally',
+    /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
+    /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
+    /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
+    /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
+    /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
+    slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
+    slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
+    // Slashing stuff
+    slashMinPenaltyPercentage: 0.5,
+    slashMaxPenaltyPercentage: 2.0,
+    slashInactivityTargetPercentage: 0.7,
+    slashInactivityConsecutiveEpochThreshold: 1,
+    slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+    slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+    slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+    slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
+    slashMaxPayloadSize: 50,
+    slashGracePeriodL2Slots: 32 * 2,
+    slashOffenseExpirationRounds: 8,
+    sentinelEnabled: true
+};
 export const stagingIgnitionL2ChainConfig = {
     l1ChainId: 11155111,
     testAccounts: true,
@@ -27,32 +53,14 @@ export const stagingIgnitionL2ChainConfig = {
         'sequencer'
     ],
     ...DefaultL1ContractsConfig,
+    ...DefaultSlashConfig,
     /** 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 after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
     /** The mana target for the rollup */ manaTarget: 0n,
-    /** The proving cost per mana */ provingCostPerMana: 0n,
-    slasherFlavor: 'none',
-    slashAmountSmall: 0n,
-    slashAmountMedium: 0n,
-    slashAmountLarge: 0n,
-    slashMinPenaltyPercentage: 0.5,
-    slashMaxPenaltyPercentage: 200,
-    slashInactivityTargetPercentage: 0,
-    slashInactivityConsecutiveEpochThreshold: 1,
-    slashInactivityPenalty: 0n,
-    slashPrunePenalty: 0n,
-    slashDataWithholdingPenalty: 0n,
-    slashProposeInvalidAttestationsPenalty: 0n,
-    slashAttestDescendantOfInvalidPenalty: 0n,
-    slashBroadcastedInvalidBlockPenalty: 0n,
-    slashMaxPayloadSize: 50,
-    slashGracePeriodL2Slots: 0,
-    slashUnknownPenalty: 0n,
-    slashOffenseExpirationRounds: 10,
-    sentinelEnabled: false
+    /** The proving cost per mana */ provingCostPerMana: 0n
 };
 export const stagingPublicL2ChainConfig = {
     l1ChainId: 11155111,
@@ -80,6 +88,8 @@ export const stagingPublicL2ChainConfig = {
     /** 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,
@@ -88,30 +98,7 @@ export const stagingPublicL2ChainConfig = {
     /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
     /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
     /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
-    /** Tally-style slashing */ slasherFlavor: 'tally',
-    /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
-    /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
-    /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
-    /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
-    /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
-    slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
-    slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
-    // Slashing stuff
-    slashMinPenaltyPercentage: 0.5,
-    slashMaxPenaltyPercentage: 2.0,
-    slashInactivityTargetPercentage: 0.7,
-    slashInactivityConsecutiveEpochThreshold: 1,
-    slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-    slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-    slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
-    slashMaxPayloadSize: 50,
-    slashGracePeriodL2Slots: 32 * 2,
-    slashOffenseExpirationRounds: 8,
-    sentinelEnabled: true
+    ...DefaultSlashConfig
 };
 export const testnetL2ChainConfig = {
     l1ChainId: 11155111,
@@ -139,38 +126,17 @@ export const testnetL2ChainConfig = {
     /** 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: 2,
     /** 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 local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
     /** 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,
-    /** Tally-style slashing */ slasherFlavor: 'tally',
-    /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
-    /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
-    /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
-    /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
-    /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
-    slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
-    slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
-    // Slashing stuff
-    slashMinPenaltyPercentage: 0.5,
-    slashMaxPenaltyPercentage: 2.0,
-    slashInactivityTargetPercentage: 0.7,
-    slashInactivityConsecutiveEpochThreshold: 1,
-    slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-    slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-    slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-    slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
-    slashMaxPayloadSize: 50,
-    slashGracePeriodL2Slots: 32 * 2,
-    slashOffenseExpirationRounds: 8,
-    sentinelEnabled: true
+    ...DefaultSlashConfig
 };
 const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
 export async function getBootnodes(networkName, cacheDir) {
@@ -293,6 +259,7 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
     enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
     enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
+    enrichVar('AZTEC_LOCAL_EJECTION_THRESHOLD', config.localEjectionThreshold.toString());
     enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum?.toString());
     enrichVar('AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS', config.slashingRoundSizeInEpochs.toString());
     enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum?.toString());

package/dest/utils/aztec.d.ts

@@ -18,7 +18,7 @@ export declare function getFunctionAbi(artifact: ContractArtifact, fnName: strin
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
  */
-export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, realVerifier: boolean, createVerificationJson: string | false, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
+export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, realVerifier: boolean, createVerificationJson: string | false, flushEntryQueue: boolean, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
 export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean, logger: Logger): Promise<{
     rollup: RollupContract;
     slashFactoryAddress: EthAddress;

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

@@ -1 +1 @@
-{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAgCtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA6CtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}
+{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,eAAe,EAAE,OAAO,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAiCtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA6CtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}

package/dest/utils/aztec.js

@@ -25,7 +25,7 @@ import { encodeArgs } from './encoding.js';
  * @param chainId - The chain ID of the L1 host.
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
- */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, realVerifier, createVerificationJson, debugLogger) {
+ */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, realVerifier, createVerificationJson, flushEntryQueue, debugLogger) {
     const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
     const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
@@ -43,7 +43,7 @@ import { encodeArgs } from './encoding.js';
         feeJuicePortalInitialBalance,
         realVerifier,
         ...config
-    }, config, createVerificationJson);
+    }, config, createVerificationJson, flushEntryQueue);
     return result;
 }
 export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, logger) {

package/dest/utils/setup_contracts.d.ts

@@ -1,5 +1,5 @@
-import { AztecAddress, type PXE, type WaitForProvenOpts } from '@aztec/aztec.js';
+import { type PXE } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
-export declare function setupSponsoredFPC(pxe: PXE, log: LogFn, waitOpts?: import("@aztec/aztec.js").WaitOpts, waitForProvenOptions?: WaitForProvenOpts): Promise<void>;
+export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js").AztecAddress>;
+export declare function setupSponsoredFPC(pxe: PXE, log: LogFn): Promise<void>;
 //# sourceMappingURL=setup_contracts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,KAAK,GAAG,EAGR,KAAK,iBAAiB,EAGvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,wBAAsB,sBAAsB,0BAM3C;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,KAAK,EACV,QAAQ,qCAAkB,EAC1B,oBAAoB,CAAC,EAAE,iBAAiB,iBAuBzC"}
+{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,KAAK,GAAG,EAA8C,MAAM,iBAAiB,CAAC;AAE3F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD,wBAAsB,sBAAsB,oDAM3C;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,iBAQ3D"}

package/dest/utils/setup_contracts.js

@@ -1,6 +1,5 @@
-import { AztecAddress, DefaultWaitOpts, Fr, SignerlessWallet, SponsoredFeePaymentMethod, getContractInstanceFromInstantiationParams, waitForProven } from '@aztec/aztec.js';
+import { Fr, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
-import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 async function getSponsoredFPCContract() {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
@@ -14,23 +13,14 @@ export async function getSponsoredFPCAddress() {
     });
     return sponsoredFPCInstance.address;
 }
-export async function setupSponsoredFPC(pxe, log, waitOpts = DefaultWaitOpts, waitForProvenOptions) {
+export async function setupSponsoredFPC(pxe, log) {
     const SponsoredFPCContract = await getSponsoredFPCContract();
-    const address = await getSponsoredFPCAddress();
-    const paymentMethod = new SponsoredFeePaymentMethod(address);
-    const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
-    const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
-    const deployTx = SponsoredFPCContract.deploy(deployer).send({
-        from: AztecAddress.ZERO,
-        contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
-        universalDeploy: true,
-        fee: {
-            paymentMethod
-        }
+    const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+        salt: new Fr(SPONSORED_FPC_SALT)
+    });
+    await pxe.registerContract({
+        instance: sponsoredFPCInstance,
+        artifact: SponsoredFPCContract.artifact
     });
-    const deployed = await deployTx.deployed(waitOpts);
-    if (waitForProvenOptions !== undefined) {
-        await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
-    }
-    log(`SponsoredFPC: ${deployed.address}`);
+    log(`SponsoredFPC: ${sponsoredFPCInstance.address}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "3.0.0-nightly.20250910",
+  "version": "3.0.0-nightly.20250912",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,17 +70,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "3.0.0-nightly.20250910",
-    "@aztec/aztec.js": "3.0.0-nightly.20250910",
-    "@aztec/constants": "3.0.0-nightly.20250910",
-    "@aztec/entrypoints": "3.0.0-nightly.20250910",
-    "@aztec/ethereum": "3.0.0-nightly.20250910",
-    "@aztec/foundation": "3.0.0-nightly.20250910",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250910",
-    "@aztec/node-lib": "3.0.0-nightly.20250910",
-    "@aztec/p2p": "3.0.0-nightly.20250910",
-    "@aztec/stdlib": "3.0.0-nightly.20250910",
-    "@aztec/world-state": "3.0.0-nightly.20250910",
+    "@aztec/accounts": "3.0.0-nightly.20250912",
+    "@aztec/archiver": "3.0.0-nightly.20250912",
+    "@aztec/aztec.js": "3.0.0-nightly.20250912",
+    "@aztec/constants": "3.0.0-nightly.20250912",
+    "@aztec/entrypoints": "3.0.0-nightly.20250912",
+    "@aztec/ethereum": "3.0.0-nightly.20250912",
+    "@aztec/foundation": "3.0.0-nightly.20250912",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250912",
+    "@aztec/node-lib": "3.0.0-nightly.20250912",
+    "@aztec/p2p": "3.0.0-nightly.20250912",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250912",
+    "@aztec/stdlib": "3.0.0-nightly.20250912",
+    "@aztec/test-wallet": "3.0.0-nightly.20250912",
+    "@aztec/world-state": "3.0.0-nightly.20250912",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -92,8 +95,6 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250910",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250910",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -109,15 +110,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250910",
-    "@aztec/bb-prover": "3.0.0-nightly.20250910",
-    "@aztec/ethereum": "3.0.0-nightly.20250910",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250910",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250910",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250910",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250910",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250910",
-    "@aztec/stdlib": "3.0.0-nightly.20250910"
+    "@aztec/accounts": "3.0.0-nightly.20250912",
+    "@aztec/bb-prover": "3.0.0-nightly.20250912",
+    "@aztec/ethereum": "3.0.0-nightly.20250912",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250912",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250912",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250912",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250912",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250912",
+    "@aztec/stdlib": "3.0.0-nightly.20250912"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import {
   AztecAddress,
   BatchCall,
@@ -21,6 +21,7 @@ import {
   deployL1Contract,
 } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import { TestWallet } from '@aztec/test-wallet';
 
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
@@ -53,14 +54,18 @@ export async function bootstrapNetwork(
   debugLog: Logger,
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
+  const wallet = new TestWallet(pxe);
 
   // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
   // so all we need to do is register them to our pxe.
-  const [accountManager] = await getInitialTestAccountsManagers(pxe);
-  await accountManager.register();
+  const [accountData] = await getInitialTestAccountsData();
+  const accountManager = await wallet.createSchnorrAccount(
+    accountData.secret,
+    accountData.salt,
+    accountData.signingKey,
+  );
 
-  const wallet = await accountManager.getWallet();
-  const defaultAccountAddress = wallet.getAddress();
+  const defaultAccountAddress = accountManager.getAddress();
 
   const l1Client = createExtendedL1Client(
     l1Urls,
@@ -78,7 +83,7 @@ export async function bootstrapNetwork(
 
   await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
 
-  const fpcAdmin = wallet.getAddress();
+  const fpcAdmin = defaultAccountAddress;
   const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
 
   const counter = await deployCounter(wallet, defaultAccountAddress);
@@ -285,11 +290,11 @@ async function fundFPC(
   const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
   const {
     protocolContractAddresses: { feeJuice },
-  } = await wallet.getPXEInfo();
+  } = await pxe.getNodeInfo();
 
   const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
 
-  const feeJuicePortal = await L1FeeJuicePortalManager.new(wallet, l1Client, debugLog);
+  const feeJuicePortal = await L1FeeJuicePortalManager.new(pxe, l1Client, debugLog);
 
   const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(
     fpcAddress,
@@ -305,8 +310,8 @@ async function fundFPC(
 
   // TODO (alexg) remove this once sequencer builds blocks continuously
   // advance the chain
-  await counter.methods.increment(wallet.getAddress()).send({ from: defaultAccountAddress }).wait(waitOpts);
-  await counter.methods.increment(wallet.getAddress()).send({ from: defaultAccountAddress }).wait(waitOpts);
+  await counter.methods.increment(defaultAccountAddress).send({ from: defaultAccountAddress }).wait(waitOpts);
+  await counter.methods.increment(defaultAccountAddress).send({ from: defaultAccountAddress }).wait(waitOpts);
 
   debugLog.info('Claiming FPC');
 

package/src/cmds/infrastructure/index.ts

@@ -12,17 +12,9 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--testAccounts', 'Deploy funded test accounts.')
     .option('--sponsoredFPC', 'Deploy a sponsored FPC.')
     .option('--json', 'Output the contract addresses in JSON format')
-    .option('--skipProofWait', "Don't wait for proofs to land.")
     .action(async options => {
       const { setupL2Contracts } = await import('./setup_l2_contract.js');
-      await setupL2Contracts(
-        options.rpcUrl,
-        options.testAccounts,
-        options.sponsoredFPC,
-        options.json,
-        options.skipProofWait,
-        log,
-      );
+      await setupL2Contracts(options.rpcUrl, options.testAccounts, options.sponsoredFPC, options.json, log);
     });
 
   program

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -1,8 +1,9 @@
-import { type InitialAccountData, deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
-import { type AztecAddress, type WaitForProvenOpts, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { AccountManager, type AztecAddress, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
 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 { setupSponsoredFPC } from '../../utils/setup_contracts.js';
 
@@ -11,41 +12,33 @@ export async function setupL2Contracts(
   testAccounts: boolean,
   sponsoredFPC: boolean,
   json: boolean,
-  skipProofWait: boolean,
   log: LogFn,
 ) {
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
   };
-  const waitForProvenOptions: WaitForProvenOpts | undefined = !skipProofWait
-    ? {
-        provenTimeout: 600,
-      }
-    : undefined;
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
-  if (waitForProvenOptions) {
-    log('setupL2Contracts: Wait for proven options' + jsonStringify(waitForProvenOptions));
-  }
   log('setupL2Contracts: Creating PXE client...');
   const pxe = createPXEClient(rpcUrl, {}, makeFetch([1, 1, 1, 1, 1], false));
+  const wallet = new TestWallet(pxe);
 
-  let deployedAccounts: InitialAccountData[] = [];
+  let deployedAccountManagers: AccountManager[] = [];
   if (testAccounts) {
     log('setupL2Contracts: Deploying test accounts...');
-    deployedAccounts = await getInitialTestAccounts();
-    await deployFundedSchnorrAccounts(pxe, deployedAccounts, waitOpts);
+    const initialAccountsData = await getInitialTestAccountsData();
+    deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
   }
 
   if (sponsoredFPC) {
     log('setupL2Contracts: Setting up sponsored FPC...');
-    await setupSponsoredFPC(pxe, log, waitOpts, waitForProvenOptions);
+    await setupSponsoredFPC(pxe, log);
   }
 
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
-    deployedAccounts.forEach((a, i) => {
-      toPrint[`testAccount${i}`] = a.address;
+    deployedAccountManagers.forEach((a, i) => {
+      toPrint[`testAccount${i}`] = a.getAddress();
     });
     log(JSON.stringify(toPrint, null, 2));
   }

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { type EthAddress, Fr } from '@aztec/aztec.js';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { SecretValue } from '@aztec/foundation/config';
@@ -22,12 +22,13 @@ export async function deployL1Contracts(
   createVerificationJson: string | false,
   initialValidators: EthAddress[],
   realVerifier: boolean,
+  flushEntryQueue: boolean,
   log: LogFn,
   debugLogger: Logger,
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
   const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
@@ -52,6 +53,7 @@ export async function deployL1Contracts(
     config,
     realVerifier,
     createVerificationJson,
+    flushEntryQueue,
     debugLogger,
   );
 

package/src/cmds/l1/deploy_new_rollup.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { type Operator, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -25,7 +25,7 @@ export async function deployNewRollup(
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
   const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);

package/src/cmds/l1/index.ts

@@ -48,6 +48,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract')
     .option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false)
     .option('--real-verifier', 'Deploy the real verifier', false)
+    .option('--flush-entry-queue', 'Whether to flush the entry queue after adding initial validators', false)
     .option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false)
     .action(async options => {
       const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
@@ -68,6 +69,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.createVerificationJson,
         initialValidators,
         options.realVerifier,
+        options.flushEntryQueue,
         log,
         debugLogger,
       );

package/src/cmds/l1/update_l1_validators.ts

@@ -308,7 +308,7 @@ export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }: Roll
   log(`Committee: ${committee?.map(v => v.toString()).join(', ')}`);
   const archive = await rollup.archive();
   log(`Archive: ${archive}`);
-  const epochNum = await rollup.getEpochNumber();
+  const epochNum = await rollup.getCurrentEpochNumber();
   log(`Current epoch: ${epochNum}`);
   const slot = await rollup.getSlotNumber();
   log(`Current slot: ${slot}`);

package/src/config/chain_l2_config.ts

@@ -34,6 +34,40 @@ export type L2ChainConfig = L1ContractsConfig &
     sentinelEnabled: boolean;
   };
 
+const DefaultSlashConfig = {
+  /** Tally-style slashing */
+  slasherFlavor: 'tally',
+  /** Allow one round for vetoing */
+  slashingExecutionDelayInRounds: 1,
+  /** How long for a slash payload to be executed */
+  slashingLifetimeInRounds: 5,
+  /** Allow 2 rounds to discover faults */
+  slashingOffsetInRounds: 2,
+  /** No slash vetoer */
+  slashingVetoer: EthAddress.ZERO,
+  /** Use default slash amounts */
+  slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
+  slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
+  slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
+
+  // Slashing stuff
+  slashMinPenaltyPercentage: 0.5,
+  slashMaxPenaltyPercentage: 2.0,
+  slashInactivityTargetPercentage: 0.7,
+  slashInactivityConsecutiveEpochThreshold: 1,
+  slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+  slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
+  slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
+  slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
+  slashMaxPayloadSize: 50,
+  slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
+  slashOffenseExpirationRounds: 8,
+  sentinelEnabled: true,
+} satisfies Partial<L2ChainConfig>;
+
 export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   l1ChainId: 11155111,
   testAccounts: true,
@@ -55,6 +89,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   publicMetricsCollectFrom: ['sequencer'],
 
   ...DefaultL1ContractsConfig,
+  ...DefaultSlashConfig,
 
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: 12,
@@ -70,26 +105,6 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   manaTarget: 0n,
   /** The proving cost per mana */
   provingCostPerMana: 0n,
-
-  slasherFlavor: 'none',
-  slashAmountSmall: 0n,
-  slashAmountMedium: 0n,
-  slashAmountLarge: 0n,
-  slashMinPenaltyPercentage: 0.5,
-  slashMaxPenaltyPercentage: 200,
-  slashInactivityTargetPercentage: 0,
-  slashInactivityConsecutiveEpochThreshold: 1,
-  slashInactivityPenalty: 0n,
-  slashPrunePenalty: 0n,
-  slashDataWithholdingPenalty: 0n,
-  slashProposeInvalidAttestationsPenalty: 0n,
-  slashAttestDescendantOfInvalidPenalty: 0n,
-  slashBroadcastedInvalidBlockPenalty: 0n,
-  slashMaxPayloadSize: 50,
-  slashGracePeriodL2Slots: 0,
-  slashUnknownPenalty: 0n,
-  slashOffenseExpirationRounds: 10,
-  sentinelEnabled: false,
 };
 
 export const stagingPublicL2ChainConfig: L2ChainConfig = {
@@ -121,6 +136,10 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   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 */
@@ -137,37 +156,8 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
   /** Exit delay for stakers */
   exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
-  /** Tally-style slashing */
-  slasherFlavor: 'tally',
-  /** Allow one round for vetoing */
-  slashingExecutionDelayInRounds: 1,
-  /** How long for a slash payload to be executed */
-  slashingLifetimeInRounds: 5,
-  /** Allow 2 rounds to discover faults */
-  slashingOffsetInRounds: 2,
-  /** No slash vetoer */
-  slashingVetoer: EthAddress.ZERO,
-  /** Use default slash amounts */
-  slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
-  slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
-  slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
 
-  // Slashing stuff
-  slashMinPenaltyPercentage: 0.5,
-  slashMaxPenaltyPercentage: 2.0,
-  slashInactivityTargetPercentage: 0.7,
-  slashInactivityConsecutiveEpochThreshold: 1,
-  slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-  slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-  slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
-  slashMaxPayloadSize: 50,
-  slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
-  slashOffenseExpirationRounds: 8,
-  sentinelEnabled: true,
+  ...DefaultSlashConfig,
 };
 
 export const testnetL2ChainConfig: L2ChainConfig = {
@@ -199,12 +189,16 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   aztecEpochDuration: 32,
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 48,
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: 2,
   /** 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 local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
   /** The slashing round size */
   slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
   /** Governance proposing round size */
@@ -215,37 +209,8 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
   /** Exit delay for stakers */
   exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
-  /** Tally-style slashing */
-  slasherFlavor: 'tally',
-  /** Allow one round for vetoing */
-  slashingExecutionDelayInRounds: 1,
-  /** How long for a slash payload to be executed */
-  slashingLifetimeInRounds: 5,
-  /** Allow 2 rounds to discover faults */
-  slashingOffsetInRounds: 2,
-  /** No slash vetoer */
-  slashingVetoer: EthAddress.ZERO,
-  /** Use default slash amounts */
-  slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
-  slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
-  slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
 
-  // Slashing stuff
-  slashMinPenaltyPercentage: 0.5,
-  slashMaxPenaltyPercentage: 2.0,
-  slashInactivityTargetPercentage: 0.7,
-  slashInactivityConsecutiveEpochThreshold: 1,
-  slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-  slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
-  slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
-  slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
-  slashMaxPayloadSize: 50,
-  slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
-  slashOffenseExpirationRounds: 8,
-  sentinelEnabled: true,
+  ...DefaultSlashConfig,
 };
 
 const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
@@ -385,6 +350,7 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
   enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
   enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
+  enrichVar('AZTEC_LOCAL_EJECTION_THRESHOLD', config.localEjectionThreshold.toString());
   enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum?.toString());
   enrichVar('AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS', config.slashingRoundSizeInEpochs.toString());
   enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum?.toString());

package/src/utils/aztec.ts

@@ -59,6 +59,7 @@ export async function deployAztecContracts(
   config: L1ContractsConfig,
   realVerifier: boolean,
   createVerificationJson: string | false,
+  flushEntryQueue: boolean,
   debugLogger: Logger,
 ): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
@@ -89,6 +90,7 @@ export async function deployAztecContracts(
     },
     config,
     createVerificationJson,
+    flushEntryQueue,
   );
 
   return result;

package/src/utils/setup_contracts.ts

@@ -1,16 +1,5 @@
-import {
-  AztecAddress,
-  DefaultWaitOpts,
-  Fr,
-  type PXE,
-  SignerlessWallet,
-  SponsoredFeePaymentMethod,
-  type WaitForProvenOpts,
-  getContractInstanceFromInstantiationParams,
-  waitForProven,
-} from '@aztec/aztec.js';
+import { Fr, type PXE, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
-import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import type { LogFn } from '@aztec/foundation/log';
 
 async function getSponsoredFPCContract() {
@@ -28,31 +17,12 @@ export async function getSponsoredFPCAddress() {
   return sponsoredFPCInstance.address;
 }
 
-export async function setupSponsoredFPC(
-  pxe: PXE,
-  log: LogFn,
-  waitOpts = DefaultWaitOpts,
-  waitForProvenOptions?: WaitForProvenOpts,
-) {
+export async function setupSponsoredFPC(pxe: PXE, log: LogFn) {
   const SponsoredFPCContract = await getSponsoredFPCContract();
-  const address = await getSponsoredFPCAddress();
-  const paymentMethod = new SponsoredFeePaymentMethod(address);
-  const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
-
-  const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
-
-  const deployTx = SponsoredFPCContract.deploy(deployer).send({
-    from: AztecAddress.ZERO,
-    contractAddressSalt: new Fr(SPONSORED_FPC_SALT),
-    universalDeploy: true,
-    fee: { paymentMethod },
+  const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+    salt: new Fr(SPONSORED_FPC_SALT),
   });
+  await pxe.registerContract({ instance: sponsoredFPCInstance, artifact: SponsoredFPCContract.artifact });
 
-  const deployed = await deployTx.deployed(waitOpts);
-
-  if (waitForProvenOptions !== undefined) {
-    await waitForProven(pxe, await deployTx.getReceipt(), waitForProvenOptions);
-  }
-
-  log(`SponsoredFPC: ${deployed.address}`);
+  log(`SponsoredFPC: ${sponsoredFPCInstance.address}`);
 }