@aztec/ethereum 3.0.0-canary.a9708bd → 3.0.0-devnet.20251212

package/dest/utils.js

@@ -118,34 +118,16 @@ function getNestedErrorData(error) {
     if (error instanceof Error) {
         return new FormattedViemError(error.message, error?.metaMessages);
     }
-    // Extract the actual error message and highlight it for clarity
-    let formattedRes = extractAndFormatRequestBody(error?.message || String(error));
-    let errorDetail = '';
-    // Look for specific details in known locations
-    if (error) {
-        // Check for details property which often has the most specific error message
-        if (typeof error.details === 'string' && error.details) {
-            errorDetail = error.details;
-        } else if (typeof error.shortMessage === 'string' && error.shortMessage) {
-            errorDetail = error.shortMessage;
-        }
-    }
-    // If we found a specific error detail, format it clearly
-    if (errorDetail) {
-        // Look for key sections of the formatted result to replace with highlighted error
-        let replaced = false;
-        // Try to find the Details: section
-        const detailsMatch = formattedRes.match(/Details: ([^\n]+)/);
-        if (detailsMatch) {
-            formattedRes = formattedRes.replace(detailsMatch[0], `Details: *${errorDetail}*`);
-            replaced = true;
-        }
-        // If we didn't find a Details section, add the error at the beginning
-        if (!replaced) {
-            formattedRes = `Error: *${errorDetail}*\n\n${formattedRes}`;
-        }
-    }
-    return new FormattedViemError(formattedRes.replace(/\\n/g, '\n'), error?.metaMessages);
+    const body = String(error);
+    const length = body.length;
+    // LogExplorer can only render up to 2500 characters in it's summary view. Try to keep the whole message below this number
+    // Limit the error to 2000 chacaters in order to allow code higher up to decorate this error with extra details (up to 500 characters)
+    if (length > 2000) {
+        const chunk = 950;
+        const truncated = length - 2 * chunk;
+        return new FormattedViemError(body.slice(0, chunk) + `...${truncated} characters truncated...` + body.slice(-1 * chunk));
+    }
+    return new FormattedViemError(body);
 }
 function stripAbis(obj) {
     if (!obj || typeof obj !== 'object') {
@@ -166,139 +148,6 @@ function stripAbis(obj) {
         }
     });
 }
