@aztec/aztec-node 0.1.0-alpha23 → 0.1.0-alpha40

package/src/aztec-node/server.ts

@@ -2,18 +2,21 @@ import { Archiver } from '@aztec/archiver';
 import {
   CONTRACT_TREE_HEIGHT,
   CircuitsWasm,
+  EthAddress,
   Fr,
+  HistoricBlockData,
   L1_TO_L2_MSG_TREE_HEIGHT,
   PRIVATE_DATA_TREE_HEIGHT,
 } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { SiblingPath } from '@aztec/merkle-tree';
+import { createDebugLogger } from '@aztec/foundation/log';
 import { InMemoryTxPool, P2P, createP2PClient } from '@aztec/p2p';
-import { SequencerClient, getCombinedHistoricTreeRoots } from '@aztec/sequencer-client';
+import { SequencerClient } from '@aztec/sequencer-client';
 import {
+  AztecNode,
   ContractData,
+  ContractDataAndBytecode,
   ContractDataSource,
-  ContractPublicData,
   L1ToL2MessageAndIndex,
   L1ToL2MessageSource,
   L2Block,
@@ -22,6 +25,7 @@ import {
   L2LogsSource,
   LogType,
   MerkleTreeId,
+  SiblingPath,
   Tx,
   TxHash,
 } from '@aztec/types';
@@ -31,9 +35,10 @@ import {
   WorldStateSynchroniser,
   computePublicDataTreeLeafIndex,
 } from '@aztec/world-state';
+
 import { default as levelup } from 'levelup';
 import { MemDown, default as memdown } from 'memdown';
-import { AztecNode } from './aztec-node.js';
+
 import { AztecNodeConfig } from './config.js';
 
 export const createMemDown = () => (memdown as any)() as MemDown<any, any>;
@@ -54,6 +59,7 @@ export class AztecNodeService implements AztecNode {
     protected sequencer: SequencerClient,
     protected chainId: number,
     protected version: number,
+    private log = createDebugLogger('aztec:node'),
   ) {}
 
   /**
@@ -111,14 +117,23 @@ export class AztecNodeService implements AztecNode {
     return (await this.p2pClient.isReady()) ?? false;
   }
 
+  /**
+   * Get the a given block.
+   * @param number - The block number being requested.
+   * @returns The blocks requested.
+   */
+  public async getBlock(number: number): Promise<L2Block | undefined> {
+    return await this.blockSource.getL2Block(number);
+  }
+
   /**
    * 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 take - The number of blocks desired.
+   * @param limit - The maximum number of blocks to obtain.
    * @returns The blocks requested.
    */
-  public async getBlocks(from: number, take: number): Promise<L2Block[]> {
-    return (await this.blockSource.getL2Blocks(from, take)) ?? [];
+  public async getBlocks(from: number, limit: number): Promise<L2Block[]> {
+    return (await this.blockSource.getL2Blocks(from, limit)) ?? [];
   }
 
   /**
@@ -145,36 +160,44 @@ export class AztecNodeService implements AztecNode {
     return Promise.resolve(this.chainId);
   }
 
+  /**
+   * Method to fetch the rollup contract address at the base-layer.
+   * @returns The rollup address.
+   */
+  public getRollupAddress(): Promise<EthAddress> {
+    return this.blockSource.getRollupAddress();
+  }
+
   /**
    * Lookup the L2 contract data for this contract.
    * Contains the ethereum portal address and bytecode.
    * @param contractAddress - The contract data address.
    * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
    */
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined> {
-    return await this.contractDataSource.getL2ContractPublicData(contractAddress);
+  public async getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined> {
+    return await this.contractDataSource.getContractDataAndBytecode(contractAddress);
   }
 
   /**
-   * Lookup the L2 contract info for this contract.
+   * Lookup the contract data for this contract.
    * Contains the ethereum portal address .
    * @param contractAddress - The contract data address.
    * @returns The contract's address & portal address.
    */
-  public async getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return await this.contractDataSource.getL2ContractInfo(contractAddress);
+  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
+    return await this.contractDataSource.getContractData(contractAddress);
   }
 
   /**
-   * Gets the `take` amount of logs starting from `from`.
+   * Gets up to `limit` amount of logs starting from `from`.
    * @param from - Number of the L2 block to which corresponds the first logs to be returned.
-   * @param take - The number of logs to return.
+   * @param limit - The maximum number of logs to return.
    * @param logType - Specifies whether to return encrypted or unencrypted logs.
    * @returns The requested logs.
    */
-  public getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]> {
+  public getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]> {
     const logSource = logType === LogType.ENCRYPTED ? this.encryptedLogsSource : this.unencryptedLogsSource;
-    return logSource.getLogs(from, take, logType);
+    return logSource.getLogs(from, limit, logType);
   }
 
   /**
@@ -182,11 +205,7 @@ export class AztecNodeService implements AztecNode {
    * @param tx - The transaction to be submitted.
    */
   public async sendTx(tx: Tx) {
-    // TODO: Patch tx to inject historic tree roots until the private kernel circuit supplies this value
-    if (tx.data.constants.historicTreeRoots.privateHistoricTreeRoots.isEmpty()) {
-      tx.data.constants.historicTreeRoots = await getCombinedHistoricTreeRoots(this.merkleTreeDB.asLatest());
-    }
-
+    this.log.info(`Received tx ${await tx.getTxHash()}`);
     await this.p2pClient!.sendTx(tx);
   }
 
@@ -199,6 +218,7 @@ export class AztecNodeService implements AztecNode {
     await this.worldStateSynchroniser.stop();
     await this.merkleTreeDB.stop();
     await this.blockSource.stop();
+    this.log.info(`Stopped`);
   }
 
   /**
@@ -287,7 +307,7 @@ export class AztecNodeService implements AztecNode {
    * @returns Storage value at the given contract slot (or undefined if not found).
    * Note: Aztec's version of `eth_getStorageAt`.
    */
-  public async getStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined> {
+  public async getPublicStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined> {
     const leafIndex = computePublicDataTreeLeafIndex(contract, new Fr(slot), await CircuitsWasm.get());
     return this.merkleTreeDB.getLeafValue(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex, false);
   }
@@ -306,9 +326,29 @@ export class AztecNodeService implements AztecNode {
       [MerkleTreeId.NULLIFIER_TREE]: await getTreeRoot(MerkleTreeId.NULLIFIER_TREE),
       [MerkleTreeId.PUBLIC_DATA_TREE]: await getTreeRoot(MerkleTreeId.PUBLIC_DATA_TREE),
       [MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: await getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
-      [MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE]: await getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE),
-      [MerkleTreeId.CONTRACT_TREE_ROOTS_TREE]: await getTreeRoot(MerkleTreeId.CONTRACT_TREE_ROOTS_TREE),
-      [MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE]: await getTreeRoot(MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE),
+      [MerkleTreeId.BLOCKS_TREE]: await getTreeRoot(MerkleTreeId.BLOCKS_TREE),
     };
   }
+
+  /**
+   * Returns the currently committed historic block data.
+   * @returns The current committed block data.
+   */
+  public async getHistoricBlockData(): Promise<HistoricBlockData> {
+    const getTreeRoot = async (id: MerkleTreeId) =>
+      Fr.fromBuffer((await this.merkleTreeDB.getTreeInfo(id, false)).root);
+
+    const globalsHash = this.worldStateSynchroniser.latestGlobalVariablesHash;
+
+    return new HistoricBlockData(
+      await getTreeRoot(MerkleTreeId.PRIVATE_DATA_TREE),
+      await getTreeRoot(MerkleTreeId.NULLIFIER_TREE),
+      await getTreeRoot(MerkleTreeId.CONTRACT_TREE),
+      await getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
+      await getTreeRoot(MerkleTreeId.BLOCKS_TREE),
+      Fr.ZERO,
+      await getTreeRoot(MerkleTreeId.PUBLIC_DATA_TREE),
+      globalsHash,
+    );
+  }
 }

