@aztec/cli 0.0.1-commit.5daedc8 → 0.0.1-commit.6230efd

package/src/cmds/l1/index.ts

@@ -3,7 +3,6 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { type Command, Option } from 'commander';
 
-import { getL1RollupAddressFromEnv } from '../../config/get_l1_config.js';
 import {
   ETHEREUM_HOSTS,
   MNEMONIC,
@@ -15,8 +14,6 @@ import {
   parseEthereumAddress,
 } 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)',
@@ -42,31 +39,25 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     )
     .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('--existing-token <address>', 'Use an existing ERC20 for both fee and staking', parseEthereumAddress)
-    .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 { deployL1ContractsCmd } = await import('./deploy_l1_contracts_cmd.js');
 
       const initialValidators =
         options.validators?.split(',').map((validator: string) => EthAddress.fromString(validator)) || [];
-      await deployL1Contracts(
+      await deployL1ContractsCmd(
         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.existingToken,
@@ -89,12 +80,10 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     )
     .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)
-    .option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false)
     .action(async options => {
       const { deployNewRollup } = await import('./deploy_new_rollup.js');
 
@@ -107,15 +96,12 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.privateKey,
         options.mnemonic,
         options.mnemonicIndex,
-        options.salt,
         options.testAccounts,
         options.sponsoredFpc,
         options.json,
         initialValidators,
         options.realVerifier,
-        options.createVerificationJson,
         log,
-        debugLogger,
       );
     });
 
