@aztec/simulator 0.0.0-test.0 → 0.0.1-commit.24de95ac

package/dest/public/public_db_sources.d.ts

@@ -2,16 +2,18 @@ import { Fr } from '@aztec/foundation/fields';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ContractClassPublic, type ContractDataSource, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { MerkleTreeCheckpointOperations, MerkleTreeReadOperations, MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import type { Tx } from '@aztec/stdlib/tx';
-import type { PublicContractsDB, PublicStateDB } from '../common/db_interfaces.js';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { TreeSnapshots, type Tx } from '@aztec/stdlib/tx';
+import type { UInt64 } from '@aztec/stdlib/types';
+import type { PublicContractsDBInterface, PublicStateDBInterface } from './db_interfaces.js';
 /**
- * Implements the PublicContractsDB using a ContractDataSource.
+ * Implements the PublicContractsDBInterface using a ContractDataSource.
  * Progressively records contracts in transaction as they are processed in a block.
  * Separates block-level contract information (from processed/included txs) from the
  * current tx's contract information (which may be cleared on tx revert/death).
  */
-export declare class ContractsDataSourcePublicDB implements PublicContractsDB {
+export declare class PublicContractsDB implements PublicContractsDBInterface {
     private dataSource;
     private currentTxNonRevertibleCache;
     private currentTxRevertibleCache;
@@ -81,49 +83,38 @@ export declare class ContractsDataSourcePublicDB implements PublicContractsDB {
      * Then, clears the tx cache.
      */
     commitContractsForTx(onlyNonRevertibles?: boolean): void;
-    getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
+    getContractInstance(address: AztecAddress, timestamp: UInt64): Promise<ContractInstanceWithAddress | undefined>;
     getContractClass(contractClassId: Fr): Promise<ContractClassPublic | undefined>;
     getBytecodeCommitment(contractClassId: Fr): Promise<Fr | undefined>;
     getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
 }
 /**
- * A public state DB that reads and writes to the world state.
+ * A high-level class that provides access to the merkle trees.
+ *
+ * This class is just a helper wrapper around a merkle db. Anything that you can do with it
+ * can also be done directly with the merkle db. This class should NOT be exposed or used
+ * outside of `simulator/src/public`.
+ *
+ * NOTE: This class is currently written in such a way that it would generate the
+ * necessary hints if used with a hinting merkle db. This is a bit of a leak of concepts.
+ * Eventually we can have everything depend on a config/factory at the TxSimulator level
+ * to decide whether to use hints or not (same with tracing, etc).
  */
-export declare class WorldStateDB extends ContractsDataSourcePublicDB implements PublicStateDB, MerkleTreeCheckpointOperations {
-    db: MerkleTreeWriteOperations;
+export declare class PublicTreesDB implements PublicStateDBInterface {
+    private readonly db;
     private logger;
-    constructor(db: MerkleTreeWriteOperations, dataSource: ContractDataSource);
-    /**
-     * Checkpoints the current fork state
-     */
+    constructor(db: MerkleTreeWriteOperations);
+    storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
+    storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
+    getL1ToL2LeafValue(leafIndex: bigint): Promise<Fr>;
+    getNoteHash(leafIndex: bigint): Promise<Fr>;
+    writeNoteHash(noteHash: Fr): Promise<void>;
+    checkNullifierExists(nullifier: Fr): Promise<boolean>;
+    writeNullifier(siloedNullifier: Fr): Promise<void>;
+    padTree(treeId: MerkleTreeId, leavesToInsert: number): Promise<void>;
     createCheckpoint(): Promise<void>;
-    /**
-     * Commits the current checkpoint
-     */
     commitCheckpoint(): Promise<void>;
-    /**
-     * Reverts the current checkpoint
-     */
     revertCheckpoint(): Promise<void>;
-    getMerkleInterface(): MerkleTreeWriteOperations;
-    /**
-     * 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.
-     */
-    storageRead(contract: AztecAddress, slot: Fr): Promise<Fr>;
-    /**
-     * 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.
-     */
-    storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<void>;
-    getL1ToL2LeafValue(leafIndex: bigint): Promise<Fr | undefined>;
-    getCommitmentValue(leafIndex: bigint): Promise<Fr | undefined>;
-    getNullifierIndex(nullifier: Fr): Promise<bigint | undefined>;
+    getTreeSnapshots(): Promise<TreeSnapshots>;
 }
-export declare function readPublicState(db: MerkleTreeReadOperations, contract: AztecAddress, slot: Fr): Promise<Fr>;
 //# sourceMappingURL=public_db_sources.d.ts.map

package/dest/public/public_db_sources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"public_db_sources.d.ts","sourceRoot":"","sources":["../../src/public/public_db_sources.ts"],"names":[],"mappings":"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"}

package/dest/public/public_db_sources.js

@@ -1,19 +1,23 @@
+import { L1_TO_L2_MSG_TREE_LEAF_COUNT, NOTE_HASH_TREE_LEAF_COUNT, NULLIFIER_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_HEIGHT } from '@aztec/constants';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ContractClassRegisteredEvent } from '@aztec/protocol-contracts/class-registerer';
-import { ContractInstanceDeployedEvent } from '@aztec/protocol-contracts/instance-deployer';
+import { ContractClassPublishedEvent } from '@aztec/protocol-contracts/class-registry';
+import { ContractInstancePublishedEvent } from '@aztec/protocol-contracts/instance-registry';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
 import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
-import { MerkleTreeId } from '@aztec/stdlib/trees';
+import { MerkleTreeId, NullifierLeaf, PublicDataTreeLeaf, getTreeName } from '@aztec/stdlib/trees';
+import { TreeSnapshots } from '@aztec/stdlib/tx';
+import { strict as assert } from 'assert';
+import { L1ToL2MessageIndexOutOfRangeError, NoteHashIndexOutOfRangeError } from './side_effect_errors.js';
 import { TxContractCache } from './tx_contract_cache.js';
 /**
- * Implements the PublicContractsDB using a ContractDataSource.
+ * Implements the PublicContractsDBInterface using a ContractDataSource.
  * Progressively records contracts in transaction as they are processed in a block.
  * Separates block-level contract information (from processed/included txs) from the
  * current tx's contract information (which may be cleared on tx revert/death).
- */ export class ContractsDataSourcePublicDB {
+ */ export class PublicContractsDB {
     dataSource;
     // Two caching layers for contract classes and instances.
     // Tx-level cache:
@@ -64,7 +68,7 @@ import { TxContractCache } from './tx_contract_cache.js';
    * For private-only txs, this will be all contract classes (found in tx.data.forPublic)
    * @param tx - The transaction to add non-revertible contract classes from.
    */ async addNonRevertibleContractClasses(tx) {
-        const siloedContractClassLogs = tx.data.forPublic ? await tx.filterContractClassLogs(tx.data.forPublic.nonRevertibleAccumulatedData.contractClassLogsHashes, /*siloed=*/ true) : await tx.filterContractClassLogs(tx.data.forRollup.end.contractClassLogsHashes, /*siloed=*/ true);
+        const siloedContractClassLogs = tx.data.forPublic ? tx.getSplitContractClassLogs(false) : tx.getContractClassLogs();
         await this.addContractClassesFromLogs(siloedContractClassLogs, this.currentTxNonRevertibleCache, 'non-revertible');
     }
     /**
@@ -72,7 +76,7 @@ import { TxContractCache } from './tx_contract_cache.js';
    * None for private-only txs.
    * @param tx - The transaction to add revertible contract classes from.
    */ async addRevertibleContractClasses(tx) {
-        const siloedContractClassLogs = tx.data.forPublic ? await tx.filterContractClassLogs(tx.data.forPublic.revertibleAccumulatedData.contractClassLogsHashes, /*siloed=*/ true) : [];
+        const siloedContractClassLogs = tx.data.forPublic ? tx.getSplitContractClassLogs(true) : [];
         await this.addContractClassesFromLogs(siloedContractClassLogs, this.currentTxRevertibleCache, 'revertible');
     }
     /**
@@ -97,7 +101,7 @@ import { TxContractCache } from './tx_contract_cache.js';
    * @param cache - The cache to store the contract classes in
    * @param cacheType - Type of cache (for logging)
    */ async addContractClassesFromLogs(siloedContractClassLogs, cache, cacheType) {
-        const contractClassEvents = siloedContractClassLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).map((log)=>ContractClassRegisteredEvent.fromLog(log));
+        const contractClassEvents = siloedContractClassLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log));
         // Cache contract classes
         await Promise.all(contractClassEvents.map(async (event)=>{
             this.log.debug(`Adding class ${event.contractClassId.toString()} to contract's ${cacheType} tx cache`);
@@ -111,7 +115,7 @@ import { TxContractCache } from './tx_contract_cache.js';
    * @param cache - The cache to store the contract instances in
    * @param cacheType - Type of cache (for logging)
    */ addContractInstancesFromLogs(contractInstanceLogs, cache, cacheType) {
-        const contractInstanceEvents = contractInstanceLogs.filter((log)=>ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log)).map((log)=>ContractInstanceDeployedEvent.fromLog(log));
+        const contractInstanceEvents = contractInstanceLogs.filter((log)=>ContractInstancePublishedEvent.isContractInstancePublishedEvent(log)).map((log)=>ContractInstancePublishedEvent.fromLog(log));
         // Cache contract instances
         contractInstanceEvents.forEach((e)=>{
             this.log.debug(`Adding instance ${e.address.toString()} with class ${e.contractClassId.toString()} to ${cacheType} tx contract cache`);
@@ -139,9 +143,18 @@ import { TxContractCache } from './tx_contract_cache.js';
         this.currentTxNonRevertibleCache.clear();
         this.currentTxRevertibleCache.clear();
     }
-    async getContractInstance(address) {
+    // TODO(fcarreiro/alvaro): This method currently needs a blockNumber. Since this class
+    // is only ever used for a given block, it should be possible to construct it with the
+    // block number and then forget about it. However, since this class (and interface) is
+    // currently more externally exposed than we'd want to, Facundo preferred to not add it
+    // to the constructor right now. If we can make this class more private, we should
+    // reconsider this. A litmus test is in how many places we need to initialize with a
+    // dummy block number (tests or not) and pass block numbers to `super`.
+    // Note: Block number got changed to timestamp so this comment ^ is outdated. Keeping
+    // the comment as is as I am not part of the AVM cabal.
+    async getContractInstance(address, timestamp) {
         // Check caches in order: tx revertible -> tx non-revertible -> block -> data source
-        return this.currentTxRevertibleCache.getInstance(address) ?? this.currentTxNonRevertibleCache.getInstance(address) ?? this.blockCache.getInstance(address) ?? await this.dataSource.getContract(address);
+        return this.currentTxRevertibleCache.getInstance(address) ?? this.currentTxNonRevertibleCache.getInstance(address) ?? this.blockCache.getInstance(address) ?? await this.dataSource.getContract(address, timestamp);
     }
     async getContractClass(contractClassId) {
         // Check caches in order: tx revertible -> tx non-revertible -> block -> data source
@@ -170,95 +183,166 @@ import { TxContractCache } from './tx_contract_cache.js';
         return value;
     }
     async getDebugFunctionName(address, selector) {
-        return await this.dataSource.getContractFunctionName(address, selector);
+        return await this.dataSource.getDebugFunctionName(address, selector);
     }
 }
 /**
- * A public state DB that reads and writes to the world state.
- */ export class WorldStateDB extends ContractsDataSourcePublicDB {
+ * A high-level class that provides access to the merkle trees.
+ *
+ * This class is just a helper wrapper around a merkle db. Anything that you can do with it
+ * can also be done directly with the merkle db. This class should NOT be exposed or used
+ * outside of `simulator/src/public`.
+ *
+ * NOTE: This class is currently written in such a way that it would generate the
+ * necessary hints if used with a hinting merkle db. This is a bit of a leak of concepts.
+ * Eventually we can have everything depend on a config/factory at the TxSimulator level
+ * to decide whether to use hints or not (same with tracing, etc).
+ */ export class PublicTreesDB {
     db;
     logger;
-    constructor(db, dataSource){
-        super(dataSource), this.db = db, this.logger = createLogger('simulator:world-state-db');
+    constructor(db){
+        this.db = db;
+        this.logger = createLogger('simulator:public-trees-db');
     }
-    /**
-   * Checkpoints the current fork state
-   */ async createCheckpoint() {
-        await this.db.createCheckpoint();
-    }
-    /**
-   * Commits the current checkpoint
-   */ async commitCheckpoint() {
-        await this.db.commitCheckpoint();
-    }
-    /**
-   * Reverts the current checkpoint
-   */ async revertCheckpoint() {
-        await this.db.revertCheckpoint();
-    }
-    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) {
-        return await readPublicState(this.db, contract, slot);
+    async storageRead(contract, slot) {
+        const timer = new Timer();
+        const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
+        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
+        if (!lowLeafResult) {
+            throw new Error('Low leaf not found');
+        }
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        // Unconditionally fetching the preimage for the hints. Move it to the hinting layer?
+        const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
+        const result = lowLeafResult.alreadyPresent ? preimage.leaf.value : Fr.ZERO;
+        this.logger.debug(`Storage read (contract=${contract}, slot=${slot}, value=${result})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'storage-read'
+        });
+        return result;
     }
-    /**
-   * 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) {
+    async storageWrite(contract, slot, newValue) {
+        const timer = new Timer();
         const leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
         const publicDataWrite = new PublicDataWrite(leafSlot, newValue);
         await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [
             publicDataWrite.toBuffer()
         ]);
+        this.logger.debug(`Storage write (contract=${contract}, slot=${slot}, value=${newValue})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'storage-write'
+        });
     }
     async getL1ToL2LeafValue(leafIndex) {
         const timer = new Timer();
+        if (leafIndex > L1_TO_L2_MSG_TREE_LEAF_COUNT) {
+            throw new L1ToL2MessageIndexOutOfRangeError(Number(leafIndex));
+        }
         const leafValue = await this.db.getLeafValue(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
-        this.logger.debug(`[DB] Fetched L1 to L2 message leaf value`, {
+        assert(leafValue !== undefined, 'Unexpected null response from l1 to l2 message tree');
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, leafIndex);
+        this.logger.debug(`Fetched L1 to L2 message leaf value (leafIndex=${leafIndex}, value=${leafValue})`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
             operation: 'get-l1-to-l2-message-leaf-value'
         });
         return leafValue;
     }
-    async getCommitmentValue(leafIndex) {
+    async getNoteHash(leafIndex) {
         const timer = new Timer();
+        if (leafIndex > NOTE_HASH_TREE_LEAF_COUNT) {
+            throw new NoteHashIndexOutOfRangeError(Number(leafIndex));
+        }
         const leafValue = await this.db.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
-        this.logger.debug(`[DB] Fetched commitment leaf value`, {
+        assert(leafValue !== undefined, 'Unexpected null response from note hash tree');
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
+        this.logger.debug(`Fetched note hash leaf value (leafIndex=${leafIndex}, value=${leafValue})`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-commitment-leaf-value'
+            operation: 'get-note-hash'
         });
         return leafValue;
     }
-    async getNullifierIndex(nullifier) {
+    async writeNoteHash(noteHash) {
         const timer = new Timer();
-        const index = (await this.db.findLeafIndices(MerkleTreeId.NULLIFIER_TREE, [
-            nullifier.toBuffer()
-        ]))[0];
-        this.logger.debug(`[DB] Fetched nullifier index`, {
+        await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, [
+            noteHash
+        ]);
+        this.logger.debug(`Wrote note hash (noteHash=${noteHash})`, {
             eventName: 'public-db-access',
             duration: timer.ms(),
-            operation: 'get-nullifier-index'
+            operation: 'write-note-hash'
         });
-        return index;
     }
-}
-export async function readPublicState(db, contract, slot) {
-    const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
-    const lowLeafResult = await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
-    if (!lowLeafResult || !lowLeafResult.alreadyPresent) {
-        return Fr.ZERO;
+    async checkNullifierExists(nullifier) {
+        const timer = new Timer();
+        const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.NULLIFIER_TREE, nullifier.toBigInt());
+        if (!lowLeafResult) {
+            throw new Error('Low leaf not found');
+        }
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
+        // TODO: We need this for the hints. See class comment for more details.
+        await this.db.getLeafPreimage(MerkleTreeId.NULLIFIER_TREE, lowLeafResult.index);
+        const exists = lowLeafResult.alreadyPresent;
+        this.logger.debug(`Checked nullifier exists (nullifier=${nullifier}, exists=${exists})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'check-nullifier-exists'
+        });
+        return exists;
+    }
+    async writeNullifier(siloedNullifier) {
+        const timer = new Timer();
+        await this.db.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [
+            siloedNullifier.toBuffer()
+        ]);
+        this.logger.debug(`Wrote nullifier (nullifier=${siloedNullifier})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'write-nullifier'
+        });
+    }
+    async padTree(treeId, leavesToInsert) {
+        const timer = new Timer();
+        switch(treeId){
+            // Indexed trees.
+            case MerkleTreeId.NULLIFIER_TREE:
+                await this.db.batchInsert(treeId, Array(leavesToInsert).fill(NullifierLeaf.empty().toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
+                break;
+            case MerkleTreeId.PUBLIC_DATA_TREE:
+                await this.db.batchInsert(treeId, Array(leavesToInsert).fill(PublicDataTreeLeaf.empty().toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
+                break;
+            // Append-only trees.
+            case MerkleTreeId.L1_TO_L2_MESSAGE_TREE:
+            case MerkleTreeId.NOTE_HASH_TREE:
+                await this.db.appendLeaves(treeId, Array(leavesToInsert).fill(Fr.ZERO));
+                break;
+            default:
+                throw new Error(`Padding not supported for tree ${treeId}`);
+        }
+        this.logger.debug(`Padded tree (tree=${getTreeName(treeId)}, leavesToInsert=${leavesToInsert})`, {
+            eventName: 'public-db-access',
+            duration: timer.ms(),
+            operation: 'pad-tree'
+        });
+    }
+    async createCheckpoint() {
+        await this.db.createCheckpoint();
+    }
+    async commitCheckpoint() {
+        await this.db.commitCheckpoint();
+    }
+    async revertCheckpoint() {
+        await this.db.revertCheckpoint();
+    }
+    async getTreeSnapshots() {
+        const stateReference = await this.db.getStateReference();
+        return new TreeSnapshots(stateReference.l1ToL2MessageTree, stateReference.partial.noteHashTree, stateReference.partial.nullifierTree, stateReference.partial.publicDataTree);
     }
-    const preimage = await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
-    return preimage.value;
 }

package/dest/public/public_errors.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Any known (and checked) error that can be thrown during public execution.
+ * Includes AvmExecutionErrors and SideEffectErrors.
+ *
+ * AvmSimulator catches any checked errors before returning a boolean "reverted".
+ * Unchecked errors are generally the result of a bug. They are propagated and
+ * ultimately will be the resonsibility of PublicProcessor to handle.
+ */
+export declare abstract class CheckedPublicExecutionError extends Error {
+    constructor(message: string);
+}
+//# sourceMappingURL=public_errors.d.ts.map

package/dest/public/public_errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"public_errors.d.ts","sourceRoot":"","sources":["../../src/public/public_errors.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,8BAAsB,2BAA4B,SAAQ,KAAK;gBACjD,OAAO,EAAE,MAAM;CAI5B"}

package/dest/public/public_errors.js

@@ -0,0 +1,13 @@
+/**
+ * Any known (and checked) error that can be thrown during public execution.
+ * Includes AvmExecutionErrors and SideEffectErrors.
+ *
+ * AvmSimulator catches any checked errors before returning a boolean "reverted".
+ * Unchecked errors are generally the result of a bug. They are propagated and
+ * ultimately will be the resonsibility of PublicProcessor to handle.
+ */ export class CheckedPublicExecutionError extends Error {
+    constructor(message){
+        super(message);
+        this.name = 'CheckedPublicExecutionError';
+    }
+}

package/dest/public/public_processor/guarded_merkle_tree.d.ts

@@ -0,0 +1,49 @@
+import type { IndexedTreeLeafPreimage, SiblingPath } from '@aztec/foundation/trees';
+import type { BatchInsertionResult, IndexedTreeId, MerkleTreeId, MerkleTreeLeafType, MerkleTreeWriteOperations, SequentialInsertionResult, TreeHeights, TreeInfo } from '@aztec/stdlib/trees';
+import type { BlockHeader, StateReference } from '@aztec/stdlib/tx';
+import type { WorldStateRevision } from '@aztec/stdlib/world-state';
+/**
+ * Wraps an instance of `MerkleTreeWriteOperations` to allow the sequencer to gate access.
+ * If transactions execution goes past the deadline, the simulator will continue to execute and update the world state
+ * The public processor however requires that the world state remain constant after the deadline in order to finalize the block
+ * The public processor provides this implementation of MerkleTreeWriteOperations to the simulator
+ */
+export declare class GuardedMerkleTreeOperations implements MerkleTreeWriteOperations {
+    private target;
+    private isStopped;
+    private serialQueue;
+    constructor(target: MerkleTreeWriteOperations);
+    private guard;
+    private guardAndPush;
+    getUnderlyingFork(): MerkleTreeWriteOperations;
+    stop(): Promise<void>;
+    appendLeaves<ID extends MerkleTreeId>(treeId: ID, leaves: MerkleTreeLeafType<ID>[]): Promise<void>;
+    updateArchive(header: BlockHeader): Promise<void>;
+    batchInsert<TreeHeight extends number, SubtreeSiblingPathHeight extends number, ID extends IndexedTreeId>(treeId: ID, leaves: Buffer[], subtreeHeight: number): Promise<BatchInsertionResult<TreeHeight, SubtreeSiblingPathHeight>>;
+    sequentialInsert<TreeHeight extends number, ID extends IndexedTreeId>(treeId: ID, leaves: Buffer[]): Promise<SequentialInsertionResult<TreeHeight>>;
+    close(): Promise<void>;
+    getTreeInfo(treeId: MerkleTreeId): Promise<TreeInfo>;
+    getStateReference(): Promise<StateReference>;
+    getInitialHeader(): BlockHeader;
+    getRevision(): WorldStateRevision;
+    getSiblingPath<ID extends MerkleTreeId>(treeId: ID, index: bigint): Promise<SiblingPath<TreeHeights[ID]>>;
+    getPreviousValueIndex<ID extends IndexedTreeId>(treeId: ID, value: bigint): Promise<{
+        index: bigint;
+        alreadyPresent: boolean;
+    } | undefined>;
+    getLeafPreimage<ID extends IndexedTreeId>(treeId: ID, index: bigint): Promise<IndexedTreeLeafPreimage | undefined>;
+    findLeafIndices<ID extends MerkleTreeId>(treeId: ID, values: MerkleTreeLeafType<ID>[]): Promise<(bigint | undefined)[]>;
+    findLeafIndicesAfter<ID extends MerkleTreeId>(treeId: ID, values: MerkleTreeLeafType<ID>[], startIndex: bigint): Promise<(bigint | undefined)[]>;
+    getLeafValue<ID extends MerkleTreeId>(treeId: ID, index: bigint): Promise<MerkleTreeLeafType<typeof treeId> | undefined>;
+    getBlockNumbersForLeafIndices<ID extends MerkleTreeId>(treeId: ID, leafIndices: bigint[]): Promise<(bigint | undefined)[]>;
+    createCheckpoint(): Promise<void>;
+    commitCheckpoint(): Promise<void>;
+    revertCheckpoint(): Promise<void>;
+    commitAllCheckpoints(): Promise<void>;
+    revertAllCheckpoints(): Promise<void>;
+    findSiblingPaths<ID extends MerkleTreeId>(treeId: ID, values: MerkleTreeLeafType<ID>[]): Promise<({
+        path: SiblingPath<TreeHeights[ID]>;
+        index: bigint;
+    } | undefined)[]>;
+}
+//# sourceMappingURL=guarded_merkle_tree.d.ts.map

package/dest/public/public_processor/guarded_merkle_tree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"guarded_merkle_tree.d.ts","sourceRoot":"","sources":["../../../src/public/public_processor/guarded_merkle_tree.ts"],"names":[],"mappings":"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"}

package/dest/public/public_processor/guarded_merkle_tree.js

@@ -0,0 +1,108 @@
+import { SerialQueue } from '@aztec/foundation/queue';
+/**
+ * Wraps an instance of `MerkleTreeWriteOperations` to allow the sequencer to gate access.
+ * If transactions execution goes past the deadline, the simulator will continue to execute and update the world state
+ * The public processor however requires that the world state remain constant after the deadline in order to finalize the block
+ * The public processor provides this implementation of MerkleTreeWriteOperations to the simulator
+ */ export class GuardedMerkleTreeOperations {
+    target;
+    isStopped;
+    serialQueue;
+    constructor(target){
+        this.target = target;
+        this.isStopped = false;
+        this.serialQueue = new SerialQueue();
+        this.serialQueue.start();
+    }
+    guard() {
+        if (this.isStopped) {
+            throw new Error('Merkle tree access has been stopped');
+        }
+    }
+    // Executes the provided function only if the guard is not stopped.
+    guardAndPush(fn) {
+        this.guard();
+        return this.serialQueue.put(()=>{
+            this.guard();
+            return fn();
+        });
+    }
+    getUnderlyingFork() {
+        return this.target;
+    }
+    // Stops all further access to the merkle trees via this object
+    async stop() {
+        await this.serialQueue.put(()=>{
+            this.isStopped = true;
+            return Promise.resolve();
+        });
+        return this.serialQueue.end();
+    }
+    // Proxy all methods to the target
+    appendLeaves(treeId, leaves) {
+        return this.guardAndPush(()=>this.target.appendLeaves(treeId, leaves));
+    }
+    updateArchive(header) {
+        return this.guardAndPush(()=>this.target.updateArchive(header));
+    }
+    batchInsert(treeId, leaves, subtreeHeight) {
+        return this.guardAndPush(()=>this.target.batchInsert(treeId, leaves, subtreeHeight));
+    }
+    sequentialInsert(treeId, leaves) {
+        return this.guardAndPush(()=>this.target.sequentialInsert(treeId, leaves));
+    }
+    close() {
+        return this.guardAndPush(()=>this.target.close());
+    }
+    getTreeInfo(treeId) {
+        return this.guardAndPush(()=>this.target.getTreeInfo(treeId));
+    }
+    getStateReference() {
+        return this.guardAndPush(()=>this.target.getStateReference());
+    }
+    getInitialHeader() {
+        return this.target.getInitialHeader();
+    }
+    getRevision() {
+        return this.target.getRevision();
+    }
+    getSiblingPath(treeId, index) {
+        return this.guardAndPush(()=>this.target.getSiblingPath(treeId, index));
+    }
+    getPreviousValueIndex(treeId, value) {
+        return this.guardAndPush(()=>this.target.getPreviousValueIndex(treeId, value));
+    }
+    getLeafPreimage(treeId, index) {
+        return this.guardAndPush(()=>this.target.getLeafPreimage(treeId, index));
+    }
+    findLeafIndices(treeId, values) {
+        return this.guardAndPush(()=>this.target.findLeafIndices(treeId, values));
+    }
+    findLeafIndicesAfter(treeId, values, startIndex) {
+        return this.guardAndPush(()=>this.target.findLeafIndicesAfter(treeId, values, startIndex));
+    }
+    getLeafValue(treeId, index) {
+        return this.guardAndPush(()=>this.target.getLeafValue(treeId, index));
+    }
+    getBlockNumbersForLeafIndices(treeId, leafIndices) {
+        return this.guardAndPush(()=>this.target.getBlockNumbersForLeafIndices(treeId, leafIndices));
+    }
+    createCheckpoint() {
+        return this.guardAndPush(()=>this.target.createCheckpoint());
+    }
+    commitCheckpoint() {
+        return this.guardAndPush(()=>this.target.commitCheckpoint());
+    }
+    revertCheckpoint() {
+        return this.guardAndPush(()=>this.target.revertCheckpoint());
+    }
+    commitAllCheckpoints() {
+        return this.guardAndPush(()=>this.target.commitAllCheckpoints());
+    }
+    revertAllCheckpoints() {
+        return this.guardAndPush(()=>this.target.revertAllCheckpoints());
+    }
+    findSiblingPaths(treeId, values) {
+        return this.guardAndPush(()=>this.target.findSiblingPaths(treeId, values));
+    }
+}