-function extractAndFormatRequestBody(message) {
-    // First check if message is extremely large and contains very large hex strings
-    if (message.length > 50000) {
-        message = replaceHexStrings(message, {
-            minLength: 10000,
-            truncateLength: 200
-        });
-    }
-    // Add a specific check for RPC calls with large params
-    if (message.includes('"method":"eth_sendRawTransaction"')) {
-        message = replaceHexStrings(message, {
-            pattern: /"params":\s*\[\s*"(0x[a-fA-F0-9]{1000,})"\s*\]/g,
-            transform: (hex)=>`"params":["${truncateHex(hex, 200)}"]`
-        });
-    }
-    // First handle Request body JSON
-    const requestBodyRegex = /Request body: ({[\s\S]*?})\n/g;
-    let result = message.replace(requestBodyRegex, (match, body)=>{
-        return `Request body: ${formatRequestBody(body)}\n`;
-    });
-    // Then handle Arguments section
-    const argsRegex = /((?:Request |Estimate Gas )?Arguments:[\s\S]*?(?=\n\n|$))/g;
-    result = result.replace(argsRegex, (section)=>{
-        const lines = section.split('\n');
-        const processedLines = lines.map((line)=>{
-            // Check if line contains a colon followed by content
-            const colonIndex = line.indexOf(':');
-            if (colonIndex !== -1) {
-                const [prefix, content] = [
-                    line.slice(0, colonIndex + 1),
-                    line.slice(colonIndex + 1).trim()
-                ];
-                // If content contains a hex string, truncate it
-                if (content.includes('0x')) {
-                    const processedContent = replaceHexStrings(content);
-                    return `${prefix} ${processedContent}`;
-                }
-            }
-            return line;
-        });
-        return processedLines.join('\n');
-    });
-    // Finally, catch any remaining hex strings in the message
-    result = replaceHexStrings(result);
-    return result;
-}
-function truncateHex(hex, length = 100) {
-    if (!hex || typeof hex !== 'string') {
-        return hex;
-    }
-    if (!hex.startsWith('0x')) {
-        return hex;
-    }
-    if (hex.length <= length * 2) {
-        return hex;
-    }
-    // For extremely large hex strings, use more aggressive truncation
-    if (hex.length > 10000) {
-        return `${hex.slice(0, length)}...<${hex.length - length * 2} chars omitted>...${hex.slice(-length)}`;
-    }
-    return `${hex.slice(0, length)}...${hex.slice(-length)}`;
-}
-function replaceHexStrings(text, options = {}) {
-    const { minLength = 10, maxLength = Infinity, truncateLength = 100, pattern, transform = (hex)=>truncateHex(hex, truncateLength) } = options;
-    const hexRegex = pattern ?? new RegExp(`(0x[a-fA-F0-9]{${minLength},${maxLength}})`, 'g');
-    return text.replace(hexRegex, (match)=>transform(match));
-}
-function formatRequestBody(body) {
-    try {
-        // Special handling for eth_sendRawTransaction
-        if (body.includes('"method":"eth_sendRawTransaction"')) {
-            try {
-                const parsed = JSON.parse(body);
-                if (parsed.params && Array.isArray(parsed.params) && parsed.params.length > 0) {
-                    // These are likely large transaction hex strings
-                    parsed.params = parsed.params.map((param)=>{
-                        if (typeof param === 'string' && param.startsWith('0x') && param.length > 1000) {
-                            return truncateHex(param, 200);
-                        }
-                        return param;
-                    });
-                }
-                return JSON.stringify(parsed, null, 2);
-            } catch  {
-                // If specific parsing fails, fall back to regex-based truncation
-                return replaceHexStrings(body, {
-                    pattern: /"params":\s*\[\s*"(0x[a-fA-F0-9]{1000,})"\s*\]/g,
-                    transform: (hex)=>`"params":["${truncateHex(hex, 200)}"]`
-                });
-            }
-        }
-        // For extremely large request bodies, use simple truncation instead of parsing
-        if (body.length > 50000) {
-            const jsonStart = body.indexOf('{');
-            const jsonEnd = body.lastIndexOf('}');
-            if (jsonStart >= 0 && jsonEnd > jsonStart) {
-                return replaceHexStrings(body, {
-                    minLength: 10000,
-                    truncateLength: 200
-                });
-            }
-        }
-        const parsed = JSON.parse(body);
-        // Process the entire request body
-        const processed = processParams(parsed);
-        return JSON.stringify(processed, null, 2);
-    } catch  {
-        // If JSON parsing fails, do a simple truncation of any large hex strings
-        return replaceHexStrings(body, {
-            minLength: 1000,
-            truncateLength: 150
-        });
-    }
-}
-// Recursively process all parameters that might contain hex strings
-function processParams(obj) {
-    if (Array.isArray(obj)) {
-        return obj.map((item)=>processParams(item));
-    }
-    if (typeof obj === 'object' && obj !== null) {
-        const result = {};
-        for (const [key, value] of Object.entries(obj)){
-            result[key] = processParams(value);
-        }
-        return result;
-    }
-    if (typeof obj === 'string') {
-        if (obj.startsWith('0x')) {
-            return truncateHex(obj);
-        }
-    }
-    return obj;
-}
 export function tryGetCustomErrorName(err) {
     try {
         // See https://viem.sh/docs/contract/simulateContract#handling-custom-errors

package/dest/zkPassportVerifierAddress.d.ts

@@ -12,4 +12,4 @@ export declare const ZK_PASSPORT_DOMAIN = "testnet.aztec.network";
  * The default scope of the zk passport proofs
  */
 export declare const ZK_PASSPORT_SCOPE = "personhood";
-//# sourceMappingURL=zkPassportVerifierAddress.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemtQYXNzcG9ydFZlcmlmaWVyQWRkcmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3prUGFzc3BvcnRWZXJpZmllckFkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNEOzs7R0FHRztBQUNILGVBQU8sTUFBTSw0QkFBNEIsWUFBc0UsQ0FBQztBQUNoSDs7R0FFRztBQUNILGVBQU8sTUFBTSxrQkFBa0IsMEJBQTBCLENBQUM7QUFDMUQ7O0dBRUc7QUFDSCxlQUFPLE1BQU0saUJBQWlCLGVBQWUsQ0FBQyJ9

package/dest/zkPassportVerifierAddress.js

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 /**
  * The address of the zk passport verifier on sepolia
  * get address from: ROOT/l1-contracts/lib/circuits/src/solidity/deployments/deployment-11155111.json
- */ export const ZK_PASSPORT_VERIFIER_ADDRESS = EthAddress.fromString('0x62e33cC35e29130e135341586e8Cf9C2BAbFB3eE');
+ */ export const ZK_PASSPORT_VERIFIER_ADDRESS = EthAddress.fromString('0x3101Bad9eA5fACadA5554844a1a88F7Fe48D4DE0');
 /**
  * The default domain of the zk passport site
  */ export const ZK_PASSPORT_DOMAIN = 'testnet.aztec.network';

package/package.json

@@ -1,14 +1,27 @@
 {
   "name": "@aztec/ethereum",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.20251212",
   "type": "module",
   "exports": {
-    ".": "./dest/index.js",
-    "./test": "./dest/test/index.js",
+    "./account": "./dest/account.js",
+    "./chain": "./dest/chain.js",
+    "./client": "./dest/client.js",
+    "./config": "./dest/config.js",
+    "./constants": "./dest/constants.js",
     "./contracts": "./dest/contracts/index.js",
     "./deploy-l1-contracts": "./dest/deploy_l1_contracts.js",
+    "./eth-signer": "./dest/eth-signer/index.js",
+    "./forwarder-proxy": "./dest/forwarder_proxy.js",
+    "./l1-artifacts": "./dest/l1_artifacts.js",
     "./l1-contract-addresses": "./dest/l1_contract_addresses.js",
-    "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils_with_blobs.js",
+    "./l1-reader": "./dest/l1_reader.js",
+    "./l1-tx-utils": "./dest/l1_tx_utils/index.js",
+    "./l1-tx-utils-with-blobs": "./dest/l1_tx_utils/index-blobs.js",
+    "./l1-types": "./dest/l1_types.js",
+    "./publisher-manager": "./dest/publisher_manager.js",
+    "./queries": "./dest/queries.js",
+    "./test": "./dest/test/index.js",
+    "./types": "./dest/types.js",
     "./utils": "./dest/utils.js"
   },
   "typedocOptions": {
@@ -19,10 +32,10 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'",
+    "start:dev": "concurrently -k \"tsgo -b -w\" \"nodemon --watch dest --exec yarn start\"",
     "start": "node ./dest/index.js",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}",
     "proposer-address": "node ./dest/cli/forwarder_address.js"
@@ -31,16 +44,16 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "3.0.0-canary.a9708bd",
-    "@aztec/constants": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/l1-artifacts": "3.0.0-canary.a9708bd",
+    "@aztec/blob-lib": "3.0.0-devnet.20251212",
+    "@aztec/constants": "3.0.0-devnet.20251212",
+    "@aztec/foundation": "3.0.0-devnet.20251212",
+    "@aztec/l1-artifacts": "3.0.0-devnet.20251212",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",
     "lodash.pickby": "^4.5.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "npm:@aztec/viem@2.38.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -49,6 +62,7 @@
     "@types/jest": "^30.0.0",
     "@types/lodash.pickby": "^4",
     "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "@viem/anvil": "^0.0.10",
     "get-port": "^7.1.0",
     "jest": "^30.0.0",
@@ -62,7 +76,7 @@
     "src",
     "!*.test.*"
   ],
-  "types": "./dest/index.d.ts",
+  "types": "./dest/types.d.ts",
   "jest": {
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"

package/src/client.ts

@@ -19,7 +19,7 @@ import { createEthereumChain } from './chain.js';
 import type { ExtendedViemWalletClient, ViemPublicClient } from './types.js';
 
 type Config = {
-  /** The RPC Url of the ethereum host. */
+  /** List of URLs of Ethereum RPC nodes that services will connect to (comma separated). */
   l1RpcUrls: string[];
   /** The chain ID of the ethereum host. */
   l1ChainId: number;

package/src/config.ts

@@ -10,7 +10,7 @@ import {
 } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
-import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils.js';
+import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './l1_tx_utils/index.js';
 
 export type GenesisStateConfig = {
   /** Whether to populate the genesis state with initial fee juice for the test accounts */
@@ -28,12 +28,18 @@ export type L1ContractsConfig = {
   aztecEpochDuration: number;
   /** The target validator committee size. */
   aztecTargetCommitteeSize: number;
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochsForValidatorSet: number;
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: number;
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: number;
   /** The deposit amount for a validator */
   activationThreshold: bigint;
   /** The minimum stake for a validator. */
   ejectionThreshold: bigint;
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: bigint;
   /** The slashing quorum, i.e. how many slots must signal for the same payload in a round for it to be submittable to the Slasher (defaults to slashRoundSize / 2 + 1) */
   slashingQuorum?: number;
   /** The slashing round size, i.e. how many epochs are in a slashing round */
@@ -46,6 +52,8 @@ export type L1ContractsConfig = {
   slashingVetoer: EthAddress;
   /** How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset) */
   slashingOffsetInRounds: number;
+  /** How long slashing can be disabled for in seconds when vetoer disables it */
+  slashingDisableDuration: number;
   /** Type of slasher proposer */
   slasherFlavor: 'empire' | 'tally' | 'none';
   /** Minimum amount that can be slashed in tally slashing */
@@ -71,22 +79,26 @@ export const DefaultL1ContractsConfig = {
   aztecSlotDuration: 36,
   aztecEpochDuration: 32,
   aztecTargetCommitteeSize: 48,
+  lagInEpochsForValidatorSet: 2,
+  lagInEpochsForRandao: 2, // For PROD, this value should be > lagInEpochsForValidatorSet
   aztecProofSubmissionEpochs: 1, // you have a full epoch to submit a proof after the epoch to prove ends
-  activationThreshold: BigInt(100e18),
-  ejectionThreshold: BigInt(50e18),
-  slashAmountSmall: BigInt(10e18),
-  slashAmountMedium: BigInt(20e18),
-  slashAmountLarge: BigInt(50e18),
+  activationThreshold: 100n * 10n ** 18n,
+  ejectionThreshold: 50n * 10n ** 18n,
+  localEjectionThreshold: 98n * 10n ** 18n,
+  slashAmountSmall: 10n * 10n ** 18n,
+  slashAmountMedium: 20n * 10n ** 18n,
+  slashAmountLarge: 50n * 10n ** 18n,
   slashingRoundSizeInEpochs: 4,
   slashingLifetimeInRounds: 5,
   slashingExecutionDelayInRounds: 0, // round N may be submitted in round N + 1
   slashingVetoer: EthAddress.ZERO,
   governanceProposerRoundSize: 300,
-  manaTarget: BigInt(1e10),
+  manaTarget: BigInt(100e6),
   provingCostPerMana: BigInt(100),
   exitDelaySeconds: 2 * 24 * 60 * 60,
   slasherFlavor: 'tally' as const,
   slashingOffsetInRounds: 2,
+  slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days in seconds
 } satisfies L1ContractsConfig;
 
 const LocalGovernanceConfiguration = {
@@ -103,113 +115,192 @@ const LocalGovernanceConfiguration = {
   minimumVotes: 400n * 10n ** 18n,
 };
 
-const TestnetGovernanceConfiguration = {
+const StagingPublicGovernanceConfiguration = {
   proposeConfig: {
-    lockDelay: 60n * 60n * 24n,
+    lockDelay: 60n * 60n * 24n * 30n,
     lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
   },
   votingDelay: 60n,
   votingDuration: 60n * 60n,
-  executionDelay: 60n * 60n * 24n,
+  executionDelay: 60n,
   gracePeriod: 60n * 60n * 24n * 7n,
   quorum: 3n * 10n ** 17n, // 30%
   requiredYeaMargin: 4n * 10n ** 16n, // 4%
-  minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n,
+  minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n, // >= 200 validators must vote
 };
 
-export const getGovernanceConfiguration = (networkName: NetworkNames) => {
-  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-    return TestnetGovernanceConfiguration;
-  }
-  return LocalGovernanceConfiguration;
+const TestnetGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 10n * 365n * 24n * 60n * 60n,
+    lockAmount: 1250n * 200_000n * 10n ** 18n,
+  },
+
+  votingDelay: 12n * 60n * 60n, // 12 hours
+  votingDuration: 1n * 24n * 60n * 60n, // 1 day
+  executionDelay: 12n * 60n * 60n, // 12 hours
+  gracePeriod: 1n * 24n * 60n * 60n, // 1 day
+  quorum: 2n * 10n ** 17n, // 20%
+  requiredYeaMargin: 1n * 10n ** 17n, // 10%
+  minimumVotes: 100n * 200_000n * 10n ** 18n,
 };
 
-const TestnetGSEConfiguration = {
-  activationThreshold: BigInt(100e18),
-  ejectionThreshold: BigInt(50e18),
+const StagingIgnitionGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 10n * 365n * 24n * 60n * 60n,
+    lockAmount: 1250n * 200_000n * 10n ** 18n,
+  },
+
+  votingDelay: 7n * 24n * 60n * 60n,
+  votingDuration: 7n * 24n * 60n * 60n,
+  executionDelay: 30n * 24n * 60n * 60n,
+  gracePeriod: 7n * 24n * 60n * 60n,
+  quorum: 2n * 10n ** 17n, // 20%
+  requiredYeaMargin: 1n * 10n ** 17n, // 10%
+  minimumVotes: 1250n * 200_000n * 10n ** 18n,
 };
 
-const LocalGSEConfiguration = {
-  activationThreshold: BigInt(100e18),
-  ejectionThreshold: BigInt(50e18),
+const MainnetGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 90n * 24n * 60n * 60n,
+    lockAmount: 258_750_000n * 10n ** 18n,
+  },
+
+  votingDelay: 3n * 24n * 60n * 60n,
+  votingDuration: 7n * 24n * 60n * 60n,
+  executionDelay: 7n * 24n * 60n * 60n,
+  gracePeriod: 7n * 24n * 60n * 60n,
+  quorum: 2n * 10n ** 17n, // 20%
+  requiredYeaMargin: 33n * 10n ** 16n, // 33%
+  minimumVotes: 1000n * 200_000n * 10n ** 18n,
 };
 
-export const getGSEConfiguration = (networkName: NetworkNames) => {
-  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-    return TestnetGSEConfiguration;
+export const getGovernanceConfiguration = (networkName: NetworkNames) => {
+  switch (networkName) {
+    case 'local':
+      return LocalGovernanceConfiguration;
+    case 'next-net':
+      return LocalGovernanceConfiguration;
+    case 'devnet':
+      return LocalGovernanceConfiguration;
+    case 'staging-public':
+      return StagingPublicGovernanceConfiguration;
+    case 'testnet':
+      return TestnetGovernanceConfiguration;
+    case 'staging-ignition':
+      return StagingIgnitionGovernanceConfiguration;
+    case 'mainnet':
+      return MainnetGovernanceConfiguration;
+    default:
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
-  return LocalGSEConfiguration;
 };
 
 // Making a default config here as we are only using it thought the deployment
 // and do not expect to be using different setups, so having environment variables
 // for it seems overkill
-const LocalRewardConfig = {
-  sequencerBps: 5000,
+
+const DefaultRewardConfig = {
+  sequencerBps: 8000,
   rewardDistributor: EthAddress.ZERO.toString(),
   booster: EthAddress.ZERO.toString(),
-  blockReward: BigInt(50e18),
+  checkpointReward: 500n * 10n ** 18n,
 };
 
-const TestnetRewardConfig = {
-  sequencerBps: 5000,
+const MainnetRewardConfig = {
+  sequencerBps: 7_000,
   rewardDistributor: EthAddress.ZERO.toString(),
   booster: EthAddress.ZERO.toString(),
-  blockReward: BigInt(50e18),
+  checkpointReward: 400n * 10n ** 18n,
 };
 
 export const getRewardConfig = (networkName: NetworkNames) => {
-  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-    return TestnetRewardConfig;
+  switch (networkName) {
+    case 'local':
+    case 'devnet':
+    case 'next-net':
+    case 'staging-public':
+    case 'testnet':
+    case 'staging-ignition':
+      return DefaultRewardConfig;
+    case 'mainnet':
+      return MainnetRewardConfig;
+    default:
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
-  return LocalRewardConfig;
-};
-
-const LocalRewardBoostConfig = {
-  increment: 200000,
-  maxScore: 5000000,
-  a: 5000,
-  k: 1000000,
-  minimum: 100000,
 };
 
-const TestnetRewardBoostConfig = {
-  increment: 125000,
-  maxScore: 15000000,
-  a: 1000,
-  k: 1000000,
-  minimum: 100000,
-};
-
-export const getRewardBoostConfig = (networkName: NetworkNames) => {
-  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-    return TestnetRewardBoostConfig;
-  }
-  return LocalRewardBoostConfig;
+export const getRewardBoostConfig = () => {
+  // The reward configuration is specified with a precision of 1e5, and we use the same across
+  // all networks.
+  return {
+    increment: 125_000, // 1.25
+    maxScore: 15_000_000, // 150
+    a: 1_000, // 0.01
+    k: 1_000_000, // 10
+    minimum: 100_000, // 1
+  };
 };
 
 // Similar to the above, no need for environment variables for this.
 const LocalEntryQueueConfig = {
   bootstrapValidatorSetSize: 0n,
   bootstrapFlushSize: 0n,
-  normalFlushSizeMin: 48n, // will effectively be bounded by maxQueueFlushSize
+  normalFlushSizeMin: 48n,
   normalFlushSizeQuotient: 2n,
   maxQueueFlushSize: 48n,
 };
 
-const TestnetEntryQueueConfig = {
-  bootstrapValidatorSetSize: 750n,
-  bootstrapFlushSize: 75n, // will effectively be bounded by maxQueueFlushSize
+const StagingPublicEntryQueueConfig = {
+  bootstrapValidatorSetSize: 48n,
+  bootstrapFlushSize: 48n,
   normalFlushSizeMin: 1n,
   normalFlushSizeQuotient: 2475n,
   maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
 };
 
+const TestnetEntryQueueConfig = {
+  bootstrapValidatorSetSize: 256n,
+  bootstrapFlushSize: 256n,
+  normalFlushSizeMin: 4n,
+  normalFlushSizeQuotient: 2048n,
+  maxQueueFlushSize: 8n,
+};
+
+const StagingIgnitionEntryQueueConfig = {
+  bootstrapValidatorSetSize: 48n,
+  bootstrapFlushSize: 48n,
+  normalFlushSizeMin: 1n,
+  normalFlushSizeQuotient: 2048n,
+  maxQueueFlushSize: 24n,
+};
+
+const MainnetEntryQueueConfig = {
+  bootstrapValidatorSetSize: 1_000n,
+  bootstrapFlushSize: 1_000n,
+  normalFlushSizeMin: 1n,
+  normalFlushSizeQuotient: 2_048n,
+  maxQueueFlushSize: 8n,
+};
+
 export const getEntryQueueConfig = (networkName: NetworkNames) => {
-  if (networkName === 'alpha-testnet' || networkName === 'testnet') {
-    return TestnetEntryQueueConfig;
+  switch (networkName) {
+    case 'local':
+      return LocalEntryQueueConfig;
+    case 'next-net':
+      return LocalEntryQueueConfig;
+    case 'devnet':
+      return LocalEntryQueueConfig;
+    case 'staging-public':
+      return StagingPublicEntryQueueConfig;
+    case 'testnet':
+      return TestnetEntryQueueConfig;
+    case 'staging-ignition':
+      return StagingIgnitionEntryQueueConfig;
+    case 'mainnet':
+      return MainnetEntryQueueConfig;
+    default:
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
-  return LocalEntryQueueConfig;
 };
 
 export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
@@ -233,6 +324,16 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The target validator committee size.',
     ...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize),
   },
+  lagInEpochsForValidatorSet: {
+    env: 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
+    description: 'The number of epochs to lag behind the current epoch for validator selection.',
+    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForValidatorSet),
+  },
+  lagInEpochsForRandao: {
+    env: 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
+    description: 'The number of epochs to lag behind the current epoch for randao selection.',
+    ...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForRandao),
+  },
   aztecProofSubmissionEpochs: {
     env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
     description: 'The number of epochs after an epoch ends that proofs are still accepted.',
@@ -248,6 +349,12 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     description: 'The minimum stake for a validator.',
     ...bigintConfigHelper(DefaultL1ContractsConfig.ejectionThreshold),
   },
+  localEjectionThreshold: {
+    env: 'AZTEC_LOCAL_EJECTION_THRESHOLD',
+    description:
+      'The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup',
+    ...bigintConfigHelper(DefaultL1ContractsConfig.localEjectionThreshold),
+  },
   slashingOffsetInRounds: {
     env: 'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
     description:
@@ -300,6 +407,11 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
     parseEnv: (val: string) => EthAddress.fromString(val),
     defaultValue: DefaultL1ContractsConfig.slashingVetoer,
   },
+  slashingDisableDuration: {
+    env: 'AZTEC_SLASHING_DISABLE_DURATION',
+    description: 'How long slashing can be disabled for in seconds when vetoer disables it',
+    ...numberConfigHelper(DefaultL1ContractsConfig.slashingDisableDuration),
+  },
   governanceProposerQuorum: {
     env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
     description: 'The governance proposing quorum',
@@ -373,7 +485,7 @@ export function validateConfig(config: Omit<L1ContractsConfig, keyof L1TxUtilsCo
   }
 
   // EmpireBase constructor validations for governance/slashing proposers
-  // From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.GovernanceProposer__InvalidQuorumAndRoundSize(QUORUM_SIZE, ROUND_SIZE));
+  // From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.EmpireBase__InvalidQuorumAndRoundSize(QUORUM_SIZE, ROUND_SIZE));
   const { governanceProposerQuorum, governanceProposerRoundSize } = config;
   if (
     governanceProposerQuorum !== undefined &&
@@ -384,7 +496,7 @@ export function validateConfig(config: Omit<L1ContractsConfig, keyof L1TxUtilsCo
     );
   }
 
-  // From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.GovernanceProposer__QuorumCannotBeLargerThanRoundSize(QUORUM_SIZE, ROUND_SIZE));
+  // From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.EmpireBase__QuorumCannotBeLargerThanRoundSize(QUORUM_SIZE, ROUND_SIZE));
   if (governanceProposerQuorum !== undefined && governanceProposerQuorum > governanceProposerRoundSize) {
     errors.push(
       `governanceProposerQuorum (${governanceProposerQuorum}) cannot be larger than governanceProposerRoundSize (${governanceProposerRoundSize})`,