@aztec/cli 0.1.0-alpha36 → 0.1.0-alpha38

package/src/index.ts

@@ -1,25 +1,29 @@
-#!/usr/bin/env -S node --no-warnings
 import {
   AztecAddress,
   Contract,
   ContractDeployer,
   Fr,
   Point,
-  createAccounts,
   createAztecRpcClient,
   generatePublicKey,
-  getAccountWallet,
+  getAccountWallets,
+  getSchnorrAccount,
+  isContractDeployed,
 } from '@aztec/aztec.js';
 import { StructType } from '@aztec/foundation/abi';
 import { JsonStringify } from '@aztec/foundation/json-rpc';
-import { createConsoleLogger, createDebugLogger } from '@aztec/foundation/log';
-import { SchnorrSingleKeyAccountContractAbi } from '@aztec/noir-contracts/artifacts';
-import { ContractData, L2BlockL2Logs, PrivateKey, TxHash } from '@aztec/types';
+import { DebugLogger, LogFn } from '@aztec/foundation/log';
+import { compileContract } from '@aztec/noir-compiler/cli';
+import { SchnorrAccountContractAbi } from '@aztec/noir-contracts/artifacts';
+import { CompleteAddress, ContractData, L2BlockL2Logs, PrivateKey, TxHash } from '@aztec/types';
 
 import { Command } from 'commander';
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
 import { mnemonicToAccount } from 'viem/accounts';
 
