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

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

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

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

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

package/dest/cmds/aztec_node/get_current_base_fee.js

@@ -0,0 +1,7 @@
+import { createAztecNodeClient } from '@aztec/aztec.js';
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+export async function getCurrentBaseFee(nodeUrl, debugLogger, log) {
+    const node = createAztecNodeClient(nodeUrl);
+    const fees = await node.getCurrentBaseFees();
+    log(`Current fees: ${jsonStringify(fees)}`);
+}

package/dest/cmds/aztec_node/get_node_info.d.ts

@@ -0,0 +1,3 @@
+import type { LogFn } from '@aztec/foundation/log';
+export declare function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, logJson: (output: any) => void): Promise<void>;
+//# sourceMappingURL=get_node_info.d.ts.map

package/dest/cmds/aztec_node/get_node_info.d.ts.map

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

package/dest/cmds/{pxe → aztec_node}/get_node_info.js

@@ -1,11 +1,6 @@
-import { createAztecNodeClient, createCompatibleClient } from '@aztec/aztec.js';
-export async function getNodeInfo(rpcUrl, pxeRequest, debugLogger, json, log, logJson) {
-    let client;
-    if (pxeRequest) {
-        client = await createCompatibleClient(rpcUrl, debugLogger);
-    } else {
-        client = createAztecNodeClient(rpcUrl);
-    }
+import { createAztecNodeClient } from '@aztec/aztec.js';
+export async function getNodeInfo(nodeUrl, json, log, logJson) {
+    const client = createAztecNodeClient(nodeUrl);
     const info = await client.getNodeInfo();
     if (json) {
         logJson({

package/dest/cmds/aztec_node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAazC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAqD/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAwE/E"}

package/dest/cmds/aztec_node/index.js

@@ -1,9 +1,13 @@
-import { nodeOption, parseAztecAddress, parseField, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalTxHash, pxeOption } from '../../utils/commands.js';
+import { logJson, nodeOption, parseAztecAddress, parseField, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalTxHash, pxeOption } from '../../utils/commands.js';
 export function injectCommands(program, log, debugLogger) {
     program.command('get-block').description('Gets info for a given block or latest.').argument('[blockNumber]', 'Block height', parseOptionalInteger).addOption(pxeOption).addOption(nodeOption).action(async (blockNumber, options)=>{
         const { getBlock } = await import('./get_block.js');
         await getBlock(options.rpcUrl, options.nodeUrl, blockNumber, debugLogger, log);
     });
+    program.command('get-current-base-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);
+    });
     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(nodeOption).action(async ({ contractAddress, messageHash, secret, nodeUrl })=>{
         const { getL1ToL2MessageWitness } = await import('./get_l1_to_l2_message_witness.js');
         await getL1ToL2MessageWitness(nodeUrl, contractAddress, messageHash, secret, log);
@@ -16,5 +20,9 @@ export function injectCommands(program, log, debugLogger) {
         const { blockNumber } = await import('./block_number.js');
         await blockNumber(options.nodeUrl, log);
     });
+    program.command('get-node-info').description('Gets the information of an Aztec node from a PXE or directly from an Aztec node.').option('--json', 'Emit output as json').addOption(nodeOption).action(async (options)=>{
+        const { getNodeInfo } = await import('./get_node_info.js');
+        await getNodeInfo(options.nodeUrl, options.json, log, logJson(log));
+    });
     return program;
 }

package/dest/cmds/devnet/bootstrap_network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAsB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAuFjB"}
+{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAsB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAuFjB"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -15,7 +15,7 @@ const provenWaitOpts = {
 export async function bootstrapNetwork(pxeUrl, nodeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
     const pxe = await createCompatibleClient(pxeUrl, debugLog);
     const node = createAztecNodeClient(nodeUrl);
-    const wallet = new TestWallet(pxe);
+    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.
     const [accountData] = await getInitialTestAccountsData();
@@ -27,11 +27,11 @@ export async function bootstrapNetwork(pxeUrl, nodeUrl, l1Urls, l1ChainId, l1Pri
     }), createEthereumChain(l1Urls, +l1ChainId).chainInfo);
     const { erc20Address, portalAddress } = await deployERC20(l1Client);
     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, node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
+    await fundFPC(node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
     if (json) {
         log(JSON.stringify({
             devCoinL1: erc20Address.toString(),
@@ -137,9 +137,9 @@ export async function bootstrapNetwork(pxeUrl, nodeUrl, l1Urls, l1ChainId, l1Pri
 }
 /**
  * Step 3. Initialize DevCoin's L1 portal
- */ async function initPortal(pxe, l1Client, erc20, portal, bridge) {
+ */ async function initPortal(aztecNode, l1Client, erc20, portal, bridge) {
     const { TokenPortalAbi } = await import('@aztec/l1-artifacts');
-    const { l1ContractAddresses: { registryAddress } } = await pxe.getNodeInfo();
+    const { l1ContractAddresses: { registryAddress } } = await aztecNode.getNodeInfo();
     const contract = getContract({
         abi: TokenPortalAbi,
         address: portal.toString(),
@@ -185,16 +185,16 @@ async function deployCounter(wallet, defaultAccountAddress) {
     return info;
 }
 // NOTE: Disabling for now in order to get devnet running
-async function fundFPC(pxe, node, counterAddress, wallet, defaultAccountAddress, l1Client, fpcAddress, debugLog) {
+async function fundFPC(node, counterAddress, wallet, defaultAccountAddress, l1Client, fpcAddress, debugLog) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
     const { FeeJuiceContract } = await import('@aztec/noir-contracts.js/FeeJuice');
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - Importing noir-contracts.js even in devDeps results in a circular dependency error. Need to ignore because this line doesn't cause an error in a dev environment
     const { CounterContract } = await import('@aztec/noir-test-contracts.js/Counter');
-    const { protocolContractAddresses: { feeJuice } } = await pxe.getNodeInfo();
+    const { protocolContractAddresses: { feeJuice } } = 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, undefined, true);
     await retryUntil(async ()=>await node.getL1ToL2MessageBlock(Fr.fromHexString(messageHash)) !== undefined, 'message sync', 600, 1);
     const counter = await CounterContract.at(counterAddress, wallet);

package/dest/cmds/infrastructure/index.d.ts

@@ -1,4 +1,4 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 import type { Command } from 'commander';
-export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger): Command;
+export declare function injectCommands(program: Command, log: LogFn): Command;
 //# sourceMappingURL=index.d.ts.map

package/dest/cmds/infrastructure/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAgD/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,WAuD1D"}

package/dest/cmds/infrastructure/index.js

@@ -1,23 +1,22 @@
-import { ETHEREUM_HOSTS, l1ChainIdOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
-export function injectCommands(program, log, debugLogger) {
-    program.command('setup-protocol-contracts').description('Bootstrap the blockchain by initializing all the protocol contracts').addOption(pxeOption).option('--testAccounts', 'Deploy funded test accounts.').option('--sponsoredFPC', 'Deploy a sponsored FPC.').option('--json', 'Output the contract addresses in JSON format').action(async (options)=>{
+import { ETHEREUM_HOSTS, l1ChainIdOption, nodeOption, parseOptionalInteger, pxeOption } from '../../utils/commands.js';
+export function injectCommands(program, log) {
+    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.command('sequencers').argument('<command>', 'Command to run: list, add, remove, who-next').argument('[who]', 'Who to add/remove').description('Manages or queries registered sequencers on the L1 rollup contract.').requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
         ETHEREUM_HOSTS
-    ]).option('-m, --mnemonic <string>', 'The mnemonic for the sender of the tx', '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(l1ChainIdOption).action(async (command, who, options)=>{
+    ]).option('-m, --mnemonic <string>', 'The mnemonic for the sender of the tx', '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(nodeOption).addOption(l1ChainIdOption).action(async (command, who, options)=>{
         const { sequencers } = await import('./sequencers.js');
         await sequencers({
             command: command,
             who,
             mnemonic: options.mnemonic,
-            rpcUrl: options.rpcUrl,
+            nodeUrl: options.nodeUrl,
             l1RpcUrls: options.l1RpcUrls,
             chainId: options.l1ChainId,
             blockNumber: options.blockNumber,
-            log,
-            debugLogger
+            log
         });
     });
     return program;

package/dest/cmds/infrastructure/sequencers.d.ts

@@ -1,14 +1,13 @@
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 export declare function sequencers(opts: {
     command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';
     who?: string;
     mnemonic?: string;
     bn254SecretKey?: bigint;
-    rpcUrl: string;
+    nodeUrl: string;
     l1RpcUrls: string[];
     chainId: number;
     blockNumber?: number;
     log: LogFn;
-    debugLogger: Logger;
 }): Promise<void>;
 //# sourceMappingURL=sequencers.d.ts.map

package/dest/cmds/infrastructure/sequencers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencers.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/sequencers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB,iBAoGA"}
+{"version":3,"file":"sequencers.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/sequencers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;IAC1D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,KAAK,CAAC;CACZ,iBAoGA"}

package/dest/cmds/infrastructure/sequencers.js

@@ -1,11 +1,11 @@
-import { Fr, createCompatibleClient } from '@aztec/aztec.js';
+import { Fr, createAztecNodeClient } from '@aztec/aztec.js';
 import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 export async function sequencers(opts) {
-    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);
     const publicClient = createPublicClient({

package/dest/cmds/infrastructure/setup_l2_contract.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function setupL2Contracts(rpcUrl: string, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, log: LogFn): Promise<void>;
+export declare function setupL2Contracts(pxeUrl: string, nodeUrl: string, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, log: LogFn): Promise<void>;
 //# sourceMappingURL=setup_l2_contract.d.ts.map

package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,iBA8BX"}
+{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,iBA+BX"}

package/dest/cmds/infrastructure/setup_l2_contract.js

@@ -1,24 +1,25 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient, createPXEClient, makeFetch } from '@aztec/aztec.js';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
 import { setupSponsoredFPC } from '../../utils/setup_contracts.js';
-export async function setupL2Contracts(rpcUrl, testAccounts, sponsoredFPC, json, log) {
+export async function setupL2Contracts(pxeUrl, nodeUrl, testAccounts, sponsoredFPC, json, log) {
     const waitOpts = {
         timeout: 180,
         interval: 1
     };
     log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
     log('setupL2Contracts: Creating PXE client...');
-    const pxe = createPXEClient(rpcUrl, {}, makeFetch([
+    const pxe = createPXEClient(pxeUrl, {}, makeFetch([
         1,
         1,
         1,
         1,
         1
     ], false));
-    const wallet = new TestWallet(pxe);
+    const node = createAztecNodeClient(nodeUrl);
+    const wallet = new TestWallet(pxe, node);
     let deployedAccountManagers = [];
     if (testAccounts) {
         log('setupL2Contracts: Deploying test accounts...');

package/dest/cmds/l1/advance_epoch.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function advanceEpoch(l1RpcUrls: string[], rpcUrl: string, log: LogFn): Promise<void>;
+export declare function advanceEpoch(l1RpcUrls: string[], nodeUrl: string, log: LogFn): Promise<void>;
 //# sourceMappingURL=advance_epoch.d.ts.map

package/dest/cmds/l1/advance_epoch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"advance_epoch.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/advance_epoch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAQjF"}
+{"version":3,"file":"advance_epoch.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/advance_epoch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAQlF"}

package/dest/cmds/l1/advance_epoch.js

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

package/dest/cmds/l1/deploy_l1_contracts.d.ts

@@ -1,4 +1,4 @@
 import { type EthAddress } from '@aztec/aztec.js';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, createVerificationJson: string | false, initialValidators: EthAddress[], realVerifier: boolean, flushEntryQueue: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
+export declare function deployL1Contracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, acceleratedTestDeployments: boolean, json: boolean, createVerificationJson: string | false, initialValidators: EthAddress[], realVerifier: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
 //# sourceMappingURL=deploy_l1_contracts.d.ts.map

package/dest/cmds/l1/deploy_l1_contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAM,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,eAAe,EAAE,OAAO,EACxB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA8DpB"}
+{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAM,MAAM,iBAAiB,CAAC;AAGtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,0BAA0B,EAAE,OAAO,EACnC,IAAI,EAAE,OAAO,EACb,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6DpB"}

package/dest/cmds/l1/deploy_l1_contracts.js

@@ -5,7 +5,7 @@ import { SecretValue } from '@aztec/foundation/config';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { deployAztecContracts } from '../../utils/aztec.js';
 import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
-export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, acceleratedTestDeployments, json, createVerificationJson, initialValidators, realVerifier, flushEntryQueue, log, debugLogger) {
+export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, acceleratedTestDeployments, json, createVerificationJson, initialValidators, realVerifier, log, debugLogger) {
     const config = getL1ContractsConfigEnvVars();
     const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
     const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
@@ -16,7 +16,7 @@ export async function deployL1Contracts(rpcUrls, chainId, privateKey, mnemonic,
             withdrawer: a,
             bn254SecretKey: new SecretValue(Fr.random().toBigInt())
         }));
-    const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidatorOperators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, realVerifier, createVerificationJson, flushEntryQueue, debugLogger);
+    const { l1ContractAddresses } = await deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidatorOperators, genesisArchiveRoot, fundingNeeded, acceleratedTestDeployments, config, realVerifier, createVerificationJson, debugLogger);
     if (json) {
         log(JSON.stringify(Object.fromEntries(Object.entries(l1ContractAddresses).map(([k, v])=>[
                 k,

package/dest/cmds/l1/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAejD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAkhB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAejD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAghB/E"}

package/dest/cmds/l1/index.js

@@ -8,10 +8,10 @@ const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum h
 ]).makeOptionMandatory(true).argParser((arg)=>arg.split(',').map((url)=>url.trim()));
 const networkOption = new Option('--network <string>', 'Network to execute against').env('NETWORK');
 export function injectCommands(program, log, debugLogger) {
-    program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').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)=>{
+    program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').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('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false).action(async (options)=>{
         const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
-        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, options.createVerificationJson, initialValidators, options.realVerifier, options.flushEntryQueue, log, debugLogger);
+        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, options.createVerificationJson, initialValidators, options.realVerifier, log, debugLogger);
     });
     program.command('deploy-new-rollup').description('Deploys a new rollup contract and adds it to the registry (if you are the owner).').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', MNEMONIC ?? 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--real-verifier', 'Deploy the real verifier', false).action(async (options)=>{
         const { deployNewRollup } = await import('./deploy_new_rollup.js');

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAmG/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAyE/E"}

package/dest/cmds/pxe/index.js

@@ -1,14 +1,10 @@
 import { Fr } from '@aztec/foundation/fields';
-import { logJson, makePxeOption, parseAztecAddress, parseEthereumAddress, parseFieldFromHexString, parsePublicKey, pxeOption } from '../../utils/commands.js';
+import { logJson, parseAztecAddress, parseEthereumAddress, parseFieldFromHexString, parsePublicKey, pxeOption } from '../../utils/commands.js';
 export function injectCommands(program, log, debugLogger) {
     program.command('add-contract').description('Adds an existing contract to the PXE. This is useful if you have deployed a contract outside of the PXE and want to use it with the PXE.').requiredOption('-c, --contract-artifact <fileLocation>', "A compiled Aztec.nr contract's ABI in JSON format or name of a contract ABI exported by @aztec/noir-contracts.js").requiredOption('-ca, --contract-address <address>', 'Aztec address of the contract.', parseAztecAddress).requiredOption('--init-hash <init hash>', 'Initialization hash', parseFieldFromHexString).option('--salt <salt>', 'Optional deployment salt', parseFieldFromHexString).option('-p, --public-key <public key>', 'Optional public key for this contract', parsePublicKey).option('--portal-address <address>', 'Optional address to a portal contract on L1', parseEthereumAddress).option('--deployer-address <address>', 'Optional address of the contract deployer', parseAztecAddress).addOption(pxeOption).action(async (options)=>{
         const { addContract } = await import('./add_contract.js');
         await addContract(options.rpcUrl, options.contractArtifact, options.contractAddress, options.initHash, options.salt ?? Fr.ZERO, options.publicKey, options.deployerAddress, 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.').argument('<contractAddress>', 'Aztec address of the contract.', parseAztecAddress).addOption(pxeOption).option('-b, --include-bytecode <boolean>', "Include the contract's public function bytecode, if any.", false).action(async (contractAddress, options)=>{
         const { getContractData } = await import('./get_contract_data.js');
         await getContractData(options.rpcUrl, contractAddress, options.includeBytecode, debugLogger, log);
@@ -21,16 +17,6 @@ export function injectCommands(program, log, debugLogger) {
         const { getAccount } = await import('./get_account.js');
         await getAccount(address, options.rpcUrl, 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;
-        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.').addOption(pxeOption).action(async (options)=>{
         const { getPXEInfo } = await import('./get_pxe_info.js');
         await getPXEInfo(options.rpcUrl, debugLogger, log);

package/dest/utils/aztec.d.ts

@@ -1,4 +1,4 @@
-import { EthAddress, type PXE } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js';
 import { type ContractArtifact, type FunctionAbi } from '@aztec/aztec.js/abi';
 import { type DeployL1ContractsReturnType, type L1ContractsConfig, type Operator, RollupContract } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
@@ -18,7 +18,7 @@ export declare function getFunctionAbi(artifact: ContractArtifact, fnName: strin
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
  */
-export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, realVerifier: boolean, createVerificationJson: string | false, flushEntryQueue: boolean, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
+export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, realVerifier: boolean, createVerificationJson: string | false, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
 export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean, logger: Logger): Promise<{
     rollup: RollupContract;
     slashFactoryAddress: EthAddress;
@@ -60,10 +60,4 @@ export declare const stripLeadingHex: (hex: string) => string;
  */
 export declare const addLeadingHex: (hex: string) => `0x${string}`;
 export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
-/**
- * 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 declare function checkServerVersion(pxe: PXE, expectedVersionRange: string): Promise<void>;
 //# sourceMappingURL=aztec.d.ts.map

package/dest/utils/aztec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,eAAe,EAAE,OAAO,EACxB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAiCtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA6CtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}
+{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAgCtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA6CtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}

package/dest/utils/aztec.js

@@ -5,7 +5,6 @@ import { Fr } from '@aztec/foundation/fields';
 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';
 /**
  * Helper to get an ABI function or throw error if it doesn't exist.
@@ -25,7 +24,7 @@ import { encodeArgs } from './encoding.js';
  * @param chainId - The chain ID of the L1 host.
  * @param privateKey - The private key to be used in contract deployment.
  * @param mnemonic - The mnemonic to be used in contract deployment.
- */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, realVerifier, createVerificationJson, flushEntryQueue, debugLogger) {
+ */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, realVerifier, createVerificationJson, debugLogger) {
     const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
     const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
@@ -43,7 +42,7 @@ import { encodeArgs } from './encoding.js';
         feeJuicePortalInitialBalance,
         realVerifier,
         ...config
-    }, config, createVerificationJson, flushEntryQueue);
+    }, config, createVerificationJson);
     return result;
 }
 export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, logger) {
@@ -177,27 +176,3 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
     });
     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, expectedVersionRange) {
-    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "3.0.0-nightly.20250919",
+  "version": "3.0.0-nightly.20250920",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -71,20 +71,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250919",
-    "@aztec/archiver": "3.0.0-nightly.20250919",
-    "@aztec/aztec.js": "3.0.0-nightly.20250919",
-    "@aztec/constants": "3.0.0-nightly.20250919",
-    "@aztec/entrypoints": "3.0.0-nightly.20250919",
-    "@aztec/ethereum": "3.0.0-nightly.20250919",
-    "@aztec/foundation": "3.0.0-nightly.20250919",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250919",
-    "@aztec/node-lib": "3.0.0-nightly.20250919",
-    "@aztec/p2p": "3.0.0-nightly.20250919",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250919",
-    "@aztec/stdlib": "3.0.0-nightly.20250919",
-    "@aztec/test-wallet": "3.0.0-nightly.20250919",
-    "@aztec/world-state": "3.0.0-nightly.20250919",
+    "@aztec/accounts": "3.0.0-nightly.20250920",
+    "@aztec/archiver": "3.0.0-nightly.20250920",
+    "@aztec/aztec.js": "3.0.0-nightly.20250920",
+    "@aztec/constants": "3.0.0-nightly.20250920",
+    "@aztec/entrypoints": "3.0.0-nightly.20250920",
+    "@aztec/ethereum": "3.0.0-nightly.20250920",
+    "@aztec/foundation": "3.0.0-nightly.20250920",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250920",
+    "@aztec/node-lib": "3.0.0-nightly.20250920",
+    "@aztec/p2p": "3.0.0-nightly.20250920",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250920",
+    "@aztec/stdlib": "3.0.0-nightly.20250920",
+    "@aztec/test-wallet": "3.0.0-nightly.20250920",
+    "@aztec/world-state": "3.0.0-nightly.20250920",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -111,15 +111,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250919",
-    "@aztec/bb-prover": "3.0.0-nightly.20250919",
-    "@aztec/ethereum": "3.0.0-nightly.20250919",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250919",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250919",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250919",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250919",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250919",
-    "@aztec/stdlib": "3.0.0-nightly.20250919"
+    "@aztec/accounts": "3.0.0-nightly.20250920",
+    "@aztec/bb-prover": "3.0.0-nightly.20250920",
+    "@aztec/ethereum": "3.0.0-nightly.20250920",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250920",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250920",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250920",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250920",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250920",
+    "@aztec/stdlib": "3.0.0-nightly.20250920"
   },
   "files": [
     "dest",

package/src/cmds/aztec_node/get_current_base_fee.ts

@@ -0,0 +1,9 @@
+import { createAztecNodeClient } from '@aztec/aztec.js';
+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) {
+  const node = createAztecNodeClient(nodeUrl);
+  const fees = await node.getCurrentBaseFees();
+  log(`Current fees: ${jsonStringify(fees)}`);
+}

package/src/cmds/{pxe → aztec_node}/get_node_info.ts

@@ -1,20 +1,9 @@
-import { type AztecNode, type PXE, createAztecNodeClient, createCompatibleClient } from '@aztec/aztec.js';
-import type { LogFn, Logger } from '@aztec/foundation/log';
+import { createAztecNodeClient } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+
+export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, logJson: (output: any) => void) {
+  const client = createAztecNodeClient(nodeUrl);
 
-export async function getNodeInfo(
-  rpcUrl: string,
-  pxeRequest: boolean,
-  debugLogger: Logger,
-  json: boolean,
-  log: LogFn,
-  logJson: (output: any) => void,
-) {
-  let client: AztecNode | PXE;
-  if (pxeRequest) {
-    client = await createCompatibleClient(rpcUrl, debugLogger);
-  } else {
-    client = createAztecNodeClient(rpcUrl);
-  }
   const info = await client.getNodeInfo();
   if (json) {
     logJson({

package/src/cmds/aztec_node/index.ts

@@ -3,6 +3,7 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 import type { Command } from 'commander';
 
 import {
+  logJson,
   nodeOption,
   parseAztecAddress,
   parseField,
@@ -25,6 +26,15 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       await getBlock(options.rpcUrl, options.nodeUrl, blockNumber, debugLogger, log);
     });
 
+  program
+    .command('get-current-base-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);
+    });
+
   program
     .command('get-l1-to-l2-message-witness')
     .description('Gets a L1 to L2 message witness.')
@@ -65,5 +75,15 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       await blockNumber(options.nodeUrl, log);
     });
 
+  program
+    .command('get-node-info')
+    .description('Gets the information of an Aztec node from a PXE or directly from an Aztec node.')
+    .option('--json', 'Emit output as json')
+    .addOption(nodeOption)
+    .action(async options => {
+      const { getNodeInfo } = await import('./get_node_info.js');
+      await getNodeInfo(options.nodeUrl, options.json, log, logJson(log));
+    });
+
   return program;
 }

package/src/cmds/devnet/bootstrap_network.ts

@@ -6,7 +6,6 @@ import {
   EthAddress,
   Fr,
   L1FeeJuicePortalManager,
-  type PXE,
   type WaitForProvenOpts,
   type WaitOpts,
   type Wallet,
@@ -58,7 +57,7 @@ export async function bootstrapNetwork(
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
   const node = createAztecNodeClient(nodeUrl);
-  const wallet = new TestWallet(pxe);
+  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.
@@ -85,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, node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
+  await fundFPC(node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
 
   if (json) {
     log(
@@ -219,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,
@@ -228,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,
@@ -278,7 +277,6 @@ 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,
@@ -295,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,

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/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

@@ -49,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');
@@ -70,7 +69,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.createVerificationJson,
         initialValidators,
         options.realVerifier,
-        options.flushEntryQueue,
         log,
         debugLogger,
       );

package/src/cmds/pxe/index.ts

@@ -5,7 +5,6 @@ import type { Command } from 'commander';
 
 import {
   logJson,
-  makePxeOption,
   parseAztecAddress,
   parseEthereumAddress,
   parseFieldFromHexString,
@@ -45,15 +44,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       );
     });
 
-  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.')
@@ -85,23 +75,6 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
       await getAccount(address, options.rpcUrl, 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/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/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"}

package/dest/cmds/pxe/get_current_base_fee.js

@@ -1,7 +0,0 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-export async function getCurrentBaseFee(rpcUrl, debugLogger, log) {
-    const client = await createCompatibleClient(rpcUrl, debugLogger);
-    const fees = await client.getCurrentBaseFees();
-    log(`Current fees: ${jsonStringify(fees)}`);
-}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,iBAgE/B"}

package/src/cmds/pxe/get_current_base_fee.ts

@@ -1,9 +0,0 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import { jsonStringify } from '@aztec/foundation/json-rpc';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-
-export async function getCurrentBaseFee(rpcUrl: string, debugLogger: Logger, log: LogFn) {
-  const client = await createCompatibleClient(rpcUrl, debugLogger);
-  const fees = await client.getCurrentBaseFees();
-  log(`Current fees: ${jsonStringify(fees)}`);
-}