@aztec/cli 0.8.10 → 0.8.11

package/README.md

@@ -387,29 +387,29 @@ aztec-cli parse-parameter-struct 0xabcdef1234567890abcdef1234567890abcdef1234567
 
 ### get-logs
 
-Gets all the unencrypted logs from L2 blocks in the specified range.
+Applies filter and returns the resulting unencrypted logs.
+The filter is applied by doing an intersection of all its params.
 
 Syntax:
 
 ```shell
-aztec-cli get-logs --from <number> --limit <number> [options]
+aztec-cli get-logs --fromBlock <number>
 ```
-
-- `from`: Block number to start fetching logs from.
-- `limit`: Maximum number of block logs to obtain.
-
 Options:
 
 - `-u, --rpc-url <string>`: URL of PXE Service. Default: `http://localhost:8080`.
 
-This command retrieves and displays all the unencrypted logs from L2 blocks in the specified range. It shows the logs found in the blocks and unrolls them for readability.
-
+This command retrieves and displays all the unencrypted logs from L2 blocks in the specified range or from a specific transaction.
 Example usage:
 
 ```shell
-aztec-cli get-logs --from 1000 --limit 10
+aztec-cli get-logs --txHash 21fef567e01f8508e30843ebcef9c5f6ff27b29d66783cfcdbd070c3a9174234
+aztec-cli get-logs --fromBlock 4 --toBlock 5 --contractAddress 0x1db5f68861c5960c37205d3d5b23466240359c115c49e45982865ea7ace69a02
+aztec-cli get-logs --fromBlock 4 --toBlock 5 --contractAddress 0x1db5f68861c5960c37205d3d5b23466240359c115c49e45982865ea7ace69a02 --selector 00000005
 ```
 
+Run `aztec-cli get-logs --help` for more information on the filtering options.
+
 ### block-number
 
 Gets the current Aztec L2 block number.

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAM3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AA8B5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CA4gBxE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAmC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAijBxE"}

package/dest/index.js

@@ -1,9 +1,10 @@
 import { Contract, ContractDeployer, Fr, GrumpkinScalar, NotePreimage, generatePublicKey, getSchnorrAccount, isContractDeployed, } from '@aztec/aztec.js';
 import { decodeFunctionSignatureWithParameterNames } from '@aztec/foundation/abi';
 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 { CompleteAddress, L2BlockL2Logs } from '@aztec/types';
+import { CompleteAddress } from '@aztec/types';
 import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
 import { Command, Option } from 'commander';
 import { readFileSync } from 'fs';
@@ -13,7 +14,7 @@ import { mnemonicToAccount } from 'viem/accounts';
 import { createCompatibleClient } from './client.js';
 import { encodeArgs, parseStructString } from './encoding.js';
 import { unboxContract } from './unbox.js';
