@aztec/cli 0.0.1-commit.1142ef1 → 0.0.1-commit.11bf3dd6e

package/src/config/generated/networks.ts

@@ -0,0 +1,220 @@
+// Auto-generated from spartan/environments/network-defaults.yml
+// Do not edit manually - run yarn generate to regenerate
+
+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_PROOF_SUBMISSION_EPOCHS: 1,
+  AZTEC_MANA_TARGET: 100000000,
+  AZTEC_PROVING_COST_PER_MANA: 100,
+  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
+  AZTEC_SLASHER_ENABLED: true,
+  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
+  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
+  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
+  AZTEC_SLASHING_VETOER: '0x0000000000000000000000000000000000000000',
+  AZTEC_SLASHING_DISABLE_DURATION: 432000,
+  AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
+  AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
+  AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
+  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
+  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
+  SLASH_MAX_PAYLOAD_SIZE: 80,
+  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
+  P2P_ENABLED: true,
+  BOOTSTRAP_NODES: '',
+  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,
+  DATA_STORE_MAP_SIZE_KB: 134217728,
+  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
+  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
+  NULLIFIER_TREE_MAP_SIZE_KB: 1073741824,
+  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,
+  AZTEC_EPOCH_DURATION: 8,
+  AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 1,
+  AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 1,
+  AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 1,
+  L1_CHAIN_ID: 11155111,
+  TEST_ACCOUNTS: true,
+  SPONSORED_FPC: true,
+  TRANSACTIONS_DISABLED: false,
+  SEQ_MAX_TX_PER_BLOCK: 18,
+  PROVER_REAL_PROOFS: false,
+  PXE_PROVER_ENABLED: false,
+  SYNC_SNAPSHOTS_URLS: '',
+  SKIP_ARCHIVER_INITIAL_SYNC: false,
+  BLOB_ALLOW_EMPTY_SOURCES: false,
+  P2P_MAX_PENDING_TX_COUNT: 1000,
+  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
+  PUBLIC_OTEL_OPT_OUT: true,
+  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
+  PUBLIC_OTEL_COLLECT_FROM: '',
+  SLASH_PRUNE_PENALTY: 10000000000000000000,
+  SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
+  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
+  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
+  SLASH_INACTIVITY_PENALTY: 10000000000000000000,
+  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
+  SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
+  SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
+  SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
+  SLASH_UNKNOWN_PENALTY: 10000000000000000000,
+  SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
+  SLASH_GRACE_PERIOD_L2_SLOTS: 0,
+  ENABLE_VERSION_CHECK: true,
+} as const;
+
+export const testnetConfig = {
+  ETHEREUM_SLOT_DURATION: 12,
+  AZTEC_EPOCH_DURATION: 32,
+  AZTEC_TARGET_COMMITTEE_SIZE: 48,
+  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_PROOF_SUBMISSION_EPOCHS: 1,
+  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
+  AZTEC_SLASHER_ENABLED: true,
+  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
+  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
+  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
+  AZTEC_SLASHING_DISABLE_DURATION: 432000,
+  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
+  SLASH_MAX_PAYLOAD_SIZE: 80,
+  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
+  P2P_ENABLED: true,
+  BOOTSTRAP_NODES: '',
+  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,
+  DATA_STORE_MAP_SIZE_KB: 134217728,
+  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
+  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
+  NULLIFIER_TREE_MAP_SIZE_KB: 1073741824,
+  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,
+  AZTEC_SLOT_DURATION: 72,
+  AZTEC_ACTIVATION_THRESHOLD: 2E+23,
+  AZTEC_EJECTION_THRESHOLD: 1E+23,
+  AZTEC_LOCAL_EJECTION_THRESHOLD: 1.99E+23,
+  AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 2,
+  AZTEC_SLASHING_VETOER: '0xdfe19Da6a717b7088621d8bBB66be59F2d78e924',
+  AZTEC_SLASHING_QUORUM: 33,
+  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
+  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
+  AZTEC_MANA_TARGET: 75000000,
+  AZTEC_PROVING_COST_PER_MANA: 25000000,
+  AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
+  AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
+  AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
+  L1_CHAIN_ID: 11155111,
+  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,
+  SLASH_PRUNE_PENALTY: 10000000000000000000,
+  SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
+  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
+  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
+  SLASH_INACTIVITY_PENALTY: 10000000000000000000,
+  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
+  SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
+  SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
+  SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
+  SLASH_UNKNOWN_PENALTY: 10000000000000000000,
+  SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
+  SLASH_GRACE_PERIOD_L2_SLOTS: 64,
+  ENABLE_VERSION_CHECK: true,
+} as const;
+
+export const mainnetConfig = {
+  ETHEREUM_SLOT_DURATION: 12,
+  AZTEC_EPOCH_DURATION: 32,
+  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_PROOF_SUBMISSION_EPOCHS: 1,
+  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
+  AZTEC_SLASHER_ENABLED: true,
+  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
+  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
+  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
+  SLASH_MAX_PAYLOAD_SIZE: 80,
+  SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
+  P2P_ENABLED: true,
+  BOOTSTRAP_NODES: '',
+  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,
+  DATA_STORE_MAP_SIZE_KB: 134217728,
+  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
+  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
+  NULLIFIER_TREE_MAP_SIZE_KB: 1073741824,
+  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,
+  AZTEC_SLOT_DURATION: 72,
+  AZTEC_ACTIVATION_THRESHOLD: 2E+23,
+  AZTEC_EJECTION_THRESHOLD: 1E+23,
+  AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
+  AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
+  AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
+  AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
+  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 34,
+  AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 28,
+  AZTEC_SLASHING_VETOER: '0xBbB4aF368d02827945748b28CD4b2D42e4A37480',
+  AZTEC_SLASHING_QUORUM: 65,
+  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
+  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
+  AZTEC_MANA_TARGET: 75000000,
+  AZTEC_PROVING_COST_PER_MANA: 25000000,
+  AZTEC_EXIT_DELAY_SECONDS: 345600,
+  AZTEC_SLASHING_DISABLE_DURATION: 259200,
+  AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
+  AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500,
+  AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1,
+  AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400,
+  AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4,
+  L1_CHAIN_ID: 1,
+  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,
+  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
+  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
+  PUBLIC_OTEL_COLLECT_FROM: '',
+  ENABLE_VERSION_CHECK: false,
+  SLASH_PRUNE_PENALTY: 0,
+  SLASH_DATA_WITHHOLDING_PENALTY: 0,
+  SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
+  SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
+  SLASH_INACTIVITY_PENALTY: 2E+21,
+  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
+  SLASH_DUPLICATE_PROPOSAL_PENALTY: 2E+21,
+  SLASH_DUPLICATE_ATTESTATION_PENALTY: 2E+21,
+  SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
+  SLASH_UNKNOWN_PENALTY: 2E+21,
+  SLASH_INVALID_BLOCK_PENALTY: 2E+21,
+  SLASH_GRACE_PERIOD_L2_SLOTS: 1200,
+} as const;
+

