@aztec/foundation 0.0.1-commit.d3ec352c → 0.0.1-commit.fcb71a6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/foundation",
-  "version": "0.0.1-commit.d3ec352c",
+  "version": "0.0.1-commit.fcb71a6",
   "type": "module",
   "main": "./dest/index.js",
   "types": "./dest/index.d.ts",
@@ -15,9 +15,27 @@
     "./branded-types": "./dest/branded-types/index.js",
     "./collection": "./dest/collection/index.js",
     "./config": "./dest/config/index.js",
-    "./crypto": "./dest/crypto/index.js",
-    "./crypto/sync": "./dest/crypto/sync/index.js",
+    "./crypto/aes128": "./dest/crypto/aes128/index.js",
+    "./crypto/bls": "./dest/crypto/bls/index.js",
     "./crypto/bls/bn254_keystore": "./dest/crypto/bls/bn254_keystore.js",
+    "./crypto/bn254": "./dest/crypto/bn254/index.js",
+    "./crypto/ecdsa": "./dest/crypto/ecdsa/index.js",
+    "./crypto/grumpkin": "./dest/crypto/grumpkin/index.js",
+    "./crypto/keccak": "./dest/crypto/keccak/index.js",
+    "./crypto/keys": "./dest/crypto/keys/index.js",
+    "./crypto/pedersen": "./dest/crypto/pedersen/index.js",
+    "./crypto/poseidon": "./dest/crypto/poseidon/index.js",
+    "./crypto/random": "./dest/crypto/random/index.js",
+    "./crypto/schnorr": "./dest/crypto/schnorr/index.js",
+    "./crypto/secp256k1": "./dest/crypto/secp256k1/index.js",
+    "./crypto/secp256k1-signer": "./dest/crypto/secp256k1-signer/index.js",
+    "./crypto/sha256": "./dest/crypto/sha256/index.js",
+    "./crypto/sha512": "./dest/crypto/sha512/index.js",
+    "./crypto/signature": "./dest/crypto/signature/index.js",
+    "./crypto/sync": "./dest/crypto/sync/index.js",
+    "./curves/bn254": "./dest/curves/bn254/index.js",
+    "./curves/grumpkin": "./dest/curves/grumpkin/index.js",
+    "./curves/bls12": "./dest/curves/bls12/index.js",
     "./decorators": "./dest/decorators/index.js",
     "./error": "./dest/error/index.js",
     "./eth-address": "./dest/eth-address/index.js",
@@ -31,9 +49,9 @@
     "./json-rpc/undici": "./dest/json-rpc/client/undici.js",
     "./json-rpc/test": "./dest/json-rpc/test/index.js",
     "./iterable": "./dest/iterable/index.js",
+    "./iterator": "./dest/iterator/index.js",
     "./log": "./dest/log/index.js",
     "./mutex": "./dest/mutex/index.js",
-    "./fields": "./dest/fields/index.js",
     "./retry": "./dest/retry/index.js",
     "./running-promise": "./dest/running-promise/index.js",
     "./serialize": "./dest/serialize/index.js",
@@ -105,7 +123,7 @@
     "testEnvironment": "../../foundation/src/jest/env.mjs"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.0.1-commit.d3ec352c",
+    "@aztec/bb.js": "0.0.1-commit.fcb71a6",
     "@koa/cors": "^5.0.0",
     "@noble/curves": "=1.7.0",
     "@noble/hashes": "^1.6.1",

package/src/array/index.ts

@@ -1 +1,2 @@
 export * from './array.js';
+export * from './sorted_array.js';

package/src/array/sorted_array.ts

