@aztec/cli 3.0.0-nightly.20250908 → 3.0.0-nightly.20250911

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.js

@@ -1,4 +1,4 @@
-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';
@@ -7,7 +7,7 @@ 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) {
     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/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;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAajD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAW3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAkhB/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,WAghB/E"}

package/dest/cmds/l1/index.js

@@ -1,11 +1,12 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { withoutHexPrefix } from '@aztec/foundation/string';
 import { Option } from 'commander';
+import { getL1RollupAddressFromEnv } from '../../config/get_l1_config.js';
 import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
 export { addL1Validator } from './update_l1_validators.js';
 const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)').env('ETHEREUM_HOSTS').default([
     ETHEREUM_HOSTS
 ]).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)=>{
         const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
@@ -95,18 +96,19 @@ export function injectCommands(program, log, debugLogger) {
         const account = generateL1Account();
         log(JSON.stringify(account, null, 2));
     });
-    program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--bls-secret-key <string>', 'The BN254 scalar field element used as a secret key for BLS signatures. Will be associated with the attester address.', parseBigint).option('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress).option('--proof <buffer>', 'The proof to use for the attestation', (arg)=>Buffer.from(withoutHexPrefix(arg), 'hex')).option('--merkle-proof <string>', 'The merkle proof to use for the attestation (comma separated list of 32 byte buffers)', (arg)=>arg.split(',')).action(async (options)=>{
-        const { addL1Validator } = await import('./update_l1_validators.js');
-        await addL1Validator({
+    program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract via a direct deposit.').addOption(l1RpcUrlsOption).addOption(networkOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--withdrawer <address>', 'ethereum address of the withdrawer', parseEthereumAddress).option('--bls-secret-key <string>', 'The BN254 scalar field element used as a secret key for BLS signatures. Will be associated with the attester address.', parseBigint).option('--move-with-latest-rollup', 'Whether to move with the latest rollup', true).option('--rollup <string>', 'Rollup contract address', parseEthereumAddress).action(async (options)=>{
+        const { addL1ValidatorViaRollup } = await import('./update_l1_validators.js');
+        const rollupAddress = options.rollup ?? await getL1RollupAddressFromEnv(options.l1RpcUrls, options.l1ChainId);
+        await addL1ValidatorViaRollup({
             rpcUrls: options.l1RpcUrls,
             chainId: options.l1ChainId,
             privateKey: options.privateKey,
             mnemonic: options.mnemonic,
             attesterAddress: options.attester,
-            stakingAssetHandlerAddress: options.stakingAssetHandler,
-            merkleProof: options.merkleProof,
-            proofParams: options.proof,
             blsSecretKey: options.blsSecretKey,
+            withdrawerAddress: options.withdrawer,
+            rollupAddress,
+            moveWithLatestRollup: options.moveWithLatestRollup,
             log,
             debugLogger
         });

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

@@ -29,6 +29,11 @@ export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic,
     proofParams: Buffer;
     merkleProof: string[];
 }): Promise<void>;
+export declare function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
+    blsSecretKey: bigint;
+    attesterAddress: EthAddress;
+    moveWithLatestRollup: boolean;
+}): Promise<void>;
 export declare function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
     validatorAddress: EthAddress;
 }): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,EAAE,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,WAAW,EACX,YAAY,EACZ,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,iBA4DF;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBAwBzG"}
+{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,EAAE,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,WAAW,EACX,YAAY,EACZ,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,iBA4DF;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAClB,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,iBAuDF;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBAwBzG"}

package/dest/cmds/l1/update_l1_validators.js

@@ -71,6 +71,58 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
         }
     }
 }
+export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger }) {
+    const dualLog = makeDualLog(log, debugLogger);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()} via direct deposit`);
+    if (!withdrawerAddress) {
+        throw new Error(`Withdrawer address required`);
+    }
+    const rollup = getContract({
+        address: rollupAddress.toString(),
+        abi: RollupAbi,
+        client: l1Client
+    });
+    const gseAddress = await rollup.read.getGSE();
+    const gse = new GSEContract(l1Client, gseAddress);
+    const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, debugLogger);
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'deposit',
+            args: [
+                attesterAddress.toString(),
+                withdrawerAddress.toString(),
+                registrationTuple.publicKeyInG1,
+                registrationTuple.publicKeyInG2,
+                registrationTuple.proofOfPossession,
+                moveWithLatestRollup
+            ]
+        }),
+        abi: StakingAssetHandlerAbi
+    });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
+    await l1Client.waitForTransactionReceipt({
+        hash: receipt.transactionHash
+    });
+    if (isAnvilTestChain(chainId)) {
+        dualLog(`Funding validator on L1`);
+        const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
+        await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
+    } else {
+        const balance = await l1Client.getBalance({
+            address: attesterAddress.toString()
+        });
+        dualLog(`Validator balance: ${formatEther(balance)} ETH`);
+        if (balance === 0n) {
+            dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
+        }
+    }
+}
 export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
     const account = getAccount(privateKey, mnemonic);

package/dest/config/chain_l2_config.d.ts

@@ -0,0 +1,32 @@
+import { type L1ContractsConfig } from '@aztec/ethereum';
+import type { NetworkNames } from '@aztec/foundation/config';
+import type { SharedNodeConfig } from '@aztec/node-lib/config';
+import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+export type L2ChainConfig = L1ContractsConfig & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
+    l1ChainId: number;
+    testAccounts: boolean;
+    sponsoredFPC: boolean;
+    p2pEnabled: boolean;
+    p2pBootstrapNodes: string[];
+    registryAddress: string;
+    slashFactoryAddress: string;
+    feeAssetHandlerAddress: string;
+    seqMinTxsPerBlock: number;
+    seqMaxTxsPerBlock: number;
+    realProofs: boolean;
+    snapshotsUrl: string;
+    autoUpdate: SharedNodeConfig['autoUpdate'];
+    autoUpdateUrl?: string;
+    maxTxPoolSize: number;
+    publicIncludeMetrics?: string[];
+    publicMetricsCollectorUrl?: string;
+    publicMetricsCollectFrom?: string[];
+    sentinelEnabled: boolean;
+};
+export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
+export declare const stagingPublicL2ChainConfig: L2ChainConfig;
+export declare const testnetL2ChainConfig: L2ChainConfig;
+export declare function getBootnodes(networkName: NetworkNames, cacheDir?: string): Promise<any>;
+export declare function getL2ChainConfig(networkName: NetworkNames, cacheDir?: string): Promise<L2ChainConfig | undefined>;
+export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): Promise<void>;
+//# sourceMappingURL=chain_l2_config.d.ts.map

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

@@ -0,0 +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;AAoCJ,eAAO,MAAM,4BAA4B,EAAE,aAqC1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAiDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAiDlC,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"}