-import { deployAztecContracts, getContractArtifact, getExampleContractArtifacts, getFunctionArtifact, getTxSender, parseAztecAddress, parseField, parseFields, parsePartialAddress, parsePrivateKey, parsePublicKey, parseSaltFromHexString, parseTxHash, prepTx, } from './utils.js';
+import { deployAztecContracts, getContractArtifact, getExampleContractArtifacts, getFunctionArtifact, getTxSender, parseAztecAddress, parseField, parseFields, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalSelector, parseOptionalTxHash, parsePartialAddress, parsePrivateKey, parsePublicKey, parseSaltFromHexString, parseTxHash, prepTx, } from './utils.js';
 const accountCreationSalt = Fr.ZERO;
 const { ETHEREUM_HOST = 'http://localhost:8545', PRIVATE_KEY, API_KEY } = process.env;
 /**
@@ -144,7 +145,8 @@ export function getProgram(log, debugLogger) {
             log(`\nContract deployed at ${deployed.contractAddress.toString()}\n`);
         }
         else {
-            log(`\nDeployment transaction hash: ${txHash}\n`);
+            log(`\nContract Address: ${tx.completeContractAddress?.address.toString() ?? 'N/A'}`);
+            log(`Deployment transaction hash: ${txHash}\n`);
         }
     });
     program
@@ -207,22 +209,56 @@ export function getProgram(log, debugLogger) {
     });
     program
         .command('get-logs')
-        .description('Gets all the unencrypted logs from L2 blocks in the range specified.')
-        .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).')
+        .description('Gets all the unencrypted logs from an intersection of all the filter params.')
+        .option('-tx, --tx-hash <txHash>', 'A transaction hash to get the receipt for.', parseOptionalTxHash)
+        .option('-fb, --from-block <blockNum>', 'Initial block number for getting logs (defaults to 1).', parseOptionalInteger)
+        .option('-tb, --to-block <blockNum>', 'Up to which block to fetch logs (defaults to latest).', parseOptionalInteger)
+        .option('-al --after-log <logId>', 'ID of a log after which to fetch the logs.', parseOptionalLogId)
+        .option('-ca, --contract-address <address>', 'Contract address to filter logs by.', parseOptionalAztecAddress)
+        .option('-s, --selector <hex string>', 'Event selector to filter logs by.', parseOptionalSelector)
         .addOption(pxeOption)
-        .action(async (options) => {
-        const { from, limit } = options;
-        const fromBlock = from ? parseInt(from) : 1;
-        const limitCount = limit ? parseInt(limit) : 100;
-        const client = await createCompatibleClient(options.rpcUrl, debugLogger);
-        const logs = await client.getUnencryptedLogs(fromBlock, limitCount);
-        if (!logs.length) {
-            log(`No logs found in blocks ${fromBlock} to ${fromBlock + limitCount}`);
+        .option('--follow', 'If set, will keep polling for new logs until interrupted.')
+        .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, selector, rpcUrl, follow }) => {
+        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');
+        }
+        const filter = { txHash, fromBlock, toBlock, afterLog, contractAddress, selector };
+        const fetchLogs = async () => {
+            const response = await pxe.getUnencryptedLogs(filter);
+            const logs = response.logs;
+            if (!logs.length) {
+                const filterOptions = Object.entries(filter)
+                    .filter(([, value]) => value !== undefined)
+                    .map(([key, value]) => `${key}: ${value}`)
+                    .join(', ');
+                if (!follow)
+                    log(`No logs found for filter: {${filterOptions}}`);
+            }
+            else {
+                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;
+            }
+            return response.maxLogsHit;
+        };
+        if (follow) {
+            log('Fetching logs...');
+            while (true) {
+                const maxLogsHit = await fetchLogs();
+                if (!maxLogsHit)
+                    await sleep(1000);
+            }
         }
         else {
-            log('Logs found: \n');
-            L2BlockL2Logs.unrollLogs(logs).forEach(fnLog => log(`${fnLog.toString('ascii')}\n`));
+            while (await fetchLogs()) {
+                // Keep fetching logs until we reach the end.
+            }
         }
     });
     program
@@ -318,7 +354,7 @@ export function getProgram(log, debugLogger) {
         const wallet = await getSchnorrAccount(client, privateKey, privateKey, accountCreationSalt).getWallet();
         const contract = await Contract.at(contractAddress, contractArtifact, wallet);
         const tx = contract.methods[functionName](...functionArgs).send();
-        log(`Transaction hash: ${(await tx.getTxHash()).toString()}`);
+        log(`\nTransaction hash: ${(await tx.getTxHash()).toString()}`);
         if (options.wait) {
             await tx.wait();
             log('Transaction has been mined');
@@ -328,7 +364,7 @@ export function getProgram(log, debugLogger) {
             log(`Block hash: ${receipt.blockHash?.toString('hex')}`);
         }
         else {
-            log('\nTransaction pending. Check status with get-tx-receipt');
+            log('Transaction pending. Check status with get-tx-receipt');
         }
     });
     program
@@ -445,4 +481,4 @@ export function getProgram(log, debugLogger) {
     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,EACL,QAAQ,EACR,gBAAgB,EAChB,EAAE,EACF,cAAc,EACd,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAc,yCAAyC,EAAE,MAAM,uBAAuB,CAAC;AAC9F,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,eAAe,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,eAAe,EAA2B,MAAM,cAAc,CAAC;AAExE,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,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,2BAA2B,EAC3B,mBAAmB,EACnB,WAAW,EACX,iBAAiB,EACjB,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,OAAO,GAAW,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC;IAErF,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,iCAAiC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAE1F,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,KAAK,EAAC,OAAO,EAAC,EAAE;QACtB,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,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,UAAW,CAAC,CAAC,CAAC;YAC5F,SAAS,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;SAC1C;aAAM;YACL,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC;YACpC,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,SAAS,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;SAC1C;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,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAClF,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;YAAE,GAAG,CAAC,oBAAoB,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5E,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,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,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QAC/E,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,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;YAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAE3E,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,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,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,eAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACzE;aAAM;YACL,GAAG,CAAC,uBAAuB,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YACtF,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;YAAE,GAAG,CAAC,uBAAuB,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;;YAC9D,GAAG,CAAC,0BAA0B,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEL,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;gBAAE,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;YAC9D,IAAI,OAAO;gBAAE,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACjE;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;oBAAE,GAAG,CAAC,8BAA8B,aAAa,GAAG,CAAC,CAAC;aAClE;iBAAM;gBACL,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ;oBAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBACvD,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;oBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;aACpC;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,MAAM,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;QACjG,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,kCAAkC,EAAE,gBAAgB,EAAE,EAAE,CAAC;SACxE,SAAS,CAAC,SAAS,CAAC;SACpB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACvE,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAChF,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,CAAC,kBAAkB,EAAE,kFAAkF,CAAC;SAChH,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,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3D,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,SAAS,GAAG,yCAAyC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;YACpF,GAAG,CAAC,GAAG,EAAE,CAAC,YAAY,IAAI,SAAS,EAAE,CAAC,CAAC;SACxC;IACH,CAAC,CAAC,CAAC;IAEL,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;IACzC,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/utils.d.ts

@@ -1,6 +1,7 @@
-import { AztecAddress, Fr, GrumpkinScalar, PXE, Point, TxHash } from '@aztec/aztec.js';
+import { AztecAddress, Fr, FunctionSelector, GrumpkinScalar, PXE, Point, TxHash } from '@aztec/aztec.js';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
+import { LogId } from '@aztec/types';
 /**
  * Helper type to dynamically import contracts.
  */