@@ -0,0 +1,133 @@
+type Cmp<T> = (a: T, b: T) => -1 | 0 | 1;
+
+export function dedupeSortedArray<T>(arr: T[], cmp: Cmp<T>): void {
+  for (let i = 0; i < arr.length; i++) {
+    let j = i + 1;
+    for (; j < arr.length; j++) {
+      const res = cmp(arr[i], arr[j]);
+      if (res === 0) {
+        continue;
+      } else if (res < 0) {
+        break;
+      } else {
+        throw new Error('Array not sorted');
+      }
+    }
+
+    if (j - i > 1) {
+      arr.splice(i + 1, j - i - 1);
+    }
+  }
+}
+
+export function insertIntoSortedArray<T>(arr: T[], item: T, cmp: Cmp<T>, allowDuplicates = true): boolean {
+  let start = 0;
+  let end = arr.length;
+
+  while (start < end) {
+    const mid = start + (((end - start) / 2) | 0);
+    const comparison = cmp(arr[mid], item);
+
+    if (comparison < 0) {
+      start = mid + 1;
+    } else {
+      end = mid;
+    }
+  }
+
+  if (!allowDuplicates) {
+    // Check element at insertion point
+    if (start < arr.length && cmp(arr[start], item) === 0) {
+      return false;
+    }
+
+    // Check element before insertion point (in case we landed after duplicates)
+    if (start > 0 && cmp(arr[start - 1], item) === 0) {
+      return false;
+    }
+  }
+
+  arr.splice(start, 0, item);
+  return true;
+}
+
+export function findIndexInSortedArray<T, N>(values: T[], needle: N, cmp: (a: T, b: N) => number): number {
+  let start = 0;
+  let end = values.length - 1;
+
+  while (start <= end) {
+    const mid = start + (((end - start) / 2) | 0);
+    const comparison = cmp(values[mid], needle);
+
+    if (comparison === 0) {
+      return mid;
+    }
+
+    if (comparison > 0) {
+      end = mid - 1;
+    } else {
+      start = mid + 1;
+    }
+  }
+
+  return -1;
+}
+
+export function findInSortedArray<T, N>(values: T[], needle: N, cmp: (a: T, b: N) => number): T | undefined {
+  const idx = findIndexInSortedArray(values, needle, cmp);
+  return idx > -1 ? values[idx] : undefined;
+}
+
+export function removeAnyOf<T, N>(arr: T[], vals: N[], cmp: (a: T, b: N) => -1 | 0 | 1): void {
+  let writeIdx = 0;
+  let readIdx = 0;
+  let valIdx = 0;
+
+  while (readIdx < arr.length && valIdx < vals.length) {
+    const comparison = cmp(arr[readIdx], vals[valIdx]);
+
+    if (comparison < 0) {
+      arr[writeIdx++] = arr[readIdx++];
+    } else if (comparison > 0) {
+      valIdx++;
+    } else {
+      readIdx++;
+    }
+  }
+
+  while (readIdx < arr.length) {
+    arr[writeIdx++] = arr[readIdx++];
+  }
+
+  arr.length = writeIdx;
+}
+
+export function removeFromSortedArray<T, N>(arr: T[], val: N, cmp: (a: T, b: N) => -1 | 0 | 1) {
+  const idx = findIndexInSortedArray(arr, val, cmp);
+  if (idx > -1) {
+    arr.splice(idx, 1);
+  }
+}
+
+export function merge<T>(arr: T[], toInsert: T[], cmp: (a: T, b: T) => -1 | 0 | 1): void {
+  const result = new Array<T>(arr.length + toInsert.length);
+  let i = 0,
+    j = 0,
+    k = 0;
+
+  while (i < arr.length && j < toInsert.length) {
+    result[k++] = cmp(arr[i], toInsert[j]) <= 0 ? arr[i++] : toInsert[j++];
+  }
+
+  while (i < arr.length) {
+    result[k++] = arr[i++];
+  }
+  while (j < toInsert.length) {
+    result[k++] = toInsert[j++];
+  }
+
+  for (i = 0; i < result.length; i++) {
+    arr[i] = result[i];
+  }
+  arr.length = result.length;
+}

package/src/buffer/buffer16.ts

@@ -1,5 +1,5 @@
-import { randomBytes } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, deserializeBigInt, serializeBigInt } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';

package/src/buffer/buffer32.ts

@@ -1,5 +1,5 @@
-import { randomBytes } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { BufferReader, deserializeBigInt, serializeBigInt } from '@aztec/foundation/serialize';
 
 import { inspect } from 'util';

