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

package/dest/interfaces/aztec-node-debug.js

@@ -0,0 +1,49 @@
+import { CheckpointNumberSchema } from '@aztec/foundation/branded-types';
+import { createSafeJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
+import { z } from 'zod';
+import { optional } from '../schemas/schemas.js';
+import { getVersioningResponseHandler } from '../versioning/index.js';
+const MAX_SIGNATURES_PER_REGISTER_CALL = 100;
+const MAX_SIGNATURE_LEN = 10000;
+export const AztecNodeDebugApiSchema = {
+    mineBlock: z.function({
+        input: z.tuple([]),
+        output: z.void()
+    }),
+    prove: z.function({
+        input: z.tuple([
+            optional(CheckpointNumberSchema)
+        ]),
+        output: CheckpointNumberSchema
+    }),
+    warpL2TimeAtLeastTo: z.function({
+        input: z.tuple([
+            z.number()
+        ]),
+        output: z.void()
+    }),
+    warpL2TimeAtLeastBy: z.function({
+        input: z.tuple([
+            z.number()
+        ]),
+        output: z.void()
+    }),
+    registerContractFunctionSignatures: z.function({
+        input: z.tuple([
+            z.array(z.string().max(MAX_SIGNATURE_LEN)).max(MAX_SIGNATURES_PER_REGISTER_CALL)
+        ]),
+        output: z.void()
+    })
+};
+export function createAztecNodeDebugClient(url, versions = {}, fetch = defaultFetch, apiKey) {
+    return createSafeJsonRpcClient(url, AztecNodeDebugApiSchema, {
+        namespaceMethods: 'aztecDebug',
+        fetch,
+        onResponse: getVersioningResponseHandler(versions),
+        ...apiKey ? {
+            extraHeaders: {
+                'x-api-key': apiKey
+            }
+        } : {}
+    });
+}

package/dest/interfaces/aztec-node.d.ts

@@ -1,37 +1,46 @@
-import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT } from '@aztec/constants';
+import { ARCHIVE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, NOTE_HASH_TREE_HEIGHT } from '@aztec/constants';
 import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
+import { type BlockNumber, type CheckpointNumber, type CheckpointProposalHash, type EpochNumber, type SlotNumber } from '@aztec/foundation/branded-types';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import type { Fr } from '@aztec/foundation/fields';
 import { MembershipWitness, SiblingPath } from '@aztec/foundation/trees';
 import type { AztecAddress } from '../aztec-address/index.js';
-import { type InBlock } from '../block/in_block.js';
-import { L2Block } from '../block/l2_block.js';
-import { type L2BlockNumber } from '../block/l2_block_number.js';
-import { type L2BlockSource, type L2Tips } from '../block/l2_block_source.js';
+import { type BlockData } from '../block/block_data.js';
+import { BlockHash } from '../block/block_hash.js';
+import { type BlockParameter } from '../block/block_parameter.js';
+import { type DataInBlock } from '../block/in_block.js';
+import { type CheckpointsQuery, type L2BlockTag, type L2Tips } from '../block/l2_block_source.js';
+import { type CheckpointData } from '../checkpoint/checkpoint_data.js';
 import { type ContractClassPublic, type ContractInstanceWithAddress, type NodeInfo, type ProtocolContractAddresses } from '../contract/index.js';
+import { type L1RollupConstants } from '../epoch-helpers/index.js';
+import { ManaUsageEstimate } from '../gas/fee_math.js';
 import { GasFees } from '../gas/gas_fees.js';
-import { type LogFilter } from '../logs/log_filter.js';
-import { PrivateLog } from '../logs/private_log.js';
-import { TxScopedL2Log } from '../logs/tx_scoped_l2_log.js';
+import { type LogResult } from '../logs/log_result.js';
+import { type PrivateLogsQuery, type PublicLogsQuery } from '../logs/logs_query.js';
+import { type L2ToL1MembershipWitness } from '../messaging/l2_to_l1_membership.js';
+import { CheckpointAttestation } from '../p2p/checkpoint_attestation.js';
 import { type ApiSchemaFor } from '../schemas/schemas.js';
 import { MerkleTreeId } from '../trees/merkle_tree_id.js';
 import { NullifierMembershipWitness } from '../trees/nullifier_membership_witness.js';
 import { PublicDataWitness } from '../trees/public_data_witness.js';
