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

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

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

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

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

package/dest/cmds/aztec_node/block_number.js

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

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

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

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

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

package/dest/cmds/aztec_node/get_block.js

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

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

@@ -0,0 +1,4 @@
+import { type AztecAddress, type Fr } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+export declare function getL1ToL2MessageWitness(nodeUrl: string, contractAddress: AztecAddress, messageHash: Fr, secret: Fr, log: LogFn): Promise<void>;
+//# sourceMappingURL=get_l1_to_l2_message_witness.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get_l1_to_l2_message_witness.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_l1_to_l2_message_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,EAAE,EAAyB,MAAM,iBAAiB,CAAC;AACpF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,EACV,GAAG,EAAE,KAAK,iBAeX"}

package/dest/cmds/aztec_node/get_l1_to_l2_message_witness.js

@@ -0,0 +1,12 @@
+import { createAztecNodeClient } from '@aztec/aztec.js';
+import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+export async function getL1ToL2MessageWitness(nodeUrl, contractAddress, messageHash, secret, log) {
+    const node = createAztecNodeClient(nodeUrl);
+    const messageWitness = await getNonNullifiedL1ToL2MessageWitness(node, contractAddress, messageHash, secret);
+    log(messageWitness === undefined ? `
+    L1 to L2 Message not found.
+    ` : `
+    L1 to L2 message index: ${messageWitness[0]}
+    L1 to L2 message sibling path: ${messageWitness[1]}
+    `);
+}

package/dest/cmds/{pxe → aztec_node}/get_logs.d.ts

@@ -1,4 +1,4 @@
 import type { AztecAddress, LogId, TxHash } from '@aztec/aztec.js';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function getLogs(txHash: TxHash, fromBlock: number, toBlock: number, afterLog: LogId, contractAddress: AztecAddress, rpcUrl: string, follow: boolean, debugLogger: Logger, log: LogFn): Promise<void>;
+import type { LogFn } from '@aztec/foundation/log';
+export declare function getLogs(txHash: TxHash, fromBlock: number, toBlock: number, afterLog: LogId, contractAddress: AztecAddress, nodeUrl: string, follow: boolean, log: LogFn): Promise<void>;
 //# sourceMappingURL=get_logs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get_logs.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAa,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,KAAK,EACf,eAAe,EAAE,YAAY,EAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,KAAK,iBAmDX"}

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

@@ -1,7 +1,7 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js';
 import { sleep } from '@aztec/foundation/sleep';
-export async function getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, rpcUrl, follow, debugLogger, log) {
-    const pxe = await createCompatibleClient(rpcUrl, debugLogger);
+export async function getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, nodeUrl, follow, log) {
+    const node = createAztecNodeClient(nodeUrl);
     if (follow) {
         if (txHash) {
             throw Error('Cannot use --follow with --tx-hash');
@@ -18,7 +18,7 @@ export async function getLogs(txHash, fromBlock, toBlock, afterLog, contractAddr
         contractAddress
     };
     const fetchLogs = async ()=>{
-        const response = await pxe.getPublicLogs(filter);
+        const response = await node.getPublicLogs(filter);
         const logs = response.logs;
         if (!logs.length) {
             const filterOptions = Object.entries(filter).filter(([, value])=>value !== undefined).map(([key, value])=>`${key}: ${value}`).join(', ');

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

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

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

@@ -0,0 +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"}

package/dest/cmds/aztec_node/index.js

@@ -0,0 +1,20 @@
+import { 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-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);
+    });
+    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(nodeOption).option('--follow', 'If set, will keep polling for new logs until interrupted.').action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, aztecNodeRpcUrl: nodeUrl, follow })=>{
+        const { getLogs } = await import('./get_logs.js');
+        await getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, nodeUrl, follow, log);
+    });
+    program.command('block-number').description('Gets the current Aztec L2 block number.').addOption(nodeOption).action(async (options)=>{
+        const { blockNumber } = await import('./block_number.js');
+        await blockNumber(options.nodeUrl, log);
+    });
+    return program;
+}

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

@@ -1,3 +1,3 @@
 import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function bootstrapNetwork(pxeUrl: string, l1Urls: string[], l1ChainId: string, l1PrivateKey: `0x${string}` | undefined, l1Mnemonic: string, addressIndex: number, json: boolean, log: LogFn, debugLog: Logger): Promise<void>;
