@aztec/foundation 0.0.1-commit.b655e406 → 0.0.1-commit.bf2612ae

package/src/collection/array.ts

@@ -250,6 +250,37 @@ export function chunk<T>(items: T[], chunkSize: number): T[][] {
   return chunks;
 }
 
+const UNINITIALIZED = Symbol('uninitialized');
+
+/**
+ * Splits the given iterable into chunks based on the key returned by the given function.
+ * Items must be contiguous to be included in the same chunk.
+ */
+export function chunkBy<T, U>(items: T[], fn: (item: T) => U): T[][] {
+  const chunks: T[][] = [];
+  let currentChunk: T[] = [];
+  let currentKey: U | typeof UNINITIALIZED = UNINITIALIZED;
+
+  for (const item of items) {
+    const key = fn(item);
+    if (currentKey === UNINITIALIZED || key !== currentKey) {
+      if (currentChunk.length > 0) {
+        chunks.push(currentChunk);
+      }
+      currentChunk = [item];
+      currentKey = key;
+    } else {
+      currentChunk.push(item);
+    }
+  }
+
+  if (currentChunk.length > 0) {
+    chunks.push(currentChunk);
+  }
+
+  return chunks;
+}
+
 /** Partitions the given iterable into two arrays based on the predicate. */
 export function partition<T>(items: T[], predicate: (item: T) => boolean): [T[], T[]] {
   const pass: T[] = [];

package/src/config/env_var.ts

@@ -21,12 +21,13 @@ export type EnvVar =
   | 'BB_NUM_IVC_VERIFIERS'
   | 'BB_IVC_CONCURRENCY'
   | 'BOOTSTRAP_NODES'
-  | 'BLOB_SINK_ARCHIVE_API_URL'
-  | 'BLOB_SINK_PORT'
-  | 'BLOB_SINK_URL'
+  | 'BLOB_ARCHIVE_API_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'
+  | 'BOT_MIN_FEE_PADDING'
   | 'BOT_FLUSH_SETUP_TRANSACTIONS'
   | 'BOT_FOLLOW_CHAIN'
   | 'BOT_L2_GAS_LIMIT'
@@ -63,8 +64,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'
@@ -86,6 +88,7 @@ export type EnvVar =
   | 'OTEL_EXPORTER_OTLP_LOGS_ENDPOINT'
   | 'OTEL_COLLECT_INTERVAL_MS'
   | 'OTEL_EXCLUDE_METRICS'
+  | 'OTEL_INCLUDE_METRICS'
   | 'OTEL_EXPORT_TIMEOUT_MS'
   | 'PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT'
   | 'PUBLIC_OTEL_INCLUDE_METRICS'
@@ -130,12 +133,12 @@ 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'
   | 'P2P_TX_POOL_DELETE_TXS_AFTER_REORG'
+  | 'DEBUG_P2P_INSTRUMENT_MESSAGES'
   | 'PEER_ID_PRIVATE_KEY'
   | 'PEER_ID_PRIVATE_KEY_PATH'
   | 'PROVER_AGENT_COUNT'
@@ -148,6 +151,7 @@ export type EnvVar =
   | 'PROVER_BROKER_BATCH_INTERVAL_MS'
   | 'PROVER_BROKER_BATCH_SIZE'
   | 'PROVER_BROKER_MAX_EPOCHS_TO_KEEP_RESULTS_FOR'
+  | 'PROVER_CANCEL_JOBS_ON_STOP'
   | 'PROVER_COORDINATION_NODE_URLS'
   | 'PROVER_FAILED_PROOF_STORE'
   | 'PROVER_NODE_FAILED_EPOCH_STORE'
@@ -164,12 +168,15 @@ 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'
   | 'PROVER_TEST_DELAY_TYPE'
+  | 'PROVER_TEST_VERIFICATION_DELAY_MS'
   | 'PXE_L2_BLOCK_BATCH_SIZE'
   | 'PXE_PROVER_ENABLED'
+  | 'PXE_SYNC_CHAIN_TIP'
   | 'RPC_MAX_BATCH_SIZE'
   | 'RPC_MAX_BODY_SIZE'
   | 'RPC_SIMULATE_PUBLIC_MAX_GAS_LIMIT'
@@ -187,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'
@@ -238,7 +248,6 @@ export type EnvVar =
   | 'VALIDATOR_ADDRESSES'
   | 'ROLLUP_VERSION'
   | 'WS_BLOCK_CHECK_INTERVAL_MS'
-  | 'WS_PROVEN_BLOCKS_ONLY'
   | 'WS_BLOCK_REQUEST_BATCH_SIZE'
   | 'L1_READER_VIEM_POLLING_INTERVAL_MS'
   | 'WS_DATA_DIRECTORY'
@@ -247,13 +256,16 @@ export type EnvVar =
   | 'AZTEC_SLOT_DURATION'
   | 'AZTEC_EPOCH_DURATION'
   | 'AZTEC_TARGET_COMMITTEE_SIZE'
-  | 'AZTEC_LAG_IN_EPOCHS'
+  | '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'
   | 'AZTEC_LOCAL_EJECTION_THRESHOLD'
   | 'AZTEC_MANA_TARGET'
   | 'AZTEC_PROVING_COST_PER_MANA'
+  | 'AZTEC_INITIAL_ETH_PER_FEE_ASSET'
   | 'AZTEC_SLASHING_QUORUM'
   | 'AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS'
   | 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS'
@@ -267,13 +279,18 @@ export type EnvVar =
   | 'AZTEC_SLASHER_FLAVOR'
   | 'AZTEC_GOVERNANCE_PROPOSER_QUORUM'
   | 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE'
+  | 'AZTEC_GOVERNANCE_VOTING_DURATION'
   | 'AZTEC_EXIT_DELAY_SECONDS'
   | 'L1_GAS_LIMIT_BUFFER_PERCENTAGE'
   | 'L1_GAS_PRICE_MAX'
+  | 'L1_FEE_PER_GAS_GWEI_MAX'
   | 'L1_BLOB_FEE_PER_GAS_MAX'
+  | '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'
   | 'L1_TX_MONITOR_CHECK_INTERVAL_MS'
   | 'L1_TX_MONITOR_STALL_TIME_MS'
@@ -289,9 +306,23 @@ export type EnvVar =
   | 'K8S_POD_UID'
   | 'K8S_NAMESPACE_NAME'
   | 'VALIDATOR_REEXECUTE_DEADLINE_MS'
-  | 'ALWAYS_REEXECUTE_BLOCK_PROPOSALS'
   | 'AUTO_UPDATE'
   | 'AUTO_UPDATE_URL'
   | 'WEB3_SIGNER_URL'
   | 'SKIP_ARCHIVER_INITIAL_SYNC'
-  | 'BLOB_ALLOW_EMPTY_SOURCES';
+  | 'BLOB_ALLOW_EMPTY_SOURCES'
+  | 'FISHERMAN_MODE'
+  | 'MAX_ALLOWED_ETH_CLIENT_DRIFT_SECONDS'
+  | 'LEGACY_BLS_CLI'
+  | 'DEBUG_FORCE_TX_PROOF_VERIFICATION'
+  | 'VALIDATOR_HA_SIGNING_ENABLED'
+  | 'VALIDATOR_HA_NODE_ID'
+  | 'VALIDATOR_HA_POLLING_INTERVAL_MS'
+  | 'VALIDATOR_HA_SIGNING_TIMEOUT_MS'
+  | 'VALIDATOR_HA_MAX_STUCK_DUTIES_AGE_MS'
+  | 'VALIDATOR_HA_DATABASE_URL'
+  | 'VALIDATOR_HA_RUN_MIGRATIONS'
+  | 'VALIDATOR_HA_POOL_MAX'
+  | 'VALIDATOR_HA_POOL_MIN'
+  | 'VALIDATOR_HA_POOL_IDLE_TIMEOUT_MS'
+  | 'VALIDATOR_HA_POOL_CONNECTION_TIMEOUT_MS';

package/src/config/index.ts

@@ -1,6 +1,8 @@
-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 { parseBooleanEnv } from './parse-env.js';
 import { SecretValue } from './secret_value.js';
 
 export { SecretValue, getActiveNetworkName };
@@ -17,6 +19,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 +79,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 });
+          }
+        }
+      }
     }
   }
 
