npm - @aztec/stdlib - Versions diffs - 0.80.0 → 0.82.0 - Mend

@aztec/stdlib 0.80.0 → 0.82.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (201) hide show

package/dest/abi/abi.d.ts +5 -1
package/dest/abi/abi.d.ts.map +1 -1
package/dest/abi/abi.js +2 -1
package/dest/abi/contract_artifact.d.ts.map +1 -1
package/dest/abi/contract_artifact.js +11 -0
package/dest/auth_witness/auth_witness.d.ts +21 -0
package/dest/auth_witness/auth_witness.d.ts.map +1 -1
package/dest/auth_witness/auth_witness.js +29 -0
package/dest/avm/avm.d.ts +173 -405
package/dest/avm/avm.d.ts.map +1 -1
package/dest/avm/avm.js +34 -27
package/dest/avm/avm_proving_request.d.ts +84 -186
package/dest/avm/avm_proving_request.d.ts.map +1 -1
package/dest/avm/public_data_write.d.ts +1 -0
package/dest/avm/public_data_write.d.ts.map +1 -1
package/dest/avm/public_data_write.js +3 -0
package/dest/block/body.d.ts +1 -0
package/dest/block/body.d.ts.map +1 -1
package/dest/block/body.js +3 -0
package/dest/block/index.d.ts +1 -1
package/dest/block/index.d.ts.map +1 -1
package/dest/block/index.js +1 -1
package/dest/block/l2_block.d.ts +2 -1
package/dest/block/l2_block.d.ts.map +1 -1
package/dest/block/l2_block.js +3 -0
package/dest/block/l2_block_downloader/l2_block_stream.d.ts +3 -3
package/dest/block/l2_block_downloader/l2_block_stream.d.ts.map +1 -1
package/dest/block/l2_block_downloader/l2_block_stream.js +2 -4
package/dest/block/l2_block_source.d.ts +9 -0
package/dest/block/l2_block_source.d.ts.map +1 -1
package/dest/block/published_l2_block.d.ts +89 -0
package/dest/block/published_l2_block.d.ts.map +1 -0
package/dest/block/published_l2_block.js +32 -0
package/dest/contract/interfaces/contract_data_source.d.ts +3 -14
package/dest/contract/interfaces/contract_data_source.d.ts.map +1 -1
package/dest/database-version/version_manager.d.ts +5 -0
package/dest/database-version/version_manager.d.ts.map +1 -1
package/dest/database-version/version_manager.js +8 -1
package/dest/interfaces/archiver.d.ts +1 -2
package/dest/interfaces/archiver.d.ts.map +1 -1
package/dest/interfaces/archiver.js +5 -6
package/dest/interfaces/aztec-node-admin.d.ts +20 -0
package/dest/interfaces/aztec-node-admin.d.ts.map +1 -0
package/dest/interfaces/aztec-node-admin.js +16 -0
package/dest/interfaces/aztec-node.d.ts +9 -39
package/dest/interfaces/aztec-node.d.ts.map +1 -1
package/dest/interfaces/aztec-node.js +6 -12
package/dest/interfaces/client.d.ts +1 -0
package/dest/interfaces/client.d.ts.map +1 -1
package/dest/interfaces/client.js +1 -0
package/dest/interfaces/private_kernel_prover.d.ts +2 -3
package/dest/interfaces/private_kernel_prover.d.ts.map +1 -1
package/dest/interfaces/prover-node.d.ts +1 -2
package/dest/interfaces/prover-node.d.ts.map +1 -1
package/dest/interfaces/prover-node.js +5 -4
package/dest/interfaces/proving-job.d.ts +106 -208
package/dest/interfaces/proving-job.d.ts.map +1 -1
package/dest/interfaces/pxe.d.ts +21 -39
package/dest/interfaces/pxe.d.ts.map +1 -1
package/dest/interfaces/pxe.js +10 -9
package/dest/kernel/index.d.ts +1 -1
package/dest/kernel/index.d.ts.map +1 -1
package/dest/kernel/index.js +1 -1
package/dest/kernel/private_kernel_prover_output.d.ts +49 -0
package/dest/kernel/private_kernel_prover_output.d.ts.map +1 -0
package/dest/kernel/private_kernel_prover_output.js +8 -0
package/dest/kernel/private_kernel_simulated_output.d.ts +3 -7
package/dest/kernel/private_kernel_simulated_output.d.ts.map +1 -1
package/dest/logs/contract_class_log.d.ts +1 -0
package/dest/logs/contract_class_log.d.ts.map +1 -1
package/dest/logs/contract_class_log.js +3 -0
package/dest/logs/l1_payload/index.d.ts +1 -1
package/dest/logs/l1_payload/index.d.ts.map +1 -1
package/dest/logs/l1_payload/index.js +1 -1
package/dest/logs/log_with_tx_data.js +2 -2
package/dest/logs/private_log.d.ts +2 -1
package/dest/logs/private_log.d.ts.map +1 -1
package/dest/logs/private_log.js +14 -3
package/dest/logs/public_log.d.ts.map +1 -1
package/dest/logs/public_log.js +4 -1
package/dest/logs/tx_scoped_l2_log.d.ts +16 -28
package/dest/logs/tx_scoped_l2_log.d.ts.map +1 -1
package/dest/logs/tx_scoped_l2_log.js +28 -19
package/dest/noir/index.d.ts +5 -1
package/dest/noir/index.d.ts.map +1 -1
package/dest/note/extended_note.d.ts +10 -21
package/dest/note/extended_note.d.ts.map +1 -1
package/dest/note/extended_note.js +19 -28
package/dest/note/notes_filter.d.ts +2 -2
package/dest/note/notes_filter.d.ts.map +1 -1
package/dest/note/notes_filter.js +1 -1
package/dest/p2p/consensus_payload.d.ts +3 -1
package/dest/p2p/consensus_payload.d.ts.map +1 -1
package/dest/p2p/consensus_payload.js +3 -0
package/dest/proofs/client_ivc_proof.d.ts +1 -2
package/dest/proofs/client_ivc_proof.d.ts.map +1 -1
package/dest/proofs/client_ivc_proof.js +6 -9
package/dest/proofs/proof.d.ts +0 -1
package/dest/proofs/proof.d.ts.map +1 -1
package/dest/proofs/proof.js +2 -7
package/dest/rollup/block_root_rollup.d.ts +1 -1
package/dest/rollup/tube_inputs.d.ts +7 -2
package/dest/rollup/tube_inputs.d.ts.map +1 -1
package/dest/rollup/tube_inputs.js +10 -4
package/dest/tests/factories.d.ts +3 -2
package/dest/tests/factories.d.ts.map +1 -1
package/dest/tests/factories.js +14 -8
package/dest/tests/mocks.d.ts +2 -2
package/dest/tests/mocks.d.ts.map +1 -1
package/dest/tests/mocks.js +4 -5
package/dest/trees/nullifier_membership_witness.d.ts +11 -7
package/dest/trees/nullifier_membership_witness.d.ts.map +1 -1
package/dest/trees/nullifier_membership_witness.js +10 -0
package/dest/trees/public_data_witness.d.ts +12 -12
package/dest/trees/public_data_witness.d.ts.map +1 -1
package/dest/trees/public_data_witness.js +13 -0
package/dest/tx/capsule.d.ts +2 -0
package/dest/tx/capsule.d.ts.map +1 -1
package/dest/tx/capsule.js +2 -0
package/dest/tx/index.d.ts +2 -0
package/dest/tx/index.d.ts.map +1 -1
package/dest/tx/index.js +2 -0
package/dest/tx/private_execution_result.d.ts +4 -0
package/dest/tx/private_execution_result.d.ts.map +1 -1
package/dest/tx/private_execution_result.js +5 -0
package/dest/tx/profiled_tx.d.ts +9 -0
package/dest/tx/profiled_tx.d.ts.map +1 -0
package/dest/tx/profiled_tx.js +27 -0
package/dest/tx/proven_tx.d.ts +33 -0
package/dest/tx/proven_tx.d.ts.map +1 -0
package/dest/tx/proven_tx.js +35 -0
package/dest/tx/simulated_tx.d.ts +8 -44
package/dest/tx/simulated_tx.d.ts.map +1 -1
package/dest/tx/simulated_tx.js +17 -40
package/dest/tx/tx_effect.d.ts +1 -0
package/dest/tx/tx_effect.d.ts.map +1 -1
package/dest/tx/tx_effect.js +4 -1
package/dest/tx/tx_receipt.d.ts +1 -30
package/dest/tx/tx_receipt.d.ts.map +1 -1
package/dest/tx/tx_receipt.js +3 -13
package/package.json +6 -7
package/src/abi/abi.ts +7 -2
package/src/abi/contract_artifact.ts +11 -0
package/src/auth_witness/auth_witness.ts +29 -0
package/src/avm/avm.ts +42 -39
package/src/avm/public_data_write.ts +4 -0
package/src/block/body.ts +6 -0
package/src/block/index.ts +1 -1
package/src/block/l2_block.ts +4 -0
package/src/block/l2_block_downloader/l2_block_stream.ts +5 -7
package/src/block/l2_block_source.ts +11 -0
package/src/block/published_l2_block.ts +45 -0
package/src/contract/interfaces/contract_data_source.ts +3 -16
package/src/database-version/version_manager.ts +11 -1
package/src/interfaces/archiver.ts +11 -14
package/src/interfaces/aztec-node-admin.ts +39 -0
package/src/interfaces/aztec-node.ts +13 -72
package/src/interfaces/client.ts +1 -0
package/src/interfaces/private_kernel_prover.ts +2 -3
package/src/interfaces/prover-node.ts +2 -4
package/src/interfaces/pxe.ts +34 -56
package/src/kernel/index.ts +1 -1
package/src/kernel/private_kernel_prover_output.ts +44 -0
package/src/kernel/private_kernel_simulated_output.ts +4 -13
package/src/logs/contract_class_log.ts +8 -0
package/src/logs/l1_payload/index.ts +1 -1
package/src/logs/log_with_tx_data.ts +2 -2
package/src/logs/private_log.ts +13 -3
package/src/logs/public_log.ts +11 -1
package/src/logs/tx_scoped_l2_log.ts +28 -25
package/src/noir/index.ts +6 -1
package/src/note/extended_note.ts +17 -36
package/src/note/notes_filter.ts +3 -3
package/src/p2p/consensus_payload.ts +9 -0
package/src/proofs/client_ivc_proof.ts +5 -15
package/src/proofs/proof.ts +2 -8
package/src/rollup/tube_inputs.ts +8 -4
package/src/tests/factories.ts +15 -14
package/src/tests/mocks.ts +4 -9
package/src/trees/nullifier_membership_witness.ts +12 -0
package/src/trees/public_data_witness.ts +15 -0
package/src/tx/capsule.ts +2 -0
package/src/tx/index.ts +2 -0
package/src/tx/private_execution_result.ts +7 -0
package/src/tx/profiled_tx.ts +27 -0
package/src/tx/proven_tx.ts +58 -0
package/src/tx/simulated_tx.ts +11 -63
package/src/tx/tx_effect.ts +23 -1
package/src/tx/tx_receipt.ts +0 -36
package/dest/block/nullifier_with_block_source.d.ts +0 -6
package/dest/block/nullifier_with_block_source.d.ts.map +0 -1
package/dest/block/nullifier_with_block_source.js +0 -1
package/dest/kernel/private_kernel_prover_profile_result.d.ts +0 -25
package/dest/kernel/private_kernel_prover_profile_result.d.ts.map +0 -1
package/dest/kernel/private_kernel_prover_profile_result.js +0 -7
package/dest/logs/l1_payload/l1_note_payload.d.ts +0 -82
package/dest/logs/l1_payload/l1_note_payload.d.ts.map +0 -1
package/dest/logs/l1_payload/l1_note_payload.js +0 -129
package/src/block/nullifier_with_block_source.ts +0 -7
package/src/kernel/private_kernel_prover_profile_result.ts +0 -7
package/src/logs/l1_payload/l1_note_payload.ts +0 -182

