@aztec/cli 0.0.1-commit.2f68f620 → 0.0.1-commit.321f6a9

package/src/cmds/validator_keys/new.ts

@@ -9,12 +9,14 @@ import { wordlist } from '@scure/bip39/wordlists/english.js';
 import { readFile, writeFile } from 'fs/promises';
 import { basename, dirname, join } from 'path';
 import { createPublicClient, fallback, http } from 'viem';
-import { generateMnemonic, mnemonicToAccount } from 'viem/accounts';
+import { generateMnemonic, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
 import {
   buildValidatorEntries,
+  encryptFundingAccountToFile,
   logValidatorSummaries,
   maybePrintJson,
+  resolveFundingAccount,
   resolveKeystoreOutputPath,
   writeBlsBn254ToFile,
   writeEthJsonV3ToFile,
@@ -23,6 +25,7 @@ import {
 import { processAttesterAccounts } from './staker.js';
 import {
   validateBlsPathOptions,
+  validateFundingAccountOptions,
   validatePublisherOptions,
   validateRemoteSignerOptions,
   validateStakerOutputOptions,
@@ -51,6 +54,7 @@ export type NewValidatorKeystoreOptions = {
   json?: boolean;
   feeRecipient: AztecAddress;
   coinbase?: EthAddress;
+  fundingAccount?: string;
   remoteSigner?: string;
   stakerOutput?: boolean;
   gseAddress?: EthAddress;
@@ -147,6 +151,8 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
   validatePublisherOptions(options);
   // validate remote signer options
   validateRemoteSignerOptions(options);
+  // validate funding account option
+  validateFundingAccountOptions(options);
 
   const {
     dataDir,
@@ -156,6 +162,7 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
     publishers,
     json,
     coinbase,
+    fundingAccount,
     accountIndex = 0,
     addressIndex = 0,
     feeRecipient,
@@ -213,17 +220,26 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
     remoteSigner,
   });
 
+  let resolvedFundingAccount = fundingAccount ? resolveFundingAccount(fundingAccount, remoteSigner) : undefined;
+
   // If password provided, write ETH JSON V3 and BLS BN254 keystores and replace plaintext
   if (shouldEncryptKeystores) {
     const encryptedKeystoreOutDir =
       encryptedKeystoreDir && encryptedKeystoreDir.length > 0 ? encryptedKeystoreDir : keystoreOutDir;
     await writeEthJsonV3ToFile(validators, { outDir: encryptedKeystoreOutDir, password: ethPassword });
     await writeBlsBn254ToFile(validators, { outDir: encryptedKeystoreOutDir, password: blsPassword });
+    if (resolvedFundingAccount) {
+      resolvedFundingAccount = await encryptFundingAccountToFile(resolvedFundingAccount, {
+        outDir: encryptedKeystoreOutDir,
+        password: ethPassword,
+      });
+    }
   }
 
   const keystore = {
     schemaVersion: 1,
     validators,
+    ...(resolvedFundingAccount ? { fundingAccount: resolvedFundingAccount } : {}),
   };
 
   await writeKeystoreFile(outputPath, keystore);
@@ -285,6 +301,11 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
   // print a concise summary of public keys (addresses and BLS pubkeys) if no --json options was selected
   if (!json) {
     logValidatorSummaries(log, summaries);
+    if (fundingAccount) {
+      const funderAddress =
+        fundingAccount.length === 66 ? privateKeyToAccount(fundingAccount as `0x${string}`).address : fundingAccount;
+      log(`funding account: ${funderAddress}`);
+    }
   }
 
   if (mnemonic && remoteSigner && !json) {

package/src/cmds/validator_keys/set_funding_account.ts

@@ -0,0 +1,55 @@
+import type { LogFn } from '@aztec/foundation/log';
+import { loadKeystoreFile } from '@aztec/node-keystore/loader';
+import type { KeyStore } from '@aztec/node-keystore/types';
+
+import { dirname } from 'path';
+import { privateKeyToAccount } from 'viem/accounts';
+
+import { encryptFundingAccountToFile, maybePrintJson, resolveFundingAccount, writeKeystoreFile } from './shared.js';
+import { validateFundingAccountOptions } from './utils.js';
+
+export type SetFundingAccountOptions = {
+  remoteSigner?: string;
+  password?: string;
+  encryptedKeystoreDir?: string;
+  json?: boolean;
+};
+
+/**
+ * Sets the top-level funding account of an existing keystore, replacing any previous one. The
+ * account may be a private key, or an address paired with a remote signer URL. With a password,
+ * a plaintext key is encrypted to an ETH JSON V3 file and stored as a { path, password } reference.
+ */
+export async function setFundingAccount(
+  existing: string,
+  fundingAccount: string,
+  options: SetFundingAccountOptions,
+  log: LogFn,
+) {
+  const { remoteSigner, password, encryptedKeystoreDir, json } = options;
+
+  const keystore: KeyStore = loadKeystoreFile(existing);
+
+  const validated = { fundingAccount, remoteSigner };
+  validateFundingAccountOptions(validated, !!keystore.remoteSigner);
+
+  let resolved = resolveFundingAccount(validated.fundingAccount!, remoteSigner);
+  if (password !== undefined) {
+    const outDir = encryptedKeystoreDir && encryptedKeystoreDir.length > 0 ? encryptedKeystoreDir : dirname(existing);
+    resolved = await encryptFundingAccountToFile(resolved, { outDir, password });
+  }
+
+  if (keystore.fundingAccount) {
+    log('Replacing existing funding account in keystore');
+  }
+  keystore.fundingAccount = resolved;
+
+  await writeKeystoreFile(existing, keystore);
+
+  if (!json) {
+    const value = validated.fundingAccount!;
+    const funderAddress = value.length === 66 ? privateKeyToAccount(value as `0x${string}`).address : value;
+    log(`Set funding account ${funderAddress} in ${existing}`);
+  }
+  maybePrintJson(log, !!json, keystore as unknown as Record<string, any>);
+}

package/src/cmds/validator_keys/shared.ts

@@ -3,7 +3,7 @@ import { asyncPool } from '@aztec/foundation/async-pool';
 import { deriveBlsPrivateKey } from '@aztec/foundation/crypto/bls';
 import { createBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
 import { computeBn254G1PublicKeyCompressed } from '@aztec/foundation/crypto/bn254';
-import type { EthAddress } from '@aztec/foundation/eth-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { EthAccount, EthPrivateKey, ValidatorKeyStore } from '@aztec/node-keystore/types';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -125,6 +125,21 @@ export function deriveEthAttester(
     : (('0x' + Buffer.from(acct.getHdKey().privateKey!).toString('hex')) as EthPrivateKey);
 }
 
+/**
+ * Resolve a `--funding-account` value into a keystore `EthAccount`. A 66-char value is a private key
+ * (used verbatim). A 42-char value is an address: with an explicit `remoteSigner` URL it becomes an
+ * `{ address, remoteSignerUrl }` pair; without one it is stored as a bare address that falls back to
+ * the keystore-level remote signer at runtime. Callers must validate the value first (see
+ * `validateFundingAccountOptions`).
+ */
+export function resolveFundingAccount(fundingAccount: string, remoteSigner?: string): EthAccount {
+  if (fundingAccount.length === 66) {
+    return fundingAccount as EthPrivateKey;
+  }
+  const address = EthAddress.fromString(fundingAccount);
+  return remoteSigner ? ({ address, remoteSignerUrl: remoteSigner } as EthAccount) : address;
+}
+
 export async function buildValidatorEntries(input: BuildValidatorsInput) {
   const {
     validatorCount,
@@ -330,6 +345,27 @@ export async function writeEthJsonV3Keystore(
   return outPath;
 }
 
+/**
+ * If `account` is a plaintext ETH private key, encrypt it to a JSON V3 file and return a
+ * { path, password } reference; otherwise return it unchanged.
+ */
+async function maybeEncryptEthAccount(account: any, label: string, options: { outDir: string; password: string }) {
+  if (typeof account === 'string' && account.startsWith('0x') && account.length === 66) {
+    const fileBase = `${label}_${account.slice(2, 10)}`;
+    const p = await writeEthJsonV3Keystore(options.outDir, fileBase, options.password, account);
+    return { path: p, password: options.password };
+  }
+  return account;
+}
+
+/** Encrypt a plaintext funding-account key to a JSON V3 file, replacing it with a { path, password } reference. */
+export async function encryptFundingAccountToFile(
+  account: EthAccount,
+  options: { outDir: string; password: string },
+): Promise<EthAccount> {
+  return (await maybeEncryptEthAccount(account, 'funding', options)) as EthAccount;
+}
+
 /** Replace plaintext ETH keys in validators with { path, password } pointing to JSON V3 files. */
 export async function writeEthJsonV3ToFile(
   validators: ValidatorKeyStore[],

package/src/cmds/validator_keys/utils.ts

@@ -1,4 +1,4 @@
-import type { EthAddress } from '@aztec/foundation/eth-address';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
 import type { EthPrivateKey } from '@aztec/node-keystore/types';
 
@@ -79,3 +79,46 @@ export function validatePublisherOptions(options: { publishers?: string[]; publi
     options.publishers = normalizedKeys as EthPrivateKey[];
   }
 }
+
+/**
+ * Validates and normalizes the `--funding-account` option in place. The value may be a private key
+ * (used as a local signer) or an ETH address. An address needs a remote signer to sign funding txs:
+ * either `--remote-signer`, or a keystore that already defines one (pass `hasKeystoreRemoteSigner`),
+ * which a bare address inherits at runtime.
+ */
+export function validateFundingAccountOptions(
+  options: { fundingAccount?: string; remoteSigner?: string },
+  hasKeystoreRemoteSigner = false,
+) {
+  if (!options.fundingAccount) {
+    return;
+  }
+
+  let value = options.fundingAccount.trim();
+  if (!value.startsWith('0x')) {
+    value = '0x' + value;
+  }
+
+  if (value.length === 66) {
+    try {
+      ethPrivateKeySchema.parse(value);
+    } catch (error) {
+      throw new Error(`Invalid funding account private key: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  } else if (value.length === 42) {
+    try {
+      EthAddress.fromString(value);
+    } catch (error) {
+      throw new Error(`Invalid funding account address: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (!options.remoteSigner && !hasKeystoreRemoteSigner) {
+      throw new Error(
+        '--funding-account as an address requires --remote-signer, or a keystore that already defines a remote signer',
+      );
+    }
+  } else {
+    throw new Error('Invalid funding account: expected a 32-byte private key or a 20-byte address');
+  }
+
+  options.fundingAccount = value;
+}

package/src/config/chain_l2_config.ts

@@ -1,4 +1,6 @@
 import type { NetworkNames } from '@aztec/foundation/config';
+import { createLogger } from '@aztec/foundation/log';
+import { type ConsensusEnvVar, checkConsensusEnvOverrides } from '@aztec/stdlib/config';
 
 import path from 'path';
 
@@ -12,6 +14,12 @@ const NetworkConfigs: Partial<Record<NetworkNames, NetworkConfigEnv>> = {
   mainnet: mainnetConfig,
 };
 
+/** Every generated network config must define every consensus-critical env var. */
+export type ConsensusComplete = Record<ConsensusEnvVar, string | number | boolean>;
+({ devnetConfig, testnetConfig, mainnetConfig }) satisfies Record<string, ConsensusComplete>;
+
+const log = createLogger('cli:chain_l2_config');
+
 function enrichEnvironmentWithNetworkConfig(config: NetworkConfigEnv): void {
   for (const [key, value] of Object.entries(config)) {
     if (process.env[key] === undefined && value !== undefined) {
@@ -31,7 +39,9 @@ function getDefaultDataDir(networkName: NetworkNames): string {
  * and DefaultSlasherConfig (which match the 'defaults' section of defaults.yml).
  *
  * For deployed networks: applies network configuration from generated defaults.yml,
- * merging base defaults with network-specific overrides.
+ * merging base defaults with network-specific overrides. Before merging, enforces that operators have not
+ * overridden any consensus-critical env var with a value diverging from the network config (throwing unless
+ * ALLOW_OVERRIDING_NETWORK_CONFIG is set), so all nodes of a network agree on consensus-critical values.
  *
  * @param networkName - The network name
  */
@@ -49,6 +59,9 @@ export function enrichEnvironmentWithChainName(networkName: NetworkNames) {
   const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
   const generatedConfig = NetworkConfigs[configKey];
   if (generatedConfig) {
+    // The check is pure; this layer owns env mutation, so apply its canonical writes before enriching.
+    const canonical = checkConsensusEnvOverrides(generatedConfig, process.env, msg => log.warn(msg));
+    Object.assign(process.env, canonical);
     enrichEnvironmentWithNetworkConfig(generatedConfig);
   }
 

package/src/config/generated/networks.ts

@@ -3,13 +3,11 @@
 
 export const devnetConfig = {
   ETHEREUM_SLOT_DURATION: 12,
-  AZTEC_SLOT_DURATION: 72,
-  AZTEC_TARGET_COMMITTEE_SIZE: 48,
   AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
   AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
   AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
   AZTEC_EXIT_DELAY_SECONDS: 172800,
-  AZTEC_INBOX_LAG: 1,
+  AZTEC_INBOX_LAG: 2,
   AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
   AZTEC_MANA_TARGET: 100000000,
   AZTEC_PROVING_COST_PER_MANA: 100,
@@ -24,6 +22,11 @@ export const devnetConfig = {
   AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
   AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
   AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
+  AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
+  AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
+  AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
+  AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
+  AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
   SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
   SLASH_MAX_PAYLOAD_SIZE: 80,
   SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
@@ -33,7 +36,7 @@ export const devnetConfig = {
   SEQ_MIN_TX_PER_BLOCK: 1,
   SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
   SEQ_BLOCK_DURATION_MS: 6000,
-  SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
+  CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
   DATA_STORE_MAP_SIZE_KB: 134217728,
   ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
   NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -41,10 +44,16 @@ export const devnetConfig = {
   PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
   PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
   SENTINEL_ENABLED: true,
+  OFFENSE_COLLECTION_ENABLED: true,
+  AZTEC_SLOT_DURATION: 36,
   AZTEC_EPOCH_DURATION: 8,
   AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
   AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
+  AZTEC_TARGET_COMMITTEE_SIZE: 1,
+  MAX_BLOCKS_PER_CHECKPOINT: 4,
   AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
+  AZTEC_SLASHING_QUORUM: 17,
+  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 151,
   L1_CHAIN_ID: 11155111,
   TEST_ACCOUNTS: true,
   SPONSORED_FPC: true,
@@ -73,7 +82,7 @@ export const devnetConfig = {
   SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
   SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
   SLASH_GRACE_PERIOD_L2_SLOTS: 0,
-  ENABLE_VERSION_CHECK: true,
+  ENABLE_AUTO_SHUTDOWN: false,
 } as const;
 
 export const testnetConfig = {
@@ -83,7 +92,7 @@ export const testnetConfig = {
   AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
   AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
   AZTEC_EXIT_DELAY_SECONDS: 172800,
-  AZTEC_INBOX_LAG: 1,
+  AZTEC_INBOX_LAG: 2,
   AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
   AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
   AZTEC_SLASHER_ENABLED: true,
@@ -91,6 +100,11 @@ export const testnetConfig = {
   AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
   AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
   AZTEC_SLASHING_DISABLE_DURATION: 432000,
+  AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 0,
+  AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 0,
+  AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 48,
+  AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 2,
+  AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 48,
   SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
   SLASH_MAX_PAYLOAD_SIZE: 80,
   SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
@@ -100,7 +114,8 @@ export const testnetConfig = {
   SEQ_MIN_TX_PER_BLOCK: 1,
   SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
   SEQ_BLOCK_DURATION_MS: 6000,
-  SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
+  MAX_BLOCKS_PER_CHECKPOINT: 10,
+  CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
   DATA_STORE_MAP_SIZE_KB: 134217728,
   ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
   NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -108,6 +123,7 @@ export const testnetConfig = {
   PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
   PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
   SENTINEL_ENABLED: true,
+  OFFENSE_COLLECTION_ENABLED: true,
   AZTEC_SLOT_DURATION: 72,
   AZTEC_ACTIVATION_THRESHOLD: 2E+23,
   AZTEC_EJECTION_THRESHOLD: 1E+23,
@@ -143,7 +159,7 @@ export const testnetConfig = {
   SLASH_INVALID_BLOCK_PENALTY: 1E+23,
   SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
   SLASH_GRACE_PERIOD_L2_SLOTS: 64,
-  ENABLE_VERSION_CHECK: true,
+  ENABLE_AUTO_SHUTDOWN: false,
 } as const;
 
 export const mainnetConfig = {
@@ -152,7 +168,7 @@ export const mainnetConfig = {
   AZTEC_TARGET_COMMITTEE_SIZE: 48,
   AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
   AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
-  AZTEC_INBOX_LAG: 1,
+  AZTEC_INBOX_LAG: 2,
   AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
   AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
   AZTEC_SLASHER_ENABLED: true,
@@ -167,7 +183,8 @@ export const mainnetConfig = {
   SEQ_MIN_TX_PER_BLOCK: 1,
   SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
   SEQ_BLOCK_DURATION_MS: 6000,
-  SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
+  MAX_BLOCKS_PER_CHECKPOINT: 10,
+  CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS: 12,
   DATA_STORE_MAP_SIZE_KB: 134217728,
   ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
   NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -175,6 +192,7 @@ export const mainnetConfig = {
   PUBLIC_DATA_TREE_MAP_SIZE_KB: 1073741824,
   PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
   SENTINEL_ENABLED: true,
+  OFFENSE_COLLECTION_ENABLED: true,
   AZTEC_SLOT_DURATION: 72,
   AZTEC_ACTIVATION_THRESHOLD: 2E+23,
   AZTEC_EJECTION_THRESHOLD: 1E+23,
@@ -208,9 +226,9 @@ export const mainnetConfig = {
   P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
   PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
   PUBLIC_OTEL_COLLECT_FROM: '',
-  ENABLE_VERSION_CHECK: false,
+  ENABLE_AUTO_SHUTDOWN: false,
   SLASH_DATA_WITHHOLDING_PENALTY: 0,
-  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
+  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.7,
   SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
   SLASH_INACTIVITY_PENALTY: 2E+21,
   SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
@@ -221,6 +239,6 @@ export const mainnetConfig = {
   SLASH_UNKNOWN_PENALTY: 2E+21,
   SLASH_INVALID_BLOCK_PENALTY: 2E+21,
   SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 2E+21,
-  SLASH_GRACE_PERIOD_L2_SLOTS: 1200,
+  SLASH_GRACE_PERIOD_L2_SLOTS: 8400,
 } as const;
 

package/src/utils/commands.ts

@@ -1,4 +1,5 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { PXE } from '@aztec/pxe/server';
@@ -50,14 +51,14 @@ export const l1ChainIdOption = new Option('-c, --l1-chain-id <number>', 'Chain I
     return parsedValue;
   });
 
-export const createSecretKeyOption = (
+export const createSigningKeyOption = (
   description: string,
   mandatory: boolean,
-  argsParser?: (value: string, previous: Fr) => Fr,
+  argsParser?: (value: string, previous: GrumpkinScalar) => GrumpkinScalar,
 ) =>
-  new Option('-sk, --secret-key <string>', description)
-    .env('SECRET_KEY')
-    .argParser(argsParser ?? parseSecretKey)
+  new Option('-sk, --signing-key <string>', description)
+    .env('SIGNING_KEY')
+    .argParser(argsParser ?? parseSigningKey)
     .makeOptionMandatory(mandatory);
 
 export const logJson = (log: LogFn) => (obj: object) => log(JSON.stringify(obj, null, 2));
@@ -101,7 +102,7 @@ export async function getTxSender(pxe: PXE, _from?: string) {
   let from: AztecAddress;
   if (_from) {
     try {
-      from = AztecAddress.fromString(_from);
+      from = AztecAddress.fromStringUnsafe(_from);
     } catch {
       throw new InvalidArgumentError(`Invalid option 'from' passed: ${_from}`);
     }
@@ -195,7 +196,7 @@ export function parseFieldFromHexString(str: string): Fr {
  */
 export function parseAztecAddress(address: string): AztecAddress {
   try {
-    return AztecAddress.fromString(address);
+    return AztecAddress.fromStringUnsafe(address);
   } catch {
     throw new InvalidArgumentError(`Invalid Aztec address: ${address}`);
   }
@@ -357,16 +358,16 @@ export function parsePartialAddress(address: string): Fr {
 }
 
 /**
- * Parses a secret key from a string.
- * @param privateKey - A string
- * @returns A secret key
+ * Parses an account signing key from a string.
+ * @param signingKey - A string
+ * @returns A signing key
  * @throws InvalidArgumentError if the input string is not valid.
  */
-export function parseSecretKey(secretKey: string): Fr {
+export function parseSigningKey(signingKey: string): GrumpkinScalar {
   try {
-    return Fr.fromHexString(secretKey);
+    return GrumpkinScalar.fromHexString(signingKey);
   } catch {
-    throw new InvalidArgumentError(`Invalid encryption secret key: ${secretKey}`);
+    throw new InvalidArgumentError(`Invalid signing key: ${signingKey}`);
   }
 }