@aztec/cli 0.0.1-commit.b655e406 → 0.0.1-commit.b8a057fa

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@aztec/cli",
-  "version": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.b8a057fa",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
     "./devnet": "./dest/cmds/devnet/index.js",
     "./infrastructure": "./dest/cmds/infrastructure/index.js",
     "./l1": "./dest/cmds/l1/index.js",
+    "./l1/validators": "./dest/cmds/l1/update_l1_validators.js",
     "./aztec_node": "./dest/cmds/aztec_node/index.js",
     "./cli-utils": "./dest/utils/index.js",
     "./misc": "./dest/cmds/misc/index.js",
@@ -14,7 +15,9 @@
     "./setup-contracts": "./dest/cmds/misc/setup_contracts.js",
     "./utils": "./dest/utils/index.js",
     "./inspect": "./dest/utils/inspect.js",
-    "./config": "./dest/config/index.js"
+    "./config": "./dest/config/index.js",
+    "./config/chain": "./dest/config/chain_l2_config.js",
+    "./config/network": "./dest/config/network_config.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -24,13 +27,16 @@
     "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",
+    "copy-generated": "mkdir -p dest/config/generated/networks && cp src/config/generated/networks/*.json dest/config/generated/networks/",
+    "generate": "./scripts/generate.sh",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
-    "../package.common.json"
+    "../package.common.json",
+    "./package.local.json"
   ],
   "jest": {
     "preset": "ts-jest/presets/default-esm",
@@ -71,21 +77,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.b655e406",
-    "@aztec/archiver": "0.0.1-commit.b655e406",
-    "@aztec/aztec.js": "0.0.1-commit.b655e406",
-    "@aztec/constants": "0.0.1-commit.b655e406",
-    "@aztec/entrypoints": "0.0.1-commit.b655e406",
-    "@aztec/ethereum": "0.0.1-commit.b655e406",
-    "@aztec/foundation": "0.0.1-commit.b655e406",
-    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
-    "@aztec/node-keystore": "0.0.1-commit.b655e406",
-    "@aztec/node-lib": "0.0.1-commit.b655e406",
-    "@aztec/p2p": "0.0.1-commit.b655e406",
-    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406",
-    "@aztec/test-wallet": "0.0.1-commit.b655e406",
-    "@aztec/world-state": "0.0.1-commit.b655e406",
+    "@aztec/accounts": "0.0.1-commit.b8a057fa",
+    "@aztec/archiver": "0.0.1-commit.b8a057fa",
+    "@aztec/aztec.js": "0.0.1-commit.b8a057fa",
+    "@aztec/constants": "0.0.1-commit.b8a057fa",
+    "@aztec/entrypoints": "0.0.1-commit.b8a057fa",
+    "@aztec/ethereum": "0.0.1-commit.b8a057fa",
+    "@aztec/foundation": "0.0.1-commit.b8a057fa",
+    "@aztec/l1-artifacts": "0.0.1-commit.b8a057fa",
+    "@aztec/node-keystore": "0.0.1-commit.b8a057fa",
+    "@aztec/node-lib": "0.0.1-commit.b8a057fa",
+    "@aztec/p2p": "0.0.1-commit.b8a057fa",
+    "@aztec/protocol-contracts": "0.0.1-commit.b8a057fa",
+    "@aztec/sequencer-client": "0.0.1-commit.b8a057fa",
+    "@aztec/slasher": "0.0.1-commit.b8a057fa",
+    "@aztec/stdlib": "0.0.1-commit.b8a057fa",
+    "@aztec/wallets": "0.0.1-commit.b8a057fa",
+    "@aztec/world-state": "0.0.1-commit.b8a057fa",
     "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
@@ -96,9 +104,12 @@
     "semver": "^7.5.4",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
+    "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
+    "@aztec/aztec-node": "0.0.1-commit.b8a057fa",
+    "@aztec/kv-store": "0.0.1-commit.b8a057fa",
+    "@aztec/telemetry-client": "0.0.1-commit.b8a057fa",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -107,6 +118,7 @@
     "@types/node": "^22.15.17",
     "@types/semver": "^7.5.2",
     "@types/source-map-support": "^0.5.10",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-jest": "^29.4.0",
@@ -114,20 +126,21 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.0.1-commit.b655e406",
-    "@aztec/bb-prover": "0.0.1-commit.b655e406",
-    "@aztec/ethereum": "0.0.1-commit.b655e406",
-    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
-    "@aztec/noir-contracts.js": "0.0.1-commit.b655e406",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b655e406",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.b655e406",
-    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406"
+    "@aztec/accounts": "0.0.1-commit.b8a057fa",
+    "@aztec/bb-prover": "0.0.1-commit.b8a057fa",
+    "@aztec/ethereum": "0.0.1-commit.b8a057fa",
+    "@aztec/l1-artifacts": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-contracts.js": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.b8a057fa",
+    "@aztec/protocol-contracts": "0.0.1-commit.b8a057fa",
+    "@aztec/stdlib": "0.0.1-commit.b8a057fa"
   },
   "files": [
     "dest",
     "src",
-    "!*.test.*"
+    "!*.test.*",
+    "public_include_metric_prefixes.json"
   ],
   "types": "./dest/index.d.ts",
   "engines": {

package/public_include_metric_prefixes.json

@@ -0,0 +1 @@
+["aztec.validator", "aztec.tx_collector", "aztec.mempool", "aztec.p2p.gossip.agg_", "aztec.ivc_verifier.agg_"]

package/src/cmds/aztec_node/block_number.ts

@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 
 export async function blockNumber(nodeUrl: string, log: LogFn) {
   const aztecNode = createAztecNodeClient(nodeUrl);
-  const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getProvenBlockNumber()]);
+  const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getBlockNumber('proven')]);
   log(`Latest block: ${latestNum}`);
   log(`Proven block: ${provenNum}`);
 }

