@aztec/txe 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/node/txe_node.js

@@ -1,125 +1,126 @@
-var _TXENode_logsByTags, _TXENode_txEffectsByTxHash, _TXENode_txReceiptsByTxHash, _TXENode_blockNumberToNullifiers, _TXENode_noteIndex, _TXENode_logger;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { createLogger } from '@aztec/aztec.js';
-import { L2BlockHash, TxHash, TxReceipt, TxScopedL2Log, } from '@aztec/circuit-types';
-import { PUBLIC_LOG_DATA_SIZE_IN_FIELDS, } from '@aztec/circuits.js';
+import { L2BlockHash, TxHash, TxReceipt, TxScopedL2Log } from '@aztec/circuit-types';
+import { PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 export class TXENode {
-    constructor(blockNumber, version, chainId, nativeWorldStateService, baseFork) {
+    blockNumber;
+    version;
+    chainId;
+    nativeWorldStateService;
+    baseFork;
+    #logsByTags;
+    #txEffectsByTxHash;
+    #txReceiptsByTxHash;
+    #blockNumberToNullifiers;
+    #noteIndex;
+    #logger;
+    constructor(blockNumber, version, chainId, nativeWorldStateService, baseFork){
         this.blockNumber = blockNumber;
         this.version = version;
         this.chainId = chainId;
         this.nativeWorldStateService = nativeWorldStateService;
         this.baseFork = baseFork;
-        _TXENode_logsByTags.set(this, new Map());
-        _TXENode_txEffectsByTxHash.set(this, new Map());
-        _TXENode_txReceiptsByTxHash.set(this, new Map());
-        _TXENode_blockNumberToNullifiers.set(this, new Map());
-        _TXENode_noteIndex.set(this, 0);
-        _TXENode_logger.set(this, createLogger('aztec:txe_node'));
-    }
-    /**
-     * Fetches the current block number.
-     * @returns The block number.
-     */
-    getBlockNumber() {
+        this.#logsByTags = new Map();
+        this.#txEffectsByTxHash = new Map();
+        this.#txReceiptsByTxHash = new Map();
+        this.#blockNumberToNullifiers = new Map();
+        this.#noteIndex = 0;
+        this.#logger = createLogger('aztec:txe_node');
+    }
+    /**
+   * Fetches the current block number.
+   * @returns The block number.
+   */ getBlockNumber() {
         return Promise.resolve(this.blockNumber);
     }
     /**
-     * Sets the current block number of the node.
-     * @param - The block number to set.
-     */
-    setBlockNumber(blockNumber) {
+   * Sets the current block number of the node.
+   * @param - The block number to set.
+   */ setBlockNumber(blockNumber) {
         this.blockNumber = blockNumber;
     }
     /**
-     * Get a tx effect.
-     * @param txHash - The hash of a transaction which resulted in the returned tx effect.
-     * @returns The requested tx effect.
-     */
-    getTxEffect(txHash) {
-        const txEffect = __classPrivateFieldGet(this, _TXENode_txEffectsByTxHash, "f").get(txHash.toString());
+   * Get a tx effect.
+   * @param txHash - The hash of a transaction which resulted in the returned tx effect.
+   * @returns The requested tx effect.
+   */ getTxEffect(txHash) {
+        const txEffect = this.#txEffectsByTxHash.get(txHash.toString());
         return Promise.resolve(txEffect);
     }
     /**
-     * Sets a tx effect and receipt for a given block number.
-     * @param blockNumber - The block number that this tx effect resides.
-     * @param txHash - The transaction hash of the transaction.
-     * @param effect - The tx effect to set.
-     */
-    async setTxEffect(blockNumber, txHash, effect) {
+   * Sets a tx effect and receipt for a given block number.
+   * @param blockNumber - The block number that this tx effect resides.
+   * @param txHash - The transaction hash of the transaction.
+   * @param effect - The tx effect to set.
+   */ async setTxEffect(blockNumber, txHash, effect) {
         // We are not creating real blocks on which membership proofs can be constructed - we instead define its hash as
         // simply the hash of the block number.
-        const blockHash = await poseidon2Hash([blockNumber]);
-        __classPrivateFieldGet(this, _TXENode_txEffectsByTxHash, "f").set(txHash.toString(), {
+        const blockHash = await poseidon2Hash([
+            blockNumber
+        ]);
+        this.#txEffectsByTxHash.set(txHash.toString(), {
             l2BlockHash: blockHash.toString(),
             l2BlockNumber: blockNumber,
-            data: effect,
+            data: effect
         });
         // We also set the receipt since we want to be able to serve `getTxReceipt` - we don't care about most values here,
         // but we do need to be able to retrieve the block number of a given txHash.
-        __classPrivateFieldGet(this, _TXENode_txReceiptsByTxHash, "f").set(txHash.toString(), new TxReceipt(txHash, TxReceipt.statusFromRevertCode(effect.revertCode), '', undefined, new L2BlockHash(blockHash.toBuffer()), blockNumber, undefined));
+        this.#txReceiptsByTxHash.set(txHash.toString(), new TxReceipt(txHash, TxReceipt.statusFromRevertCode(effect.revertCode), '', undefined, new L2BlockHash(blockHash.toBuffer()), blockNumber, 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.
-     */
-    async findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
+   * 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.
+   */ async findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
         const parsedBlockNumber = blockNumber === 'latest' ? await this.getBlockNumber() : blockNumber;
         const nullifiersInBlock = [];
-        for (const [key, val] of __classPrivateFieldGet(this, _TXENode_blockNumberToNullifiers, "f").entries()) {
+        for (const [key, val] of this.#blockNumberToNullifiers.entries()){
             if (key < parsedBlockNumber) {
                 nullifiersInBlock.push(...val);
             }
         }
-        return nullifiers.map(nullifier => {
-            const possibleNullifierIndex = nullifiersInBlock.findIndex(nullifierInBlock => nullifierInBlock.equals(nullifier));
-            return possibleNullifierIndex === -1
-                ? undefined
-                : {
-                    l2BlockNumber: parsedBlockNumber,
-                    l2BlockHash: new Fr(parsedBlockNumber).toString(),
-                    data: BigInt(possibleNullifierIndex),
-                };
+        return nullifiers.map((nullifier)=>{
+            const possibleNullifierIndex = nullifiersInBlock.findIndex((nullifierInBlock)=>nullifierInBlock.equals(nullifier));
+            return possibleNullifierIndex === -1 ? undefined : {
+                l2BlockNumber: parsedBlockNumber,
+                l2BlockHash: new Fr(parsedBlockNumber).toString(),
+                data: BigInt(possibleNullifierIndex)
+            };
         });
     }
     /**
-     * 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.
-     */
-    setNullifiersIndexesWithBlock(blockNumber, nullifiers) {
-        __classPrivateFieldGet(this, _TXENode_blockNumberToNullifiers, "f").set(blockNumber, nullifiers);
+   * 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.
+   */ setNullifiersIndexesWithBlock(blockNumber, nullifiers) {
+        this.#blockNumberToNullifiers.set(blockNumber, nullifiers);
     }
     /**
-     * Adds note logs to the txe node, given a block
-     * @param blockNumber - The block number at which to add the note logs.
-     * @param privateLogs - The privateLogs that contain the note logs to be added.
-     */
-    addNoteLogsByTags(blockNumber, privateLogs) {
-        privateLogs.forEach(log => {
+   * Adds note logs to the txe node, given a block
+   * @param blockNumber - The block number at which to add the note logs.
+   * @param privateLogs - The privateLogs that contain the note logs to be added.
+   */ addNoteLogsByTags(blockNumber, privateLogs) {
+        privateLogs.forEach((log)=>{
             const tag = log.fields[0];
-            const currentLogs = __classPrivateFieldGet(this, _TXENode_logsByTags, "f").get(tag.toString()) ?? [];
-            const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), __classPrivateFieldGet(this, _TXENode_noteIndex, "f"), blockNumber, false, log.toBuffer());
+            const currentLogs = this.#logsByTags.get(tag.toString()) ?? [];
+            const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), this.#noteIndex, blockNumber, false, log.toBuffer());
             currentLogs.push(scopedLog);
-            __classPrivateFieldGet(this, _TXENode_logsByTags, "f").set(tag.toString(), currentLogs);
+            this.#logsByTags.set(tag.toString(), currentLogs);
         });
         // TODO: DISTINGUISH BETWEEN EVENT LOGS AND NOTE LOGS ?
-        __classPrivateFieldSet(this, _TXENode_noteIndex, __classPrivateFieldGet(this, _TXENode_noteIndex, "f") + privateLogs.length, "f");
+        this.#noteIndex += privateLogs.length;
     }
     /**
-     * Adds public logs to the txe node, given a block
-     * @param blockNumber - The block number at which to add the public logs.
-     * @param publicLogs - The public logs to be added.
-     */
-    addPublicLogsByTags(blockNumber, publicLogs) {
-        publicLogs.forEach(log => {
+   * Adds public logs to the txe node, given a block
+   * @param blockNumber - The block number at which to add the public logs.
+   * @param publicLogs - The public logs to be added.
+   */ addPublicLogsByTags(blockNumber, publicLogs) {
+        publicLogs.forEach((log)=>{
             // Check that each log stores 3 lengths in its first field. If not, it's not a tagged log:
             const firstFieldBuf = log.log[0].toBuffer();
             // See macros/note/mod/ and see how finalization_log[0] is constructed, to understand this monstrosity. (It wasn't me).
@@ -127,7 +128,7 @@ export class TXENode {
             if (!firstFieldBuf.subarray(0, 27).equals(Buffer.alloc(27)) || firstFieldBuf[29] !== 0) {
                 // See parseLogFromPublic - the first field of a tagged log is 5 bytes structured:
                 // [ publicLen[0], publicLen[1], 0, privateLen[0], privateLen[1]]
-                __classPrivateFieldGet(this, _TXENode_logger, "f").warn(`Skipping public log with invalid first field: ${log.log[0]}`);
+                this.#logger.warn(`Skipping public log with invalid first field: ${log.log[0]}`);
                 return;
             }
             // Check that the length values line up with the log contents
@@ -136,411 +137,364 @@ export class TXENode {
             // Add 1 for the first field holding lengths
             const totalLogLength = 1 + publicValuesLength + privateValuesLength;
             // Note that zeroes can be valid log values, so we can only assert that we do not go over the given length
-            if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find(f => !f.isZero())) {
-                __classPrivateFieldGet(this, _TXENode_logger, "f").warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
+            if (totalLogLength > PUBLIC_LOG_DATA_SIZE_IN_FIELDS || log.log.slice(totalLogLength).find((f)=>!f.isZero())) {
+                this.#logger.warn(`Skipping invalid tagged public log with first field: ${log.log[0]}`);
                 return;
             }
             // The first elt stores lengths => tag is in fields[1]
             const tag = log.log[1];
-            __classPrivateFieldGet(this, _TXENode_logger, "f").verbose(`Found tagged public log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
-            const currentLogs = __classPrivateFieldGet(this, _TXENode_logsByTags, "f").get(tag.toString()) ?? [];
-            const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), __classPrivateFieldGet(this, _TXENode_noteIndex, "f"), blockNumber, true, log.toBuffer());
+            this.#logger.verbose(`Found tagged public log with tag ${tag.toString()} in block ${this.getBlockNumber()}`);
+            const currentLogs = this.#logsByTags.get(tag.toString()) ?? [];
+            const scopedLog = new TxScopedL2Log(new TxHash(new Fr(blockNumber)), this.#noteIndex, blockNumber, true, log.toBuffer());
             currentLogs.push(scopedLog);
-            __classPrivateFieldGet(this, _TXENode_logsByTags, "f").set(tag.toString(), currentLogs);
+            this.#logsByTags.set(tag.toString(), currentLogs);
         });
     }
     /**
-     * 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.
-     * @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.
-     */
-    getLogsByTags(tags) {
-        const noteLogs = tags.map(tag => __classPrivateFieldGet(this, _TXENode_logsByTags, "f").get(tag.toString()) ?? []);
+   * 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.
+   * @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.
+   */ getLogsByTags(tags) {
+        const noteLogs = tags.map((tag)=>this.#logsByTags.get(tag.toString()) ?? []);
         return Promise.resolve(noteLogs);
     }
     /**
-     * Returns the tips of the L2 chain.
-     */
-    getL2Tips() {
+   * Returns the tips of the L2 chain.
+   */ getL2Tips() {
         throw new Error('TXE Node method getL2Tips not implemented');
     }
     /**
-     * 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 leafValue - The values to search for
-     * @returns The indexes of the given leaves in the given tree or undefined if not found.
-     */
-    async findLeavesIndexes(blockNumber, treeId, leafValues) {
+   * 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 leafValue - The values to search for
+   * @returns The indexes of the given leaves in the given tree or undefined if not found.
+   */ async findLeavesIndexes(blockNumber, treeId, leafValues) {
         // Temporary workaround to be able to respond this query: the trees are currently stored in the TXE oracle, but we
         // hold a reference to them.
         // We should likely migrate this so that the trees are owned by the node.
         // TODO: blockNumber is being passed as undefined, figure out why
-        const db = blockNumber === (await this.getBlockNumber()) || blockNumber === 'latest' || blockNumber === undefined
-            ? this.baseFork
-            : this.nativeWorldStateService.getSnapshot(blockNumber);
-        return await db.findLeafIndices(treeId, leafValues.map(x => x.toBuffer()));
-    }
-    /**
-     * 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, _leafIndex) {
+        const db = blockNumber === await this.getBlockNumber() || blockNumber === 'latest' || blockNumber === undefined ? this.baseFork : this.nativeWorldStateService.getSnapshot(blockNumber);
+        return await db.findLeafIndices(treeId, leafValues.map((x)=>x.toBuffer()));
+    }
+    /**
+   * 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, _leafIndex) {
         throw new Error('TXE Node method getNullifierSiblingPath not implemented');
     }
     /**
-     * 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, _leafIndex) {
+   * 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, _leafIndex) {
         throw new Error('TXE Node method getNoteHashSiblingPath not implemented');
     }
     /**
-     * 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 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, _l1ToL2Message) {
+   * 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 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, _l1ToL2Message) {
         throw new Error('TXE Node method getL1ToL2MessageMembershipWitness not implemented');
     }
     /**
-     * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
-     * @param l1ToL2Message - The L1 to L2 message to check.
-     * @returns Whether the message is synced and ready to be included in a block.
-     */
-    isL1ToL2MessageSynced(_l1ToL2Message) {
+   * Returns whether an L1 to L2 message is synced by archiver and if it's ready to be included in a block.
+   * @param l1ToL2Message - The L1 to L2 message to check.
+   * @returns Whether the message is synced and ready to be included in a block.
+   */ isL1ToL2MessageSynced(_l1ToL2Message) {
         throw new Error('TXE Node method isL1ToL2MessageSynced not implemented');
     }
     /**
-     * Returns a membership witness of an l2ToL1Message in an ephemeral l2 to l1 message tree.
-     * @dev Membership witness is a consists of the index and the sibling path of the l2ToL1Message.
-     * @remarks This tree is considered ephemeral because it is created on-demand by: taking all the l2ToL1 messages
-     * in a single block, and then using them to make a variable depth append-only tree with these messages as leaves.
-     * The tree is discarded immediately after calculating what we need from it.
-     * @param blockNumber - The block number at which to get the data.
-     * @param l2ToL1Message - The l2ToL1Message to get the membership witness for.
-     * @returns A tuple of the index and the sibling path of the L2ToL1Message.
-     */
-    getL2ToL1MessageMembershipWitness(_blockNumber, _l2ToL1Message) {
+   * Returns a membership witness of an l2ToL1Message in an ephemeral l2 to l1 message tree.
+   * @dev Membership witness is a consists of the index and the sibling path of the l2ToL1Message.
+   * @remarks This tree is considered ephemeral because it is created on-demand by: taking all the l2ToL1 messages
+   * in a single block, and then using them to make a variable depth append-only tree with these messages as leaves.
+   * The tree is discarded immediately after calculating what we need from it.
+   * @param blockNumber - The block number at which to get the data.
+   * @param l2ToL1Message - The l2ToL1Message to get the membership witness for.
+   * @returns A tuple of the index and the sibling path of the L2ToL1Message.
+   */ getL2ToL1MessageMembershipWitness(_blockNumber, _l2ToL1Message) {
         throw new Error('TXE Node method getL2ToL1MessageMembershipWitness not implemented');
     }
     /**
-     * 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, _leafIndex) {
+   * 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, _leafIndex) {
         throw new Error('TXE Node method getArchiveSiblingPath not implemented');
     }
     /**
-     * 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, _leafIndex) {
+   * 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, _leafIndex) {
         throw new Error('TXE Node method getPublicDataSiblingPath not implemented');
     }
     /**
-     * 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 nullifier - Nullifier we try to find witness for.
-     * @returns The nullifier membership witness (if found).
-     */
-    getNullifierMembershipWitness(_blockNumber, _nullifier) {
+   * 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 nullifier - Nullifier we try to find witness for.
+   * @returns The nullifier membership witness (if found).
+   */ getNullifierMembershipWitness(_blockNumber, _nullifier) {
         throw new Error('TXE Node method getNullifierMembershipWitness not implemented');
     }
     /**
-     * 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 nullifier - Nullifier we try to find the low nullifier witness for.
-     * @returns The low nullifier membership witness (if found).
-     * @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, _nullifier) {
+   * 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 nullifier - Nullifier we try to find the low nullifier witness for.
+   * @returns The low nullifier membership witness (if found).
+   * @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, _nullifier) {
         throw new Error('TXE Node method getLowNullifierMembershipWitness not implemented');
     }
     /**
-     * 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 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.
-     */
-    getPublicDataTreeWitness(_blockNumber, _leafSlot) {
+   * 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 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.
+   */ getPublicDataTreeWitness(_blockNumber, _leafSlot) {
         throw new Error('TXE Node method getPublicDataTreeWitness not implemented');
     }
     /**
-     * Get a block specified by its number.
-     * @param number - The block number being requested.
-     * @returns The requested block.
-     */
-    getBlock(_number) {
+   * Get a block specified by its number.
+   * @param number - The block number being requested.
+   * @returns The requested block.
+   */ getBlock(_number) {
         throw new Error('TXE Node method getBlock not implemented');
     }
     /**
-     * Fetches the latest proven block number.
-     * @returns The block number.
-     */
-    getProvenBlockNumber() {
+   * Fetches the latest proven block number.
+   * @returns The block number.
+   */ getProvenBlockNumber() {
         throw new Error('TXE Node method getProvenBlockNumber not implemented');
     }
     /**
-     * Method to determine if the node is ready to accept transactions.
-     * @returns - Flag indicating the readiness for tx submission.
-     */
-    isReady() {
+   * Method to determine if the node is ready to accept transactions.
+   * @returns - Flag indicating the readiness for tx submission.
+   */ isReady() {
         throw new Error('TXE Node method isReady not implemented');
     }
     /**
-     * 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.
-     */
-    getBlocks(_from, _limit) {
+   * 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.
+   */ getBlocks(_from, _limit) {
         throw new Error('TXE Node method getBlocks not implemented');
     }
     /**
-     * Method to fetch the version of the package.
-     * @returns The node package version
-     */
-    getNodeVersion() {
+   * Method to fetch the version of the package.
+   * @returns The node package version
+   */ getNodeVersion() {
         throw new Error('TXE Node method getNodeVersion not implemented');
     }
     /**
-     * Method to fetch the version of the rollup the node is connected to.
-     * @returns The rollup version.
-     */
-    getVersion() {
+   * Method to fetch the version of the rollup the node is connected to.
+   * @returns The rollup version.
+   */ getVersion() {
         return Promise.resolve(this.version);
     }
     /**
-     * Method to fetch the chain id of the base-layer for the rollup.
-     * @returns The chain id.
-     */
-    getChainId() {
+   * Method to fetch the chain id of the base-layer for the rollup.
+   * @returns The chain id.
+   */ getChainId() {
         return Promise.resolve(this.chainId);
     }
     /**
-     * Method to fetch the currently deployed l1 contract addresses.
-     * @returns The deployed contract addresses.
-     */
-    getL1ContractAddresses() {
+   * Method to fetch the currently deployed l1 contract addresses.
+   * @returns The deployed contract addresses.
+   */ getL1ContractAddresses() {
         throw new Error('TXE Node method getL1ContractAddresses not implemented');
     }
     /**
-     * Method to fetch the protocol contract addresses.
-     */
-    getProtocolContractAddresses() {
+   * Method to fetch the protocol contract addresses.
+   */ getProtocolContractAddresses() {
         throw new Error('TXE Node method getProtocolContractAddresses not implemented');
     }
     /**
-     * Method to add a contract artifact to the database.
-     * @param aztecAddress
-     * @param artifact
-     */
-    registerContractFunctionSignatures(_address, _signatures) {
+   * Method to add a contract artifact to the database.
+   * @param aztecAddress
+   * @param artifact
+   */ registerContractFunctionSignatures(_address, _signatures) {
         throw new Error('TXE Node method addContractArtifact not implemented');
     }
     /**
-     * Gets public logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
-     */
-    getPublicLogs(_filter) {
+   * Gets public logs based on the provided filter.
+   * @param filter - The filter to apply to the logs.
+   * @returns The requested logs.
+   */ getPublicLogs(_filter) {
         throw new Error('TXE Node method getPublicLogs not implemented');
     }
     /**
-     * Gets contract class logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
-     */
-    getContractClassLogs(_filter) {
+   * Gets contract class logs based on the provided filter.
+   * @param filter - The filter to apply to the logs.
+   * @returns The requested logs.
+   */ getContractClassLogs(_filter) {
         throw new Error('TXE Node method getContractClassLogs not implemented');
     }
     /**
-     * Method to submit a transaction to the p2p pool.
-     * @param tx - The transaction to be submitted.
-     * @returns Nothing.
-     */
-    sendTx(_tx) {
+   * Method to submit a transaction to the p2p pool.
+   * @param tx - The transaction to be submitted.
+   * @returns Nothing.
+   */ sendTx(_tx) {
         throw new Error('TXE Node method sendTx not implemented');
     }
     /**
-     * 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.
-     *
-     * @param txHash - The transaction hash.
-     * @returns A receipt of the transaction.
-     */
-    getTxReceipt(txHash) {
-        const txEffect = __classPrivateFieldGet(this, _TXENode_txReceiptsByTxHash, "f").get(txHash.toString());
+   * 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.
+   *
+   * @param txHash - The transaction hash.
+   * @returns A receipt of the transaction.
+   */ getTxReceipt(txHash) {
+        const txEffect = this.#txReceiptsByTxHash.get(txHash.toString());
         if (!txEffect) {
             throw new Error('Unknown txHash');
         }
         return Promise.resolve(txEffect);
     }
     /**
-     * Method to retrieve pending txs.
-     * @returns The pending txs.
-     */
-    getPendingTxs() {
+   * Method to retrieve pending txs.
+   * @returns The pending txs.
+   */ getPendingTxs() {
         throw new Error('TXE Node method getPendingTxs not implemented');
     }
     /**
-     * Retrieves the number of pending txs
-     * @returns The number of pending txs.
-     */
-    getPendingTxCount() {
+   * Retrieves the number of pending txs
+   * @returns The number of pending txs.
+   */ getPendingTxCount() {
         throw new Error('TXE Node method getPendingTxCount not implemented');
     }
     /**
-     * Method to retrieve a single pending tx.
-     * @param txHash - The transaction hash to return.
-     * @returns The pending tx if it exists.
-     */
-    getTxByHash(_txHash) {
+   * Method to retrieve a single pending tx.
+   * @param txHash - The transaction hash to return.
+   * @returns The pending tx if it exists.
+   */ getTxByHash(_txHash) {
+        throw new Error('TXE Node method getTxByHash not implemented');
+    }
+    getTxsByHash(_txHashes) {
         throw new Error('TXE Node method getTxByHash not implemented');
     }
     /**
-     * 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 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(_contract, _slot, _blockNumber) {
+   * 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 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(_contract, _slot, _blockNumber) {
         throw new Error('TXE Node method getPublicStorageAt not implemented');
     }
     /**
-     * Returns the currently committed block header.
-     * @returns The current committed block header.
-     */
-    getBlockHeader(_blockNumber) {
+   * Returns the currently committed block header.
+   * @returns The current committed block header.
+   */ getBlockHeader(_blockNumber) {
         throw new Error('TXE Node method getBlockHeader not implemented');
     }
     /**
-     * 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.
-     **/
-    simulatePublicCalls(_tx, _enforceFeePayment = false) {
+   * 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.
+   **/ simulatePublicCalls(_tx, _enforceFeePayment = false) {
         throw new Error('TXE Node method simulatePublicCalls not implemented');
     }
     /**
-     * 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 max_block_number property.
-     * @param tx - The transaction to validate for correctness.
-     * @param isSimulation - True if the transaction is a simulated one without generated proofs. (Optional)
-     */
-    isValidTx(_tx, _isSimulation) {
+   * 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 max_block_number property.
+   * @param tx - The transaction to validate for correctness.
+   * @param isSimulation - True if the transaction is a simulated one without generated proofs. (Optional)
+   */ isValidTx(_tx, _isSimulation) {
         throw new Error('TXE Node method isValidTx not implemented');
     }
     /**
-     * Updates the configuration of this node.
-     * @param config - Updated configuration to be merged with the current one.
-     */
-    setConfig(_config) {
+   * Updates the configuration of this node.
+   * @param config - Updated configuration to be merged with the current one.
+   */ setConfig(_config) {
         throw new Error('TXE Node method setConfig not implemented');
     }
     /**
-     * Returns a registered contract class given its id.
-     * @param id - Id of the contract class.
-     */
-    getContractClass(_id) {
+   * Returns a registered contract class given its id.
+   * @param id - Id of the contract class.
+   */ getContractClass(_id) {
         throw new Error('TXE Node method getContractClass not implemented');
     }
     /**
-     * Returns a publicly deployed contract instance given its address.
-     * @param address - Address of the deployed contract.
-     */
-    getContract(_address) {
+   * Returns a publicly deployed contract instance given its address.
+   * @param address - Address of the deployed contract.
+   */ getContract(_address) {
         throw new Error('TXE Node method getContract not implemented');
     }
-    /** Forces the next block to be built bypassing all time and pending checks. Useful for testing. */
-    flushTxs() {
+    /** Forces the next block to be built bypassing all time and pending checks. Useful for testing. */ flushTxs() {
         throw new Error('TXE Node method flushTxs not implemented');
     }
     /**
-     * Returns the ENR of this node for peer discovery, if available.
-     */
-    getEncodedEnr() {
+   * Returns the ENR of this node for peer discovery, if available.
+   */ getEncodedEnr() {
         throw new Error('TXE Node method getEncodedEnr not implemented');
     }
     /**
-     * Receives a quote for an epoch proof and stores it in its EpochProofQuotePool
-     * @param quote - The quote to store
-     */
-    addEpochProofQuote(_quote) {
+   * Receives a quote for an epoch proof and stores it in its EpochProofQuotePool
+   * @param quote - The quote to store
+   */ addEpochProofQuote(_quote) {
         throw new Error('TXE Node method addEpochProofQuote not implemented');
     }
     /**
-     * Returns the received quotes for a given epoch
-     * @param epoch - The epoch for which to get the quotes
-     */
-    getEpochProofQuotes(_epoch) {
+   * Returns the received quotes for a given epoch
+   * @param epoch - The epoch for which to get the quotes
+   */ getEpochProofQuotes(_epoch) {
         throw new Error('TXE Node method getEpochProofQuotes not implemented');
     }
     /**
-     * Adds a contract class bypassing the registerer.
-     * TODO(#10007): Remove this method.
-     * @param contractClass - The class to register.
-     */
-    addContractClass(_contractClass) {
+   * Adds a contract class bypassing the registerer.
+   * TODO(#10007): Remove this method.
+   * @param contractClass - The class to register.
+   */ addContractClass(_contractClass) {
         throw new Error('TXE Node method addContractClass not implemented');
     }
     /**
-     * Method to fetch the current base fees.
-     * @returns The current base fees.
-     */
-    getCurrentBaseFees() {
+   * Method to fetch the current base fees.
+   * @returns The current base fees.
+   */ getCurrentBaseFees() {
         throw new Error('TXE Node method getCurrentBaseFees not implemented');
     }
     /**
-     * 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, _limit) {
+   * 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, _limit) {
         throw new Error('TXE Node method getPrivateLogs not implemented');
     }
     /**
-     * Find the block numbers of the given leaf indices 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, _treeId, _leafIndices) {
+   * Find the block numbers of the given leaf indices 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, _treeId, _leafIndices) {
         throw new Error('TXE Node method findBlockNumbersForIndexes not implemented');
     }
     /**
-     * Returns the information about the server's node. Includes current Node version, compatible Noir version,
-     * L1 chain identifier, protocol version, and L1 address of the rollup contract.
-     * @returns - The node information.
-     */
-    getNodeInfo() {
+   * Returns the information about the server's node. Includes current Node version, compatible Noir version,
+   * L1 chain identifier, protocol version, and L1 address of the rollup contract.
+   * @returns - The node information.
+   */ getNodeInfo() {
         throw new Error('TXE Node method getNodeInfo not implemented');
     }
 }
-_TXENode_logsByTags = new WeakMap(), _TXENode_txEffectsByTxHash = new WeakMap(), _TXENode_txReceiptsByTxHash = new WeakMap(), _TXENode_blockNumberToNullifiers = new WeakMap(), _TXENode_noteIndex = new WeakMap(), _TXENode_logger = new WeakMap();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"txe_node.js","sourceRoot":"","sources":["../../src/node/txe_node.ts"],"names":[],"mappings":"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"}