package/src/index.ts

@@ -1,4 +1,3 @@
-export * from './aztec-node/aztec-node.js';
 export * from './aztec-node/config.js';
 export * from './aztec-node/server.js';
 export * from './aztec-node/http-node.js';

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

@@ -1,126 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import { CONTRACT_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { ContractPublicData, ContractData, L2Block, MerkleTreeId, L1ToL2MessageAndIndex, L2BlockL2Logs, TxHash, Tx, LogType } from '@aztec/types';
-import { SiblingPath } from '@aztec/merkle-tree';
-import { Fr } from '@aztec/foundation/fields';
-/**
- * The aztec node.
- */
-export interface AztecNode {
-    /**
-     * Method to determine if the node is ready to accept transactions.
-     * @returns - Flag indicating the readiness for tx submission.
-     */
-    isReady(): Promise<boolean>;
-    /**
-     * 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 take - The number of blocks desired.
-     * @returns The blocks requested.
-     */
-    getBlocks(from: number, take: number): Promise<L2Block[]>;
-    /**
-     * Method to fetch the current block height.
-     * @returns The block height as a number.
-     */
-    getBlockHeight(): Promise<number>;
-    /**
-     * Method to fetch the version of the rollup the node is connected to.
-     * @returns The rollup version.
-     */
-    getVersion(): Promise<number>;
-    /**
-     * Method to fetch the chain id of the base-layer for the rollup.
-     * @returns The chain id.
-     */
-    getChainId(): Promise<number>;
-    /**
-     * Lookup the L2 contract data for this contract.
-     * Contains the ethereum portal address and bytecode.
-     * @param contractAddress - The contract data address.
-     * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
-     */
-    getContractData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined>;
-    /**
-     * Lookup the L2 contract info for this contract.
-     * Contains the ethereum portal address .
-     * @param contractAddress - The contract data address.
-     * @returns The contract's address & portal address.
-     */
-    getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-    /**
-     * Gets the `take` amount of logs starting from `from`.
-     * @param from - Number of the L2 block to which corresponds the first logs to be returned.
-     * @param take - The number of logs to return.
-     * @param logType - Specifies whether to return encrypted or unencrypted logs.
-     * @returns The requested logs.
-     */
-    getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
-    /**
-     * Method to submit a transaction to the p2p pool.
-     * @param tx - The transaction to be submitted.
-     */
-    sendTx(tx: Tx): Promise<void>;
-    /**
-     * Method to retrieve pending txs.
-     * @returns The pending txs.
-     */
-    getPendingTxs(): Promise<Tx[]>;
-    /**
-     * Method to retrieve a single pending tx.
-     * @param txHash - The transaction hash to return.
-     * @returns The pending tx if it exists.
-     */
-    getPendingTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-    /**
-     * Find the index of the given contract.
-     * @param leafValue - The value to search for.
-     * @returns The index of the given leaf in the contracts tree or undefined if not found.
-     */
-    findContractIndex(leafValue: Buffer): Promise<bigint | undefined>;
-    /**
-     * Returns the sibling path for the given index in the contract tree.
-     * @param leafIndex - The index of the leaf for which the sibling path is required.
-     * @returns The sibling path for the leaf index.
-     */
-    getContractPath(leafIndex: bigint): Promise<SiblingPath<typeof CONTRACT_TREE_HEIGHT>>;
-    /**
-     * Find the index of the given commitment.
-     * @param leafValue - The value to search for.
-     * @returns The index of the given leaf of undefined if not found.
-     */
-    findCommitmentIndex(leafValue: Buffer): Promise<bigint | undefined>;
-    /**
-     * Returns the sibling path for the given index in the data tree.
-     * @param leafIndex - The index of the leaf for which the sibling path is required.
-     * @returns The sibling path for the leaf index.
-     */
-    getDataTreePath(leafIndex: bigint): Promise<SiblingPath<typeof PRIVATE_DATA_TREE_HEIGHT>>;
-    /**
-     * Gets a confirmed/consumed L1 to L2 message for the given message key (throws if not found).
-     * and its index in the merkle tree
-     * @param messageKey - The message key.
-     * @returns The map containing the message and index.
-     */
-    getL1ToL2MessageAndIndex(messageKey: Fr): Promise<L1ToL2MessageAndIndex>;
-    /**
-     * Returns the sibling path for a leaf in the committed l1 to l2 data tree.
-     * @param leafIndex - Index of the leaf in the tree.
-     * @returns The sibling path.
-     */
-    getL1ToL2MessagesTreePath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
-    /**
-     * Gets the storage value at the given contract slot. Our version of eth_getStorageAt.
-     * @param contract - Address of the contract to query.
-     * @param slot - Slot to query.
-     * @returns Storage value at the given contract slot (or undefined if not found).
-     */
-    getStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined>;
-    /**
-     * Returns the current committed roots for the data trees.
-     * @returns The current committed roots for the data trees.
-     */
-    getTreeRoots(): Promise<Record<MerkleTreeId, Fr>>;
-}
-//# sourceMappingURL=aztec-node.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"aztec-node.d.ts","sourceRoot":"","sources":["../../src/aztec-node/aztec-node.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9G,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,aAAa,EACb,MAAM,EACN,EAAE,EACF,OAAO,EACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE5B;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE1D;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAAC;IAExF;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;IAElF;;;;;;OAMG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAEhF;;;OAGG;IACH,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;OAGG;IACH,aAAa,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/B;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAE5D;;;;OAIG;IACH,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAElE;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC;IAEtF;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEpE;;;;OAIG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAE1F;;;;;OAKG;IACH,wBAAwB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAEzE;;;;OAIG;IACH,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAEpG;;;;;OAKG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEhF;;;OAGG;IACH,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;CACnD"}

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

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMtbm9kZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9henRlYy1ub2RlL2F6dGVjLW5vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/src/aztec-node/aztec-node.ts

@@ -1,153 +0,0 @@
-import { CONTRACT_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import {
-  ContractPublicData,
-  ContractData,
-  L2Block,
-  MerkleTreeId,
-  L1ToL2MessageAndIndex,
-  L2BlockL2Logs,
-  TxHash,
-  Tx,
-  LogType,
-} from '@aztec/types';
-import { SiblingPath } from '@aztec/merkle-tree';
-import { Fr } from '@aztec/foundation/fields';
-
-/**
- * The aztec node.
- */
-export interface AztecNode {
-  /**
-   * Method to determine if the node is ready to accept transactions.
-   * @returns - Flag indicating the readiness for tx submission.
-   */
-  isReady(): Promise<boolean>;
-
-  /**
-   * 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 take - The number of blocks desired.
-   * @returns The blocks requested.
-   */
-  getBlocks(from: number, take: number): Promise<L2Block[]>;
-
-  /**
-   * Method to fetch the current block height.
-   * @returns The block height as a number.
-   */
-  getBlockHeight(): Promise<number>;
-
-  /**
-   * Method to fetch the version of the rollup the node is connected to.
-   * @returns The rollup version.
-   */
-  getVersion(): Promise<number>;
-
-  /**
-   * Method to fetch the chain id of the base-layer for the rollup.
-   * @returns The chain id.
-   */
-  getChainId(): Promise<number>;
-
-  /**
-   * Lookup the L2 contract data for this contract.
-   * Contains the ethereum portal address and bytecode.
-   * @param contractAddress - The contract data address.
-   * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined>;
-
-  /**
-   * Lookup the L2 contract info for this contract.
-   * Contains the ethereum portal address .
-   * @param contractAddress - The contract data address.
-   * @returns The contract's address & portal address.
-   */
-  getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
-  /**
-   * Gets the `take` amount of logs starting from `from`.
-   * @param from - Number of the L2 block to which corresponds the first logs to be returned.
-   * @param take - The number of logs to return.
-   * @param logType - Specifies whether to return encrypted or unencrypted logs.
-   * @returns The requested logs.
-   */
-  getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
-
-  /**
-   * Method to submit a transaction to the p2p pool.
-   * @param tx - The transaction to be submitted.
-   */
-  sendTx(tx: Tx): Promise<void>;
-
-  /**
-   * Method to retrieve pending txs.
-   * @returns The pending txs.
-   */
-  getPendingTxs(): Promise<Tx[]>;
-
-  /**
-   * Method to retrieve a single pending tx.
-   * @param txHash - The transaction hash to return.
-   * @returns The pending tx if it exists.
-   */
-  getPendingTxByHash(txHash: TxHash): Promise<Tx | undefined>;
-
-  /**
-   * Find the index of the given contract.
-   * @param leafValue - The value to search for.
-   * @returns The index of the given leaf in the contracts tree or undefined if not found.
-   */
-  findContractIndex(leafValue: Buffer): Promise<bigint | undefined>;
-
-  /**
-   * Returns the sibling path for the given index in the contract tree.
-   * @param leafIndex - The index of the leaf for which the sibling path is required.
-   * @returns The sibling path for the leaf index.
-   */
-  getContractPath(leafIndex: bigint): Promise<SiblingPath<typeof CONTRACT_TREE_HEIGHT>>;
-
-  /**
-   * Find the index of the given commitment.
-   * @param leafValue - The value to search for.
-   * @returns The index of the given leaf of undefined if not found.
-   */
-  findCommitmentIndex(leafValue: Buffer): Promise<bigint | undefined>;
-
-  /**
-   * Returns the sibling path for the given index in the data tree.
-   * @param leafIndex - The index of the leaf for which the sibling path is required.
-   * @returns The sibling path for the leaf index.
-   */
-  getDataTreePath(leafIndex: bigint): Promise<SiblingPath<typeof PRIVATE_DATA_TREE_HEIGHT>>;
-
-  /**
-   * Gets a confirmed/consumed L1 to L2 message for the given message key (throws if not found).
-   * and its index in the merkle tree
-   * @param messageKey - The message key.
-   * @returns The map containing the message and index.
-   */
-  getL1ToL2MessageAndIndex(messageKey: Fr): Promise<L1ToL2MessageAndIndex>;
-
-  /**
-   * Returns the sibling path for a leaf in the committed l1 to l2 data tree.
-   * @param leafIndex - Index of the leaf in the tree.
-   * @returns The sibling path.
-   */
-  getL1ToL2MessagesTreePath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
-
-  /**
-   * Gets the storage value at the given contract slot. Our version of eth_getStorageAt.
-   * @param contract - Address of the contract to query.
-   * @param slot - Slot to query.
-   * @returns Storage value at the given contract slot (or undefined if not found).
-   */
-  getStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined>;
-
-  /**
-   * Returns the current committed roots for the data trees.
-   * @returns The current committed roots for the data trees.
-   */
-  getTreeRoots(): Promise<Record<MerkleTreeId, Fr>>;
-}