package/src/cmds/aztec_node/get_block.ts

@@ -1,10 +1,11 @@
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import type { LogFn } from '@aztec/foundation/log';
 
 import { inspectBlock } from '../../utils/inspect.js';
 
 export async function getBlock(nodeUrl: string, maybeBlockNumber: number | undefined, log: LogFn) {
   const aztecNode = createAztecNodeClient(nodeUrl);
-  const blockNumber = maybeBlockNumber ?? (await aztecNode.getBlockNumber());
+  const blockNumber: BlockNumber = maybeBlockNumber ? BlockNumber(maybeBlockNumber) : await aztecNode.getBlockNumber();
   await inspectBlock(aztecNode, blockNumber, log, { showTxs: true });
 }

package/src/cmds/aztec_node/{get_current_base_fee.ts → get_current_min_fee.ts}

@@ -2,8 +2,8 @@ import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
-export async function getCurrentBaseFee(nodeUrl: string, debugLogger: Logger, log: LogFn) {
+export async function getCurrentMinFee(nodeUrl: string, debugLogger: Logger, log: LogFn) {
   const node = createAztecNodeClient(nodeUrl);
-  const fees = await node.getCurrentBaseFees();
+  const fees = await node.getCurrentMinFees();
   log(`Current fees: ${jsonStringify(fees)}`);
 }

package/src/cmds/aztec_node/get_logs.ts

@@ -1,21 +1,47 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { LogFilter, LogId } from '@aztec/aztec.js/log';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import type { TxHash } from '@aztec/aztec.js/tx';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { LogFn } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
+import {
+  LogCursor,
+  type PublicLogsQuery,
+  type Tag,
+  logResultToHumanReadable,
+  queryAllPublicLogsByTags,
+} from '@aztec/stdlib/logs';
 
-export async function getLogs(
-  txHash: TxHash,
-  fromBlock: number,
-  toBlock: number,
-  afterLog: LogId,
-  contractAddress: AztecAddress,
-  nodeUrl: string,
-  follow: boolean,
-  log: LogFn,
-) {
-  const node = createAztecNodeClient(nodeUrl);
+/** Options for the `get-logs` CLI command. */
+export type GetLogsOptions = {
+  /** Contract address that emitted the logs (required). */
+  contractAddress: AztecAddress;
+  /** Tag to filter logs by (required). */
+  tag: Tag;
+  /** Restrict the search to this tx hash. Mutually exclusive with `fromBlock`/`toBlock`. */
+  txHash?: TxHash;
+  /** Lower block bound, inclusive. */
+  fromBlock?: BlockNumber;
+  /** Upper block bound, exclusive. */
+  toBlock?: BlockNumber;
+  /** Log cursor to resume pagination strictly after a previously-seen log. */
+  afterLog?: LogCursor;
+  /** Node RPC URL. */
+  nodeUrl: string;
+  /** When set, polls indefinitely for new logs. Incompatible with `txHash` and `toBlock`. */
+  follow: boolean;
+  /** Log function. */
+  log: LogFn;
+};
+
+/**
+ * Fetches public logs for a (contract, tag) pair, draining all pages via the stdlib pagination helper.
+ * In `--follow` mode, polls indefinitely: each round drains all currently-available logs, then sleeps
+ * until the next poll if nothing new was found.
+ */
+export async function getLogs(options: GetLogsOptions): Promise<void> {
+  const { txHash, fromBlock, toBlock, contractAddress, tag, nodeUrl, follow, log } = options;
+  let afterLog = options.afterLog;
 
   if (follow) {
     if (txHash) {
@@ -25,43 +51,50 @@ export async function getLogs(
       throw Error('Cannot use --follow with --to-block');
     }
   }
+  if (txHash !== undefined && (fromBlock !== undefined || toBlock !== undefined)) {
+    throw Error('Cannot combine --tx-hash with --from-block / --to-block');
+  }
 
-  const filter: LogFilter = { txHash, fromBlock, toBlock, afterLog, contractAddress };
-
-  const fetchLogs = async () => {
-    const response = await node.getPublicLogs(filter);
-    const logs = response.logs;
+  const node = createAztecNodeClient(nodeUrl);
 
-    if (!logs.length) {
-      const filterOptions = Object.entries(filter)
-        .filter(([, value]) => value !== undefined)
-        .map(([key, value]) => `${key}: ${value}`)
-        .join(', ');
-      if (!follow) {
-        log(`No logs found for filter: {${filterOptions}}`);
-      }
-    } else {
-      if (!follow && !filter.afterLog) {
-        log('Logs found: \n');
-      }
-      logs.forEach(publicLog => log(publicLog.toHumanReadable()));
-      // Set the continuation parameter for the following requests
-      filter.afterLog = logs[logs.length - 1].id;
+  const drainLogs = async () => {
+    const query: PublicLogsQuery = {
+      contractAddress,
+      tags: [afterLog !== undefined ? { tag, afterLog } : tag],
+      fromBlock,
+      toBlock,
+      txHash,
+    };
+    const [logsForTag] = await queryAllPublicLogsByTags(node, query);
+    if (logsForTag.length > 0) {
+      afterLog = LogCursor.fromLog(logsForTag[logsForTag.length - 1]);
     }
-    return response.maxLogsHit;
+    return logsForTag;
   };
 
   if (follow) {
     log('Fetching logs...');
     while (true) {
-      const maxLogsHit = await fetchLogs();
-      if (!maxLogsHit) {
+      const results = await drainLogs();
+      if (results.length === 0) {
         await sleep(1000);
+      } else {
+        results.forEach(r => log(logResultToHumanReadable(r)));
       }
     }
   } else {
-    while (await fetchLogs()) {
-      // Keep fetching logs until we reach the end.
+    const results = await drainLogs();
+    if (results.length === 0) {
+      log(
+        `No logs found for {contractAddress: ${contractAddress.toString()}, tag: ${tag.toString()}` +
+          `${txHash ? `, txHash: ${txHash.toString()}` : ''}` +
+          `${fromBlock !== undefined ? `, fromBlock: ${fromBlock}` : ''}` +
+          `${toBlock !== undefined ? `, toBlock: ${toBlock}` : ''}` +
+          `${afterLog ? `, afterLog: ${afterLog.toString()}` : ''}}`,
+      );
+    } else {
+      log('Logs found: \n');
+      results.forEach(r => log(logResultToHumanReadable(r)));
     }
   }
 }

package/src/cmds/aztec_node/get_node_info.ts

@@ -23,7 +23,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
         rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
         governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
         governance: info.l1ContractAddresses.governanceAddress.toString(),
-        slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
         feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
         stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
       },
@@ -51,7 +50,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
     log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
     log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
-    log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
     log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`L2 Contract Addresses:`);

package/src/cmds/aztec_node/index.ts

@@ -7,10 +7,10 @@ import {
   nodeOption,
   parseAztecAddress,
   parseField,
-  parseOptionalAztecAddress,
   parseOptionalInteger,
-  parseOptionalLogId,
+  parseOptionalLogCursor,
   parseOptionalTxHash,
+  parseTag,
 } from '../../utils/commands.js';
 
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
@@ -25,12 +25,12 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     });
 
   program
-    .command('get-current-base-fee')
+    .command('get-current-min-fee')
     .description('Gets the current base fee.')
     .addOption(nodeOption)
     .action(async options => {
-      const { getCurrentBaseFee } = await import('./get_current_base_fee.js');
-      await getCurrentBaseFee(options.rpcUrl, debugLogger, log);
+      const { getCurrentMinFee } = await import('./get_current_min_fee.js');
+      await getCurrentMinFee(options.rpcUrl, debugLogger, log);
     });
 
   program
@@ -47,21 +47,26 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
 
   program
     .command('get-logs')
-    .description('Gets all the public logs from an intersection of all the filter params.')
-    .option('-tx, --tx-hash <txHash>', 'A transaction hash to get the receipt for.', parseOptionalTxHash)
+    .description('Gets public logs for a contract and tag, optionally restricted by block range or tx hash.')
+    .requiredOption('-ca, --contract-address <address>', 'Contract address that emitted the logs.', parseAztecAddress)
+    .requiredOption('--tag <tag>', 'Tag (Fr value) to filter logs by.', parseTag)
+    .option('-tx, --tx-hash <txHash>', 'A transaction hash to restrict the search to.', parseOptionalTxHash)
     .option(
       '-fb, --from-block <blockNum>',
       'Initial block number for getting logs (defaults to 1).',
       parseOptionalInteger,
     )
     .option('-tb, --to-block <blockNum>', 'Up to which block to fetch logs (defaults to latest).', parseOptionalInteger)
-    .option('-al --after-log <logId>', 'ID of a log after which to fetch the logs.', parseOptionalLogId)
-    .option('-ca, --contract-address <address>', 'Contract address to filter logs by.', parseOptionalAztecAddress)
+    .option(
+      '-al --after-log <cursor>',
+      'Log cursor of the form <blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx> to resume pagination after.',
+      parseOptionalLogCursor,
+    )
     .addOption(nodeOption)
     .option('--follow', 'If set, will keep polling for new logs until interrupted.')
-    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, aztecNodeRpcUrl: nodeUrl, follow }) => {
+    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, tag, nodeUrl, follow }) => {
       const { getLogs } = await import('./get_logs.js');
-      await getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, nodeUrl, follow, log);
+      await getLogs({ txHash, fromBlock, toBlock, afterLog, contractAddress, tag, nodeUrl, follow, log });
     });
 
   program

