@aztec/simulator 0.76.4 → 0.77.0-testnet-ignition.17

package/dest/public/public_db_sources.js

@@ -1,17 +1,22 @@
-import { ContractClassTxL2Logs, MerkleTreeId, NullifierMembershipWitness, } from '@aztec/circuit-types';
-import { Fr, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
-import { computeL1ToL2MessageNullifier, computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
+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 { MessageLoadOracleInputs } from '../common/message_load_oracle_inputs.js';
+import { PublicDataWrite } from '@aztec/stdlib/avm';
+import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
+import { MerkleTreeId } from '@aztec/stdlib/trees';
 /**
  * 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 +24,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 siloedLogs = await tx.filterContractClassLogs(tx.data.getNonEmptyContractClassLogsHashes(), true);
+        const contractClassRegisteredEvents = siloedLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).map((log)=>ContractClassRegisteredEvent.fromLog(log));
+        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
+   */ async 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 event = ContractClassRegisteredEvent.fromLog(log.data);
+        const contractClassLogs = onlyRevertible ? await tx.getSplitContractClassLogs(true, true) : tx.contractClassLogs;
+        contractClassLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).forEach((log)=>{
+            const event = ContractClassRegisteredEvent.fromLog(log);
             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
@@ -100,107 +88,56 @@ export class ContractsDataSourcePublicDB {
         this.bytecodeCommitmentCache.set(key, value);
         return value;
     }
-    async getBytecode(address, selector) {
-        const instance = await this.getContractInstance(address);
-        if (!instance) {
-            throw new Error(`Contract ${address.toString()} not found`);
-        }
-        const contractClass = await this.getContractClass(instance.contractClassId);
-        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;
-    }
     async getDebugFunctionName(address, selector) {
         return await this.dataSource.getContractFunctionName(address, selector);
     }
 }
 /**
  * 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;
+    constructor(db, dataSource){
+        super(dataSource), this.db = db, this.logger = createLogger('simulator:world-state-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) {
-        const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
-        const uncommitted = this.publicUncommittedWriteCache.get(leafSlot);
-        if (uncommitted !== undefined) {
-            return uncommitted;
-        }
-        const checkpointed = this.publicCheckpointedWriteCache.get(leafSlot);
-        if (checkpointed !== undefined) {
-            return checkpointed;
-        }
-        const committed = this.publicCommittedWriteCache.get(leafSlot);
-        if (committed !== undefined) {
-            return committed;
-        }
+   * 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);
     }
     /**
-     * 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];
-        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]);
-        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',
-        });
-        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];
-        if (messageIndex === undefined) {
-            throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
-        }
-        const messageNullifier = await computeL1ToL2MessageNullifier(contractAddress, messageHash, secret);
-        const nullifierIndex = await this.getNullifierIndex(messageNullifier);
-        if (nullifierIndex !== undefined) {
-            throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
-        }
-        const siblingPath = await this.db.getSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, messageIndex);
-        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',
-        });
-        return new MessageLoadOracleInputs(messageIndex, siblingPath);
+   * 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 leafSlot = await computePublicDataTreeLeafSlot(contract, slot);
+        const publicDataWrite = new PublicDataWrite(leafSlot, newValue);
+        await this.db.sequentialInsert(MerkleTreeId.PUBLIC_DATA_TREE, [
+            publicDataWrite.toBuffer()
+        ]);
     }
     async getL1ToL2LeafValue(leafIndex) {
         const timer = new Timer();
@@ -208,74 +145,32 @@ 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];
-        this.logger.debug(`[DB] Fetched commitment index`, {
-            eventName: 'public-db-access',
-            duration: timer.ms(),
-            operation: 'get-commitment-index',
-        });
-        return index;
-    }
     async getCommitmentValue(leafIndex) {
         const timer = new Timer();
         const leafValue = await this.db.getLeafValue(MerkleTreeId.NOTE_HASH_TREE, leafIndex);
         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) {
-            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) {
-            this.publicCommittedWriteCache.set(k, v);
-        }
-        return this.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) {
-            this.publicCheckpointedWriteCache.set(k, v);
-        }
-        return this.rollbackToCheckpoint();
-    }
-    rollbackToCheckpoint() {
-        this.publicUncommittedWriteCache = new Map();
-        return Promise.resolve();
-    }
 }
 export async function readPublicState(db, contract, slot) {
     const leafSlot = (await computePublicDataTreeLeafSlot(contract, slot)).toBigInt();
@@ -283,7 +178,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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"}

package/dest/public/public_processor.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import { type FailedTx, type MerkleTreeWriteOperations, NestedProcessReturnValues, type ProcessedTx, Tx, type TxValidator } from '@aztec/circuit-types';
-import { type ContractDataSource, Gas, type GlobalVariables } from '@aztec/circuits.js';
 import { type DateProvider } from '@aztec/foundation/timer';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import { Gas } from '@aztec/stdlib/gas';
+import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
+import { type FailedTx, GlobalVariables, NestedProcessReturnValues, type ProcessedTx, Tx, type TxValidator } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { WorldStateDB } from './public_db_sources.js';
 import { PublicTxSimulator } from './public_tx_simulator.js';
@@ -18,11 +20,11 @@ export declare class PublicProcessorFactory {
      * Creates a new instance of a PublicProcessor.
      * @param historicalHeader - The header of a block previous to the one in which the tx is included.
      * @param globalVariables - The global variables for the block being processed.
-     * @param enforceFeePayment - Allows disabling balance checks for fee estimations.
+     * @param skipFeeEnforcement - Allows disabling balance checks for fee estimations.
      * @returns A new instance of a PublicProcessor.
      */
-    create(merkleTree: MerkleTreeWriteOperations, globalVariables: GlobalVariables, enforceFeePayment: boolean): PublicProcessor;
-    protected createPublicTxSimulator(db: MerkleTreeWriteOperations, worldStateDB: WorldStateDB, globalVariables: GlobalVariables, doMerkleOperations: boolean, enforceFeePayment: boolean, telemetryClient: TelemetryClient): PublicTxSimulator;
+    create(merkleTree: MerkleTreeWriteOperations, globalVariables: GlobalVariables, skipFeeEnforcement: boolean): PublicProcessor;
+    protected createPublicTxSimulator(db: MerkleTreeWriteOperations, worldStateDB: WorldStateDB, globalVariables: GlobalVariables, doMerkleOperations: boolean, skipFeeEnforcement: boolean, telemetryClient: TelemetryClient): PublicTxSimulator;
 }
 /**
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
@@ -57,7 +59,7 @@ export declare class PublicProcessor implements Traceable {
         };
     }): Promise<[ProcessedTx[], FailedTx[], NestedProcessReturnValues[]]>;
     private processTx;
-    private commitTxState;
+    private doTreeInsertionsForPrivateOnlyTx;
     /** Processes the given tx within deadline. Returns timeout if deadline is hit. */
     private processTxWithinDeadline;
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,yBAAyB,EAC9B,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,KAAK,kBAAkB,EAEvB,GAAG,EACH,KAAK,eAAe,EAKrB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAG5F,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAGjE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,iBAAiB,EAAE,OAAO,GACzB,eAAe;IAqBlB,SAAS,CAAC,uBAAuB,CAC/B,EAAE,EAAE,yBAAyB,EAC7B,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,iBAAiB,EAAE,OAAO,EAC1B,eAAe,EAAE,eAAe;CAWnC;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,EAAE,EAAE,yBAAyB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,EAAE,EAAE,yBAAyB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,UAAU,GAAE;QACV,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,oBAAoB,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;QAChD,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAgJtD,SAAS;YA2BT,aAAa;IAwC3B,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YA6B5B,oBAAoB;YAyBpB,wBAAwB;CA0CvC"}
+{"version":3,"file":"public_processor.d.ts","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,yBAAyB,CAAC;AAM5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAEjF,OAAO,EACL,KAAK,QAAQ,EACb,eAAe,EACf,yBAAyB,EACzB,KAAK,WAAW,EAChB,EAAE,EAEF,KAAK,WAAW,EAGjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAFf,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAGjE;;;;;;OAMG;IACI,MAAM,CACX,UAAU,EAAE,yBAAyB,EACrC,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,GAC1B,eAAe;IAqBlB,SAAS,CAAC,uBAAuB,CAC/B,EAAE,EAAE,yBAAyB,EAC7B,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,kBAAkB,EAAE,OAAO,EAC3B,kBAAkB,EAAE,OAAO,EAC3B,eAAe,EAAE,eAAe;CAWnC;AASD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAG7C,SAAS,CAAC,EAAE,EAAE,yBAAyB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe;IAC1C,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,OAAO,CAAC,YAAY;IAEpB,OAAO,CAAC,GAAG;IARb,OAAO,CAAC,OAAO,CAAyB;gBAE5B,EAAE,EAAE,yBAAyB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,iBAAiB,EAAE,iBAAiB,EACtC,YAAY,EAAE,YAAY,EAClC,eAAe,GAAE,eAAsC,EAC/C,GAAG,yCAA6C;IAK1D,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,OAAO,CAClB,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EACrC,MAAM,GAAE;QACN,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,QAAQ,CAAC,EAAE,IAAI,CAAC;KACZ,EACN,UAAU,GAAE;QACV,mBAAmB,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;QACtC,oBAAoB,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;QAChD,cAAc,CAAC,EAAE;YAAE,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;SAAE,CAAC;KAC/D,GACL,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;YAkKtD,SAAS;YA2BT,gCAAgC;IAyC9C,kFAAkF;YACpE,uBAAuB;IA+BrC;;;;OAIG;YACW,4BAA4B;YAwB5B,oBAAoB;YA6BpB,wBAAwB;CA8CvC"}