@@ -66,39 +67,82 @@ export declare const stripLeadingHex: (hex: string) => string;
  */
 export declare function parseSaltFromHexString(str: string): Fr;
 /**
- * Parses an AztecAddress from a string. Throws InvalidArgumentError if the string is not a valid.
- * @param address - A serialised Aztec address
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
  * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export declare function parseAztecAddress(address: string): AztecAddress;
 /**
- * Parses a TxHash from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
+ * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseOptionalAztecAddress(address: string): AztecAddress | undefined;
+/**
+ * Parses an optional log ID string into a LogId object.
+ *
+ * @param logId - The log ID string to parse.
+ * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
+ */
+export declare function parseOptionalLogId(logId: string): LogId | undefined;
+/**
+ * Parses a selector from a string.
+ * @param selector - A serialized selector.
+ * @returns A selector.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseOptionalSelector(selector: string): FunctionSelector | undefined;
+/**
+ * Parses a string into an integer or returns undefined if the input is falsy.
+ *
+ * @param value - The string to parse into an integer.
+ * @returns The parsed integer, or undefined if the input string is falsy.
+ * @throws If the input is not a valid integer.
+ */
+export declare function parseOptionalInteger(value: string): number | undefined;
+/**
+ * Parses a TxHash from a string.
  * @param txHash - A transaction hash
  * @returns A TxHash instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export declare function parseTxHash(txHash: string): TxHash;
 /**
- * Parses a public key from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses an optional TxHash from a string.
+ * Calls parseTxHash internally.
+ * @param txHash - A transaction hash
+ * @returns A TxHash instance, or undefined if the input string is falsy.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export declare function parseOptionalTxHash(txHash: string): TxHash | undefined;
+/**
+ * Parses a public key from a string.
  * @param publicKey - A public key
  * @returns A Point instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export declare function parsePublicKey(publicKey: string): Point;
 /**
- * Parses a partial address from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses a partial address from a string.
  * @param address - A partial address
  * @returns A Fr instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export declare function parsePartialAddress(address: string): Fr;
 /**
- * Parses a private key from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses a private key from a string.
  * @param privateKey - A string
  * @returns A private key
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export declare function parsePrivateKey(privateKey: string): GrumpkinScalar;
 /**
- * Parses a field from a string. Throws InvalidArgumentError if the string is not a valid field value.
+ * Parses a field from a string.
  * @param field - A string representing the field.
  * @returns A field.
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export declare function parseField(field: string): Fr;
 /**

package/dest/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAoB3D;;GAEG;AACH,UAAU,aAAa;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,oDAM7E;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,wDA2BzB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,2BAGhD;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BAuBpE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,yBAgBzD;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;GAM3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CActD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMlD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAMvD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,EAAE,CAMvD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAYlE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,CAyB5C;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAElD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAa3D,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAQrC;;GAEG;AACH,UAAU,aAAa;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACjC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,oDAM7E;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,WAAW,wDA2BzB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,2BAGhD;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BAuBpE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,yBAgBzD;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;GAM3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAAS,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CActD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAKnE;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CASpF;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAStE;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMlD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKtE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,EAAE,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAYlE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,CAyB5C;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAElD"}

package/dest/utils.js

@@ -1,6 +1,7 @@
-import { AztecAddress, Fr, GrumpkinScalar, Point, TxHash } from '@aztec/aztec.js';
+import { AztecAddress, Fr, FunctionSelector, GrumpkinScalar, Point, TxHash } from '@aztec/aztec.js';
 import { createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
 import { ContractDeploymentEmitterAbi, ContractDeploymentEmitterBytecode, InboxAbi, InboxBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RollupAbi, RollupBytecode, } from '@aztec/l1-artifacts';
+import { LogId } from '@aztec/types';
 import { InvalidArgumentError } from 'commander';
 import fs from 'fs';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
@@ -158,9 +159,10 @@ export function parseSaltFromHexString(str) {
     return Fr.fromBuffer(Buffer.from(padded, 'hex'));
 }
 /**
- * Parses an AztecAddress from a string. Throws InvalidArgumentError if the string is not a valid.
- * @param address - A serialised Aztec address
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
  * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parseAztecAddress(address) {
     try {
@@ -171,9 +173,68 @@ export function parseAztecAddress(address) {
     }
 }
 /**
- * Parses a TxHash from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
+ * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export function parseOptionalAztecAddress(address) {
+    if (!address) {
+        return undefined;
+    }
+    return parseAztecAddress(address);
+}
+/**
+ * Parses an optional log ID string into a LogId object.
+ *
+ * @param logId - The log ID string to parse.
+ * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
+ */
+export function parseOptionalLogId(logId) {
+    if (!logId) {
+        return undefined;
+    }
+    return LogId.fromString(logId);
+}
+/**
+ * Parses a selector from a string.
+ * @param selector - A serialized selector.
+ * @returns A selector.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export function parseOptionalSelector(selector) {
+    if (!selector) {
+        return undefined;
+    }
+    try {
+        return FunctionSelector.fromString(selector);
+    }
+    catch {
+        throw new InvalidArgumentError(`Invalid selector: ${selector}`);
+    }
+}
+/**
+ * Parses a string into an integer or returns undefined if the input is falsy.
+ *
+ * @param value - The string to parse into an integer.
+ * @returns The parsed integer, or undefined if the input string is falsy.
+ * @throws If the input is not a valid integer.
+ */
+export function parseOptionalInteger(value) {
+    if (!value) {
+        return undefined;
+    }
+    const parsed = Number(value);
+    if (!Number.isInteger(parsed)) {
+        throw new InvalidArgumentError('Invalid integer.');
+    }
+    return parsed;
+}
+/**
+ * Parses a TxHash from a string.
  * @param txHash - A transaction hash
  * @returns A TxHash instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parseTxHash(txHash) {
     try {
@@ -184,9 +245,23 @@ export function parseTxHash(txHash) {
     }
 }
 /**
- * Parses a public key from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses an optional TxHash from a string.
+ * Calls parseTxHash internally.
+ * @param txHash - A transaction hash
+ * @returns A TxHash instance, or undefined if the input string is falsy.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export function parseOptionalTxHash(txHash) {
+    if (!txHash) {
+        return undefined;
+    }
+    return parseTxHash(txHash);
+}
+/**
+ * Parses a public key from a string.
  * @param publicKey - A public key
  * @returns A Point instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parsePublicKey(publicKey) {
     try {
@@ -197,9 +272,10 @@ export function parsePublicKey(publicKey) {
     }
 }
 /**
- * Parses a partial address from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses a partial address from a string.
  * @param address - A partial address
  * @returns A Fr instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parsePartialAddress(address) {
     try {
@@ -210,9 +286,10 @@ export function parsePartialAddress(address) {
     }
 }
 /**
- * Parses a private key from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses a private key from a string.
  * @param privateKey - A string
  * @returns A private key
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parsePrivateKey(privateKey) {
     try {
@@ -228,9 +305,10 @@ export function parsePrivateKey(privateKey) {
     }
 }
 /**
- * Parses a field from a string. Throws InvalidArgumentError if the string is not a valid field value.
+ * Parses a field from a string.
  * @param field - A string representing the field.
  * @returns A field.
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parseField(field) {
     try {
@@ -263,4 +341,4 @@ export function parseField(field) {
 export function parseFields(fields) {
     return fields.map(parseField);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxFQUFFLEVBQUUsY0FBYyxFQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN2RixPQUFPLEVBQW9DLG1CQUFtQixFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHM0csT0FBTyxFQUNMLDRCQUE0QixFQUM1QixpQ0FBaUMsRUFDakMsUUFBUSxFQUNSLGFBQWEsRUFDYixTQUFTLEVBQ1QsY0FBYyxFQUNkLFdBQVcsRUFDWCxnQkFBZ0IsRUFDaEIsU0FBUyxFQUNULGNBQWMsR0FDZixNQUFNLHFCQUFxQixDQUFDO0FBRTdCLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNqRCxPQUFPLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDcEIsT0FBTyxFQUFFLGlCQUFpQixFQUFFLG1CQUFtQixFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXZFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFTM0M7Ozs7O0dBS0c7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBQUMsUUFBMEIsRUFBRSxNQUFjO0lBQzVFLE1BQU0sRUFBRSxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxDQUFDO0lBQ2xFLElBQUksQ0FBQyxFQUFFLEVBQUU7UUFDUCxNQUFNLEtBQUssQ0FBQyxZQUFZLE1BQU0sNkJBQTZCLENBQUMsQ0FBQztLQUM5RDtJQUNELE9BQU8sRUFBRSxDQUFDO0FBQ1osQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsb0JBQW9CLENBQ3hDLE1BQWMsRUFDZCxNQUFjLEVB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzG,OAAO,EAAoC,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAG3G,OAAO,EACL,4BAA4B,EAC5B,iCAAiC,EACjC,QAAQ,EACR,aAAa,EACb,SAAS,EACT,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,cAAc,GACf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAS3C;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAA0B,EAAE,MAAc;IAC5E,MAAM,EAAE,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAClE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,KAAK,CAAC,YAAY,MAAM,6BAA6B,CAAC,CAAC;KAC9D;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,MAAc,EACd,UAAkB,EAClB,QAAgB,EAChB,WAAwB;IAExB,MAAM,OAAO,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;IACpG,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClD,MAAM,WAAW,GAAqC;QACpD,yBAAyB,EAAE;YACzB,WAAW,EAAE,4BAA4B;YACzC,gBAAgB,EAAE,iCAAiC;SACpD;QACD,QAAQ,EAAE;YACR,WAAW,EAAE,WAAW;YACxB,gBAAgB,EAAE,gBAAgB;SACnC;QACD,KAAK,EAAE;YACL,WAAW,EAAE,QAAQ;YACrB,gBAAgB,EAAE,aAAa;SAChC;QACD,MAAM,EAAE;YACN,WAAW,EAAE,SAAS;YACtB,gBAAgB,EAAE,cAAc;SACjC;QACD,MAAM,EAAE;YACN,WAAW,EAAE,SAAS;YACtB,gBAAgB,EAAE,cAAc;SACjC;KACF,CAAC;IACF,OAAO,MAAM,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AACnG,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B;IAC/C,MAAM,SAAS,GAAkB,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACjF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAe,EAAE,GAAU;IACnE,+CAA+C;IAC/C,IAAI,QAAgB,CAAC;IACrB,MAAM,SAAS,GAAG,MAAM,2BAA2B,EAAE,CAAC;IACtD,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE;QACtB,OAAO,SAAS,CAAC,OAAO,CAAqB,CAAC;KAC/C;IAED,IAAI;QACF,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC7C;IAAC,MAAM;QACN,MAAM,KAAK,CAAC,YAAY,OAAO,YAAY,CAAC,CAAC;KAC9C;IAED,6CAA6C;IAC7C,IAAI,gBAAkC,CAAC;IACvC,IAAI;QACF,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAqB,CAAC;KAC7D;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,sCAAsC,CAAC,CAAC;QAC5C,MAAM,GAAG,CAAC;KACX;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAQ,EAAE,KAAc;IACxD,IAAI,IAAkB,CAAC;IACvB,IAAI,KAAK,EAAE;QACT,IAAI;YACF,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACvC;QAAC,MAAM;YACN,MAAM,IAAI,oBAAoB,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAC;SAC1E;KACF;SAAM;QACL,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,qBAAqB,EAAE,CAAC;QACnD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;KAC5B;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,YAAoB,EAAE,YAAoB,EAAE,aAAuB,EAAE,GAAU;IAC1G,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAC7E,MAAM,YAAY,GAAG,UAAU,CAAC,aAAa,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAE5E,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC;AAC5C,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,EAAE;IAC7C,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAC1C,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACzB;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IAEjC,2BAA2B;IAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE;QAC9B,MAAM,IAAI,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;KACtD;IAED,6CAA6C;IAC7C,qDAAqD;IACrD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAEtD,mCAAmC;IACnC,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI;QACF,OAAO,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KACzC;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;KAC/D;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,SAAS,CAAC;KAClB;IACD,IAAI;QACF,OAAO,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;KAC9C;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;KACjE;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;QAC7B,MAAM,IAAI,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;KACpD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,IAAI;QACF,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAClC;IAAC,MAAM;QACN,MAAM,IAAI,oBAAoB,CAAC,6BAA6B,MAAM,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,IAAI;QACF,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;KACpC;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,uBAAuB,SAAS,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,IAAI;QACF,OAAO,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,4BAA4B,OAAO,EAAE,CAAC,CAAC;KACvE;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI;QACF,MAAM,KAAK,GAAG,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpD,+CAA+C;QAC/C,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;SACjD;QAED,OAAO,KAAK,CAAC;KACd;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,wBAAwB,UAAU,EAAE,CAAC,CAAC;KACtE;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,IAAI;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC,aAAa,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5G,IAAI,KAAK,EAAE;YACT,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACrC,OAAO,IAAI,EAAE,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;SACjC;QAED,MAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC;QACzC,IAAI,QAAQ,EAAE;YACZ,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SAC9B;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,EAAE;YACZ,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;QAED,OAAO,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KAC9B;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,IAAI,oBAAoB,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;KAC3D;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,MAAgB;IAC1C,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "type": "module",
   "main": "./dest/index.js",
   "bin": {
@@ -34,13 +34,13 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.8.10",
-    "@aztec/ethereum": "0.8.10",
-    "@aztec/foundation": "0.8.10",
-    "@aztec/l1-artifacts": "0.8.10",
-    "@aztec/noir-compiler": "0.8.10",
-    "@aztec/noir-contracts": "0.8.10",
-    "@aztec/types": "0.8.10",
+    "@aztec/aztec.js": "0.8.11",
+    "@aztec/ethereum": "0.8.11",
+    "@aztec/foundation": "0.8.11",
+    "@aztec/l1-artifacts": "0.8.11",
+    "@aztec/noir-compiler": "0.8.11",
+    "@aztec/noir-contracts": "0.8.11",
+    "@aztec/types": "0.8.11",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^9.0.0",
     "jszip": "^3.10.1",

package/src/index.ts

@@ -11,9 +11,10 @@ import {
 import { StructType, decodeFunctionSignatureWithParameterNames } from '@aztec/foundation/abi';
 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 { CompleteAddress, ContractData, L2BlockL2Logs } from '@aztec/types';
+import { CompleteAddress, ContractData, LogFilter } from '@aztec/types';
 
 import { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
 import { Command, Option } from 'commander';
@@ -34,6 +35,11 @@ import {
   parseAztecAddress,
   parseField,
   parseFields,
+  parseOptionalAztecAddress,
+  parseOptionalInteger,
+  parseOptionalLogId,
+  parseOptionalSelector,
+  parseOptionalTxHash,
   parsePartialAddress,
   parsePrivateKey,
   parsePublicKey,
@@ -219,7 +225,8 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
         const deployed = await tx.wait();
         log(`\nContract deployed at ${deployed.contractAddress!.toString()}\n`);
       } else {
-        log(`\nDeployment transaction hash: ${txHash}\n`);
+        log(`\nContract Address: ${tx.completeContractAddress?.address.toString() ?? 'N/A'}`);
+        log(`Deployment transaction hash: ${txHash}\n`);
       }
     });
 
@@ -288,22 +295,58 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
 
   program
     .command('get-logs')
-    .description('Gets all the unencrypted logs from L2 blocks in the range specified.')
-    .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).')
+    .description('Gets all the unencrypted logs from an intersection of all the filter params.')
+    .option('-tx, --tx-hash <txHash>', 'A transaction hash to get the receipt for.', parseOptionalTxHash)
+    .option(
+      '-fb, --from-block <blockNum>',
+      'Initial block number for getting logs (defaults to 1).',
+      parseOptionalInteger,
+    )
+    .option('-tb, --to-block <blockNum>', 'Up to which block to fetch logs (defaults to latest).', parseOptionalInteger)
+    .option('-al --after-log <logId>', 'ID of a log after which to fetch the logs.', parseOptionalLogId)
+    .option('-ca, --contract-address <address>', 'Contract address to filter logs by.', parseOptionalAztecAddress)
+    .option('-s, --selector <hex string>', 'Event selector to filter logs by.', parseOptionalSelector)
     .addOption(pxeOption)
-    .action(async options => {
-      const { from, limit } = options;
-      const fromBlock = from ? parseInt(from) : 1;
-      const limitCount = limit ? parseInt(limit) : 100;
+    .option('--follow', 'If set, will keep polling for new logs until interrupted.')
+    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, selector, rpcUrl, follow }) => {
+      const pxe = await createCompatibleClient(rpcUrl, debugLogger);
 
-      const client = await createCompatibleClient(options.rpcUrl, debugLogger);
-      const logs = await client.getUnencryptedLogs(fromBlock, limitCount);
-      if (!logs.length) {
-        log(`No logs found in blocks ${fromBlock} to ${fromBlock + limitCount}`);
+      if (follow) {
+        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 };
+
+      const fetchLogs = async () => {
+        const response = await pxe.getUnencryptedLogs(filter);
+        const logs = response.logs;
+
+        if (!logs.length) {
+          const filterOptions = Object.entries(filter)
+            .filter(([, value]) => value !== undefined)
+            .map(([key, value]) => `${key}: ${value}`)
+            .join(', ');
+          if (!follow) log(`No logs found for filter: {${filterOptions}}`);
+        } else {
+          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;
+        }
+        return response.maxLogsHit;
+      };
+
+      if (follow) {
+        log('Fetching logs...');
+        while (true) {
+          const maxLogsHit = await fetchLogs();
+          if (!maxLogsHit) await sleep(1000);
+        }
       } else {
-        log('Logs found: \n');
-        L2BlockL2Logs.unrollLogs(logs).forEach(fnLog => log(`${fnLog.toString('ascii')}\n`));
+        while (await fetchLogs()) {
+          // Keep fetching logs until we reach the end.
+        }
       }
     });
 
@@ -416,7 +459,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
       const wallet = await getSchnorrAccount(client, privateKey, privateKey, accountCreationSalt).getWallet();
       const contract = await Contract.at(contractAddress, contractArtifact, wallet);
       const tx = contract.methods[functionName](...functionArgs).send();
-      log(`Transaction hash: ${(await tx.getTxHash()).toString()}`);
+      log(`\nTransaction hash: ${(await tx.getTxHash()).toString()}`);
       if (options.wait) {
         await tx.wait();
 
@@ -427,7 +470,7 @@ export function getProgram(log: LogFn, debugLogger: DebugLogger): Command {
         log(`Block number: ${receipt.blockNumber}`);
         log(`Block hash: ${receipt.blockHash?.toString('hex')}`);
       } else {
-        log('\nTransaction pending. Check status with get-tx-receipt');
+        log('Transaction pending. Check status with get-tx-receipt');
       }
     });
 

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, Fr, GrumpkinScalar, PXE, Point, TxHash } from '@aztec/aztec.js';
+import { AztecAddress, Fr, FunctionSelector, GrumpkinScalar, PXE, Point, TxHash } from '@aztec/aztec.js';
 import { L1ContractArtifactsForDeployment, createEthereumChain, deployL1Contracts } from '@aztec/ethereum';
 import { ContractArtifact } from '@aztec/foundation/abi';
 import { DebugLogger, LogFn } from '@aztec/foundation/log';
@@ -14,6 +14,7 @@ import {
   RollupAbi,
   RollupBytecode,
 } from '@aztec/l1-artifacts';
+import { LogId } from '@aztec/types';
 
 import { InvalidArgumentError } from 'commander';
 import fs from 'fs';
@@ -197,9 +198,10 @@ export function parseSaltFromHexString(str: string): Fr {
 }
 
 /**
- * Parses an AztecAddress from a string. Throws InvalidArgumentError if the string is not a valid.
- * @param address - A serialised Aztec address
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
  * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parseAztecAddress(address: string): AztecAddress {
   try {
@@ -210,9 +212,71 @@ export function parseAztecAddress(address: string): AztecAddress {
 }
 
 /**
- * Parses a TxHash from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses an AztecAddress from a string.
+ * @param address - A serialized Aztec address
+ * @returns An Aztec address
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export function parseOptionalAztecAddress(address: string): AztecAddress | undefined {
+  if (!address) {
+    return undefined;
+  }
+  return parseAztecAddress(address);
+}
+
+/**
+ * Parses an optional log ID string into a LogId object.
+ *
+ * @param logId - The log ID string to parse.
+ * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
+ */
+export function parseOptionalLogId(logId: string): LogId | undefined {
+  if (!logId) {
+    return undefined;
+  }
+  return LogId.fromString(logId);
+}
+
+/**
+ * Parses a selector from a string.
+ * @param selector - A serialized selector.
+ * @returns A selector.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export function parseOptionalSelector(selector: string): FunctionSelector | undefined {
+  if (!selector) {
+    return undefined;
+  }
+  try {
+    return FunctionSelector.fromString(selector);
+  } catch {
+    throw new InvalidArgumentError(`Invalid selector: ${selector}`);
+  }
+}
+
+/**
+ * Parses a string into an integer or returns undefined if the input is falsy.
+ *
+ * @param value - The string to parse into an integer.
+ * @returns The parsed integer, or undefined if the input string is falsy.
+ * @throws If the input is not a valid integer.
+ */
+export function parseOptionalInteger(value: string): number | undefined {
+  if (!value) {
+    return undefined;
+  }
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed)) {
+    throw new InvalidArgumentError('Invalid integer.');
+  }
+  return parsed;
+}
+
+/**
+ * Parses a TxHash from a string.
  * @param txHash - A transaction hash
  * @returns A TxHash instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parseTxHash(txHash: string): TxHash {
   try {
@@ -223,9 +287,24 @@ export function parseTxHash(txHash: string): TxHash {
 }
 
 /**
- * Parses a public key from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses an optional TxHash from a string.
+ * Calls parseTxHash internally.
+ * @param txHash - A transaction hash
+ * @returns A TxHash instance, or undefined if the input string is falsy.
+ * @throws InvalidArgumentError if the input string is not valid.
+ */
+export function parseOptionalTxHash(txHash: string): TxHash | undefined {
+  if (!txHash) {
+    return undefined;
+  }
+  return parseTxHash(txHash);
+}
+
+/**
+ * Parses a public key from a string.
  * @param publicKey - A public key
  * @returns A Point instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parsePublicKey(publicKey: string): Point {
   try {
@@ -236,9 +315,10 @@ export function parsePublicKey(publicKey: string): Point {
 }
 
 /**
- * Parses a partial address from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses a partial address from a string.
  * @param address - A partial address
  * @returns A Fr instance
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parsePartialAddress(address: string): Fr {
   try {
@@ -249,9 +329,10 @@ export function parsePartialAddress(address: string): Fr {
 }
 
 /**
- * Parses a private key from a string. Throws InvalidArgumentError if the string is not a valid.
+ * Parses a private key from a string.
  * @param privateKey - A string
  * @returns A private key
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parsePrivateKey(privateKey: string): GrumpkinScalar {
   try {
@@ -268,9 +349,10 @@ export function parsePrivateKey(privateKey: string): GrumpkinScalar {
 }
 
 /**
- * Parses a field from a string. Throws InvalidArgumentError if the string is not a valid field value.
+ * Parses a field from a string.
  * @param field - A string representing the field.
  * @returns A field.
+ * @throws InvalidArgumentError if the input string is not valid.
  */
 export function parseField(field: string): Fr {
   try {