getPublicDataTreeSiblingPath

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -8,6 +8,7 @@ import {
   L1_TO_L2_MSG_TREE_HEIGHT,
   NOTE_HASH_TREE_HEIGHT,
   NULLIFIER_TREE_HEIGHT,
+  PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/circuits.js';
 import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
 import { L1ContractAddresses, createEthereumChain } from '@aztec/ethereum';
@@ -300,7 +301,7 @@ export class AztecNodeService implements AztecNode {
   }
 
   /**
-   * Returns the sibling path for the given index in the contract tree.
+   * Returns a 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.
    */
@@ -310,7 +311,7 @@ export class AztecNodeService implements AztecNode {
   }
 
   /**
-   * Returns the sibling path for the given index in the data tree.
+   * Returns a 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.
    */
@@ -333,7 +334,7 @@ export class AztecNodeService implements AztecNode {
   }
 
   /**
-   * Returns the sibling path for a leaf in the committed l1 to l2 data tree.
+   * Returns a 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.
    */
@@ -343,7 +344,7 @@ export class AztecNodeService implements AztecNode {
   }
 
   /**
-   * Returns the sibling path for a leaf in the committed historic blocks tree.
+   * Returns a sibling path for a leaf in the committed historic blocks tree.
    * @param leafIndex - Index of the leaf in the tree.
    * @returns The sibling path.
    */
@@ -354,6 +355,16 @@ export class AztecNodeService implements AztecNode {
     return committedDb.getSiblingPath(MerkleTreeId.BLOCKS_TREE, leafIndex);
   }
 
+  /**
+   * Returns a sibling path for a leaf in the committed public data tree.
+   * @param leafIndex - Index of the leaf in the tree.
+   * @returns The sibling path.
+   */
+  public async getPublicDataTreeSiblingPath(leafIndex: bigint): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>> {
+    const committedDb = await this.#getWorldState();
+    return committedDb.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
+  }
+
   /**
    * Returns a low nullifier membership witness for a given nullifier at a given block.
    * @param blockNumber - The block number at which to get the index.

yarn-project/noir-contracts/src/contracts/inclusion_proofs_contract/src/main.nr

@@ -274,7 +274,7 @@ contract InclusionProofs {
 
         // 8)
         assert(
-            block_data.note_hash_tree_root == compute_merkle_root(public_value, public_value_leaf_index, path),
+            block_data.public_data_tree_root == compute_merkle_root(public_value, public_value_leaf_index, path),
             "Proving membership of a value in public data tree failed"
         );
     }

yarn-project/pxe/src/simulator_oracle/index.ts

@@ -151,6 +151,8 @@ export class SimulatorOracle implements DBOracle {
         return (await this.stateInfoProvider.getNoteHashSiblingPath(leafIndex)).toFieldArray();
       case MerkleTreeId.BLOCKS_TREE:
         return (await this.stateInfoProvider.getHistoricBlocksTreeSiblingPath(leafIndex)).toFieldArray();
+      case MerkleTreeId.PUBLIC_DATA_TREE:
+        return (await this.stateInfoProvider.getPublicDataTreeSiblingPath(leafIndex)).toFieldArray();
       default:
         throw new Error('Not implemented');
     }

yarn-project/types/src/interfaces/state_provider.ts

@@ -4,6 +4,7 @@ import {
   HISTORIC_BLOCKS_TREE_HEIGHT,
   L1_TO_L2_MSG_TREE_HEIGHT,
   NOTE_HASH_TREE_HEIGHT,
+  PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/circuits.js';
 
 import { L1ToL2MessageAndIndex } from '../l1_to_l2_message.js';
@@ -25,15 +26,15 @@ export interface StateInfoProvider {
   findLeafIndex(treeId: MerkleTreeId, leafValue: Fr): Promise<bigint | undefined>;
 
   /**
-   * Returns the sibling path for the given index in the contract tree.
+   * Returns a 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.
    * TODO: https://github.com/AztecProtocol/aztec-packages/issues/3414
    */
   getContractSiblingPath(leafIndex: bigint): Promise<SiblingPath<typeof CONTRACT_TREE_HEIGHT>>;
 
   /**
-   * Returns the sibling path for the given index in the note hash tree.
+   * Returns a sibling path for the given index in the note hash tree.
    * @param leafIndex - The index of the leaf for which the sibling path is required.
    * @returns The sibling path for the leaf index.
    * TODO: https://github.com/AztecProtocol/aztec-packages/issues/3414
@@ -49,21 +50,29 @@ export interface StateInfoProvider {
   getL1ToL2MessageAndIndex(messageKey: Fr): Promise<L1ToL2MessageAndIndex>;
 
   /**
-   * Returns the sibling path for a leaf in the committed l1 to l2 data tree.
+   * Returns a 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.
    * TODO: https://github.com/AztecProtocol/aztec-packages/issues/3414
    */
   getL1ToL2MessageSiblingPath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
 
   /**
-   * Returns the sibling path for a leaf in the committed historic blocks tree.
+   * Returns a sibling path for a leaf in the committed historic blocks tree.
    * @param leafIndex - Index of the leaf in the tree.
    * @returns The sibling path.
    * TODO: https://github.com/AztecProtocol/aztec-packages/issues/3414
    */
   getHistoricBlocksTreeSiblingPath(leafIndex: bigint): Promise<SiblingPath<typeof HISTORIC_BLOCKS_TREE_HEIGHT>>;
 
+  /**
+   * Returns a sibling path for a leaf in the committed public data tree.
+   * @param leafIndex - Index of the leaf in the tree.
+   * @returns The sibling path.
+   * TODO: https://github.com/AztecProtocol/aztec-packages/issues/3414
+   */
+  getPublicDataTreeSiblingPath(leafIndex: bigint): Promise<SiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>>;
+
   /**
    * Returns a low nullifier membership witness for a given nullifier at a given block.
    * @param blockNumber - The block number at which to get the index.