package/src/config/env_var.ts

@@ -24,6 +24,9 @@ export type EnvVar =
   | 'BLOB_SINK_ARCHIVE_API_URL'
   | 'BLOB_SINK_PORT'
   | 'BLOB_SINK_URL'
+  | 'BLOB_FILE_STORE_URLS'
+  | 'BLOB_FILE_STORE_UPLOAD_URL'
+  | 'BLOB_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES'
   | 'BOT_DA_GAS_LIMIT'
   | 'BOT_FEE_PAYMENT_METHOD'
   | 'BOT_BASE_FEE_PADDING'
@@ -63,8 +66,9 @@ export type EnvVar =
   | 'PUBLIC_DATA_TREE_MAP_SIZE_KB'
   | 'DEBUG'
   | 'DEBUG_P2P_DISABLE_COLOCATION_PENALTY'
-  | 'DEPLOY_AZTEC_CONTRACTS_SALT'
   | 'ETHEREUM_HOSTS'
+  | 'ETHEREUM_DEBUG_HOSTS'
+  | 'ETHEREUM_ALLOW_NO_DEBUG_HOSTS'
   | 'FEE_RECIPIENT'
   | 'FORCE_COLOR'
   | 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS'
@@ -131,8 +135,7 @@ export type EnvVar =
   | 'P2P_TRUSTED_PEERS'
   | 'P2P_PRIVATE_PEERS'
   | 'P2P_PREFERRED_PEERS'
-  | 'P2P_MAX_TX_POOL_SIZE'
-  | 'P2P_TX_POOL_OVERFLOW_FACTOR'
+  | 'P2P_MAX_PENDING_TX_COUNT'
   | 'P2P_SEEN_MSG_CACHE_SIZE'
   | 'P2P_DROP_TX'
   | 'P2P_DROP_TX_CHANCE'
@@ -166,6 +169,7 @@ export type EnvVar =
   | 'PROVER_PUBLISHER_PRIVATE_KEYS'
   | 'PROVER_PUBLISHER_ADDRESSES'
   | 'PROVER_PUBLISHER_ALLOW_INVALID_STATES'
+  | 'PROVER_PUBLISHER_FORWARDER_ADDRESS'
   | 'PROVER_REAL_PROOFS'
   | 'PROVER_TEST_DELAY_FACTOR'
   | 'PROVER_TEST_DELAY_MS'
@@ -190,10 +194,13 @@ export type EnvVar =
   | 'SEQ_PUBLISHER_PRIVATE_KEYS'
   | 'SEQ_PUBLISHER_ADDRESSES'
   | 'SEQ_PUBLISHER_ALLOW_INVALID_STATES'
-  | 'SEQ_TX_POLLING_INTERVAL_MS'
+  | 'SEQ_PUBLISHER_FORWARDER_ADDRESS'
+  | 'SEQ_POLLING_INTERVAL_MS'
   | 'SEQ_ENFORCE_TIME_TABLE'
-  | 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT'
+  | 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT'
   | 'SEQ_ATTESTATION_PROPAGATION_TIME'
+  | 'SEQ_BLOCK_DURATION_MS'
+  | 'SEQ_BUILD_CHECKPOINT_IF_EMPTY'
   | 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER'
   | 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER'
   | 'SLASH_MIN_PENALTY_PERCENTAGE'
@@ -252,6 +259,7 @@ export type EnvVar =
   | 'AZTEC_TARGET_COMMITTEE_SIZE'
   | 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET'
   | 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO'
+  | 'AZTEC_INBOX_LAG'
   | 'AZTEC_PROOF_SUBMISSION_EPOCHS'
   | 'AZTEC_ACTIVATION_THRESHOLD'
   | 'AZTEC_EJECTION_THRESHOLD'
@@ -279,6 +287,7 @@ export type EnvVar =
   | 'L1_BLOB_FEE_PER_GAS_GWEI_MAX'
   | 'L1_PRIORITY_FEE_BUMP_PERCENTAGE'
   | 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE'
