@aztec/cli 0.0.1-commit.a89ec08 → 0.0.1-commit.aa0c64f

package/dest/utils/commands.d.ts

@@ -1,13 +1,15 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import type { PXE } from '@aztec/pxe/server';
 import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import { LogId } from '@aztec/stdlib/logs/log-id';
+import { LogCursor, Tag } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx/tx-hash';
 import { type Command, Option } from 'commander';
+export { LogCursor };
 /**
  * If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
  * localhost as being host.docker.internal.
@@ -19,7 +21,7 @@ export declare function addOptions(program: Command, options: Option[]): Command
 export declare const makeNodeOption: (mandatory: boolean) => Option;
 export declare const nodeOption: Option;
 export declare const l1ChainIdOption: Option;
-export declare const createSecretKeyOption: (description: string, mandatory: boolean, argsParser?: ((value: string, previous: Fr) => Fr) | undefined) => Option;
+export declare const createSigningKeyOption: (description: string, mandatory: boolean, argsParser?: ((value: string, previous: import("@aztec/foundation/curves/bn254").Fq) => import("@aztec/foundation/curves/bn254").Fq) | undefined) => Option;
 export declare const logJson: (log: LogFn) => (obj: object) => void;
 /**
  * Updates a file in place atomically.
@@ -73,12 +75,19 @@ export declare function parseEthereumAddress(address: string): EthAddress;
  */
 export declare function parseOptionalAztecAddress(address: string): AztecAddress | undefined;
 /**
- * Parses an optional log ID string into a LogId object.
+ * Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
+ * used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
+ * Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
+ * {@link InvalidArgumentError}.
+ */
+export declare function parseOptionalLogCursor(value: string): LogCursor | undefined;
+/**
+ * Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
  *
- * @param logId - The log ID string to parse.
- * @returns The parsed LogId object, or undefined if the log ID is missing or empty.
+ * @param tag - A hex string, integer, or boolean string representing the tag.
+ * @returns A {@link Tag} wrapping the parsed field.
  */
-export declare function parseOptionalLogId(logId: string): LogId | undefined;
+export declare function parseTag(tag: string): Tag;
 /**
  * Parses a selector from a string.
  * @param selector - A serialized selector.
@@ -124,12 +133,12 @@ export declare function parsePublicKey(publicKey: string): PublicKeys | undefine
  */
 export declare function parsePartialAddress(address: string): Fr;
 /**
- * Parses a secret key from a string.
- * @param privateKey - A string
- * @returns A secret key
+ * Parses an account signing key from a string.
+ * @param signingKey - A string
+ * @returns A signing key
  * @throws InvalidArgumentError if the input string is not valid.
  */
-export declare function parseSecretKey(secretKey: string): Fr;
+export declare function parseSigningKey(signingKey: string): GrumpkinScalar;
 /**
  * Parses a field from a string.
  * @param field - A string representing the field.
@@ -149,4 +158,4 @@ export declare function parseFields(fields: string[]): Fr[];
  * @returns A JSON string
  */
 export declare function prettyPrintJSON(data: Record<string, any>): string;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDaEQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVsRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQXdDLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUl2Rjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sWUFBWSx1QkFHSSxDQUFDO0FBRTlCLGVBQU8sTUFBTSxTQUFTLFFBQXVCLENBQUM7QUFDOUMsZUFBTyxNQUFRLGNBQWMsVUFBK0IsV0FBVyxzQkFBRSxRQUFRLHNCQUFFLE9BQU8sc0JBQUUsV0FBVyxvQkFBZ0IsQ0FBQztBQUV4SCx3QkFBZ0IsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUc3RDtBQUVELGVBQU8sTUFBTSxjQUFjLGdDQUlRLENBQUM7QUFFcEMsZUFBTyxNQUFNLFVBQVUsUUFBdUIsQ0FBQztBQUUvQyxlQUFPLE1BQU0sZUFBZSxRQVN4QixDQUFDO0FBRUwsZUFBTyxN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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9jb21tYW5kcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN2RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRWxELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBd0MsTUFBTSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBSXZGLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQztBQUVyQjs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sWUFBWSx1QkFHSSxDQUFDO0FBRTlCLGVBQU8sTUFBTSxTQUFTLFFBQXVCLENBQUM7QUFDOUMsZUFBTyxNQUFRLGNBQWMsVUFBK0IsV0FBVyxzQkFBRSxRQUFRLHNCQUFFLE9BQU8sc0JBQUUsV0FBVyxvQkFBZ0IsQ0FBQztBQUV4SCx3QkFBZ0IsVUFBVSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUc3RDtBQUVELGVBQU8sTUFBTSxjQUFjLGdD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

