@aztec/cli 3.0.0-nightly.20250918 → 3.0.0-nightly.20250920

package/src/cmds/devnet/bootstrap_network.ts

@@ -1,14 +1,15 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import {
   AztecAddress,
+  type AztecNode,
   BatchCall,
   EthAddress,
   Fr,
   L1FeeJuicePortalManager,
-  type PXE,
   type WaitForProvenOpts,
   type WaitOpts,
   type Wallet,
+  createAztecNodeClient,
   createCompatibleClient,
   retryUntil,
   waitForProven,
@@ -44,6 +45,7 @@ const provenWaitOpts: WaitForProvenOpts = {
 
 export async function bootstrapNetwork(
   pxeUrl: string,
+  nodeUrl: string,
   l1Urls: string[],
   l1ChainId: string,
   l1PrivateKey: `0x${string}` | undefined,
@@ -54,7 +56,8 @@ export async function bootstrapNetwork(
   debugLog: Logger,
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
-  const wallet = new TestWallet(pxe);
+  const node = createAztecNodeClient(nodeUrl);
+  const wallet = new TestWallet(pxe, node);
 
   // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
   // so all we need to do is register them to our pxe.
@@ -81,14 +84,14 @@ export async function bootstrapNetwork(
 
   const { token, bridge } = await deployToken(wallet, defaultAccountAddress, portalAddress);
 
-  await initPortal(pxe, l1Client, erc20Address, portalAddress, bridge.address);
+  await initPortal(node, l1Client, erc20Address, portalAddress, bridge.address);
 
   const fpcAdmin = defaultAccountAddress;
   const fpc = await deployFPC(wallet, defaultAccountAddress, token.address, fpcAdmin);
 
   const counter = await deployCounter(wallet, defaultAccountAddress);
 
-  await fundFPC(pxe, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
+  await fundFPC(node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
 
   if (json) {
     log(
@@ -215,7 +218,7 @@ async function deployToken(
  * Step 3. Initialize DevCoin's L1 portal
  */
 async function initPortal(
-  pxe: PXE,
+  aztecNode: AztecNode,
   l1Client: ExtendedViemWalletClient,
   erc20: EthAddress,
   portal: EthAddress,
@@ -224,7 +227,7 @@ async function initPortal(
   const { TokenPortalAbi } = await import('@aztec/l1-artifacts');
   const {
     l1ContractAddresses: { registryAddress },
-  } = await pxe.getNodeInfo();
+  } = await aztecNode.getNodeInfo();
 
   const contract = getContract({
     abi: TokenPortalAbi,
@@ -274,7 +277,7 @@ async function deployCounter(wallet: Wallet, defaultAccountAddress: AztecAddress
 
 // NOTE: Disabling for now in order to get devnet running
 async function fundFPC(
-  pxe: PXE,
+  node: AztecNode,
   counterAddress: AztecAddress,
   wallet: Wallet,
   defaultAccountAddress: AztecAddress,
@@ -290,11 +293,11 @@ async function fundFPC(
   const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
   const {
     protocolContractAddresses: { feeJuice },
-  } = await pxe.getNodeInfo();
+  } = await node.getNodeInfo();
 
   const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
 
-  const feeJuicePortal = await L1FeeJuicePortalManager.new(pxe, l1Client, debugLog);
+  const feeJuicePortal = await L1FeeJuicePortalManager.new(node, l1Client, debugLog);
 
   const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(
     fpcAddress,
@@ -302,7 +305,12 @@ async function fundFPC(
     true,
   );
 
-  await retryUntil(async () => await pxe.isL1ToL2MessageSynced(Fr.fromHexString(messageHash)), 'message sync', 600, 1);
+  await retryUntil(
+    async () => (await node.getL1ToL2MessageBlock(Fr.fromHexString(messageHash))) !== undefined,
+    'message sync',
+    600,
+    1,
+  );
 
   const counter = await CounterContract.at(counterAddress, wallet);
 
@@ -320,7 +328,7 @@ async function fundFPC(
     .send({ from: defaultAccountAddress })
     .wait({ ...waitOpts });
 
-  await waitForProven(pxe, receipt, provenWaitOpts);
+  await waitForProven(node, receipt, provenWaitOpts);
 
   debugLog.info('Finished claiming FPC');
 }

package/src/cmds/devnet/index.ts

@@ -2,13 +2,14 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 
 import type { Command } from 'commander';
 
-import { ETHEREUM_HOSTS, l1ChainIdOption, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
+import { ETHEREUM_HOSTS, l1ChainIdOption, nodeOption, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
 
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
   program
     .command('bootstrap-network')
     .description('Bootstrap a new network')
     .addOption(pxeOption)
+    .addOption(nodeOption)
     .addOption(l1ChainIdOption)
     .requiredOption<string[]>(
       '--l1-rpc-urls <string>',
@@ -33,6 +34,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       const { bootstrapNetwork } = await import('./bootstrap_network.js');
       await bootstrapNetwork(
         options[pxeOption.attributeName()],
+        options[nodeOption.attributeName()],
         options.l1RpcUrls,
         options[l1ChainIdOption.attributeName()],
         options.l1PrivateKey,

package/src/cmds/infrastructure/index.ts

@@ -1,20 +1,28 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 
 import type { Command } from 'commander';
 
-import { ETHEREUM_HOSTS, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
+import { ETHEREUM_HOSTS, l1ChainIdOption, nodeOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
 
-export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
+export function injectCommands(program: Command, log: LogFn) {
   program
     .command('setup-protocol-contracts')
     .description('Bootstrap the blockchain by initializing all the protocol contracts')
     .addOption(pxeOption)
+    .addOption(nodeOption)
     .option('--testAccounts', 'Deploy funded test accounts.')
     .option('--sponsoredFPC', 'Deploy a sponsored FPC.')
     .option('--json', 'Output the contract addresses in JSON format')
     .action(async options => {
       const { setupL2Contracts } = await import('./setup_l2_contract.js');
-      await setupL2Contracts(options.rpcUrl, options.testAccounts, options.sponsoredFPC, options.json, log);
+      await setupL2Contracts(
+        options.rpcUrl,
+        options.nodeUrl,
+        options.testAccounts,
+        options.sponsoredFPC,
+        options.json,
+        log,
+      );
     });
 
   program
@@ -34,7 +42,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       'test test test test test test test test test test test junk',
     )
     .option('--block-number <number>', 'Block number to query next sequencer for', parseOptionalInteger)
-    .addOption(pxeOption)
+    .addOption(nodeOption)
     .addOption(l1ChainIdOption)
     .action(async (command, who, options) => {
       const { sequencers } = await import('./sequencers.js');
@@ -42,12 +50,11 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         command: command,
         who,
         mnemonic: options.mnemonic,
-        rpcUrl: options.rpcUrl,
+        nodeUrl: options.nodeUrl,
         l1RpcUrls: options.l1RpcUrls,
         chainId: options.l1ChainId,
         blockNumber: options.blockNumber,
         log,
-        debugLogger,
       });
     });
 

package/src/cmds/infrastructure/sequencers.ts

@@ -1,6 +1,6 @@
-import { Fr, createCompatibleClient } from '@aztec/aztec.js';
+import { Fr, createAztecNodeClient } from '@aztec/aztec.js';
 import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
 import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
@@ -11,15 +11,14 @@ export async function sequencers(opts: {
   who?: string;
   mnemonic?: string;
   bn254SecretKey?: bigint;
-  rpcUrl: string;
+  nodeUrl: string;
   l1RpcUrls: string[];
   chainId: number;
   blockNumber?: number;
   log: LogFn;
-  debugLogger: Logger;
 }) {
-  const { command, who: maybeWho, mnemonic, bn254SecretKey, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
-  const client = await createCompatibleClient(rpcUrl, debugLogger);
+  const { command, who: maybeWho, mnemonic, bn254SecretKey, nodeUrl, l1RpcUrls, chainId, log } = opts;
+  const client = createAztecNodeClient(nodeUrl);
   const { l1ContractAddresses } = await client.getNodeInfo();
 
   const chain = createEthereumChain(l1RpcUrls, chainId);

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -1,5 +1,12 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { AccountManager, type AztecAddress, type WaitOpts, createPXEClient, makeFetch } from '@aztec/aztec.js';
+import {
+  AccountManager,
+  type AztecAddress,
+  type WaitOpts,
+  createAztecNodeClient,
+  createPXEClient,
+  makeFetch,
+} from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
@@ -8,7 +15,8 @@ import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
 import { setupSponsoredFPC } from '../../utils/setup_contracts.js';
 
 export async function setupL2Contracts(
-  rpcUrl: string,
+  pxeUrl: string,
+  nodeUrl: string,
   testAccounts: boolean,
   sponsoredFPC: boolean,
   json: boolean,
@@ -20,8 +28,9 @@ export async function setupL2Contracts(
   };
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
   log('setupL2Contracts: Creating PXE client...');
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([1, 1, 1, 1, 1], false));
-  const wallet = new TestWallet(pxe);
+  const pxe = createPXEClient(pxeUrl, {}, makeFetch([1, 1, 1, 1, 1], false));
+  const node = createAztecNodeClient(nodeUrl);
+  const wallet = new TestWallet(pxe, node);
 
   let deployedAccountManagers: AccountManager[] = [];
   if (testAccounts) {

package/src/cmds/l1/advance_epoch.ts

@@ -1,10 +1,10 @@
-import { createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js';
 import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
 
-export async function advanceEpoch(l1RpcUrls: string[], rpcUrl: string, log: LogFn) {
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
-  const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
+export async function advanceEpoch(l1RpcUrls: string[], nodeUrl: string, log: LogFn) {
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
 
   const cheat = RollupCheatCodes.create(l1RpcUrls, { rollupAddress });
 

package/src/cmds/l1/assume_proven_through.ts

@@ -1,16 +1,16 @@
-import { createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js';
 import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
 
 export async function assumeProvenThrough(
   blockNumberOrLatest: number | undefined,
   l1RpcUrls: string[],
-  rpcUrl: string,
+  nodeUrl: string,
   log: LogFn,
 ) {
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
-  const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
-  const blockNumber = blockNumberOrLatest ?? (await pxe.getBlockNumber());
+  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 });
 

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -22,7 +22,6 @@ export async function deployL1Contracts(
   createVerificationJson: string | false,
   initialValidators: EthAddress[],
   realVerifier: boolean,
-  flushEntryQueue: boolean,
   log: LogFn,
   debugLogger: Logger,
 ) {
@@ -53,7 +52,6 @@ export async function deployL1Contracts(
     config,
     realVerifier,
     createVerificationJson,
-    flushEntryQueue,
     debugLogger,
   );
 

package/src/cmds/l1/index.ts

@@ -9,6 +9,7 @@ import {
   MNEMONIC,
   PRIVATE_KEY,
   l1ChainIdOption,
+  nodeOption,
   parseAztecAddress,
   parseBigint,
   parseEthereumAddress,
@@ -48,7 +49,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .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('--flush-entry-queue', 'Whether to flush the entry queue after adding initial validators', false)
     .option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false)
     .action(async options => {
       const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
@@ -69,7 +69,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.createVerificationJson,
         initialValidators,
         options.realVerifier,
-        options.flushEntryQueue,
         log,
         debugLogger,
       );
@@ -509,10 +508,10 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     )
     .argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint)
     .addOption(l1RpcUrlsOption)
-    .addOption(pxeOption)
+    .addOption(nodeOption)
     .action(async (blockNumber, options) => {
       const { assumeProvenThrough } = await import('./assume_proven_through.js');
-      await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.rpcUrl, log);
+      await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.nodeUrl, log);
     });
 
   program

package/src/cmds/pxe/index.ts

@@ -5,15 +5,9 @@ import type { Command } from 'commander';
 
 import {
   logJson,
-  makePxeOption,
   parseAztecAddress,
   parseEthereumAddress,
-  parseField,
   parseFieldFromHexString,
-  parseOptionalAztecAddress,
-  parseOptionalInteger,
-  parseOptionalLogId,
-  parseOptionalTxHash,
   parsePublicKey,
   pxeOption,
 } from '../../utils/commands.js';
@@ -50,25 +44,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       );
     });
 
-  program
-    .command('get-block')
-    .description('Gets info for a given block or latest.')
-    .argument('[blockNumber]', 'Block height', parseOptionalInteger)
-    .addOption(pxeOption)
-    .action(async (blockNumber, options) => {
-      const { getBlock } = await import('./get_block.js');
-      await getBlock(options.rpcUrl, blockNumber, debugLogger, log);
-    });
-
-  program
-    .command('get-current-base-fee')
-    .description('Gets the current base fee.')
-    .addOption(pxeOption)
-    .action(async options => {
-      const { getCurrentBaseFee } = await import('./get_current_base_fee.js');
-      await getCurrentBaseFee(options.rpcUrl, debugLogger, log);
-    });
-
   program
     .command('get-contract-data')
     .description('Gets information about the Aztec contract deployed at the specified address.')
@@ -80,25 +55,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       await getContractData(options.rpcUrl, contractAddress, options.includeBytecode, debugLogger, log);
     });
 
-  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)
-    .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)
-    .addOption(pxeOption)
-    .option('--follow', 'If set, will keep polling for new logs until interrupted.')
-    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, rpcUrl, follow }) => {
-      const { getLogs } = await import('./get_logs.js');
-      await getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, rpcUrl, follow, debugLogger, log);
-    });
-
   program
     .command('get-accounts')
     .description('Gets all the Aztec accounts stored in the PXE.')
@@ -119,44 +75,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       await getAccount(address, options.rpcUrl, debugLogger, log);
     });
 
-  program
-    .command('block-number')
-    .description('Gets the current Aztec L2 block number.')
-    .addOption(pxeOption)
-    .action(async (options: any) => {
-      const { blockNumber } = await import('./block_number.js');
-      await blockNumber(options.rpcUrl, debugLogger, log);
-    });
-
-  program
-    .command('get-l1-to-l2-message-witness')
-    .description('Gets a L1 to L2 message witness.')
-    .requiredOption('-ca, --contract-address <address>', 'Aztec address of the contract.', parseAztecAddress)
-    .requiredOption('--message-hash <messageHash>', 'The L1 to L2 message hash.', parseField)
-    .requiredOption('--secret <secret>', 'The secret used to claim the L1 to L2 message', parseField)
-    .addOption(pxeOption)
-    .action(async ({ contractAddress, messageHash, secret, rpcUrl }) => {
-      const { getL1ToL2MessageWitness } = await import('./get_l1_to_l2_message_witness.js');
-      await getL1ToL2MessageWitness(rpcUrl, contractAddress, messageHash, secret, debugLogger, log);
-    });
-
-  program
-    .command('get-node-info')
-    .description('Gets the information of an Aztec node from a PXE or directly from an Aztec node.')
-    .option('--node-url <string>', 'URL of the node.')
-    .option('--json', 'Emit output as json')
-    .addOption(makePxeOption(false))
-    .action(async options => {
-      const { getNodeInfo } = await import('./get_node_info.js');
-      let url: string;
-      if (options.nodeUrl) {
-        url = options.nodeUrl;
-      } else {
-        url = options.rpcUrl;
-      }
-      await getNodeInfo(url, !options.nodeUrl, debugLogger, options.json, log, logJson(log));
-    });
-
   program
     .command('get-pxe-info')
     .description('Gets the information of a PXE at a URL.')

package/src/config/chain_l2_config.ts

@@ -76,9 +76,9 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: false,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
-  registryAddress: '0xf299347e765cfb27f913bde8e4983fd0f195676f',
-  slashFactoryAddress: '',
-  feeAssetHandlerAddress: '',
+  registryAddress: '0xa2ed20f46dc58e5af6035ec61d463ac85a6d52d3',
+  slashFactoryAddress: '0x2c03d596f4b5f0c1d0d2dbf92a5964dfc658763c',
+  feeAssetHandlerAddress: '0x48be40187f2932bd14cd4d111fba26646da96c36',
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,

package/src/utils/aztec.ts

@@ -1,4 +1,4 @@
-import { EthAddress, type PXE } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js';
 import {
   type ContractArtifact,
   type FunctionAbi,
@@ -20,7 +20,6 @@ import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 
 import TOML from '@iarna/toml';
 import { readFile } from 'fs/promises';
-import { gtr, ltr, satisfies, valid } from 'semver';
 
 import { encodeArgs } from './encoding.js';
 
@@ -59,7 +58,6 @@ export async function deployAztecContracts(
   config: L1ContractsConfig,
   realVerifier: boolean,
   createVerificationJson: string | false,
-  flushEntryQueue: boolean,
   debugLogger: Logger,
 ): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
@@ -90,7 +88,6 @@ export async function deployAztecContracts(
     },
     config,
     createVerificationJson,
-    flushEntryQueue,
   );
 
   return result;
@@ -260,38 +257,3 @@ export function prettyPrintNargoToml(config: NoirPackageConfig): string {
 
   return partialToml + '\n[dependencies]\n' + dependenciesToml.join('\n') + '\n';
 }
-
-/** Mismatch between server and client versions. */
-class VersionMismatchError extends Error {}
-
-/**
- * Checks that Private eXecution Environment (PXE) version matches the expected one by this CLI. Throws if not.
- * @param pxe - PXE client.
- * @param expectedVersionRange - Expected version by CLI.
- */
-export async function checkServerVersion(pxe: PXE, expectedVersionRange: string) {
-  const serverName = 'Aztec Node';
-  const { nodeVersion } = await pxe.getNodeInfo();
-  if (!nodeVersion) {
-    throw new VersionMismatchError(`Couldn't determine ${serverName} version. You may run into issues.`);
-  }
-  if (!nodeVersion || !valid(nodeVersion)) {
-    throw new VersionMismatchError(
-      `Missing or invalid version identifier for ${serverName} (${nodeVersion ?? 'empty'}).`,
-    );
-  } else if (!satisfies(nodeVersion, expectedVersionRange)) {
-    if (gtr(nodeVersion, expectedVersionRange)) {
-      throw new VersionMismatchError(
-        `${serverName} is running version ${nodeVersion} which is newer than the expected by this CLI (${expectedVersionRange}). Consider upgrading your CLI to a newer version.`,
-      );
-    } else if (ltr(nodeVersion, expectedVersionRange)) {
-      throw new VersionMismatchError(
-        `${serverName} is running version ${nodeVersion} which is older than the expected by this CLI (${expectedVersionRange}). Consider upgrading your ${serverName} to a newer version.`,
-      );
-    } else {
-      throw new VersionMismatchError(
-        `${serverName} is running version ${nodeVersion} which does not match the expected by this CLI (${expectedVersionRange}).`,
-      );
-    }
-  }
-}

package/src/utils/commands.ts

@@ -38,6 +38,14 @@ export const makePxeOption = (mandatory: boolean) =>
 
 export const pxeOption = makePxeOption(true);
 
+export const makeNodeOption = (mandatory: boolean) =>
+  new Option('-n, --node-url <string>', 'URL of the Aztec node')
+    .env('AZTEC_NODE_URL')
+    .default(`http://${LOCALHOST}:8079`)
+    .makeOptionMandatory(mandatory);
+
+export const nodeOption = makeNodeOption(true);
+
 export const l1ChainIdOption = new Option('-c, --l1-chain-id <number>', 'Chain ID of the ethereum host')
   .env('L1_CHAIN_ID')
   .default(31337)

package/src/utils/inspect.ts

@@ -2,12 +2,18 @@ import type { AztecAddress, ContractArtifact, Fr } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { siloNullifier } from '@aztec/stdlib/hash';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
 import type { ExtendedNote } from '@aztec/stdlib/note';
 import type { TxHash } from '@aztec/stdlib/tx';
 
-export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts: { showTxs?: boolean } = {}) {
-  const block = await pxe.getBlock(blockNumber);
+export async function inspectBlock(
+  pxe: PXE,
+  aztecNode: AztecNode,
+  blockNumber: number,
+  log: LogFn,
+  opts: { showTxs?: boolean } = {},
+) {
+  const block = await aztecNode.getBlock(blockNumber);
   if (!block) {
     log(`No block found for block number ${blockNumber}`);
     return;
@@ -27,7 +33,7 @@ export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, op
     log(``);
     const artifactMap = await getKnownArtifacts(pxe);
     for (const txHash of block.body.txEffects.map(tx => tx.txHash)) {
-      await inspectTx(pxe, txHash, log, { includeBlockInfo: false, artifactMap });
+      await inspectTx(pxe, aztecNode, txHash, log, { includeBlockInfo: false, artifactMap });
     }
   } else {
     log(` Transactions: ${block.body.txEffects.length}`);
@@ -36,11 +42,12 @@ export async function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, op
 
 export async function inspectTx(
   pxe: PXE,
+  aztecNode: AztecNode,
   txHash: TxHash,
   log: LogFn,
   opts: { includeBlockInfo?: boolean; artifactMap?: ArtifactMap } = {},
 ) {
-  const [receipt, effectsInBlock] = await Promise.all([pxe.getTxReceipt(txHash), pxe.getTxEffect(txHash)]);
+  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()})` : ''}`);

package/dest/cmds/pxe/block_number.d.ts

@@ -1,3 +0,0 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function blockNumber(rpcUrl: string, debugLogger: Logger, log: LogFn): Promise<void>;
-//# sourceMappingURL=block_number.d.ts.map

package/dest/cmds/pxe/block_number.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"block_number.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/block_number.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAKhF"}

package/dest/cmds/pxe/block_number.js

@@ -1,10 +0,0 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-export async function blockNumber(rpcUrl, debugLogger, log) {
-    const client = await createCompatibleClient(rpcUrl, debugLogger);
-    const [latestNum, provenNum] = await Promise.all([
-        client.getBlockNumber(),
-        client.getProvenBlockNumber()
-    ]);
-    log(`Latest block: ${latestNum}`);
-    log(`Proven block: ${provenNum}`);
-}

package/dest/cmds/pxe/get_block.d.ts

@@ -1,3 +0,0 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function getBlock(rpcUrl: string, maybeBlockNumber: number | undefined, debugLogger: Logger, log: LogFn): Promise<void>;
-//# sourceMappingURL=get_block.d.ts.map

package/dest/cmds/pxe/get_block.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get_block.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_block.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAInH"}

package/dest/cmds/pxe/get_block.js

@@ -1,9 +0,0 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import { inspectBlock } from '../../utils/inspect.js';
-export async function getBlock(rpcUrl, maybeBlockNumber, debugLogger, log) {
-    const client = await createCompatibleClient(rpcUrl, debugLogger);
-    const blockNumber = maybeBlockNumber ?? await client.getBlockNumber();
-    await inspectBlock(client, blockNumber, log, {
-        showTxs: true
-    });
-}

package/dest/cmds/pxe/get_current_base_fee.d.ts

@@ -1,3 +0,0 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function getCurrentBaseFee(rpcUrl: string, debugLogger: Logger, log: LogFn): Promise<void>;
-//# sourceMappingURL=get_current_base_fee.d.ts.map

package/dest/cmds/pxe/get_current_base_fee.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get_current_base_fee.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_current_base_fee.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAItF"}