@aztec/simulator 0.32.0 → 0.33.0

package/src/client/view_data_oracle.ts

@@ -1,21 +1,21 @@
 import {
-  AuthWitness,
-  AztecNode,
-  CompleteAddress,
+  type AuthWitness,
+  type AztecNode,
+  type CompleteAddress,
   MerkleTreeId,
-  NoteStatus,
-  NullifierMembershipWitness,
-  PublicDataWitness,
+  type NoteStatus,
+  type NullifierMembershipWitness,
+  type PublicDataWitness,
 } from '@aztec/circuit-types';
-import { Header } from '@aztec/circuits.js';
+import { type Header } from '@aztec/circuits.js';
 import { siloNullifier } from '@aztec/circuits.js/hash';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ContractInstance } from '@aztec/types/contracts';
+import { type ContractInstance } from '@aztec/types/contracts';
 
-import { NoteData, TypedOracle } from '../acvm/index.js';
-import { DBOracle } from './db_oracle.js';
+import { type NoteData, TypedOracle } from '../acvm/index.js';
+import { type DBOracle } from './db_oracle.js';
 import { pickNotes } from './pick_notes.js';
 
 /**

package/src/common/errors.ts

@@ -1,4 +1,4 @@
-import { FailingFunction, NoirCallStack, SimulationError } from '@aztec/circuit-types';
+import { type FailingFunction, type NoirCallStack, SimulationError } from '@aztec/circuit-types';
 
 /**
  * An error that occurred during the execution of a function.

package/src/public/db.ts

@@ -1,10 +1,10 @@
-import { NullifierMembershipWitness } from '@aztec/circuit-types';
-import { EthAddress, FunctionSelector, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
-import { Fr } from '@aztec/foundation/fields';
-import { ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { type NullifierMembershipWitness } from '@aztec/circuit-types';
+import { type EthAddress, type FunctionSelector, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { type Fr } from '@aztec/foundation/fields';
+import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { MessageLoadOracleInputs } from '../acvm/index.js';
+import { type MessageLoadOracleInputs } from '../acvm/index.js';
 
 /**
  * Database interface for providing access to public state.

package/src/public/execution.ts

@@ -1,16 +1,16 @@
-import { SimulationError, UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
+import { type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
 import {
-  AztecAddress,
-  ContractStorageRead,
-  ContractStorageUpdateRequest,
-  Fr,
-  L2ToL1Message,
-  PublicCallRequest,
+  type AztecAddress,
+  type ContractStorageRead,
+  type ContractStorageUpdateRequest,
+  type Fr,
+  type L2ToL1Message,
+  type PublicCallRequest,
   PublicDataRead,
   PublicDataUpdateRequest,
-  ReadRequest,
-  SideEffect,
-  SideEffectLinkedToNoteHash,
+  type ReadRequest,
+  type SideEffect,
+  type SideEffectLinkedToNoteHash,
 } from '@aztec/circuits.js';
 import { computePublicDataTreeLeafSlot, computePublicDataTreeValue } from '@aztec/circuits.js/hash';
 

package/src/public/executor.ts

@@ -1,5 +1,5 @@
 import { UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
-import { Fr, GlobalVariables, Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
+import { Fr, type GlobalVariables, type Header, PublicCircuitPublicInputs } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import { spawn } from 'child_process';
@@ -13,6 +13,7 @@ import { AvmSimulator } from '../avm/avm_simulator.js';
 import { HostStorage } from '../avm/journal/host_storage.js';
 import { AvmPersistableStateManager } from '../avm/journal/index.js';
 import {
+  isAvmBytecode,
   temporaryConvertAvmResults,
   temporaryCreateAvmExecutionEnvironment,
 } from '../avm/temporary_executor_migration.js';
@@ -20,8 +21,8 @@ import { AcirSimulator } from '../client/simulator.js';
 import { ExecutionError, createSimulationError } from '../common/errors.js';
 import { SideEffectCounter } from '../common/index.js';
 import { PackedArgsCache } from '../common/packed_args_cache.js';
-import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
-import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js';
+import { type PublicExecution, type PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { PublicExecutionContext } from './public_execution_context.js';
 
 /**
@@ -166,6 +167,7 @@ export class PublicExecutor {
     private readonly header: Header,
   ) {}
 
+  private readonly log = createDebugLogger('aztec:simulator:public_executor');
   /**
    * Executes a public execution request.
    * @param execution - The execution to run.
@@ -176,6 +178,30 @@ export class PublicExecutor {
     execution: PublicExecution,
     globalVariables: GlobalVariables,
     sideEffectCounter: number = 0,
+  ): Promise<PublicExecutionResult> {
+    const selector = execution.functionData.selector;
+    const bytecode = await this.contractsDb.getBytecode(execution.contractAddress, selector);
+    if (!bytecode) {
+      throw new Error(`Bytecode not found for ${execution.contractAddress}:${selector}`);
+    }
+
+    if (isAvmBytecode(bytecode)) {
+      return await this.simulateAvm(execution, globalVariables, sideEffectCounter);
+    } else {
+      return await this.simulateAcvm(execution, globalVariables, sideEffectCounter);
+    }
+  }
+
+  /**
+   * Executes a public execution request with the ACVM.
+   * @param execution - The execution to run.
+   * @param globalVariables - The global variables to use.
+   * @returns The result of the run plus all nested runs.
+   */
+  private async simulateAcvm(
+    execution: PublicExecution,
+    globalVariables: GlobalVariables,
+    sideEffectCounter: number = 0,
   ): Promise<PublicExecutionResult> {
     const selector = execution.functionData.selector;
     const acir = await this.contractsDb.getBytecode(execution.contractAddress, selector);
@@ -214,12 +240,12 @@ export class PublicExecutor {
   }
 
   /**
-   * Executes a public execution request in the avm.
+   * Executes a public execution request in the AVM.
    * @param execution - The execution to run.
    * @param globalVariables - The global variables to use.
    * @returns The result of the run plus all nested runs.
    */
-  public async simulateAvm(
+  private async simulateAvm(
     execution: PublicExecution,
     globalVariables: GlobalVariables,
     _sideEffectCounter = 0,
@@ -230,13 +256,14 @@ export class PublicExecutor {
     const worldStateJournal = new AvmPersistableStateManager(hostStorage);
     const executionEnv = temporaryCreateAvmExecutionEnvironment(execution, globalVariables);
     // TODO(@spalladino) Load initial gas from the public execution request
-    const machineState = new AvmMachineState(100_000, 100_000, 100_000);
+    const machineState = new AvmMachineState(1e10, 1e10, 1e10);
 
     const context = new AvmContext(worldStateJournal, executionEnv, machineState);
     const simulator = new AvmSimulator(context);
 
     const result = await simulator.execute();
     const newWorldState = context.persistableState.flush();
+
     // TODO(@spalladino) Read gas left from machineState and return it
     return temporaryConvertAvmResults(execution, newWorldState, result);
   }
@@ -260,6 +287,7 @@ export class PublicExecutor {
     const artifactsPath = path.resolve('target');
 
     // Create the directory if it does not exist
+    await fs.rm(artifactsPath, { recursive: true, force: true });
     await fs.mkdir(artifactsPath, { recursive: true });
 
     const calldataPath = path.join(artifactsPath, 'calldata.bin');
@@ -269,34 +297,54 @@ export class PublicExecutor {
     const { args, functionData, contractAddress } = avmExecution;
     const bytecode = await this.contractsDb.getBytecode(contractAddress, functionData.selector);
     // Write call data and bytecode to files.
-    await Promise.all([
-      fs.writeFile(
-        calldataPath,
-        args.map(c => c.toBuffer()),
-      ),
-      fs.writeFile(bytecodePath, bytecode!),
-    ]);
-
-    const bbBinary = spawn(path.join(bbPath, 'build', 'bin', 'bb'), [
-      'avm_prove',
-      '-b',
-      bytecodePath,
-      '-d',
+    await fs.writeFile(
       calldataPath,
-      '-o',
-      proofPath,
-    ]);
+      args.map(c => c.toBuffer()),
+    );
+    await fs.writeFile(bytecodePath, bytecode!);
+
+    const bbExec = path.join(bbPath, 'build', 'bin', 'bb');
+    const bbArgs = ['avm_prove', '-b', bytecodePath, '-d', calldataPath, '-o', proofPath];
+    this.log(`calling '${bbExec} ${bbArgs.join(' ')}'`);
+    const bbBinary = spawn(bbExec, bbArgs);
+
     // The binary writes the proof and the verification key to the write path.
     return new Promise((resolve, reject) => {
+      let stdout: string = '';
+      let stderr: string = '';
+
       bbBinary.on('close', () => {
-        resolve(Promise.all([fs.readFile(proofPath), fs.readFile(path.join(artifactsPath, 'vk'))]));
+        this.log(`Proof generation complete. Reading proof and vk from ${proofPath}.`);
+        return resolve(Promise.all([fs.readFile(proofPath), fs.readFile(path.join(artifactsPath, 'vk'))]));
+      });
+
+      // Catch stdout.
+      bbBinary.stdout.on('data', (data: Buffer) => {
+        stdout += data.toString();
       });
+      bbBinary.stdout.on('end', () => {
+        if (stdout.length > 0) {
+          this.log(`stdout: ${stdout}`);
+        }
+      });
+
+      // Catch stderr.
+      bbBinary.stderr.on('data', (data: Buffer) => {
+        stderr += data.toString();
+      });
+      bbBinary.stderr.on('end', () => {
+        if (stderr.length > 0) {
+          this.log(`stderr: ${stderr}`);
+        }
+      });
+
       // Catch and propagate errors from spawning
       bbBinary.on('error', err => {
         reject(err);
       });
     });
   }
+
   /**
    * Verifies an AVM proof. This function is currently only used for testing purposes, as verification
    * is not fully complete in the AVM yet.
@@ -313,9 +361,14 @@ export class PublicExecutor {
     const proofPath = path.join(artifactsPath, 'proof');
 
     // Write the verification key and the proof to files.
-    await Promise.all([fs.writeFile(vkPath, vk), fs.writeFile(proofPath, proof)]);
+    await fs.writeFile(vkPath, vk);
+    await fs.writeFile(proofPath, proof);
+
+    const bbExec = path.join(bbPath, 'build', 'bin', 'bb');
+    const bbArgs = ['avm_verify', '-p', proofPath];
+    this.log(`calling '${bbPath} ${bbArgs.join(' ')}'`);
+    const bbBinary = spawn(bbExec, bbArgs);
 
-    const bbBinary = spawn(path.join(bbPath, 'build', 'bin', 'bb'), ['avm_verify', '-p', proofPath]);
     // The binary prints to stdout 1 if the proof is valid and 0 if it is not.
     return new Promise((resolve, reject) => {
       let result = Buffer.alloc(0);

package/src/public/index.ts

@@ -1,7 +1,7 @@
 export * from './db.js';
 export {
-  PublicExecution,
-  PublicExecutionResult,
+  type PublicExecution,
+  type PublicExecutionResult,
   isPublicExecutionResult,
   collectPublicDataReads,
   collectPublicDataUpdateRequests,

package/src/public/public_execution_context.ts

@@ -1,15 +1,25 @@
-import { NullifierMembershipWitness, UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
-import { CallContext, FunctionData, FunctionSelector, GlobalVariables, Header } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import {
+  type NullifierMembershipWitness,
+  UnencryptedFunctionL2Logs,
+  type UnencryptedL2Log,
+} from '@aztec/circuit-types';
+import {
+  CallContext,
+  FunctionData,
+  type FunctionSelector,
+  type GlobalVariables,
+  type Header,
+} from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { ContractInstance } from '@aztec/types/contracts';
+import { type ContractInstance } from '@aztec/types/contracts';
 
 import { TypedOracle, toACVMWitness } from '../acvm/index.js';
-import { PackedArgsCache, SideEffectCounter } from '../common/index.js';
-import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
-import { PublicExecution, PublicExecutionResult, checkValidStaticCall } from './execution.js';
+import { type PackedArgsCache, type SideEffectCounter } from '../common/index.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js';
+import { type PublicExecution, type PublicExecutionResult, checkValidStaticCall } from './execution.js';
 import { executePublicFunction } from './executor.js';
 import { ContractStorageActionsCollector } from './state_actions.js';
 

package/src/public/state_actions.ts

@@ -1,8 +1,8 @@
 import { ContractStorageRead, ContractStorageUpdateRequest } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
-import { PublicStateDB } from './db.js';
+import { type PublicStateDB } from './db.js';
 
 /**
  * Implements read/write operations on a contract public storage, collecting

package/src/simulator/acvm_native.ts

@@ -1,11 +1,11 @@
 import { randomBytes } from '@aztec/foundation/crypto';
-import { NoirCompiledCircuit } from '@aztec/types/noir';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
-import { WitnessMap } from '@noir-lang/types';
+import { type WitnessMap } from '@noir-lang/types';
 import * as proc from 'child_process';
 import fs from 'fs/promises';
 
-import { SimulationProvider } from './simulation_provider.js';
+import { type SimulationProvider } from './simulation_provider.js';
 
 /**
  * Parses a TOML format witness map string into a Map structure

package/src/simulator/acvm_wasm.ts

@@ -1,9 +1,13 @@
-import { NoirCompiledCircuit } from '@aztec/types/noir';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
-import { WasmBlackBoxFunctionSolver, createBlackBoxSolver, executeCircuitWithBlackBoxSolver } from '@noir-lang/acvm_js';
-import { WitnessMap } from '@noir-lang/types';
+import {
+  type WasmBlackBoxFunctionSolver,
+  createBlackBoxSolver,
+  executeCircuitWithBlackBoxSolver,
+} from '@noir-lang/acvm_js';
+import { type WitnessMap } from '@noir-lang/types';
 
-import { SimulationProvider } from './simulation_provider.js';
+import { type SimulationProvider } from './simulation_provider.js';
 
 let solver: Promise<WasmBlackBoxFunctionSolver>;
 

package/src/simulator/simulation_provider.ts

@@ -1,6 +1,6 @@
-import { NoirCompiledCircuit } from '@aztec/types/noir';
+import { type NoirCompiledCircuit } from '@aztec/types/noir';
 
-import { WitnessMap } from '@noir-lang/types';
+import { type WitnessMap } from '@noir-lang/types';
 
 /**
  * Low level simulation interface

package/src/test/utils.ts

@@ -1,5 +1,5 @@
 import { L1Actor, L1ToL2Message, L2Actor } from '@aztec/circuit-types';
-import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
+import { type AztecAddress, EthAddress, type Fr } from '@aztec/circuits.js';
 import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
 import { sha256ToField } from '@aztec/foundation/crypto';
 

package/src/utils.ts

@@ -1,5 +1,5 @@
 import { pedersenHash } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { type Fr } from '@aztec/foundation/fields';
 
 /**
  * Computes the resulting storage slot for an entry in a mapping.

package/dest/acvm/oracle/debug.d.ts

@@ -1,19 +0,0 @@
-import { ForeignCallInput } from '@noir-lang/acvm_js';
-import { ACVMField } from '../acvm_types.js';
-/**
- * Convert an array of ACVMFields to a string.
- *
- * @param msg - array of ACVMFields where each represents a single ascii character
- * @returns string representation of the message
- */
-export declare function acvmFieldMessageToString(msg: ACVMField[]): string;
-/**
- * Convert an array of ACVMFields from ACVM to a formatted string.
- *
- * @param parameters - either one parameter representing a simple field or array, or two parameters when
- * It's a message without args or three parameters when it's a message with arguments.
- *
- * @returns formatted string
- */
-export declare function oracleDebugCallToFormattedStr(parameters: ForeignCallInput[]): string;
-//# sourceMappingURL=debug.d.ts.map

package/dest/acvm/oracle/debug.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/acvm/oracle/debug.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAajE;AAyBD;;;;;;;GAOG;AACH,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAcpF"}

package/dest/acvm/oracle/debug.js

@@ -1,95 +0,0 @@
-/**
- * Convert an array of ACVMFields to a string.
- *
- * @param msg - array of ACVMFields where each represents a single ascii character
- * @returns string representation of the message
- */
-export function acvmFieldMessageToString(msg) {
-    let msgStr = '';
-    for (const msgChar of msg) {
-        const asciiCode = Number(msgChar);
-        const asciiChar = String.fromCharCode(asciiCode);
-        msgStr = msgStr.concat(asciiChar);
-    }
-    // cut off string in case of preemptive null termination
-    const nullCharIndex = msgStr.indexOf('\\0');
-    if (nullCharIndex >= 0) {
-        msgStr = msgStr.substring(0, nullCharIndex);
-    }
-    return msgStr.replaceAll('\\n', '\n').replaceAll('\\t', '\t');
-}
-/**
- * Format a debug string for Aztec.nr filling in `'{0}'` entries with their
- * corresponding values from the args array.
- *
- * @param formatStr - str of form `'this is a string with some entries like {0} and {1}'`
- * @param args - array of fields to fill in the string format entries with
- * @returns formatted string
- */
-function applyStringFormatting(formatStr, args) {
-    const matches = formatStr.match(/{\d+}/g);
-    if (matches == null) {
-        return formatStr;
-    }
-    // Get the numeric values within the curly braces, convert them to numbers,
-    // and find the maximum value.
-    const maxIndex = Math.max(...matches.map(match => Number(match.slice(1, -1))));
-    const argsPadded = args.concat(Array.from({ length: Math.max(0, maxIndex - args.length) }, () => '0xBAD'));
-    return formatStr.replace(/{(\d+)}/g, function (match, index) {
-        return typeof args[index] != 'undefined' ? argsPadded[index] : match;
-    });
-}
-/**
- * Convert an array of ACVMFields from ACVM to a formatted string.
- *
- * @param parameters - either one parameter representing a simple field or array, or two parameters when
- * It's a message without args or three parameters when it's a message with arguments.
- *
- * @returns formatted string
- */
-export function oracleDebugCallToFormattedStr(parameters) {
-    if (parameters.length === 1) {
-        return processFieldOrArray(parameters[0]);
-    }
-    let formatArgs = [];
-    if (parameters.length > 2) {
-        formatArgs = parameters[1];
-    }
-    const formattedMsg = applyStringFormatting(acvmFieldMessageToString(parameters[0]), formatArgs);
-    return formattedMsg;
-}
-/**
- * Processes a field or an array and returns a string representation.
- * @param fieldOrArray - The field or array to be processed.
- * @returns Returns the processed string representation of the field or array.
- */
-function processFieldOrArray(fieldOrArray) {
-    if (fieldOrArray.length === 1) {
-        return `${fieldOrArray[0]}`;
-    }
-    // Check if all the elements start with 63 zero bytes
-    // --> if yes, we have an array of bytes and we print as hex
-    if (onlyBytes(fieldOrArray)) {
-        const decimalArray = fieldOrArray.map(element => parseInt(element, 16));
-        return '0x' + Buffer.from(decimalArray).toString('hex');
-    }
-    return '[' + fieldOrArray.join(', ') + ']';
-}
-/**
- * Checks if all elements in the array are valid byte representations.
- * @param array - The array to be checked.
- * @returns Returns `true` if all elements are valid byte representations, `false` otherwise.
- * @throws Throws an error if any element has an invalid length.
- */
-function onlyBytes(array) {
-    for (const element of array) {
-        if (element.length != 66) {
-            throw new Error('Invalid element length. Expected 66 chars, got ' + element.length + ' chars.');
-        }
-        if (!element.startsWith('0x00000000000000000000000000000000000000000000000000000000000000')) {
-            return false;
-        }
-    }
-    return true;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYWN2bS9vcmFjbGUvZGVidWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUE7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsd0JBQXdCLENBQUMsR0FBZ0I7SUFDdkQsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLEtBQUssTUFBTSxPQUFPLElBQUksR0FBRyxFQUFFLENBQUM7UUFDMUIsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sU0FBUyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDakQsTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUNELHdEQUF3RDtJQUN4RCxNQUFNLGFBQWEsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzVDLElBQUksYUFBYSxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ3ZCLE1BQU0sR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBQ0QsT0FBTyxNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0FBQ2hFLENBQUM7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsU0FBUyxxQkFBcUIsQ0FBQyxTQUFpQixFQUFFLElBQWlCO0lBQ2pFLE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDMUMsSUFBSSxPQUFPLElBQUksSUFBSSxFQUFFLENBQUM7UUFDcEIsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUNELDJFQUEyRTtJQUMzRSw4QkFBOEI7SUFDOUIsTUFBTSxRQUFRLEdB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