@aztec/cli 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/utils/inspect.js

@@ -1,8 +1,5 @@
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { siloNullifier } from '@aztec/stdlib/hash';
-import { NoteStatus } from '@aztec/stdlib/note';
-export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
-    const block = await pxe.getBlock(blockNumber);
+export async function inspectBlock(aztecNode, blockNumber, log, opts = {}) {
+    const block = await aztecNode.getBlock(blockNumber);
     if (!block) {
         log(`No block found for block number ${blockNumber}`);
         return;
@@ -11,31 +8,25 @@ export async function inspectBlock(pxe, blockNumber, log, opts = {}) {
     log(`Block ${blockNumber} (${blockHash.toString()})`);
     log(` Total fees: ${block.header.totalFees.toBigInt()}`);
     log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
-    log(` Fee per gas unit: DA=${block.header.globalVariables.gasFees.feePerDaGas.toBigInt()} L2=${block.header.globalVariables.gasFees.feePerL2Gas.toBigInt()}`);
+    log(` Fee per gas unit: DA=${block.header.globalVariables.gasFees.feePerDaGas} L2=${block.header.globalVariables.gasFees.feePerL2Gas}`);
     log(` Coinbase: ${block.header.globalVariables.coinbase}`);
     log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
-    log(` Timestamp: ${new Date(block.header.globalVariables.timestamp.toNumber() * 500)}`);
+    log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
     if (opts.showTxs) {
         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(aztecNode, txHash, log, {
+                includeBlockInfo: false
             });
         }
     } else {
         log(` Transactions: ${block.body.txEffects.length}`);
     }
 }
-export async function inspectTx(pxe, txHash, log, opts = {}) {
-    const [receipt, effectsInBlock, getNotes] = await Promise.all([
-        pxe.getTxReceipt(txHash),
-        pxe.getTxEffect(txHash),
-        pxe.getNotes({
-            txHash,
-            status: NoteStatus.ACTIVE_OR_NULLIFIED
-        })
+export async function inspectTx(aztecNode, txHash, log, opts = {}) {
+    const [receipt, effectsInBlock] = await Promise.all([
+        aztecNode.getTxReceipt(txHash),
+        aztecNode.getTxEffect(txHash)
     ]);
     // Base tx data
     log(`Tx ${txHash.toString()}`);
@@ -47,7 +38,6 @@ export async function inspectTx(pxe, txHash, log, opts = {}) {
         return;
     }
     const effects = effectsInBlock.data;
-    const artifactMap = opts?.artifactMap ?? await getKnownArtifacts(pxe);
     if (opts.includeBlockInfo) {
         log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
     }
@@ -74,39 +64,17 @@ export async function inspectTx(pxe, txHash, log, opts = {}) {
     const notes = effects.noteHashes;
     if (notes.length > 0) {
         log(' Created notes:');
-        log(`  Total: ${notes.length}. Found: ${getNotes.length}.`);
-        if (getNotes.length) {
-            log('  Found notes:');
-            for (const note of getNotes){
-                inspectNote(note, artifactMap, log);
-            }
+        log(`  Total: ${notes.length}`);
+        for (const note of notes){
+            log(`  Note hash: ${note.toShortString()}`);
         }
     }
-    // Nullifiers
-    const nullifierCount = effects.nullifiers.length;
-    const { deployNullifiers, initNullifiers, classNullifiers } = await getKnownNullifiers(pxe, artifactMap);
-    if (nullifierCount > 0) {
-        log(' Nullifiers:');
-        for (const nullifier of effects.nullifiers){
-            const [note] = await pxe.getNotes({
-                siloedNullifier: nullifier
-            });
-            const deployed = deployNullifiers[nullifier.toString()];
-            const initialized = initNullifiers[nullifier.toString()];
-            const registered = classNullifiers[nullifier.toString()];
-            if (nullifier.toBuffer().equals(txHash.toBuffer())) {
-                log(`  Transaction hash nullifier ${nullifier.toShortString()}`);
-            } else if (note) {
-                inspectNote(note, artifactMap, log, `Nullifier ${nullifier.toShortString()} for note`);
-            } else if (deployed) {
-                log(`  Contract ${toFriendlyAddress(deployed, artifactMap)} deployed via nullifier ${nullifier.toShortString()}`);
-            } else if (initialized) {
-                log(`  Contract ${toFriendlyAddress(initialized, artifactMap)} initialized via nullifier ${nullifier.toShortString()}`);
-            } else if (registered) {
-                log(`  Class ${registered} registered via nullifier ${nullifier.toShortString()}`);
-            } else {
-                log(`  Unknown nullifier ${nullifier.toString()}`);
-            }
+    // Created nullifiers
+    const nullifiers = effects.nullifiers;
+    if (nullifiers.length > 0) {
+        log(' Created nullifiers:');
+        for (const nullifier of nullifiers){
+            log(`  Nullifier: ${nullifier.toShortString()}`);
         }
     }
     // L2 to L1 messages
@@ -117,61 +85,3 @@ export async function inspectTx(pxe, txHash, log, opts = {}) {
         }
     }
 }
-function inspectNote(note, artifactMap, log, text = 'Note') {
-    const artifact = artifactMap[note.contractAddress.toString()];
-    const contract = artifact?.name ?? note.contractAddress.toString();
-    const type = artifact?.notes[note.noteTypeId.toString()]?.typ ?? note.noteTypeId.toField().toShortString();
-    log(`  ${text} type ${type} at ${contract}`);
-    log(`    Owner: ${toFriendlyAddress(note.owner, artifactMap)}`);
-    for (const field of note.note.items){
-        log(`    ${field.toString()}`);
-    }
-}
-function toFriendlyAddress(address, artifactMap) {
-    const artifact = artifactMap[address.toString()];
-    if (!artifact) {
-        return address.toString();
-    }
-    return `${artifact.name}<${address.toString()}>`;
-}
-async function getKnownNullifiers(pxe, artifactMap) {
-    const knownContracts = await pxe.getContracts();
-    const deployerAddress = ProtocolContractAddress.ContractInstanceDeployer;
-    const registererAddress = ProtocolContractAddress.ContractClassRegisterer;
-    const initNullifiers = {};
-    const deployNullifiers = {};
-    const classNullifiers = {};
-    for (const contract of knownContracts){
-        initNullifiers[siloNullifier(contract, contract.toField()).toString()] = contract;
-        deployNullifiers[siloNullifier(deployerAddress, contract.toField()).toString()] = contract;
-    }
-    for (const artifact of Object.values(artifactMap)){
-        classNullifiers[siloNullifier(registererAddress, artifact.classId).toString()] = `${artifact.name}Class<${artifact.classId}>`;
-    }
-    return {
-        initNullifiers,
-        deployNullifiers,
-        classNullifiers
-    };
-}
-async function getKnownArtifacts(pxe) {
-    const knownContractAddresses = await pxe.getContracts();
-    const knownContracts = (await Promise.all(knownContractAddresses.map((contractAddress)=>pxe.getContractMetadata(contractAddress)))).map((contractMetadata)=>contractMetadata.contractInstance);
-    const classIds = [
-        ...new Set(knownContracts.map((contract)=>contract?.currentContractClassId))
-    ];
-    const knownArtifacts = (await Promise.all(classIds.map((classId)=>classId ? pxe.getContractClassMetadata(classId) : undefined))).map((contractClassMetadata)=>contractClassMetadata ? {
-            ...contractClassMetadata.artifact,
-            classId: contractClassMetadata.contractClass?.id
-        } : undefined);
-    const map = {};
-    for (const instance of knownContracts){
-        if (instance) {
-            const artifact = knownArtifacts.find((a)=>a?.classId?.equals(instance.currentContractClassId));
-            if (artifact) {
-                map[instance.address.toString()] = artifact;
-            }
-        }
-    }
-    return map;
-}

package/dest/utils/setup_contracts.d.ts

@@ -0,0 +1,3 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+export declare function getSponsoredFPCAddress(): Promise<AztecAddress>;
+//# sourceMappingURL=setup_contracts.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setup_contracts.d.ts","sourceRoot":"","sources":["../../src/utils/setup_contracts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAY9D,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,YAAY,CAAC,CAMpE"}

package/dest/utils/setup_contracts.js

@@ -0,0 +1,16 @@
+import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import { SPONSORED_FPC_SALT } from '@aztec/constants';
+async function getSponsoredFPCContract() {
+    // 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 { SponsoredFPCContract } = await import('@aztec/noir-contracts.js/SponsoredFPC');
+    return SponsoredFPCContract;
+}
+export async function getSponsoredFPCAddress() {
+    const SponsoredFPCContract = await getSponsoredFPCContract();
+    const sponsoredFPCInstance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+        salt: new Fr(SPONSORED_FPC_SALT)
+    });
+    return sponsoredFPCInstance.address;
+}

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "@aztec/cli",
-  "version": "0.0.0-test.1",
+  "version": "0.0.1-commit.b655e406",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
     "./devnet": "./dest/cmds/devnet/index.js",
     "./infrastructure": "./dest/cmds/infrastructure/index.js",
     "./l1": "./dest/cmds/l1/index.js",
-    "./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",
+    "./validator_keys": "./dest/cmds/validator_keys/index.js",
     "./setup-contracts": "./dest/cmds/misc/setup_contracts.js",
     "./utils": "./dest/utils/index.js",
-    "./inspect": "./dest/utils/inspect.js"
+    "./inspect": "./dest/utils/inspect.js",
+    "./config": "./dest/config/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -25,8 +27,6 @@
     "build": "yarn clean && tsc -b",
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
-    "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
@@ -64,54 +64,65 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs",
+    "setupFilesAfterEnv": [
+      "../../foundation/src/jest/setupAfterEnv.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.0-test.1",
-    "@aztec/aztec.js": "0.0.0-test.1",
-    "@aztec/constants": "0.0.0-test.1",
-    "@aztec/foundation": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
-    "@aztec/p2p": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1",
-    "@aztec/world-state": "0.0.0-test.1",
+    "@aztec/accounts": "0.0.1-commit.b655e406",
+    "@aztec/archiver": "0.0.1-commit.b655e406",
+    "@aztec/aztec.js": "0.0.1-commit.b655e406",
+    "@aztec/constants": "0.0.1-commit.b655e406",
+    "@aztec/entrypoints": "0.0.1-commit.b655e406",
+    "@aztec/ethereum": "0.0.1-commit.b655e406",
+    "@aztec/foundation": "0.0.1-commit.b655e406",
+    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
+    "@aztec/node-keystore": "0.0.1-commit.b655e406",
+    "@aztec/node-lib": "0.0.1-commit.b655e406",
+    "@aztec/p2p": "0.0.1-commit.b655e406",
+    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
+    "@aztec/stdlib": "0.0.1-commit.b655e406",
+    "@aztec/test-wallet": "0.0.1-commit.b655e406",
+    "@aztec/world-state": "0.0.1-commit.b655e406",
+    "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
+    "@scure/bip39": "^2.0.1",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "lodash.groupby": "^4.6.0",
     "semver": "^7.5.4",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.22.8"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@aztec/accounts": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@jest/globals": "^29.5.0",
-    "@types/jest": "^29.5.0",
+    "@jest/globals": "^30.0.0",
+    "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
     "@types/lodash.groupby": "^4.6.9",
     "@types/lodash.startcase": "^4.4.7",
-    "@types/node": "^18.7.23",
+    "@types/node": "^22.15.17",
     "@types/semver": "^7.5.2",
     "@types/source-map-support": "^0.5.10",
-    "jest": "^29.5.0",
-    "jest-mock-extended": "^3.0.5",
-    "ts-jest": "^29.1.0",
+    "jest": "^30.0.0",
+    "jest-mock-extended": "^4.0.0",
+    "ts-jest": "^29.4.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.0.0-test.1",
-    "@aztec/bb-prover": "0.0.0-test.1",
-    "@aztec/ethereum": "0.0.0-test.1",
-    "@aztec/l1-artifacts": "0.0.0-test.1",
-    "@aztec/noir-contracts.js": "0.0.0-test.1",
-    "@aztec/noir-protocol-circuits-types": "0.0.0-test.1",
-    "@aztec/protocol-contracts": "0.0.0-test.1",
-    "@aztec/stdlib": "0.0.0-test.1"
+    "@aztec/accounts": "0.0.1-commit.b655e406",
+    "@aztec/bb-prover": "0.0.1-commit.b655e406",
+    "@aztec/ethereum": "0.0.1-commit.b655e406",
+    "@aztec/l1-artifacts": "0.0.1-commit.b655e406",
+    "@aztec/noir-contracts.js": "0.0.1-commit.b655e406",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b655e406",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.b655e406",
+    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
+    "@aztec/stdlib": "0.0.1-commit.b655e406"
   },
   "files": [
     "dest",
@@ -120,6 +131,6 @@
   ],
   "types": "./dest/index.d.ts",
   "engines": {
-    "node": ">=18"
+    "node": ">=20.10"
   }
 }

package/src/cmds/aztec_node/block_number.ts

@@ -0,0 +1,9 @@
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+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,10 @@
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import type { LogFn } from '@aztec/foundation/log';
+
+import { inspectBlock } from '../../utils/inspect.js';
+
+export async function getBlock(nodeUrl: string, maybeBlockNumber: number | undefined, log: LogFn) {
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const blockNumber = maybeBlockNumber ?? (await aztecNode.getBlockNumber());
+  await inspectBlock(aztecNode, blockNumber, log, { showTxs: true });
+}

package/src/cmds/aztec_node/get_current_base_fee.ts

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

package/src/cmds/aztec_node/get_l1_to_l2_message_witness.ts

@@ -0,0 +1,27 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Fr } from '@aztec/aztec.js/fields';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+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,8 @@
-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 type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { LogFilter, LogId } from '@aztec/aztec.js/log';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import type { TxHash } from '@aztec/aztec.js/tx';
+import type { LogFn } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 
 export async function getLogs(
@@ -9,12 +11,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 +29,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/{pxe → aztec_node}/get_node_info.ts

@@ -1,26 +1,15 @@
-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/node';
+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({
       nodeVersion: info.nodeVersion,
       l1ChainId: info.l1ChainId,
-      protocolVersion: info.protocolVersion,
+      rollupVersion: info.rollupVersion,
       enr: info.enr,
       l1ContractAddresses: {
         rollup: info.l1ContractAddresses.rollupAddress.toString(),
@@ -35,18 +24,20 @@ export async function getNodeInfo(
         governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
         governance: info.l1ContractAddresses.governanceAddress.toString(),
         slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
+        feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
+        stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
       },
       protocolContractAddresses: {
-        classRegisterer: info.protocolContractAddresses.classRegisterer.toString(),
+        classRegistry: info.protocolContractAddresses.classRegistry.toString(),
         feeJuice: info.protocolContractAddresses.feeJuice.toString(),
-        instanceDeployer: info.protocolContractAddresses.instanceDeployer.toString(),
+        instanceRegistry: info.protocolContractAddresses.instanceRegistry.toString(),
         multiCallEntrypoint: info.protocolContractAddresses.multiCallEntrypoint.toString(),
       },
     });
   } else {
     log(`Node Version: ${info.nodeVersion}`);
     log(`Chain Id: ${info.l1ChainId}`);
-    log(`Protocol Version: ${info.protocolVersion}`);
+    log(`Rollup Version: ${info.rollupVersion}`);
     log(`Node ENR: ${info.enr}`);
     log(`L1 Contract Addresses:`);
     log(` Rollup Address: ${info.l1ContractAddresses.rollupAddress.toString()}`);
@@ -61,11 +52,12 @@ export async function getNodeInfo(
     log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
     log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
-
+    log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
+    log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`L2 Contract Addresses:`);
-    log(` Class Registerer: ${info.protocolContractAddresses.classRegisterer.toString()}`);
+    log(` Class Registry: ${info.protocolContractAddresses.classRegistry.toString()}`);
     log(` Fee Juice: ${info.protocolContractAddresses.feeJuice.toString()}`);
-    log(` Instance Deployer: ${info.protocolContractAddresses.instanceDeployer.toString()}`);
+    log(` Instance Deployer: ${info.protocolContractAddresses.instanceRegistry.toString()}`);
     log(` MultiCall: ${info.protocolContractAddresses.multiCallEntrypoint.toString()}`);
   }
 }

package/src/cmds/aztec_node/index.ts

@@ -0,0 +1,87 @@
+import type { LogFn, Logger } from '@aztec/foundation/log';
+
+import type { Command } from 'commander';
+
+import {
+  logJson,
+  nodeOption,
+  parseAztecAddress,
+  parseField,
+  parseOptionalAztecAddress,
+  parseOptionalInteger,
+  parseOptionalLogId,
+  parseOptionalTxHash,
+} 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(nodeOption)
+    .action(async (blockNumber, options) => {
+      const { getBlock } = await import('./get_block.js');
+      await getBlock(options.nodeUrl, blockNumber, 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);
+    });
+
+  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);
+    });
+
+  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/contracts/inspect_contract.ts

