@aztec-labs/cli 6.0.0-rc.1 → 6.0.0-rc.2

package/dest/config/generated/networks.d.ts

@@ -55,6 +55,8 @@ export declare const devnetConfig: {
     readonly SPONSORED_FPC: true;
     readonly TRANSACTIONS_DISABLED: false;
     readonly SEQ_MAX_TX_PER_BLOCK: 18;
+    readonly SEQ_MAX_TX_PER_CHECKPOINT: 36;
+    readonly VALIDATOR_MAX_TX_PER_CHECKPOINT: 72;
     readonly PROVER_REAL_PROOFS: false;
     readonly PXE_PROVER_ENABLED: false;
     readonly SYNC_SNAPSHOTS_URLS: "";
@@ -110,6 +112,8 @@ export declare const testnetConfig: {
     readonly SEQ_BLOCK_DURATION_MS: 6000;
     readonly MAX_BLOCKS_PER_CHECKPOINT: 10;
     readonly CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12;
+    readonly SEQ_MAX_TX_PER_CHECKPOINT: 72;
+    readonly VALIDATOR_MAX_TX_PER_CHECKPOINT: 144;
     readonly DATA_STORE_MAP_SIZE_KB: 134217728;
     readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
     readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -136,7 +140,6 @@ export declare const testnetConfig: {
     readonly TEST_ACCOUNTS: false;
     readonly SPONSORED_FPC: false;
     readonly TRANSACTIONS_DISABLED: false;
-    readonly SEQ_MAX_TX_PER_CHECKPOINT: 72;
     readonly PROVER_REAL_PROOFS: true;
     readonly P2P_MAX_PENDING_TX_COUNT: 1000;
     readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true;
@@ -177,6 +180,8 @@ export declare const mainnetConfig: {
     readonly SEQ_BLOCK_DURATION_MS: 6000;
     readonly MAX_BLOCKS_PER_CHECKPOINT: 10;
     readonly CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12;
+    readonly SEQ_MAX_TX_PER_CHECKPOINT: 72;
+    readonly VALIDATOR_MAX_TX_PER_CHECKPOINT: 144;
     readonly DATA_STORE_MAP_SIZE_KB: 134217728;
     readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
     readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -211,7 +216,6 @@ export declare const mainnetConfig: {
     readonly TEST_ACCOUNTS: false;
     readonly SPONSORED_FPC: false;
     readonly TRANSACTIONS_DISABLED: false;
-    readonly SEQ_MAX_TX_PER_CHECKPOINT: 72;
     readonly PROVER_REAL_PROOFS: true;
     readonly BLOB_ALLOW_EMPTY_SOURCES: true;
     readonly P2P_MAX_PENDING_TX_COUNT: 1000;
@@ -233,4 +237,4 @@ export declare const mainnetConfig: {
     readonly SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2e+21;
     readonly SLASH_GRACE_PERIOD_L2_SLOTS: 8400;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FpRmYsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTBFaEIsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTZFaEIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQW1GZixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTJFaEIsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0E4RWhCLENBQUMifQ==

package/dest/config/generated/networks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0EhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6EhB,CAAC"}
+{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmFf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2EhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EhB,CAAC"}

package/dest/config/generated/networks.js

@@ -57,6 +57,8 @@ export const devnetConfig = {
     SPONSORED_FPC: true,
     TRANSACTIONS_DISABLED: false,
     SEQ_MAX_TX_PER_BLOCK: 18,
+    SEQ_MAX_TX_PER_CHECKPOINT: 36,
+    VALIDATOR_MAX_TX_PER_CHECKPOINT: 72,
     PROVER_REAL_PROOFS: false,
     PXE_PROVER_ENABLED: false,
     SYNC_SNAPSHOTS_URLS: '',
@@ -112,6 +114,8 @@ export const testnetConfig = {
     SEQ_BLOCK_DURATION_MS: 6000,
     MAX_BLOCKS_PER_CHECKPOINT: 10,
     CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
+    SEQ_MAX_TX_PER_CHECKPOINT: 72,
+    VALIDATOR_MAX_TX_PER_CHECKPOINT: 144,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -138,7 +142,6 @@ export const testnetConfig = {
     TEST_ACCOUNTS: false,
     SPONSORED_FPC: false,
     TRANSACTIONS_DISABLED: false,
-    SEQ_MAX_TX_PER_CHECKPOINT: 72,
     PROVER_REAL_PROOFS: true,
     P2P_MAX_PENDING_TX_COUNT: 1000,
     P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
@@ -179,6 +182,8 @@ export const mainnetConfig = {
     SEQ_BLOCK_DURATION_MS: 6000,
     MAX_BLOCKS_PER_CHECKPOINT: 10,
     CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
+    SEQ_MAX_TX_PER_CHECKPOINT: 72,
+    VALIDATOR_MAX_TX_PER_CHECKPOINT: 144,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -213,7 +218,6 @@ export const mainnetConfig = {
     TEST_ACCOUNTS: false,
     SPONSORED_FPC: false,
     TRANSACTIONS_DISABLED: false,
-    SEQ_MAX_TX_PER_CHECKPOINT: 72,
     PROVER_REAL_PROOFS: true,
     BLOB_ALLOW_EMPTY_SOURCES: true,
     P2P_MAX_PENDING_TX_COUNT: 1000,

package/dest/config/index.d.ts

@@ -1,5 +1,6 @@
 export * from './cached_fetch.js';
 export * from './chain_l2_config.js';
+export * from './generated/networks.js';
 export * from './get_l1_config.js';
 export * from './network_config.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyxxQkFBcUIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQztBQUNsQyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLHFCQUFxQixDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC"}

package/dest/config/index.js

@@ -1,4 +1,5 @@
 export * from './cached_fetch.js';
 export * from './chain_l2_config.js';
+export * from './generated/networks.js';
 export * from './get_l1_config.js';
 export * from './network_config.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec-labs/cli",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.2",
   "type": "module",
   "exports": {
     "./devnet": "./dest/cmds/devnet/index.js",
@@ -76,19 +76,19 @@
     ]
   },
   "dependencies": {
-    "@aztec-foundation/l1-artifacts": "6.0.0-rc.1",
-    "@aztec-labs/accounts": "6.0.0-rc.1",
-    "@aztec-labs/archiver": "6.0.0-rc.1",
-    "@aztec-labs/aztec.js": "6.0.0-rc.1",
-    "@aztec-labs/constants": "6.0.0-rc.1",
-    "@aztec-labs/ethereum": "6.0.0-rc.1",
-    "@aztec-labs/foundation": "6.0.0-rc.1",
-    "@aztec-labs/node-keystore": "6.0.0-rc.1",
-    "@aztec-labs/p2p": "6.0.0-rc.1",
-    "@aztec-labs/protocol-contracts": "6.0.0-rc.1",
-    "@aztec-labs/stdlib": "6.0.0-rc.1",
-    "@aztec-labs/wallets": "6.0.0-rc.1",
-    "@aztec-labs/world-state": "6.0.0-rc.1",
+    "@aztec-foundation/l1-artifacts": "6.0.0-rc.5",
+    "@aztec-labs/accounts": "6.0.0-rc.2",
+    "@aztec-labs/archiver": "6.0.0-rc.2",
+    "@aztec-labs/aztec.js": "6.0.0-rc.2",
+    "@aztec-labs/constants": "6.0.0-rc.2",
+    "@aztec-labs/ethereum": "6.0.0-rc.2",
+    "@aztec-labs/foundation": "6.0.0-rc.2",
+    "@aztec-labs/node-keystore": "6.0.0-rc.2",
+    "@aztec-labs/p2p": "6.0.0-rc.2",
+    "@aztec-labs/protocol-contracts": "6.0.0-rc.2",
+    "@aztec-labs/stdlib": "6.0.0-rc.2",
+    "@aztec-labs/wallets": "6.0.0-rc.2",
+    "@aztec-labs/world-state": "6.0.0-rc.2",
     "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
@@ -118,15 +118,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec-foundation/l1-artifacts": "6.0.0-rc.1",
-    "@aztec-labs/accounts": "6.0.0-rc.1",
-    "@aztec-labs/bb-prover": "6.0.0-rc.1",
-    "@aztec-labs/ethereum": "6.0.0-rc.1",
-    "@aztec-labs/noir-contracts.js": "6.0.0-rc.1",
-    "@aztec-labs/noir-protocol-circuits-types": "6.0.0-rc.1",
-    "@aztec-labs/noir-test-contracts.js": "6.0.0-rc.1",
-    "@aztec-labs/protocol-contracts": "6.0.0-rc.1",
-    "@aztec-labs/stdlib": "6.0.0-rc.1"
+    "@aztec-foundation/l1-artifacts": "6.0.0-rc.5",
+    "@aztec-labs/accounts": "6.0.0-rc.2",
+    "@aztec-labs/bb-prover": "6.0.0-rc.2",
+    "@aztec-labs/ethereum": "6.0.0-rc.2",
+    "@aztec-labs/noir-contracts.js": "6.0.0-rc.2",
+    "@aztec-labs/noir-protocol-circuits-types": "6.0.0-rc.2",
+    "@aztec-labs/noir-test-contracts.js": "6.0.0-rc.2",
+    "@aztec-labs/protocol-contracts": "6.0.0-rc.2",
+    "@aztec-labs/stdlib": "6.0.0-rc.2"
   },
   "files": [
     "dest",

package/src/cmds/l1/index.ts

@@ -11,6 +11,7 @@ import {
   nodeOption,
   parseBigint,
   parseEthereumAddress,
+  parseOptionalInteger,
 } from '../../utils/commands.js';
 
 const l1RpcUrlsOption = new Option(
@@ -312,6 +313,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       parseBigint,
     )
     .option('--move-with-latest-rollup', 'Whether to move with the latest rollup', true)
+    .option('--no-move-with-latest-rollup', 'Keep the stake on this rollup after an upgrade')
     .option('--rollup <string>', 'Rollup contract address', parseEthereumAddress)
     .action(async options => {
       const { addL1ValidatorViaRollup } = await import('./update_l1_validators.js');
@@ -337,13 +339,14 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       });
     });
 
-  program
-    .command('initiate-withdraw-by-attester')
-    .description("Initiates a withdrawal signed by the position's attester.")
+  addSignerOptions(
+    program
+      .command('initiate-withdraw-by-attester')
+      .description("Initiates a withdrawal signed by the position's attester."),
+    'attester',
+  )
     .addOption(l1RpcUrlsOption)
     .addOption(l1ChainIdOption)
-    .option('-pk, --private-key <string>', 'The attester private key', PRIVATE_KEY)
-    .option('-m, --mnemonic <string>', 'Mnemonic for the attester account', MNEMONIC)
     .requiredOption('--attester <address>', 'Attester address of the position to exit', parseEthereumAddress)
     .requiredOption('--rollup <address>', 'Rollup holding the position', parseEthereumAddress)
     .action(async options => {
@@ -353,6 +356,8 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         chainId: options.l1ChainId,
         privateKey: options.privateKey,
         mnemonic: options.mnemonic,
+        accountIndex: options.accountIndex,
+        addressIndex: options.addressIndex,
         attesterAddress: options.attester,
         rollupAddress: options.rollup,
         log,
@@ -360,19 +365,98 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       });
     });
 
-  program
-    .command('initiate-withdraw-by-attester-batch')
-    .description('Relays a JSON array of attester-signed withdrawal authorizations.')
+  addSignerOptions(
+    program
+      .command('sign-attester-exit')
+      .description('Signs an exit authorization locally and writes a JSON array for batch submission.'),
+    'attester',
+  )
+    .addOption(
+      new Option(
+        '--l1-rpc-urls <string>',
+        'Ethereum host URLs (comma separated); when given, the chain ID they report must match, and they supply it or the rollup when those are not given',
+      )
+        .env('ETHEREUM_HOSTS')
+        .argParser((arg: string) => arg.split(',').map(url => url.trim())),
+    )
+    .addOption(
+      new Option(
+        '-c, --l1-chain-id <number>',
+        'Chain ID to sign for; required unless --network or --l1-rpc-urls supplies it, and a value from L1_CHAIN_ID alone must be confirmed by one of them',
+      )
+        .env('L1_CHAIN_ID')
+        .argParser(Number),
+    )
+    .addOption(networkOption)
+    .requiredOption('--attester <address>', 'Attester address of the position to exit', parseEthereumAddress)
+    .option(
+      '--rollup <address>',
+      'Rollup holding the position; defaults to the canonical rollup of --network',
+      parseEthereumAddress,
+    )
+    .requiredOption('--deadline <timestamp>', 'Authorization expiry as Unix seconds', parseBigint)
+    .requiredOption('--output <path>', 'JSON output file (must be new unless --append is used)')
+    .option(
+      '--append',
+      'Append or create if missing, without validating existing authorizations; run initiate-withdraw-by-attester-batch --dry-run after the batch is complete',
+    )
+    .addHelpText(
+      'after',
+      `
+Examples:
+  aztec sign-attester-exit --private-key "$ATTESTER_KEY_0" --attester "$ATTESTER_0" --rollup "$ROLLUP" --l1-chain-id "$CHAIN_ID" --deadline "$DEADLINE" --output exits.json --append
+  aztec sign-attester-exit --private-key "$ATTESTER_KEY_1" --attester "$ATTESTER_1" --rollup "$ROLLUP" --l1-chain-id "$CHAIN_ID" --deadline "$DEADLINE" --output exits.json --append
+  aztec sign-attester-exit --mnemonic "$VALIDATOR_MNEMONIC" --account-index 0 --address-index 2 --attester "$ATTESTER_2" --rollup "$ROLLUP" --l1-chain-id "$CHAIN_ID" --deadline "$DEADLINE" --output exits.json --append
+  aztec sign-attester-exit --network testnet --l1-rpc-urls "$L1_RPC_URL" --private-key "$ATTESTER_KEY_3" --attester "$ATTESTER_3" --deadline "$DEADLINE" --output exits.json --append
+  aztec initiate-withdraw-by-attester-batch --dry-run --authorizations exits.json --rollup "$ROLLUP" --l1-chain-id "$CHAIN_ID" --l1-rpc-urls "$L1_RPC_URL"
+  aztec initiate-withdraw-by-attester-batch --authorizations exits.json --rollup "$ROLLUP" --l1-chain-id "$CHAIN_ID" --l1-rpc-urls "$L1_RPC_URL" --private-key "$RELAYER_PRIVATE_KEY"
+Note: DEADLINE is a future Unix timestamp in seconds. Run append commands sequentially.
+`,
+    )
+
+    .action(async (options, command: Command) => {
+      const { getAttesterExitNetwork, resolveAttesterExitTarget, signAttesterExit } = await import(
+        './update_l1_validators.js'
+      );
+      const { chainId, rollupAddress } = await resolveAttesterExitTarget({
+        chainId: options.l1ChainId,
+        chainIdFromEnv: command.getOptionValueSource('l1ChainId') === 'env',
+        rpcUrls: options.l1RpcUrls,
+        network: options.network ? await getAttesterExitNetwork(options.network) : undefined,
+        rollupAddress: options.rollup,
+        log,
+      });
+      await signAttesterExit({
+        rpcUrls: options.l1RpcUrls ?? [],
+        chainId,
+        privateKey: options.privateKey,
+        mnemonic: options.mnemonic,
+        accountIndex: options.accountIndex,
+        addressIndex: options.addressIndex,
+        attesterAddress: options.attester,
+        rollupAddress,
+        deadline: options.deadline,
+        output: options.output,
+        append: options.append,
+        log,
+      });
+    });
+
+  addSignerOptions(
+    program
+      .command('initiate-withdraw-by-attester-batch')
+      .description('Relays a JSON array of attester-signed withdrawal authorizations.'),
+    'relayer',
+  )
     .addOption(l1RpcUrlsOption)
     .addOption(l1ChainIdOption)
-    .option('-pk, --private-key <string>', 'The relayer private key', PRIVATE_KEY)
-    .option('-m, --mnemonic <string>', 'Mnemonic for the relayer account', MNEMONIC)
     .requiredOption('--authorizations <path>', 'JSON file containing attester, decimal deadline, and signature fields')
     .requiredOption('--rollup <address>', 'Rollup holding the positions', parseEthereumAddress)
     .option(
       '--up-to-limit',
       'Process the largest permitted prefix instead of reverting when the whole batch is too large',
     )
+    .option('--dry-run', 'Simulate against current chain state without sending; no relayer key is required')
     .action(async options => {
       const { initiateWithdrawByAttesterBatch, readAttesterExitAuthorizations } = await import(
         './update_l1_validators.js'
@@ -382,8 +466,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         chainId: options.l1ChainId,
         privateKey: options.privateKey,
         mnemonic: options.mnemonic,
+        accountIndex: options.accountIndex,
+        addressIndex: options.addressIndex,
         authorizations: await readAttesterExitAuthorizations(options.authorizations),
         upToLimit: options.upToLimit,
+        dryRun: options.dryRun,
         rollupAddress: options.rollup,
         log,
         debugLogger,
@@ -550,3 +637,42 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
 
   return program;
 }
+
+function addSignerOptions(command: Command, role: 'attester' | 'relayer'): Command {
+  return command
+    .addOption(
+      new Option('-pk, --private-key <string>', `The ${role} private key; supply this or --mnemonic`).env(
+        'PRIVATE_KEY',
+      ),
+    )
+    .addOption(
+      new Option(
+        '-m, --mnemonic <string>',
+        `Mnemonic for the ${role} account; a flag overrides the other credential from the environment, and PRIVATE_KEY wins when both come from the environment`,
+      ).env('MNEMONIC'),
+    )
+    .option(
+      '--account-index <number>',
+      'Mnemonic account index, matching validator-keys generation (default: 0; requires --mnemonic)',
+      value => parseOptionalInteger(value, 0),
+    )
+    .option(
+      '--address-index <number>',
+      role === 'attester'
+        ? 'Mnemonic address index: validator-keys base address index + zero-based validator position; third validator = base + 2 (default: 0; requires --mnemonic)'
+        : 'Mnemonic address index for the relayer paying for the transaction; attesters sign authorizations separately (default: 0; requires --mnemonic)',
+      value => parseOptionalInteger(value, 0),
+    )
+    .hook('preAction', (_, actionCommand) => {
+      const { privateKey, mnemonic } = actionCommand.opts();
+      if (!privateKey || !mnemonic) {
+        return;
+      }
+      // Only two credentials passed as flags are a conflict; otherwise drop the one that came from the environment.
+      if (actionCommand.getOptionValueSource('mnemonic') === 'env') {
+        actionCommand.setOptionValue('mnemonic', undefined);
+      } else if (actionCommand.getOptionValueSource('privateKey') === 'env') {
+        actionCommand.setOptionValue('privateKey', undefined);
+      }
+    });
+}

package/src/cmds/l1/l1_rpc_test_utils.ts

@@ -0,0 +1,43 @@
+import type { EthAddress } from '@aztec-labs/foundation/eth-address';
+import { createServer } from 'node:http';
+import { encodeAbiParameters } from 'viem';
+
+/**
+ * Starts a JSON-RPC server that reports `chainId` and, when `canonicalRollup` is given, answers every `eth_call` with
+ * that address and records the call. Any other method gets an error.
+ */
+export async function serveL1Rpc(chainId: number, canonicalRollup?: EthAddress) {
+  const registryCalls: { to: string; data: string }[] = [];
+  const server = createServer((request, response) => {
+    let body = '';
+    request.on('data', chunk => (body += chunk));
+    request.on('end', () => {
+      const { id, method, params } = JSON.parse(body);
+      response.setHeader('content-type', 'application/json');
+      if (method === 'eth_chainId') {
+        response.end(JSON.stringify({ jsonrpc: '2.0', id, result: `0x${chainId.toString(16)}` }));
+      } else if (method === 'eth_call' && canonicalRollup) {
+        registryCalls.push({ to: params[0].to, data: params[0].data });
+        response.end(
+          JSON.stringify({
+            jsonrpc: '2.0',
+            id,
+            result: encodeAbiParameters([{ type: 'address' }], [canonicalRollup.toString() as `0x${string}`]),
+          }),
+        );
+      } else {
+        response.end(JSON.stringify({ jsonrpc: '2.0', id, error: { code: -32601, message: 'Unsupported method' } }));
+      }
+    });
+  });
+  await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));
+  const address = server.address();
+  if (!address || typeof address === 'string') {
+    throw new Error('Expected a TCP server address');
+  }
+  return {
+    url: `http://127.0.0.1:${address.port}`,
+    registryCalls,
+    close: () => new Promise(resolve => server.close(resolve)),
+  };
+}