-import { encodeArgs, parseStructString } from './cli_encoder.js';
+import { encodeArgs, parseStructString } from './encoding.js';
 import {
   deployAztecContracts,
   getAbiFunction,
@@ -31,8 +35,6 @@ import {
 
 const accountCreationSalt = Fr.ZERO;
 
-const debugLogger = createDebugLogger('aztec:cli');
-const log = createConsoleLogger();
 const stripLeadingHex = (hex: string) => {
   if (hex.length > 2 && hex.startsWith('0x')) {
     return hex.substring(2);
@@ -40,16 +42,22 @@ const stripLeadingHex = (hex: string) => {
   return hex;
 };
 
-const program = new Command();
-
-program.name('aztec-cli').description('CLI for interacting with Aztec.').version('0.1.0');
-
-const { ETHEREUM_HOST, AZTEC_RPC_HOST, PRIVATE_KEY, PUBLIC_KEY, API_KEY } = process.env;
+const { ETHEREUM_HOST, AZTEC_RPC_HOST, PRIVATE_KEY, API_KEY } = process.env;
 
 /**
- * Main function for the Aztec CLI.
+ * Returns commander program that defines the CLI.
+ * @param log - Console logger.
+ * @param debugLogger - Debug logger.
+ * @returns The CLI.
  */
-async function main() {
+export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
+  const program = new Command();
+
+  const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
+  const version: string = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+
+  program.name('aztec-cli').description('CLI for interacting with Aztec.').version(version);
+
   program
     .command('deploy-l1-contracts')
     .description('Deploys all necessary Ethereum contracts for Aztec.')
@@ -97,7 +105,7 @@ async function main() {
         publicKey = await generatePublicKey(new PrivateKey(key));
       } else {
         const key = PrivateKey.random();
-        privKey = PrivateKey.random().toString();
+        privKey = key.toString();
         publicKey = await generatePublicKey(key);
       }
       log(`\nPrivate Key: ${privKey}\nPublic Key: ${publicKey.toString()}\n`);
@@ -105,27 +113,31 @@ async function main() {
 
   program
     .command('create-account')
-    .description('Creates an aztec account that can be used for transactions.')
+    .description(
+      'Creates an aztec account that can be used for sending transactions. Registers the account on the RPC server and deploys an account contract. Uses a Schnorr single-key account which uses the same key for encryption and authentication (not secure for production usage).',
+    )
+    .summary('Creates an aztec account that can be used for sending transactions.')
     .option(
       '-k, --private-key <string>',
-      'Private Key to use for the 1st account generation. Uses random by default.',
+      'Private key for note encryption and transaction signing. Uses random by default.',
       PRIVATE_KEY,
     )
     .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
     .action(async options => {
       const client = createAztecRpcClient(options.rpcUrl);
-      const privateKey = options.privateKey && Buffer.from(stripLeadingHex(options.privateKey), 'hex');
-      const wallet = await createAccounts(
-        client,
-        SchnorrSingleKeyAccountContractAbi,
-        privateKey && new PrivateKey(privateKey),
-        accountCreationSalt,
-        1,
-      );
-      const accounts = await wallet.getAccounts();
-      const pubKeys = await Promise.all(accounts.map(acc => wallet.getPublicKey(acc)));
-      log(`\nCreated account(s).`);
-      accounts.map((acc, i) => log(`\nAddress: ${acc.toString()}\nPublic Key: ${pubKeys[i].toString()}\n`));
+      const privateKey = options.privateKey
+        ? new PrivateKey(Buffer.from(stripLeadingHex(options.privateKey), 'hex'))
+        : PrivateKey.random();
+
+      const account = getSchnorrAccount(client, privateKey, privateKey, accountCreationSalt);
+      const wallet = await account.waitDeploy();
+      const { address, publicKey, partialAddress } = wallet.getCompleteAddress();
+
+      log(`\nCreated new account:\n`);
+      log(`Address:         ${address.toString()}`);
+      log(`Public key:      ${publicKey.toString()}`);
+      if (!options.privateKey) log(`Private key:     ${privateKey.toString()}`);
+      log(`Partial address: ${partialAddress.toString()}`);
     });
 
   program
@@ -140,40 +152,33 @@ async function main() {
     .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
     .option(
       '-k, --public-key <string>',
-      'Public key of the deployer. If not provided, it will check the RPC for existing ones.',
-      PUBLIC_KEY,
+      'Optional encryption public key for this address. Set this value only if this contract is expected to receive private notes, which will be encrypted using this public key.',
     )
+    .option('-s, --salt <string>', 'Optional deployment salt as a hex string for generating the deployment address.')
     .action(async (options: any) => {
       const contractAbi = await getContractAbi(options.contractAbi, log);
       const constructorAbi = contractAbi.functions.find(({ name }) => name === 'constructor');
 
       const client = createAztecRpcClient(options.rpcUrl);
-      let publicKey;
-      if (options.publicKey) {
-        publicKey = Point.fromString(options.publicKey);
-      } else {
-        const accounts = await client.getAccounts();
-        if (!accounts) {
-          throw new Error('No public key provided or found in Aztec RPC.');
-        }
-        publicKey = await client.getPublicKey(accounts[0]);
-      }
-
-      log(`Using Public Key: ${publicKey.toString()}`);
-
-      const deployer = new ContractDeployer(contractAbi, client);
+      const publicKey = options.publicKey ? Point.fromString(options.publicKey) : undefined;
+      const salt = options.salt ? Fr.fromBuffer(Buffer.from(stripLeadingHex(options.salt), 'hex')) : undefined;
+      const deployer = new ContractDeployer(contractAbi, client, publicKey);
 
       const constructor = getAbiFunction(contractAbi, 'constructor');
+      if (!constructor) throw new Error(`Constructor not found in contract ABI`);
       if (constructor.parameters.length !== options.args.length) {
-        throw Error(
-          `Invalid number of args passed. Expected ${constructor.parameters.length}; Received: ${options.args.length}`,
+        throw new Error(
+          `Invalid number of args passed (expected ${constructor.parameters.length} but got ${options.args.length})`,
         );
       }
 
-      const tx = deployer.deploy(...encodeArgs(options.args, constructorAbi!.parameters), publicKey.toBigInts()).send();
-      await tx.isMined();
-      const receipt = await tx.getReceipt();
-      log(`\nAztec Contract deployed at ${receipt.contractAddress?.toString()}\n`);
+      debugLogger(`Input arguments: ${options.args.map((x: any) => `"${x}"`).join(', ')}`);
+      const args = encodeArgs(options.args, constructorAbi!.parameters);
+      debugLogger(`Encoded arguments: ${args.join(', ')}`);
+      const tx = deployer.deploy(...args).send({ contractAddressSalt: salt });
+      debugLogger(`Deploy tx sent with hash ${await tx.getTxHash()}`);
+      const deployed = await tx.wait();
+      log(`\nContract deployed at ${deployed.contractAddress!.toString()}\n`);
     });
 
   program
@@ -184,13 +189,14 @@ async function main() {
     .action(async options => {
       const client = createAztecRpcClient(options.rpcUrl);
       const address = AztecAddress.fromString(options.contractAddress);
-      const isDeployed = await client.isContractDeployed(address);
-      log(`\n${isDeployed.toString()}\n`);
+      const isDeployed = await isContractDeployed(client, address);
+      if (isDeployed) log(`\nContract found at ${address.toString()}\n`);
+      else log(`\nNo contract found at ${address.toString()}\n`);
     });
 
   program
     .command('get-tx-receipt')
-    .argument('<txHash>', 'A TX hash to get the receipt for.')
+    .argument('<txHash>', 'A transaction hash to get the receipt for.')
     .description('Gets the receipt for the specified transaction hash.')
     .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
     .action(async (_txHash, options) => {
@@ -198,9 +204,9 @@ async function main() {
       const txHash = TxHash.fromString(_txHash);
       const receipt = await client.getTxReceipt(txHash);
       if (!receipt) {
-        log(`No receipt found for tx hash ${_txHash}`);
+        log(`No receipt found for transaction hash ${_txHash}`);
       } else {
-        log(`\nTX Receipt: \n${JsonStringify(receipt, true)}\n`);
+        log(`\nTransaction receipt: \n${JsonStringify(receipt, true)}\n`);
       }
     });
 
@@ -213,25 +219,25 @@ async function main() {
     .action(async (contractAddress, options) => {
       const client = createAztecRpcClient(options.rpcUrl);
       const address = AztecAddress.fromString(contractAddress);
-      const contractDataOrInfo = options.includeBytecode
-        ? await client.getContractData(address)
-        : await client.getContractInfo(address);
+      const contractDataWithOrWithoutBytecode = options.includeBytecode
+        ? await client.getContractDataAndBytecode(address)
+        : await client.getContractData(address);
 
-      if (!contractDataOrInfo) {
+      if (!contractDataWithOrWithoutBytecode) {
         log(`No contract data found at ${contractAddress}`);
         return;
       }
       let contractData: ContractData;
 
-      if ('contractData' in contractDataOrInfo) {
-        contractData = contractDataOrInfo.contractData;
+      if ('contractData' in contractDataWithOrWithoutBytecode) {
+        contractData = contractDataWithOrWithoutBytecode.contractData;
       } else {
-        contractData = contractDataOrInfo;
+        contractData = contractDataWithOrWithoutBytecode;
       }
       log(`\nContract Data: \nAddress: ${contractData.contractAddress.toString()}`);
-      log(`Portal: ${contractData.portalContractAddress.toString()}`);
-      if ('bytecode' in contractDataOrInfo) {
-        log(`Bytecode: ${contractDataOrInfo.bytecode}`);
+      log(`Portal:  ${contractData.portalContractAddress.toString()}`);
+      if ('bytecode' in contractDataWithOrWithoutBytecode) {
+        log(`Bytecode: ${contractDataWithOrWithoutBytecode.bytecode}`);
       }
       log('\n');
     });
@@ -239,23 +245,18 @@ async function main() {
   program
     .command('get-logs')
     .description('Gets all the unencrypted logs from L2 blocks in the range specified.')
-    .argument('<from>', 'Block num start for getting logs.')
-    .argument('<limit>', 'How many block logs to fetch.')
+    .option('-f, --from <blockNum>', 'Initial block number for getting logs (defaults to 1).')
+    .option('-l, --limit <blockCount>', 'How many blocks to fetch (defaults to 100).')
     .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
-    .action(async (_from, _take, options) => {
-      let from: number;
-      let limit: number;
-      try {
-        from = parseInt(_from);
-        limit = parseInt(_take);
-      } catch {
-        log(`Invalid integer value(s) passed: ${_from}, ${_take}`);
-        return;
-      }
+    .action(async options => {
+      const { from, limit } = options;
+      const fromBlock = from ? parseInt(from) : 1;
+      const limitCount = limit ? parseInt(limit) : 100;
+
       const client = createAztecRpcClient(options.rpcUrl);
-      const logs = await client.getUnencryptedLogs(from, limit);
+      const logs = await client.getUnencryptedLogs(fromBlock, limitCount);
       if (!logs.length) {
-        log(`No logs found in blocks ${from} to ${from + limit}`);
+        log(`No logs found in blocks ${fromBlock} to ${fromBlock + limitCount}`);
       } else {
         log('Logs found: \n');
         L2BlockL2Logs.unrollLogs(logs).forEach(fnLog => log(`${fnLog.toString('ascii')}\n`));
@@ -263,8 +264,8 @@ async function main() {
     });
 
   program
-    .command('register-public-key')
-    .description("Register an account's public key to the RPC server")
+    .command('register-recipient')
+    .description('Register a recipient in the Aztec RPC.')
     .option('-a, --address <aztecAddress>', "The account's Aztec address.")
     .option('-p, --public-key <publicKey>', 'The account public key.')
     .option('-pa, --partial-address <partialAddress', 'The partially computed address of the account contract.')
@@ -275,7 +276,7 @@ async function main() {
       const publicKey = Point.fromString(options.publicKey);
       const partialAddress = Fr.fromString(options.partialAddress);
 
-      await client.addPublicKeyAndPartialAddress(address, publicKey, partialAddress);
+      await client.registerRecipient(await CompleteAddress.create(address, publicKey, partialAddress));
       log(`\nRegistered details for Address: ${options.address}\n`);
     });
 
@@ -290,29 +291,60 @@ async function main() {
         log('No accounts found.');
       } else {
         log(`Accounts found: \n`);
-        for (const address of accounts) {
-          const [pk, partialAddress] = await client.getPublicKeyAndPartialAddress(address);
-          log(
-            `Address: ${address}\nPublic Key: ${pk.toString()}\nPartial Contract Address: ${partialAddress.toString()}\n`,
-          );
+        for (const account of accounts) {
+          log(account.toReadableString());
         }
       }
     });
 
   program
-    .command('get-account-public-key')
-    .description("Gets an account's public key, given its Aztec address.")
-    .argument('<address>', 'The Aztec address to get the public key for')
+    .command('get-account')
+    .description('Gets an account given its Aztec address.')
+    .argument('<address>', 'The Aztec address to get account for')
     .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
     .action(async (_address, options) => {
       const client = createAztecRpcClient(options.rpcUrl);
       const address = AztecAddress.fromString(_address);
-      const [pk, partialAddress] = await client.getPublicKeyAndPartialAddress(address);
+      const account = await client.getAccount(address);
 
-      if (!pk) {
-        log(`Unkown account ${_address}`);
+      if (!account) {
+        log(`Unknown account ${_address}`);
       } else {
-        log(`Public Key: \n ${pk.toString()}\nPartial Contract Address: ${partialAddress.toString()}\n`);
+        log(account.toReadableString());
+      }
+    });
+
+  program
+    .command('get-recipients')
+    .description('Gets all the recipients stored in the Aztec RPC.')
+    .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
+    .action(async (options: any) => {
+      const client = createAztecRpcClient(options.rpcUrl);
+      const recipients = await client.getRecipients();
+      if (!recipients.length) {
+        log('No recipients found.');
+      } else {
+        log(`Recipients found: \n`);
+        for (const recipient of recipients) {
+          log(recipient.toReadableString());
+        }
+      }
+    });
+
+  program
+    .command('get-recipient')
+    .description('Gets a recipient given its Aztec address.')
+    .argument('<address>', 'The Aztec address to get recipient for')
+    .option('-u, --rpc-url <string>', 'URL of the Aztec RPC', AZTEC_RPC_HOST || 'http://localhost:8080')
+    .action(async (_address, options) => {
+      const client = createAztecRpcClient(options.rpcUrl);
+      const address = AztecAddress.fromString(_address);
+      const recipient = await client.getRecipient(address);
+
+      if (!recipient) {
+        log(`Unknown recipient ${_address}`);
+      } else {
+        log(recipient.toReadableString());
       }
     });
 
@@ -346,22 +378,25 @@ async function main() {
         );
       }
 
+      const privateKey = new PrivateKey(Buffer.from(stripLeadingHex(options.privateKey), 'hex'));
+
       const client = createAztecRpcClient(options.rpcUrl);
-      const wallet = await getAccountWallet(
+      const wallet = await getAccountWallets(
         client,
-        SchnorrSingleKeyAccountContractAbi,
-        PrivateKey.fromString(options.privateKey),
-        accountCreationSalt,
+        SchnorrAccountContractAbi,
+        [privateKey],
+        [privateKey],
+        [accountCreationSalt],
       );
-      const contract = await Contract.create(contractAddress, contractAbi, wallet);
+      const contract = await Contract.at(contractAddress, contractAbi, wallet);
       const tx = contract.methods[functionName](...functionArgs).send();
       await tx.isMined();
-      log('\nTX has been mined');
+      log('\nTransaction has been mined');
       const receipt = await tx.getReceipt();
-      log(`TX Hash: ${(await tx.getTxHash()).toString()}`);
-      log(`Block Num: ${receipt.blockNumber}`);
-      log(`Block Hash: ${receipt.blockHash?.toString('hex')}`);
-      log(`TX Status: ${receipt.status}\n`);
+      log(`Transaction hash: ${(await tx.getTxHash()).toString()}`);
+      log(`Status: ${receipt.status}\n`);
+      log(`Block number: ${receipt.blockNumber}`);
+      log(`Block hash: ${receipt.blockHash?.toString('hex')}`);
     });
 
   program
@@ -396,7 +431,7 @@ async function main() {
       const client = createAztecRpcClient(options.rpcUrl);
       const from = await getTxSender(client, options.from);
       const result = await client.viewTx(functionName, functionArgs, contractAddress, from);
-      log('\nView TX result: ', JsonStringify(result, true), '\n');
+      log('\nView result: ', JsonStringify(result, true), '\n');
     });
 
   // Helper for users to decode hex strings into structs if needed
@@ -443,10 +478,7 @@ async function main() {
       names.forEach(name => log(name));
     });
 
-  await program.parseAsync(process.argv);
-}
+  compileContract(program, 'compile', log);
 
-main().catch(err => {
-  log(`Error thrown: ${err}`);
-  process.exit(1);
-});
+  return program;
+}

package/src/utils.ts

@@ -6,10 +6,10 @@ import { DebugLogger, LogFn } from '@aztec/foundation/log';
 import fs from 'fs';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
-import { encodeArgs } from './cli_encoder.js';
+import { encodeArgs } from './encoding.js';
 
 /**
- * Helper type to dynamically import contarcts.
+ * Helper type to dynamically import contracts.
  */
 interface ArtifactsType {
   [key: string]: ContractAbi;
@@ -105,9 +105,9 @@ export async function getTxSender(client: AztecRPC, _from?: string) {
   } else {
     const accounts = await client.getAccounts();
     if (!accounts.length) {
-      throw new Error('No accounts found in Aztec RPC insance.');
+      throw new Error('No accounts found in Aztec RPC instance.');
     }
-    from = accounts[0];
+    from = accounts[0].address;
   }
   return from;
 }

package/tsconfig.json

@@ -15,6 +15,9 @@
     {
       "path": "../foundation"
     },
+    {
+      "path": "../noir-compiler"
+    },
     {
       "path": "../noir-contracts"
     },

package/dest/cli_encoder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cli_encoder.d.ts","sourceRoot":"","sources":["../src/cli_encoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAW,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE1E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,OAcjE;AA8CD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,SAO7D"}

package/dest/cli_encoder.js

@@ -1,87 +0,0 @@
-import { Fr } from '@aztec/aztec.js';
-/**
- * Parses a hex string into an ABI struct type.
- * @param str - The encoded hex string.
- * @param abiType - The ABI Struct type.
- * @returns An object in the ABI struct type's format.
- */
-export function parseStructString(str, abiType) {
-    // Assing string bytes to struct fields.
-    const buf = Buffer.from(str.replace(/^0x/i, ''), 'hex');
-    const struct = {};
-    let byteIndex = 0;
-    let argIndex = 0;
-    while (byteIndex < buf.length) {
-        const { name } = abiType.fields[argIndex];
-        struct[name] = Fr.fromBuffer(buf.subarray(byteIndex, byteIndex + 32));
-        byteIndex += 32;
-        argIndex += 1;
-    }
-    return struct;
-}
-/**
- * Helper function to encode CLI string args to an appropriate JS type.
- * @param arg - The CLI argument.
- * @param abiType - The type as described by the contract's ABI.
- * @returns The encoded argument.
- */
-function encodeArg(arg, abiType) {
-    const { kind } = abiType;
-    if (kind === 'field' || kind === 'integer') {
-        return BigInt(arg);
-    }
-    else if (kind === 'boolean') {
-        if (arg === 'true')
-            return true;
-        if (arg === 'false')
-            return false;
-    }
-    else if (kind === 'array') {
-        let arr;
-        try {
-            arr = JSON.parse(arg);
-            if (!Array.isArray(arr))
-                throw Error();
-            for (let i = 0; i < abiType.length; i += 1) {
-                return encodeArg(arg[i], abiType.type);
-            }
-        }
-        catch {
-            throw new Error(`Unable to parse arg ${arg} as array`);
-        }
-    }
-    else if (kind === 'struct') {
-        // check if input is encoded long string
-        if (arg.startsWith('0x')) {
-            return parseStructString(arg, abiType);
-        }
-        let obj;
-        try {
-            obj = JSON.parse(arg);
-            if (Array.isArray(obj))
-                throw Error();
-            const res = [];
-            for (const field of abiType.fields) {
-                res.push(encodeArg(obj[field.name], field.type));
-            }
-            return res;
-        }
-        catch {
-            throw new Error(`Unable to parse arg ${arg} as struct`);
-        }
-    }
-}
-/**
- * Tries to encode function args to their equivalent TS type.
- * @param args - An array of function's / constructor's args.
- * @returns The encoded array.
- */
-export function encodeArgs(args, params) {
-    return args
-        .map((arg, index) => {
-        const paramType = params[index].type;
-        return encodeArg(arg, paramType);
-    })
-        .flat();
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpX2VuY29kZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpX2VuY29kZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBR3JDOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQixDQUFDLEdBQVcsRUFBRSxPQUFtQjtJQUNoRSx3Q0FBd0M7SUFDeEMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN4RCxNQUFNLE1BQU0sR0FBUSxFQUFFLENBQUM7SUFDdkIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQztJQUNqQixPQUFPLFNBQVMsR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFO1FBQzdCLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RFLFNBQVMsSUFBSSxFQUFFLENBQUM7UUFDaEIsUUFBUSxJQUFJLENBQUMsQ0FBQztLQUNmO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxTQUFTLENBQUMsR0FBVyxFQUFFLE9BQWdCO0lBQzlDLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUM7SUFDekIsSUFBSSxJQUFJLEtBQUssT0FBTyxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUU7UUFDMUMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7S0FDcEI7U0FBTSxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUU7UUFDN0IsSUFBSSxHQUFHLEtBQUssTUFBTTtZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ2hDLElBQUksR0FBRyxLQUFLLE9BQU87WUFBRSxPQUFPLEtBQUssQ0FBQztLQUNuQztTQUFNLElBQUksSUFBSSxLQUFLLE9BQU8sRUFBRTtRQUMzQixJQUFJLEdBQUcsQ0FBQztRQUNSLElBQUk7WUFDRixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN0QixJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUM7Z0JBQUUsTUFBTSxLQUFLLEVBQUUsQ0FBQztZQUN2QyxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUMxQyxPQUFPLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO2FBQ3hDO1NBQ0Y7UUFBQyxNQUFNO1lBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQyx1QkFBdUIsR0FBRyxXQUFXLENBQUMsQ0FBQztTQUN4RDtLQUNGO1NBQU0sSUFBSSxJQUFJLEtBQUssUUFBUSxFQUFFO1FBQzVCLHdDQUF3QztRQUN4QyxJQUFJLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDeEIsT0FBTyxpQkFBaUIsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDeEM7UUFDRCxJQUFJLEdBQUcsQ0FBQztRQUNSLElBQUk7WUFDRixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN0QixJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDO2dCQUFFLE1BQU0sS0FBSyxFQUFFLENBQUM7WUFDdEMsTUFBTSxHQUFHLEdBQUcsRUFBRSxDQUFDO1lBQ2YsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLENBQUMsTUFBTSxFQUFFO2dCQUNsQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO2FBQ2xEO1lBQ0QsT0FBTyxHQUFHLENBQUM7U0FDWjtRQUFDLE1BQU07WUFDTixNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixHQUFHLFlBQVksQ0FBQyxDQUFDO1NBQ3pEO0tBQ0Y7QUFDSCxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxVQUFVLENBQUMsSUFBVyxFQUFFLE1BQXNCO0lBQzVELE9BQU8sSUFBSTtTQUNSLEdBQUcsQ0FBQyxDQUFDLEdBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRTtRQUN2QixNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ3JDLE9BQU8sU0FBUyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNuQyxDQUFDLENBQUM7U0FDRCxJQUFJLEVBQUUsQ0FBQztBQUNaLENBQUMifQ==