@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

package/dest/avm/journal/nullifiers.js

@@ -3,32 +3,26 @@ import { Fr } from '@aztec/foundation/fields';
  * A class to manage new nullifier staging and existence checks during a contract call's AVM simulation.
  * Maintains a siloed nullifier cache, and ensures that existence checks fall back to the correct source.
  * When a contract call completes, its cached nullifier set can be merged into its parent's.
- */
-export class NullifierManager {
-    constructor(
-    /** Reference to node storage. Checked on parent cache-miss. */
-    hostNullifiers, 
-    /** Cache of siloed nullifiers. */
-    cache = new Set(), 
-    /** Parent nullifier manager to fall back on */
-    parent) {
+ */ export class NullifierManager {
+    hostNullifiers;
+    cache;
+    parent;
+    constructor(/** Reference to node storage. Checked on parent cache-miss. */ hostNullifiers, /** Cache of siloed nullifiers. */ cache = new Set(), /** Parent nullifier manager to fall back on */ parent){
         this.hostNullifiers = hostNullifiers;
         this.cache = cache;
         this.parent = parent;
     }
     /**
-     * Create a new nullifiers manager forked from this one
-     */
-    fork() {
+   * Create a new nullifiers manager forked from this one
+   */ fork() {
         return new NullifierManager(this.hostNullifiers, new Set(), this);
     }
     /**
-     * Get a nullifier's existence in this' cache or parent's (recursively).
-     * DOES NOT CHECK HOST STORAGE!
-     * @param siloedNullifier - the nullifier to check for
-     * @returns exists: whether the nullifier exists in cache here or in parent's
-     */
-    checkExistsHereOrParent(siloedNullifier) {
+   * Get a nullifier's existence in this' cache or parent's (recursively).
+   * DOES NOT CHECK HOST STORAGE!
+   * @param siloedNullifier - the nullifier to check for
+   * @returns exists: whether the nullifier exists in cache here or in parent's
+   */ checkExistsHereOrParent(siloedNullifier) {
         // First check this cache
         let existsAsPending = this.cache.has(siloedNullifier.toBigInt());
         // Then try parent's nullifier cache
@@ -39,18 +33,17 @@ export class NullifierManager {
         return existsAsPending;
     }
     /**
-     * Get a nullifier's existence status.
-     * 1. Check cache.
-     * 2. Check parent cache.
-     * 3. Fall back to the host state.
-     * 4. Not found! Nullifier does not exist.
-     *
-     * @param siloedNullifier - the nullifier to check for
-     * @returns exists: whether the nullifier exists at all,
-     *          isPending: whether the nullifier was found in a cache,
-     *          leafIndex: the nullifier's leaf index if it exists and is not pending (comes from host state).
-     */
-    async checkExists(siloedNullifier) {
+   * Get a nullifier's existence status.
+   * 1. Check cache.
+   * 2. Check parent cache.
+   * 3. Fall back to the host state.
+   * 4. Not found! Nullifier does not exist.
+   *
+   * @param siloedNullifier - the nullifier to check for
+   * @returns exists: whether the nullifier exists at all,
+   *          isPending: whether the nullifier was found in a cache,
+   *          leafIndex: the nullifier's leaf index if it exists and is not pending (comes from host state).
+   */ async checkExists(siloedNullifier) {
         // Check this cache and parent's (recursively)
         const existsAsPending = this.checkExistsHereOrParent(siloedNullifier);
         // Finally try the host's Aztec state (a trip to the database)
@@ -62,38 +55,42 @@ export class NullifierManager {
         }
         const exists = existsAsPending || leafIndex !== undefined;
         leafIndex = leafIndex === undefined ? BigInt(0) : leafIndex;
-        return Promise.resolve([exists, existsAsPending, new Fr(leafIndex)]);
+        return Promise.resolve([
+            exists,
+            existsAsPending,
+            new Fr(leafIndex)
+        ]);
     }
     /**
-     * Stage a new nullifier (append it to the cache).
-     *
-     * @param siloedNullifier - the nullifier to stage
-     */
-    async append(siloedNullifier) {
-        const [exists, ,] = await this.checkExists(siloedNullifier);
+   * Stage a new nullifier (append it to the cache).
+   *
+   * @param siloedNullifier - the nullifier to stage
+   */ async append(siloedNullifier) {
+        const [exists] = await this.checkExists(siloedNullifier);
         if (exists) {
             throw new NullifierCollisionError(`Siloed nullifier ${siloedNullifier} already exists in parent cache or host.`);
         }
         this.cache.add(siloedNullifier.toBigInt());
     }
     /**
-     * Merges another nullifier cache into this one.
-     *
-     * @param incomingNullifiers - the incoming cached nullifiers to merge into this instance's
-     */
-    acceptAndMerge(incomingNullifiers) {
-        for (const incomingNullifier of incomingNullifiers.cache) {
+   * Merges another nullifier cache into this one.
+   *
+   * @param incomingNullifiers - the incoming cached nullifiers to merge into this instance's
+   */ acceptAndMerge(incomingNullifiers) {
+        for (const incomingNullifier of incomingNullifiers.cache){
             if (this.cache.has(incomingNullifier)) {
                 throw new NullifierCollisionError(`Failed to merge in fork's cached nullifiers. Siloed nullifier ${incomingNullifier} already exists in parent cache.`);
             }
         }
-        this.cache = new Set([...this.cache, ...incomingNullifiers.cache]);
+        this.cache = new Set([
+            ...this.cache,
+            ...incomingNullifiers.cache
+        ]);
     }
 }
 export class NullifierCollisionError extends Error {
-    constructor(message, ...rest) {
+    constructor(message, ...rest){
         super(message, ...rest);
         this.name = 'NullifierCollisionError';
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vam91cm5hbC9udWxsaWZpZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUk5Qzs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLGdCQUFnQjtJQUMzQjtJQUNFLCtEQUErRDtJQUM5QyxjQUE2QjtJQUM5QyxrQ0FBa0M7SUFDMUIsUUFBcUIsSUFBSSxHQUFHLEVBQUU7SUFDdEMsK0NBQStDO0lBQzlCLE1BQXlCO1FBSnpCLG1CQUFjLEdBQWQsY0FBYyxDQUFlO1FBRXRDLFVBQUssR0FBTCxLQUFLLENBQXlCO1FBRXJCLFdBQU0sR0FBTixNQUFNLENBQW1CO0lBQ3pDLENBQUM7SUFFSjs7T0FFRztJQUNJLElBQUk7UUFDVCxPQUFPLElBQUksZ0JBQWdCLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxJQUFJLEdBQUcsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNLLHVCQUF1QixDQUFDLGVBQW1CO1FBQ2pELHlCQUF5QjtRQUN6QixJQUFJLGVBQWUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUNqRSxvQ0FBb0M7UUFDcEMsSUFBSSxDQUFDLGVBQWUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDcEMsK0VBQStFO1lBQy9FLGVBQWUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDSSxLQUFLLENBQUMsV0FBVyxDQUN0QixlQUFtQjtRQUVuQiw4Q0FBOEM7UUFDOUMsTUFBTSxlQUFlLEdBQUcsSUFBSSxDQUFDLHVCQUF1QixDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ3RFLDhEQUE4RDtRQUM5RCxrRkFBa0Y7UUFDbEYsSUFBSSxTQUFTLEdBQXVCLFNBQVMsQ0FBQztRQUM5QyxJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDckIsbUVBQW1FO1lBQ25FLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsaUJBQWlCLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDM0UsQ0FBQztRQUNELE1BQU0sTUFBTSxHQUFHLGVBQWUsSUFBSSxTQUFTLEtBQUssU0FBUyxDQUFDO1FBQzFELFNBQVMsR0FBRyxTQUFTLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUM1RCxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxNQUFNLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2RSxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLEtBQUssQ0FBQyxNQUFNLENBQUMsZUFBbUI7UUFDckMsTUFBTSxDQUFDLE1BQU0sRUFBRSxBQUFELEVBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDNUQsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLE1BQU0sSUFBSSx1QkFBdUIsQ0FBQyxvQkFBb0IsZUFBZSwwQ0FBMEMsQ0FBQyxDQUFDO1FBQ25ILENBQUM7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLGNBQWMsQ0FBQyxrQkFBb0M7UUFDeEQsS0FBSyxNQUFNLGlCQUFpQixJQUFJLGtCQUFrQixDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ3pELElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsRUFBRSxDQUFDO2dCQUN0QyxNQUFNLElBQUksdUJBQXVCLENBQy9CLGlFQUFpRSxpQkFBaUIsa0NBQWtDLENBQ3JILENBQUM7WUFDSixDQUFDO1FBQ0gsQ0FBQztRQUNELElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQUUsR0FBRyxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3JFLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyx1QkFBd0IsU0FBUSxLQUFLO0lBQ2hELFlBQVksT0FBZSxFQUFFLEdBQUcsSUFBVztRQUN6QyxLQUFLLENBQUMsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7UUFDeEIsSUFBSSxDQUFDLElBQUksR0FBRyx5QkFBeUIsQ0FBQztJQUN4QyxDQUFDO0NBQ0YifQ==

package/dest/avm/journal/public_storage.js

@@ -3,32 +3,28 @@ import { Fr } from '@aztec/foundation/fields';
  * A class to manage public storage reads and writes during a contract call's AVM simulation.
  * Maintains a storage write cache, and ensures that reads fall back to the correct source.
  * When a contract call completes, its storage cache can be merged into its parent's.
- */
-export class PublicStorage {
-    constructor(
-    /** Reference to node storage. Checked on parent cache-miss. */
-    hostPublicStorage, 
-    /** Parent's storage. Checked on this' cache-miss. */
-    parent) {
+ */ export class PublicStorage {
+    hostPublicStorage;
+    parent;
+    /** Cached storage writes. */ cache;
+    constructor(/** Reference to node storage. Checked on parent cache-miss. */ hostPublicStorage, /** Parent's storage. Checked on this' cache-miss. */ parent){
         this.hostPublicStorage = hostPublicStorage;
         this.parent = parent;
         this.cache = new PublicStorageCache();
     }
     /**
-     * Create a new public storage manager forked from this one
-     */
-    fork() {
+   * Create a new public storage manager forked from this one
+   */ fork() {
         return new PublicStorage(this.hostPublicStorage, this);
     }
     /**
-     * Read a storage value from this' cache or parent's (recursively).
-     * DOES NOT CHECK HOST STORAGE!
-     *
-     * @param contractAddress - the address of the contract whose storage is being read from
-     * @param slot - the slot in the contract's storage being read from
-     * @returns value: the latest value written according to this cache or the parent's. undefined on cache miss.
-     */
-    readHereOrParent(contractAddress, slot) {
+   * Read a storage value from this' cache or parent's (recursively).
+   * DOES NOT CHECK HOST STORAGE!
+   *
+   * @param contractAddress - the address of the contract whose storage is being read from
+   * @param slot - the slot in the contract's storage being read from
+   * @returns value: the latest value written according to this cache or the parent's. undefined on cache miss.
+   */ readHereOrParent(contractAddress, slot) {
         // First try check this storage cache
         let value = this.cache.read(contractAddress, slot);
         // Then try parent's storage cache
@@ -39,17 +35,16 @@ export class PublicStorage {
         return value;
     }
     /**
-     * Read a value from storage.
-     * 1. Check cache.
-     * 2. Check parent cache.
-     * 3. Fall back to the host state.
-     * 4. Not found! Value has never been written to before. Flag it as non-existent and return value zero.
-     *
-     * @param contractAddress - the address of the contract whose storage is being read from
-     * @param slot - the slot in the contract's storage being read from
-     * @returns exists: whether the slot has EVER been written to before, value: the latest value written to slot, or 0 if never written to before
-     */
-    async read(contractAddress, slot) {
+   * Read a value from storage.
+   * 1. Check cache.
+   * 2. Check parent cache.
+   * 3. Fall back to the host state.
+   * 4. Not found! Value has never been written to before. Flag it as non-existent and return value zero.
+   *
+   * @param contractAddress - the address of the contract whose storage is being read from
+   * @param slot - the slot in the contract's storage being read from
+   * @returns exists: whether the slot has EVER been written to before, value: the latest value written to slot, or 0 if never written to before
+   */ async read(contractAddress, slot) {
         let cached = false;
         // Check this cache and parent's (recursively)
         let value = this.readHereOrParent(contractAddress, slot);
@@ -57,33 +52,33 @@ export class PublicStorage {
         if (!value) {
             // This functions returns Fr.ZERO if it has never been written to before
             // we explicity coalesce to Fr.ZERO in case we have some implementations that cause this to return undefined
-            value = (await this.hostPublicStorage.storageRead(contractAddress, slot)) ?? Fr.ZERO;
-            // TODO(dbanks12): if value retrieved from host storage, we can cache it here
-            // any future reads to the same slot can read from cache instead of more expensive
-            // DB access
-        }
-        else {
+            value = await this.hostPublicStorage.storageRead(contractAddress, slot) ?? Fr.ZERO;
+        // TODO(dbanks12): if value retrieved from host storage, we can cache it here
+        // any future reads to the same slot can read from cache instead of more expensive
+        // DB access
+        } else {
             cached = true;
         }
         // if value is Fr.ZERO here, it that means this slot has never been written to!
-        return Promise.resolve({ value, cached });
+        return Promise.resolve({
+            value,
+            cached
+        });
     }
     /**
-     * Stage a storage write.
-     *
-     * @param contractAddress - the address of the contract whose storage is being written to
-     * @param slot - the slot in the contract's storage being written to
-     * @param value - the value being written to the slot
-     */
-    write(contractAddress, slot, value) {
+   * Stage a storage write.
+   *
+   * @param contractAddress - the address of the contract whose storage is being written to
+   * @param slot - the slot in the contract's storage being written to
+   * @param value - the value being written to the slot
+   */ write(contractAddress, slot, value) {
         this.cache.write(contractAddress, slot, value);
     }
     /**
-     * Merges another PublicStorage's cache (pending writes) into this one.
-     *
-     * @param incomingPublicStorage - the incoming public storage to merge into this instance's
-     */
-    acceptAndMerge(incomingPublicStorage) {
+   * Merges another PublicStorage's cache (pending writes) into this one.
+   *
+   * @param incomingPublicStorage - the incoming public storage to merge into this instance's
+   */ acceptAndMerge(incomingPublicStorage) {
         this.cache.acceptAndMerge(incomingPublicStorage.cache);
     }
 }
@@ -91,34 +86,28 @@ export class PublicStorage {
  * A class to cache writes to public storage during a contract call's AVM simulation.
  * "Writes" update a map, "reads" check that map or return undefined.
  * An instance of this class can merge another instance's staged writes into its own.
- */
-class PublicStorageCache {
-    constructor() {
-        /**
-         * Map for staging storage writes.
-         * One inner-map per contract storage address,
-         * mapping storage slot to latest staged write value.
-         */
-        this.cachePerContract = new Map();
-    }
+ */ class PublicStorageCache {
     /**
-     * Read a staged value from storage, if it has been previously written to.
-     *
-     * @param contractAddress - the address of the contract whose storage is being read from
-     * @param slot - the slot in the contract's storage being read from
-     * @returns the latest value written to slot, or undefined if no value has been written
-     */
-    read(contractAddress, slot) {
+   * Map for staging storage writes.
+   * One inner-map per contract storage address,
+   * mapping storage slot to latest staged write value.
+   */ cachePerContract = new Map();
+    /**
+   * Read a staged value from storage, if it has been previously written to.
+   *
+   * @param contractAddress - the address of the contract whose storage is being read from
+   * @param slot - the slot in the contract's storage being read from
+   * @returns the latest value written to slot, or undefined if no value has been written
+   */ read(contractAddress, slot) {
         return this.cachePerContract.get(contractAddress.toBigInt())?.get(slot.toBigInt());
     }
     /**
-     * Stage a storage write.
-     *
-     * @param contractAddress - the address of the contract whose storage is being written to
-     * @param slot - the slot in the contract's storage being written to
-     * @param value - the value being written to the slot
-     */
-    write(contractAddress, slot, value) {
+   * Stage a storage write.
+   *
+   * @param contractAddress - the address of the contract whose storage is being written to
+   * @param slot - the slot in the contract's storage being written to
+   * @param value - the value being written to the slot
+   */ write(contractAddress, slot, value) {
         let cacheAtContract = this.cachePerContract.get(contractAddress.toBigInt());
         if (!cacheAtContract) {
             // If this contract's storage has no staged modifications, create a new inner map to store them
@@ -128,32 +117,29 @@ class PublicStorageCache {
         cacheAtContract.set(slot.toBigInt(), value);
     }
     /**
-     * Merges another cache's staged writes into this instance's cache.
-     *
-     * Staged modifications in "incoming" take precedence over those
-     * present in "this" as they are assumed to occur after this' writes.
-     *
-     * In practice, "this" is a parent call's storage cache, and "incoming" is a nested call's.
-     *
-     * @param incomingStorageCache - the incoming storage write cache to merge into this instance's
-     */
-    acceptAndMerge(incomingStorageCache) {
+   * Merges another cache's staged writes into this instance's cache.
+   *
+   * Staged modifications in "incoming" take precedence over those
+   * present in "this" as they are assumed to occur after this' writes.
+   *
+   * In practice, "this" is a parent call's storage cache, and "incoming" is a nested call's.
+   *
+   * @param incomingStorageCache - the incoming storage write cache to merge into this instance's
+   */ acceptAndMerge(incomingStorageCache) {
         // Iterate over all incoming contracts with staged writes.
-        for (const [incomingAddress, incomingCacheAtContract] of incomingStorageCache.cachePerContract) {
+        for (const [incomingAddress, incomingCacheAtContract] of incomingStorageCache.cachePerContract){
             const thisCacheAtContract = this.cachePerContract.get(incomingAddress);
             if (!thisCacheAtContract) {
                 // The contract has no storage writes staged here
                 // so just accept the incoming cache as-is for this contract.
                 this.cachePerContract.set(incomingAddress, incomingCacheAtContract);
-            }
-            else {
+            } else {
                 // "Incoming" and "this" both have staged writes for this contract.
                 // Merge in incoming staged writes, giving them precedence over this'.
-                for (const [slot, value] of incomingCacheAtContract) {
+                for (const [slot, value] of incomingCacheAtContract){
                     thisCacheAtContract.set(slot, value);
                 }
             }
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljX3N0b3JhZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL2pvdXJuYWwvcHVibGljX3N0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBUzlDOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sYUFBYTtJQUl4QjtJQUNFLCtEQUErRDtJQUM5QyxpQkFBZ0M7SUFDakQscURBQXFEO0lBQ3BDLE1BQXNCO1FBRnRCLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBZTtRQUVoQyxXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUV2QyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksa0JBQWtCLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLGFBQWEsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxnQkFBZ0IsQ0FBQyxlQUE2QixFQUFFLElBQVE7UUFDN0QscUNBQXFDO1FBQ3JDLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUNuRCxrQ0FBa0M7UUFDbEMsSUFBSSxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDMUIsK0VBQStFO1lBQy9FLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsRUFBRSxJQUFJLENBQUMsQ0FBQztRQUM5RCxDQUFDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUQ7Ozs7Ozs7Ozs7T0FVRztJQUNJLEtBQUssQ0FBQyxJQUFJLENBQUMsZUFBNkIsRUFBRSxJQUFRO1FBQ3ZELElBQUksTUFBTSxHQUFHLEtBQUssQ0FBQztR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