+  | 'L1_MINIMUM_PRIORITY_FEE_PER_GAS_GWEI'
   | 'L1_FIXED_PRIORITY_FEE_PER_GAS'
   | 'L1_FIXED_PRIORITY_FEE_PER_GAS_GWEI'
   | 'L1_TX_MONITOR_MAX_ATTEMPTS'
@@ -304,4 +313,5 @@ export type EnvVar =
   | 'BLOB_ALLOW_EMPTY_SOURCES'
   | 'FISHERMAN_MODE'
   | 'MAX_ALLOWED_ETH_CLIENT_DRIFT_SECONDS'
-  | 'LEGACY_BLS_CLI';
+  | 'LEGACY_BLS_CLI'
+  | 'DEBUG_FORCE_TX_PROOF_VERIFICATION';

package/src/config/index.ts

@@ -1,4 +1,5 @@
-import { Fq, Fr } from '../fields/fields.js';
+import { Fq, Fr } from '../curves/bn254/field.js';
+import { createConsoleLogger } from '../log/console.js';
 import type { EnvVar } from './env_var.js';
 import { type NetworkNames, getActiveNetworkName } from './network_name.js';
 import { SecretValue } from './secret_value.js';
@@ -17,6 +18,11 @@ export interface ConfigMapping {
   isBoolean?: boolean;
   nested?: Record<string, ConfigMapping>;
   fallback?: EnvVar[];
+  /**
+   * List of deprecated env vars that are still supported but will log a warning.
+   * These should also be included in the fallback array for parsing.
+   */
+  deprecatedFallback?: { env: EnvVar; message?: string }[];
 }
 
 export function isBooleanConfigValue<T>(obj: T, key: keyof T): boolean {
@@ -72,12 +78,24 @@ export function getConfigFromMappings<T>(configMappings: ConfigMappingsType<T>):
   const config = {} as T;
 
   for (const key in configMappings) {
-    const { env, parseEnv, defaultValue, nested, fallback } = configMappings[key];
+    const { env, parseEnv, defaultValue, nested, fallback, deprecatedFallback } = configMappings[key];
     if (nested) {
       (config as any)[key] = getConfigFromMappings(nested);
     } else {
       // Use the shared utility function
       (config as any)[key] = getValueFromEnvWithFallback(env, parseEnv, defaultValue, fallback);
+
+      // Check for deprecated env vars and warn if logger is set
+      if (deprecatedFallback?.length) {
+        const userLog = createConsoleLogger('[DEPRECATED]');
+        for (const { env: deprecatedEnv, message } of deprecatedFallback) {
+          if (process.env[deprecatedEnv]) {
+            const warningMessage =
+              message ?? `Environment variable ${deprecatedEnv} is deprecated. Please use ${env} instead.`;
+            userLog(warningMessage, { deprecatedEnvVar: deprecatedEnv, newEnvVar: env });
+          }
+        }
+      }
     }
   }
 

package/src/config/network_config.ts

@@ -4,9 +4,11 @@ export const NetworkConfigSchema = z
   .object({
     bootnodes: z.array(z.string()),
     snapshots: z.array(z.string()),
+    blobFileStoreUrls: z.array(z.string()).optional(),
     registryAddress: z.string(),
     feeAssetHandlerAddress: z.string().optional(),
     l1ChainId: z.number(),
+    blockDurationMs: z.number().positive().optional(),
   })
   .passthrough(); // Allow additional unknown fields to pass through
 

package/src/crypto/bls/bn254_keystore.ts

@@ -1,4 +1,4 @@
-import { randomBytes } from '@aztec/foundation/crypto';
+import { randomBytes } from '@aztec/foundation/crypto/random';
 
 import { createCipheriv, createDecipheriv, createHash, pbkdf2Sync, randomUUID } from 'crypto';
 import { readFileSync } from 'fs';

package/src/crypto/bls/index.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Hex } from '@aztec/foundation/string';
 
 import { mod } from '@noble/curves/abstract/modular';

package/src/crypto/bn254/index.ts