-import { BlockHeader, type IndexedTxEffect, PublicSimulationOutput, Tx, TxHash, TxReceipt, type TxValidationResult } from '../tx/index.js';
+import { type GetTxReceiptOptions, type IndexedTxEffect, PublicSimulationOutput, SimulationOverrides, Tx, TxHash, type TxReceipt, type TxValidationResult } from '../tx/index.js';
 import type { SingleValidatorStats, ValidatorsStats } from '../validators/types.js';
 import { type ComponentsVersions } from '../versioning/index.js';
 import { type AllowedElement } from './allowed_element.js';
-import { type GetContractClassLogsResponse, type GetPublicLogsResponse } from './get_logs_response.js';
+import { type BlockIncludeOptions, type BlockResponse, type BlocksIncludeOptions } from './block_response.js';
+import { type CheckpointTag } from './chain_tips.js';
+import { type CheckpointParameter } from './checkpoint_parameter.js';
+import { type CheckpointIncludeOptions, type CheckpointResponse } from './checkpoint_response.js';
+import { type GetTxByHashOptions } from './get_tx_by_hash_options.js';
+import { type PeerInfo, type ProposalsForSlot } from './p2p.js';
 import { type WorldStateSyncStatus } from './world_state.js';
+export type { GetTxByHashOptions } from './get_tx_by_hash_options.js';
+export { GetTxByHashOptionsSchema } from './get_tx_by_hash_options.js';
 /**
  * The aztec node.
  * We will probably implement the additional interfaces by means other than Aztec Node as it's currently a privacy leak
  */