package/src/cmds/contracts/inspect_contract.ts

@@ -1,4 +1,4 @@
-import { sha256 } from '@aztec/foundation/crypto';
+import { sha256 } from '@aztec/foundation/crypto/sha256';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import {
   type FunctionArtifact,
@@ -29,16 +29,9 @@ export async function inspectContract(contractArtifactFile: string, debugLogger:
   log(`\tpublic bytecode commitment: ${contractClass.publicBytecodeCommitment.toString()}`);
   log(`\tpublic bytecode length: ${contractClass.packedBytecode.length} bytes (${bytecodeLengthInFields} fields)`);
 
-  const externalFunctions = contractFns.filter(f => !f.isInternal);
-  if (externalFunctions.length > 0) {
-    log(`\nExternal functions:`);
-    await Promise.all(externalFunctions.map(f => logFunction(f, log)));
-  }
-
-  const internalFunctions = contractFns.filter(f => f.isInternal);
-  if (internalFunctions.length > 0) {
-    log(`\nInternal functions:`);
-    await Promise.all(internalFunctions.map(f => logFunction(f, log)));
+  if (contractFns.length > 0) {
+    log(`\nExternal contract functions:`);
+    await Promise.all(contractFns.map(f => logFunction(f, log)));
   }
 }
 

package/src/cmds/infrastructure/index.ts

@@ -44,7 +44,6 @@ export function injectCommands(program: Command, log: LogFn) {
         nodeUrl: options.nodeUrl,
         l1RpcUrls: options.l1RpcUrls,
         chainId: options.l1ChainId,
-        blockNumber: options.blockNumber,
         log,
       });
     });

