@aztec/foundation 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/src/config/index.ts

@@ -1,10 +1,13 @@
-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';
 
 export { SecretValue, getActiveNetworkName };
 export type { EnvVar, NetworkNames };
+export type { NetworkConfig, NetworkConfigMap } from './network_config.js';
+export { NetworkConfigMapSchema, NetworkConfigSchema } from './network_config.js';
 
 export interface ConfigMapping {
   env?: EnvVar;
@@ -15,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 {
@@ -70,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

@@ -0,0 +1,18 @@
+import { z } from 'zod';
+
+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
+
+export const NetworkConfigMapSchema = z.record(z.string(), NetworkConfigSchema);
+
+export type NetworkConfig = z.infer<typeof NetworkConfigSchema>;
+export type NetworkConfigMap = z.infer<typeof NetworkConfigMapSchema>;

package/src/config/network_name.ts

@@ -1,13 +1,28 @@
-export type NetworkNames = 'local' | 'testnet-ignition' | 'alpha-testnet' | 'testnet';
+export type NetworkNames =
+  | 'local'
+  | 'staging-ignition'
+  | 'staging-public'
+  | 'testnet'
+  | 'mainnet'
+  | 'next-net'
+  | 'devnet';
 
 export function getActiveNetworkName(name?: string): NetworkNames {
   const network = name || process.env.NETWORK;
   if (!network || network === '' || network === 'local') {
     return 'local';
-  } else if (network === 'testnet-ignition') {
+  } else if (network === 'staging-ignition') {
     return network;
-  } else if (network === 'alpha-testnet' || network === 'testnet') {
+  } else if (network === 'staging-public') {
     return network;
+  } else if (network === 'testnet' || network === 'alpha-testnet') {
+    return 'testnet';
+  } else if (network === 'mainnet') {
+    return 'mainnet';
+  } else if (network === 'next-net') {
+    return 'next-net';
+  } else if (network === 'devnet') {
+    return 'devnet';
   }
   throw new Error(`Unknown network: ${network}`);
 }

package/src/crypto/aes128/index.ts

@@ -1,4 +1,4 @@
-import { BarretenbergSync, RawBuffer } from '@aztec/bb.js';
+import { BarretenbergSync } from '@aztec/bb.js';
 
 import { Buffer } from 'buffer';
 
@@ -22,10 +22,15 @@ export class Aes128 {
     paddingBuffer.fill(numPaddingBytes);
     const input = Buffer.concat([data, paddingBuffer]);
 
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    return Buffer.from(
-      api.aesEncryptBufferCbc(new RawBuffer(input), new RawBuffer(iv), new RawBuffer(key), input.length),
-    );
+    await BarretenbergSync.initSingleton();
+    const api = BarretenbergSync.getSingleton();
+    const response = api.aesEncrypt({
+      plaintext: input,
+      iv,
+      key,
+      length: input.length,
+    });
+    return Buffer.from(response.ciphertext);
   }
 
   /**
@@ -37,11 +42,15 @@ export class Aes128 {
    * @returns Decrypted data.
    */
   public async decryptBufferCBCKeepPadding(data: Uint8Array, iv: Uint8Array, key: Uint8Array): Promise<Buffer> {
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    const paddedBuffer = Buffer.from(
-      api.aesDecryptBufferCbc(new RawBuffer(data), new RawBuffer(iv), new RawBuffer(key), data.length),
-    );
-    return paddedBuffer;
+    await BarretenbergSync.initSingleton();
+    const api = BarretenbergSync.getSingleton();
+    const response = api.aesDecrypt({
+      ciphertext: data,
+      iv,
+      key,
+      length: data.length,
+    });
+    return Buffer.from(response.plaintext);
   }
 
   /**

package/src/crypto/bls/bn254_keystore.ts

@@ -0,0 +1,287 @@
+import { randomBytes } from '@aztec/foundation/crypto/random';
+
+import { createCipheriv, createDecipheriv, createHash, pbkdf2Sync, randomUUID } from 'crypto';
+import { readFileSync } from 'fs';
+import { z } from 'zod';
+
+/**
+ * BN254 Keystore Format
+ *
+ * Implements encryption and decryption of keystores for BN254 BLS private keys
+ * using PBKDF2 and AES-128-CTR. This format is inspired by EIP-2335 but adapted
+ * for BN254 keys rather than BLS12-381.
+ *
+ * @see https://eips.ethereum.org/EIPS/eip-2335
+ */
+
+/**
+ * Zod schema for validating BN254 keystore structure
+ */
+const bn254KeystoreSchema = z.object({
+  crypto: z.object({
+    kdf: z.object({
+      function: z.literal('pbkdf2'),
+      params: z.object({
+        dklen: z.number(),
+        c: z.number(),
+        prf: z.string(),
+        salt: z.string(),
+      }),
+      message: z.string(),
+    }),
+    checksum: z.object({
+      function: z.literal('sha256'),
+      params: z.object({}),
+      message: z.string(),
+    }),
+    cipher: z.object({
+      function: z.literal('aes-128-ctr'),
+      params: z.object({
+        iv: z.string(),
+      }),
+      message: z.string(),
+    }),
+  }),
+  description: z.string().optional(),
+  pubkey: z.string(),
+  path: z.string(),
+  uuid: z.string(),
+  version: z.number(),
+});
+
+/**
+ * Error thrown when BN254 keystore operations fail
+ */
+export class Bn254KeystoreError extends Error {
+  constructor(
+    message: string,
+    public override cause?: Error,
+  ) {
+    super(message);
+    this.name = 'Bn254KeystoreError';
+  }
+}
+
+export type Bn254Keystore = z.infer<typeof bn254KeystoreSchema>;
+
+/**
+ * The JSON structure of a BN254 keystore file.
+ * @deprecated Use the inferred type from bn254KeystoreSchema instead
+ */
+export interface Bn254KeystoreInterface {
+  crypto: {
+    kdf: {
+      function: 'pbkdf2';
+      params: {
+        dklen: number;
+        c: number;
+        prf: string;
+        salt: string;
+      };
+      message: string;
+    };
+    checksum: {
+      function: 'sha256';
+      params: Record<string, never>;
+      message: string;
+    };
+    cipher: {
+      function: 'aes-128-ctr';
+      params: {
+        iv: string;
+      };
+      message: string;
+    };
+  };
+  description: string;
+  pubkey: string;
+  path: string;
+  uuid: string;
+  version: number;
+}
+
+/**
+ * Creates a BN254 keystore object for a BN254 BLS private key.
+ *
+ * Uses PBKDF2 with SHA-256 for key derivation and AES-128-CTR for encryption,
+ * following the EIP-2335 specification format.
+ *
+ * @param password - Password for encrypting the private key
+ * @param privateKeyHex - Private key as 0x-prefixed hex string (32 bytes)
+ * @param pubkeyHex - Public key as hex string (compressed or uncompressed)
+ * @param derivationPath - BIP-44 style derivation path (e.g., "m/12381/3600/0/0/0")
+ * @returns BN254 keystore object ready to be serialized to JSON
+ * @throws Error if private key is not 32-byte hex
+ */
+export function createBn254Keystore(
+  password: string,
+  privateKeyHex: string,
+  pubkeyHex: string,
+  derivationPath: string,
+): Bn254Keystore {
+  const ensureHex = (hex: string) => hex.replace(/^0x/i, '');
+  const privHex = ensureHex(privateKeyHex);
+  if (!/^[0-9a-fA-F]{64}$/.test(privHex)) {
+    throw new Error('BLS private key must be 32-byte hex');
+  }
+
+  const salt = randomBytes(32);
+  const iv = randomBytes(16);
+  const dk = pbkdf2Sync(Buffer.from(password.normalize('NFKD'), 'utf8'), salt, 262144, 32, 'sha256');
+  const cipherKey = dk.subarray(0, 16);
+
+  const cipher = createCipheriv('aes-128-ctr', cipherKey, iv);
+  const plaintext = Buffer.from(privHex, 'hex');
+  const ciphertext = Buffer.concat([cipher.update(plaintext), cipher.final()]);
+
+  const checksum = createHash('sha256')
+    .update(Buffer.concat([dk.subarray(16, 32), ciphertext]))
+    .digest();
+
+  const uuid = randomUUID();
+
+  return {
+    crypto: {
+      kdf: {
+        function: 'pbkdf2',
+        params: { dklen: 32, c: 262144, prf: 'hmac-sha256', salt: salt.toString('hex') },
+        message: '',
+      },
+      checksum: {
+        function: 'sha256',
+        params: {},
+        message: checksum.toString('hex'),
+      },
+      cipher: {
+        function: 'aes-128-ctr',
+        params: { iv: iv.toString('hex') },
+        message: ciphertext.toString('hex'),
+      },
+    },
+    description: ensureHex(pubkeyHex),
+    pubkey: pubkeyHex,
+    path: derivationPath ?? '',
+    uuid,
+    version: 4,
+  };
+}
+
+/**
+ * Loads and validates a BN254 keystore file.
+ *
+ * @param filePath - Path to the BN254 keystore JSON file
+ * @returns Validated keystore object
+ * @throws Bn254KeystoreError if file cannot be read or validated
+ */
+export function loadBn254Keystore(filePath: string): Bn254Keystore {
+  try {
+    const content = readFileSync(filePath, 'utf-8');
+    const json = JSON.parse(content);
+    return bn254KeystoreSchema.parse(json);
+  } catch (error) {
+    if (error instanceof SyntaxError) {
+      throw new Bn254KeystoreError(`Invalid JSON in keystore file: ${filePath}`, error);
+    }
+    if (error && typeof error === 'object' && 'issues' in error) {
+      const issues = (error as any).issues ?? [];
+      const message = issues.map((e: any) => `${e.message} at ${e.path?.join('.') ?? 'root'}`).join('; ');
+      throw new Bn254KeystoreError(`Invalid BN254 keystore format: ${message}`);
+    }
+    throw new Bn254KeystoreError(`Failed to load keystore from ${filePath}: ${String(error)}`, error as Error);
+  }
+}
+
+/**
+ * Decrypts a BN254 BLS private key from a keystore file.
+ *
+ * @param filePath - Path to the BN254 keystore JSON file
+ * @param password - Password to decrypt the keystore
+ * @returns Decrypted private key as 0x-prefixed hex string (32 bytes)
+ * @throws Bn254KeystoreError if decryption fails or checksum is invalid
+ */
+export function decryptBn254Keystore(filePath: string, password: string): string {
+  const keystore = loadBn254Keystore(filePath);
+  return decryptBn254KeystoreFromObject(keystore, password);
+}
+
+/**
+ * Decrypts a BN254 BLS private key from a keystore object.
+ *
+ * @param keystore - BN254 keystore object
+ * @param password - Password to decrypt the keystore
+ * @returns Decrypted private key as 0x-prefixed hex string (32 bytes)
+ * @throws Bn254KeystoreError if decryption fails or checksum is invalid
+ */
+export function decryptBn254KeystoreFromObject(keystore: Bn254Keystore, password: string): string {
+  try {
+    const { crypto } = keystore;
+
+    // Only support PBKDF2 + AES-128-CTR (as per our implementation)
+    if (crypto.kdf.function !== 'pbkdf2') {
+      throw new Bn254KeystoreError(`Unsupported KDF function: ${crypto.kdf.function}`);
+    }
+    if (crypto.cipher.function !== 'aes-128-ctr') {
+      throw new Bn254KeystoreError(`Unsupported cipher function: ${crypto.cipher.function}`);
+    }
+
+    // Derive decryption key using PBKDF2
+    const salt = Buffer.from(crypto.kdf.params.salt, 'hex');
+    const dk = pbkdf2Sync(
+      Buffer.from(password.normalize('NFKD'), 'utf8'),
+      salt,
+      crypto.kdf.params.c,
+      crypto.kdf.params.dklen,
+      'sha256',
+    );
+
+    const cipherKey = dk.subarray(0, 16);
+    const checksumKey = dk.subarray(16, 32);
+
+    // Decrypt the ciphertext
+    const iv = Buffer.from(crypto.cipher.params.iv, 'hex');
+    const ciphertext = Buffer.from(crypto.cipher.message, 'hex');
+    const decipher = createDecipheriv('aes-128-ctr', cipherKey, iv);
+    const decrypted = Buffer.concat([decipher.update(ciphertext), decipher.final()]);
+
+    // Verify checksum
+    const computedChecksum = createHash('sha256')
+      .update(Buffer.concat([checksumKey, ciphertext]))
+      .digest();
+    const expectedChecksum = Buffer.from(crypto.checksum.message, 'hex');
+
+    if (!computedChecksum.equals(expectedChecksum)) {
+      throw new Bn254KeystoreError('Checksum verification failed - incorrect password or corrupted keystore');
+    }
+
+    // Return as 0x-prefixed hex
+    return '0x' + decrypted.toString('hex');
+  } catch (error) {
+    if (error instanceof Bn254KeystoreError) {
+      throw error;
+    }
+    throw new Bn254KeystoreError(`Failed to decrypt keystore: ${String(error)}`, error as Error);
+  }
+}
+
+/**
+ * Validates that a decrypted private key matches the public key in the keystore.
+ *
+ * @param privateKeyHex - Decrypted private key (0x-prefixed)
+ * @param expectedPubkey - Expected public key from keystore
+ * @param computePublicKey - Function to compute public key from private key
+ * @returns true if keys match, false otherwise
+ */
+export function verifyBn254Keypair(
+  privateKeyHex: string,
+  expectedPubkey: string,
+  computePublicKey: (privateKey: string) => string,
+): boolean {
+  try {
+    const computedPubkey = computePublicKey(privateKeyHex);
+    const normalizedExpected = expectedPubkey.toLowerCase().replace(/^0x/i, '');
+    const normalizedComputed = computedPubkey.toLowerCase().replace(/^0x/i, '');
+    return normalizedExpected === normalizedComputed;
+  } catch {
+    return false;
+  }
+}

package/src/crypto/bls/index.ts

@@ -0,0 +1,77 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { Hex } from '@aztec/foundation/string';
+
+import { mod } from '@noble/curves/abstract/modular';
+import { bytesToNumberBE } from '@noble/curves/abstract/utils';
+import { hmac } from '@noble/hashes/hmac';
+import { sha512 } from '@noble/hashes/sha2';
+import { mnemonicToSeedSync } from '@scure/bip39';
+
+export function deriveBlsPrivateKey(mnemonic: string | undefined, ikm: string | undefined, path: string): Hex<32> {
+  if (ikm) {
+    return deriveBlsKeyFromEntropy(ikm, path) as Hex<32>;
+  }
+  if (!mnemonic) {
+    throw new Error('Either mnemonic or ikm must be provided for BLS derivation');
+  }
+  return deriveBlsKeyFromMnemonic(mnemonic, path) as Hex<32>;
+}
+
+/**
+ * Deterministically derive a BN254 BLS private key from mnemonic and derivation path.
+ * Returns a 0x-prefixed 32-byte hex string representing an Fr in [1, r-1].
+ */
+export function deriveBlsKeyFromMnemonic(mnemonic: string, derivationPath: string, passphrase = ''): string {
+  const seed = Buffer.from(mnemonicToSeedSync(mnemonic, passphrase)); // 64 bytes
+  const data = Buffer.concat([Buffer.from([0x00]), seed, Buffer.from(derivationPath, 'utf8')]);
+  const sk = deriveBn254ScalarFromData(data);
+  return `0x${toFixed32(sk).toString('hex')}`;
+}
+
+/**
+ * Deterministically derive a BN254 BLS private key from input keying material (IKM) and derivation path.
+ * Returns a 0x-prefixed 32-byte hex string representing an Fr in [1, r-1].
+ */
+export function deriveBlsKeyFromEntropy(ikm: string, derivationPath: string): string {
+  const ikmBytes = parseIkm(ikm);
+  const data = Buffer.concat([Buffer.from([0x01]), ikmBytes, Buffer.from(derivationPath, 'utf8')]);
+  const sk = deriveBn254ScalarFromData(data);
+  return `0x${toFixed32(sk).toString('hex')}`;
+}
+
+function deriveBn254ScalarFromData(data: Buffer): bigint {
+  // Domain-separated HMAC-SHA512, then map to BN254 Fr using noble modular math. Retry on zero.
+  const domainKey = Buffer.from('Aztec bn254 key', 'utf8');
+  for (let counter = 0; ; counter = (counter + 1) & 0xff) {
+    const msg = counter === 0 ? data : Buffer.concat([data, Buffer.from([counter])]);
+    const digest = hmac(sha512, domainKey, msg); // 64 bytes
+    const x = bytesToNumberBE(digest);
+    const sk = mod(x, Fr.MODULUS);
+    if (sk !== 0n) {
+      return sk;
+    }
+  }
+}
+
+function parseIkm(ikm: string): Buffer {
+  const hexMatch = ikm.replace(/^0x/i, '');
+  if (/^[0-9a-fA-F]+$/.test(hexMatch) && hexMatch.length >= 2) {
+    const normalized = hexMatch.length % 2 === 1 ? `0${hexMatch}` : hexMatch;
+    return Buffer.from(normalized, 'hex');
+  }
+  return Buffer.from(ikm, 'utf8');
+}
+
+function toFixed32(x: bigint): Buffer {
+  const hex = x.toString(16);
+  const padded = hex.length % 2 === 1 ? `0${hex}` : hex;
+  const buf = Buffer.from(padded, 'hex');
+  if (buf.length === 32) {
+    return buf;
+  }
+  if (buf.length < 32) {
+    return Buffer.concat([Buffer.alloc(32 - buf.length, 0), buf]);
+  }
+  // Should never happen since x < bn254.Fr.ORDER < 2^256, but guard anyway
+  return buf.subarray(buf.length - 32);
+}

package/src/crypto/bn254/index.ts

@@ -0,0 +1,64 @@
+import { Fr } from '../../curves/bn254/field.js';
+import { Bn254G1Point, Bn254G2Point } from '../../curves/bn254/point.js';
+
+/**
+ * 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.
+ */
+
+/**
+ * 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;
+
+  // Generate G1 point on BN254 curve using bb.js
+  const scalar = Fr.fromString(skReduced.toString());
+  const pk1 = await Bn254G1Point.generator(scalar);
+
+  // Compress the point using the primitive method
+  return '0x' + pk1.compress().toString('hex');
+}
+
+/**
+ * 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 async function computeBn254G1PublicKey(privateKeyHex: string): Promise<{ x: bigint; y: bigint }> {
+  const sk = BigInt(privateKeyHex);
+  const skReduced = sk % Fr.MODULUS;
+
+  const scalar = Fr.fromString(skReduced.toString());
+  const pk1 = await Bn254G1Point.generator(scalar);
+
+  return { x: pk1.x.toBigInt(), y: pk1.y.toBigInt() };
+}
+
+/**
+ * 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

@@ -1,7 +1,5 @@
 import { BarretenbergSync } from '@aztec/bb.js';
-import { numToInt32BE } from '@aztec/foundation/serialize';
 
-import { concatenateUint8Arrays } from '../serialize.js';
 import { EcdsaSignature } from './signature.js';
 
 export * from './signature.js';
@@ -18,11 +16,13 @@ export class Ecdsa {
    * @returns A secp256k1 public key.
    */
   public async computePublicKey(privateKey: Buffer): Promise<Buffer> {
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    const [result] = api
-      .getWasm()
-      .callWasmExport(`ecdsa_${this.curve === 'secp256r1' ? 'r' : ''}_compute_public_key`, [privateKey], [64]);
-    return Buffer.from(result);
+    await BarretenbergSync.initSingleton();
+    const api = BarretenbergSync.getSingleton();
+    const response =
+      this.curve === 'secp256r1'
+        ? api.ecdsaSecp256r1ComputePublicKey({ privateKey })
+        : api.ecdsaSecp256k1ComputePublicKey({ privateKey });
+    return Buffer.concat([Buffer.from(response.publicKey.x), Buffer.from(response.publicKey.y)]);
   }
 
   /**
@@ -32,16 +32,13 @@ export class Ecdsa {
    * @returns An ECDSA signature of the form (r, s, v).
    */
   public async constructSignature(msg: Uint8Array, privateKey: Buffer) {
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    const messageArray = concatenateUint8Arrays([numToInt32BE(msg.length), msg]);
-    const [r, s, v] = api
-      .getWasm()
-      .callWasmExport(
-        `ecdsa_${this.curve === 'secp256r1' ? 'r' : ''}_construct_signature_`,
-        [messageArray, privateKey],
-        [32, 32, 1],
-      );
-    return new EcdsaSignature(Buffer.from(r), Buffer.from(s), Buffer.from(v));
+    await BarretenbergSync.initSingleton();
+    const api = BarretenbergSync.getSingleton();
+    const response =
+      this.curve === 'secp256r1'
+        ? api.ecdsaSecp256r1ConstructSignature({ message: msg, privateKey })
+        : api.ecdsaSecp256k1ConstructSignature({ message: msg, privateKey });
+    return new EcdsaSignature(Buffer.from(response.r), Buffer.from(response.s), Buffer.from([response.v]));
   }
 
   /**
@@ -51,16 +48,13 @@ export class Ecdsa {
    * @returns The secp256k1 public key of the signer.
    */
   public async recoverPublicKey(msg: Uint8Array, sig: EcdsaSignature): Promise<Buffer> {
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    const messageArray = concatenateUint8Arrays([numToInt32BE(msg.length), msg]);
-    const [result] = api
-      .getWasm()
-      .callWasmExport(
-        `ecdsa_${this.curve === 'secp256r1' ? 'r' : ''}_recover_public_key_from_signature_`,
-        [messageArray, sig.r, sig.s, sig.v],
-        [64],
-      );
-    return Buffer.from(result);
+    await BarretenbergSync.initSingleton();
+    const api = BarretenbergSync.getSingleton();
+    const response =
+      this.curve === 'secp256r1'
+        ? api.ecdsaSecp256r1RecoverPublicKey({ message: msg, r: sig.r, s: sig.s, v: sig.v[0] })
+        : api.ecdsaSecp256k1RecoverPublicKey({ message: msg, r: sig.r, s: sig.s, v: sig.v[0] });
+    return Buffer.concat([Buffer.from(response.publicKey.x), Buffer.from(response.publicKey.y)]);
   }
 
   /**
@@ -71,15 +65,24 @@ export class Ecdsa {
    * @returns True or false.
    */
   public async verifySignature(msg: Uint8Array, pubKey: Buffer, sig: EcdsaSignature) {
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    const messageArray = concatenateUint8Arrays([numToInt32BE(msg.length), msg]);
-    const [result] = api
-      .getWasm()
-      .callWasmExport(
-        `ecdsa_${this.curve === 'secp256r1' ? 'r' : ''}_verify_signature_`,
-        [messageArray, pubKey, sig.r, sig.s, sig.v],
-        [1],
-      );
-    return result[0] === 1;
+    await BarretenbergSync.initSingleton();
+    const api = BarretenbergSync.getSingleton();
+    const response =
+      this.curve === 'secp256r1'
+        ? api.ecdsaSecp256r1VerifySignature({
+            message: msg,
+            publicKey: { x: pubKey.subarray(0, 32), y: pubKey.subarray(32, 64) },
+            r: sig.r,
+            s: sig.s,
+            v: sig.v[0],
+          })
+        : api.ecdsaSecp256k1VerifySignature({
+            message: msg,
+            publicKey: { x: pubKey.subarray(0, 32), y: pubKey.subarray(32, 64) },
+            r: sig.r,
+            s: sig.s,
+            v: sig.v[0],
+          });
+    return response.verified;
   }
 }