@@ -130,6 +149,23 @@ export function floatConfigHelper(
   };
 }
 
+/**
+ * Parses an environment variable to a 0-1 percentage value
+ */
+export function percentageConfigHelper(defaultVal: number): Pick<ConfigMapping, 'parseEnv' | 'defaultValue'> {
+  return {
+    parseEnv: (val: string): number => {
+      const parsed = safeParseFloat(val, defaultVal);
+      if (parsed < 0 || parsed > 1) {
+        throw new TypeError(`Invalid percentage value: ${parsed} should be between 0 and 1`);
+      }
+
+      return parsed;
+    },
+    defaultValue: defaultVal,
+  };
+}
+
 /**
  * Generates parseEnv and default values for a numerical config value.
  * @param defaultVal - The default numerical value to use if the environment variable is not set or is invalid
@@ -213,10 +249,7 @@ export function secretValueConfigHelper<T>(parse: (val: string | undefined) => T
   };
 }
 
-/** Parses an env var as boolean. Returns true only if value is 1, true, or TRUE. */
-export function parseBooleanEnv(val: string | undefined): boolean {
-  return val !== undefined && ['1', 'true', 'TRUE'].includes(val);
-}
+export { parseBooleanEnv } from './parse-env.js';
 
 export function secretStringConfigHelper(): Required<
   Pick<ConfigMapping, 'parseEnv' | 'defaultValue' | 'isBoolean'> & {

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/config/parse-env.ts

@@ -0,0 +1,4 @@
+/** Parses an env var as boolean. Returns true only if value is 1, true, or TRUE. */
+export function parseBooleanEnv(val: string | undefined): boolean {
+  return val !== undefined && ['1', 'true', 'TRUE'].includes(val);
+}

package/src/crypto/aes128/index.ts

@@ -22,7 +22,7 @@ export class Aes128 {
     paddingBuffer.fill(numPaddingBytes);
     const input = Buffer.concat([data, paddingBuffer]);
 
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.aesEncrypt({
       plaintext: input,
@@ -42,7 +42,7 @@ export class Aes128 {
    * @returns Decrypted data.
    */
   public async decryptBufferCBCKeepPadding(data: Uint8Array, iv: Uint8Array, key: Uint8Array): Promise<Buffer> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.aesDecrypt({
       ciphertext: data,

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,170 +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> {
-    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/index.ts

@@ -16,7 +16,7 @@ export class Ecdsa {
    * @returns A secp256k1 public key.
    */
   public async computePublicKey(privateKey: Buffer): Promise<Buffer> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response =
       this.curve === 'secp256r1'
@@ -32,7 +32,7 @@ export class Ecdsa {
    * @returns An ECDSA signature of the form (r, s, v).
    */
   public async constructSignature(msg: Uint8Array, privateKey: Buffer) {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response =
       this.curve === 'secp256r1'
@@ -48,7 +48,7 @@ export class Ecdsa {
    * @returns The secp256k1 public key of the signer.
    */
   public async recoverPublicKey(msg: Uint8Array, sig: EcdsaSignature): Promise<Buffer> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response =
       this.curve === 'secp256r1'
@@ -65,7 +65,7 @@ export class Ecdsa {
    * @returns True or false.
    */
   public async verifySignature(msg: Uint8Array, pubKey: Buffer, sig: EcdsaSignature) {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response =
       this.curve === 'secp256r1'

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.
@@ -20,7 +22,7 @@ export class Grumpkin {
    * @returns Result of the multiplication.
    */
   public static async mul(point: Point, scalar: GrumpkinScalar): Promise<Point> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.grumpkinMul({
       point: { x: point.x.toBuffer(), y: point.y.toBuffer() },
@@ -36,7 +38,7 @@ export class Grumpkin {
    * @returns Result of the addition.
    */
   public static async add(a: Point, b: Point): Promise<Point> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.grumpkinAdd({
       pointA: { x: a.x.toBuffer(), y: a.y.toBuffer() },
@@ -52,7 +54,7 @@ export class Grumpkin {
    * @returns Points multiplied by the scalar.
    */
   public static async batchMul(points: Point[], scalar: GrumpkinScalar) {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.grumpkinBatchMul({
       points: points.map(p => ({ x: p.x.toBuffer(), y: p.y.toBuffer() })),
@@ -67,7 +69,7 @@ export class Grumpkin {
    * @returns Random field element.
    */
   public static async getRandomFr(): Promise<Fr> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.grumpkinGetRandomFr({ dummy: 0 });
     return Fr.fromBuffer(Buffer.from(response.value));
@@ -79,7 +81,7 @@ export class Grumpkin {
    * @returns Buffer representation of the field element.
    */
   public static async reduce512BufferToFr(uint512Buf: Buffer): Promise<Fr> {
-    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    await BarretenbergSync.initSingleton();
     const api = BarretenbergSync.getSingleton();
     const response = api.grumpkinReduce512({ input: uint512Buf });
     return Fr.fromBuffer(Buffer.from(response.value));

package/src/crypto/keys/index.ts

@@ -1,9 +1,9 @@
 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({ wasmPath: process.env.BB_WASM_PATH });
+  await BarretenbergSync.initSingleton();
   const api = BarretenbergSync.getSingleton();
   const response = api.megaVkAsFields({ verificationKey: input });
   return response.fields.map(field => Fr.fromBuffer(Buffer.from(field)));