@aztec/cli 0.0.1-commit.3469e52 → 0.0.1-commit.350e0a4d

package/src/config/generated/networks.ts

@@ -3,17 +3,16 @@
 
 export const devnetConfig = {
   ETHEREUM_SLOT_DURATION: 12,
-  AZTEC_SLOT_DURATION: 36,
-  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,
-  AZTEC_SLASHER_FLAVOR: 'tally',
+  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,
@@ -23,15 +22,21 @@ export const devnetConfig = {
   AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
   AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
   AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
-  SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
-  SLASH_MAX_PENALTY_PERCENTAGE: 2,
+  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: 50,
+  SLASH_MAX_PAYLOAD_SIZE: 80,
   SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
+  SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
   P2P_ENABLED: true,
   BOOTSTRAP_NODES: '',
-  SEQ_MIN_TX_PER_BLOCK: 0,
+  SEQ_MIN_TX_PER_BLOCK: 1,
   SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
+  SEQ_BLOCK_DURATION_MS: 6000,
+  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,
@@ -39,15 +44,21 @@ 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,
   TRANSACTIONS_DISABLED: false,
-  SEQ_MAX_TX_PER_BLOCK: 32,
+  SEQ_MAX_TX_PER_BLOCK: 18,
   PROVER_REAL_PROOFS: false,
   PXE_PROVER_ENABLED: false,
   SYNC_SNAPSHOTS_URLS: '',
@@ -55,21 +66,23 @@ export const devnetConfig = {
   BLOB_ALLOW_EMPTY_SOURCES: false,
   P2P_MAX_PENDING_TX_COUNT: 1000,
   P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
-  AUTO_UPDATE: 'none',
-  AUTO_UPDATE_URL: '',
   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_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
+  SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
+  SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
+  SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
+  SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 10000000000000000000,
   SLASH_UNKNOWN_PENALTY: 10000000000000000000,
   SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
+  SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
   SLASH_GRACE_PERIOD_L2_SLOTS: 0,
+  ENABLE_AUTO_SHUTDOWN: false,
 } as const;
 
 export const testnetConfig = {
@@ -79,26 +92,30 @@ 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_PROVING_COST_PER_MANA: 100,
-  AZTEC_SLASHER_FLAVOR: 'tally',
+  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,
-  AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
-  AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
-  AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
-  SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
-  SLASH_MAX_PENALTY_PERCENTAGE: 2,
+  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: 50,
+  SLASH_MAX_PAYLOAD_SIZE: 80,
   SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
+  SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
   P2P_ENABLED: true,
   BOOTSTRAP_NODES: '',
-  SEQ_MIN_TX_PER_BLOCK: 0,
+  SEQ_MIN_TX_PER_BLOCK: 1,
   SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
+  SEQ_BLOCK_DURATION_MS: 6000,
+  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,
@@ -106,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,
@@ -115,45 +133,58 @@ export const testnetConfig = {
   AZTEC_SLASHING_QUORUM: 33,
   AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
   AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
-  AZTEC_MANA_TARGET: 150000000,
+  AZTEC_MANA_TARGET: 75000000,
+  AZTEC_PROVING_COST_PER_MANA: 12500000,
+  AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
+  AZTEC_SLASH_AMOUNT_MEDIUM: 2.5E+23,
+  AZTEC_SLASH_AMOUNT_LARGE: 2.5E+23,
   L1_CHAIN_ID: 11155111,
   TEST_ACCOUNTS: false,
-  SPONSORED_FPC: true,
+  SPONSORED_FPC: false,
   TRANSACTIONS_DISABLED: false,
-  SEQ_MAX_TX_PER_BLOCK: 8,
+  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_DATA_WITHHOLDING_PENALTY: 0,
   SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
   SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
-  SLASH_INACTIVITY_PENALTY: 10000000000000000000,
-  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
-  SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
-  SLASH_UNKNOWN_PENALTY: 10000000000000000000,
-  SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
+  SLASH_INACTIVITY_PENALTY: 1E+23,
+  SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 1E+23,
+  SLASH_DUPLICATE_PROPOSAL_PENALTY: 2.5E+23,
+  SLASH_DUPLICATE_ATTESTATION_PENALTY: 2.5E+23,
+  SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
+  SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
+  SLASH_UNKNOWN_PENALTY: 1E+23,
+  SLASH_INVALID_BLOCK_PENALTY: 1E+23,
+  SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 1E+23,
   SLASH_GRACE_PERIOD_L2_SLOTS: 64,
+  ENABLE_AUTO_SHUTDOWN: false,
 } 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_INBOX_LAG: 2,
   AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
-  AZTEC_SLASHER_FLAVOR: 'tally',
+  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_MIN_PENALTY_PERCENTAGE: 0.5,
-  SLASH_MAX_PENALTY_PERCENTAGE: 2,
   SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
-  SLASH_MAX_PAYLOAD_SIZE: 50,
+  SLASH_MAX_PAYLOAD_SIZE: 80,
   SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
+  SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS: 3,
   P2P_ENABLED: true,
   BOOTSTRAP_NODES: '',
-  SEQ_MIN_TX_PER_BLOCK: 0,
+  SEQ_MIN_TX_PER_BLOCK: 1,
   SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
+  SEQ_BLOCK_DURATION_MS: 6000,
+  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,
@@ -161,47 +192,53 @@ 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_TARGET_COMMITTEE_SIZE: 24,
   AZTEC_ACTIVATION_THRESHOLD: 2E+23,
   AZTEC_EJECTION_THRESHOLD: 1E+23,
-  AZTEC_LOCAL_EJECTION_THRESHOLD: 1.96E+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_SLASH_AMOUNT_MEDIUM: 5E+21,
+  AZTEC_SLASH_AMOUNT_LARGE: 5E+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: 0,
-  AZTEC_PROVING_COST_PER_MANA: 0,
+  AZTEC_MANA_TARGET: 75000000,
+  AZTEC_PROVING_COST_PER_MANA: 12500000,
   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: true,
-  SEQ_MAX_TX_PER_BLOCK: 0,
+  TRANSACTIONS_DISABLED: false,
+  SEQ_MAX_TX_PER_CHECKPOINT: 72,
   PROVER_REAL_PROOFS: true,
-  SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
   BLOB_ALLOW_EMPTY_SOURCES: true,
-  P2P_MAX_PENDING_TX_COUNT: 0,
+  P2P_MAX_PENDING_TX_COUNT: 1000,
   P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
-  AUTO_UPDATE: 'notify',
-  AUTO_UPDATE_URL: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
-  PUBLIC_OTEL_COLLECT_FROM: 'sequencer',
-  SLASH_PRUNE_PENALTY: 0,
+  PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
+  PUBLIC_OTEL_COLLECT_FROM: '',
+  ENABLE_AUTO_SHUTDOWN: false,
   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_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
+  SLASH_DUPLICATE_PROPOSAL_PENALTY: 5E+21,
+  SLASH_DUPLICATE_ATTESTATION_PENALTY: 5E+21,
+  SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY: 0,
+  SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY: 0,
   SLASH_UNKNOWN_PENALTY: 2E+21,
   SLASH_INVALID_BLOCK_PENALTY: 2E+21,
+  SLASH_INVALID_CHECKPOINT_PROPOSAL_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:') {
@@ -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/commands.ts

@@ -5,13 +5,15 @@ import type { PXE } from '@aztec/pxe/server';
 import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import { LogId } from '@aztec/stdlib/logs/log-id';
+import { LogCursor, Tag } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx/tx-hash';
 
 import { type Command, CommanderError, InvalidArgumentError, Option } from 'commander';
 import { lookup } from 'dns/promises';
 import { rename, writeFile } from 'fs/promises';
 
+export { LogCursor };
+
 /**
  * If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
  * localhost as being host.docker.internal.
@@ -99,7 +101,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}`);
     }
@@ -193,7 +195,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}`);
   }
@@ -227,16 +229,27 @@ export function parseOptionalAztecAddress(address: string): AztecAddress | undef
 }
 
 /**
- * Parses an optional log ID string into a LogId object.
- *
- * @param logId - The log ID string to parse.
- * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
+ * Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
+ * used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
+ * Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
+ * {@link InvalidArgumentError}.
  */
-export function parseOptionalLogId(logId: string): LogId | undefined {
-  if (!logId) {
-    return undefined;
+export function parseOptionalLogCursor(value: string): LogCursor | undefined {
+  try {
+    return LogCursor.parseOptional(value);
+  } catch (err) {
+    throw new InvalidArgumentError(err instanceof Error ? err.message : String(err));
   }
-  return LogId.fromString(logId);
+}
+
+/**
+ * Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
+ *
+ * @param tag - A hex string, integer, or boolean string representing the tag.
+ * @returns A {@link Tag} wrapping the parsed field.
+ */
+export function parseTag(tag: string): Tag {
+  return new Tag(parseField(tag));
 }
 
 /**

package/src/utils/inspect.ts

@@ -9,14 +9,13 @@ export async function inspectBlock(
   log: LogFn,
   opts: { showTxs?: boolean } = {},
 ) {
-  const block = await aztecNode.getBlock(blockNumber);
+  const block = await aztecNode.getBlock(blockNumber, { includeTransactions: opts.showTxs });
   if (!block) {
     log(`No block found for block number ${blockNumber}`);
     return;
   }
 
-  const blockHash = await block.hash();
-  log(`Block ${blockNumber} (${blockHash.toString()})`);
+  log(`Block ${blockNumber} (${block.hash.toString()})`);
   log(` Total fees: ${block.header.totalFees.toBigInt()}`);
   log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
   log(
@@ -25,12 +24,12 @@ export async function inspectBlock(
   log(` Coinbase: ${block.header.globalVariables.coinbase}`);
   log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
   log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
-  if (opts.showTxs) {
+  if (opts.showTxs && block.body) {
     log(``);
     for (const txHash of block.body.txEffects.map(tx => tx.txHash)) {
       await inspectTx(aztecNode, txHash, log, { includeBlockInfo: false });
     }
-  } else {
+  } else if (block.body) {
     log(` Transactions: ${block.body.txEffects.length}`);
   }
 }
@@ -41,19 +40,22 @@ export async function inspectTx(
   log: LogFn,
   opts: { includeBlockInfo?: boolean } = {},
 ) {
-  const [receipt, effectsInBlock] = await Promise.all([aztecNode.getTxReceipt(txHash), aztecNode.getTxEffect(txHash)]);
+  const receipt = await aztecNode.getTxReceipt(txHash, { includeTxEffect: true });
   // 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}`);
   }
 
-  if (!effectsInBlock) {
+  if (!receipt.isMined() || !receipt.txEffect) {
     return;
   }
 
-  const effects = effectsInBlock.data;
+  const effects = receipt.txEffect;
 
   if (opts.includeBlockInfo) {
     log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);