package/src/block/body.ts CHANGED Viewed

@@ -18,6 +18,12 @@ export class Body {
     });
   }
+  equals(other: Body) {
+    return (
+      this.txEffects.length === other.txEffects.length && this.txEffects.every((te, i) => te.equals(other.txEffects[i]))
+    );
+  }
   static get schema(): ZodFor<Body> {
     return z
       .object({

package/src/block/index.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 export * from './l2_block.js';
 export * from './l2_block_downloader/index.js';
-export * from './nullifier_with_block_source.js';
 export * from './in_block.js';
 export * from './body.js';
 export * from './l2_block_number.js';
 export * from './l2_block_source.js';
 export * from './block_hash.js';
+export * from './published_l2_block.js';

package/src/block/l2_block.ts CHANGED Viewed

@@ -202,4 +202,8 @@ export class L2Block {
       ...logsStats,
     };
   }
+  equals(other: L2Block) {
+    return this.archive.equals(other.archive) && this.header.equals(other.header) && this.body.equals(other.body);
+  }
 }

package/src/block/l2_block_downloader/l2_block_stream.ts CHANGED Viewed

@@ -2,8 +2,8 @@ import { AbortError } from '@aztec/foundation/error';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import type { L2Block } from '../l2_block.js';
 import type { L2BlockId, L2BlockSource, L2Tips } from '../l2_block_source.js';
+import type { PublishedL2Block } from '../published_l2_block.js';
 /** Creates a stream of events for new blocks, chain tips updates, and reorgs, out of polling an archiver or a node. */
 export class L2BlockStream {
@@ -11,7 +11,7 @@ export class L2BlockStream {
   private isSyncing = false;
   constructor(
-    private l2BlockSource: Pick<L2BlockSource, 'getBlocks' | 'getBlockHeader' | 'getL2Tips'>,
+    private l2BlockSource: Pick<L2BlockSource, 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'>,
     private localData: L2BlockStreamLocalDataProvider,
     private handler: L2BlockStreamEventHandler,
     private readonly log = createLogger('types:block_stream'),
@@ -84,17 +84,15 @@ export class L2BlockStream {
         const from = latestBlockNumber + 1;
         const limit = Math.min(this.opts.batchSize ?? 20, sourceTips.latest.number - from + 1);
         this.log.trace(`Requesting blocks from ${from} limit ${limit} proven=${this.opts.proven}`);
-        const blocks = await this.l2BlockSource.getBlocks(from, limit, this.opts.proven);
+        const blocks = await this.l2BlockSource.getPublishedBlocks(from, limit, this.opts.proven);
         if (blocks.length === 0) {
           break;
         }
         await this.emitEvent({ type: 'blocks-added', blocks });
-        latestBlockNumber = blocks.at(-1)!.number;
+        latestBlockNumber = blocks.at(-1)!.block.number;
       }
       // Update the proven and finalized tips.
-      // TODO(palla/reorg): Should we emit this before passing the new blocks? This would allow world-state to skip
-      // building the data structures for the pending chain if it's unneeded.
       if (localTips.proven !== undefined && sourceTips.proven.number !== localTips.proven.number) {
         await this.emitEvent({ type: 'chain-proven', blockNumber: sourceTips.proven.number });
       }
@@ -160,7 +158,7 @@ export type L2BlockStreamEvent =
   | {
       type: 'blocks-added';
       /** New blocks added to the chain. */
-      blocks: L2Block[];
+      blocks: PublishedL2Block[];
     }
   | {
       type: 'chain-pruned';

package/src/block/l2_block_source.ts CHANGED Viewed

@@ -10,6 +10,7 @@ import type { TxHash } from '../tx/tx_hash.js';
 import type { TxReceipt } from '../tx/tx_receipt.js';
 import type { InBlock } from './in_block.js';
 import type { L2Block } from './l2_block.js';
+import type { PublishedL2Block } from './published_l2_block.js';
 /**
  * Interface of classes allowing for the retrieval of L2 blocks.
@@ -62,6 +63,9 @@ export interface L2BlockSource {
    */
   getBlocks(from: number, limit: number, proven?: boolean): Promise<L2Block[]>;
+  /** Equivalent to getBlocks but includes publish data. */
+  getPublishedBlocks(from: number, limit: number, proven?: boolean): Promise<PublishedL2Block[]>;
   /**
    * Gets a tx effect.
    * @param txHash - The hash of a transaction which resulted in the returned tx effect.
@@ -93,6 +97,13 @@ export interface L2BlockSource {
    */
   getBlocksForEpoch(epochNumber: bigint): Promise<L2Block[]>;
+  /**
+   * Returns all block headers for a given epoch.
+   * @dev Use this method only with recent epochs, since it walks the block list backwards.
+   * @param epochNumber - The epoch number to return headers for.
+   */
+  getBlockHeadersForEpoch(epochNumber: bigint): Promise<BlockHeader[]>;
   /**
    * Returns whether the given epoch is completed on L1, based on the current L1 and L2 block numbers.
    * @param epochNumber - The epoch number to check.

package/src/block/published_l2_block.ts ADDED Viewed

@@ -0,0 +1,45 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { times } from '@aztec/foundation/collection';
+import { Secp256k1Signer } from '@aztec/foundation/crypto';
+import { Signature } from '@aztec/foundation/eth-signature';
+import { schemas } from '@aztec/foundation/schemas';
+import { L2Block } from '@aztec/stdlib/block';
+import { z } from 'zod';
+export type L1PublishedData = {
+  blockNumber: bigint;
+  timestamp: bigint;
+  blockHash: string;
+};
+export type PublishedL2Block = {
+  block: L2Block;
+  l1: L1PublishedData;
+  signatures: Signature[];
+};
+export const PublishedL2BlockSchema = z.object({
+  block: L2Block.schema,
+  l1: z.object({
+    blockNumber: schemas.BigInt,
+    timestamp: schemas.BigInt,
+    blockHash: z.string(),
+  }),
+  signatures: z.array(Signature.schema),
+});
+export async function randomPublishedL2Block(l2BlockNumber: number): Promise<PublishedL2Block> {
+  const block = await L2Block.random(l2BlockNumber);
+  const l1 = {
+    blockNumber: BigInt(block.number),
+    timestamp: block.header.globalVariables.timestamp.toBigInt(),
+    blockHash: Buffer32.random().toString(),
+  };
+  // Create valid signatures
+  const signers = times(3, () => Secp256k1Signer.random());
+  const signatures = await Promise.all(
+    times(3, async i => signers[i].signMessage(Buffer32.fromField(await block.hash()))),
+  );
+  return { block, l1, signatures };
+}

package/src/contract/interfaces/contract_data_source.ts CHANGED Viewed

@@ -2,18 +2,10 @@ import type { Fr } from '@aztec/foundation/fields';
 import { FunctionSelector } from '../../abi/index.js';
 import type { AztecAddress } from '../../aztec-address/index.js';
-import type { ContractClassPublic, PublicFunction } from './contract_class.js';
+import type { ContractClassPublic } from './contract_class.js';
 import type { ContractInstanceWithAddress } from './contract_instance.js';
 export interface ContractDataSource {
-  /**
-   * Returns a contract's encoded public function, given its function selector.
-   * @param address - The contract aztec address.
-   * @param selector - The function's selector.
-   * @returns The function's data.
-   */
-  getPublicFunction(address: AztecAddress, selector: FunctionSelector): Promise<PublicFunction | undefined>;
   /**
    * Gets the number of the latest L2 block processed by the implementation.
    * @returns The number of the latest L2 block processed by the implementation.
@@ -28,17 +20,12 @@ export interface ContractDataSource {
   getBytecodeCommitment(id: Fr): Promise<Fr | undefined>;
-  /**
-   * Adds a contract class to the database.
-   * TODO(#10007): Remove this method
-   */
-  addContractClass(contractClass: ContractClassPublic): Promise<void>;
   /**
    * Returns a publicly deployed contract instance given its address.
    * @param address - Address of the deployed contract.
+   * @param blockNumber - Block number at which to retrieve the contract instance. If not provided, the latest block should be used.
    */
-  getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+  getContract(address: AztecAddress, blockNumber?: number): Promise<ContractInstanceWithAddress | undefined>;
   /**
    * Returns the list of all class ids known.

package/src/database-version/version_manager.ts CHANGED Viewed

@@ -3,6 +3,7 @@ import { jsonParseWithSchemaSync, jsonStringify } from '@aztec/foundation/json-r
 import { createLogger } from '@aztec/foundation/log';
 import fs from 'fs/promises';
+import { inspect } from 'node:util';
 import { join } from 'path';
 import { z } from 'zod';
@@ -59,6 +60,15 @@ export class DatabaseVersion {
       .transform(({ schemaVersion, rollupAddress }) => new DatabaseVersion(schemaVersion, rollupAddress));
   }
+  /** Allows for better introspection. */
+  public [inspect.custom](): string {
+    return this.toString();
+  }
+  public toString(): string {
+    return this.schemaVersion.toString();
+  }
   /**
    * Returns an empty instance
    */
@@ -148,7 +158,7 @@ export class DatabaseVersionManager<T> {
         }
       } else if (cmp !== 0) {
         this.log.info(
-          `Can't upgrade from version ${storedVersion.schemaVersion} to ${this.currentVersion}. Resetting database at ${this.dataDirectory}`,
+          `Can't upgrade from version ${storedVersion.schemaVersion} to ${this.currentVersion.schemaVersion}. Resetting database at ${this.dataDirectory}`,
         );
         needsReset = true;
       }

package/src/interfaces/archiver.ts CHANGED Viewed

@@ -5,12 +5,11 @@ import { z } from 'zod';
 import { inBlockSchemaFor } from '../block/in_block.js';
 import { L2Block } from '../block/l2_block.js';
 import { type L2BlockSource, L2TipsSchema } from '../block/l2_block_source.js';
-import type { NullifierWithBlockSource } from '../block/nullifier_with_block_source.js';
+import { PublishedL2BlockSchema } from '../block/published_l2_block.js';
 import {
   ContractClassPublicSchema,
   type ContractDataSource,
   ContractInstanceWithAddressSchema,
-  PublicFunctionSchema,
 } from '../contract/index.js';
 import { L1RollupConstantsSchema } from '../epoch-helpers/index.js';
 import { LogFilterSchema } from '../logs/log_filter.js';
@@ -26,7 +25,7 @@ import { GetContractClassLogsResponseSchema, GetPublicLogsResponseSchema } from
 import type { L2LogsSource } from './l2_logs_source.js';
 export type ArchiverApi = Omit<
-  L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource & NullifierWithBlockSource,
+  L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource,
   'start' | 'stop'
 >;
@@ -44,11 +43,16 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
     .function()
     .args(schemas.Integer, schemas.Integer, optional(z.boolean()))
     .returns(z.array(L2Block.schema)),
+  getPublishedBlocks: z
+    .function()
+    .args(schemas.Integer, schemas.Integer, optional(z.boolean()))
+    .returns(z.array(PublishedL2BlockSchema)),
   getTxEffect: z.function().args(TxHash.schema).returns(inBlockSchemaFor(TxEffect.schema).optional()),
   getSettledTxReceipt: z.function().args(TxHash.schema).returns(TxReceipt.schema.optional()),
   getL2SlotNumber: z.function().args().returns(schemas.BigInt),
   getL2EpochNumber: z.function().args().returns(schemas.BigInt),
   getBlocksForEpoch: z.function().args(schemas.BigInt).returns(z.array(L2Block.schema)),
+  getBlockHeadersForEpoch: z.function().args(schemas.BigInt).returns(z.array(BlockHeader.schema)),
   isEpochComplete: z.function().args(schemas.BigInt).returns(z.boolean()),
   getL2Tips: z.function().args().returns(L2TipsSchema),
   getPrivateLogs: z.function().args(z.number(), z.number()).returns(z.array(PrivateLog.schema)),
@@ -56,25 +60,18 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
     .function()
     .args(z.array(schemas.Fr))
     .returns(z.array(z.array(TxScopedL2Log.schema))),
-  findNullifiersIndexesWithBlock: z
-    .function()
-    .args(z.number(), z.array(schemas.Fr))
-    .returns(z.array(optional(inBlockSchemaFor(schemas.BigInt)))),
   getPublicLogs: z.function().args(LogFilterSchema).returns(GetPublicLogsResponseSchema),
   getContractClassLogs: z.function().args(LogFilterSchema).returns(GetContractClassLogsResponseSchema),
-  getPublicFunction: z
-    .function()
-    .args(schemas.AztecAddress, schemas.FunctionSelector)
-    .returns(PublicFunctionSchema.optional()),
   getContractClass: z.function().args(schemas.Fr).returns(ContractClassPublicSchema.optional()),
   getBytecodeCommitment: z.function().args(schemas.Fr).returns(schemas.Fr),
-  getContract: z.function().args(schemas.AztecAddress).returns(ContractInstanceWithAddressSchema.optional()),
+  getContract: z
+    .function()
+    .args(schemas.AztecAddress, optional(schemas.Integer))
+    .returns(ContractInstanceWithAddressSchema.optional()),
   getContractClassIds: z.function().args().returns(z.array(schemas.Fr)),
   registerContractFunctionSignatures: z.function().args(schemas.AztecAddress, z.array(z.string())).returns(z.void()),
   getL1ToL2Messages: z.function().args(schemas.BigInt).returns(z.array(schemas.Fr)),
   getL1ToL2MessageIndex: z.function().args(schemas.Fr).returns(schemas.BigInt.optional()),
-  // TODO(#10007): Remove this method
-  addContractClass: z.function().args(ContractClassPublicSchema).returns(z.void()),
   getContractFunctionName: z
     .function()
     .args(schemas.AztecAddress, schemas.FunctionSelector)

package/src/interfaces/aztec-node-admin.ts ADDED Viewed

@@ -0,0 +1,39 @@
+import { createSafeJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
+import { z } from 'zod';
+import type { ApiSchemaFor } from '../schemas/schemas.js';
+import { type ComponentsVersions, getVersioningResponseHandler } from '../versioning/index.js';
+import { type SequencerConfig, SequencerConfigSchema } from './configs.js';
+import { type ProverConfig, ProverConfigSchema } from './prover-client.js';
+/**
+ * Aztec node admin API.
+ */
+export interface AztecNodeAdmin {
+  /**
+   * Updates the configuration of this node.
+   * @param config - Updated configuration to be merged with the current one.
+   */
+  setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void>;
+  /** Forces the next block to be built bypassing all time and pending checks. Useful for testing. */
+  flushTxs(): Promise<void>;
+}
+export const AztecNodeAdminApiSchema: ApiSchemaFor<AztecNodeAdmin> = {
+  setConfig: z.function().args(SequencerConfigSchema.merge(ProverConfigSchema).partial()).returns(z.void()),
+  flushTxs: z.function().returns(z.void()),
+};
+export function createAztecNodeAdminClient(
+  url: string,
+  versions: Partial<ComponentsVersions> = {},
+  fetch = defaultFetch,
+): AztecNodeAdmin {
+  return createSafeJsonRpcClient<AztecNodeAdmin>(url, AztecNodeAdminApiSchema, {
+    namespaceMethods: 'nodeAdmin',
+    fetch,
+    onResponse: getVersioningResponseHandler(versions),
+  });
+}

package/src/interfaces/aztec-node.ts CHANGED Viewed

@@ -17,6 +17,7 @@ import { type InBlock, inBlockSchemaFor } from '../block/in_block.js';
 import { L2Block } from '../block/l2_block.js';
 import { type L2BlockNumber, L2BlockNumberSchema } from '../block/l2_block_number.js';
 import { type L2BlockSource, type L2Tips, L2TipsSchema } from '../block/l2_block_source.js';
+import { PublishedL2BlockSchema } from '../block/published_l2_block.js';
 import {
   type ContractClassPublic,
   ContractClassPublicSchema,
@@ -46,14 +47,12 @@ import {
 } from '../tx/index.js';
 import { TxEffect } from '../tx/tx_effect.js';
 import { type ComponentsVersions, getVersioningResponseHandler } from '../versioning/index.js';
-import { type SequencerConfig, SequencerConfigSchema } from './configs.js';
 import {
   type GetContractClassLogsResponse,
   GetContractClassLogsResponseSchema,
   type GetPublicLogsResponse,
   GetPublicLogsResponseSchema,
 } from './get_logs_response.js';
-import { type ProverConfig, ProverConfigSchema } from './prover-client.js';
 import type { ProverCoordination } from './prover-coordination.js';
 import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_state.js';
@@ -63,7 +62,7 @@ import { type WorldStateSyncStatus, WorldStateSyncStatusSchema } from './world_s
  */
 export interface AztecNode
   extends ProverCoordination,
-    Pick<L2BlockSource, 'getBlocks' | 'getBlockHeader' | 'getL2Tips'> {
+    Pick<L2BlockSource, 'getBlocks' | 'getPublishedBlocks' | 'getBlockHeader' | 'getL2Tips'> {
   /**
    * Returns the tips of the L2 chain.
    */
@@ -75,41 +74,17 @@ export interface AztecNode
   getWorldStateSyncStatus(): Promise<WorldStateSyncStatus>;
   /**
-   * Find the indexes of the given leaves in the given tree.
-   * @param blockNumber - The block number at which to get the data or 'latest' for latest data
+   * 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 treeId - The tree to search in.
-   * @param leafValues - The values to search for
-   * @returns The indexes of the given leaves in the given tree or undefined if not found.
+   * @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<(bigint | undefined)[]>;
-  /**
-   * Find the indexes of the given leaves in the given tree.
-   * @param blockNumber - The block number at which to get the data or 'latest' for latest data
-   * @param treeId - The tree to search in.
-   * @param leafIndices - The values to search for
-   * @returns The indexes of the given leaves in the given tree or undefined if not found.
-   */
-  findBlockNumbersForIndexes(
-    blockNumber: L2BlockNumber,
-    treeId: MerkleTreeId,
-    leafIndices: bigint[],
-  ): Promise<(bigint | undefined)[]>;
-  /**
-   * Returns the indexes of the given nullifiers in the nullifier tree,
-   * scoped to the block they were included in.
-   * @param blockNumber - The block number at which to get the data.
-   * @param nullifiers - The nullifiers to search for.
-   * @returns The block scoped indexes of the given nullifiers in the nullifier tree, or undefined if not found.
-   */
-  findNullifiersIndexesWithBlock(
-    blockNumber: L2BlockNumber,
-    nullifiers: Fr[],
   ): Promise<(InBlock<bigint> | undefined)[]>;
   /**
@@ -220,14 +195,14 @@ export interface AztecNode
    * "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.
    */
-  getPublicDataTreeWitness(blockNumber: L2BlockNumber, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
+  getPublicDataWitness(blockNumber: L2BlockNumber, leafSlot: Fr): Promise<PublicDataWitness | undefined>;
   /**
    * Get a block specified by its number.
    * @param number - The block number being requested.
    * @returns The requested block.
    */
-  getBlock(number: number): Promise<L2Block | undefined>;
+  getBlock(number: L2BlockNumber): Promise<L2Block | undefined>;
   /**
    * Fetches the current block number.
@@ -421,12 +396,6 @@ export interface AztecNode
    */
   isValidTx(tx: Tx, options?: { isSimulation?: boolean; skipFeeEnforcement?: boolean }): Promise<TxValidationResult>;
-  /**
-   * Updates the configuration of this node.
-   * @param config - Updated configuration to be merged with the current one.
-   */
-  setConfig(config: Partial<SequencerConfig & ProverConfig>): Promise<void>;
   /**
    * Returns a registered contract class given its id.
    * @param id - Id of the contract class.
@@ -439,20 +408,10 @@ export interface AztecNode
    */
   getContract(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
-  /** Forces the next block to be built bypassing all time and pending checks. Useful for testing. */
-  flushTxs(): Promise<void>;
   /**
    * Returns the ENR of this node for peer discovery, if available.
    */
   getEncodedEnr(): Promise<string | undefined>;
-  /**
-   * Adds a contract class bypassing the registerer.
-   * TODO(#10007): Remove this method.
-   * @param contractClass - The class to register.
-   */
-  addContractClass(contractClass: ContractClassPublic): Promise<void>;
 }
 export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
@@ -463,16 +422,6 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
   findLeavesIndexes: z
     .function()
     .args(L2BlockNumberSchema, z.nativeEnum(MerkleTreeId), z.array(schemas.Fr))
-    .returns(z.array(optional(schemas.BigInt))),
-  findBlockNumbersForIndexes: z
-    .function()
-    .args(L2BlockNumberSchema, z.nativeEnum(MerkleTreeId), z.array(schemas.BigInt))
-    .returns(z.array(optional(schemas.BigInt))),
-  findNullifiersIndexesWithBlock: z
-    .function()
-    .args(L2BlockNumberSchema, z.array(schemas.Fr))
     .returns(z.array(optional(inBlockSchemaFor(schemas.BigInt)))),
   getNullifierSiblingPath: z
@@ -517,12 +466,9 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
     .args(L2BlockNumberSchema, schemas.Fr)
     .returns(NullifierMembershipWitness.schema.optional()),
-  getPublicDataTreeWitness: z
-    .function()
-    .args(L2BlockNumberSchema, schemas.Fr)
-    .returns(PublicDataWitness.schema.optional()),
+  getPublicDataWitness: z.function().args(L2BlockNumberSchema, schemas.Fr).returns(PublicDataWitness.schema.optional()),
-  getBlock: z.function().args(z.number()).returns(L2Block.schema.optional()),
+  getBlock: z.function().args(L2BlockNumberSchema).returns(L2Block.schema.optional()),
   getBlockNumber: z.function().returns(z.number()),
@@ -534,6 +480,8 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
   getBlocks: z.function().args(z.number(), z.number()).returns(z.array(L2Block.schema)),
+  getPublishedBlocks: z.function().args(z.number(), z.number()).returns(z.array(PublishedL2BlockSchema)),
   getCurrentBaseFees: z.function().returns(GasFees.schema),
   getNodeVersion: z.function().returns(z.string()),
@@ -587,18 +535,11 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
     )
     .returns(TxValidationResultSchema),
-  setConfig: z.function().args(SequencerConfigSchema.merge(ProverConfigSchema).partial()).returns(z.void()),
   getContractClass: z.function().args(schemas.Fr).returns(ContractClassPublicSchema.optional()),
   getContract: z.function().args(schemas.AztecAddress).returns(ContractInstanceWithAddressSchema.optional()),
-  flushTxs: z.function().returns(z.void()),
   getEncodedEnr: z.function().returns(z.string().optional()),
-  // TODO(#10007): Remove this method
-  addContractClass: z.function().args(ContractClassPublicSchema).returns(z.void()),
 };
 export function createAztecNodeClient(

package/src/interfaces/client.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export * from './pxe.js';
 export * from './aztec-node.js';
+export * from './aztec-node-admin.js';
 export * from './private_kernel_prover.js';
 export * from './get_logs_response.js';

package/src/interfaces/private_kernel_prover.ts CHANGED Viewed

@@ -1,6 +1,5 @@
-import type { WitnessMap } from '@aztec/noir-acvm_js';
 import type {
+  PrivateExecutionStep,
   PrivateKernelCircuitPublicInputs,
   PrivateKernelInitCircuitPrivateInputs,
   PrivateKernelInnerCircuitPrivateInputs,
@@ -101,7 +100,7 @@ export interface PrivateKernelProver {
    * @param acirs The program bytecode.
    * @param witnessStack The witnessses for each program bytecode.
    */
-  createClientIvcProof(acirs: Buffer[], witnessStack: WitnessMap[]): Promise<ClientIvcProof>;
+  createClientIvcProof(executionSteps: PrivateExecutionStep[]): Promise<ClientIvcProof>;
   /**
    * Compute the gate count for a given circuit.

package/src/interfaces/prover-node.ts CHANGED Viewed

@@ -11,6 +11,7 @@ const EpochProvingJobState = [
   'failed',
   'stopped',
   'timed-out',
+  'reorg',
 ] as const;
 export type EpochProvingJobState = (typeof EpochProvingJobState)[number];
@@ -20,6 +21,7 @@ export const EpochProvingJobTerminalState: EpochProvingJobState[] = [
   'failed',
   'stopped',
   'timed-out',
+  'reorg',
 ] as const;
 export type EpochProvingJobTerminalState = (typeof EpochProvingJobTerminalState)[number];
@@ -29,8 +31,6 @@ export interface ProverNodeApi {
   getJobs(): Promise<{ uuid: string; status: EpochProvingJobState; epochNumber: number }[]>;
   startProof(epochNumber: number): Promise<void>;
-  prove(epochNumber: number): Promise<void>;
 }
 /** Schemas for prover node API functions. */
@@ -41,6 +41,4 @@ export const ProverNodeApiSchema: ApiSchemaFor<ProverNodeApi> = {
     .returns(z.array(z.object({ uuid: z.string(), status: z.enum(EpochProvingJobState), epochNumber: z.number() }))),
   startProof: z.function().args(schemas.Integer).returns(z.void()),
-  prove: z.function().args(schemas.Integer).returns(z.void()),
 };