@@ -313,7 +299,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .action(async options => {
       const { addL1ValidatorViaRollup } = await import('./update_l1_validators.js');
 
-      const rollupAddress = options.rollup ?? (await getL1RollupAddressFromEnv(options.l1RpcUrls, options.l1ChainId));
+      let rollupAddress = options.rollup;
+      if (!rollupAddress) {
+        const { getL1RollupAddressFromEnv } = await import('../../config/get_l1_config.js');
+        rollupAddress = await getL1RollupAddressFromEnv(options.l1RpcUrls, options.l1ChainId);
+      }
 
       await addL1ValidatorViaRollup({
         rpcUrls: options.l1RpcUrls,

package/src/cmds/l1/prover_stats.ts

@@ -1,5 +1,6 @@
 import { retrieveL2ProofVerifiedEvents } from '@aztec/archiver';
-import { type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import type { ViemPublicClient } from '@aztec/ethereum/types';
 import { compactArray, mapValues, unique } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type LogFn, type Logger, createLogger } from '@aztec/foundation/log';
@@ -46,7 +47,10 @@ export async function proverStats(opts: {
         .then(a => a.rollupAddress);
 
   const chain = createEthereumChain(l1RpcUrls, chainId).chainInfo;
-  const publicClient = createPublicClient({ chain, transport: fallback(l1RpcUrls.map(url => http(url))) });
+  const publicClient = createPublicClient({
+    chain,
+    transport: fallback(l1RpcUrls.map(url => http(url, { batch: false }))),
+  });
   const lastBlockNum = endBlock ?? (await publicClient.getBlockNumber());
   debugLog.verbose(`Querying events on rollup at ${rollup.toString()} from ${startBlock} up to ${lastBlockNum}`);
 

package/src/cmds/l1/trigger_seed_snapshot.ts

@@ -1,4 +1,5 @@
-import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
 import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 

package/src/cmds/l1/update_l1_validators.ts

@@ -1,13 +1,8 @@
-import {
-  GSEContract,
-  RollupContract,
-  createEthereumChain,
-  createExtendedL1Client,
-  createL1TxUtilsFromViemWallet,
-  getL1ContractsConfigEnvVars,
-  getPublicClient,
-  isAnvilTestChain,
-} from '@aztec/ethereum';
+import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
+import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
 import { EthCheatCodes } from '@aztec/ethereum/test';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';

package/src/cmds/misc/generate_secret_and_hash.ts

@@ -1,5 +1,5 @@
 import { computeSecretHash } from '@aztec/aztec.js/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { LogFn } from '@aztec/foundation/log';
 
 export async function generateSecretAndHash(log: LogFn) {

package/src/cmds/misc/index.ts

@@ -1,5 +1,4 @@
 import type { LogFn } from '@aztec/foundation/log';
-import { printENR } from '@aztec/p2p/enr';
 
 import type { Command } from 'commander';
 
@@ -49,6 +48,7 @@ export function injectCommands(program: Command, log: LogFn) {
     .description('Decodes and ENR record')
     .argument('<enr>', 'The encoded ENR string')
     .action(async (enr: string) => {
+      const { printENR } = await import('@aztec/p2p/enr');
       await printENR(enr, log);
     });
 

package/src/cmds/validator_keys/generate_bls_keypair.ts

@@ -1,4 +1,4 @@
-import { deriveBlsPrivateKey } from '@aztec/foundation/crypto';
+import { deriveBlsPrivateKey } from '@aztec/foundation/crypto/bls';
 import type { LogFn } from '@aztec/foundation/log';
 
 import { writeFile } from 'fs/promises';

package/src/cmds/validator_keys/new.ts

@@ -1,5 +1,6 @@
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { GSEContract, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { GSEContract } from '@aztec/ethereum/contracts';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -134,7 +135,7 @@ export async function newValidatorKeystore(options: NewValidatorKeystoreOptions,
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
     const publicClient = createPublicClient({
       chain: chain.chainInfo,
-      transport: fallback(l1RpcUrls.map(url => http(url))),
+      transport: fallback(l1RpcUrls.map(url => http(url, { batch: false }))),
     });
     const gse = new GSEContract(publicClient, gseAddress);
 

package/src/cmds/validator_keys/shared.ts

@@ -1,6 +1,7 @@
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { computeBn254G1PublicKeyCompressed, deriveBlsPrivateKey } from '@aztec/foundation/crypto';
+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 type { LogFn } from '@aztec/foundation/log';
 import type { EthAccount, EthPrivateKey, ValidatorKeyStore } from '@aztec/node-keystore/types';

package/src/cmds/validator_keys/staker.ts

@@ -1,9 +1,10 @@
 import { prettyPrintJSON } from '@aztec/cli/utils';
-import { GSEContract, createEthereumChain } from '@aztec/ethereum';
-import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { GSEContract } from '@aztec/ethereum/contracts';
 import { decryptBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
+import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto/bn254';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 import { loadKeystoreFile } from '@aztec/node-keystore/loader';
 import type {
@@ -272,7 +273,7 @@ export async function generateStakerJson(options: StakerOptions, log: LogFn): Pr
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const publicClient = createPublicClient({
     chain: chain.chainInfo,
-    transport: fallback(l1RpcUrls.map(url => http(url))),
+    transport: fallback(l1RpcUrls.map(url => http(url, { batch: false }))),
   });
   const gse = new GSEContract(publicClient, gseAddress);
 

package/src/cmds/validator_keys/utils.ts

@@ -1,5 +1,6 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { type EthPrivateKey, ethPrivateKeySchema } from '@aztec/node-keystore';
+import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
+import type { EthPrivateKey } from '@aztec/node-keystore/types';
 
 export const defaultBlsPath = 'm/12381/3600/0/0/0';
 

package/src/config/chain_l2_config.ts

@@ -1,8 +1,9 @@
-import { DefaultL1ContractsConfig, type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
+import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum/config';
+import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils/config';
 import type { NetworkNames } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
-import type { P2PConfig } from '@aztec/p2p';
+import type { P2PConfig } from '@aztec/p2p/config';
 import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
 
 import path from 'path';
@@ -18,7 +19,7 @@ const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> &
   Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> &
   Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> &
-  Pick<SequencerConfig, 'minTxsPerBlock' | 'maxTxsPerBlock'> & {
+  Pick<SequencerConfig, 'buildCheckpointIfEmpty' | 'minTxsPerBlock' | 'maxTxsPerBlock' | 'blockDurationMs'> & {
     l1ChainId: number;
     testAccounts: boolean;
     sponsoredFPC: boolean;
@@ -28,7 +29,7 @@ export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> &
     snapshotsUrls: string[];
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
-    maxTxPoolSize: number;
+    maxPendingTxCount: number;
     publicMetricsOptOut: boolean;
     publicIncludeMetrics?: string[];
     publicMetricsCollectorUrl?: string;
@@ -103,11 +104,12 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 0,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
-  maxTxPoolSize: 0,
+  maxPendingTxCount: 0,
   publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
@@ -127,6 +129,8 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: 2,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 2,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: 1,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
   /** How many sequencers must agree with a slash for it to be executed. */
@@ -188,6 +192,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 20,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
   autoUpdate: 'config-and-version',
@@ -196,7 +201,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 1_000, // ~156MB
   txPoolDeleteTxsAfterReorg: true,
 
   // Deployment stuff
@@ -212,6 +217,8 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: DefaultL1ContractsConfig.inboxLag,
   /** 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. */
@@ -245,6 +252,7 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 8,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [],
   autoUpdate: 'config-and-version',
@@ -253,7 +261,7 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: '',
   publicMetricsCollectFrom: [''],
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 1_000, // ~156MB
   txPoolDeleteTxsAfterReorg: false,
 
   // Deployment stuff
@@ -269,6 +277,8 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: DefaultL1ContractsConfig.inboxLag,
   /** 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. */
@@ -301,12 +311,13 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   disableTransactions: true,
   bootstrapNodes: [],
   minTxsPerBlock: 0,
-  maxTxsPerBlock: 0,
+  maxTxsPerBlock: 20,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 5_000, // ~760MB
   publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
@@ -322,55 +333,57 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   /** How many L2 slots an epoch lasts. */
   aztecEpochDuration: 32,
   /** The target validator committee size. */
-  aztecTargetCommitteeSize: 24,
+  aztecTargetCommitteeSize: 48,
   /** The number of epochs to lag behind the current epoch for validator selection. */
   lagInEpochsForValidatorSet: 2,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 2,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: 1,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
 
-  // This is a diff from mainnet: we have 2-strikes you're out, rather than 3 on mainnet.
-  localEjectionThreshold: 198_000n * 10n ** 18n,
+  // This is a diff from mainnet: we have 1-strike you're out, rather than 3 on mainnet.
+  localEjectionThreshold: 199_000n * 10n ** 18n,
   /** How many sequencers must agree with a slash for it to be executed. */
-  slashingQuorum: 65,
-  slashingRoundSizeInEpochs: 4,
-  slashingExecutionDelayInRounds: 28,
-  slashingLifetimeInRounds: 34,
-  slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
+  slashingQuorum: 33,
+  slashingRoundSizeInEpochs: 2,
+  slashingExecutionDelayInRounds: 2,
+  slashingLifetimeInRounds: 5,
+  slashingVetoer: EthAddress.fromString('0xdfe19Da6a717b7088621d8bBB66be59F2d78e924'),
   slashingOffsetInRounds: 2,
 
-  slashingDisableDuration: 259_200, // 3 days
+  slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days
   slasherFlavor: 'tally',
 
-  slashAmountSmall: 2_000n * 10n ** 18n,
-  slashAmountMedium: 2_000n * 10n ** 18n,
-  slashAmountLarge: 2_000n * 10n ** 18n,
+  slashAmountSmall: 10_000n * 10n ** 18n,
+  slashAmountMedium: 50_000n * 10n ** 18n,
+  slashAmountLarge: 200_000n * 10n ** 18n,
 
   /** The mana target for the rollup */
-  manaTarget: 0n,
+  manaTarget: 150_000_000n,
 
   /** The proving cost per mana */
-  provingCostPerMana: 0n,
+  provingCostPerMana: 100n,
 
   exitDelaySeconds: 4 * 24 * 60 * 60, // 4 days
 
   activationThreshold: 200_000n * 10n ** 18n,
   ejectionThreshold: 100_000n * 10n ** 18n,
 
-  governanceProposerRoundSize: 300,
-  governanceProposerQuorum: 151,
+  governanceProposerRoundSize: 100,
+  governanceProposerQuorum: 60,
 
   // Node slashing config
   slashInactivityTargetPercentage: 0.8,
   slashInactivityConsecutiveEpochThreshold: 2,
-  slashInactivityPenalty: 2_000n * 10n ** 18n,
+  slashInactivityPenalty: 10_000n * 10n ** 18n,
   slashPrunePenalty: 0n, // 2_000n * 10n ** 18n, We disable slashing for prune offenses right now
   slashDataWithholdingPenalty: 0n, // 2_000n * 10n ** 18n, We disable slashing for data withholding offenses right now
-  slashProposeInvalidAttestationsPenalty: 2_000n * 10n ** 18n,
-  slashAttestDescendantOfInvalidPenalty: 2_000n * 10n ** 18n,
-  slashUnknownPenalty: 2_000n * 10n ** 18n,
-  slashBroadcastedInvalidBlockPenalty: 2_000n * 10n ** 18n, // 10_000n * 10n ** 18n, Disabled for now until further testing
+  slashProposeInvalidAttestationsPenalty: 10_000n * 10n ** 18n,
+  slashAttestDescendantOfInvalidPenalty: 10_000n * 10n ** 18n,
+  slashUnknownPenalty: 10_000n * 10n ** 18n,
+  slashBroadcastedInvalidBlockPenalty: 10_000n * 10n ** 18n, // 10_000n * 10n ** 18n, Disabled for now until further testing
   slashGracePeriodL2Slots: 1_200, // One day from deployment
   slashOffenseExpirationRounds: 8,
 
@@ -395,11 +408,12 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 0,
+  buildCheckpointIfEmpty: true,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
   autoUpdate: 'notify',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-  maxTxPoolSize: 0,
+  maxPendingTxCount: 0,
   publicMetricsOptOut: true,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
@@ -418,6 +432,8 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: 2,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 2,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: 1,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
 
@@ -483,6 +499,7 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   bootstrapNodes: [],
   minTxsPerBlock: 0,
   maxTxsPerBlock: 8,
+  buildCheckpointIfEmpty: true,
   realProofs: false,
   snapshotsUrls: [],
   autoUpdate: 'config-and-version',
@@ -491,7 +508,7 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: '',
   publicMetricsCollectFrom: [''],
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxPendingTxCount: 1_000, // ~156MB
   txPoolDeleteTxsAfterReorg: true,
 
   // Deployment stuff
@@ -507,6 +524,8 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   lagInEpochsForValidatorSet: 1,
   /** The number of epochs to lag behind the current epoch for randao selection. */
   lagInEpochsForRandao: 1,
+  /** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */
+  inboxLag: DefaultL1ContractsConfig.inboxLag,
   /** 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. */
@@ -576,10 +595,16 @@ export function enrichEnvironmentWithChainConfig(config: L2ChainConfig) {
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
   enrichVar('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
   enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
+  if (config.blockDurationMs !== undefined) {
+    enrichVar('SEQ_BLOCK_DURATION_MS', config.blockDurationMs.toString());
+  }
+  if (config.buildCheckpointIfEmpty !== undefined) {
+    enrichVar('SEQ_BUILD_CHECKPOINT_IF_EMPTY', config.buildCheckpointIfEmpty.toString());
+  }
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
   enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
-  enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
+  enrichVar('P2P_MAX_PENDING_TX_COUNT', config.maxPendingTxCount.toString());
   enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
 
   enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
@@ -625,6 +650,7 @@ export function enrichEnvironmentWithChainConfig(config: L2ChainConfig) {
   enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
   enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET', config.lagInEpochsForValidatorSet.toString());
   enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_RANDAO', config.lagInEpochsForRandao.toString());
+  enrichVar('AZTEC_INBOX_LAG', config.inboxLag.toString());
   enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
   enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
   enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());

package/src/config/get_l1_config.ts

@@ -1,4 +1,7 @@
-import { type L1ContractAddresses, RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract } from '@aztec/ethereum/contracts';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { getL1ContractsConfig } from '@aztec/ethereum/queries';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 export async function getL1Config(

package/src/config/network_config.ts

@@ -137,4 +137,11 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
   if (networkConfig.feeAssetHandlerAddress) {
     enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());
   }
+
+  if (networkConfig.blobFileStoreUrls?.length) {
+    enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
+  }
+  if (networkConfig.blockDurationMs !== undefined) {
+    enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
+  }
 }