package/dest/utils/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/utils/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,KAAK,OAAO,EAAwC,MAAM,EAAE,MAAM,WAAW,CAAC;AAIvF,OAAO,EAAE,SAAS,EAAE,CAAC;AAErB;;;GAGG;AACH,eAAO,MAAM,YAAY,uBAGI,CAAC;AAE9B,eAAO,MAAM,SAAS,QAAuB,CAAC;AAC9C,eAAO,MAAQ,cAAc,UAA+B,WAAW,sBAAE,QAAQ,sBAAE,OAAO,sBAAE,WAAW,oBAAgB,CAAC;AAExH,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAG7D;AAED,eAAO,MAAM,cAAc,gCAIQ,CAAC;AAEpC,eAAO,MAAM,UAAU,QAAuB,CAAC;AAE/C,eAAO,MAAM,eAAe,QASxB,CAAC;AAEL,eAAO,MAAM,sBAAsB,uMAQA,CAAC;AAEpC,eAAO,MAAM,OAAO,uCAAqE,CAAC;AAE1F;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAqBxE;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,MAAM,yBAgBzD;AAED;;;;;;;GAOG;AAEH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAiBpE;AAcD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,CAqBvD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAMhE;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAM3E;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAEzC;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CASpF;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,MAAM,EACb,GAAG,GAAE,MAAgC,EACrC,GAAG,GAAE,MAAgC,GACpC,MAAM,GAAG,SAAS,CAepB;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,UAAU,GAAG,SAAS,CASxE;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,EAAE,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc,CAMlE;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;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAcjE"}

package/dest/utils/commands.js

@@ -1,13 +1,15 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import { LogId } from '@aztec/stdlib/logs/log-id';
+import { LogCursor, Tag } from '@aztec/stdlib/logs';
 import { TxHash } from '@aztec/stdlib/tx/tx-hash';
 import { CommanderError, InvalidArgumentError, Option } from 'commander';
 import { lookup } from 'dns/promises';
 import { rename, writeFile } from 'fs/promises';