-export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'> {
-    /**
-     * Returns the tips of the L2 chain.
-     */
-    getL2Tips(): Promise<L2Tips>;
+export interface AztecNode {
     /**
      * Returns the sync status of the node's world state
      */
@@ -39,129 +48,154 @@ export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublish
     /**
      * Find the indexes of the given leaves in the given tree along with a block metadata pointing to the block in which
      * the leaves were inserted.
-     * @param blockNumber - The block number at which to get the data or 'latest' for latest data.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param treeId - The tree to search in.
      * @param leafValues - The values to search for.
      * @returns The indices of leaves and the block metadata of a block in which the leaves were inserted.
      */
-    findLeavesIndexes(blockNumber: L2BlockNumber, treeId: MerkleTreeId, leafValues: Fr[]): Promise<(InBlock<bigint> | undefined)[]>;
-    /**
-     * Returns a sibling path for the given index in the nullifier tree.
-     * @param blockNumber - The block number at which to get the data.
-     * @param leafIndex - The index of the leaf for which the sibling path is required.
-     * @returns The sibling path for the leaf index.
-     */
-    getNullifierSiblingPath(blockNumber: L2BlockNumber, leafIndex: bigint): Promise<SiblingPath<typeof NULLIFIER_TREE_HEIGHT>>;
-    /**
-     * Returns a sibling path for the given index in the note hash tree.
-     * @param blockNumber - The block number at which to get the data.
-     * @param leafIndex - The index of the leaf for which the sibling path is required.
-     * @returns The sibling path for the leaf index.
-     */
-    getNoteHashSiblingPath(blockNumber: L2BlockNumber, leafIndex: bigint): Promise<SiblingPath<typeof NOTE_HASH_TREE_HEIGHT>>;
-    /**
-     * Returns a sibling path for a leaf in the committed historic blocks tree.
-     * @param blockNumber - The block number at which to get the data.
-     * @param leafIndex - Index of the leaf in the tree.
-     * @returns The sibling path.
-     */
-    getArchiveSiblingPath(blockNumber: L2BlockNumber, leafIndex: bigint): Promise<SiblingPath<typeof ARCHIVE_HEIGHT>>;
-    /**
-     * Returns a sibling path for a leaf in the committed public data tree.
-     * @param blockNumber - The block number at which to get the data.
-     * @param leafIndex - Index of the leaf in the tree.
-     * @returns The sibling path.
-     */
-    getPublicDataSiblingPath(blockNumber: L2BlockNumber, leafIndex: bigint): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>>;
+    findLeavesIndexes(referenceBlock: BlockParameter, treeId: MerkleTreeId, leafValues: Fr[]): Promise<(DataInBlock<bigint> | undefined)[]>;
     /**
      * Returns a nullifier membership witness for a given nullifier at a given block.
-     * @param blockNumber - The block number at which to get the data.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param nullifier - Nullifier we try to find witness for.
      * @returns The nullifier membership witness (if found).
      */
-    getNullifierMembershipWitness(blockNumber: L2BlockNumber, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
+    getNullifierMembershipWitness(referenceBlock: BlockParameter, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
     /**
      * Returns a low nullifier membership witness for a given nullifier at a given block.
-     * @param blockNumber - The block number at which to get the data.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param nullifier - Nullifier we try to find the low nullifier witness for.
      * @returns The low nullifier membership witness (if found).
+     * @throws If the nullifier already exists in the tree, since non-inclusion cannot be proven.
      * @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
      * list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
      * we are trying to prove non-inclusion for.
      */
-    getLowNullifierMembershipWitness(blockNumber: L2BlockNumber, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
+    getLowNullifierMembershipWitness(referenceBlock: BlockParameter, nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
     /**
      * Returns a public data tree witness for a given leaf slot at a given block.
-     * @param blockNumber - The block number at which to get the data.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param leafSlot - The leaf slot we try to find the witness for.
      * @returns The public data witness (if found).
      * @remarks The witness can be used to compute the current value of the public data tree leaf. If the low leaf preimage corresponds to an
      * "in range" slot, means that the slot doesn't exist and the value is 0. If the low leaf preimage corresponds to the exact slot, the current value
      * is contained in the leaf preimage.
      */
-    getPublicDataWitness(blockNumber: L2BlockNumber, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
+    getPublicDataWitness(referenceBlock: BlockParameter, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
     /**
-     * Returns a membership witness for a given archive leaf at a given block.
-     * @param blockNumber - The block number at which to get the data.
-     * @param archive - The archive leaf we try to find the witness for.
+     * Returns a membership witness for a given block hash in the archive tree.
+     *
+     * Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
+     * its block hash is appended as a new leaf to the archive tree. This method finds the membership
+     * witness (leaf index and sibling path) for a given block hash, which can be used to prove that
+     * a specific block exists in the chain's history.
+     *
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data
+     * (which contains the root of the archive tree in which we are searching for the block hash).
+     * @param blockHash - The block hash to find in the archive tree.
      */
-    getArchiveMembershipWitness(blockNumber: L2BlockNumber, archive: Fr): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined>;
+    getBlockHashMembershipWitness(referenceBlock: BlockParameter, blockHash: BlockHash): Promise<MembershipWitness<typeof ARCHIVE_HEIGHT> | undefined>;
     /**
      * Returns a membership witness for a given note hash at a given block.
-     * @param blockNumber - The block number at which to get the data.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param noteHash - The note hash we try to find the witness for.
      */
-    getNoteHashMembershipWitness(blockNumber: L2BlockNumber, noteHash: Fr): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined>;
+    getNoteHashMembershipWitness(referenceBlock: BlockParameter, noteHash: Fr): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT> | undefined>;
     /**
      * Returns the index and a sibling path for a leaf in the committed l1 to l2 data tree.
-     * @param blockNumber - The block number at which to get the data.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param l1ToL2Message - The l1ToL2Message to get the index / sibling path for.
      * @returns A tuple of the index and the sibling path of the L1ToL2Message (undefined if not found).
      */
-    getL1ToL2MessageMembershipWitness(blockNumber: L2BlockNumber, l1ToL2Message: Fr): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] | undefined>;
-    /** Returns the L2 block number in which this L1 to L2 message becomes available, or undefined if not found. */
-    getL1ToL2MessageBlock(l1ToL2Message: Fr): Promise<number | undefined>;
+    getL1ToL2MessageMembershipWitness(referenceBlock: BlockParameter, l1ToL2Message: Fr): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] | undefined>;
+    /** Returns the L2 checkpoint number in which this L1 to L2 message becomes available, or undefined if not found. */
+    getL1ToL2MessageCheckpoint(l1ToL2Message: Fr): Promise<CheckpointNumber | undefined>;
+    /**
+     * Returns all the L2 to L1 messages in an epoch.
+     *
+     * @deprecated Use {@link getL2ToL1MembershipWitness} to get an L2-to-L1 message witness directly.
+     *
+     * @param epoch - The epoch at which to get the data.
+     * @returns A nested array of the L2 to L1 messages in each tx of each block in each checkpoint in the epoch (empty
+     * array if the epoch is not found).
+     */
+    getL2ToL1Messages(epoch: EpochNumber): Promise<Fr[][][][]>;
+    /**
+     * Returns the L2-to-L1 membership witness for `message` emitted by tx `txHash`. The node selects
+     * the smallest partial-proof root on the Outbox that covers the tx's checkpoint and builds the
+     * witness against it.
+     *
+     * The node reads the Outbox roots lazily, pinned to its synced L1 block, so the witness reflects
+     * the node's synced view. Returns `undefined` if the tx isn't yet in a block/epoch or no covering
+     * root has landed on L1 as of the synced block.
+     *
+     * Caveat: cached roots that are sealed and L1-finalized are not re-validated. A reorg deeper than
+     * L1 finality could leave the node serving a witness against a no-longer-canonical root.
+     *
+     * @param txHash - The tx whose L2-to-L1 message we want a witness for.
+     * @param message - The message hash to prove inclusion of.
+     * @param messageIndexInTx - Optional index of the message within the tx's L2-to-L1 messages; pass
+     *   this when the same message hash appears multiple times in the tx.
+     */
+    getL2ToL1MembershipWitness(txHash: TxHash, message: Fr, messageIndexInTx?: number): Promise<L2ToL1MembershipWitness | undefined>;
+    /**
+     * Returns the block number at a given block tag, or the latest proposed block number when
+     * `tip` is omitted.
+     */
+    getBlockNumber(tip?: L2BlockTag): Promise<BlockNumber>;
+    /**
+     * Returns the checkpoint number at a given checkpoint tag, or the latest checkpointed number when
+     * `tip` is omitted. The proposed-but-unconfirmed checkpoint frontier is archiver-internal and not
+     * exposed over RPC, so `'proposed'` is not a valid checkpoint tag (see {@link CheckpointTag}).
+     */
+    getCheckpointNumber(tip?: CheckpointTag): Promise<CheckpointNumber>;
+    /** Returns the tips of the L2 chain. */
+    getChainTips(): Promise<L2Tips>;
+    /** Returns the rollup constants for the current chain. */
+    getL1Constants(): Promise<L1RollupConstants>;
     /**
-     * Returns whether an L1 to L2 message is synced by archiver.
-     * @param l1ToL2Message - The L1 to L2 message to check.
-     * @returns Whether the message is synced.
-     * @deprecated Use `getL1ToL2MessageBlock` instead. This method may return true even if the message is not ready to use.
+     * Returns the last L2 slot number for which the node has all L1 data needed to build the next checkpoint.
      */
-    isL1ToL2MessageSynced(l1ToL2Message: Fr): Promise<boolean>;
+    getSyncedL2SlotNumber(): Promise<SlotNumber | undefined>;
     /**
-     * Returns all the L2 to L1 messages in a block.
-     * @param blockNumber - The block number at which to get the data.
-     * @returns The L2 to L1 messages (undefined if the block number is not found).
+     * Returns the last L2 epoch number that has been fully synchronized from L1.
      */
-    getL2ToL1Messages(blockNumber: L2BlockNumber): Promise<Fr[][] | undefined>;
+    getSyncedL2EpochNumber(): Promise<EpochNumber | undefined>;
+    /** Returns the latest L1 timestamp according to the archiver's synced L1 view. */
+    getSyncedL1Timestamp(): Promise<bigint | undefined>;
     /**
-     * Get a block specified by its number.
-     * @param number - The block number being requested.
-     * @returns The requested block.
+     * Gets lightweight checkpoint metadata for a contiguous range or for an entire epoch.
+     * @param query - Either `{ from, limit }` or `{ epoch }`.
      */
-    getBlock(number: L2BlockNumber): Promise<L2Block | undefined>;
+    getCheckpointsData(query: CheckpointsQuery): Promise<CheckpointData[]>;
     /**
-     * Get a block specified by its hash.
-     * @param blockHash - The block hash being requested.
-     * @returns The requested block.
+     * Unified block fetch. Returns the block identified by `param`, with optional fields controlled
+     * by `options`.
+     * @param param - A block number, block hash, archive root, chain-tip name, or object variant.
+     * @param options - Narrowing options: `includeTransactions`, `includeL1PublishInfo`, `includeAttestations`.
      */
-    getBlockByHash(blockHash: Fr): Promise<L2Block | undefined>;
+    getBlock<Opts extends BlockIncludeOptions = {}>(param: BlockParameter, options?: Opts): Promise<BlockResponse<Opts> | undefined>;
     /**
-     * Get a block specified by its archive root.
-     * @param archive - The archive root being requested.
-     * @returns The requested block.
+     * Lightweight block-metadata fetch. Returns the block identified by `param` without transaction
+     * bodies or other optional context. Cheaper than `getBlock` for header-only access.
+     * @param param - A block number, block hash, archive root, chain-tip name, or object variant.
      */
-    getBlockByArchive(archive: Fr): Promise<L2Block | undefined>;
+    getBlockData(param: BlockParameter): Promise<BlockData | undefined>;
     /**
-     * Method to fetch the latest block number synchronized by the node.
-     * @returns The block number.
+     * Returns up to `limit` blocks starting from `from`, projected to the {@link BlockResponse}
+     * shape determined by `options`.
      */
-    getBlockNumber(): Promise<number>;
+    getBlocks<Opts extends BlocksIncludeOptions = {}>(from: BlockNumber, limit: number, options?: Opts): Promise<BlockResponse<Opts>[]>;
     /**
-     * Fetches the latest proven block number.
-     * @returns The block number.
+     * Unified checkpoint fetch. Returns the checkpoint identified by `param`, with optional fields
+     * controlled by `options`.
      */
-    getProvenBlockNumber(): Promise<number>;
+    getCheckpoint<Opts extends CheckpointIncludeOptions = {}>(param: CheckpointParameter, options?: Opts): Promise<CheckpointResponse<Opts> | undefined>;
+    /**
+     * Returns up to `limit` checkpoints starting from `from`, projected to the
+     * {@link CheckpointResponse} shape determined by `options`.
+     */
+    getCheckpoints<Opts extends CheckpointIncludeOptions = {}>(from: CheckpointNumber, limit: number, options?: Opts): Promise<CheckpointResponse<Opts>[]>;
     /**
      * Method to determine if the node is ready to accept transactions.
      * @returns - Flag indicating the readiness for tx submission.
@@ -174,17 +208,23 @@ export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublish
      */
     getNodeInfo(): Promise<NodeInfo>;
     /**
-     * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
-     * @param from - The start of the range of blocks to return.
-     * @param limit - The maximum number of blocks to return.
-     * @returns The blocks requested.
+     * Method to fetch the current min fees.
+     * @returns The current min fees.
+     */
+    getCurrentMinFees(): Promise<GasFees>;
+    /**
+     * Returns predicted min fees for the current slot and next N slots.
+     * Each entry accounts for the L1 gas oracle transition and congestion growth based on the
+     * given mana usage estimate. Defaults to target usage (steady state).
+     * @param manaUsage - Expected mana usage per checkpoint (none, target, or limit).
+     * @returns An array of GasFees with current min fees first, followed by one entry per predicted slot.
      */
-    getBlocks(from: number, limit: number): Promise<L2Block[]>;
+    getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]>;
     /**
-     * Method to fetch the current base fees.
-     * @returns The current base fees.
+     * Method to fetch the current max priority fee of txs in the mempool.
+     * @returns The current max priority fees.
      */
-    getCurrentBaseFees(): Promise<GasFees>;
+    getMaxPriorityFees(): Promise<GasFees>;
     /**
      * Method to fetch the version of the package.
      * @returns The node package version
@@ -210,38 +250,24 @@ export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublish
      */
     getProtocolContractAddresses(): Promise<ProtocolContractAddresses>;
     /**
-     * Registers contract function signatures for debugging purposes.
-     * @param functionSignatures - An array of function signatures to register by selector.
-     */
-    registerContractFunctionSignatures(functionSignatures: string[]): Promise<void>;
-    /**
-     * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-     * @param from - The block number from which to begin retrieving logs.
-     * @param limit - The maximum number of blocks to retrieve logs from.
-     * @returns An array of private logs from the specified range of blocks.
-     */
-    getPrivateLogs(from: number, limit: number): Promise<PrivateLog[]>;
-    /**
-     * Gets public logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
-     */
-    getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse>;
-    /**
-     * Gets contract class logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
+     * Gets private logs matching the given tags. Returns one inner array per element of `query.tags`, in
+     * input order. An empty inner array means no logs matched that tag. Set `query.includeEffects` to also
+     * receive the tx's note hashes and nullifiers.
+     *
+     * The return type is the widest {@link LogResult} shape — `noteHashes`/`nullifiers` are typed as
+     * optional even when `includeEffects: true` is set. JSON-RPC validation can't preserve a stricter
+     * narrowing across the wire. Callers that want a narrowed type at the call site should use the typed
+     * helpers in `pxe/src/tagging/get_all_logs_by_tags.ts`.
      */
-    getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
+    getPrivateLogsByTags(query: PrivateLogsQuery): Promise<LogResult[][]>;
     /**
-     * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-     * @param tags - The tags to filter the logs by.
-     * @param logsPerTag - How many logs to return per tag. Default 10 logs are returned for each tag
-     * @returns For each received tag, an array of matching logs and metadata (e.g. tx hash) is returned. An empty
-     * array implies no logs match that tag. There can be multiple logs for 1 tag because tag reuse can happen
-     * --> e.g. when sending a note from multiple unsynched devices.
+     * Gets public logs matching the given tags for the given contract. Returns one inner array per element
+     * of `query.tags`, in input order. An empty inner array means no logs matched that tag. Set
+     * `query.includeEffects` to also receive the tx's note hashes and nullifiers.
+     *
+     * The return type is the widest {@link LogResult} shape — see {@link getPrivateLogsByTags}.
      */
-    getLogsByTags(tags: Fr[], logsPerTag?: number): Promise<TxScopedL2Log[][]>;
+    getPublicLogsByTags(query: PublicLogsQuery): Promise<LogResult[][]>;
     /**
      * Method to submit a transaction to the p2p pool.
      * @param tx - The transaction to be submitted.
@@ -249,85 +275,80 @@ export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublish
      */
     sendTx(tx: Tx): Promise<void>;
     /**
-     * Fetches a transaction receipt for a given transaction hash. Returns a mined receipt if it was added
-     * to the chain, a pending receipt if it's still in the mempool of the connected Aztec node, or a dropped
-     * receipt if not found in the connected Aztec node.
+     * Fetches a transaction receipt for a given transaction hash. Always resolves to one of the lifecycle variants of
+     * the {@link TxReceipt} union: a {@link MinedTxReceipt} if the tx was included in a block, a {@link PendingTxReceipt}
+     * if it's still in the mempool of the connected Aztec node, or a {@link DroppedTxReceipt} if not found.
      *
      * @param txHash - The transaction hash.
+     * @param options - Optional flags controlling which extra data is attached: `includeTxEffect` attaches the full
+     * {@link TxEffect} to a mined receipt, `includePendingTx` attaches the pending {@link Tx} to a pending receipt, and
+     * `includeProof` keeps the proof on that attached pending tx (only meaningful with `includePendingTx`).
      * @returns A receipt of the transaction.
      */
-    getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
+    getTxReceipt<TGetTxReceiptOptions extends GetTxReceiptOptions = {}>(txHash: TxHash, options?: TGetTxReceiptOptions): Promise<TxReceipt<TGetTxReceiptOptions>>;
     /**
      * Gets a tx effect.
      * @param txHash - The hash of the tx corresponding to the tx effect.
      * @returns The requested tx effect with block info (or undefined if not found).
+     * @deprecated Use `getTxReceipt(txHash, { includeTxEffect: true })` and read the `.txEffect` field instead.
      */
     getTxEffect(txHash: TxHash): Promise<IndexedTxEffect | undefined>;
     /**
-     * Method to retrieve pending txs.
+     * Method to retrieve pending txs. The txs' proofs are stripped unless `includeProof` is set.
+     * @param limit - The number of items to return.
+     * @param after - The last known pending tx. Used for pagination.
+     * @param options - Options for the returned txs (eg whether to include their proofs).
      * @returns The pending txs.
      */
-    getPendingTxs(limit?: number, after?: TxHash): Promise<Tx[]>;
+    getPendingTxs(limit?: number, after?: TxHash, options?: GetTxByHashOptions): Promise<Tx[]>;
     /**
      * Retrieves the number of pending txs
      * @returns The number of pending txs.
      */
     getPendingTxCount(): Promise<number>;
     /**
-     * Method to retrieve a single pending tx.
+     * Method to retrieve a single pending tx. The tx's proof is stripped unless `includeProof` is set.
      * @param txHash - The transaction hash to return.
+     * @param options - Options for the returned tx (eg whether to include its proof).
      * @returns The pending tx if it exists.
      */
-    getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
+    getTxByHash(txHash: TxHash, options?: GetTxByHashOptions): Promise<Tx | undefined>;
     /**
-     * Method to retrieve multiple pending txs.
+     * Method to retrieve multiple pending txs. The txs' proofs are stripped unless `includeProof` is set.
      * @param txHash - The transaction hashes to return.
+     * @param options - Options for the returned txs (eg whether to include their proofs).
      * @returns The pending txs if exist.
      */
-    getTxsByHash(txHashes: TxHash[]): Promise<Tx[]>;
+    getTxsByHash(txHashes: TxHash[], options?: GetTxByHashOptions): Promise<Tx[]>;
     /**
      * Gets the storage value at the given contract storage slot.
      *
      * @remarks The storage slot here refers to the slot as it is defined in Noir not the index in the merkle tree.
      * Aztec's version of `eth_getStorageAt`.
      *
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
      * @param contract - Address of the contract to query.
      * @param slot - Slot to query.
-     * @param blockNumber - The block number at which to get the data or 'latest'.
      * @returns Storage value at the given contract slot.
      */
-    getPublicStorageAt(blockNumber: L2BlockNumber, contract: AztecAddress, slot: Fr): Promise<Fr>;
-    /**
-     * Returns the currently committed block header.
-     * @returns The current committed block header.
-     */
-    getBlockHeader(blockNumber?: L2BlockNumber): Promise<BlockHeader | undefined>;
-    /**
-     * Get a block header specified by its hash.
-     * @param blockHash - The block hash being requested.
-     * @returns The requested block header.
-     */
-    getBlockHeaderByHash(blockHash: Fr): Promise<BlockHeader | undefined>;
-    /**
-     * Get a block header specified by its archive root.
-     * @param archive - The archive root being requested.
-     * @returns The requested block header.
-     */
-    getBlockHeaderByArchive(archive: Fr): Promise<BlockHeader | undefined>;
+    getPublicStorageAt(referenceBlock: BlockParameter, contract: AztecAddress, slot: Fr): Promise<Fr>;
     /** Returns stats for validators if enabled. */
     getValidatorsStats(): Promise<ValidatorsStats>;
     /** Returns stats for a single validator if enabled. */
-    getValidatorStats(validatorAddress: EthAddress, fromSlot?: bigint, toSlot?: bigint): Promise<SingleValidatorStats | undefined>;
+    getValidatorStats(validatorAddress: EthAddress, fromSlot?: SlotNumber, toSlot?: SlotNumber): Promise<SingleValidatorStats | undefined>;
     /**
      * Simulates the public part of a transaction with the current state.
      * This currently just checks that the transaction execution succeeds.
      * @param tx - The transaction to simulate.
+     * @param skipFeeEnforcement - If true, fee enforcement is skipped.
+     * @param overrides - Optional pre-simulation overrides applied to the ephemeral fork and contract DB
+     * (publicStorage writes, contract instance overrides).
      **/
-    simulatePublicCalls(tx: Tx, skipFeeEnforcement?: boolean): Promise<PublicSimulationOutput>;
+    simulatePublicCalls(tx: Tx, skipFeeEnforcement?: boolean, overrides?: SimulationOverrides): Promise<PublicSimulationOutput>;
     /**
      * Returns true if the transaction is valid for inclusion at the current state. Valid transactions can be
      * made invalid by *other* transactions if e.g. they emit the same nullifiers, or come become invalid
-     * due to e.g. the include_by_timestamp property.
+     * due to e.g. the expiration_timestamp property.
      * @param tx - The transaction to validate for correctness.
      * @param isSimulation - True if the transaction is a simulated one without generated proofs. (Optional)
      * @param skipFeeEnforcement - True if the validation of the fee should be skipped. Useful when the simulation is for estimating fee (Optional)
@@ -342,10 +363,18 @@ export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublish
      */
     getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
     /**
-     * Returns a publicly deployed contract instance given its address.
+     * Returns a publicly deployed contract instance given its address. Its current class id is resolved as of the given
+     * reference block.
+     *
+     * Returns `undefined` if the instance has not been published (i.e. `publish_for_public_execution` was never called
+     * on the `ContractInstanceRegistry`). A contract whose class has been updated will never return `undefined`:
+     * scheduling an update requires the contract's deployment nullifier, which is only emitted by publishing, so any
+     * updatable contract has necessarily been published.
      * @param address - Address of the deployed contract.
+     * @param referenceBlock - The block parameter (block number, block hash, or 'latest') at which to get the data.
+     *        Defaults to 'latest'.
      */
-    getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+    getContract(address: AztecAddress, referenceBlock?: BlockParameter): Promise<ContractInstanceWithAddress | undefined>;
     /**
      * Returns the ENR of this node for peer discovery, if available.
      */
@@ -355,8 +384,25 @@ export interface AztecNode extends Pick<L2BlockSource, 'getBlocks' | 'getPublish
      * @returns The list of allowed elements.
      */
     getAllowedPublicSetup(): Promise<AllowedElement[]>;
+    /**
+     * Returns info for all connected, dialing, and cached peers. Only available when P2P is enabled.
+     * @param includePending - If true, also include peers in the pending state.
+     */
+    getPeers(includePending?: boolean): Promise<PeerInfo[]>;
+    /**
+     * Queries the attestation pool for checkpoint attestations for the given slot.
+     * @param slot - The slot to query.
+     * @param proposalPayloadHash - Hex-encoded keccak256 of the target proposal's signed payload hash.
+     *        When provided, only attestations whose payload hash matches are returned.
+     *        When omitted, all attestations for the slot are returned.
+     */
+    getCheckpointAttestationsForSlot(slot: SlotNumber, proposalPayloadHash?: CheckpointProposalHash): Promise<CheckpointAttestation[]>;
+    /**
+     * Returns block and checkpoint proposals retained in the attestation pool for the given slot.
+     * Only available when P2P is enabled.
+     */
+    getProposalsForSlot(slot: SlotNumber): Promise<ProposalsForSlot>;
 }
-export declare const MAX_LOGS_PER_TAG = 10;
 export declare const AztecNodeApiSchema: ApiSchemaFor<AztecNode>;
 export declare function createAztecNodeClient(url: string, versions?: Partial<ComponentsVersions>, fetch?: typeof import("@aztec/foundation/json-rpc/client").defaultFetch, batchWindowMS?: number): AztecNode;
-//# sourceMappingURL=aztec-node.d.ts.map
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"aztec-node.d.ts","sourceRoot":"","sources":["../../src/interfaces/aztec-node.ts"],"names":[],"mappings":"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"}