@aztec/cli 0.15.0 → 0.16.0

package/dest/encoding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAW,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAG1E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,OAcjE;AA8DD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,SAY7D"}
+{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAW,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAG1E;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,OAcjE;AA0ED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,SAY7D"}

package/dest/encoding.js

@@ -38,12 +38,15 @@ function encodeArg(arg, abiType, name) {
         return res;
     }
     else if (kind === 'boolean') {
-        if (arg === 'true')
+        if (arg === 'true') {
             return true;
-        if (arg === 'false')
+        }
+        if (arg === 'false') {
             return false;
-        else
+        }
+        else {
             throw Error(`Invalid boolean value passed for ${name}: ${arg}.`);
+        }
     }
     else if (kind === 'array') {
         let arr;
@@ -54,10 +57,12 @@ function encodeArg(arg, abiType, name) {
         catch {
             throw new Error(`Unable to parse arg ${arg} as array for ${name} parameter`);
         }
-        if (!Array.isArray(arr))
+        if (!Array.isArray(arr)) {
             throw Error(`Invalid argument ${arg} passed for array parameter ${name}.`);
-        if (arr.length !== abiType.length)
+        }
+        if (arr.length !== abiType.length) {
             throw Error(`Invalid array length passed for ${name}. Expected ${abiType.length}, received ${arr.length}.`);
+        }
         for (let i = 0; i < abiType.length; i += 1) {
             res.push(encodeArg(arr[i], abiType.type, name));
         }
@@ -75,14 +80,16 @@ function encodeArg(arg, abiType, name) {
         catch {
             throw new Error(`Unable to parse arg ${arg} as struct`);
         }
-        if (Array.isArray(obj))
+        if (Array.isArray(obj)) {
             throw Error(`Array passed for arg ${name}. Expected a struct.`);
+        }
         const res = {};
         for (const field of abiType.fields) {
             // Remove field name from list as it's present
             const arg = obj[field.name];
-            if (!arg)
+            if (!arg) {
                 throw Error(`Expected field ${field.name} not found in struct ${name}.`);
+            }
             res[field.name] = encodeArg(obj[field.name], field.type, field.name);
         }
         return res;
@@ -104,4 +111,4 @@ export function encodeArgs(args, params) {
         return encodeArg(arg, type, name);
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2RpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZW5jb2RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlDOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQixDQUFDLEdBQVcsRUFBRSxPQUFtQjtJQUNoRSx3Q0FBd0M7SUFDeEMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN4RCxNQUFNLE1BQU0sR0FBUSxFQUFFLENBQUM7SUFDdkIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQztJQUNqQixPQUFPLFNBQVMsR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFO1FBQzdCLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RFLFNBQVMsSUFBSSxFQUFFLENBQUM7UUFDaEIsUUFBUSxJQUFJLENBQUMsQ0FBQztLQUNmO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxTQUFTLENBQUMsR0FBVyxFQUFFLE9BQWdCLEVBQUUsSUFBWTtJQUM1RCxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLElBQUksSUFBSSxLQUFLLE9BQU8sSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFO1FBQzFDLElBQUksR0FBVyxDQUFDO1FBQ2hCLElB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2RpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZW5jb2RpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTlDOzs7OztHQUtHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQixDQUFDLEdBQVcsRUFBRSxPQUFtQjtJQUNoRSx3Q0FBd0M7SUFDeEMsTUFBTSxHQUFHLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN4RCxNQUFNLE1BQU0sR0FBUSxFQUFFLENBQUM7SUFDdkIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2xCLElBQUksUUFBUSxHQUFHLENBQUMsQ0FBQztJQUNqQixPQUFPLFNBQVMsR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFO1FBQzdCLE1BQU0sRUFBRSxJQUFJLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3RFLFNBQVMsSUFBSSxFQUFFLENBQUM7UUFDaEIsUUFBUSxJQUFJLENBQUMsQ0FBQztLQUNmO0lBRUQsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxTQUFTLENBQUMsR0FBVyxFQUFFLE9BQWdCLEVBQUUsSUFBWTtJQUM1RCxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLElBQUksSUFBSSxLQUFLLE9BQU8sSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFO1FBQzFDLElBQUksR0FBVyxDQUFDO1FBQ2hCLElB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

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAsC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAopBxE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAsC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAqqBxE"}

package/dest/index.js

@@ -3,7 +3,7 @@ import { FunctionSelector, decodeFunctionSignature, decodeFunctionSignatureWithP
 import { JsonStringify } from '@aztec/foundation/json-rpc';
 import { sleep } from '@aztec/foundation/sleep';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { compileContract, generateNoirInterface, generateTypescriptInterface } from '@aztec/noir-compiler/cli';
+import { compileNoir, generateNoirInterface, generateTypescriptInterface } from '@aztec/noir-compiler/cli';
 import { CompleteAddress, ExtendedNote } from '@aztec/types';
 import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
 import { Command, Option } from 'commander';
@@ -60,19 +60,19 @@ export function getProgram(log, debugLogger) {
         .summary('Generates an encryption private key.')
         .description('Generates a private key which fits into the scalar field used by Grumpkin curve, can be used as an encryption private key.')
         .option('-m, --mnemonic', 'An optional mnemonic string used for the private key generation. If not provided, random private key will be generated.')
-        .action(async (options) => {
+        .action(options => {
         let privKey;
         let publicKey;
         if (options.mnemonic) {
             const acc = mnemonicToAccount(options.mnemonic);
             // TODO(#2052): This reduction is not secure enough. TACKLE THIS ISSUE BEFORE MAINNET.
-            const key = GrumpkinScalar.fromBufferWithReduction(Buffer.from(acc.getHdKey().privateKey));
-            publicKey = await generatePublicKey(key);
+            const key = GrumpkinScalar.fromBufferReduce(Buffer.from(acc.getHdKey().privateKey));
+            publicKey = generatePublicKey(key);
         }
         else {
             const key = GrumpkinScalar.random();
-            privKey = key.toString(true);
-            publicKey = await generatePublicKey(key);
+            privKey = key.toString();
+            publicKey = generatePublicKey(key);
         }
         log(`\nPrivate Key: ${privKey}\nPublic Key: ${publicKey.toString()}\n`);
     });
@@ -99,7 +99,7 @@ export function getProgram(log, debugLogger) {
         const client = await createCompatibleClient(rpcUrl, debugLogger);
         const actualPrivateKey = privateKey ?? GrumpkinScalar.random();
         const account = getSchnorrAccount(client, actualPrivateKey, actualPrivateKey, accountCreationSalt);
-        const { address, publicKey, partialAddress } = await account.getCompleteAddress();
+        const { address, publicKey, partialAddress } = account.getCompleteAddress();
         const tx = await account.deploy();
         const txHash = await tx.getTxHash();
         debugLogger(`Account contract tx sent with hash ${txHash}`);
@@ -113,8 +113,9 @@ export function getProgram(log, debugLogger) {
         log(`\nNew account:\n`);
         log(`Address:         ${address.toString()}`);
         log(`Public key:      ${publicKey.toString()}`);
-        if (!privateKey)
-            log(`Private key:     ${actualPrivateKey.toString(true)}`);
+        if (!privateKey) {
+            log(`Private key:     ${actualPrivateKey.toString()}`);
+        }
         log(`Partial address: ${partialAddress.toString()}`);
     });
     program
@@ -155,8 +156,9 @@ export function getProgram(log, debugLogger) {
         }
         const deployer = new ContractDeployer(contractArtifact, client, publicKey);
         const constructor = getFunctionArtifact(contractArtifact, 'constructor');
-        if (!constructor)
+        if (!constructor) {
             throw new Error(`Constructor not found in contract ABI`);
+        }
         debugLogger(`Input arguments: ${rawArgs.map((x) => `"${x}"`).join(', ')}`);
         const args = encodeArgs(rawArgs, constructorArtifact.parameters);
         debugLogger(`Encoded arguments: ${args.join(', ')}`);
@@ -185,10 +187,12 @@ export function getProgram(log, debugLogger) {
         const client = await createCompatibleClient(options.rpcUrl, debugLogger);
         const address = options.contractAddress;
         const isDeployed = await isContractDeployed(client, address);
-        if (isDeployed)
+        if (isDeployed) {
             log(`\nContract found at ${address.toString()}\n`);
-        else
+        }
+        else {
             log(`\nNo contract found at ${address.toString()}\n`);
+        }
     });
     program
         .command('add-contract')
@@ -266,10 +270,12 @@ export function getProgram(log, debugLogger) {
         .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, selector, rpcUrl, follow }) => {
         const pxe = await createCompatibleClient(rpcUrl, debugLogger);
         if (follow) {
-            if (txHash)
+            if (txHash) {
                 throw Error('Cannot use --follow with --tx-hash');
-            if (toBlock)
+            }
+            if (toBlock) {
                 throw Error('Cannot use --follow with --to-block');
+            }
         }
         const filter = { txHash, fromBlock, toBlock, afterLog, contractAddress, selector };
         const fetchLogs = async () => {
@@ -280,12 +286,14 @@ export function getProgram(log, debugLogger) {
                     .filter(([, value]) => value !== undefined)
                     .map(([key, value]) => `${key}: ${value}`)
                     .join(', ');
-                if (!follow)
+                if (!follow) {
                     log(`No logs found for filter: {${filterOptions}}`);
+                }
             }
             else {
-                if (!follow && !filter.afterLog)
+                if (!follow && !filter.afterLog) {
                     log('Logs found: \n');
+                }
                 logs.forEach(unencryptedLog => log(unencryptedLog.toHumanReadable()));
                 // Set the continuation parameter for the following requests
                 filter.afterLog = logs[logs.length - 1].id;
@@ -296,8 +304,9 @@ export function getProgram(log, debugLogger) {
             log('Fetching logs...');
             while (true) {
                 const maxLogsHit = await fetchLogs();
-                if (!maxLogsHit)
+                if (!maxLogsHit) {
                     await sleep(1000);
+                }
             }
         }
         else {
@@ -543,9 +552,9 @@ export function getProgram(log, debugLogger) {
         const { contract } = options;
         await update(projectPath, contract, options.rpcUrl, options.sandboxVersion, log, debugLogger);
     });
-    compileContract(program, 'compile', log);
+    compileNoir(program, 'compile', log);
     generateTypescriptInterface(program, 'generate-typescript', log);
     generateNoirInterface(program, 'generate-noir-interface', log);
     return program;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,EAAE,EACF,cAAc,EACd,IAAI,EACJ,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAEhB,uBAAuB,EACvB,yCAAyC,GAC1C,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC3G,OAAO,EAAE,eAAe,EAAgB,YAAY,EAAa,MAAM,cAAc,CAAC;AAEtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,2BAA2B,EAC3B,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,WAAW,EACX,yBAAyB,EACzB,oBAAoB,EACpB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,sBAAsB,EACtB,WAAW,EACX,MAAM,GACP,MAAM,YAAY,CAAC;AAEpB,MAAM,mBAAmB,GAAG,EAAE,CAAC,IAAI,CAAC;AAEpC,MAAM,EAAE,aAAa,GAAG,uBAAuB,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEtF;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,GAAU,EAAE,WAAwB;IAC7D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAW,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC;IAExF,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,iCAAiC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE7F,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,wBAAwB,EAAE,gBAAgB,CAAC;SACrE,GAAG,CAAC,SAAS,CAAC;SACd,OAAO,CAAC,uBAAuB,CAAC;SAChC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAE7B,MAAM,sBAAsB,GAAG,CAAC,WAAmB,EAAE,SAAkB,EAAE,EAAE,CACzE,IAAI,MAAM,CAAC,4BAA4B,EAAE,WAAW,CAAC;SAClD,GAAG,CAAC,aAAa,CAAC;SAClB,SAAS,CAAC,eAAe,CAAC;SAC1B,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAEpC,OAAO;SACJ,OAAO,CAAC,qBAAqB,CAAC;SAC9B,WAAW,CAAC,qDAAqD,CAAC;SAClE,cAAc,CACb,wBAAwB,EACxB,+EAA+E,EAC/E,aAAa,CACd;SACA,MAAM,CAAC,wBAAwB,EAAE,+BAA+B,EAAE,OAAO,CAAC;SAC1E,cAAc,CAAC,4BAA4B,EAAE,uCAAuC,EAAE,WAAW,CAAC;SAClG,MAAM,CACL,yBAAyB,EACzB,mCAAmC,EACnC,6DAA6D,CAC9D;SACA,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACtB,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,oBAAoB,CACxD,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,MAAM,IAAI,EAAE,EACpB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,QAAQ,EAChB,WAAW,CACZ,CAAC;QACF,GAAG,CAAC,IAAI,CAAC,CAAC;QACV,GAAG,CAAC,mBAAmB,mBAAmB,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACvE,GAAG,CAAC,qBAAqB,mBAAmB,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC3E,GAAG,CAAC,2BAA2B,mBAAmB,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9E,GAAG,CAAC,4BAA4B,mBAAmB,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChF,GAAG,CAAC,wCAAwC,mBAAmB,CAAC,gCAAgC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/G,GAAG,CAAC,IAAI,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,sBAAsB,CAAC;SAC/B,OAAO,CAAC,sCAAsC,CAAC;SAC/C,WAAW,CACV,4HAA4H,CAC7H;SACA,MAAM,CACL,gBAAgB,EAChB,yHAAyH,CAC1H;SACA,MAAM,CAAC,OAAO,CAAC,EAAE;QAChB,IAAI,OAAO,CAAC;QACZ,IAAI,SAAS,CAAC;QACd,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,MAAM,GAAG,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,sFAAsF;YACtF,MAAM,GAAG,GAAG,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,UAAW,CAAC,CAAC,CAAC;YACrF,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;YACpC,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;YACzB,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;SACpC;QACD,GAAG,CAAC,kBAAkB,OAAO,iBAAiB,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,0BAA0B,CAAC;SACnC,OAAO,CAAC,sCAAsC,CAAC;SAC/C,WAAW,CAAC,kFAAkF,CAAC;SAC/F,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAC7C,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAW,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvE,GAAG,CAAC,gBAAgB,cAAc,EAAE,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CACV,sQAAsQ,CACvQ;SACA,OAAO,CAAC,qEAAqE,CAAC;SAC9E,SAAS,CACR,sBAAsB,CAAC,kFAAkF,EAAE,KAAK,CAAC,CAClH;SACA,SAAS,CAAC,SAAS,CAAC;QACrB,4EAA4E;QAC5E,2FAA2F;SAC1F,MAAM,CAAC,WAAW,EAAE,wFAAwF,CAAC;SAC7G,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,UAAU,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAE/D,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;QACnG,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC5E,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;QACpC,WAAW,CAAC,sCAAsC,MAAM,EAAE,CAAC,CAAC;QAC5D,IAAI,IAAI,EAAE;YACR,GAAG,CAAC,8CAA8C,CAAC,CAAC;YACpD,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;SACjB;aAAM;YACL,GAAG,CAAC,0CAA0C,MAAM,IAAI,CAAC,CAAC;SAC3D;QAED,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACxB,GAAG,CAAC,oBAAoB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9C,GAAG,CAAC,oBAAoB,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,EAAE;YACf,GAAG,CAAC,oBAAoB,gBAAgB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACxD;QACD,GAAG,CAAC,oBAAoB,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CACV,wOAAwO,CACzO;SACA,OAAO,CAAC,uEAAuE,CAAC;SAChF,SAAS,CAAC,sBAAsB,CAAC,0DAA0D,EAAE,IAAI,CAAC,CAAC;SACnG,cAAc,CACb,yCAAyC,EACzC,yDAAyD,EACzD,mBAAmB,CACpB;SACA,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE;QACvD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAEjE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;QAExF,GAAG,CAAC,yBAAyB,CAAC,CAAC;QAC/B,GAAG,CAAC,oBAAoB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9C,GAAG,CAAC,oBAAoB,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChD,GAAG,CAAC,oBAAoB,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,gDAAgD,CAAC;SAC7D,QAAQ,CACP,YAAY,EACZ,yHAAyH,CAC1H;SACA,MAAM,CAAC,iCAAiC,EAAE,gCAAgC,EAAE,EAAE,CAAC;SAC/E,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CACL,2BAA2B,EAC3B,4KAA4K,EAC5K,cAAc,CACf;SACA,MAAM,CACL,mCAAmC,EACnC,qDAAqD,EACrD,oBAAoB,CACrB;SACA,MAAM,CACL,yBAAyB,EACzB,iFAAiF,EACjF,sBAAsB,CACvB;QACD,4EAA4E;QAC5E,2FAA2F;SAC1F,MAAM,CAAC,WAAW,EAAE,wFAAwF,CAAC;SAC7G,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QAC9F,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACtE,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;QAElG,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,sBAAsB,GAAG,GAAG,iBAAiB,KAAK,QAAQ,CAAC,cAAc,EAAE,CAAC;QAClF,IAAI,gBAAgB,CAAC,cAAc,IAAI,gBAAgB,CAAC,cAAc,KAAK,sBAAsB,EAAE;YACjG,GAAG,CACD,0EAA0E,gBAAgB,CAAC,cAAc,mCAAmC,sBAAsB,IAAI,CACvK,CAAC;SACH;QAED,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAE3E,MAAM,WAAW,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;QACzE,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;SAC1D;QAED,WAAW,CAAC,oBAAoB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChF,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,EAAE,mBAAoB,CAAC,UAAU,CAAC,CAAC;QAClE,WAAW,CAAC,sBAAsB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QAExC,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC;QAClF,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;QACpC,WAAW,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;QAClD,IAAI,IAAI,EAAE;YACR,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;YACjC,GAAG,CAAC,0BAA0B,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACxF,GAAG,CAAC,4BAA4B,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SAClG;aAAM;YACL,GAAG,CAAC,uBAAuB,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YAClF,GAAG,CAAC,6BAA6B,MAAM,CAAC,eAAe,EAAE,cAAc,CAAC,QAAQ,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YAC/F,GAAG,CAAC,gCAAgC,MAAM,IAAI,CAAC,CAAC;SACjD;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,kEAAkE,CAAC;SAC/E,cAAc,CACb,mCAAmC,EACnC,6DAA6D,EAC7D,iBAAiB,CAClB;SACA,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACtB,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;QACxC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7D,IAAI,UAAU,EAAE;YACd,GAAG,CAAC,uBAAuB,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACpD;aAAM;YACL,GAAG,CAAC,0BAA0B,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACvD;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CACV,0IAA0I,CAC3I;SACA,cAAc,CACb,wCAAwC,EACxC,+GAA+G,CAChH;SACA,cAAc,CAAC,mCAAmC,EAAE,gCAAgC,EAAE,iBAAiB,CAAC;SACxG,cAAc,CAAC,kCAAkC,EAAE,iCAAiC,EAAE,mBAAmB,CAAC;SAC1G,MAAM,CAAC,+BAA+B,EAAE,uCAAuC,EAAE,cAAc,CAAC;SAChG,MAAM,CAAC,4BAA4B,EAAE,6CAA6C,EAAE,oBAAoB,CAAC;SACzG,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACtB,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAC1E,MAAM,eAAe,GAAiB,OAAO,CAAC,eAAe,CAAC;QAC9D,MAAM,eAAe,GAAG,IAAI,eAAe,CACzC,eAAe,EACf,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,EAC5B,OAAO,CAAC,cAAc,CACvB,CAAC;QACF,MAAM,cAAc,GAAe,OAAO,CAAC,cAAc,IAAI,UAAU,CAAC,IAAI,CAAC;QAC7E,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAEzE,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QAC3E,GAAG,CAAC,8BAA8B,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IACL,OAAO;SACJ,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,sDAAsD,CAAC;SACnE,QAAQ,CAAC,UAAU,EAAE,4CAA4C,EAAE,WAAW,CAAC;SAC/E,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,EAAE;YACZ,GAAG,CAAC,yCAAyC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACnE;aAAM;YACL,GAAG,CAAC,4BAA4B,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SACnE;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,8EAA8E,CAAC;SAC3F,QAAQ,CAAC,mBAAmB,EAAE,gCAAgC,EAAE,iBAAiB,CAAC;SAClF,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,kCAAkC,EAAE,0DAA0D,EAAE,KAAK,CAAC;SAC7G,MAAM,CAAC,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,iCAAiC,GAAG,OAAO,CAAC,eAAe;YAC/D,CAAC,CAAC,MAAM,MAAM,CAAC,uBAAuB,CAAC,eAAe,CAAC;YACvD,CAAC,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAElD,IAAI,CAAC,iCAAiC,EAAE;YACtC,GAAG,CAAC,6BAA6B,eAAe,EAAE,CAAC,CAAC;YACpD,OAAO;SACR;QACD,IAAI,YAA0B,CAAC;QAE/B,IAAI,cAAc,IAAI,iCAAiC,EAAE;YACvD,YAAY,GAAG,iCAAiC,CAAC,YAAY,CAAC;SAC/D;aAAM;YACL,YAAY,GAAG,iCAAiC,CAAC;SAClD;QACD,GAAG,CAAC,+BAA+B,YAAY,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC9E,GAAG,CAAC,YAAY,YAAY,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACjE,IAAI,UAAU,IAAI,iCAAiC,EAAE;YACnD,GAAG,CAAC,aAAa,iCAAiC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAChE;QACD,GAAG,CAAC,IAAI,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,8EAA8E,CAAC;SAC3F,MAAM,CAAC,yBAAyB,EAAE,4CAA4C,EAAE,mBAAmB,CAAC;SACpG,MAAM,CACL,8BAA8B,EAC9B,wDAAwD,EACxD,oBAAoB,CACrB;SACA,MAAM,CAAC,4BAA4B,EAAE,uDAAuD,EAAE,oBAAoB,CAAC;SACnH,MAAM,CAAC,yBAAyB,EAAE,4CAA4C,EAAE,kBAAkB,CAAC;SACnG,MAAM,CAAC,mCAAmC,EAAE,qCAAqC,EAAE,yBAAyB,CAAC;SAC7G,MAAM,CAAC,6BAA6B,EAAE,mCAAmC,EAAE,qBAAqB,CAAC;SACjG,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,UAAU,EAAE,2DAA2D,CAAC;SAC/E,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;QACpG,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAE9D,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,EAAE;gBACV,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACnD;YACD,IAAI,OAAO,EAAE;gBACX,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;aACpD;SACF;QAED,MAAM,MAAM,GAAc,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;QAE9F,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;YAC3B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;qBACzC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC;qBAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,KAAK,EAAE,CAAC;qBACzC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACd,IAAI,CAAC,MAAM,EAAE;oBACX,GAAG,CAAC,8BAA8B,aAAa,GAAG,CAAC,CAAC;iBACrD;aACF;iBAAM;gBACL,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;oBAC/B,GAAG,CAAC,gBAAgB,CAAC,CAAC;iBACvB;gBACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBACtE,4DAA4D;gBAC5D,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5C;YACD,OAAO,QAAQ,CAAC,UAAU,CAAC;QAC7B,CAAC,CAAC;QAEF,IAAI,MAAM,EAAE;YACV,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACxB,OAAO,IAAI,EAAE;gBACX,MAAM,UAAU,GAAG,MAAM,SAAS,EAAE,CAAC;gBACrC,IAAI,CAAC,UAAU,EAAE;oBACf,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;iBACnB;aACF;SACF;aAAM;YACL,OAAO,MAAM,SAAS,EAAE,EAAE;gBACxB,6CAA6C;aAC9C;SACF;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,oBAAoB,CAAC;SAC7B,WAAW,CAAC,kCAAkC,CAAC;SAC/C,cAAc,CAAC,8BAA8B,EAAE,8BAA8B,EAAE,iBAAiB,CAAC;SACjG,cAAc,CAAC,8BAA8B,EAAE,yBAAyB,EAAE,cAAc,CAAC;SACzF,cAAc,CACb,yCAAyC,EACzC,yDAAyD,EACzD,mBAAmB,CACpB;SACA,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACjE,MAAM,MAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;QAC3F,GAAG,CAAC,kDAAkD,OAAO,IAAI,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,gDAAgD,CAAC;SAC7D,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAY,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,qBAAqB,EAAE,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC3B;aAAM;YACL,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAC1B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;aACjC;SACF;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,0CAA0C,CAAC;SACvD,QAAQ,CAAC,WAAW,EAAE,sCAAsC,EAAE,iBAAiB,CAAC;SAChF,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAE3D,IAAI,CAAC,OAAO,EAAE;YACZ,GAAG,CAAC,mBAAmB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC9C;aAAM;YACL,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,4CAA4C,CAAC;SACzD,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAY,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;QAChD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,sBAAsB,CAAC,CAAC;SAC7B;aAAM;YACL,GAAG,CAAC,sBAAsB,CAAC,CAAC;YAC5B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;gBAClC,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;aACnC;SACF;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,2CAA2C,CAAC;SACxD,QAAQ,CAAC,WAAW,EAAE,wCAAwC,EAAE,iBAAiB,CAAC;SAClF,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAErD,IAAI,CAAC,SAAS,EAAE;YACd,GAAG,CAAC,qBAAqB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAChD;aAAM;YACL,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;SACnC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,wCAAwC,CAAC;SACrD,QAAQ,CAAC,gBAAgB,EAAE,6BAA6B,CAAC;SACzD,MAAM,CAAC,8BAA8B,EAAE,oBAAoB,EAAE,EAAE,CAAC;SAChE,cAAc,CACb,wCAAwC,EACxC,+GAA+G,CAChH;SACA,cAAc,CAAC,mCAAmC,EAAE,gCAAgC,EAAE,iBAAiB,CAAC;SACxG,SAAS,CAAC,sBAAsB,CAAC,2BAA2B,EAAE,IAAI,CAAC,CAAC;SACpE,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,WAAW,EAAE,2DAA2D,CAAC;SAChF,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;QACtC,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CACrD,OAAO,CAAC,gBAAgB,EACxB,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,GAAG,CACJ,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEhD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC,SAAS,EAAE,CAAC;QACxG,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC,eAAe,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAC9E,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;QAClE,GAAG,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAChE,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;YAEhB,GAAG,CAAC,4BAA4B,CAAC,CAAC;YAElC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,UAAU,EAAE,CAAC;YACtC,GAAG,CAAC,WAAW,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC;YACnC,GAAG,CAAC,iBAAiB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;YAC5C,GAAG,CAAC,eAAe,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SAC1D;aAAM;YACL,GAAG,CAAC,uDAAuD,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CACV,yGAAyG,CAC1G;SACA,QAAQ,CAAC,gBAAgB,EAAE,0BAA0B,CAAC;SACtD,MAAM,CAAC,8BAA8B,EAAE,oBAAoB,EAAE,EAAE,CAAC;SAChE,cAAc,CACb,wCAAwC,EACxC,+GAA+G,CAChH;SACA,cAAc,CAAC,mCAAmC,EAAE,gCAAgC,EAAE,iBAAiB,CAAC;SACxG,MAAM,CAAC,qBAAqB,EAAE,6EAA6E,CAAC;SAC5G,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;QACtC,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CACrD,OAAO,CAAC,gBAAgB,EACxB,YAAY,EACZ,OAAO,CAAC,IAAI,EACZ,GAAG,CACJ,CAAC;QAEF,MAAM,UAAU,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QACvE,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE;YACxD,MAAM,KAAK,CACT,2CAA2C,UAAU,CAAC,UAAU,CAAC,MAAM,eAAe,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAC5G,CAAC;SACH;QACD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC9F,GAAG,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,yCAAyC,CAAC;SACtD,QAAQ,CAAC,WAAW,EAAE,sCAAsC,EAAE,iBAAiB,CAAC;SAChF,QAAQ,CAAC,mBAAmB,EAAE,gCAAgC,EAAE,iBAAiB,CAAC;SAClF,QAAQ,CAAC,eAAe,EAAE,+BAA+B,EAAE,UAAU,CAAC;SACtE,QAAQ,CAAC,UAAU,EAAE,4CAA4C,EAAE,WAAW,CAAC;SAC/E,cAAc,CAAC,sBAAsB,EAAE,kDAAkD,EAAE,EAAE,CAAC;SAC9F,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACvE,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC3F,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEL,iEAAiE;IACjE,OAAO;SACJ,OAAO,CAAC,wBAAwB,CAAC;SACjC,WAAW,CAAC,0EAA0E,CAAC;SACvF,QAAQ,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;SACrD,cAAc,CACb,wCAAwC,EACxC,+GAA+G,CAChH;SACA,cAAc,CAAC,iCAAiC,EAAE,iDAAiD,CAAC;SACpG,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE;QACvC,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QAClF,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,SAAS;aAChD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC;aACnC,IAAI,EAAE;aACN,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;QAClF,IAAI,CAAC,gBAAgB,EAAE;YACrB,GAAG,CAAC,uCAAuC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;YAChE,OAAO;SACR;QACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,aAAa,EAAE,gBAAgB,CAAC,IAAkB,CAAC,CAAC;QACnF,GAAG,CAAC,oBAAoB,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,yCAAyC,CAAC;SACtD,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAY,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,CAAC;QAC1C,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,mBAAmB,CAAC;SAC5B,WAAW,CAAC,4EAA4E,CAAC;SACzF,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,QAAQ,GAAG,MAAM,2BAA2B,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CACV,gJAAgJ,CACjJ;SACA,QAAQ,CAAC,gBAAgB,EAAE,oDAAoD,CAAC;SAChF,QAAQ,CACP,kBAAkB,EAClB,4GAA4G,CAC7G;SACA,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAW,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC;QACvE,MAAM,aAAa,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,iDAAiD,CAAC;SAC9D,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;QACtB,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;QACxC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACtB,GAAG,CAAC,oBAAoB,IAAI,CAAC,cAAc,IAAI,CAAC,CAAC;QACjD,GAAG,CAAC,6BAA6B,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAC;QAClE,GAAG,CAAC,aAAa,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QACnC,GAAG,CAAC,qBAAqB,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC;QACnD,GAAG,CAAC,mBAAmB,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,0DAA0D,CAAC;SACvE,QAAQ,CACP,wBAAwB,EACxB,qHAAqH,CACtH;SACA,MAAM,CAAC,KAAK,EAAE,oBAA4B,EAAE,EAAE;QAC7C,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QACtF,MAAM,WAAW,GAAG,gBAAgB,CAAC,SAAS,CAAC,MAAM,CACnD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,iCAAiC,CACnE,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,GAAG,CAAC,4CAA4C,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;SAC1E;QACD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE;YAC5B,MAAM,2BAA2B,GAAG,yCAAyC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;YACtG,MAAM,SAAS,GAAG,uBAAuB,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;YAClE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC3D,GAAG,CACD,GAAG,EAAE,CAAC,YAAY,IAAI,2BAA2B,4BAA4B,SAAS,iBAAiB,QAAQ,EAAE,CAClH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,oDAAoD,CAAC;SACjE,QAAQ,CAAC,qBAAqB,EAAE,4DAA4D,CAAC;SAC7F,MAAM,CAAC,CAAC,iBAAyB,EAAE,EAAE;QACpC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QACnE,GAAG,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,sCAAsC,CAAC;SACnD,QAAQ,CAAC,eAAe,EAAE,+BAA+B,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;SACzE,MAAM,CAAC,uBAAuB,EAAE,2CAA2C,EAAE,EAAE,CAAC;SAChF,MAAM,CAAC,4BAA4B,EAAE,sDAAsD,EAAE,QAAQ,CAAC;SACtG,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,WAAmB,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,MAAM,MAAM,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;IAChG,CAAC,CAAC,CAAC;IAEL,WAAW,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACrC,2BAA2B,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,CAAC,CAAC;IACjE,qBAAqB,CAAC,OAAO,EAAE,yBAAyB,EAAE,GAAG,CAAC,CAAC;IAE/D,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dest/update/npm.d.ts

@@ -9,6 +9,8 @@ import { DependencyChanges } from './common.js';
 export declare function readPackageJson(projectPath: string): Promise<{
     /** dependencies */
     dependencies?: Record<string, string>;
+    /** devDependencies */
+    devDependencies?: Record<string, string>;
 }>;
 /**
  * Queries the npm registry for the latest version of a package

package/dest/update/npm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/update/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAM9C,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE,mBAAmB;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC,CAKD;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,SAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/F;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,iBAAiB,CAAC,CAyC5B;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAuBpE"}
+{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/update/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAM9C,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE,mBAAmB;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,sBAAsB;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C,CAAC,CAKD;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,SAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/F;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,iBAAiB,CAAC,CA4C5B;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAuBpE"}

package/dest/update/npm.js

@@ -45,26 +45,29 @@ export async function updateAztecDeps(projectPath, aztecVersion, log) {
         file: resolve(join(projectPath, 'package.json')),
         dependencies: [],
     };
-    if (!pkg.dependencies) {
-        return changes;
-    }
     log(`Updating @aztec packages to ${aztecVersion} in ${relative(process.cwd(), changes.file)}`);
     const version = aztecVersion.version;
-    for (const name of Object.keys(pkg.dependencies)) {
-        if (!name.startsWith('@aztec/')) {
-            continue;
-        }
-        // different release schedule
-        if (name === '@aztec/aztec-ui') {
+    for (const depType of ['dependencies', 'devDependencies']) {
+        const dependencies = pkg[depType];
+        if (!dependencies) {
             continue;
         }
-        if (pkg.dependencies[name] !== version) {
-            changes.dependencies.push({
-                name,
-                from: pkg.dependencies[name],
-                to: version,
-            });
-            pkg.dependencies[name] = version;
+        for (const name of Object.keys(dependencies)) {
+            if (!name.startsWith('@aztec/')) {
+                continue;
+            }
+            // different release schedule
+            if (name === '@aztec/aztec-ui') {
+                continue;
+            }
+            if (dependencies[name] !== version) {
+                changes.dependencies.push({
+                    name,
+                    from: dependencies[name],
+                    to: version,
+                });
+                dependencies[name] = version;
+            }
         }
     }
     if (changes.dependencies.length > 0) {
@@ -103,4 +106,4 @@ export function updateLockfile(projectPath, log) {
         log(`No lockfile found in ${projectPath}. Skipping lockfile update...`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS9ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ2hDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9DLE9BQU8sRUFBVSxLQUFLLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFdkMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRy9DOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGVBQWUsQ0FBQyxXQUFtQjtJQUl2RCxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFFaEUsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFdBQW1CLEVBQUUsT0FBTyxHQUFHLFFBQVE7SUFDNUUsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsV0FBVyxFQUFFLDZCQUE2QixDQUFDLENBQUM7SUFDaEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQztLQUMz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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS9ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ2hDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9DLE9BQU8sRUFBVSxLQUFLLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFdkMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRy9DOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGVBQWUsQ0FBQyxXQUFtQjtJQU12RCxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFFaEUsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFdBQW1CLEVBQUUsT0FBTyxHQUFHLFFBQVE7SUFDNUUsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsV0FBVyxFQUFFLDZCQUE2QixDQUFDLENBQUM7SUFDaEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQztLQUMzQztJQUVELE1BQU0sSUFBSSxHQUFHLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ25DLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQztJQUN4RCxJQUFJLENBQUMsYUFBYSxFQUFFO1FBQ2xCLE1BQU0sSUFBSSxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQztLQUMvRDtJQUVELE9BQU8sYUFBYSxDQUFDO0FBQ3ZCLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsZUFBZSxDQUNuQyxXQUFtQixFQUNuQixZQUFvQixFQUNwQixHQUFVO0lBRVYsTUFBTSxHQUFHLEdBQUcsTUFBTSxlQUFlLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDL0MsTUFBTSxPQUFPLEdBQXNCO1FBQ2pDLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxjQUFjLENBQUMsQ0FBQztRQUNoRCxZQUFZLEVBQUUsRUFBRTtLQUNqQixDQUFDO0lBRUYsR0FBRyxDQUFDLCtCQUErQixZQUFZLE9BQU8sUUFBUSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQy9GLE1BQU0sT0FBTyxHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUM7SUFFckMsS0FBSyxNQUFNLE9BQU8sSUFBSSxDQUFDLGNBQWMsRUFBRSxpQkFBaUIsQ0FBVSxFQUFFO1FBQ2xFLE1BQU0sWUFBWSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNsQyxJQUFJLENBQUMsWUFBWSxFQUFFO1lBQ2pCLFNBQVM7U0FDVjtRQUVELEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsRUFBRTtZQUM1QyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRTtnQkFDL0IsU0FBUzthQUNWO1lBRUQsNkJBQTZCO1lBQzdCLElBQUksSUFBSSxLQUFLLGlCQUFpQixFQUFFO2dCQUM5QixTQUFTO2FBQ1Y7WUFFRCxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FBSyxPQUFPLEVBQUU7Z0JBQ2xDLE9BQU8sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDO29CQUN4QixJQUFJO29CQUNKLElBQUksRUFBRSxZQUFZLENBQUMsSUFBSSxDQUFDO29CQUN4QixFQUFFLEVBQUUsT0FBTztpQkFDWixDQUFDLENBQUM7Z0JBRUgsWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQzthQUM5QjtTQUNGO0tBQ0Y7SUFFRCxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtRQUNuQyxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ3JELE1BQU0sZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsY0FBYyxDQUFDLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQztLQUM5RTtJQUVELE9BQU8sT0FBTyxDQUFDO0FBQ2pCLENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsY0FBYyxDQUFDLFdBQW1CLEVBQUUsR0FBVTtJQUM1RCxNQUFNLEtBQUssR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDMUUsTUFBTSxNQUFNLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuRSxNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFeEUsSUFBSSxNQUFNLEVBQUU7UUFDVixTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUU7WUFDN0IsR0FBRyxFQUFFLFdBQVc7WUFDaEIsS0FBSyxFQUFFLFNBQVM7U0FDakIsQ0FBQyxDQUFDO0tBQ0o7U0FBTSxJQUFJLE1BQU0sRUFBRTtRQUNqQixTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUU7WUFDN0IsR0FBRyxFQUFFLFdBQVc7WUFDaEIsS0FBSyxFQUFFLFNBQVM7U0FDakIsQ0FBQyxDQUFDO0tBQ0o7U0FBTSxJQUFJLEtBQUssRUFBRTtRQUNoQixTQUFTLENBQUMsS0FBSyxFQUFFLENBQUMsU0FBUyxDQUFDLEVBQUU7WUFDNUIsR0FBRyxFQUFFLFdBQVc7WUFDaEIsS0FBSyxFQUFFLFNBQVM7U0FDakIsQ0FBQyxDQUFDO0tBQ0o7U0FBTTtRQUNMLEdBQUcsQ0FBQyx3QkFBd0IsV0FBVywrQkFBK0IsQ0FBQyxDQUFDO0tBQ3pFO0FBQ0gsQ0FBQyJ9

package/dest/update/update.js

@@ -66,7 +66,15 @@ async function getNpmSandboxVersion(projectPath, log) {
     try {
         const pkg = await readPackageJson(projectPath);
         // use coerce instead of parse because it eliminates semver operators like ~ and ^
-        return coerce(pkg.dependencies?.[SANDBOX_PACKAGE]);
+        if (pkg.dependencies?.[SANDBOX_PACKAGE]) {
+            return coerce(pkg.dependencies[SANDBOX_PACKAGE]);
+        }
+        else if (pkg.devDependencies?.[SANDBOX_PACKAGE]) {
+            return coerce(pkg.devDependencies[SANDBOX_PACKAGE]);
+        }
+        else {
+            return null;
+        }
     }
     catch (err) {
         if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
@@ -90,4 +98,4 @@ async function getRemoteSandboxVersion(pxeUrl, log, debugLog) {
         throw err;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS91cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekMsT0FBTyxFQUFVLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUV2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRWpELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDMUMsT0FBTyxFQUFFLGdCQUFnQixJQUFJLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRWxILE1BQU0sZUFBZSxHQUFHLHNCQUFzQixDQUFDO0FBRS9DLE1BQU0sQ0FBQyxLQUFLLFVBQVUsTUFBTSxDQUMxQixXQUFtQixFQUNuQixTQUFtQixFQUNuQixNQUFjLEVBQ2QsY0FBc0IsRUFDdEIsR0FBVSxFQUNWLFFBQXFCO0lBRXJCLE1BQU0sb0JBQW9CLEdBQ3hCLGNBQWMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFMUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFO1FBQ3pCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLGNBQWMsRUFBRSxDQUFDLENBQUM7S0FDNUQ7SUFFRCxJQUFJLHFCQUFxQixHQUFHLE1BQU0sb0JBQW9CLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRXpFLElBQUksQ0FBQyxxQkFBcUIsRUFBRTtRQUMxQixxQkFBcUIs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS91cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekMsT0FBTyxFQUFVLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUV2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdEQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRWpELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDMUMsT0FBTyxFQUFFLGdCQUFnQixJQUFJLGdCQUFnQixFQUFFLGVBQWUsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBRWxILE1BQU0sZUFBZSxHQUFHLHNCQUFzQixDQUFDO0FBRS9DLE1BQU0sQ0FBQyxLQUFLLFVBQVUsTUFBTSxDQUMxQixXQUFtQixFQUNuQixTQUFtQixFQUNuQixNQUFjLEVBQ2QsY0FBc0IsRUFDdEIsR0FBVSxFQUNWLFFBQXFCO0lBRXJCLE1BQU0sb0JBQW9CLEdBQ3hCLGNBQWMsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLE1BQU0sZ0JBQWdCLENBQUMsZUFBZSxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUM7SUFFMUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFO1FBQ3pCLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLGNBQWMsRUFBRSxDQUFDLENBQUM7S0FDNUQ7SUFFRCxJQUFJLHFCQUFxQixHQUFHLE1BQU0sb0JBQW9CLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBRXpFLElBQUksQ0FBQyxxQkFBcUIsRUFBRTtRQUMxQixxQkFBcUIs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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "type": "module",
   "main": "./dest/index.js",
   "bin": {
@@ -18,7 +18,7 @@
     "build:dev": "tsc -b --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
-    "formatting:fix": "run -T prettier -w ./src",
+    "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
     "start": "node --no-warnings ./dest/bin/index.js"
   },
@@ -34,13 +34,13 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.15.0",
-    "@aztec/ethereum": "0.15.0",
-    "@aztec/foundation": "0.15.0",
-    "@aztec/l1-artifacts": "0.15.0",
-    "@aztec/noir-compiler": "0.15.0",
-    "@aztec/noir-contracts": "0.15.0",
-    "@aztec/types": "0.15.0",
+    "@aztec/aztec.js": "0.16.0",
+    "@aztec/ethereum": "0.16.0",
+    "@aztec/foundation": "0.16.0",
+    "@aztec/l1-artifacts": "0.16.0",
+    "@aztec/noir-compiler": "0.16.0",
+    "@aztec/noir-contracts": "0.16.0",
+    "@aztec/types": "0.16.0",
     "@libp2p/peer-id-factory": "^3.0.4",
     "@ltd/j-toml": "^1.38.0",
     "commander": "^9.0.0",
@@ -53,7 +53,6 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
-    "@rushstack/eslint-patch": "^1.1.4",
     "@types/jest": "^29.5.0",
     "@types/lodash.startcase": "^4.4.7",
     "@types/node": "^18.7.23",

package/src/encoding.ts

@@ -42,9 +42,14 @@ function encodeArg(arg: string, abiType: ABIType, name: string): any {
     }
     return res;
   } else if (kind === 'boolean') {
-    if (arg === 'true') return true;
-    if (arg === 'false') return false;
-    else throw Error(`Invalid boolean value passed for ${name}: ${arg}.`);
+    if (arg === 'true') {
+      return true;
+    }
+    if (arg === 'false') {
+      return false;
+    } else {
+      throw Error(`Invalid boolean value passed for ${name}: ${arg}.`);
+    }
   } else if (kind === 'array') {
     let arr;
     const res = [];
@@ -53,9 +58,12 @@ function encodeArg(arg: string, abiType: ABIType, name: string): any {
     } catch {
       throw new Error(`Unable to parse arg ${arg} as array for ${name} parameter`);
     }
-    if (!Array.isArray(arr)) throw Error(`Invalid argument ${arg} passed for array parameter ${name}.`);
-    if (arr.length !== abiType.length)
+    if (!Array.isArray(arr)) {
+      throw Error(`Invalid argument ${arg} passed for array parameter ${name}.`);
+    }
+    if (arr.length !== abiType.length) {
       throw Error(`Invalid array length passed for ${name}. Expected ${abiType.length}, received ${arr.length}.`);
+    }
     for (let i = 0; i < abiType.length; i += 1) {
       res.push(encodeArg(arr[i], abiType.type, name));
     }
@@ -71,12 +79,16 @@ function encodeArg(arg: string, abiType: ABIType, name: string): any {
     } catch {
       throw new Error(`Unable to parse arg ${arg} as struct`);
     }
-    if (Array.isArray(obj)) throw Error(`Array passed for arg ${name}. Expected a struct.`);
+    if (Array.isArray(obj)) {
+      throw Error(`Array passed for arg ${name}. Expected a struct.`);
+    }
     const res: any = {};
     for (const field of abiType.fields) {
       // Remove field name from list as it's present
       const arg = obj[field.name];
-      if (!arg) throw Error(`Expected field ${field.name} not found in struct ${name}.`);
+      if (!arg) {
+        throw Error(`Expected field ${field.name} not found in struct ${name}.`);
+      }
       res[field.name] = encodeArg(obj[field.name], field.type, field.name);
     }
     return res;

package/src/index.ts

@@ -20,7 +20,7 @@ import { JsonStringify } from '@aztec/foundation/json-rpc';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
 import { fileURLToPath } from '@aztec/foundation/url';
-import { compileContract, generateNoirInterface, generateTypescriptInterface } from '@aztec/noir-compiler/cli';
+import { compileNoir, generateNoirInterface, generateTypescriptInterface } from '@aztec/noir-compiler/cli';
 import { CompleteAddress, ContractData, ExtendedNote, LogFilter } from '@aztec/types';
 
 import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
@@ -129,18 +129,18 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       '-m, --mnemonic',
       'An optional mnemonic string used for the private key generation. If not provided, random private key will be generated.',
     )
-    .action(async options => {
+    .action(options => {
       let privKey;
       let publicKey;
       if (options.mnemonic) {
         const acc = mnemonicToAccount(options.mnemonic);
         // TODO(#2052): This reduction is not secure enough. TACKLE THIS ISSUE BEFORE MAINNET.
-        const key = GrumpkinScalar.fromBufferWithReduction(Buffer.from(acc.getHdKey().privateKey!));
-        publicKey = await generatePublicKey(key);
+        const key = GrumpkinScalar.fromBufferReduce(Buffer.from(acc.getHdKey().privateKey!));
+        publicKey = generatePublicKey(key);
       } else {
         const key = GrumpkinScalar.random();
-        privKey = key.toString(true);
-        publicKey = await generatePublicKey(key);
+        privKey = key.toString();
+        publicKey = generatePublicKey(key);
       }
       log(`\nPrivate Key: ${privKey}\nPublic Key: ${publicKey.toString()}\n`);
     });
@@ -174,7 +174,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const actualPrivateKey = privateKey ?? GrumpkinScalar.random();
 
       const account = getSchnorrAccount(client, actualPrivateKey, actualPrivateKey, accountCreationSalt);
-      const { address, publicKey, partialAddress } = await account.getCompleteAddress();
+      const { address, publicKey, partialAddress } = account.getCompleteAddress();
       const tx = await account.deploy();
       const txHash = await tx.getTxHash();
       debugLogger(`Account contract tx sent with hash ${txHash}`);
@@ -188,7 +188,9 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       log(`\nNew account:\n`);
       log(`Address:         ${address.toString()}`);
       log(`Public key:      ${publicKey.toString()}`);
-      if (!privateKey) log(`Private key:     ${actualPrivateKey.toString(true)}`);
+      if (!privateKey) {
+        log(`Private key:     ${actualPrivateKey.toString()}`);
+      }
       log(`Partial address: ${partialAddress.toString()}`);
     });
 
@@ -259,7 +261,9 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const deployer = new ContractDeployer(contractArtifact, client, publicKey);
 
       const constructor = getFunctionArtifact(contractArtifact, 'constructor');
-      if (!constructor) throw new Error(`Constructor not found in contract ABI`);
+      if (!constructor) {
+        throw new Error(`Constructor not found in contract ABI`);
+      }
 
       debugLogger(`Input arguments: ${rawArgs.map((x: any) => `"${x}"`).join(', ')}`);
       const args = encodeArgs(rawArgs, constructorArtifact!.parameters);
@@ -295,8 +299,11 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const client = await createCompatibleClient(options.rpcUrl, debugLogger);
       const address = options.contractAddress;
       const isDeployed = await isContractDeployed(client, address);
-      if (isDeployed) log(`\nContract found at ${address.toString()}\n`);
-      else log(`\nNo contract found at ${address.toString()}\n`);
+      if (isDeployed) {
+        log(`\nContract found at ${address.toString()}\n`);
+      } else {
+        log(`\nNo contract found at ${address.toString()}\n`);
+      }
     });
 
   program
@@ -392,8 +399,12 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const pxe = await createCompatibleClient(rpcUrl, debugLogger);
 
       if (follow) {
-        if (txHash) throw Error('Cannot use --follow with --tx-hash');
-        if (toBlock) throw Error('Cannot use --follow with --to-block');
+        if (txHash) {
+          throw Error('Cannot use --follow with --tx-hash');
+        }
+        if (toBlock) {
+          throw Error('Cannot use --follow with --to-block');
+        }
       }
 
       const filter: LogFilter = { txHash, fromBlock, toBlock, afterLog, contractAddress, selector };
@@ -407,9 +418,13 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
             .filter(([, value]) => value !== undefined)
             .map(([key, value]) => `${key}: ${value}`)
             .join(', ');
-          if (!follow) log(`No logs found for filter: {${filterOptions}}`);
+          if (!follow) {
+            log(`No logs found for filter: {${filterOptions}}`);
+          }
         } else {
-          if (!follow && !filter.afterLog) log('Logs found: \n');
+          if (!follow && !filter.afterLog) {
+            log('Logs found: \n');
+          }
           logs.forEach(unencryptedLog => log(unencryptedLog.toHumanReadable()));
           // Set the continuation parameter for the following requests
           filter.afterLog = logs[logs.length - 1].id;
@@ -421,7 +436,9 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
         log('Fetching logs...');
         while (true) {
           const maxLogsHit = await fetchLogs();
-          if (!maxLogsHit) await sleep(1000);
+          if (!maxLogsHit) {
+            await sleep(1000);
+          }
         }
       } else {
         while (await fetchLogs()) {
@@ -723,7 +740,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       await update(projectPath, contract, options.rpcUrl, options.sandboxVersion, log, debugLogger);
     });
 
-  compileContract(program, 'compile', log);
+  compileNoir(program, 'compile', log);
   generateTypescriptInterface(program, 'generate-typescript', log);
   generateNoirInterface(program, 'generate-noir-interface', log);
 

package/src/update/npm.ts

@@ -17,6 +17,8 @@ import { DependencyChanges } from './common.js';
 export async function readPackageJson(projectPath: string): Promise<{
   /** dependencies */
   dependencies?: Record<string, string>;
+  /** devDependencies */
+  devDependencies?: Record<string, string>;
 }> {
   const configFilepath = resolve(join(projectPath, 'package.json'));
   const pkg = JSON.parse(await readFile(configFilepath, 'utf-8'));
@@ -63,31 +65,34 @@ export async function updateAztecDeps(
     dependencies: [],
   };
 
-  if (!pkg.dependencies) {
-    return changes;
-  }
-
   log(`Updating @aztec packages to ${aztecVersion} in ${relative(process.cwd(), changes.file)}`);
   const version = aztecVersion.version;
 
-  for (const name of Object.keys(pkg.dependencies)) {
-    if (!name.startsWith('@aztec/')) {
-      continue;
-    }
-
-    // different release schedule
-    if (name === '@aztec/aztec-ui') {
+  for (const depType of ['dependencies', 'devDependencies'] as const) {
+    const dependencies = pkg[depType];
+    if (!dependencies) {
       continue;
     }
 
-    if (pkg.dependencies[name] !== version) {
-      changes.dependencies.push({
-        name,
-        from: pkg.dependencies[name],
-        to: version,
-      });
-
-      pkg.dependencies[name] = version;
+    for (const name of Object.keys(dependencies)) {
+      if (!name.startsWith('@aztec/')) {
+        continue;
+      }
+
+      // different release schedule
+      if (name === '@aztec/aztec-ui') {
+        continue;
+      }
+
+      if (dependencies[name] !== version) {
+        changes.dependencies.push({
+          name,
+          from: dependencies[name],
+          to: version,
+        });
+
+        dependencies[name] = version;
+      }
     }
   }
 

package/src/update/update.ts

@@ -98,7 +98,13 @@ async function getNpmSandboxVersion(projectPath: string, log: LogFn): Promise<Se
   try {
     const pkg = await readPackageJson(projectPath);
     // use coerce instead of parse because it eliminates semver operators like ~ and ^
-    return coerce(pkg.dependencies?.[SANDBOX_PACKAGE]);
+    if (pkg.dependencies?.[SANDBOX_PACKAGE]) {
+      return coerce(pkg.dependencies[SANDBOX_PACKAGE]);
+    } else if (pkg.devDependencies?.[SANDBOX_PACKAGE]) {
+      return coerce(pkg.devDependencies[SANDBOX_PACKAGE]);
+    } else {
+      return null;
+    }
   } catch (err) {
     if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
       log(`No package.json found in ${projectPath}`);