+export { LogCursor };
 /**
  * If we can successfully resolve 'host.docker.internal', then we are running in a container, and we should treat
  * localhost as being host.docker.internal.
@@ -27,7 +29,7 @@ export const l1ChainIdOption = new Option('-c, --l1-chain-id <number>', 'Chain I
     }
     return parsedValue;
 });
-export const createSecretKeyOption = (description, mandatory, argsParser)=>new Option('-sk, --secret-key <string>', description).env('SECRET_KEY').argParser(argsParser ?? parseSecretKey).makeOptionMandatory(mandatory);
+export const createSigningKeyOption = (description, mandatory, argsParser)=>new Option('-sk, --signing-key <string>', description).env('SIGNING_KEY').argParser(argsParser ?? parseSigningKey).makeOptionMandatory(mandatory);
 export const logJson = (log)=>(obj)=>log(JSON.stringify(obj, null, 2));
 /**
  * Updates a file in place atomically.
@@ -61,7 +63,7 @@ export const logJson = (log)=>(obj)=>log(JSON.stringify(obj, null, 2));
     let from;
     if (_from) {
         try {
-            from = AztecAddress.fromString(_from);
+            from = AztecAddress.fromStringUnsafe(_from);
         } catch  {
             throw new InvalidArgumentError(`Invalid option 'from' passed: ${_from}`);
         }
@@ -137,7 +139,7 @@ export function parseBigint(bigint) {
  * @throws InvalidArgumentError if the input string is not valid.
  */ export function parseAztecAddress(address) {
     try {
-        return AztecAddress.fromString(address);
+        return AztecAddress.fromStringUnsafe(address);
     } catch  {
         throw new InvalidArgumentError(`Invalid Aztec address: ${address}`);
     }
@@ -166,15 +168,24 @@ export function parseBigint(bigint) {
     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;
+ * Parses an optional `<blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx>` triple into a {@link LogCursor},
+ * used as the `--after-log` argument of `get-logs` to resume pagination strictly after a previously-seen log.
+ * Thin wrapper over {@link LogCursor.parseOptional} that surfaces parse errors as commander's
+ * {@link InvalidArgumentError}.
+ */ export function parseOptionalLogCursor(value) {
+    try {
+        return LogCursor.parseOptional(value);
+    } catch (err) {
+        throw new InvalidArgumentError(err instanceof Error ? err.message : String(err));
     }
-    return LogId.fromString(logId);
+}
+/**
+ * Parses a log tag from a string. Tags are field-element values; we delegate to the {@link parseField} parser.
+ *
+ * @param tag - A hex string, integer, or boolean string representing the tag.
+ * @returns A {@link Tag} wrapping the parsed field.
+ */ export function parseTag(tag) {
+    return new Tag(parseField(tag));
 }
 /**
  * Parses a selector from a string.
@@ -265,15 +276,15 @@ export function parseBigint(bigint) {
     }
 }
 /**
- * Parses a secret key from a string.
- * @param privateKey - A string
- * @returns A secret key
+ * Parses an account signing key from a string.
+ * @param signingKey - A string
+ * @returns A signing key
  * @throws InvalidArgumentError if the input string is not valid.
- */ export function parseSecretKey(secretKey) {
+ */ export function parseSigningKey(signingKey) {
     try {
-        return Fr.fromHexString(secretKey);
+        return GrumpkinScalar.fromHexString(signingKey);
     } catch  {
-        throw new InvalidArgumentError(`Invalid encryption secret key: ${secretKey}`);
+        throw new InvalidArgumentError(`Invalid signing key: ${signingKey}`);
     }
 }
 /**

package/dest/utils/inspect.d.ts

@@ -8,4 +8,4 @@ export declare function inspectBlock(aztecNode: AztecNode, blockNumber: BlockNum
 export declare function inspectTx(aztecNode: AztecNode, txHash: TxHash, log: LogFn, opts?: {
     includeBlockInfo?: boolean;
 }): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zcGVjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2luc3BlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHdCQUFzQixZQUFZLENBQ2hDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEdBQUcsRUFBRSxLQUFLLEVBQ1YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQU8saUJBMEJqQztBQUVELHdCQUFzQixTQUFTLENBQzdCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxFQUFFLEtBQUssRUFDVixJQUFJLEdBQUU7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFPLGlCQXNFMUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zcGVjdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2luc3BlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRS9DLHdCQUFzQixZQUFZLENBQ2hDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFdBQVcsRUFBRSxXQUFXLEVBQ3hCLEdBQUcsRUFBRSxLQUFLLEVBQ1YsSUFBSSxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQU8saUJBeUJqQztBQUVELHdCQUFzQixTQUFTLENBQzdCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsR0FBRyxFQUFFLEtBQUssRUFDVixJQUFJLEdBQUU7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFPLGlCQXNFMUMifQ==

package/dest/utils/inspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBA0BjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,iBAsE1C"}
+{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../src/utils/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,wBAAsB,YAAY,CAChC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,iBAyBjC;AAED,wBAAsB,SAAS,CAC7B,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,KAAK,EACV,IAAI,GAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,iBAsE1C"}

package/dest/utils/inspect.js

@@ -1,33 +1,33 @@
 export async function inspectBlock(aztecNode, blockNumber, log, opts = {}) {
-    const block = await aztecNode.getBlock(blockNumber);
+    const block = await aztecNode.getBlock(blockNumber, {
+        includeTransactions: opts.showTxs
+    });
     if (!block) {
         log(`No block found for block number ${blockNumber}`);
         return;
     }
-    const blockHash = await block.hash();
-    log(`Block ${blockNumber} (${blockHash.toString()})`);
+    log(`Block ${blockNumber} (${block.hash.toString()})`);
     log(` Total fees: ${block.header.totalFees.toBigInt()}`);
     log(` Total mana used: ${block.header.totalManaUsed.toBigInt()}`);
     log(` Fee per gas unit: DA=${block.header.globalVariables.gasFees.feePerDaGas} L2=${block.header.globalVariables.gasFees.feePerL2Gas}`);
     log(` Coinbase: ${block.header.globalVariables.coinbase}`);
     log(` Fee recipient: ${block.header.globalVariables.feeRecipient}`);
     log(` Timestamp: ${new Date(Number(block.header.globalVariables.timestamp) * 500)}`);
-    if (opts.showTxs) {
+    if (opts.showTxs && block.body) {
         log(``);
         for (const txHash of block.body.txEffects.map((tx)=>tx.txHash)){
             await inspectTx(aztecNode, txHash, log, {
                 includeBlockInfo: false
             });
         }
-    } else {
+    } else if (block.body) {
         log(` Transactions: ${block.body.txEffects.length}`);
     }
 }
 export async function inspectTx(aztecNode, txHash, log, opts = {}) {
-    const [receipt, effectsInBlock] = await Promise.all([
-        aztecNode.getTxReceipt(txHash),
-        aztecNode.getTxEffect(txHash)
-    ]);
+    const receipt = await aztecNode.getTxReceipt(txHash, {
+        includeTxEffect: true
+    });
     // Base tx data
     log(`Tx ${txHash.toString()}`);
     log(` Status: ${receipt.status}`);
@@ -37,10 +37,10 @@ export async function inspectTx(aztecNode, txHash, log, opts = {}) {
     if (receipt.error) {
         log(` Error: ${receipt.error}`);
     }
-    if (!effectsInBlock) {
+    if (!receipt.isMined() || !receipt.txEffect) {
         return;
     }
-    const effects = effectsInBlock.data;
+    const effects = receipt.txEffect;
     if (opts.includeBlockInfo) {
         log(` Block: ${receipt.blockNumber} (${receipt.blockHash?.toString()})`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.0.1-commit.a89ec08",
+  "version": "0.0.1-commit.aa0c64f",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.a89ec08",
-    "@aztec/archiver": "0.0.1-commit.a89ec08",
-    "@aztec/aztec.js": "0.0.1-commit.a89ec08",
-    "@aztec/constants": "0.0.1-commit.a89ec08",
-    "@aztec/entrypoints": "0.0.1-commit.a89ec08",
-    "@aztec/ethereum": "0.0.1-commit.a89ec08",
-    "@aztec/foundation": "0.0.1-commit.a89ec08",
-    "@aztec/l1-artifacts": "0.0.1-commit.a89ec08",
-    "@aztec/node-keystore": "0.0.1-commit.a89ec08",
-    "@aztec/node-lib": "0.0.1-commit.a89ec08",
-    "@aztec/p2p": "0.0.1-commit.a89ec08",
-    "@aztec/protocol-contracts": "0.0.1-commit.a89ec08",
-    "@aztec/sequencer-client": "0.0.1-commit.a89ec08",
-    "@aztec/slasher": "0.0.1-commit.a89ec08",
-    "@aztec/stdlib": "0.0.1-commit.a89ec08",
-    "@aztec/wallets": "0.0.1-commit.a89ec08",
-    "@aztec/world-state": "0.0.1-commit.a89ec08",
+    "@aztec/accounts": "0.0.1-commit.aa0c64f",
+    "@aztec/archiver": "0.0.1-commit.aa0c64f",
+    "@aztec/aztec.js": "0.0.1-commit.aa0c64f",
+    "@aztec/constants": "0.0.1-commit.aa0c64f",
+    "@aztec/entrypoints": "0.0.1-commit.aa0c64f",
+    "@aztec/ethereum": "0.0.1-commit.aa0c64f",
+    "@aztec/foundation": "0.0.1-commit.aa0c64f",
+    "@aztec/l1-artifacts": "0.0.1-commit.aa0c64f",
+    "@aztec/node-keystore": "0.0.1-commit.aa0c64f",
+    "@aztec/node-lib": "0.0.1-commit.aa0c64f",
+    "@aztec/p2p": "0.0.1-commit.aa0c64f",
+    "@aztec/protocol-contracts": "0.0.1-commit.aa0c64f",
+    "@aztec/sequencer-client": "0.0.1-commit.aa0c64f",
+    "@aztec/slasher": "0.0.1-commit.aa0c64f",
+    "@aztec/stdlib": "0.0.1-commit.aa0c64f",
+    "@aztec/wallets": "0.0.1-commit.aa0c64f",
+    "@aztec/world-state": "0.0.1-commit.aa0c64f",
     "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/aztec-node": "0.0.1-commit.a89ec08",
-    "@aztec/kv-store": "0.0.1-commit.a89ec08",
-    "@aztec/telemetry-client": "0.0.1-commit.a89ec08",
+    "@aztec/aztec-node": "0.0.1-commit.aa0c64f",
+    "@aztec/kv-store": "0.0.1-commit.aa0c64f",
+    "@aztec/telemetry-client": "0.0.1-commit.aa0c64f",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.0.1-commit.a89ec08",
-    "@aztec/bb-prover": "0.0.1-commit.a89ec08",
-    "@aztec/ethereum": "0.0.1-commit.a89ec08",
-    "@aztec/l1-artifacts": "0.0.1-commit.a89ec08",
-    "@aztec/noir-contracts.js": "0.0.1-commit.a89ec08",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.a89ec08",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.a89ec08",
-    "@aztec/protocol-contracts": "0.0.1-commit.a89ec08",
-    "@aztec/stdlib": "0.0.1-commit.a89ec08"
+    "@aztec/accounts": "0.0.1-commit.aa0c64f",
+    "@aztec/bb-prover": "0.0.1-commit.aa0c64f",
+    "@aztec/ethereum": "0.0.1-commit.aa0c64f",
+    "@aztec/l1-artifacts": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-contracts.js": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.aa0c64f",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.aa0c64f",
+    "@aztec/protocol-contracts": "0.0.1-commit.aa0c64f",
+    "@aztec/stdlib": "0.0.1-commit.aa0c64f"
   },
   "files": [
     "dest",

package/src/cmds/aztec_node/block_number.ts

@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 
 export async function blockNumber(nodeUrl: string, log: LogFn) {
   const aztecNode = createAztecNodeClient(nodeUrl);
-  const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getProvenBlockNumber()]);
+  const [latestNum, provenNum] = await Promise.all([aztecNode.getBlockNumber(), aztecNode.getBlockNumber('proven')]);
   log(`Latest block: ${latestNum}`);
   log(`Proven block: ${provenNum}`);
 }

package/src/cmds/aztec_node/get_logs.ts

@@ -1,22 +1,47 @@
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { LogFilter, LogId } from '@aztec/aztec.js/log';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import type { TxHash } from '@aztec/aztec.js/tx';
-import { BlockNumber } from '@aztec/foundation/branded-types';
+import type { BlockNumber } from '@aztec/foundation/branded-types';
 import type { LogFn } from '@aztec/foundation/log';
 import { sleep } from '@aztec/foundation/sleep';
+import {
+  LogCursor,
+  type PublicLogsQuery,
+  type Tag,
+  logResultToHumanReadable,
+  queryAllPublicLogsByTags,
+} from '@aztec/stdlib/logs';
 
-export async function getLogs(
-  txHash: TxHash,
-  fromBlock: BlockNumber,
-  toBlock: BlockNumber,
-  afterLog: LogId,
-  contractAddress: AztecAddress,
-  nodeUrl: string,
-  follow: boolean,
-  log: LogFn,
-) {
-  const node = createAztecNodeClient(nodeUrl);
+/** Options for the `get-logs` CLI command. */
+export type GetLogsOptions = {
+  /** Contract address that emitted the logs (required). */
+  contractAddress: AztecAddress;
+  /** Tag to filter logs by (required). */
+  tag: Tag;
+  /** Restrict the search to this tx hash. Mutually exclusive with `fromBlock`/`toBlock`. */
+  txHash?: TxHash;
+  /** Lower block bound, inclusive. */
+  fromBlock?: BlockNumber;
+  /** Upper block bound, exclusive. */
+  toBlock?: BlockNumber;
+  /** Log cursor to resume pagination strictly after a previously-seen log. */
+  afterLog?: LogCursor;
+  /** Node RPC URL. */
+  nodeUrl: string;
+  /** When set, polls indefinitely for new logs. Incompatible with `txHash` and `toBlock`. */
+  follow: boolean;
+  /** Log function. */
+  log: LogFn;
+};
+
+/**
+ * Fetches public logs for a (contract, tag) pair, draining all pages via the stdlib pagination helper.
+ * In `--follow` mode, polls indefinitely: each round drains all currently-available logs, then sleeps
+ * until the next poll if nothing new was found.
+ */
+export async function getLogs(options: GetLogsOptions): Promise<void> {
+  const { txHash, fromBlock, toBlock, contractAddress, tag, nodeUrl, follow, log } = options;
+  let afterLog = options.afterLog;
 
   if (follow) {
     if (txHash) {
@@ -26,43 +51,50 @@ export async function getLogs(
       throw Error('Cannot use --follow with --to-block');
     }
   }
+  if (txHash !== undefined && (fromBlock !== undefined || toBlock !== undefined)) {
+    throw Error('Cannot combine --tx-hash with --from-block / --to-block');
+  }
 
-  const filter: LogFilter = { txHash, fromBlock, toBlock, afterLog, contractAddress };
-
-  const fetchLogs = async () => {
-    const response = await node.getPublicLogs(filter);
-    const logs = response.logs;
+  const node = createAztecNodeClient(nodeUrl);
 
-    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(publicLog => log(publicLog.toHumanReadable()));
-      // Set the continuation parameter for the following requests
-      filter.afterLog = logs[logs.length - 1].id;
+  const drainLogs = async () => {
+    const query: PublicLogsQuery = {
+      contractAddress,
+      tags: [afterLog !== undefined ? { tag, afterLog } : tag],
+      fromBlock,
+      toBlock,
+      txHash,
+    };
+    const [logsForTag] = await queryAllPublicLogsByTags(node, query);
+    if (logsForTag.length > 0) {
+      afterLog = LogCursor.fromLog(logsForTag[logsForTag.length - 1]);
     }
-    return response.maxLogsHit;
+    return logsForTag;
   };
 
   if (follow) {
     log('Fetching logs...');
     while (true) {
-      const maxLogsHit = await fetchLogs();
-      if (!maxLogsHit) {
+      const results = await drainLogs();
+      if (results.length === 0) {
         await sleep(1000);
+      } else {
+        results.forEach(r => log(logResultToHumanReadable(r)));
       }
     }
   } else {
-    while (await fetchLogs()) {
-      // Keep fetching logs until we reach the end.
+    const results = await drainLogs();
+    if (results.length === 0) {
+      log(
+        `No logs found for {contractAddress: ${contractAddress.toString()}, tag: ${tag.toString()}` +
+          `${txHash ? `, txHash: ${txHash.toString()}` : ''}` +
+          `${fromBlock !== undefined ? `, fromBlock: ${fromBlock}` : ''}` +
+          `${toBlock !== undefined ? `, toBlock: ${toBlock}` : ''}` +
+          `${afterLog ? `, afterLog: ${afterLog.toString()}` : ''}}`,
+      );
+    } else {
+      log('Logs found: \n');
+      results.forEach(r => log(logResultToHumanReadable(r)));
     }
   }
 }

package/src/cmds/aztec_node/get_node_info.ts

@@ -23,7 +23,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
         rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
         governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
         governance: info.l1ContractAddresses.governanceAddress.toString(),
-        slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
         feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
         stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
       },
@@ -51,7 +50,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
     log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
     log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
-    log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
     log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`L2 Contract Addresses:`);

package/src/cmds/aztec_node/index.ts

@@ -7,10 +7,10 @@ import {
   nodeOption,
   parseAztecAddress,
   parseField,
-  parseOptionalAztecAddress,
   parseOptionalInteger,
-  parseOptionalLogId,
+  parseOptionalLogCursor,
   parseOptionalTxHash,
+  parseTag,
 } from '../../utils/commands.js';
 
 export function injectCommands(program: Command, log: LogFn, debugLogger: Logger) {
@@ -47,21 +47,26 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
 
   program
     .command('get-logs')
-    .description('Gets all the public logs from an intersection of all the filter params.')
-    .option('-tx, --tx-hash <txHash>', 'A transaction hash to get the receipt for.', parseOptionalTxHash)
+    .description('Gets public logs for a contract and tag, optionally restricted by block range or tx hash.')
+    .requiredOption('-ca, --contract-address <address>', 'Contract address that emitted the logs.', parseAztecAddress)
+    .requiredOption('--tag <tag>', 'Tag (Fr value) to filter logs by.', parseTag)
+    .option('-tx, --tx-hash <txHash>', 'A transaction hash to restrict the search to.', 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(
+      '-al --after-log <cursor>',
+      'Log cursor of the form <blockNumber>-<txIndexWithinBlock>-<logIndexWithinTx> to resume pagination after.',
+      parseOptionalLogCursor,
+    )
     .addOption(nodeOption)
     .option('--follow', 'If set, will keep polling for new logs until interrupted.')
-    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, aztecNodeRpcUrl: nodeUrl, follow }) => {
+    .action(async ({ txHash, fromBlock, toBlock, afterLog, contractAddress, tag, nodeUrl, follow }) => {
       const { getLogs } = await import('./get_logs.js');
-      await getLogs(txHash, fromBlock, toBlock, afterLog, contractAddress, nodeUrl, follow, log);
+      await getLogs({ txHash, fromBlock, toBlock, afterLog, contractAddress, tag, nodeUrl, follow, log });
     });
 
   program

package/src/cmds/infrastructure/setup_l2_contract.ts

@@ -2,33 +2,37 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import type { WaitOpts } from '@aztec/aztec.js/contracts';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
+import { TxStatus } from '@aztec/aztec.js/tx';
 import { AccountManager } from '@aztec/aztec.js/wallet';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import type { LogFn } from '@aztec/foundation/log';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { EmbeddedWallet } from '@aztec/wallets/embedded';
-import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
+import { createFundedInitializerlessAccounts } from '@aztec/wallets/testing';
 
 export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
   const waitOpts: WaitOpts = {
     timeout: 180,
     interval: 1,
+    // The embedded wallet defaults to PROPOSED, which can be dropped if its proposed block is pruned
+    // before the checkpoint lands. Wait for the checkpoint so serial setup is reliable.
+    waitForStatus: TxStatus.CHECKPOINTED,
   };
   log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
   log('setupL2Contracts: Creating PXE client...');
   const node = createAztecNodeClient(nodeUrl);
   const wallet = await EmbeddedWallet.create(node);
 
-  let deployedAccountManagers: AccountManager[] = [];
+  let accountManagers: AccountManager[] = [];
   if (testAccounts) {
-    log('setupL2Contracts: Deploying test accounts...');
+    log('setupL2Contracts: Creating test accounts...');
     const initialAccountsData = await getInitialTestAccountsData();
-    deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
+    accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccountsData);
   }
 
   if (json) {
     const toPrint: Record<string, AztecAddress> = { ...ProtocolContractAddress };
-    deployedAccountManagers.forEach((a, i) => {
+    accountManagers.forEach((a, i) => {
       toPrint[`testAccount${i}`] = a.address;
     });
     log(JSON.stringify(toPrint, null, 2));

package/src/cmds/l1/deploy_l1_contracts_cmd.ts

@@ -96,7 +96,6 @@ export async function deployL1ContractsCmd(
     log(`RewardDistributor Address: ${l1ContractAddresses.rewardDistributorAddress.toString()}`);
     log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
-    log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
     log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);