+export declare function bootstrapNetwork(pxeUrl: string, nodeUrl: string, l1Urls: string[], l1ChainId: string, l1PrivateKey: `0x${string}` | undefined, l1Mnemonic: string, addressIndex: number, json: boolean, log: LogFn, debugLog: Logger): Promise<void>;
 //# sourceMappingURL=bootstrap_network.d.ts.map

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":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAsB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,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,iBAsFjB"}
+{"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"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,5 +1,5 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
+import { BatchCall, Fr, L1FeeJuicePortalManager, createAztecNodeClient, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { TestWallet } from '@aztec/test-wallet';
 import { getContract } from 'viem';
@@ -12,8 +12,9 @@ const provenWaitOpts = {
     provenTimeout: 4800,
     interval: 1
 };
-export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
+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);
     // 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.
@@ -30,7 +31,7 @@ export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey,
     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(pxe, node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
     if (json) {
         log(JSON.stringify({
             devCoinL1: erc20Address.toString(),
@@ -184,7 +185,7 @@ async function deployCounter(wallet, defaultAccountAddress) {
     return info;
 }
 // NOTE: Disabling for now in order to get devnet running
-async function fundFPC(pxe, counterAddress, wallet, defaultAccountAddress, l1Client, fpcAddress, debugLog) {
+async function fundFPC(pxe, 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');
@@ -195,7 +196,7 @@ async function fundFPC(pxe, counterAddress, wallet, defaultAccountAddress, l1Cli
     const feeJuiceContract = await FeeJuiceContract.at(feeJuice, wallet);
     const feeJuicePortal = await L1FeeJuicePortalManager.new(pxe, l1Client, debugLog);
     const { claimAmount, claimSecret, messageLeafIndex, messageHash } = await feeJuicePortal.bridgeTokensPublic(fpcAddress, undefined, 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);
     debugLog.info('Incrementing Counter');
     // TODO (alexg) remove this once sequencer builds blocks continuously
@@ -212,6 +213,6 @@ async function fundFPC(pxe, counterAddress, wallet, defaultAccountAddress, l1Cli
     }).wait({
         ...waitOpts
     });
-    await waitForProven(pxe, receipt, provenWaitOpts);
+    await waitForProven(node, receipt, provenWaitOpts);
     debugLog.info('Finished claiming FPC');
 }

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/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,WAqD/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/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,WAuD/E"}

package/dest/cmds/devnet/index.js

@@ -1,10 +1,10 @@
-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, log, debugLogger) {
-    program.command('bootstrap-network').description('Bootstrap a new network').addOption(pxeOption).addOption(l1ChainIdOption).requiredOption('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)', (arg)=>arg.split(','), [
+    program.command('bootstrap-network').description('Bootstrap a new network').addOption(pxeOption).addOption(nodeOption).addOption(l1ChainIdOption).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('--l1-private-key <string>', 'The private key to use for deployment', process.env.PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-ai, --address-index <number>', 'The address index to use when calculating an address', (arg)=>BigInt(arg), 0n).option('--json', 'Output the result as JSON').action(async (options)=>{
         const { bootstrapNetwork } = await import('./bootstrap_network.js');
-        await bootstrapNetwork(options[pxeOption.attributeName()], options.l1RpcUrls, options[l1ChainIdOption.attributeName()], options.l1PrivateKey, options.mnemonic, options.addressIndex, options.json, log, debugLogger);
+        await bootstrapNetwork(options[pxeOption.attributeName()], options[nodeOption.attributeName()], options.l1RpcUrls, options[l1ChainIdOption.attributeName()], options.l1PrivateKey, options.mnemonic, options.addressIndex, options.json, log, debugLogger);
     });
     program.command('drip-faucet').description('Drip the faucet').requiredOption('-u, --faucet-url <string>', 'Url of the faucet', 'http://localhost:8082').requiredOption('-t, --token <string>', 'The asset to drip', 'eth').requiredOption('-a, --address <string>', 'The Ethereum address to drip to', parseEthereumAddress).option('--json', 'Output the result as JSON').action(async (options)=>{
         const { dripFaucet } = await import('./faucet.js');

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,mBAAmB,CACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,iBAUX"}
+{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,mBAAmB,CACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,iBAUX"}

package/dest/cmds/l1/assume_proven_through.js

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

package/dest/cmds/l1/index.js

@@ -1,7 +1,7 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Option } from 'commander';
 import { getL1RollupAddressFromEnv } from '../../config/get_l1_config.js';
-import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
+import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, nodeOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
 export { addL1Validator } from './update_l1_validators.js';
 const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)').env('ETHEREUM_HOSTS').default([
     ETHEREUM_HOSTS
@@ -186,9 +186,9 @@ export function injectCommands(program, log, debugLogger) {
     });
     program.command('set-proven-through', {
         hidden: true
-    }).description('Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.').argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint).addOption(l1RpcUrlsOption).addOption(pxeOption).action(async (blockNumber, options)=>{
+    }).description('Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.').argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint).addOption(l1RpcUrlsOption).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.command('advance-epoch').description('Use L1 cheat codes to warp time until the next epoch.').addOption(l1RpcUrlsOption).addOption(pxeOption).action(async (options)=>{
         const { advanceEpoch } = await import('./advance_epoch.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;AAiBzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAqJ/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;AAYzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAmG/E"}

package/dest/cmds/pxe/index.js

@@ -1,14 +1,10 @@
 import { Fr } from '@aztec/foundation/fields';
-import { logJson, makePxeOption, parseAztecAddress, parseEthereumAddress, parseField, parseFieldFromHexString, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalTxHash, parsePublicKey, pxeOption } from '../../utils/commands.js';
+import { logJson, makePxeOption, 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-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);
@@ -17,10 +13,6 @@ export function injectCommands(program, log, debugLogger) {
         const { getContractData } = await import('./get_contract_data.js');
         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.').addOption(pxeOption).option('--json', 'Emit output as json').action(async (options)=>{
         const { getAccounts } = await import('./get_accounts.js');
         await getAccounts(options.rpcUrl, options.json, debugLogger, log, logJson(log));
@@ -29,14 +21,6 @@ export function injectCommands(program, log, debugLogger) {
         const { getAccount } = await import('./get_account.js');
         await getAccount(address, options.rpcUrl, debugLogger, log);
     });
-    program.command('block-number').description('Gets the current Aztec L2 block number.').addOption(pxeOption).action(async (options)=>{
-        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;

package/dest/config/chain_l2_config.js

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

package/dest/utils/commands.d.ts

@@ -18,6 +18,8 @@ export declare const ETHEREUM_HOSTS: string, PRIVATE_KEY: string | undefined, MN
 export declare function addOptions(program: Command, options: Option[]): Command;
 export declare const makePxeOption: (mandatory: boolean) => Option;
 export declare const pxeOption: Option;
+export declare const makeNodeOption: (mandatory: boolean) => Option;
+export declare const nodeOption: Option;
 export declare const l1ChainIdOption: Option;
 export declare const createSecretKeyOption: (description: string, mandatory: boolean, argsParser?: (value: string, previous: Fr) => Fr) => Option;
 export declare const logJson: (log: LogFn) => (obj: object) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}

package/dest/utils/commands.js

@@ -20,6 +20,8 @@ export function addOptions(program, options) {
 }
 export const makePxeOption = (mandatory)=>new Option('-u, --rpc-url <string>', 'URL of the PXE').env('PXE_URL').default(`http://${LOCALHOST}:8080`).conflicts('remote-pxe').makeOptionMandatory(mandatory);
 export const pxeOption = makePxeOption(true);
+export const makeNodeOption = (mandatory)=>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).argParser((value)=>{
     const parsedValue = Number(value);
     if (isNaN(parsedValue)) {

package/dest/utils/inspect.d.ts

@@ -1,11 +1,11 @@
 import type { ContractArtifact, Fr } from '@aztec/aztec.js';
 import type { LogFn } from '@aztec/foundation/log';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
 import type { TxHash } from '@aztec/stdlib/tx';
-export declare function inspectBlock(pxe: PXE, blockNumber: number, log: LogFn, opts?: {
+export declare function inspectBlock(pxe: PXE, aztecNode: AztecNode, blockNumber: number, log: LogFn, opts?: {
     showTxs?: boolean;
 }): Promise<void>;
-export declare function inspectTx(pxe: PXE, txHash: TxHash, log: LogFn, opts?: {
+export declare function inspectTx(pxe: PXE, aztecNode: AztecNode, txHash: TxHash, log: LogFn, opts?: {
     includeBlockInfo?: boolean;
     artifactMap?: ArtifactMap;
 }): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0B7G;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,WAAW,CAAA;CAAO,iBA8FrE;AAuCD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAC/D,KAAK,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC"}
+{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA2BjC;AAED,wBAAsB,SAAS,CAC7B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,WAAW,CAAA;CAAO,iBA8FrE;AAuCD,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAC/D,KAAK,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,EAAE,CAAA;CAAE,CAAC"}

package/dest/utils/inspect.js

@@ -1,7 +1,7 @@
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { siloNullifier } from '@aztec/stdlib/hash';
-export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
-    const block = await pxe.getBlock(blockNumber);
+export async function inspectBlock(pxe, aztecNode, blockNumber, log, opts = {}) {
+    const block = await aztecNode.getBlock(blockNumber);
     if (!block) {
         log(`No block found for block number ${blockNumber}`);
         return;
@@ -18,7 +18,7 @@ export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
         log(``);
         const artifactMap = await getKnownArtifacts(pxe);
         for (const txHash of block.body.txEffects.map((tx)=>tx.txHash)){
-            await inspectTx(pxe, txHash, log, {
+            await inspectTx(pxe, aztecNode, txHash, log, {
                 includeBlockInfo: false,
                 artifactMap
             });
@@ -27,10 +27,10 @@ export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
         log(` Transactions: ${block.body.txEffects.length}`);
     }
 }
-export async function inspectTx(pxe, txHash, log, opts = {}) {
+export async function inspectTx(pxe, aztecNode, txHash, log, opts = {}) {
     const [receipt, effectsInBlock] = await Promise.all([
-        pxe.getTxReceipt(txHash),
-        pxe.getTxEffect(txHash)
+        aztecNode.getTxReceipt(txHash),
+        aztecNode.getTxEffect(txHash)
     ]);
     // Base tx data
     log(`Tx ${txHash.toString()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "3.0.0-nightly.20250918",
+  "version": "3.0.0-nightly.20250919",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -8,6 +8,7 @@
     "./infrastructure": "./dest/cmds/infrastructure/index.js",
     "./l1": "./dest/cmds/l1/index.js",
     "./pxe": "./dest/cmds/pxe/index.js",
+    "./aztec_node": "./dest/cmds/aztec_node/index.js",
     "./cli-utils": "./dest/utils/index.js",
     "./misc": "./dest/cmds/misc/index.js",
     "./setup-contracts": "./dest/cmds/misc/setup_contracts.js",
@@ -70,20 +71,20 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250918",
-    "@aztec/archiver": "3.0.0-nightly.20250918",
-    "@aztec/aztec.js": "3.0.0-nightly.20250918",
-    "@aztec/constants": "3.0.0-nightly.20250918",
-    "@aztec/entrypoints": "3.0.0-nightly.20250918",
-    "@aztec/ethereum": "3.0.0-nightly.20250918",
-    "@aztec/foundation": "3.0.0-nightly.20250918",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250918",
-    "@aztec/node-lib": "3.0.0-nightly.20250918",
-    "@aztec/p2p": "3.0.0-nightly.20250918",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250918",
-    "@aztec/stdlib": "3.0.0-nightly.20250918",
-    "@aztec/test-wallet": "3.0.0-nightly.20250918",
-    "@aztec/world-state": "3.0.0-nightly.20250918",
+    "@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",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -110,15 +111,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250918",
-    "@aztec/bb-prover": "3.0.0-nightly.20250918",
-    "@aztec/ethereum": "3.0.0-nightly.20250918",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250918",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250918",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250918",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250918",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250918",
-    "@aztec/stdlib": "3.0.0-nightly.20250918"
+    "@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"
   },
   "files": [
     "dest",

package/src/cmds/aztec_node/block_number.ts

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

package/src/cmds/aztec_node/get_block.ts

@@ -0,0 +1,17 @@
+import { createAztecNodeClient, createCompatibleClient } from '@aztec/aztec.js';
+import type { LogFn, Logger } from '@aztec/foundation/log';
+
+import { inspectBlock } from '../../utils/inspect.js';
+
+export async function getBlock(
+  pxeUrl: string,
+  nodeUrl: string,
+  maybeBlockNumber: number | undefined,
+  debugLogger: Logger,
+  log: LogFn,
+) {
+  const client = await createCompatibleClient(pxeUrl, debugLogger);
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const blockNumber = maybeBlockNumber ?? (await aztecNode.getBlockNumber());
+  await inspectBlock(client, aztecNode, blockNumber, log, { showTxs: true });
+}

package/src/cmds/aztec_node/get_l1_to_l2_message_witness.ts

@@ -0,0 +1,25 @@
+import { type AztecAddress, type Fr, createAztecNodeClient } from '@aztec/aztec.js';
+import type { LogFn } from '@aztec/foundation/log';
+import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
+
+export async function getL1ToL2MessageWitness(
+  nodeUrl: string,
+  contractAddress: AztecAddress,
+  messageHash: Fr,
+  secret: Fr,
+  log: LogFn,
+) {
+  const node = createAztecNodeClient(nodeUrl);
+  const messageWitness = await getNonNullifiedL1ToL2MessageWitness(node, contractAddress, messageHash, secret);
+
+  log(
+    messageWitness === undefined
+      ? `
+    L1 to L2 Message not found.
+    `
+      : `
+    L1 to L2 message index: ${messageWitness[0]}
+    L1 to L2 message sibling path: ${messageWitness[1]}
+    `,
+  );
+}

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

@@ -1,6 +1,6 @@
 import type { AztecAddress, LogFilter, LogId, TxHash } from '@aztec/aztec.js';
-import { 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';
 import { sleep } from '@aztec/foundation/sleep';
 
 export async function getLogs(
@@ -9,12 +9,11 @@ export async function getLogs(
   toBlock: number,
   afterLog: LogId,
   contractAddress: AztecAddress,
-  rpcUrl: string,
+  nodeUrl: string,
   follow: boolean,
-  debugLogger: Logger,
   log: LogFn,
 ) {
-  const pxe = await createCompatibleClient(rpcUrl, debugLogger);
+  const node = createAztecNodeClient(nodeUrl);
 
   if (follow) {
     if (txHash) {
@@ -28,7 +27,7 @@ export async function getLogs(
   const filter: LogFilter = { txHash, fromBlock, toBlock, afterLog, contractAddress };
 
   const fetchLogs = async () => {
-    const response = await pxe.getPublicLogs(filter);
+    const response = await node.getPublicLogs(filter);
     const logs = response.logs;
 
     if (!logs.length) {

package/src/cmds/aztec_node/index.ts

@@ -0,0 +1,69 @@
+import type { LogFn, Logger } from '@aztec/foundation/log';
+
+import type { Command } from 'commander';
+
+import {
+  nodeOption,
+  parseAztecAddress,
+  parseField,
+  parseOptionalAztecAddress,
+  parseOptionalInteger,
+  parseOptionalLogId,
+  parseOptionalTxHash,
+  pxeOption,
+} from '../../utils/commands.js';
+
+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)
+    .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-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);
+    });
+
+  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(nodeOption)
+    .option('--follow', 'If set, will keep polling for new logs until interrupted.')
+    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, aztecNodeRpcUrl: nodeUrl, follow }) => {
+      const { getLogs } = await import('./get_logs.js');
+      await getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, nodeUrl, follow, log);
+    });
+
+  program
+    .command('block-number')
+    .description('Gets the current Aztec L2 block number.')
+    .addOption(nodeOption)
+    .action(async (options: any) => {
+      const { blockNumber } = await import('./block_number.js');
+      await blockNumber(options.nodeUrl, log);
+    });
+
+  return program;
+}

package/src/cmds/devnet/bootstrap_network.ts

@@ -1,6 +1,7 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import {
   AztecAddress,
+  type AztecNode,
   BatchCall,
   EthAddress,
   Fr,
@@ -9,6 +10,7 @@ import {
   type WaitForProvenOpts,
   type WaitOpts,
   type Wallet,
+  createAztecNodeClient,
   createCompatibleClient,
   retryUntil,
   waitForProven,
@@ -44,6 +46,7 @@ const provenWaitOpts: WaitForProvenOpts = {
 
 export async function bootstrapNetwork(
   pxeUrl: string,
+  nodeUrl: string,
   l1Urls: string[],
   l1ChainId: string,
   l1PrivateKey: `0x${string}` | undefined,
@@ -54,6 +57,7 @@ export async function bootstrapNetwork(
   debugLog: Logger,
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
+  const node = createAztecNodeClient(nodeUrl);
   const wallet = new TestWallet(pxe);
 
   // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
@@ -88,7 +92,7 @@ export async function bootstrapNetwork(
 
   const counter = await deployCounter(wallet, defaultAccountAddress);
 
-  await fundFPC(pxe, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
+  await fundFPC(pxe, node, counter.address, wallet, defaultAccountAddress, l1Client, fpc.address, debugLog);
 
   if (json) {
     log(
@@ -275,6 +279,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,
@@ -302,7 +307,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 +330,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/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/index.ts

@@ -9,6 +9,7 @@ import {
   MNEMONIC,
   PRIVATE_KEY,
   l1ChainIdOption,
+  nodeOption,
   parseAztecAddress,
   parseBigint,
   parseEthereumAddress,
@@ -509,10 +510,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

@@ -8,12 +8,7 @@ import {
   makePxeOption,
   parseAztecAddress,
   parseEthereumAddress,
-  parseField,
   parseFieldFromHexString,
-  parseOptionalAztecAddress,
-  parseOptionalInteger,
-  parseOptionalLogId,
-  parseOptionalTxHash,
   parsePublicKey,
   pxeOption,
 } from '../../utils/commands.js';
@@ -50,16 +45,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.')
@@ -80,25 +65,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,27 +85,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.')

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/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_l1_to_l2_message_witness.d.ts

@@ -1,4 +0,0 @@
-import { type AztecAddress, type Fr } from '@aztec/aztec.js';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-export declare function getL1ToL2MessageWitness(rpcUrl: string, contractAddress: AztecAddress, messageHash: Fr, secret: Fr, debugLogger: Logger, log: LogFn): Promise<void>;
-//# sourceMappingURL=get_l1_to_l2_message_witness.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"get_l1_to_l2_message_witness.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_l1_to_l2_message_witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,EAAE,EAA0B,MAAM,iBAAiB,CAAC;AACrF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,EACV,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,iBAeX"}

package/dest/cmds/pxe/get_l1_to_l2_message_witness.js

@@ -1,11 +0,0 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-export async function getL1ToL2MessageWitness(rpcUrl, contractAddress, messageHash, secret, debugLogger, log) {
-    const client = await createCompatibleClient(rpcUrl, debugLogger);
-    const messageWitness = await client.getL1ToL2MembershipWitness(contractAddress, messageHash, secret);
-    log(messageWitness === undefined ? `
-    L1 to L2 Message not found.
-    ` : `
-    L1 to L2 message index: ${messageWitness[0]}
-    L1 to L2 message sibling path: ${messageWitness[1]}
-    `);
-}

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

@@ -1 +0,0 @@
-{"version":3,"file":"get_logs.d.ts","sourceRoot":"","sources":["../../../src/cmds/pxe/get_logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAa,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,KAAK,EACf,eAAe,EAAE,YAAY,EAC7B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,KAAK,iBAmDX"}

package/src/cmds/pxe/block_number.ts

@@ -1,9 +0,0 @@
-import { createCompatibleClient } from '@aztec/aztec.js';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-
-export async function blockNumber(rpcUrl: string, debugLogger: Logger, log: LogFn) {
-  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/src/cmds/pxe/get_block.ts

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

package/src/cmds/pxe/get_l1_to_l2_message_witness.ts

@@ -1,25 +0,0 @@
-import { type AztecAddress, type Fr, createCompatibleClient } from '@aztec/aztec.js';
-import type { LogFn, Logger } from '@aztec/foundation/log';
-
-export async function getL1ToL2MessageWitness(
-  rpcUrl: string,
-  contractAddress: AztecAddress,
-  messageHash: Fr,
-  secret: Fr,
-  debugLogger: Logger,
-  log: LogFn,
-) {
-  const client = await createCompatibleClient(rpcUrl, debugLogger);
-  const messageWitness = await client.getL1ToL2MembershipWitness(contractAddress, messageHash, secret);
-
-  log(
-    messageWitness === undefined
-      ? `
-    L1 to L2 Message not found.
-    `
-      : `
-    L1 to L2 message index: ${messageWitness[0]}
-    L1 to L2 message sibling path: ${messageWitness[1]}
-    `,
-  );
-}