package/src/cmds/infrastructure/sequencers.ts

@@ -1,6 +1,8 @@
 import { Fr } from '@aztec/aztec.js/fields';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
-import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
 import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
@@ -15,7 +17,6 @@ export async function sequencers(opts: {
   nodeUrl: string;
   l1RpcUrls: string[];
   chainId: number;
-  blockNumber?: number;
   log: LogFn;
 }) {
   const { command, who: maybeWho, mnemonic, bn254SecretKey, nodeUrl, l1RpcUrls, chainId, log } = opts;
@@ -25,14 +26,14 @@ export async function sequencers(opts: {
   const chain = createEthereumChain(l1RpcUrls, chainId);
   const publicClient = createPublicClient({
     chain: chain.chainInfo,
-    transport: fallback(l1RpcUrls.map(url => http(url))),
+    transport: fallback(l1RpcUrls.map(url => http(url, { batch: false }))),
   });
 
   const walletClient = mnemonic
     ? createWalletClient({
         account: mnemonicToAccount(mnemonic),
         chain: chain.chainInfo,
-        transport: fallback(l1RpcUrls.map(url => http(url))),
+        transport: fallback(l1RpcUrls.map(url => http(url, { batch: false }))),
       })
     : undefined;
 
@@ -65,8 +66,9 @@ export async function sequencers(opts: {
 
     log(`Adding ${who} as sequencer`);
 
+    const stakingAssetAddress = await rollup.getStakingAsset();
     const stakingAsset = getContract({
-      address: await rollup.getStakingAsset(),
+      address: stakingAssetAddress.toString(),
       abi: TestERC20Abi,
       client: walletClient,
     });

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -1,33 +1,38 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { WaitOpts } from '@aztec/aztec.js/contracts';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { TxStatus } from '@aztec/aztec.js/tx';
 import { AccountManager } from '@aztec/aztec.js/wallet';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { createFundedInitializerlessAccounts } from '@aztec/wallets/testing';
 
 export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
+    // The embedded wallet defaults to PROPOSED, which can be dropped if its proposed block is pruned
+    // before the checkpoint lands. Wait for the checkpoint so serial setup is reliable.
+    waitForStatus: TxStatus.CHECKPOINTED,
   };
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
   log('setupL2Contracts: Creating PXE client...');
   const node = createAztecNodeClient(nodeUrl);
-  const wallet = await TestWallet.create(node);
+  const wallet = await EmbeddedWallet.create(node);
 
-  let deployedAccountManagers: AccountManager[] = [];
+  let accountManagers: AccountManager[] = [];
   if (testAccounts) {
-    log('setupL2Contracts: Deploying test accounts...');
+    log('setupL2Contracts: Creating test accounts...');
     const initialAccountsData = await getInitialTestAccountsData();
-    deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccountsData, waitOpts);
+    accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccountsData);
   }
 
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
-    deployedAccountManagers.forEach((a, i) => {
+    accountManagers.forEach((a, i) => {
       toPrint[`testAccount${i}`] = a.address;
     });
     log(JSON.stringify(toPrint, null, 2));

package/src/cmds/l1/assume_proven_through.ts

@@ -1,20 +1,20 @@
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { RollupCheatCodes } from '@aztec/ethereum/test';
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { LogFn } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 
 export async function assumeProvenThrough(
-  blockNumberOrLatest: number | undefined,
+  checkpointOrLatest: CheckpointNumber | undefined,
   l1RpcUrls: string[],
   nodeUrl: string,
   log: LogFn,
 ) {
   const aztecNode = createAztecNodeClient(nodeUrl);
   const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
-  const blockNumber = blockNumberOrLatest ?? (await aztecNode.getBlockNumber());
 
   const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
 
-  await rollupCheatCodes.markAsProven(blockNumber);
-  log(`Assumed proven through block ${blockNumber}`);
+  await rollupCheatCodes.markAsProven(checkpointOrLatest);
+  log(`Assumed proven through checkpoint ${checkpointOrLatest ?? 'latest'}`);
 }

package/src/cmds/l1/bridge_erc20.ts

@@ -1,7 +1,8 @@
 import type { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
 import { L1ToL2TokenPortalManager } from '@aztec/aztec.js/ethereum';
 import type { Fr } from '@aztec/aztec.js/fields';
-import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import { prettyPrintJSON } from '../../utils/commands.js';

package/src/cmds/l1/compute_genesis_values.ts

@@ -0,0 +1,29 @@
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import type { LogFn } from '@aztec/foundation/log';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { getGenesisValues } from '@aztec/world-state/testing';
+
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
+
+/** Computes and prints genesis values needed for L1 contract deployment. */
+export async function computeGenesisValuesCmd(testAccounts: boolean, sponsoredFPC: boolean, log: LogFn) {
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
+  const sponsoredFPCAddresses = sponsoredFPC ? await getSponsoredFPCAddress() : [];
+  const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddresses);
+  const { genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
+
+  const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
+  const vkTreeRoot = getVKTreeRoot();
+
+  log(
+    JSON.stringify(
+      {
+        vkTreeRoot: vkTreeRoot.toString(),
+        protocolContractsHash: protocolContractsHash.toString(),
+        genesisArchiveRoot: genesisArchiveRoot.toString(),
+      },
+      null,
+      2,
+    ),
+  );
+}