@@ -1,173 +1,64 @@
-import {
-  BN254_G1_GENERATOR,
-  BN254_G2_GENERATOR,
-  BarretenbergSync,
-  type Bn254G1Point as BbApiBn254G1Point,
-  type Bn254G2Point as BbApiBn254G2Point,
-} from '@aztec/bb.js';
-
-import { Fq, Fr } from '../../fields/fields.js';
+import { Fr } from '../../curves/bn254/field.js';
+import { Bn254G1Point, Bn254G2Point } from '../../curves/bn254/point.js';
 
 /**
- * BN254 G1 point using foundation field classes.
- * Represents a point on the BN254 elliptic curve in affine coordinates.
+ * BN254 utility functions for point operations.
+ * Provides compression, decompression, and public key generation for the BN254 curve.
+ * Uses the bb.js Barretenberg backend for point operations.
  */
-export class Bn254G1Point {
-  constructor(
-    public readonly x: Fq,
-    public readonly y: Fq,
-  ) {}
-
-  private toBbApiPoint(): BbApiBn254G1Point {
-    return {
-      x: this.x.toBuffer(),
-      y: this.y.toBuffer(),
-    };
-  }
-
-  private static fromBbApiPoint(point: BbApiBn254G1Point): Bn254G1Point {
-    return new Bn254G1Point(Fq.fromBuffer(Buffer.from(point.x)), Fq.fromBuffer(Buffer.from(point.y)));
-  }
-
-  async isOnCurve(): Promise<boolean> {
-    await BarretenbergSync.initSingleton();
-    const api = BarretenbergSync.getSingleton();
-
-    const apiPoint = this.toBbApiPoint();
-    const response = api.bn254G1IsOnCurve({ point: apiPoint });
-    return response.isOnCurve;
-  }
-
-  /**
-   * Get the generator point for BN254 G1, or perform scalar multiplication.
-   * When called without arguments, returns the base generator point.
-   * When called with a scalar, returns scalar * generator (useful for public key derivation).
-   */
-  static async generator(scalar?: Fr): Promise<Bn254G1Point> {
-    if (!scalar) {
-      return new Bn254G1Point(
-        Fq.fromBuffer(Buffer.from(BN254_G1_GENERATOR.x)),
-        Fq.fromBuffer(Buffer.from(BN254_G1_GENERATOR.y)),
-      );
-    }
-
-    await BarretenbergSync.initSingleton();
-    const api = BarretenbergSync.getSingleton();
-
-    const response = api.bn254G1Mul({
-      point: BN254_G1_GENERATOR,
-      scalar: scalar.toBuffer(),
-    });
-
-    return Bn254G1Point.fromBbApiPoint(response.point);
-  }
-
-  /**
-   * Decompress a BN254 G1 point from compressed form (32 bytes).
-   * The compressed format encodes the x-coordinate and the sign bit of the y-coordinate
-   * in the most significant bit.
-   */
-  static async fromCompressed(compressed: Buffer): Promise<Bn254G1Point> {
-    if (compressed.length !== 32) {
-      throw new Error('Invalid compressed point length');
-    }
-    await BarretenbergSync.initSingleton();
-    const api = BarretenbergSync.getSingleton();
-
-    const response = api.bn254G1FromCompressed({
-      compressed: new Uint8Array(compressed),
-    });
-
-    return Bn254G1Point.fromBbApiPoint(response.point);
-  }
 
-  /**
-   * Compress this BN254 G1 point to 32 bytes.
-   * The compressed format encodes the x-coordinate and the sign bit of the y-coordinate
-   * in the most significant bit (bit 255).
-   */
-  compress(): Buffer {
-    const xBytes = this.x.toBuffer();
-    // Get the least significant bit of y to determine the sign
-    const yLsb = this.y.toBigInt() & 1n;
-    // If y is odd, set the most significant bit (bit 255) of the output
-    if (yLsb === 1n) {
-      xBytes[0] |= 0x80;
-    }
-    return xBytes;
-  }
+/**
+ * Generate a compressed BN254 G1 public key from a private key.
+ *
+ * @param privateKeyHex - Private key as 0x-prefixed hex string
+ * @returns Compressed G1 point (32 bytes with sign bit in MSB)
+ */
+export async function computeBn254G1PublicKeyCompressed(privateKeyHex: string): Promise<string> {
+  const sk = BigInt(privateKeyHex);
+  const skReduced = sk % Fr.MODULUS;
 
-  equals(other: Bn254G1Point): boolean {
-    return this.x.equals(other.x) && this.y.equals(other.y);
-  }
+  // Generate G1 point on BN254 curve using bb.js
+  const scalar = Fr.fromString(skReduced.toString());
+  const pk1 = await Bn254G1Point.generator(scalar);
 
-  toString(): string {
-    return `Bn254G1Point(x: ${this.x.toString()}, y: ${this.y.toString()})`;
-  }
+  // Compress the point using the primitive method
+  return '0x' + pk1.compress().toString('hex');
 }
 
 /**
- * BN254 G2 point using foundation field classes.
- * Represents a point on the BN254 G2 curve (twist curve) in affine coordinates.
- * G2 points use extension field coordinates (Fq2).
+ * Generate uncompressed BN254 G1 public key from a private key.
+ *
+ * @param privateKeyHex - Private key as 0x-prefixed hex string
+ * @returns G1 point in affine coordinates
  */
-export class Bn254G2Point {
-  constructor(
-    public readonly x: [Fq, Fq],
-    public readonly y: [Fq, Fq],
-  ) {}
-
-  private toBbApiPoint(): BbApiBn254G2Point {
-    return {
-      x: [this.x[0].toBuffer(), this.x[1].toBuffer()],
-      y: [this.y[0].toBuffer(), this.y[1].toBuffer()],
-    };
-  }
-
-  private static fromBbApiPoint(point: BbApiBn254G2Point): Bn254G2Point {
-    return new Bn254G2Point(
-      [Fq.fromBuffer(Buffer.from(point.x[0])), Fq.fromBuffer(Buffer.from(point.x[1]))],
-      [Fq.fromBuffer(Buffer.from(point.y[0])), Fq.fromBuffer(Buffer.from(point.y[1]))],
-    );
-  }
-
-  /**
-   * Get the generator point for BN254 G2, or perform scalar multiplication.
-   * When called without arguments, returns the base generator point.
-   * When called with a scalar, returns scalar * generator.
-   */
-  static async generator(scalar?: Fr): Promise<Bn254G2Point> {
-    if (!scalar) {
-      return new Bn254G2Point(
-        [Fq.fromBuffer(Buffer.from(BN254_G2_GENERATOR.x[0])), Fq.fromBuffer(Buffer.from(BN254_G2_GENERATOR.x[1]))],
-        [Fq.fromBuffer(Buffer.from(BN254_G2_GENERATOR.y[0])), Fq.fromBuffer(Buffer.from(BN254_G2_GENERATOR.y[1]))],
-      );
-    }
-
-    await BarretenbergSync.initSingleton();
-    const api = BarretenbergSync.getSingleton();
+export async function computeBn254G1PublicKey(privateKeyHex: string): Promise<{ x: bigint; y: bigint }> {
+  const sk = BigInt(privateKeyHex);
+  const skReduced = sk % Fr.MODULUS;
 
-    const response = api.bn254G2Mul({
-      point: BN254_G2_GENERATOR as BbApiBn254G2Point,
-      scalar: scalar.toBuffer(),
-    });
+  const scalar = Fr.fromString(skReduced.toString());
+  const pk1 = await Bn254G1Point.generator(scalar);
 
-    return Bn254G2Point.fromBbApiPoint(response.point);
-  }
-
-  equals(other: Bn254G2Point): boolean {
-    return (
-      this.x[0].equals(other.x[0]) &&
-      this.x[1].equals(other.x[1]) &&
-      this.y[0].equals(other.y[0]) &&
-      this.y[1].equals(other.y[1])
-    );
-  }
-
-  toString(): string {
-    return `Bn254G2Point(x: (${this.x[0].toString()}, ${this.x[1].toString()}), y: (${this.y[0].toString()}, ${this.y[1].toString()}))`;
-  }
+  return { x: pk1.x.toBigInt(), y: pk1.y.toBigInt() };
 }
 
-// Re-export BN254 point utility functions
-export { computeBn254G1PublicKeyCompressed, computeBn254G1PublicKey, computeBn254G2PublicKey } from './bn254_utils.js';
+/**
+ * Generate BN254 G2 public key from a private key.
+ *
+ * @param privateKeyHex - Private key as 0x-prefixed hex string
+ * @returns G2 point in affine coordinates
+ */
+export async function computeBn254G2PublicKey(privateKeyHex: string): Promise<{
+  x: { c0: bigint; c1: bigint };
+  y: { c0: bigint; c1: bigint };
+}> {
+  const sk = BigInt(privateKeyHex);
+  const skReduced = sk % Fr.MODULUS;
+
+  const scalar = Fr.fromString(skReduced.toString());
+  const pk2 = await Bn254G2Point.generator(scalar);
+
+  return {
+    x: { c0: pk2.x[0].toBigInt(), c1: pk2.x[1].toBigInt() },
+    y: { c0: pk2.y[0].toBigInt(), c1: pk2.y[1].toBigInt() },
+  };
+}

package/src/crypto/ecdsa/signature.ts

@@ -1,6 +1,6 @@
 import { toBufferBE } from '@aztec/foundation/bigint-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 { mapTuple } from '@aztec/foundation/serialize';
 
 import type { Signature } from '../signature/index.js';

package/src/crypto/grumpkin/index.ts

@@ -1,5 +1,7 @@
 import { BarretenbergSync } from '@aztec/bb.js';
-import { Fr, type GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import { Point } from '@aztec/foundation/curves/grumpkin';
 
 /**
  * Grumpkin elliptic curve operations.

package/src/crypto/keys/index.ts

@@ -1,6 +1,6 @@
 import { BarretenbergSync } from '@aztec/bb.js';
 
-import { Fr } from '../../fields/fields.js';
+import { Fr } from '../../curves/bn254/field.js';
 
 export async function vkAsFieldsMegaHonk(input: Buffer): Promise<Fr[]> {
   await BarretenbergSync.initSingleton();

package/src/crypto/pedersen/pedersen.wasm.ts

@@ -1,6 +1,6 @@
 import { BarretenbergSync } from '@aztec/bb.js';
 
-import { Fr } from '../../fields/fields.js';
+import { Fr } from '../../curves/bn254/field.js';
 import { type Fieldable, serializeToFields } from '../../serialize/serialize.js';
 
 /**

package/src/crypto/poseidon/index.ts

@@ -1,6 +1,6 @@
 import { BarretenbergSync } from '@aztec/bb.js';
 
-import { Fr } from '../../fields/fields.js';
+import { Fr } from '../../curves/bn254/field.js';
 import { type Fieldable, serializeToFields } from '../../serialize/serialize.js';
 
 /**

package/src/crypto/schnorr/index.ts

@@ -1,5 +1,6 @@
 import { BarretenbergSync } from '@aztec/bb.js';
-import { type GrumpkinScalar, Point } from '@aztec/foundation/fields';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import { Point } from '@aztec/foundation/curves/grumpkin';
 
 import { SchnorrSignature } from './signature.js';
 

package/src/crypto/schnorr/signature.ts

@@ -1,5 +1,5 @@
-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, mapTuple } from '@aztec/foundation/serialize';
 
 import type { Signature } from '../signature/index.js';

package/src/crypto/sha256/index.ts

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import { default as hash } from 'hash.js';
 
-import { Fr } from '../../fields/fields.js';
+import { Fr } from '../../curves/bn254/field.js';
 import { truncateAndPad } from '../../serialize/free_funcs.js';
 import { type Bufferable, serializeToBuffer } from '../../serialize/serialize.js';
 import type { Hasher } from '../../trees/hasher.js';