@aztec/stdlib 0.0.1-commit.d3ec352c → 0.0.1-commit.f295ac2

package/dest/zkpassport/index.d.ts

@@ -1,14 +1,13 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 export type ViemZkPassportProofParams = {
+    version: `0x${string}`;
     proofVerificationData: {
         vkeyHash: `0x${string}`;
         proof: `0x${string}`;
         publicInputs: `0x${string}`[];
     };
-    commitments: {
-        committedInputs: `0x${string}`;
-    };
+    committedInputs: `0x${string}`;
     serviceConfig: {
         validityPeriodInSeconds: bigint;
         domain: string;
@@ -32,4 +31,4 @@ export declare class ZkPassportProofParams {
     static fromViem(params: ViemZkPassportProofParams): ZkPassportProofParams;
     toViem(): ViemZkPassportProofParams;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy96a3Bhc3Nwb3J0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFJOUMsTUFBTSxNQUFNLHlCQUF5QixHQUFHO0lBQ3RDLHFCQUFxQixFQUFFO1FBQ3JCLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3hCLEtBQUssRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3JCLFlBQVksRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7S0FDL0IsQ0FBQztJQUNGLFdBQVcsRUFBRTtRQUNYLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0tBQ2hDLENBQUM7SUFDRixhQUFhLEVBQUU7UUFDYix1QkFBdUIsRUFBRSxNQUFNLENBQUM7UUFDaEMsTUFBTSxFQUFFLE1BQU0sQ0FBQztRQUNmLEtBQUssRUFBRSxNQUFNLENBQUM7UUFDZCxPQUFPLEVBQUUsT0FBTyxDQUFDO0tBQ2xCLENBQUM7Q0FDSCxDQUFDO0FBSUYscUJBQWEscUJBQXFCO0lBRXZCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFFBQVEsRUFBRSxRQUFRO0lBQ2xCLEtBQUssRUFBRSxNQUFNO0lBQ2IsWUFBWSxFQUFFLEVBQUUsRUFBRTtJQUNsQixlQUFlLEVBQUUsTUFBTTtJQUN2Qix1QkFBdUIsRUFBRSxNQUFNO0lBQy9CLE1BQU0sRUFBRSxNQUFNO0lBQ2QsS0FBSyxFQUFFLE1BQU07SUFSdEIsWUFDUyxPQUFPLEVBQUUsT0FBTyxFQUNoQixRQUFRLEVBQUUsUUFBUSxFQUNsQixLQUFLLEVBQUUsTUFBTSxFQUNiLFlBQVksRUFBRSxFQUFFLEVBQUUsRUFDbEIsZUFBZSxFQUFFLE1BQU0sRUFDdkIsdUJBQXVCLEVBQUUsTUFBTSxFQUMvQixNQUFNLEVBQUUsTUFBTSxFQUNkLEtBQUssRUFBRSxNQUFNLEVBQ2xCO0lBRUosUUFBUSw0QkFjUDtJQUVELE1BQU0sQ0FBQyxNQUFNLDBCQWtCWjtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0seUJBWS9CO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUseUJBQXlCLHlCQVdoRDtJQUVELE1BQU0sSUFBSSx5QkFBeUIsQ0FpQmxDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy96a3Bhc3Nwb3J0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJcEQsTUFBTSxNQUFNLHlCQUF5QixHQUFHO0lBQ3RDLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQ3ZCLHFCQUFxQixFQUFFO1FBQ3JCLFFBQVEsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3hCLEtBQUssRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3JCLFlBQVksRUFBRSxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7S0FDL0IsQ0FBQztJQUNGLGVBQWUsRUFBRSxLQUFLLE1BQU0sRUFBRSxDQUFDO0lBQy9CLGFBQWEsRUFBRTtRQUNiLHVCQUF1QixFQUFFLE1BQU0sQ0FBQztRQUNoQyxNQUFNLEVBQUUsTUFBTSxDQUFDO1FBQ2YsS0FBSyxFQUFFLE1BQU0sQ0FBQztRQUNkLE9BQU8sRUFBRSxPQUFPLENBQUM7S0FDbEIsQ0FBQztDQUNILENBQUM7QUFJRixxQkFBYSxxQkFBcUI7SUFFdkIsT0FBTyxFQUFFLE9BQU87SUFDaEIsUUFBUSxFQUFFLFFBQVE7SUFDbEIsS0FBSyxFQUFFLE1BQU07SUFDYixZQUFZLEVBQUUsRUFBRSxFQUFFO0lBQ2xCLGVBQWUsRUFBRSxNQUFNO0lBQ3ZCLHVCQUF1QixFQUFFLE1BQU07SUFDL0IsTUFBTSxFQUFFLE1BQU07SUFDZCxLQUFLLEVBQUUsTUFBTTtJQVJ0QixZQUNTLE9BQU8sRUFBRSxPQUFPLEVBQ2hCLFFBQVEsRUFBRSxRQUFRLEVBQ2xCLEtBQUssRUFBRSxNQUFNLEVBQ2IsWUFBWSxFQUFFLEVBQUUsRUFBRSxFQUNsQixlQUFlLEVBQUUsTUFBTSxFQUN2Qix1QkFBdUIsRUFBRSxNQUFNLEVBQy9CLE1BQU0sRUFBRSxNQUFNLEVBQ2QsS0FBSyxFQUFFLE1BQU0sRUFDbEI7SUFFSixRQUFRLDRCQWNQO0lBRUQsTUFBTSxDQUFDLE1BQU0sMEJBa0JaO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFZL0I7SUFFRCxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSx5QkFBeUIseUJBV2hEO0lBRUQsTUFBTSxJQUFJLHlCQUF5QixDQWlCbEM7Q0FDRiJ9

package/dest/zkpassport/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zkpassport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,MAAM,MAAM,yBAAyB,GAAG;IACtC,qBAAqB,EAAE;QACrB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QACxB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;KAC/B,CAAC;IACF,WAAW,EAAE;QACX,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;KAChC,CAAC;IACF,aAAa,EAAE;QACb,uBAAuB,EAAE,MAAM,CAAC;QAChC,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAIF,qBAAa,qBAAqB;IAEvB,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,EAAE,EAAE;IAClB,eAAe,EAAE,MAAM;IACvB,uBAAuB,EAAE,MAAM;IAC/B,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,MAAM;IARtB,YACS,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,EAAE,EAAE,EAClB,eAAe,EAAE,MAAM,EACvB,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,4BAcP;IAED,MAAM,CAAC,MAAM,0BAkBZ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,yBAY/B;IAED,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB,yBAWhD;IAED,MAAM,IAAI,yBAAyB,CAiBlC;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/zkpassport/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,KAAK,MAAM,EAAE,CAAC;IACvB,qBAAqB,EAAE;QACrB,QAAQ,EAAE,KAAK,MAAM,EAAE,CAAC;QACxB,KAAK,EAAE,KAAK,MAAM,EAAE,CAAC;QACrB,YAAY,EAAE,KAAK,MAAM,EAAE,EAAE,CAAC;KAC/B,CAAC;IACF,eAAe,EAAE,KAAK,MAAM,EAAE,CAAC;IAC/B,aAAa,EAAE;QACb,uBAAuB,EAAE,MAAM,CAAC;QAChC,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,CAAC;AAIF,qBAAa,qBAAqB;IAEvB,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,MAAM;IACb,YAAY,EAAE,EAAE,EAAE;IAClB,eAAe,EAAE,MAAM;IACvB,uBAAuB,EAAE,MAAM;IAC/B,MAAM,EAAE,MAAM;IACd,KAAK,EAAE,MAAM;IARtB,YACS,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,EAAE,EAAE,EAClB,eAAe,EAAE,MAAM,EACvB,uBAAuB,EAAE,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EAClB;IAEJ,QAAQ,4BAcP;IAED,MAAM,CAAC,MAAM,0BAkBZ;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,yBAY/B;IAED,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,yBAAyB,yBAWhD;IAED,MAAM,IAAI,yBAAyB,CAiBlC;CACF"}

package/dest/zkpassport/index.js

@@ -1,6 +1,6 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
-import { randomBytes } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { withoutHexPrefix } from '@aztec/foundation/string';
 // NOTE: Must match the ZkPassportProofParams struct in the zkpassport verifier contract
@@ -59,23 +59,23 @@ export class ZkPassportProofParams {
         return new ZkPassportProofParams(reader.readBoolean(), reader.readObject(Buffer32), reader.readBuffer(), reader.readVector(Fr), reader.readBuffer(), reader.readUInt256(), reader.readString(), reader.readString());
     }
     static fromViem(params) {
-        return new ZkPassportProofParams(params.serviceConfig.devMode, Buffer32.fromString(params.proofVerificationData.vkeyHash), Buffer.from(withoutHexPrefix(params.proofVerificationData.proof), 'hex'), params.proofVerificationData.publicInputs.map((input)=>Fr.fromString(input)), Buffer.from(withoutHexPrefix(params.commitments.committedInputs), 'hex'), params.serviceConfig.validityPeriodInSeconds, params.serviceConfig.domain, params.serviceConfig.scope);
+        return new ZkPassportProofParams(params.serviceConfig.devMode, Buffer32.fromString(params.proofVerificationData.vkeyHash), Buffer.from(withoutHexPrefix(params.proofVerificationData.proof), 'hex'), params.proofVerificationData.publicInputs.map((input)=>Fr.fromString(input)), Buffer.from(withoutHexPrefix(params.committedInputs), 'hex'), params.serviceConfig.validityPeriodInSeconds, params.serviceConfig.domain, params.serviceConfig.scope);
     }
     toViem() {
+        // Version is set to bytes32(0) as per zkpassport library convention
         return {
-            serviceConfig: {
-                devMode: this.devMode,
-                validityPeriodInSeconds: this.validityPeriodInSeconds,
-                domain: this.domain,
-                scope: this.scope
-            },
+            version: '0x0000000000000000000000000000000000000000000000000000000000000000',
             proofVerificationData: {
                 vkeyHash: this.vkeyHash.toString(),
                 proof: `0x${this.proof.toString('hex')}`,
                 publicInputs: this.publicInputs.map((input)=>input.toString())
             },
-            commitments: {
-                committedInputs: `0x${this.committedInputs.toString('hex')}`
+            committedInputs: `0x${this.committedInputs.toString('hex')}`,
+            serviceConfig: {
+                devMode: this.devMode,
+                validityPeriodInSeconds: this.validityPeriodInSeconds,
+                domain: this.domain,
+                scope: this.scope
             }
         };
     }

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.0.1-commit.d3ec352c",
+  "version": "0.0.1-commit.f295ac2",
   "type": "module",
   "inherits": [
     "../package.common.json",
     "./package.local.json"
   ],
   "exports": {
+    "./deserialization": "./dest/deserialization/index.js",
     "./aztec-address": "./dest/aztec-address/index.js",
     "./abi": "./dest/abi/index.js",
+    "./abi/function-selector": "./dest/abi/function_selector.js",
     "./hash": "./dest/hash/index.js",
     "./keys": "./dest/keys/index.js",
     "./testing": "./dest/tests/index.js",
@@ -21,6 +23,7 @@
     "./kernel": "./dest/kernel/index.js",
     "./trees": "./dest/trees/index.js",
     "./logs": "./dest/logs/index.js",
+    "./logs/log-id": "./dest/logs/log_id.js",
     "./avm": "./dest/avm/index.js",
     "./schemas": "./dest/schemas/index.js",
     "./noir": "./dest/noir/index.js",
@@ -31,6 +34,7 @@
     "./messaging": "./dest/messaging/index.js",
     "./gas": "./dest/gas/index.js",
     "./tx": "./dest/tx/index.js",
+    "./tx/tx-hash": "./dest/tx/tx_hash.js",
     "./fees": "./dest/fees/index.js",
     "./note": "./dest/note/index.js",
     "./p2p": "./dest/p2p/index.js",
@@ -43,6 +47,8 @@
     "./versioning": "./dest/versioning/index.js",
     "./interfaces/client": "./dest/interfaces/client.js",
     "./interfaces/server": "./dest/interfaces/server.js",
+    "./interfaces/prover-config": "./dest/interfaces/prover-client.js",
+    "./interfaces/api-limit": "./dest/interfaces/api_limit.js",
     "./epoch-helpers": "./dest/epoch-helpers/index.js",
     "./config": "./dest/config/index.js",
     "./testing/jest": "./dest/tests/jest.js",
@@ -64,7 +70,7 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && yarn generate && tsgo -b",
+    "build": "yarn clean && yarn generate && ../scripts/tsc.sh",
     "generate": "./scripts/copy-contracts.sh",
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
@@ -72,13 +78,14 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec/bb.js": "0.0.1-commit.d3ec352c",
-    "@aztec/blob-lib": "0.0.1-commit.d3ec352c",
-    "@aztec/constants": "0.0.1-commit.d3ec352c",
-    "@aztec/ethereum": "0.0.1-commit.d3ec352c",
-    "@aztec/foundation": "0.0.1-commit.d3ec352c",
-    "@aztec/l1-artifacts": "0.0.1-commit.d3ec352c",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.d3ec352c",
+    "@aztec/bb.js": "0.0.1-commit.f295ac2",
+    "@aztec/blob-lib": "0.0.1-commit.f295ac2",
+    "@aztec/constants": "0.0.1-commit.f295ac2",
+    "@aztec/ethereum": "0.0.1-commit.f295ac2",
+    "@aztec/foundation": "0.0.1-commit.f295ac2",
+    "@aztec/l1-artifacts": "0.0.1-commit.f295ac2",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.f295ac2",
+    "@aztec/validator-ha-signer": "0.0.1-commit.f295ac2",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.12.0",
     "json-stringify-deterministic": "1.0.12",
@@ -103,7 +110,7 @@
     "@types/lodash.times": "^4.3.9",
     "@types/node": "^22.15.17",
     "@types/pako": "^2.0.3",
-    "@typescript/native-preview": "7.0.0-dev.20251126.1",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "eslint": "^9.26.0",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",

package/src/abi/abi.ts

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
-import { type ZodFor, schemas } from '@aztec/foundation/schemas';
+import { schemas, zodFor } from '@aztec/foundation/schemas';
 
 import { inflate } from 'pako';
 import { z } from 'zod';
@@ -154,11 +154,13 @@ export type AbiErrorType =
   | { error_kind: 'fmtstring'; length: number; item_types: AbiType[] }
   | ({ error_kind: 'custom' } & AbiType);
 
-const AbiErrorTypeSchema = z.union([
-  z.object({ error_kind: z.literal('string'), string: z.string() }),
-  z.object({ error_kind: z.literal('fmtstring'), length: z.number(), item_types: z.array(AbiTypeSchema) }),
-  z.object({ error_kind: z.literal('custom') }).and(AbiTypeSchema),
-]) satisfies ZodFor<AbiErrorType>;
+const AbiErrorTypeSchema = zodFor<AbiErrorType>()(
+  z.union([
+    z.object({ error_kind: z.literal('string'), string: z.string() }),
+    z.object({ error_kind: z.literal('fmtstring'), length: z.number(), item_types: z.array(AbiTypeSchema) }),
+    z.object({ error_kind: z.literal('custom') }).and(AbiTypeSchema),
+  ]),
+);
 
 /** Aztec.nr function types. */
 export enum FunctionType {
@@ -242,14 +244,16 @@ export interface FunctionArtifactWithContractName extends FunctionArtifact {
   contractName: string;
 }
 
-export const FunctionArtifactSchema = FunctionAbiSchema.and(
-  z.object({
-    bytecode: schemas.Buffer,
-    verificationKey: z.string().optional(),
-    debugSymbols: z.string(),
-    debug: FunctionDebugMetadataSchema.optional(),
-  }),
-) satisfies ZodFor<FunctionArtifact>;
+export const FunctionArtifactSchema = zodFor<FunctionArtifact>()(
+  FunctionAbiSchema.and(
+    z.object({
+      bytecode: schemas.Buffer,
+      verificationKey: z.string().optional(),
+      debugSymbols: z.string(),
+      debug: FunctionDebugMetadataSchema.optional(),
+    }),
+  ),
+);
 
 /** A file ID. It's assigned during compilation. */
 type FileId = number;
@@ -342,28 +346,30 @@ export interface ContractArtifact {
   fileMap: DebugFileMap;
 }
 
-export const ContractArtifactSchema: ZodFor<ContractArtifact> = z.object({
-  name: z.string(),
-  functions: z.array(FunctionArtifactSchema),
-  nonDispatchPublicFunctions: z.array(FunctionAbiSchema),
-  outputs: z.object({
-    structs: z.record(z.array(AbiTypeSchema)).transform(structs => {
-      for (const [key, value] of Object.entries(structs)) {
-        // We are manually ordering events and functions in the abi by path.
-        // The path ordering is arbitrary, and only needed to ensure deterministic order.
-        // These are the only arrays in the artifact with arbitrary order, and hence the only ones
-        // we need to sort.
-        if (key === 'events' || key === 'functions') {
-          structs[key] = (value as StructType[]).sort((a, b) => (a.path > b.path ? -1 : 1));
+export const ContractArtifactSchema = zodFor<ContractArtifact>()(
+  z.object({
+    name: z.string(),
+    functions: z.array(FunctionArtifactSchema),
+    nonDispatchPublicFunctions: z.array(FunctionAbiSchema),
+    outputs: z.object({
+      structs: z.record(z.array(AbiTypeSchema)).transform(structs => {
+        for (const [key, value] of Object.entries(structs)) {
+          // We are manually ordering events and functions in the abi by path.
+          // The path ordering is arbitrary, and only needed to ensure deterministic order.
+          // These are the only arrays in the artifact with arbitrary order, and hence the only ones
+          // we need to sort.
+          if (key === 'events' || key === 'functions') {
+            structs[key] = (value as StructType[]).sort((a, b) => (a.path > b.path ? -1 : 1));
+          }
         }
-      }
-      return structs;
+        return structs;
+      }),
+      globals: z.record(z.array(AbiValueSchema)),
     }),
-    globals: z.record(z.array(AbiValueSchema)),
+    storageLayout: z.record(z.object({ slot: schemas.Fr })),
+    fileMap: z.record(z.coerce.number(), z.object({ source: z.string(), path: z.string() })),
   }),
-  storageLayout: z.record(z.object({ slot: schemas.Fr })),
-  fileMap: z.record(z.coerce.number(), z.object({ source: z.string(), path: z.string() })),
-});
+);
 
 export function getFunctionArtifactByName(artifact: ContractArtifact, functionName: string): FunctionArtifact {
   const functionArtifact = artifact.functions.find(f => f.name === functionName);

package/src/abi/authorization_selector.ts

@@ -1,6 +1,7 @@
 import { fromHex, toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { poseidon2HashBytes, randomBytes } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashBytes } from '@aztec/foundation/crypto/poseidon';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 

package/src/abi/buffer.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import chunk from 'lodash.chunk';
 

package/src/abi/contract_artifact.ts

@@ -1,5 +1,14 @@
 import { jsonParseWithSchema, jsonStringify } from '@aztec/foundation/json-rpc';
 
+import {
+  AZTEC_INITIALIZER_ATTRIBUTE,
+  AZTEC_ONLY_SELF_ATTRIBUTE,
+  AZTEC_PRIVATE_ATTRIBUTE,
+  AZTEC_PUBLIC_ATTRIBUTE,
+  AZTEC_UTILITY_ATTRIBUTE,
+  AZTEC_VIEW_ATTRIBUTE,
+  type NoirCompiledContract,
+} from '../noir/index.js';
 import {
   type ABIParameter,
   type ABIParameterVisibility,
@@ -14,16 +23,7 @@ import {
   type IntegerValue,
   type StructValue,
   type TypedStructFieldValue,
-} from '../abi/index.js';
-import {
-  AZTEC_INITIALIZER_ATTRIBUTE,
-  AZTEC_ONLY_SELF_ATTRIBUTE,
-  AZTEC_PRIVATE_ATTRIBUTE,
-  AZTEC_PUBLIC_ATTRIBUTE,
-  AZTEC_UTILITY_ATTRIBUTE,
-  AZTEC_VIEW_ATTRIBUTE,
-  type NoirCompiledContract,
-} from '../noir/index.js';
+} from './abi.js';
 
 /**
  * Serializes a contract artifact to a buffer for storage.

package/src/abi/decoder.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import { AztecAddress } from '../aztec-address/index.js';
 import type { ABIParameter, ABIVariable, AbiType } from './abi.js';

package/src/abi/encoder.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 
 import type { AbiType, FunctionAbi } from './abi.js';
 import { isAddressStruct, isBoundedVecStruct, isFunctionSelectorStruct, isWrappedFieldStruct } from './utils.js';

package/src/abi/event_selector.ts

@@ -1,6 +1,7 @@
 import { fromHex, toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { poseidon2HashBytes, randomBytes } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashBytes } from '@aztec/foundation/crypto/poseidon';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader } from '@aztec/foundation/serialize';
 

package/src/abi/function_call.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import type { FieldsOf } from '@aztec/foundation/types';
 
 import { AztecAddress } from '../aztec-address/index.js';

package/src/abi/function_selector.ts

@@ -1,6 +1,7 @@
 import { fromHex, toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { poseidon2HashBytes, randomBytes } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashBytes } from '@aztec/foundation/crypto/poseidon';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { type ZodFor, hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, TypeRegistry } from '@aztec/foundation/serialize';
 
@@ -38,6 +39,14 @@ export class FunctionSelector extends Selector {
     return new FunctionSelector(Number(fr.toBigInt()));
   }
 
+  static fromFieldOrUndefined(fr: Fr) {
+    try {
+      return FunctionSelector.fromField(fr);
+    } catch {
+      return undefined;
+    }
+  }
+
   static fromFields(fields: Fr[] | FieldReader) {
     const reader = FieldReader.asReader(fields);
     return FunctionSelector.fromField(reader.readField());

package/src/abi/note_selector.ts

@@ -1,6 +1,6 @@
 import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-import { randomInt } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { randomInt } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { hexSchemaFor } from '@aztec/foundation/schemas';
 import { BufferReader, TypeRegistry } from '@aztec/foundation/serialize';
 

package/src/abi/selector.ts

@@ -1,5 +1,5 @@
 import { toBufferBE } from '@aztec/foundation/bigint-buffer';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { bufferToHex } from '@aztec/foundation/string';
 
 import { inspect } from 'util';

package/src/abi/utils.ts

@@ -49,6 +49,23 @@ export function isWrappedFieldStruct(abiType: AbiType) {
   );
 }
 
+/**
+ * Returns whether the ABI type is a PublicKeys struct from Aztec.nr.
+ * @param abiType - Type to check.
+ * @returns A boolean indicating whether the ABI type is a PublicKeys struct.
+ */
+export function isPublicKeysStruct(abiType: AbiType) {
+  return (
+    abiType.kind === 'struct' &&
+    abiType.path === 'aztec::protocol_types::public_keys::PublicKeys' &&
+    abiType.fields.length === 4 &&
+    abiType.fields[0].name === 'npk_m' &&
+    abiType.fields[1].name === 'ivpk_m' &&
+    abiType.fields[2].name === 'ovpk_m' &&
+    abiType.fields[3].name === 'tpk_m'
+  );
+}
+
 /**
  * Returns whether the ABI type is a BoundedVec struct from Noir's std::collections::bounded_vec.
  * @param abiType - Type to check.

package/src/auth_witness/auth_witness.ts

@@ -1,6 +1,6 @@
 import { GeneratorIndex } from '@aztec/constants';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { bufferToHex, hexToBuffer } from '@aztec/foundation/string';