@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/public/fixtures/utils.js

@@ -1,5 +1,5 @@
 import { Tx } from '@aztec/circuit-types';
-import { BlockHeader, DEFAULT_GAS_LIMIT, FunctionSelector, Gas, GasFees, GasSettings, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, RollupValidationRequests, TxConstantData, TxContext, } from '@aztec/circuits.js';
+import { BlockHeader, DEFAULT_GAS_LIMIT, FunctionSelector, Gas, GasFees, GasSettings, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, RollupValidationRequests, TxConstantData, TxContext } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { AvmTestContractArtifact } from '@aztec/noir-contracts.js/AvmTest';
@@ -7,21 +7,20 @@ import { strict as assert } from 'assert';
 export const PUBLIC_DISPATCH_FN_NAME = 'public_dispatch';
 /**
  * Craft a carrier transaction for some public calls for simulation by PublicTxSimulator.
- */
-export async function createTxForPublicCalls(firstNullifier, setupExecutionRequests, appExecutionRequests, teardownExecutionRequest, feePayer = AztecAddress.zero(), gasUsedByPrivate = Gas.empty()) {
+ */ export async function createTxForPublicCalls(firstNullifier, setupExecutionRequests, appExecutionRequests, teardownExecutionRequest, feePayer = AztecAddress.zero(), gasUsedByPrivate = Gas.empty()) {
     assert(setupExecutionRequests.length > 0 || appExecutionRequests.length > 0 || teardownExecutionRequest !== undefined, "Can't create public tx with no enqueued calls");
-    const setupCallRequests = await Promise.all(setupExecutionRequests.map(er => er.toCallRequest()));
-    const appCallRequests = await Promise.all(appExecutionRequests.map(er => er.toCallRequest()));
+    const setupCallRequests = await Promise.all(setupExecutionRequests.map((er)=>er.toCallRequest()));
+    const appCallRequests = await Promise.all(appExecutionRequests.map((er)=>er.toCallRequest()));
     // use max limits
     const gasLimits = new Gas(DEFAULT_GAS_LIMIT, MAX_L2_GAS_PER_TX_PUBLIC_PORTION);
     const forPublic = PartialPrivateTailPublicInputsForPublic.empty();
     // TODO(#9269): Remove this fake nullifier method as we move away from 1st nullifier as hash.
     forPublic.nonRevertibleAccumulatedData.nullifiers[0] = firstNullifier; // fake tx nullifier
     // We reverse order because the simulator expects it to be like a "stack" of calls to pop from
-    for (let i = setupCallRequests.length - 1; i >= 0; i--) {
+    for(let i = setupCallRequests.length - 1; i >= 0; i--){
         forPublic.nonRevertibleAccumulatedData.publicCallRequests[i] = setupCallRequests[i];
     }
-    for (let i = appCallRequests.length - 1; i >= 0; i--) {
+    for(let i = appCallRequests.length - 1; i >= 0; i--){
         forPublic.revertibleAccumulatedData.publicCallRequests[i] = appCallRequests[i];
     }
     if (teardownExecutionRequest) {
@@ -32,27 +31,26 @@ export async function createTxForPublicCalls(firstNullifier, setupExecutionReque
     const gasSettings = new GasSettings(gasLimits, teardownGasLimits, maxFeesPerGas, GasFees.empty());
     const txContext = new TxContext(Fr.zero(), Fr.zero(), gasSettings);
     const constantData = new TxConstantData(BlockHeader.empty(), txContext, Fr.zero(), Fr.zero());
-    const txData = new PrivateKernelTailCircuitPublicInputs(constantData, RollupValidationRequests.empty(), 
-    /*gasUsed=*/ gasUsedByPrivate, feePayer, forPublic);
+    const txData = new PrivateKernelTailCircuitPublicInputs(constantData, RollupValidationRequests.empty(), /*gasUsed=*/ gasUsedByPrivate, feePayer, forPublic);
     const tx = Tx.newWithTxData(txData, teardownExecutionRequest);
     // Reverse order because the simulator expects it to be like a "stack" of calls to pop from.
     // Also push app calls before setup calls for this reason.
-    for (let i = appExecutionRequests.length - 1; i >= 0; i--) {
+    for(let i = appExecutionRequests.length - 1; i >= 0; i--){
         tx.enqueuedPublicFunctionCalls.push(appExecutionRequests[i]);
     }
-    for (let i = setupExecutionRequests.length - 1; i >= 0; i--) {
+    for(let i = setupExecutionRequests.length - 1; i >= 0; i--){
         tx.enqueuedPublicFunctionCalls.push(setupExecutionRequests[i]);
     }
     return tx;
 }
 export function getAvmTestContractFunctionSelector(functionName) {
-    const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName);
+    const artifact = AvmTestContractArtifact.functions.find((f)=>f.name === functionName);
     assert(!!artifact, `Function ${functionName} not found in AvmTestContractArtifact`);
     const params = artifact.parameters;
     return FunctionSelector.fromNameAndParameters(artifact.name, params);
 }
 export function getAvmTestContractArtifact(functionName) {
-    const artifact = AvmTestContractArtifact.functions.find(f => f.name === functionName);
+    const artifact = AvmTestContractArtifact.functions.find((f)=>f.name === functionName);
     assert(!!artifact?.bytecode, `No bytecode found for function ${functionName}. Try re-running bootstrap.sh on the repository root.`);
     return artifact;
 }
@@ -63,4 +61,3 @@ export function getAvmTestContractBytecode(functionName) {
 export function getAvmTestContractPublicDispatchBytecode() {
     return getAvmTestContractBytecode(PUBLIC_DISPATCH_FN_NAME);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcHVibGljL2ZpeHR1cmVzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBK0IsRUFBRSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkUsT0FBTyxFQUNMLFdBQVcsRUFDWCxpQkFBaUIsRUFDakIsZ0JBQWdCLEVBQ2hCLEdBQUcsRUFDSCxPQUFPLEVBQ1AsV0FBVyxFQUNYLGdDQUFnQyxFQUNoQyx1Q0FBdUMsRUFDdkMsb0NBQW9DLEVBQ3BDLHdCQUF3QixFQUN4QixjQUFjLEVBQ2QsU0FBUyxHQUNWLE1BQU0sb0JBQW9CLENBQUM7QUFFNUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9ELE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUM5QyxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUUzRSxPQUFPLEVBQUUsTUFBTSxJQUFJLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUUxQyxNQUFNLENBQUMsTUFBTSx1QkFBdUIsR0FBRyxpQkFBaUIsQ0FBQztBQUV6RDs7R0FFRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsc0JBQXNCLENBQzFDLGNBQWtCLEVBQ2xCLHNCQUFnRCxFQUNoRCxvQkFBOEMsRUFDOUMsd0JBQWlELEVBQ2pELFFBQVEsR0FBRyxZQUFZLENBQUMsSUFBSSxFQUFFLEVBQzlCLG1CQUF3QixHQUFHLENBQUMsS0FBSyxFQUFFO0lBRW5DLE1BQU0sQ0FDSixzQkFBc0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLG9CQUFvQixDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksd0JBQXdCLEtBQUssU0FBUyxFQUM5RywrQ0FBK0MsQ0FDaEQsQ0FBQztJQUNGLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFz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

package/dest/public/index.js

@@ -5,4 +5,3 @@ export * from './public_db_sources.js';
 export { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
 export { SideEffectTrace } from './side_effect_trace.js';
 export { getExecutionRequestsByPhase } from './utils.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYywwQkFBMEIsQ0FBQztBQUV6QyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsT0FBTyxFQUFFLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2hGLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxZQUFZLENBQUMifQ==

package/dest/public/public_db_sources.js

@@ -1,5 +1,5 @@
-import { ContractClassTxL2Logs, MerkleTreeId, NullifierMembershipWitness, } from '@aztec/circuit-types';
-import { Fr, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
+import { ContractClassTxL2Logs, MerkleTreeId, NullifierMembershipWitness } from '@aztec/circuit-types';
+import { Fr, computePublicBytecodeCommitment } from '@aztec/circuits.js';
 import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
@@ -9,9 +9,13 @@ import { MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js
 /**
  * Implements the PublicContractsDB using a ContractDataSource.
  * Progressively records contracts in transaction as they are processed in a block.
- */
-export class ContractsDataSourcePublicDB {
-    constructor(dataSource) {
+ */ export class ContractsDataSourcePublicDB {
+    dataSource;
+    instanceCache;
+    classCache;
+    bytecodeCommitmentCache;
+    log;
+    constructor(dataSource){
         this.dataSource = dataSource;
         this.instanceCache = new Map();
         this.classCache = new Map();
@@ -19,64 +23,47 @@ export class ContractsDataSourcePublicDB {
         this.log = createLogger('simulator:contracts-data-source');
     }
     /**
-     * Add new contracts from a transaction
-     * @param tx - The transaction to add contracts from.
-     */
-    async addNewContracts(tx) {
+   * Add new contracts from a transaction
+   * @param tx - The transaction to add contracts from.
+   */ async addNewContracts(tx) {
         // Extract contract class and instance data from logs and add to cache for this block
         const logs = tx.contractClassLogs.unrollLogs();
-        const contractClassRegisteredEvents = logs
-            .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
-            .map(log => ContractClassRegisteredEvent.fromLog(log.data));
-        await Promise.all(contractClassRegisteredEvents.map(async (event) => {
+        const contractClassRegisteredEvents = logs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data)).map((log)=>ContractClassRegisteredEvent.fromLog(log.data));
+        await Promise.all(contractClassRegisteredEvents.map(async (event)=>{
             this.log.debug(`Adding class ${event.contractClassId.toString()} to public execution contract cache`);
             this.classCache.set(event.contractClassId.toString(), await event.toContractClassPublic());
         }));
         // We store the contract instance deployed event log in private logs, contract_instance_deployer_contract/src/main.nr
-        const contractInstanceEvents = tx.data
-            .getNonEmptyPrivateLogs()
-            .filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log))
-            .map(ContractInstanceDeployedEvent.fromLog);
-        contractInstanceEvents.forEach(e => {
+        const contractInstanceEvents = tx.data.getNonEmptyPrivateLogs().filter((log)=>ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log)).map(ContractInstanceDeployedEvent.fromLog);
+        contractInstanceEvents.forEach((e)=>{
             this.log.debug(`Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to public execution contract cache`);
             this.instanceCache.set(e.address.toString(), e.toContractInstance());
         });
     }
     /**
-     * Removes new contracts added from transactions
-     * @param tx - The tx's contracts to be removed
-     * @param onlyRevertible - Whether to only remove contracts added from revertible contract class logs
-     */
-    removeNewContracts(tx, onlyRevertible = false) {
+   * Removes new contracts added from transactions
+   * @param tx - The tx's contracts to be removed
+   * @param onlyRevertible - Whether to only remove contracts added from revertible contract class logs
+   */ removeNewContracts(tx, onlyRevertible = false) {
         // TODO(@spalladino): Can this inadvertently delete a valid contract added by another tx?
         // Let's say we have two txs adding the same contract on the same block. If the 2nd one reverts,
         // wouldn't that accidentally remove the contract added on the first one?
-        const contractClassLogs = onlyRevertible
-            ? tx.contractClassLogs
-                .filterScoped(tx.data.forPublic.revertibleAccumulatedData.contractClassLogsHashes, ContractClassTxL2Logs.empty())
-                .unrollLogs()
-            : tx.contractClassLogs.unrollLogs();
-        contractClassLogs
-            .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data))
-            .forEach(log => {
+        const contractClassLogs = onlyRevertible ? tx.contractClassLogs.filterScoped(tx.data.forPublic.revertibleAccumulatedData.contractClassLogsHashes, ContractClassTxL2Logs.empty()).unrollLogs() : tx.contractClassLogs.unrollLogs();
+        contractClassLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log.data)).forEach((log)=>{
             const event = ContractClassRegisteredEvent.fromLog(log.data);
             this.classCache.delete(event.contractClassId.toString());
         });
         // We store the contract instance deployed event log in private logs, contract_instance_deployer_contract/src/main.nr
-        const privateLogs = onlyRevertible
-            ? tx.data.forPublic.revertibleAccumulatedData.privateLogs.filter(l => !l.isEmpty())
-            : tx.data.getNonEmptyPrivateLogs();
-        const contractInstanceEvents = privateLogs
-            .filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log))
-            .map(ContractInstanceDeployedEvent.fromLog);
-        contractInstanceEvents.forEach(e => this.instanceCache.delete(e.address.toString()));
+        const privateLogs = onlyRevertible ? tx.data.forPublic.revertibleAccumulatedData.privateLogs.filter((l)=>!l.isEmpty()) : tx.data.getNonEmptyPrivateLogs();
+        const contractInstanceEvents = privateLogs.filter((log)=>ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log)).map(ContractInstanceDeployedEvent.fromLog);
+        contractInstanceEvents.forEach((e)=>this.instanceCache.delete(e.address.toString()));
         return Promise.resolve();
     }
     async getContractInstance(address) {
-        return this.instanceCache.get(address.toString()) ?? (await this.dataSource.getContract(address));
+        return this.instanceCache.get(address.toString()) ?? await this.dataSource.getContract(address);
     }
     async getContractClass(contractClassId) {
-        return this.classCache.get(contractClassId.toString()) ?? (await this.dataSource.getContractClass(contractClassId));
+        return this.classCache.get(contractClassId.toString()) ?? await this.dataSource.getContractClass(contractClassId);
     }
     async getBytecodeCommitment(contractClassId) {
         // Try and retrieve from cache
@@ -109,7 +96,7 @@ export class ContractsDataSourcePublicDB {
         if (!contractClass) {
             throw new Error(`Contract class ${instance.contractClassId.toString()} for ${address.toString()} not found`);
         }
-        return contractClass.publicFunctions.find(f => f.selector.equals(selector))?.bytecode;
+        return contractClass.publicFunctions.find((f)=>f.selector.equals(selector))?.bytecode;
     }
     async getDebugFunctionName(address, selector) {
         return await this.dataSource.getContractFunctionName(address, selector);
@@ -117,26 +104,24 @@ export class ContractsDataSourcePublicDB {
 }
 /**
  * A public state DB that reads and writes to the world state.
- */
-export class WorldStateDB extends ContractsDataSourcePublicDB {
-    constructor(db, dataSource) {
-        super(dataSource);
-        this.db = db;
-        this.logger = createLogger('simulator:world-state-db');
-        this.publicCommittedWriteCache = new Map();
-        this.publicCheckpointedWriteCache = new Map();
-        this.publicUncommittedWriteCache = new Map();
+ */ export class WorldStateDB extends ContractsDataSourcePublicDB {
+    db;
+    logger;
+    publicCommittedWriteCache;
+    publicCheckpointedWriteCache;
+    publicUncommittedWriteCache;
+    constructor(db, dataSource){
+        super(dataSource), this.db = db, this.logger = createLogger('simulator:world-state-db'), this.publicCommittedWriteCache = new Map(), this.publicCheckpointedWriteCache = new Map(), this.publicUncommittedWriteCache = new Map();
     }
     getMerkleInterface() {
         return this.db;
     }
     /**
-     * Reads a value from public storage, returning zero if none.
-     * @param contract - Owner of the storage.
-     * @param slot - Slot to read in the contract storage.
-     * @returns The current value in the storage slot.
-     */
-    async storageRead(contract, slot) {
+   * Reads a value from public storage, returning zero if none.
+   * @param contract - Owner of the storage.
+   * @param slot - Slot to read in the contract storage.
+   * @returns The current value in the storage slot.
+   */ async storageRead(contract, slot) {
         const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
         const uncommitted = this.publicUncommittedWriteCache.get(leafSlot);
         if (uncommitted !== undefined) {
@@ -153,39 +138,45 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
         return await readPublicState(this.db, contract, slot);
     }
     /**
-     * Records a write to public storage.
-     * @param contract - Owner of the storage.
-     * @param slot - Slot to read in the contract storage.
-     * @param newValue - The new value to store.
-     * @returns The slot of the written leaf in the public data tree.
-     */
-    async storageWrite(contract, slot, newValue) {
+   * Records a write to public storage.
+   * @param contract - Owner of the storage.
+   * @param slot - Slot to read in the contract storage.
+   * @param newValue - The new value to store.
+   * @returns The slot of the written leaf in the public data tree.
+   */ async storageWrite(contract, slot, newValue) {
         const index = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
         this.publicUncommittedWriteCache.set(index, newValue);
         return index;
     }
     async getNullifierMembershipWitnessAtLatestBlock(nullifier) {
         const timer = new Timer();
-        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [nullifier.toBuffer()]))[0];
+        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
+            nullifier.toBuffer()
+        ]))[0];
         if (!index) {
             return undefined;
         }
         const leafPreimagePromise = this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, index);
         const siblingPathPromise = this.db.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, BigInt(index));
-        const [leafPreimage, siblingPath] = await Promise.all([leafPreimagePromise, siblingPathPromise]);
+        const [leafPreimage, siblingPath] = await Promise.all([
+            leafPreimagePromise,
+            siblingPathPromise
+        ]);
         if (!leafPreimage) {
             return undefined;
         }
         this.logger.debug(`[DB] Fetched nullifier membership`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-nullifier-membership-witness-at-latest-block',
+            operation: 'get-nullifier-membership-witness-at-latest-block'
         });
         return new NullifierMembershipWitness(BigInt(index), leafPreimage, siblingPath);
     }
     async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
         const timer = new Timer();
-        const messageIndex = (await this.db.findLeafIndices(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [messageHash]))[0];
+        const messageIndex = (await this.db.findLeafIndices(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
+            messageHash
+        ]))[0];
         if (messageIndex === undefined) {
             throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
         }
@@ -198,7 +189,7 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
         this.logger.debug(`[DB] Fetched L1 to L2 message membership`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-l1-to-l2-message-membership-witness',
+            operation: 'get-l1-to-l2-message-membership-witness'
         });
         return new MessageLoadOracleInputs(messageIndex, siblingPath);
     }
@@ -208,17 +199,19 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
         this.logger.debug(`[DB] Fetched L1 to L2 message leaf value`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-l1-to-l2-message-leaf-value',
+            operation: 'get-l1-to-l2-message-leaf-value'
         });
         return leafValue;
     }
     async getCommitmentIndex(commitment) {
         const timer = new Timer();
-        const index = (await this.db.findLeafIndices(MerkleTreeId.NOTE_HASH_TREE, [commitment]))[0];
+        const index = (await this.db.findLeafIndices(MerkleTreeId.NOTE_HASH_TREE, [
+            commitment
+        ]))[0];
         this.logger.debug(`[DB] Fetched commitment index`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-commitment-index',
+            operation: 'get-commitment-index'
         });
         return index;
     }
@@ -228,46 +221,46 @@ export class WorldStateDB extends ContractsDataSourcePublicDB {
         this.logger.debug(`[DB] Fetched commitment leaf value`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-commitment-leaf-value',
+            operation: 'get-commitment-leaf-value'
         });
         return leafValue;
     }
     async getNullifierIndex(nullifier) {
         const timer = new Timer();
-        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [nullifier.toBuffer()]))[0];
+        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
+            nullifier.toBuffer()
+        ]))[0];
         this.logger.debug(`[DB] Fetched nullifier index`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-nullifier-index',
+            operation: 'get-nullifier-index'
         });
         return index;
     }
     /**
-     * Commit the pending public changes to the DB.
-     * @returns Nothing.
-     */
-    commit() {
-        for (const [k, v] of this.publicCheckpointedWriteCache) {
+   * Commit the pending public changes to the DB.
+   * @returns Nothing.
+   */ commit() {
+        for (const [k, v] of this.publicCheckpointedWriteCache){
             this.publicCommittedWriteCache.set(k, v);
         }
         // uncommitted writes take precedence over checkpointed writes
         // since they are the most recent
-        for (const [k, v] of this.publicUncommittedWriteCache) {
+        for (const [k, v] of this.publicUncommittedWriteCache){
             this.publicCommittedWriteCache.set(k, v);
         }
         return this.rollbackToCommit();
     }
     /**
-     * Rollback the pending public changes.
-     * @returns Nothing.
-     */
-    async rollbackToCommit() {
+   * Rollback the pending public changes.
+   * @returns Nothing.
+   */ async rollbackToCommit() {
         await this.rollbackToCheckpoint();
         this.publicCheckpointedWriteCache = new Map();
         return Promise.resolve();
     }
     checkpoint() {
-        for (const [k, v] of this.publicUncommittedWriteCache) {
+        for (const [k, v] of this.publicUncommittedWriteCache){
             this.publicCheckpointedWriteCache.set(k, v);
         }
         return this.rollbackToCheckpoint();
@@ -283,7 +276,6 @@ export async function readPublicState(db, contract, slot) {
     if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
         return Fr.ZERO;
     }
-    const preimage = (await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index));
+    const preimage = await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
     return preimage.value;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_db_sources.js","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}