@aztec/foundation 0.46.6 → 0.46.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/crypto/random/index.d.ts +5 -0
- package/dest/crypto/random/index.d.ts.map +1 -1
- package/dest/crypto/random/index.js +9 -1
- package/dest/fields/fields.d.ts +6 -0
- package/dest/fields/fields.d.ts.map +1 -1
- package/dest/fields/fields.js +36 -15
- package/dest/fields/point.d.ts +30 -0
- package/dest/fields/point.d.ts.map +1 -1
- package/dest/fields/point.js +72 -4
- package/package.json +2 -2
- package/src/crypto/random/index.ts +9 -0
- package/src/fields/fields.ts +22 -0
- package/src/fields/point.ts +80 -3
|
@@ -16,4 +16,9 @@ export declare const randomInt: (max: number) => number;
|
|
|
16
16
|
* TODO(#3949): This is insecure as it's modulo biased. Nuke or safeguard before mainnet.
|
|
17
17
|
*/
|
|
18
18
|
export declare const randomBigInt: (max: bigint) => bigint;
|
|
19
|
+
/**
|
|
20
|
+
* Generate a random boolean value.
|
|
21
|
+
* @returns A random boolean value.
|
|
22
|
+
*/
|
|
23
|
+
export declare const randomBoolean: () => boolean;
|
|
19
24
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/crypto/random/index.ts"],"names":[],"mappings":";AAmBA,eAAO,MAAM,WAAW,QAAS,MAAM,WA8BtC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,QAAS,MAAM,WAIpC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,QAAS,MAAM,WAIvC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/crypto/random/index.ts"],"names":[],"mappings":";AAmBA,eAAO,MAAM,WAAW,QAAS,MAAM,WA8BtC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,QAAS,MAAM,WAIpC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,QAAS,MAAM,WAIvC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,aAAa,eAGzB,CAAC"}
|
|
@@ -64,4 +64,12 @@ export const randomBigInt = (max) => {
|
|
|
64
64
|
const randomBigInt = BigInt(`0x${randomBuffer.toString('hex')}`); // Convert buffer to a large integer.
|
|
65
65
|
return randomBigInt % max; // Use modulo to ensure the result is less than max.
|
|
66
66
|
};
|
|
67
|
-
|
|
67
|
+
/**
|
|
68
|
+
* Generate a random boolean value.
|
|
69
|
+
* @returns A random boolean value.
|
|
70
|
+
*/
|
|
71
|
+
export const randomBoolean = () => {
|
|
72
|
+
const randomByte = randomBytes(1)[0]; // Generate a single random byte.
|
|
73
|
+
return randomByte % 2 === 0; // Use modulo to determine if the byte is even or odd.
|
|
74
|
+
};
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY3J5cHRvL3JhbmRvbS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLFVBQVUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWhFLG9DQUFvQztBQUNwQywwRUFBMEU7QUFDMUUsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDO0FBRXhCLE1BQU0sWUFBWSxHQUFHLEdBQUcsRUFBRTtJQUN4QixJQUFJLE9BQU8sTUFBTSxLQUFLLFdBQVcsSUFBSSxNQUFNLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDbkQsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFDRCxJQUFJLE9BQU8sSUFBSSxLQUFLLFdBQVcsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7UUFDL0MsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7SUFDRCxPQUFPLFNBQVMsQ0FBQztBQUNuQixDQUFDLENBQUM7QUFFRixNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRTtJQUN6QyxNQUFNLFNBQVMsR0FBRyxtQkFBbUIsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUVwRCxJQUFJLFNBQVMsQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDO1FBQ2hDLE9BQU8sU0FBUyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsSUFBSSxNQUFNLEVBQUUsQ0FBQztRQUNYLE9BQU8sVUFBVSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQVcsQ0FBQztJQUMvQyxDQUFDO0lBRUQsTUFBTSxNQUFNLEdBQUcsWUFBWSxFQUFFLENBQUM7SUFDOUIsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ1osTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFRCxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3BDLElBQUksR0FBRyxHQUFHLFNBQVMsRUFBRSxDQUFDO1FBQ3BCLCtDQUErQztRQUMvQyxvR0FBb0c7UUFDcEcsS0FBSyxJQUFJLFNBQVMsR0FBRyxDQUFDLEVBQUUsU0FBUyxHQUFHLEdBQUcsRUFBRSxTQUFTLElBQUksU0FBUyxFQUFFLENBQUM7WUFDaEUsa0VBQWtFO1lBQ2xFLHNDQUFzQztZQUN0QyxNQUFNLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQ3RFLENBQUM7SUFDSCxDQUFDO1NBQU0sQ0FBQztRQUNOLE1BQU0sQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFDO0FBQ2IsQ0FBQyxDQUFDO0FBRUY7Ozs7OztHQU1HO0FBQ0gsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUU7SUFDdkMsTUFBTSxZQUFZLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsdUNBQXVDO0lBQzVFLE1BQU0sU0FBUyxHQUFHLFFBQVEsQ0FBQyxZQUFZLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMscUNBQXFDO0lBQ25HLE9BQU8sU0FBUyxHQUFHLEdBQUcsQ0FBQyxDQUFDLG9EQUFvRDtBQUM5RSxDQUFDLENBQUM7QUFFRjs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRTtJQUMxQyxNQUFNLFlBQVksR0FBRyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyx1Q0FBdUM7SUFDNUUsTUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLEtBQUssWUFBWSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxxQ0FBcUM7SUFDdkcsT0FBTyxZQUFZLEdBQUcsR0FBRyxDQUFDLENBQUMsb0RBQW9EO0FBQ2pGLENBQUMsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxHQUFHLEVBQUU7SUFDaEMsTUFBTSxVQUFVLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsaUNBQWlDO0lBQ3ZFLE9BQU8sVUFBVSxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxzREFBc0Q7QUFDckYsQ0FBQyxDQUFDIn0=
|
package/dest/fields/fields.d.ts
CHANGED
|
@@ -69,6 +69,7 @@ export declare class Fr extends BaseField {
|
|
|
69
69
|
static ZERO: Fr;
|
|
70
70
|
static ONE: Fr;
|
|
71
71
|
static MODULUS: bigint;
|
|
72
|
+
static MAX_FIELD_VALUE: Fr;
|
|
72
73
|
constructor(value: number | bigint | boolean | Fr | Buffer);
|
|
73
74
|
[inspect.custom](): string;
|
|
74
75
|
protected modulus(): bigint;
|
|
@@ -91,6 +92,11 @@ export declare class Fr extends BaseField {
|
|
|
91
92
|
mul(rhs: Fr): Fr;
|
|
92
93
|
div(rhs: Fr): Fr;
|
|
93
94
|
ediv(rhs: Fr): Fr;
|
|
95
|
+
/**
|
|
96
|
+
* Computes a square root of the field element.
|
|
97
|
+
* @returns A square root of the field element (null if it does not exist).
|
|
98
|
+
*/
|
|
99
|
+
sqrt(): Fr | null;
|
|
94
100
|
toJSON(): {
|
|
95
101
|
type: string;
|
|
96
102
|
value: `0x${string}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../src/fields/fields.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../src/fields/fields.ts"],"names":[],"mappings":"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"}
|
package/dest/fields/fields.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
var _a;
|
|
2
|
+
import { BarretenbergSync } from '@aztec/bb.js';
|
|
1
3
|
import { inspect } from 'util';
|
|
2
4
|
import { toBigIntBE, toBufferBE } from '../bigint-buffer/index.js';
|
|
3
5
|
import { randomBytes } from '../crypto/random/index.js';
|
|
@@ -153,22 +155,22 @@ export class Fr extends BaseField {
|
|
|
153
155
|
return `Fr<${this.toString()}>`;
|
|
154
156
|
}
|
|
155
157
|
modulus() {
|
|
156
|
-
return
|
|
158
|
+
return _a.MODULUS;
|
|
157
159
|
}
|
|
158
160
|
static random() {
|
|
159
|
-
return random(
|
|
161
|
+
return random(_a);
|
|
160
162
|
}
|
|
161
163
|
static zero() {
|
|
162
|
-
return
|
|
164
|
+
return _a.ZERO;
|
|
163
165
|
}
|
|
164
166
|
static isZero(value) {
|
|
165
167
|
return value.isZero();
|
|
166
168
|
}
|
|
167
169
|
static fromBuffer(buffer) {
|
|
168
|
-
return fromBuffer(buffer,
|
|
170
|
+
return fromBuffer(buffer, _a);
|
|
169
171
|
}
|
|
170
172
|
static fromBufferReduce(buffer) {
|
|
171
|
-
return fromBufferReduce(buffer,
|
|
173
|
+
return fromBufferReduce(buffer, _a);
|
|
172
174
|
}
|
|
173
175
|
/**
|
|
174
176
|
* Creates a Fr instance from a hex string.
|
|
@@ -176,24 +178,24 @@ export class Fr extends BaseField {
|
|
|
176
178
|
* @returns the Fr instance
|
|
177
179
|
*/
|
|
178
180
|
static fromString(buf) {
|
|
179
|
-
return fromHexString(buf,
|
|
181
|
+
return fromHexString(buf, _a);
|
|
180
182
|
}
|
|
181
183
|
/** Arithmetic */
|
|
182
184
|
add(rhs) {
|
|
183
|
-
return new
|
|
185
|
+
return new _a((this.toBigInt() + rhs.toBigInt()) % _a.MODULUS);
|
|
184
186
|
}
|
|
185
187
|
square() {
|
|
186
|
-
return new
|
|
188
|
+
return new _a((this.toBigInt() * this.toBigInt()) % _a.MODULUS);
|
|
187
189
|
}
|
|
188
190
|
negate() {
|
|
189
|
-
return new
|
|
191
|
+
return new _a(_a.MODULUS - this.toBigInt());
|
|
190
192
|
}
|
|
191
193
|
sub(rhs) {
|
|
192
194
|
const result = this.toBigInt() - rhs.toBigInt();
|
|
193
|
-
return new
|
|
195
|
+
return new _a(result < 0 ? result + _a.MODULUS : result);
|
|
194
196
|
}
|
|
195
197
|
mul(rhs) {
|
|
196
|
-
return new
|
|
198
|
+
return new _a((this.toBigInt() * rhs.toBigInt()) % _a.MODULUS);
|
|
197
199
|
}
|
|
198
200
|
div(rhs) {
|
|
199
201
|
if (rhs.isZero()) {
|
|
@@ -207,7 +209,24 @@ export class Fr extends BaseField {
|
|
|
207
209
|
if (rhs.isZero()) {
|
|
208
210
|
throw new Error('Division by zero');
|
|
209
211
|
}
|
|
210
|
-
return new
|
|
212
|
+
return new _a(this.toBigInt() / rhs.toBigInt());
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* Computes a square root of the field element.
|
|
216
|
+
* @returns A square root of the field element (null if it does not exist).
|
|
217
|
+
*/
|
|
218
|
+
sqrt() {
|
|
219
|
+
const wasm = BarretenbergSync.getSingleton().getWasm();
|
|
220
|
+
wasm.writeMemory(0, this.toBuffer());
|
|
221
|
+
wasm.call('bn254_fr_sqrt', 0, _a.SIZE_IN_BYTES);
|
|
222
|
+
const isSqrtBuf = Buffer.from(wasm.getMemorySlice(_a.SIZE_IN_BYTES, _a.SIZE_IN_BYTES + 1));
|
|
223
|
+
const isSqrt = isSqrtBuf[0] === 1;
|
|
224
|
+
if (!isSqrt) {
|
|
225
|
+
// Field element is not a quadratic residue mod p so it has no square root.
|
|
226
|
+
return null;
|
|
227
|
+
}
|
|
228
|
+
const rootBuf = Buffer.from(wasm.getMemorySlice(_a.SIZE_IN_BYTES + 1, _a.SIZE_IN_BYTES * 2 + 1));
|
|
229
|
+
return _a.fromBuffer(rootBuf);
|
|
211
230
|
}
|
|
212
231
|
toJSON() {
|
|
213
232
|
return {
|
|
@@ -216,9 +235,11 @@ export class Fr extends BaseField {
|
|
|
216
235
|
};
|
|
217
236
|
}
|
|
218
237
|
}
|
|
219
|
-
|
|
220
|
-
Fr.
|
|
238
|
+
_a = Fr;
|
|
239
|
+
Fr.ZERO = new _a(0n);
|
|
240
|
+
Fr.ONE = new _a(1n);
|
|
221
241
|
Fr.MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
|
|
242
|
+
Fr.MAX_FIELD_VALUE = new _a(_a.MODULUS - 1n);
|
|
222
243
|
// For deserializing JSON.
|
|
223
244
|
TypeRegistry.register('Fr', Fr);
|
|
224
245
|
/**
|
|
@@ -326,4 +347,4 @@ if (process.env.NODE_ENV === 'test') {
|
|
|
326
347
|
// `addEqualityTesters` doesn't seem to be in the types yet.
|
|
327
348
|
expect.addEqualityTesters([areFieldsEqual]);
|
|
328
349
|
}
|
|
329
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../src/fields/fields.ts"],"names":[],"mappings":"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"}
|
|
350
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fields.js","sourceRoot":"","sources":["../../src/fields/fields.ts"],"names":[],"mappings":"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"}
|
package/dest/fields/point.d.ts
CHANGED
|
@@ -21,6 +21,7 @@ export declare class Point {
|
|
|
21
21
|
readonly isInfinite: boolean;
|
|
22
22
|
static ZERO: Point;
|
|
23
23
|
static SIZE_IN_BYTES: number;
|
|
24
|
+
static COMPRESSED_SIZE_IN_BYTES: number;
|
|
24
25
|
/** Used to differentiate this class from AztecAddress */
|
|
25
26
|
readonly kind = "point";
|
|
26
27
|
constructor(
|
|
@@ -50,6 +51,14 @@ export declare class Point {
|
|
|
50
51
|
* @returns A Point instance.
|
|
51
52
|
*/
|
|
52
53
|
static fromBuffer(buffer: Buffer | BufferReader): Point;
|
|
54
|
+
/**
|
|
55
|
+
* Create a Point instance from a compressed buffer.
|
|
56
|
+
* The input 'buffer' should have exactly 33 bytes representing the x coordinate and the sign of the y coordinate.
|
|
57
|
+
*
|
|
58
|
+
* @param buffer - The buffer containing the x coordinate and the sign of the y coordinate.
|
|
59
|
+
* @returns A Point instance.
|
|
60
|
+
*/
|
|
61
|
+
static fromCompressedBuffer(buffer: Buffer | BufferReader): Point;
|
|
53
62
|
/**
|
|
54
63
|
* Create a Point instance from a hex-encoded string.
|
|
55
64
|
* The input 'address' should be prefixed with '0x' or not, and have exactly 128 hex characters representing the x and y coordinates.
|
|
@@ -65,6 +74,22 @@ export declare class Point {
|
|
|
65
74
|
*/
|
|
66
75
|
toFields(): Fr[];
|
|
67
76
|
static fromFields(fields: Fr[] | FieldReader): Point;
|
|
77
|
+
/**
|
|
78
|
+
* Uses the x coordinate and isPositive flag (+/-) to reconstruct the point.
|
|
79
|
+
* @dev The y coordinate can be derived from the x coordinate and the "sign" flag by solving the grumpkin curve
|
|
80
|
+
* equation for y.
|
|
81
|
+
* @param x - The x coordinate of the point
|
|
82
|
+
* @param sign - The "sign" of the y coordinate - note that this is not a sign as is known in integer arithmetic.
|
|
83
|
+
* Instead it is a boolean flag that determines whether the y coordinate is <= (Fr.MODULUS - 1) / 2
|
|
84
|
+
* @returns The point as an array of 2 fields
|
|
85
|
+
*/
|
|
86
|
+
static fromXAndSign(x: Fr, sign: boolean): Point;
|
|
87
|
+
/**
|
|
88
|
+
* Returns the x coordinate and the sign of the y coordinate.
|
|
89
|
+
* @dev The y sign can be determined by checking if the y coordinate is greater than half of the modulus.
|
|
90
|
+
* @returns The x coordinate and the sign of the y coordinate.
|
|
91
|
+
*/
|
|
92
|
+
toXAndSign(): [Fr, boolean];
|
|
68
93
|
/**
|
|
69
94
|
* Returns the contents of the point as BigInts.
|
|
70
95
|
* @returns The point as BigInts
|
|
@@ -85,6 +110,11 @@ export declare class Point {
|
|
|
85
110
|
* is not considered a valid public key and the extra byte would raise DA cost.
|
|
86
111
|
*/
|
|
87
112
|
toBuffer(): Buffer;
|
|
113
|
+
/**
|
|
114
|
+
* Converts the Point instance to a compressed Buffer representation of the coordinates.
|
|
115
|
+
* @returns A Buffer representation of the Point instance
|
|
116
|
+
*/
|
|
117
|
+
toCompressedBuffer(): Buffer;
|
|
88
118
|
/**
|
|
89
119
|
* Convert the Point instance to a hexadecimal string representation.
|
|
90
120
|
* The output string is prefixed with '0x' and consists of exactly 128 hex characters,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../src/fields/point.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC;;;;GAIG;AACH,qBAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../src/fields/point.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC;;;;GAIG;AACH,qBAAa,KAAK;IASd;;OAEG;aACa,CAAC,EAAE,EAAE;IACrB;;OAEG;aACa,CAAC,EAAE,EAAE;IACrB;;OAEG;aACa,UAAU,EAAE,OAAO;IAnBrC,MAAM,CAAC,IAAI,QAAsC;IACjD,MAAM,CAAC,aAAa,SAAwB;IAC5C,MAAM,CAAC,wBAAwB,SAAwB;IAEvD,yDAAyD;IACzD,SAAgB,IAAI,WAAW;;IAG7B;;OAEG;IACa,CAAC,EAAE,EAAE;IACrB;;OAEG;IACa,CAAC,EAAE,EAAE;IACrB;;OAEG;IACa,UAAU,EAAE,OAAO;IAKrC;;;;OAIG;IACH,MAAM,CAAC,MAAM;IAcb;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAK/C;;;;;;OAMG;IACH,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAKzD;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM;IAIjC;;;OAGG;IACH,QAAQ;IAIR,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW;IAK5C;;;;;;;;OAQG;IACH,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO;IAsBxC;;;;OAIG;IACH,UAAU,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAI3B;;;OAGG;IACH,SAAS;;;;;IAQT;;;;;;;;;OASG;IACH,QAAQ;IAWR;;;OAGG;IACH,kBAAkB;IAIlB;;;;;;OAMG;IACH,QAAQ;IAIR;;;;;;;OAOG;IACH,aAAa;IAKb,YAAY;;;;;IAMZ;;;;;;OAMG;IACH,MAAM,CAAC,GAAG,EAAE,KAAK;IAIjB,MAAM;IAIN,IAAI;IAIJ;;;OAGG;IACH,IAAW,GAAG,YAEb;IAED,YAAY;CAYb;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,KAAK,CAMjD"}
|
package/dest/fields/point.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { poseidon2Hash } from '../crypto/index.js';
|
|
1
|
+
import { poseidon2Hash, randomBoolean } from '../crypto/index.js';
|
|
2
2
|
import { BufferReader, FieldReader, serializeToBuffer } from '../serialize/index.js';
|
|
3
3
|
import { Fr } from './fields.js';
|
|
4
4
|
/**
|
|
@@ -33,8 +33,18 @@ export class Point {
|
|
|
33
33
|
* @returns A randomly generated Point instance.
|
|
34
34
|
*/
|
|
35
35
|
static random() {
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
while (true) {
|
|
37
|
+
try {
|
|
38
|
+
return Point.fromXAndSign(Fr.random(), randomBoolean());
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
if (!(e instanceof NotOnCurveError)) {
|
|
42
|
+
throw e;
|
|
43
|
+
}
|
|
44
|
+
// The random point is not on the curve - we try again
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
38
48
|
}
|
|
39
49
|
/**
|
|
40
50
|
* Create a Point instance from a given buffer or BufferReader.
|
|
@@ -47,6 +57,17 @@ export class Point {
|
|
|
47
57
|
const reader = BufferReader.asReader(buffer);
|
|
48
58
|
return new this(Fr.fromBuffer(reader), Fr.fromBuffer(reader), false);
|
|
49
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Create a Point instance from a compressed buffer.
|
|
62
|
+
* The input 'buffer' should have exactly 33 bytes representing the x coordinate and the sign of the y coordinate.
|
|
63
|
+
*
|
|
64
|
+
* @param buffer - The buffer containing the x coordinate and the sign of the y coordinate.
|
|
65
|
+
* @returns A Point instance.
|
|
66
|
+
*/
|
|
67
|
+
static fromCompressedBuffer(buffer) {
|
|
68
|
+
const reader = BufferReader.asReader(buffer);
|
|
69
|
+
return this.fromXAndSign(Fr.fromBuffer(reader), reader.readBoolean());
|
|
70
|
+
}
|
|
50
71
|
/**
|
|
51
72
|
* Create a Point instance from a hex-encoded string.
|
|
52
73
|
* The input 'address' should be prefixed with '0x' or not, and have exactly 128 hex characters representing the x and y coordinates.
|
|
@@ -69,6 +90,39 @@ export class Point {
|
|
|
69
90
|
const reader = FieldReader.asReader(fields);
|
|
70
91
|
return new this(reader.readField(), reader.readField(), reader.readBoolean());
|
|
71
92
|
}
|
|
93
|
+
/**
|
|
94
|
+
* Uses the x coordinate and isPositive flag (+/-) to reconstruct the point.
|
|
95
|
+
* @dev The y coordinate can be derived from the x coordinate and the "sign" flag by solving the grumpkin curve
|
|
96
|
+
* equation for y.
|
|
97
|
+
* @param x - The x coordinate of the point
|
|
98
|
+
* @param sign - The "sign" of the y coordinate - note that this is not a sign as is known in integer arithmetic.
|
|
99
|
+
* Instead it is a boolean flag that determines whether the y coordinate is <= (Fr.MODULUS - 1) / 2
|
|
100
|
+
* @returns The point as an array of 2 fields
|
|
101
|
+
*/
|
|
102
|
+
static fromXAndSign(x, sign) {
|
|
103
|
+
// Calculate y^2 = x^3 - 17
|
|
104
|
+
const ySquared = x.square().mul(x).sub(new Fr(17));
|
|
105
|
+
// Calculate the square root of ySquared
|
|
106
|
+
const y = ySquared.sqrt();
|
|
107
|
+
// If y is null, the x-coordinate is not on the curve
|
|
108
|
+
if (y === null) {
|
|
109
|
+
throw new NotOnCurveError();
|
|
110
|
+
}
|
|
111
|
+
const yPositiveBigInt = y.toBigInt() > (Fr.MODULUS - 1n) / 2n ? Fr.MODULUS - y.toBigInt() : y.toBigInt();
|
|
112
|
+
const yNegativeBigInt = Fr.MODULUS - yPositiveBigInt;
|
|
113
|
+
// Choose the positive or negative root based on isPositive
|
|
114
|
+
const finalY = sign ? new Fr(yPositiveBigInt) : new Fr(yNegativeBigInt);
|
|
115
|
+
// Create and return the new Point
|
|
116
|
+
return new this(x, finalY, false);
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* Returns the x coordinate and the sign of the y coordinate.
|
|
120
|
+
* @dev The y sign can be determined by checking if the y coordinate is greater than half of the modulus.
|
|
121
|
+
* @returns The x coordinate and the sign of the y coordinate.
|
|
122
|
+
*/
|
|
123
|
+
toXAndSign() {
|
|
124
|
+
return [this.x, this.y.toBigInt() <= (Fr.MODULUS - 1n) / 2n];
|
|
125
|
+
}
|
|
72
126
|
/**
|
|
73
127
|
* Returns the contents of the point as BigInts.
|
|
74
128
|
* @returns The point as BigInts
|
|
@@ -100,6 +154,13 @@ export class Point {
|
|
|
100
154
|
}
|
|
101
155
|
return buf;
|
|
102
156
|
}
|
|
157
|
+
/**
|
|
158
|
+
* Converts the Point instance to a compressed Buffer representation of the coordinates.
|
|
159
|
+
* @returns A Buffer representation of the Point instance
|
|
160
|
+
*/
|
|
161
|
+
toCompressedBuffer() {
|
|
162
|
+
return serializeToBuffer(this.toXAndSign());
|
|
163
|
+
}
|
|
103
164
|
/**
|
|
104
165
|
* Convert the Point instance to a hexadecimal string representation.
|
|
105
166
|
* The output string is prefixed with '0x' and consists of exactly 128 hex characters,
|
|
@@ -164,6 +225,7 @@ export class Point {
|
|
|
164
225
|
}
|
|
165
226
|
Point.ZERO = new Point(Fr.ZERO, Fr.ZERO, false);
|
|
166
227
|
Point.SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * 2;
|
|
228
|
+
Point.COMPRESSED_SIZE_IN_BYTES = Fr.SIZE_IN_BYTES + 1;
|
|
167
229
|
/**
|
|
168
230
|
* Does this object look like a point?
|
|
169
231
|
* @param obj - Object to test if it is a point.
|
|
@@ -176,4 +238,10 @@ export function isPoint(obj) {
|
|
|
176
238
|
const point = obj;
|
|
177
239
|
return point.kind === 'point' && point.x !== undefined && point.y !== undefined;
|
|
178
240
|
}
|
|
179
|
-
|
|
241
|
+
class NotOnCurveError extends Error {
|
|
242
|
+
constructor() {
|
|
243
|
+
super('The given x-coordinate is not on the Grumpkin curve');
|
|
244
|
+
this.name = 'NotOnCurveError';
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9pbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmllbGRzL3BvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsYUFBYSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxXQUFXLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRWpDOzs7O0dBSUc7QUFDSCxNQUFNLE9BQU8sS0FBSztJQVFoQjtJQUNFOztPQUVHO0lBQ2EsQ0FBSztJQUNyQjs7T0FFRztJQUNhLENBQUs7SUFDckI7O09BRUc7SUFDYSxVQUFtQjtRQVJuQixNQUFDLEdBQUQsQ0FBQyxDQUFJO1FBSUwsTUFBQyxHQUFELENBQUMsQ0FBSTtRQUlMLGVBQVUsR0FBVixVQUFVLENBQVM7UUFmckMseURBQXlEO1FBQ3pDLFNBQUksR0FBRyxPQUFPLENBQUM7UUFnQjdCLGlDQUFpQztJQUNuQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxNQUFNO1FBQ1gsT0FBTyxJQUFJLEVBQUUsQ0FBQztZQUNaLElBQUksQ0FBQztnQkFDSCxPQUFPLEtBQUssQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLGFBQWEsRUFBRSxDQUFDLENBQUM7WUFDMUQsQ0FBQztZQUFDLE9BQU8sQ0FBTSxFQUFFLENBQUM7Z0JBQ2hCLElBQUksQ0FBQyxDQUFDLENBQUMsWUFBWSxlQUFlLENBQUMsRUFBRSxDQUFDO29CQUNwQyxNQUFNLENBQUMsQ0FBQztnQkFDVixDQUFDO2dCQUNELHNEQUFzRDtnQkFDdEQsU0FBUztZQUNYLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztJQUVEOzs7Ozs7T0FNRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBNkI7UUFDN0MsTUFBTSxNQUFN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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/foundation",
|
|
3
|
-
"version": "0.46.
|
|
3
|
+
"version": "0.46.7",
|
|
4
4
|
"packageManager": "yarn@3.4.1",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dest/index.js",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
]
|
|
89
89
|
},
|
|
90
90
|
"dependencies": {
|
|
91
|
-
"@aztec/bb.js": "0.46.
|
|
91
|
+
"@aztec/bb.js": "0.46.7",
|
|
92
92
|
"@koa/cors": "^5.0.0",
|
|
93
93
|
"@noble/curves": "^1.2.0",
|
|
94
94
|
"bn.js": "^5.2.1",
|
|
@@ -74,3 +74,12 @@ export const randomBigInt = (max: bigint) => {
|
|
|
74
74
|
const randomBigInt = BigInt(`0x${randomBuffer.toString('hex')}`); // Convert buffer to a large integer.
|
|
75
75
|
return randomBigInt % max; // Use modulo to ensure the result is less than max.
|
|
76
76
|
};
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* Generate a random boolean value.
|
|
80
|
+
* @returns A random boolean value.
|
|
81
|
+
*/
|
|
82
|
+
export const randomBoolean = () => {
|
|
83
|
+
const randomByte = randomBytes(1)[0]; // Generate a single random byte.
|
|
84
|
+
return randomByte % 2 === 0; // Use modulo to determine if the byte is even or odd.
|
|
85
|
+
};
|
package/src/fields/fields.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { BarretenbergSync } from '@aztec/bb.js';
|
|
2
|
+
|
|
1
3
|
import { inspect } from 'util';
|
|
2
4
|
|
|
3
5
|
import { toBigIntBE, toBufferBE } from '../bigint-buffer/index.js';
|
|
@@ -197,6 +199,7 @@ export class Fr extends BaseField {
|
|
|
197
199
|
static ZERO = new Fr(0n);
|
|
198
200
|
static ONE = new Fr(1n);
|
|
199
201
|
static MODULUS = 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001n;
|
|
202
|
+
static MAX_FIELD_VALUE = new Fr(this.MODULUS - 1n);
|
|
200
203
|
|
|
201
204
|
constructor(value: number | bigint | boolean | Fr | Buffer) {
|
|
202
205
|
super(value);
|
|
@@ -280,6 +283,25 @@ export class Fr extends BaseField {
|
|
|
280
283
|
return new Fr(this.toBigInt() / rhs.toBigInt());
|
|
281
284
|
}
|
|
282
285
|
|
|
286
|
+
/**
|
|
287
|
+
* Computes a square root of the field element.
|
|
288
|
+
* @returns A square root of the field element (null if it does not exist).
|
|
289
|
+
*/
|
|
290
|
+
sqrt(): Fr | null {
|
|
291
|
+
const wasm = BarretenbergSync.getSingleton().getWasm();
|
|
292
|
+
wasm.writeMemory(0, this.toBuffer());
|
|
293
|
+
wasm.call('bn254_fr_sqrt', 0, Fr.SIZE_IN_BYTES);
|
|
294
|
+
const isSqrtBuf = Buffer.from(wasm.getMemorySlice(Fr.SIZE_IN_BYTES, Fr.SIZE_IN_BYTES + 1));
|
|
295
|
+
const isSqrt = isSqrtBuf[0] === 1;
|
|
296
|
+
if (!isSqrt) {
|
|
297
|
+
// Field element is not a quadratic residue mod p so it has no square root.
|
|
298
|
+
return null;
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
const rootBuf = Buffer.from(wasm.getMemorySlice(Fr.SIZE_IN_BYTES + 1, Fr.SIZE_IN_BYTES * 2 + 1));
|
|
302
|
+
return Fr.fromBuffer(rootBuf);
|
|
303
|
+
}
|
|
304
|
+
|
|
283
305
|
toJSON() {
|
|
284
306
|
return {
|
|
285
307
|
type: 'Fr',
|
package/src/fields/point.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { poseidon2Hash } from '../crypto/index.js';
|
|
1
|
+
import { poseidon2Hash, randomBoolean } from '../crypto/index.js';
|
|
2
2
|
import { BufferReader, FieldReader, serializeToBuffer } from '../serialize/index.js';
|
|
3
3
|
import { Fr } from './fields.js';
|
|
4
4
|
|
|
@@ -10,6 +10,7 @@ import { Fr } from './fields.js';
|
|
|
10
10
|
export class Point {
|
|
11
11
|
static ZERO = new Point(Fr.ZERO, Fr.ZERO, false);
|
|
12
12
|
static SIZE_IN_BYTES = Fr.SIZE_IN_BYTES * 2;
|
|
13
|
+
static COMPRESSED_SIZE_IN_BYTES = Fr.SIZE_IN_BYTES + 1;
|
|
13
14
|
|
|
14
15
|
/** Used to differentiate this class from AztecAddress */
|
|
15
16
|
public readonly kind = 'point';
|
|
@@ -37,8 +38,17 @@ export class Point {
|
|
|
37
38
|
* @returns A randomly generated Point instance.
|
|
38
39
|
*/
|
|
39
40
|
static random() {
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
while (true) {
|
|
42
|
+
try {
|
|
43
|
+
return Point.fromXAndSign(Fr.random(), randomBoolean());
|
|
44
|
+
} catch (e: any) {
|
|
45
|
+
if (!(e instanceof NotOnCurveError)) {
|
|
46
|
+
throw e;
|
|
47
|
+
}
|
|
48
|
+
// The random point is not on the curve - we try again
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
42
52
|
}
|
|
43
53
|
|
|
44
54
|
/**
|
|
@@ -53,6 +63,18 @@ export class Point {
|
|
|
53
63
|
return new this(Fr.fromBuffer(reader), Fr.fromBuffer(reader), false);
|
|
54
64
|
}
|
|
55
65
|
|
|
66
|
+
/**
|
|
67
|
+
* Create a Point instance from a compressed buffer.
|
|
68
|
+
* The input 'buffer' should have exactly 33 bytes representing the x coordinate and the sign of the y coordinate.
|
|
69
|
+
*
|
|
70
|
+
* @param buffer - The buffer containing the x coordinate and the sign of the y coordinate.
|
|
71
|
+
* @returns A Point instance.
|
|
72
|
+
*/
|
|
73
|
+
static fromCompressedBuffer(buffer: Buffer | BufferReader) {
|
|
74
|
+
const reader = BufferReader.asReader(buffer);
|
|
75
|
+
return this.fromXAndSign(Fr.fromBuffer(reader), reader.readBoolean());
|
|
76
|
+
}
|
|
77
|
+
|
|
56
78
|
/**
|
|
57
79
|
* Create a Point instance from a hex-encoded string.
|
|
58
80
|
* The input 'address' should be prefixed with '0x' or not, and have exactly 128 hex characters representing the x and y coordinates.
|
|
@@ -78,6 +100,46 @@ export class Point {
|
|
|
78
100
|
return new this(reader.readField(), reader.readField(), reader.readBoolean());
|
|
79
101
|
}
|
|
80
102
|
|
|
103
|
+
/**
|
|
104
|
+
* Uses the x coordinate and isPositive flag (+/-) to reconstruct the point.
|
|
105
|
+
* @dev The y coordinate can be derived from the x coordinate and the "sign" flag by solving the grumpkin curve
|
|
106
|
+
* equation for y.
|
|
107
|
+
* @param x - The x coordinate of the point
|
|
108
|
+
* @param sign - The "sign" of the y coordinate - note that this is not a sign as is known in integer arithmetic.
|
|
109
|
+
* Instead it is a boolean flag that determines whether the y coordinate is <= (Fr.MODULUS - 1) / 2
|
|
110
|
+
* @returns The point as an array of 2 fields
|
|
111
|
+
*/
|
|
112
|
+
static fromXAndSign(x: Fr, sign: boolean) {
|
|
113
|
+
// Calculate y^2 = x^3 - 17
|
|
114
|
+
const ySquared = x.square().mul(x).sub(new Fr(17));
|
|
115
|
+
|
|
116
|
+
// Calculate the square root of ySquared
|
|
117
|
+
const y = ySquared.sqrt();
|
|
118
|
+
|
|
119
|
+
// If y is null, the x-coordinate is not on the curve
|
|
120
|
+
if (y === null) {
|
|
121
|
+
throw new NotOnCurveError();
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
const yPositiveBigInt = y.toBigInt() > (Fr.MODULUS - 1n) / 2n ? Fr.MODULUS - y.toBigInt() : y.toBigInt();
|
|
125
|
+
const yNegativeBigInt = Fr.MODULUS - yPositiveBigInt;
|
|
126
|
+
|
|
127
|
+
// Choose the positive or negative root based on isPositive
|
|
128
|
+
const finalY = sign ? new Fr(yPositiveBigInt) : new Fr(yNegativeBigInt);
|
|
129
|
+
|
|
130
|
+
// Create and return the new Point
|
|
131
|
+
return new this(x, finalY, false);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/**
|
|
135
|
+
* Returns the x coordinate and the sign of the y coordinate.
|
|
136
|
+
* @dev The y sign can be determined by checking if the y coordinate is greater than half of the modulus.
|
|
137
|
+
* @returns The x coordinate and the sign of the y coordinate.
|
|
138
|
+
*/
|
|
139
|
+
toXAndSign(): [Fr, boolean] {
|
|
140
|
+
return [this.x, this.y.toBigInt() <= (Fr.MODULUS - 1n) / 2n];
|
|
141
|
+
}
|
|
142
|
+
|
|
81
143
|
/**
|
|
82
144
|
* Returns the contents of the point as BigInts.
|
|
83
145
|
* @returns The point as BigInts
|
|
@@ -111,6 +173,14 @@ export class Point {
|
|
|
111
173
|
return buf;
|
|
112
174
|
}
|
|
113
175
|
|
|
176
|
+
/**
|
|
177
|
+
* Converts the Point instance to a compressed Buffer representation of the coordinates.
|
|
178
|
+
* @returns A Buffer representation of the Point instance
|
|
179
|
+
*/
|
|
180
|
+
toCompressedBuffer() {
|
|
181
|
+
return serializeToBuffer(this.toXAndSign());
|
|
182
|
+
}
|
|
183
|
+
|
|
114
184
|
/**
|
|
115
185
|
* Convert the Point instance to a hexadecimal string representation.
|
|
116
186
|
* The output string is prefixed with '0x' and consists of exactly 128 hex characters,
|
|
@@ -194,3 +264,10 @@ export function isPoint(obj: object): obj is Point {
|
|
|
194
264
|
const point = obj as Point;
|
|
195
265
|
return point.kind === 'point' && point.x !== undefined && point.y !== undefined;
|
|
196
266
|
}
|
|
267
|
+
|
|
268
|
+
class NotOnCurveError extends Error {
|
|
269
|
+
constructor() {
|
|
270
|
+
super('The given x-coordinate is not on the Grumpkin curve');
|
|
271
|
+
this.name = 'NotOnCurveError';
|
|
272
|
+
}
|
|
273
|
+
}
|