package/src/config/network_config.ts

@@ -9,7 +9,6 @@ import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
 const DEFAULT_CONFIG_URL =
   'https://raw.githubusercontent.com/AztecProtocol/networks/refs/heads/main/network_config.json';
 const FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/network_config.json';
-const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
 
 /**
  * Fetches remote network configuration from GitHub with caching support.
@@ -87,7 +86,6 @@ async function fetchNetworkConfigFromUrl(
 
   if (url.protocol === 'http:' || url.protocol === 'https:') {
     rawConfig = await cachedFetch(url.href, {
-      cacheDurationMs: NETWORK_CONFIG_CACHE_DURATION_MS,
       cacheFile: cacheDir ? join(cacheDir, networkName, 'network_config.json') : undefined,
     });
   } else if (url.protocol === 'file:') {
@@ -111,7 +109,7 @@ async function fetchNetworkConfigFromUrl(
 /**
  * Enriches environment variables with remote network configuration.
  * This function is called before node config initialization to set env vars
- * from the remote config, following the same pattern as enrichEnvironmentWithChainConfig().
+ * from the remote config.
  *
  * @param networkName - The network name to fetch remote config for
  * @throws Error if network config fetch fails (network errors, parse errors, etc.)
@@ -141,7 +139,13 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
   if (networkConfig.blobFileStoreUrls?.length) {
     enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
   }
+  if (networkConfig.txCollectionFileStoreUrls?.length) {
+    enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
+  }
   if (networkConfig.blockDurationMs !== undefined) {
     enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
   }
+  if (networkConfig.txPublicSetupAllowListExtend) {
+    enrichVar('TX_PUBLIC_SETUP_ALLOWLIST', networkConfig.txPublicSetupAllowListExtend);
+  }
 }

package/src/utils/aztec.ts

@@ -49,7 +49,7 @@ export async function deployNewRollupContracts(
   feeJuicePortalInitialBalance: bigint,
   config: L1ContractsConfig,
   realVerifier: boolean,
-): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
+): Promise<{ rollup: RollupContract }> {
   const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
   const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
@@ -80,23 +80,17 @@ export async function deployNewRollupContracts(
     logger.info('Initializing new rollup with old attesters', { initialValidators });
   }
 
-  const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(
-    privateKey as Hex,
-    rpcUrls[0],
-    chainId,
-    registryAddress,
-    {
-      vkTreeRoot: getVKTreeRoot(),
-      protocolContractsHash,
-      genesisArchiveRoot,
-      initialValidators,
-      feeJuicePortalInitialBalance,
-      realVerifier,
-      ...config,
-    },
-  );
-
-  return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
+  const { rollup } = await deployRollupForUpgrade(privateKey as Hex, rpcUrls[0], chainId, registryAddress, {
+    vkTreeRoot: getVKTreeRoot(),
+    protocolContractsHash,
+    genesisArchiveRoot,
+    initialValidators,
+    feeJuicePortalInitialBalance,
+    realVerifier,
+    ...config,
+  });
+
+  return { rollup };
 }
 
 /**

package/src/utils/inspect.ts

@@ -44,7 +44,10 @@ export async function inspectTx(
   const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
   // Base tx data
   log(`Tx ${txHash.toString()}`);
-  log(` Status: ${receipt.status} ${effectsInBlock ? `(${effectsInBlock.data.revertCode.getDescription()})` : ''}`);
+  log(` Status: ${receipt.status}`);
+  if (receipt.executionResult) {
+    log(` Execution result: ${receipt.executionResult}`);
+  }
   if (receipt.error) {
     log(` Error: ${receipt.error}`);
   }