@@ -5,6 +5,7 @@ import {
   FunctionSelector,
   decodeFunctionSignature,
   decodeFunctionSignatureWithParameterNames,
+  retainBytecode,
 } from '@aztec/stdlib/abi';
 import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 
@@ -12,7 +13,9 @@ import { getContractArtifact } from '../../utils/aztec.js';
 
 export async function inspectContract(contractArtifactFile: string, debugLogger: Logger, log: LogFn) {
   const contractArtifact = await getContractArtifact(contractArtifactFile, log);
-  const contractFns = contractArtifact.functions;
+  const contractFns = contractArtifact.functions.concat(
+    contractArtifact.nonDispatchPublicFunctions.map(f => f as FunctionArtifact),
+  );
   if (contractFns.length === 0) {
     log(`No functions found for contract ${contractArtifact.name}`);
   }
@@ -43,9 +46,16 @@ async function logFunction(fn: FunctionArtifact, log: LogFn) {
   const signatureWithParameterNames = decodeFunctionSignatureWithParameterNames(fn.name, fn.parameters);
   const signature = decodeFunctionSignature(fn.name, fn.parameters);
   const selector = await FunctionSelector.fromSignature(signature);
-  const bytecodeSize = fn.bytecode.length;
-  const bytecodeHash = sha256(fn.bytecode).toString('hex');
-  log(
-    `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}\n\tbytecode: ${bytecodeSize} bytes (sha256 ${bytecodeHash})`,
-  );
+
+  if (retainBytecode(fn)) {
+    const bytecodeSize = fn.bytecode.length;
+    const bytecodeHash = sha256(fn.bytecode).toString('hex');
+    log(
+      `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}\n\tbytecode: ${bytecodeSize} bytes (sha256 ${bytecodeHash})`,
+    );
+  } else {
+    log(
+      `${fn.functionType} ${signatureWithParameterNames} \n\tfunction signature: ${signature}\n\tselector: ${selector}`,
+    );
+  }
 }