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

package/dest/{fields/fields.js → curves/bn254/field.js}

@@ -1,19 +1,16 @@
+var _computedKey, _computedKey1;
 import { BarretenbergSync } from '@aztec/bb.js';
 import { inspect } from 'util';
-import { toBigIntBE, toBufferBE } from '../bigint-buffer/index.js';
-import { randomBytes } from '../crypto/random/index.js';
-import { hexSchemaFor } from '../schemas/utils.js';
-import { BufferReader } from '../serialize/buffer_reader.js';
-import { TypeRegistry } from '../serialize/type_registry.js';
-const ZERO_BUFFER = Buffer.alloc(32);
+import { toBigIntBE, toBufferBE } from '../../bigint-buffer/index.js';
+import { randomBytes } from '../../crypto/random/index.js';
+import { hexSchemaFor } from '../../schemas/utils.js';
+import { BufferReader } from '../../serialize/buffer_reader.js';
 /**
  * Base field class.
- * Conversions from Buffer to BigInt and vice-versa are not cheap.
- * We allow construction with either form and lazily convert to other as needed.
- * We only check we are within the field modulus when initializing with bigint.
+ * Uses bigint as the internal representation.
+ * Buffers are generated on demand from the bigint value.
  */ class BaseField {
     static SIZE_IN_BYTES = 32;
-    asBuffer;
     asBigInt;
     /**
    * Return bigint representation.
@@ -29,81 +26,72 @@ const ZERO_BUFFER = Buffer.alloc(32);
             if (value.length > BaseField.SIZE_IN_BYTES) {
                 throw new Error(`Value length ${value.length} exceeds ${BaseField.SIZE_IN_BYTES}`);
             }
-            this.asBuffer = value.length === BaseField.SIZE_IN_BYTES ? value : Buffer.concat([
-                Buffer.alloc(BaseField.SIZE_IN_BYTES - value.length),
-                value
-            ]);
+            this.asBigInt = toBigIntBE(value);
         } else if (typeof value === 'bigint' || typeof value === 'number' || typeof value === 'boolean') {
             this.asBigInt = BigInt(value);
-            if (this.asBigInt >= this.modulus()) {
-                throw new Error(`Value 0x${this.asBigInt.toString(16)} is greater or equal to field modulus.`);
-            } else if (this.asBigInt < 0n) {
-                throw new Error(`Value 0x${this.asBigInt.toString(16)} is negative.`);
-            }
         } else if (value instanceof BaseField) {
-            this.asBuffer = value.asBuffer;
             this.asBigInt = value.asBigInt;
         } else {
             throw new Error(`Type '${typeof value}' with value '${value}' passed to BaseField ctor.`);
         }
+        if (this.asBigInt < 0n) {
+            throw new Error(`Value 0x${this.asBigInt.toString(16)} is negative.`);
+        } else if (this.asBigInt >= this.modulus()) {
+            throw new Error(`Value 0x${this.asBigInt.toString(16)} is greater or equal to field modulus.`);
+        }
     }
-    /**
-   * We return a copy of the Buffer to ensure this remains immutable.
-   */ toBuffer() {
-        if (!this.asBuffer) {
-            this.asBuffer = toBufferBE(this.asBigInt, 32);
+    toBuffer(sink) {
+        if (!sink) {
+            return toBufferBE(this.asBigInt, BaseField.SIZE_IN_BYTES);
         }
-        return Buffer.from(this.asBuffer);
+        sink.writeField(this.asBigInt);
     }
     toString() {
-        return `0x${this.toBuffer().toString('hex')}`;
+        return `0x${this.asBigInt.toString(16).padStart(64, '0')}`;
     }
     toBigInt() {
-        if (this.asBigInt === undefined) {
-            this.asBigInt = toBigIntBE(this.asBuffer);
-            if (this.asBigInt >= this.modulus()) {
-                throw new Error(`Value 0x${this.asBigInt.toString(16)} is greater or equal to field modulus.`);
-            }
-        }
         return this.asBigInt;
     }
     toBool() {
-        return Boolean(this.toBigInt());
+        return this.asBigInt !== 0n;
     }
     /**
    * Converts this field to a number.
    * Throws if the underlying value is greater than MAX_SAFE_INTEGER.
    */ toNumber() {
-        const value = this.toBigInt();
-        if (value > Number.MAX_SAFE_INTEGER) {
-            throw new Error(`Value ${value.toString(16)} greater than than max safe integer`);
+        if (this.asBigInt > Number.MAX_SAFE_INTEGER) {
+            throw new Error(`Value ${this.asBigInt.toString(16)} greater than than max safe integer`);
         }
-        return Number(value);
+        return Number(this.asBigInt);
     }
     /**
    * Converts this field to a number.
    * May cause loss of precision if the underlying value is greater than MAX_SAFE_INTEGER.
    */ toNumberUnsafe() {
-        const value = this.toBigInt();
-        return Number(value);
+        return Number(this.asBigInt);
     }
     toShortString() {
         const str = this.toString();
         return `${str.slice(0, 10)}...${str.slice(-4)}`;
     }
     equals(rhs) {
-        return this.toBuffer().equals(rhs.toBuffer());
+        return this.asBigInt === rhs.asBigInt;
     }
     lt(rhs) {
-        return this.toBigInt() < rhs.toBigInt();
+        return this.asBigInt < rhs.asBigInt;
     }
     cmp(rhs) {
-        const lhsBigInt = this.toBigInt();
-        const rhsBigInt = rhs.toBigInt();
-        return lhsBigInt === rhsBigInt ? 0 : lhsBigInt < rhsBigInt ? -1 : 1;
+        return BaseField.cmpAsBigInt(this.asBigInt, rhs.asBigInt);
+    }
+    static cmp(lhs, rhs) {
+        return lhs.cmp(rhs);
+    }
+    // Actual bigint comparison. Arguments must have been validated previously.
+    static cmpAsBigInt(lhs, rhs) {
+        return lhs === rhs ? 0 : lhs < rhs ? -1 : 1;
     }
     isZero() {
-        return this.toBuffer().equals(ZERO_BUFFER);
+        return this.asBigInt === 0n;
     }
     isEmpty() {
         return this.isZero();
@@ -143,26 +131,40 @@ const ZERO_BUFFER = Buffer.alloc(32);
         throw new Error(`Invalid hex-encoded string: "${buf}"`);
     }
     const buffer = Buffer.from(checked.length % 2 === 1 ? '0' + checked : checked, 'hex');
-    return new f(buffer);
+    return new f(toBigIntBE(buffer));
 }
+/**
+ * Abstract unbranded base class for BN254 scalar field elements.
+ * Extend this instead of Fr when defining a branded subtype (e.g. BlockHash)
+ * to avoid inheriting Fr's `_branding`.
+ */ export class BaseFr extends BaseField {
+    static MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
+    constructor(value){
+        super(value);
+    }
+    modulus() {
+        return BaseFr.MODULUS;
+    }
+    toJSON() {
+        return this.toString();
+    }
+}
+_computedKey = inspect.custom;
 /**
  * Fr field class.
  * @dev This class is used to represent elements of BN254 scalar field or elements in the base field of Grumpkin.
  * (Grumpkin's scalar field corresponds to BN254's base field and vice versa.)
- */ export class Fr extends BaseField {
+ */ export class Fr extends BaseFr {
+    static MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
     static ZERO = new Fr(0n);
     static ONE = new Fr(1n);
-    static MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
     static MAX_FIELD_VALUE = new Fr(this.MODULUS - 1n);
     constructor(value){
         super(value);
     }
-    [inspect.custom]() {
+    [_computedKey]() {
         return `Fr<${this.toString()}>`;
     }
-    modulus() {
-        return Fr.MODULUS;
-    }
     static random() {
         return random(Fr);
     }
@@ -246,9 +248,6 @@ const ZERO_BUFFER = Buffer.alloc(32);
         }
         return Fr.fromBuffer(Buffer.from(response.value));
     }
-    toJSON() {
-        return this.toString();
-    }
     /**
    * Creates an Fr instance from a plain object without Zod validation.
    * This method is optimized for performance and skips validation, making it suitable
@@ -267,8 +266,7 @@ const ZERO_BUFFER = Buffer.alloc(32);
         return hexSchemaFor(Fr);
     }
 }
-// For deserializing JSON.
-TypeRegistry.register('Fr', Fr);
+_computedKey1 = inspect.custom;
 /**
  * Fq field class.
  * @dev This class is used to represent elements of BN254 base field or elements in the scalar field of Grumpkin.
@@ -278,7 +276,7 @@ TypeRegistry.register('Fr', Fr);
     static MODULUS = 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47n;
     static HIGH_SHIFT = BigInt(BaseField.SIZE_IN_BYTES / 2 * 8);
     static LOW_MASK = (1n << Fq.HIGH_SHIFT) - 1n;
-    [inspect.custom]() {
+    [_computedKey1]() {
         return `Fq<${this.toString()}>`;
     }
     get lo() {
@@ -365,8 +363,6 @@ TypeRegistry.register('Fr', Fr);
         return hexSchemaFor(Fq);
     }
 }
-// For deserializing JSON.
-TypeRegistry.register('Fq', Fq);
 // Beware: Performance bottleneck below
 /**
  * Find the modular inverse of a given element, for BN254 Fr.
@@ -397,7 +393,6 @@ TypeRegistry.register('Fq', Fq);
         ];
     }
 }
-export const GrumpkinScalar = Fq;
 /** Wraps a function that returns a buffer so that all results are reduced into a field of the given type. */ export function reduceFn(fn, field) {
     return (input)=>fromBufferReduce(fn(input), field);
 }

package/dest/curves/bn254/index.d.ts

@@ -0,0 +1,3 @@
+export * from './field.js';
+export * from './point.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jdXJ2ZXMvYm4yNTQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxZQUFZLENBQUM7QUFDM0IsY0FBYyxZQUFZLENBQUMifQ==

package/dest/curves/bn254/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/curves/bn254/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/dest/curves/bn254/index.js

@@ -0,0 +1,2 @@
+export * from './field.js';
+export * from './point.js';

package/dest/curves/bn254/point.d.ts

@@ -0,0 +1,54 @@
+import { Fq, Fr } from './field.js';
+/**
+ * BN254 G1 point using foundation field classes.
+ * Represents a point on the BN254 elliptic curve in affine coordinates.
+ */
+export declare class Bn254G1Point {
+    readonly x: Fq;
+    readonly y: Fq;
+    constructor(x: Fq, y: Fq);
+    private toBbApiPoint;
+    private static fromBbApiPoint;
+    isOnCurve(): Promise<boolean>;
+    /**
+     * 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 generator(scalar?: Fr): Promise<Bn254G1Point>;
+    /**
+     * 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 fromCompressed(compressed: Buffer): Promise<Bn254G1Point>;
+    /**
+     * 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;
+    equals(other: Bn254G1Point): boolean;
+    toString(): string;
+}
+/**
+ * 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).
+ */
+export declare class Bn254G2Point {
+    readonly x: [Fq, Fq];
+    readonly y: [Fq, Fq];
+    constructor(x: [Fq, Fq], y: [Fq, Fq]);
+    private toBbApiPoint;
+    private static fromBbApiPoint;
+    /**
+     * 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 generator(scalar?: Fr): Promise<Bn254G2Point>;
+    equals(other: Bn254G2Point): boolean;
+    toString(): string;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9pbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jdXJ2ZXMvYm4yNTQvcG9pbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBUUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFFcEM7OztHQUdHO0FBQ0gscUJBQWEsWUFBWTthQUVMLENBQUMsRUFBRSxFQUFFO2FBQ0wsQ0FBQyxFQUFFLEVBQUU7SUFGdkIsWUFDa0IsQ0FBQyxFQUFFLEVBQUUsRUFDTCxDQUFDLEVBQUUsRUFBRSxFQUNuQjtJQUVKLE9BQU8sQ0FBQyxZQUFZO0lBT3BCLE9BQU8sQ0FBQyxNQUFNLENBQUMsY0FBYztJQUl2QixTQUFTLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQU9sQztJQUVEOzs7O09BSUc7SUFDSCxPQUFhLFNBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQWlCekQ7SUFFRDs7OztPQUlHO0lBQ0gsT0FBYSxjQUFjLENBQUMsVUFBVSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBWXJFO0lBRUQ7Ozs7T0FJRztJQUNILFFBQVEsSUFBSSxNQUFNLENBU2pCO0lBRUQsTUFBTSxDQUFDLEtBQUssRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUVuQztJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0NBQ0Y7QUFFRDs7OztHQUlHO0FBQ0gscUJBQWEsWUFBWTthQUVMLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUM7YUFDWCxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBRjdCLFlBQ2tCLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFDWCxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQ3pCO0lBRUosT0FBTyxDQUFDLFlBQVk7SUFPcEIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxjQUFjO0lBTzdCOzs7O09BSUc7SUFDSCxPQUFhLFNBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQWlCekQ7SUFFRCxNQUFNLENBQUMsS0FBSyxFQUFFLFlBQVksR0FBRyxPQUFPLENBT25DO0lBRUQsUUFBUSxJQUFJLE1BQU0sQ0FFakI7Q0FDRiJ9

package/dest/curves/bn254/point.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/curves/bn254/point.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,YAAY,CAAC;AAEpC;;;GAGG;AACH,qBAAa,YAAY;aAEL,CAAC,EAAE,EAAE;aACL,CAAC,EAAE,EAAE;IAFvB,YACkB,CAAC,EAAE,EAAE,EACL,CAAC,EAAE,EAAE,EACnB;IAEJ,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,MAAM,CAAC,cAAc;IAIvB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAOlC;IAED;;;;OAIG;IACH,OAAa,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAiBzD;IAED;;;;OAIG;IACH,OAAa,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAYrE;IAED;;;;OAIG;IACH,QAAQ,IAAI,MAAM,CASjB;IAED,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAEnC;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF;AAED;;;;GAIG;AACH,qBAAa,YAAY;aAEL,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;aACX,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;IAF7B,YACkB,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EACX,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EACzB;IAEJ,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,MAAM,CAAC,cAAc;IAO7B;;;;OAIG;IACH,OAAa,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAiBzD;IAED,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAOnC;IAED,QAAQ,IAAI,MAAM,CAEjB;CACF"}

package/dest/curves/bn254/point.js

@@ -0,0 +1,143 @@
+import { BN254_G1_GENERATOR, BN254_G2_GENERATOR, BarretenbergSync } from '@aztec/bb.js';
+import { Fq } from './field.js';
+/**
+ * BN254 G1 point using foundation field classes.
+ * Represents a point on the BN254 elliptic curve in affine coordinates.
+ */ export class Bn254G1Point {
+    x;
+    y;
+    constructor(x, y){
+        this.x = x;
+        this.y = y;
+    }
+    toBbApiPoint() {
+        return {
+            x: this.x.toBuffer(),
+            y: this.y.toBuffer()
+        };
+    }
+    static fromBbApiPoint(point) {
+        return new Bn254G1Point(Fq.fromBuffer(Buffer.from(point.x)), Fq.fromBuffer(Buffer.from(point.y)));
+    }
+    async isOnCurve() {
+        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) {
+        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) {
+        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() {
+        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;
+    }
+    equals(other) {
+        return this.x.equals(other.x) && this.y.equals(other.y);
+    }
+    toString() {
+        return `Bn254G1Point(x: ${this.x.toString()}, y: ${this.y.toString()})`;
+    }
+}
+/**
+ * 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).
+ */ export class Bn254G2Point {
+    x;
+    y;
+    constructor(x, y){
+        this.x = x;
+        this.y = y;
+    }
+    toBbApiPoint() {
+        return {
+            x: [
+                this.x[0].toBuffer(),
+                this.x[1].toBuffer()
+            ],
+            y: [
+                this.y[0].toBuffer(),
+                this.y[1].toBuffer()
+            ]
+        };
+    }
+    static fromBbApiPoint(point) {
+        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) {
+        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();
+        const response = api.bn254G2Mul({
+            point: BN254_G2_GENERATOR,
+            scalar: scalar.toBuffer()
+        });
+        return Bn254G2Point.fromBbApiPoint(response.point);
+    }
+    equals(other) {
+        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() {
+        return `Bn254G2Point(x: (${this.x[0].toString()}, ${this.x[1].toString()}), y: (${this.y[0].toString()}, ${this.y[1].toString()}))`;
+    }
+}

package/dest/curves/grumpkin/index.d.ts

@@ -0,0 +1,10 @@
+import { Fq } from '../bn254/field.js';
+export * from './point.js';
+/**
+ * GrumpkinScalar is an Fq.
+ * @remarks Called GrumpkinScalar because it is used to represent elements in Grumpkin's scalar field as defined in
+ *          the Aztec Protocol Specs.
+ */
+export type GrumpkinScalar = Fq;
+export declare const GrumpkinScalar: typeof Fq;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jdXJ2ZXMvZ3J1bXBraW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXZDLGNBQWMsWUFBWSxDQUFDO0FBRTNCOzs7O0dBSUc7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHLEVBQUUsQ0FBQztBQUNoQyxlQUFPLE1BQU0sY0FBYyxXQUFLLENBQUMifQ==

package/dest/curves/grumpkin/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/curves/grumpkin/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAEvC,cAAc,YAAY,CAAC;AAE3B;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC;AAChC,eAAO,MAAM,cAAc,WAAK,CAAC"}

package/dest/curves/grumpkin/index.js

@@ -0,0 +1,3 @@
+import { Fq } from '../bn254/field.js';
+export * from './point.js';
+export const GrumpkinScalar = Fq;

package/dest/{fields → curves/grumpkin}/point.d.ts

@@ -1,5 +1,5 @@
-import { BufferReader, FieldReader } from '../serialize/index.js';
-import { Fr } from './fields.js';
+import { BufferReader, FieldReader } from '../../serialize/index.js';
+import { Fr } from '../bn254/field.js';
 /**
  * Represents a Point on an elliptic curve with x and y coordinates.
  * The Point class provides methods for creating instances from different input types,
@@ -7,14 +7,21 @@ import { Fr } from './fields.js';
  * TODO(#7386): Clean up this class.
  */
 export declare class Point {
+    /**
+     * The point's x coordinate
+     */
     readonly x: Fr;
+    /**
+     * The point's y coordinate
+     */
     readonly y: Fr;
-    readonly isInfinite: boolean;
-    static ZERO: Point;
+    static INFINITY: Point;
     static SIZE_IN_BYTES: number;
     static COMPRESSED_SIZE_IN_BYTES: number;
     /** Used to differentiate this class from AztecAddress */
-    readonly kind: string;
+    readonly kind = "point";
+    /** Whether the point is at infinity */
+    readonly isInfinite: boolean;
     constructor(
     /**
      * The point's x coordinate
@@ -23,13 +30,9 @@ export declare class Point {
     /**
      * The point's y coordinate
      */
-    y: Fr, 
-    /**
-     * Whether the point is at infinity
-     */
-    isInfinite: boolean);
+    y: Fr);
     toJSON(): `0x${string}`;
-    static get schema(): import("zod").ZodType<Point, any, string>;
+    static get schema(): import("zod").ZodType<Point, string, import("zod/v4/core").$ZodTypeInternals<Point, string>>;
     /**
      * Creates a Point from a plain object without Zod validation.
      * This method is optimized for performance and skips validation, making it suitable
@@ -40,7 +43,7 @@ export declare class Point {
      */
     static fromPlainObject(obj: any): Point;
     /**
-     * Generate a random Point instance.
+     * Generate a random Point instance that is on the curve.
      *
      * @returns A randomly generated Point instance.
      */
@@ -87,7 +90,8 @@ export declare class Point {
      */
     static fromXAndSign(x: Fr, sign: boolean): Promise<Point>;
     /**
-     * @returns
+     * @param x - The x coordinate of the point
+     * @returns y^2 such that y^2 = x^3 - 17
      */
     static YFromX(x: Fr): Promise<Fr | null>;
     /**
@@ -103,17 +107,11 @@ export declare class Point {
     toBigInts(): {
         x: bigint;
         y: bigint;
-        isInfinite: bigint;
     };
     /**
      * Converts the Point instance to a Buffer representation of the coordinates.
      * @returns A Buffer representation of the Point instance.
-     * @dev Note that toBuffer does not include the isInfinite flag and other serialization methods do (e.g. toFields).
-     * This is because currently when we work with point as bytes we don't want to populate the extra bytes for
-     * isInfinite flag because:
-     * 1. Our Grumpkin BB API currently does not handle point at infinity,
-     * 2. we use toBuffer when serializing notes and events and there we only work with public keys and point at infinity
-     *   is not considered a valid public key and the extra byte would raise DA cost.
+     * @dev Note that toBuffer does not include the isInfinite flag. The point at infinity is serialized as (0, 0).
      */
     toBuffer(): Buffer<ArrayBufferLike>;
     /**
@@ -141,13 +139,11 @@ export declare class Point {
     toNoirStruct(): {
         x: Fr;
         y: Fr;
-        is_infinite: boolean;
     };
     toWrappedNoirStruct(): {
         inner: {
             x: Fr;
             y: Fr;
-            is_infinite: boolean;
         };
     };
     /**
@@ -159,15 +155,14 @@ export declare class Point {
      */
     equals(rhs: Point): boolean;
     isZero(): boolean;
-    hash(): Promise<Fr>;
     /**
-     * Check if this is point at infinity.
-     * Check this is consistent with how bb is encoding the point at infinity
+     * @param x - The x coordinate of the point
+     * @param y - The y coordinate of the point
+     * @returns Whether the point exists on Grumpkin
      */
-    get inf(): boolean;
-    isOnGrumpkin(): boolean;
+    isOnCurve(): boolean;
 }
 export declare class NotOnCurveError extends Error {
     constructor(x: Fr);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9pbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maWVsZHMvcG9pbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sdUJBQXVCLENBQUM7QUFFckYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUVqQzs7Ozs7R0FLRztBQUNILHFCQUFhLEtBQUs7YUFZRSxDQUFDLEVBQUUsRUFBRTthQUlMLENBQUMsRUFBRSxFQUFFO2FBSUwsVUFBVSxFQUFFLE9BQU87SUFuQnJDLE1BQU0sQ0FBQyxJQUFJLFFBQXNDO0lBQ2pELE1BQU0sQ0FBQyxhQUFhLFNBQXdCO0lBQzVDLE1BQU0sQ0FBQyx3QkFBd0IsU0FBb0I7SUFFbkQseURBQXlEO0lBQ3pELFNBQWdCLElBQUksU0FBVztJQUUvQjtJQUNFOztPQUVHO0lBQ2EsQ0FBQyxFQUFFLEVBQUU7SUFDckI7O09BRUc7SUFDYSxDQUFDLEVBQUUsRUFBRTtJQUNyQjs7T0FFRztJQUNhLFVBQVUsRUFBRSxPQUFPLEVBR3BDO0lBRUQsTUFBTSxrQkFFTDtJQUVELE1BQU0sS0FBSyxNQUFNLDhDQUdoQjtJQUVEOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsS0FBSyxDQVF0QztJQUVEOzs7O09BSUc7SUFDSCxPQUFhLE1BQU0sbUJBWWxCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksU0FHOUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsb0JBQW9CLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQVF6RTtJQUVEOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLFNBRTVCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxTQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxTQUczQztJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxZQUFZLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsT0FBTyxrQkFjN0M7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxDQU92QztJQUVEOzs7O09BSUc7SUFDSCxVQUFVLElBQUksQ0FBQyxFQUFFLEVBQUUsT0FBTyxDQUFDLENBRTFCO0lBRUQ7OztPQUdHO0lBQ0gsU0FBUzs7OztNQU1SO0lBRUQ7Ozs7Ozs7OztPQVNHO0lBQ0gsUUFBUSw0QkFTUDtJQUVEOzs7T0FHRztJQUNILGtCQUFrQiw0QkFXakI7SUFFRDs7Ozs7O09BTUc7SUFDSCxRQUFRLGtCQUVQO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILGFBQWEsV0FHWjtJQUVELFlBQVk7Ozs7TUFJWDtJQUdELG1CQUFtQjs7Ozs7O01BRWxCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLEdBQUcsRUFBRSxLQUFLLFdBRWhCO0lBRUQsTUFBTSxZQUVMO0lBRUQsSUFBSSxnQkFFSDtJQUVEOzs7T0FHRztJQUNILElBQVcsR0FBRyxZQUViO0lBRUQsWUFBWSxZQVdYO0NBQ0Y7QUFFRCxxQkFBYSxlQUFnQixTQUFRLEtBQUs7SUFDeEMsWUFBWSxDQUFDLEVBQUUsRUFBRSxFQUdoQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9pbnQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jdXJ2ZXMvZ3J1bXBraW4vcG9pbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQXFCLE1BQU0sMEJBQTBCLENBQUM7QUFFeEYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXZDOzs7OztHQUtHO0FBQ0gscUJBQWEsS0FBSztJQVlkOztPQUVHO2FBQ2EsQ0FBQyxFQUFFLEVBQUU7SUFDckI7O09BRUc7YUFDYSxDQUFDLEVBQUUsRUFBRTtJQWxCdkIsTUFBTSxDQUFDLFFBQVEsUUFBK0I7SUFDOUMsTUFBTSxDQUFDLGFBQWEsU0FBd0I7SUFDNUMsTUFBTSxDQUFDLHdCQUF3QixTQUFvQjtJQUVuRCx5REFBeUQ7SUFDekQsU0FBZ0IsSUFBSSxXQUFXO0lBRS9CLHVDQUF1QztJQUN2QyxTQUFnQixVQUFVLEVBQUUsT0FBTyxDQUFDO0lBRXBDO0lBQ0U7O09BRUc7SUFDYSxDQUFDLEVBQUUsRUFBRTtJQUNyQjs7T0FFRztJQUNhLENBQUMsRUFBRSxFQUFFLEVBS3RCO0lBRUQsTUFBTSxrQkFFTDtJQUVELE1BQU0sS0FBSyxNQUFNLGlHQUdoQjtJQUVEOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsRUFBRSxHQUFHLEdBQUcsS0FBSyxDQVF0QztJQUVEOzs7O09BSUc7SUFDSCxPQUFhLE1BQU0sbUJBWWxCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksU0FHOUM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsb0JBQW9CLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQVF6RTtJQUVEOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLFNBRTVCO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxTQUVQO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLEdBQUcsV0FBVyxTQUkzQztJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYSxZQUFZLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsT0FBTyxrQkFjN0M7SUFFRDs7O09BR0c7SUFDSCxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FPdkM7SUFFRDs7OztPQUlHO0lBQ0gsVUFBVSxJQUFJLENBQUMsRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUUxQjtJQUVEOzs7T0FHRztJQUNILFNBQVM7OztNQUtSO0lBRUQ7Ozs7T0FJRztJQUNILFFBQVEsNEJBTVA7SUFFRDs7O09BR0c7SUFDSCxrQkFBa0IsNEJBV2pCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsUUFBUSxrQkFFUDtJQUVEOzs7Ozs7O09BT0c7SUFDSCxhQUFhLFdBR1o7SUFFRCxZQUFZOzs7TUFFWDtJQUdELG1CQUFtQjs7Ozs7TUFFbEI7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsR0FBRyxFQUFFLEtBQUssV0FFaEI7SUFFRCxNQUFNLFlBRUw7SUFFRDs7OztPQUlHO0lBQ0gsU0FBUyxZQVVSO0NBQ0Y7QUFFRCxxQkFBYSxlQUFnQixTQUFRLEtBQUs7SUFDeEMsWUFBWSxDQUFDLEVBQUUsRUFBRSxFQUdoQjtDQUNGIn0=

package/dest/curves/grumpkin/point.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/curves/grumpkin/point.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAExF,OAAO,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAEvC;;;;;GAKG;AACH,qBAAa,KAAK;IAYd;;OAEG;aACa,CAAC,EAAE,EAAE;IACrB;;OAEG;aACa,CAAC,EAAE,EAAE;IAlBvB,MAAM,CAAC,QAAQ,QAA+B;IAC9C,MAAM,CAAC,aAAa,SAAwB;IAC5C,MAAM,CAAC,wBAAwB,SAAoB;IAEnD,yDAAyD;IACzD,SAAgB,IAAI,WAAW;IAE/B,uCAAuC;IACvC,SAAgB,UAAU,EAAE,OAAO,CAAC;IAEpC;IACE;;OAEG;IACa,CAAC,EAAE,EAAE;IACrB;;OAEG;IACa,CAAC,EAAE,EAAE,EAKtB;IAED,MAAM,kBAEL;IAED,MAAM,KAAK,MAAM,iGAGhB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,CAQtC;IAED;;;;OAIG;IACH,OAAa,MAAM,mBAYlB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,SAG9C;IAED;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAQzE;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,SAE5B;IAED;;;OAGG;IACH,QAAQ,SAEP;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,SAI3C;IAED;;;;;;;;OAQG;IACH,OAAa,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,kBAc7C;IAED;;;OAGG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,CAOvC;IAED;;;;OAIG;IACH,UAAU,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAE1B;IAED;;;OAGG;IACH,SAAS;;;MAKR;IAED;;;;OAIG;IACH,QAAQ,4BAMP;IAED;;;OAGG;IACH,kBAAkB,4BAWjB;IAED;;;;;;OAMG;IACH,QAAQ,kBAEP;IAED;;;;;;;OAOG;IACH,aAAa,WAGZ;IAED,YAAY;;;MAEX;IAGD,mBAAmB;;;;;MAElB;IAED;;;;;;OAMG;IACH,MAAM,CAAC,GAAG,EAAE,KAAK,WAEhB;IAED,MAAM,YAEL;IAED;;;;OAIG;IACH,SAAS,YAUR;CACF;AAED,qBAAa,eAAgB,SAAQ,KAAK;IACxC,YAAY,CAAC,EAAE,EAAE,EAGhB;CACF"}