diff --git a/yarn-project/simulator/src/public/hinting_db_sources.ts b/yarn-project/simulator/src/public/hinting_db_sources.ts index 797a58dc9503..d65521b25d34 100644 --- a/yarn-project/simulator/src/public/hinting_db_sources.ts +++ b/yarn-project/simulator/src/public/hinting_db_sources.ts @@ -97,7 +97,7 @@ export class HintingPublicTreesDB extends PublicTreesDB { // Getters. public override async getSiblingPath(treeId: MerkleTreeId, index: bigint): Promise> { const path = await super.getSiblingPath(treeId, index); - const key = await this.#getHintKey(treeId); + const key = await this.getHintKey(treeId); this.hints.getSiblingPathHints.push(new AvmGetSiblingPathHint(key, treeId, index, path.toFields())); return Promise.resolve(path); } @@ -120,7 +120,7 @@ export class HintingPublicTreesDB extends PublicTreesDB { )}, ${value}}) returned undefined. Possible wrong tree setup or corrupted state.`, ); } - const key = await this.#getHintKey(treeId); + const key = await this.getHintKey(treeId); this.hints.getPreviousValueIndexHints.push( new AvmGetPreviousValueIndexHint(key, treeId, new Fr(value), result.index, result.alreadyPresent), ); @@ -133,7 +133,7 @@ export class HintingPublicTreesDB extends PublicTreesDB { ): Promise { const preimage = await super.getLeafPreimage(treeId, index); if (preimage) { - const key = await this.#getHintKey(treeId); + const key = await this.getHintKey(treeId); switch (treeId) { case MerkleTreeId.PUBLIC_DATA_TREE: @@ -162,11 +162,11 @@ export class HintingPublicTreesDB extends PublicTreesDB { leaves: Buffer[], ): Promise> { HintingPublicTreesDB.log.debug('sequentialInsert not hinted yet!'); - const beforeState = await this.#getHintKey(treeId); + const beforeState = await this.getHintKey(treeId); const result = await super.sequentialInsert(treeId, leaves); - const afterState = await this.#getHintKey(treeId); + const afterState = await this.getHintKey(treeId); HintingPublicTreesDB.log.debug( `Evolved tree state (${getTreeName(treeId)}): ${beforeState.root}, ${beforeState.nextAvailableLeafIndex} -> ${ afterState.root @@ -182,21 +182,21 @@ export class HintingPublicTreesDB extends PublicTreesDB { // WARNING: is this enough? we might actually need the number of the checkpoint or similar... // We will need to keep a stack of checkpoints on the C++ side. const beforeState = { - [MerkleTreeId.PUBLIC_DATA_TREE]: await this.#getHintKey(MerkleTreeId.PUBLIC_DATA_TREE), - [MerkleTreeId.NULLIFIER_TREE]: await this.#getHintKey(MerkleTreeId.NULLIFIER_TREE), - [MerkleTreeId.NOTE_HASH_TREE]: await this.#getHintKey(MerkleTreeId.NOTE_HASH_TREE), - [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.#getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), - [MerkleTreeId.ARCHIVE]: await this.#getHintKey(MerkleTreeId.ARCHIVE), + [MerkleTreeId.PUBLIC_DATA_TREE]: await this.getHintKey(MerkleTreeId.PUBLIC_DATA_TREE), + [MerkleTreeId.NULLIFIER_TREE]: await this.getHintKey(MerkleTreeId.NULLIFIER_TREE), + [MerkleTreeId.NOTE_HASH_TREE]: await this.getHintKey(MerkleTreeId.NOTE_HASH_TREE), + [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), + [MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE), }; await super.revertCheckpoint(); const afterState = { - [MerkleTreeId.PUBLIC_DATA_TREE]: await this.#getHintKey(MerkleTreeId.PUBLIC_DATA_TREE), - [MerkleTreeId.NULLIFIER_TREE]: await this.#getHintKey(MerkleTreeId.NULLIFIER_TREE), - [MerkleTreeId.NOTE_HASH_TREE]: await this.#getHintKey(MerkleTreeId.NOTE_HASH_TREE), - [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.#getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), - [MerkleTreeId.ARCHIVE]: await this.#getHintKey(MerkleTreeId.ARCHIVE), + [MerkleTreeId.PUBLIC_DATA_TREE]: await this.getHintKey(MerkleTreeId.PUBLIC_DATA_TREE), + [MerkleTreeId.NULLIFIER_TREE]: await this.getHintKey(MerkleTreeId.NULLIFIER_TREE), + [MerkleTreeId.NOTE_HASH_TREE]: await this.getHintKey(MerkleTreeId.NOTE_HASH_TREE), + [MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: await this.getHintKey(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), + [MerkleTreeId.ARCHIVE]: await this.getHintKey(MerkleTreeId.ARCHIVE), }; HintingPublicTreesDB.log.debug('Evolved tree state:'); @@ -210,7 +210,7 @@ export class HintingPublicTreesDB extends PublicTreesDB { } // Private methods. - async #getHintKey(treeId: MerkleTreeId): Promise { + private async getHintKey(treeId: MerkleTreeId): Promise { const treeInfo = await super.getTreeInfo(treeId); return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size)); }