@aztec/foundation 0.71.0 → 0.72.1
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/abi/decoder.d.ts +1 -1
- package/dest/abi/decoder.d.ts.map +1 -1
- package/dest/abi/decoder.js +11 -2
- package/dest/abi/encoder.d.ts.map +1 -1
- package/dest/abi/encoder.js +12 -2
- package/dest/abi/event_selector.d.ts +1 -2
- package/dest/abi/event_selector.d.ts.map +1 -1
- package/dest/abi/event_selector.js +2 -3
- package/dest/abi/function_selector.d.ts +1 -2
- package/dest/abi/function_selector.d.ts.map +1 -1
- package/dest/abi/function_selector.js +2 -3
- package/dest/abi/index.d.ts +1 -0
- package/dest/abi/index.d.ts.map +1 -1
- package/dest/abi/index.js +2 -1
- package/dest/abi/u128.d.ts +13 -0
- package/dest/abi/u128.d.ts.map +1 -0
- package/dest/abi/u128.js +58 -0
- package/dest/abi/utils.d.ts +5 -0
- package/dest/abi/utils.d.ts.map +1 -1
- package/dest/abi/utils.js +8 -1
- package/dest/array/array.d.ts +8 -0
- package/dest/array/array.d.ts.map +1 -1
- package/dest/array/array.js +13 -1
- package/dest/aztec-address/index.d.ts +3 -3
- package/dest/aztec-address/index.d.ts.map +1 -1
- package/dest/aztec-address/index.js +5 -5
- package/dest/collection/array.d.ts +7 -0
- package/dest/collection/array.d.ts.map +1 -1
- package/dest/collection/array.js +13 -1
- package/dest/config/env_var.d.ts +1 -1
- package/dest/config/env_var.d.ts.map +1 -1
- package/dest/fields/fields.d.ts +10 -1
- package/dest/fields/fields.d.ts.map +1 -1
- package/dest/fields/fields.js +19 -10
- package/dest/fields/point.d.ts +4 -4
- package/dest/fields/point.d.ts.map +1 -1
- package/dest/fields/point.js +5 -5
- package/dest/json-rpc/client/fetch.d.ts +2 -2
- package/dest/json-rpc/client/fetch.d.ts.map +1 -1
- package/dest/json-rpc/client/fetch.js +7 -7
- package/dest/json-rpc/client/safe_json_rpc_client.d.ts.map +1 -1
- package/dest/json-rpc/client/safe_json_rpc_client.js +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts +17 -5
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts.map +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.js +16 -9
- package/dest/json-rpc/server/telemetry.d.ts +2 -0
- package/dest/json-rpc/server/telemetry.d.ts.map +1 -0
- package/dest/json-rpc/server/telemetry.js +2 -0
- package/dest/testing/files/index.d.ts +1 -1
- package/dest/testing/files/index.d.ts.map +1 -1
- package/dest/testing/files/index.js +3 -3
- package/dest/timer/timeout.js +2 -2
- package/package.json +3 -3
- package/src/abi/decoder.ts +11 -2
- package/src/abi/encoder.ts +11 -1
- package/src/abi/event_selector.ts +1 -2
- package/src/abi/function_selector.ts +1 -2
- package/src/abi/index.ts +1 -0
- package/src/abi/u128.ts +71 -0
- package/src/abi/utils.ts +8 -0
- package/src/array/array.ts +15 -0
- package/src/aztec-address/index.ts +5 -5
- package/src/collection/array.ts +15 -0
- package/src/config/env_var.ts +1 -1
- package/src/fields/fields.ts +19 -10
- package/src/fields/point.ts +6 -6
- package/src/json-rpc/client/fetch.ts +14 -6
- package/src/json-rpc/client/safe_json_rpc_client.ts +0 -1
- package/src/json-rpc/server/safe_json_rpc_server.ts +27 -11
- package/src/json-rpc/server/telemetry.ts +0 -0
- package/src/testing/files/index.ts +2 -2
- package/src/timer/timeout.ts +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import cors from '@koa/cors';
|
|
2
2
|
import http from 'http';
|
|
3
|
-
import Koa from 'koa';
|
|
3
|
+
import { default as Koa } from 'koa';
|
|
4
4
|
import bodyParser from 'koa-bodyparser';
|
|
5
5
|
import compress from 'koa-compress';
|
|
6
6
|
import Router from 'koa-router';
|
|
@@ -22,11 +22,14 @@ export class SafeJsonRpcServer {
|
|
|
22
22
|
http200OnError = false,
|
|
23
23
|
/** Health check function */
|
|
24
24
|
healthCheck = () => true,
|
|
25
|
+
/** Additional middlewares */
|
|
26
|
+
extraMiddlewares = [],
|
|
25
27
|
/** Logger */
|
|
26
28
|
log = createLogger('json-rpc:server')) {
|
|
27
29
|
this.proxy = proxy;
|
|
28
30
|
this.http200OnError = http200OnError;
|
|
29
31
|
this.healthCheck = healthCheck;
|
|
32
|
+
this.extraMiddlewares = extraMiddlewares;
|
|
30
33
|
this.log = log;
|
|
31
34
|
}
|
|
32
35
|
isHealthy() {
|
|
@@ -86,6 +89,9 @@ export class SafeJsonRpcServer {
|
|
|
86
89
|
});
|
|
87
90
|
app.use(compress({ br: false }));
|
|
88
91
|
app.use(jsonResponse);
|
|
92
|
+
for (const middleware of this.extraMiddlewares) {
|
|
93
|
+
app.use(middleware);
|
|
94
|
+
}
|
|
89
95
|
app.use(exceptionHandler);
|
|
90
96
|
app.use(bodyParser({ jsonLimit: '50mb', enableTypes: ['json'], detectJSON: () => true }));
|
|
91
97
|
app.use(cors());
|
|
@@ -106,7 +112,9 @@ export class SafeJsonRpcServer {
|
|
|
106
112
|
// Fail if not a registered function in the proxy
|
|
107
113
|
if (typeof method !== 'string' || method === 'constructor' || !this.proxy.hasMethod(method)) {
|
|
108
114
|
ctx.status = 400;
|
|
109
|
-
|
|
115
|
+
const code = -32601;
|
|
116
|
+
const message = `Method not found: ${method}`;
|
|
117
|
+
ctx.body = { jsonrpc, id, error: { code, message } };
|
|
110
118
|
}
|
|
111
119
|
else {
|
|
112
120
|
ctx.status = 200;
|
|
@@ -233,18 +241,17 @@ function makeAggregateHealthcheck(namedHandlers, log) {
|
|
|
233
241
|
* @returns A single JsonRpcServer with namespaced methods.
|
|
234
242
|
*/
|
|
235
243
|
export function createNamespacedSafeJsonRpcServer(handlers, options = {
|
|
236
|
-
http200OnError: false,
|
|
237
244
|
log: createLogger('json-rpc:server'),
|
|
238
245
|
}) {
|
|
239
|
-
const { http200OnError, log } = options;
|
|
246
|
+
const { middlewares, http200OnError, log } = options;
|
|
240
247
|
const proxy = new NamespacedSafeJsonProxy(handlers);
|
|
241
248
|
const healthCheck = makeAggregateHealthcheck(handlers, log);
|
|
242
|
-
return new SafeJsonRpcServer(proxy, http200OnError, healthCheck, log);
|
|
249
|
+
return new SafeJsonRpcServer(proxy, http200OnError, healthCheck, middlewares, log);
|
|
243
250
|
}
|
|
244
|
-
export function createSafeJsonRpcServer(handler, schema, options = {
|
|
245
|
-
const { http200OnError, log, healthCheck } = options;
|
|
251
|
+
export function createSafeJsonRpcServer(handler, schema, options = {}) {
|
|
252
|
+
const { http200OnError, log, healthCheck, middlewares: extraMiddlewares } = options;
|
|
246
253
|
const proxy = new SafeJsonProxy(handler, schema);
|
|
247
|
-
return new SafeJsonRpcServer(proxy, http200OnError, healthCheck, log);
|
|
254
|
+
return new SafeJsonRpcServer(proxy, http200OnError, healthCheck, extraMiddlewares, log);
|
|
248
255
|
}
|
|
249
256
|
/**
|
|
250
257
|
* Creates a router for handling a plain status request that will return 200 status when running.
|
|
@@ -290,4 +297,4 @@ export async function startHttpRpcServer(rpcServer, options = {}) {
|
|
|
290
297
|
const port = httpServer.address().port;
|
|
291
298
|
return Object.assign(httpServer, { port });
|
|
292
299
|
}
|
|
293
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"safe_json_rpc_server.js","sourceRoot":"","sources":["../../../src/json-rpc/server/safe_json_rpc_server.ts"],"names":[],"mappings":"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"}
|
|
300
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"safe_json_rpc_server.js","sourceRoot":"","sources":["../../../src/json-rpc/server/safe_json_rpc_server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/json-rpc/server/telemetry.ts"],"names":[],"mappings":""}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
3
|
/** Writes the contents specified to the target file if test data generation is enabled. */
|
|
4
|
-
export declare function writeTestData(targetFileFromRepoRoot: string, contents: string | Buffer): void;
|
|
4
|
+
export declare function writeTestData(targetFileFromRepoRoot: string, contents: string | Buffer, raw?: boolean): void;
|
|
5
5
|
export declare function readTestData(repoPath: string): Buffer;
|
|
6
6
|
/**
|
|
7
7
|
* Looks for a variable assignment in the target file and updates the value, only if test data generation is enabled.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/files/index.ts"],"names":[],"mappings":";;AAOA,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/files/index.ts"],"names":[],"mappings":";;AAOA,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,GAAE,OAAe,QAS5G;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAenG;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAMnF"}
|
|
@@ -4,12 +4,12 @@ import { createConsoleLogger } from '../../log/console.js';
|
|
|
4
4
|
import { fileURLToPath } from '../../url/index.js';
|
|
5
5
|
import { isGenerateTestDataEnabled } from '../test_data.js';
|
|
6
6
|
/** Writes the contents specified to the target file if test data generation is enabled. */
|
|
7
|
-
export function writeTestData(targetFileFromRepoRoot, contents) {
|
|
7
|
+
export function writeTestData(targetFileFromRepoRoot, contents, raw = false) {
|
|
8
8
|
if (!isGenerateTestDataEnabled()) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
11
|
const targetFile = getPathToFile(targetFileFromRepoRoot);
|
|
12
|
-
const toWrite = typeof contents === 'string' ? contents : contents.toString('hex');
|
|
12
|
+
const toWrite = raw ? contents : typeof contents === 'string' ? contents : contents.toString('hex');
|
|
13
13
|
writeFileSync(targetFile, toWrite);
|
|
14
14
|
const logger = createConsoleLogger('aztec:testing:test_data');
|
|
15
15
|
logger(`Wrote test data to ${targetFile}`);
|
|
@@ -58,4 +58,4 @@ function getPathToFile(targetFileFromRepoRoot) {
|
|
|
58
58
|
}
|
|
59
59
|
return join(repoRoot, targetFileFromRepoRoot);
|
|
60
60
|
}
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdGVzdGluZy9maWxlcy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDN0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRTlDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNuRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1RCwyRkFBMkY7QUFDM0YsTUFBTSxVQUFVLGFBQWEsQ0FBQyxzQkFBOEIsRUFBRSxRQUF5QixFQUFFLE1BQWUsS0FBSztJQUMzRyxJQUFJLENBQUMseUJBQXlCLEVBQUUsRUFBRSxDQUFDO1FBQ2pDLE9BQU87SUFDVCxDQUFDO0lBQ0QsTUFBTSxVQUFVLEdBQUcsYUFBYSxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFDekQsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLE9BQU8sUUFBUSxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3BHLGFBQWEsQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDbkMsTUFBTSxNQUFNLEdBQUcsbUJBQW1CLENBQUMseUJBQXlCLENBQUMsQ0FBQztJQUM5RCxNQUFNLENBQUMsc0JBQXNCLFVBQVUsRUFBRSxDQUFDLENBQUM7QUFDN0MsQ0FBQztBQUVELE1BQU0sVUFBVSxZQUFZLENBQUMsUUFBZ0I7SUFDM0MsTUFBTSxVQUFVLEdBQUcsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQzNDLE9BQU8sWUFBWSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ2xDLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxzQkFBOEIsRUFBRSxRQUFnQixFQUFFLEtBQWE7SUFDbEcsSUFBSSxDQUFDLHlCQUF5QixFQUFFLEVBQUUsQ0FBQztRQUNqQyxPQUFPO0lBQ1QsQ0FBQztJQUNELE1BQU0sTUFBTSxHQUFHLG1CQUFtQixDQUFDLHlCQUF5QixDQUFDLENBQUM7SUFDOUQsTUFBTSxVQUFVLEdBQUcsYUFBYSxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFDekQsTUFBTSxRQUFRLEdBQUcsWUFBWSxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUM3RCxNQUFNLEtBQUssR0FBRyxJQUFJLE1BQU0sQ0FBQyxPQUFPLFFBQVEsZUFBZSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQzlELElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDMUIsTUFBTSxJQUFJLEtBQUssQ0FBQyx3QkFBd0IsUUFBUSxpQkFBaUIsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUNqRixDQUFDO0lBRUQsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsT0FBTyxRQUFRLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQztJQUNsRixhQUFhLENBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQzNDLE1BQU0sQ0FBQyx3QkFBd0IsVUFBVSxRQUFRLFFBQVEsT0FBTyxLQUFLLEVBQUUsQ0FBQyxDQUFDO0FBQzNFLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLGlDQUFpQyxDQUFDLFdBQW1CLEVBQUUsS0FBYTtJQUNsRixNQUFNLE1BQU0sR0FBRyxtQkFBbUIsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0lBQzlELE1BQU0sc0JBQXNCLEdBQUcsK0NBQStDLFdBQVcsY0FBYyxDQUFDO0lBQ3hHLE1BQU0sVUFBVSxHQUFHLGFBQWEsQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDO0lBQ3pELGFBQWEsQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDakMsTUFBTSxDQUFDLHdCQUF3QixVQUFVLFFBQVEsV0FBVyxFQUFFLENBQUMsQ0FBQztBQUNsRSxDQUFDO0FBRUQsU0FBUyxhQUFhLENBQUMsc0JBQThCO0lBQ25ELE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQ3JGLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxZQUFZLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDOUMsTUFBTSxJQUFJLEtBQUssQ0FBQyx1Q0FBdUMsUUFBUSxHQUFHLENBQUMsQ0FBQztJQUN0RSxDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUMsUUFBUSxFQUFFLHNCQUFzQixDQUFDLENBQUM7QUFDaEQsQ0FBQyJ9
|
package/dest/timer/timeout.js
CHANGED
|
@@ -25,7 +25,7 @@ export class TimeoutTask {
|
|
|
25
25
|
* @throws An error with a message indicating the function was interrupted due to exceeding the specified timeout.
|
|
26
26
|
*/
|
|
27
27
|
async exec() {
|
|
28
|
-
const interruptTimeout =
|
|
28
|
+
const interruptTimeout = setTimeout(this.interrupt, this.timeout);
|
|
29
29
|
try {
|
|
30
30
|
const start = Date.now();
|
|
31
31
|
const result = await Promise.race([this.fn(), this.interruptPromise]);
|
|
@@ -63,4 +63,4 @@ export async function executeTimeout(fn, timeout, errorOrFnName) {
|
|
|
63
63
|
const task = new TimeoutTask(fn, timeout, errorFn);
|
|
64
64
|
return await task.exec();
|
|
65
65
|
}
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZW91dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90aW1lci90aW1lb3V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVqRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLE9BQU8sV0FBVztJQUt0QixZQUFvQixFQUFvQixFQUFVLE9BQWUsRUFBRSxPQUFrQjtRQUFqRSxPQUFFLEdBQUYsRUFBRSxDQUFrQjtRQUFVLFlBQU8sR0FBUCxPQUFPLENBQVE7UUFIekQsY0FBUyxHQUFHLEdBQUcsRUFBRSxHQUFFLENBQUMsQ0FBQztRQUNyQixjQUFTLEdBQUcsQ0FBQyxDQUFDO1FBR3BCLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLE9BQU8sQ0FBSSxDQUFDLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRTtZQUNuRCxJQUFJLENBQUMsU0FBUyxHQUFHLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQzNDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOzs7Ozs7O09BT0c7SUFDSSxLQUFLLENBQUMsSUFBSTtRQUNmLE1BQU0sZ0JBQWdCLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQztZQUNILE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUN6QixNQUFNLE1BQU0sR0FBRyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztZQUN6RSxJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLENBQUM7WUFDcEMsT0FBTyxNQUFNLENBQUM7UUFDaEIsQ0FBQztnQkFBUyxDQUFDO1lBQ1QsWUFBWSxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDakMsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSSxtQkFBbUI7UUFDeEIsT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUM7SUFDL0IsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksT0FBTztRQUNaLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQztJQUN4QixDQUFDO0NBQ0Y7QUFFRCxNQUFNLENBQUMsS0FBSyxVQUFVLGNBQWMsQ0FBSSxFQUFvQixFQUFFLE9BQWUsRUFBRSxhQUFvQztJQUNqSCxNQUFNLE9BQU8sR0FDWCxPQUFPLGFBQWEsS0FBSyxVQUFVO1FBQ2pDLENBQUMsQ0FBQyxhQUFhO1FBQ2YsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksWUFBWSxDQUFDLG1CQUFtQixhQUFhLElBQUksVUFBVSxVQUFVLE9BQU8sS0FBSyxDQUFDLENBQUM7SUFDbkcsTUFBTSxJQUFJLEdBQUcsSUFBSSxXQUFXLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNuRCxPQUFPLE1BQU0sSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO0FBQzNCLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/foundation",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.72.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dest/index.js",
|
|
6
6
|
"types": "./dest/index.d.ts",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
]
|
|
103
103
|
},
|
|
104
104
|
"dependencies": {
|
|
105
|
-
"@aztec/bb.js": "0.
|
|
105
|
+
"@aztec/bb.js": "0.72.1",
|
|
106
106
|
"@koa/cors": "^5.0.0",
|
|
107
107
|
"@noble/curves": "^1.2.0",
|
|
108
108
|
"bn.js": "^5.2.1",
|
|
@@ -160,7 +160,7 @@
|
|
|
160
160
|
"supertest": "^6.3.3",
|
|
161
161
|
"ts-node": "^10.9.1",
|
|
162
162
|
"typescript": "^5.0.4",
|
|
163
|
-
"viem": "
|
|
163
|
+
"viem": "2.22.8"
|
|
164
164
|
},
|
|
165
165
|
"files": [
|
|
166
166
|
"dest",
|
package/src/abi/decoder.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { AztecAddress } from '../aztec-address/index.js';
|
|
2
|
-
import {
|
|
2
|
+
import { Fr } from '../fields/index.js';
|
|
3
3
|
import { type ABIParameter, type ABIVariable, type AbiType } from './abi.js';
|
|
4
|
-
import {
|
|
4
|
+
import { U128 } from './u128.js';
|
|
5
|
+
import { isAztecAddressStruct, isU128Struct, parseSignedInt } from './utils.js';
|
|
5
6
|
|
|
6
7
|
/**
|
|
7
8
|
* The type of our decoded ABI.
|
|
@@ -43,6 +44,14 @@ class AbiDecoder {
|
|
|
43
44
|
return array;
|
|
44
45
|
}
|
|
45
46
|
case 'struct': {
|
|
47
|
+
if (isU128Struct(abiType)) {
|
|
48
|
+
const fields = [
|
|
49
|
+
new Fr(this.decodeNext({ kind: 'field' }) as bigint),
|
|
50
|
+
new Fr(this.decodeNext({ kind: 'field' }) as bigint),
|
|
51
|
+
];
|
|
52
|
+
return U128.fromFields(fields).toInteger();
|
|
53
|
+
}
|
|
54
|
+
|
|
46
55
|
const struct: { [key: string]: AbiDecoded } = {};
|
|
47
56
|
if (isAztecAddressStruct(abiType)) {
|
|
48
57
|
return new AztecAddress(this.getNextField().toBuffer());
|
package/src/abi/encoder.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Fr } from '../fields/index.js';
|
|
2
2
|
import { type AbiType, type FunctionAbi } from './abi.js';
|
|
3
|
-
import {
|
|
3
|
+
import { U128 } from './u128.js';
|
|
4
|
+
import { isAddressStruct, isFunctionSelectorStruct, isU128Struct, isWrappedFieldStruct } from './utils.js';
|
|
4
5
|
|
|
5
6
|
/**
|
|
6
7
|
* Encodes arguments for a function call.
|
|
@@ -105,6 +106,15 @@ class ArgumentEncoder {
|
|
|
105
106
|
this.encodeArgument({ kind: 'integer', sign: 'unsigned', width: 32 }, arg.value ?? arg, `${name}.inner`);
|
|
106
107
|
break;
|
|
107
108
|
}
|
|
109
|
+
if (isU128Struct(abiType)) {
|
|
110
|
+
// U128 struct has low and high limbs - so we first convert the value to the 2 limbs and then we encode them
|
|
111
|
+
const value = new U128(arg);
|
|
112
|
+
const limbs = value.toFields();
|
|
113
|
+
const limbNames = U128.getLimbNames();
|
|
114
|
+
this.encodeArgument({ kind: 'field' }, limbs[0], `${name}.${limbNames[0]}`);
|
|
115
|
+
this.encodeArgument({ kind: 'field' }, limbs[1], `${name}.${limbNames[1]}`);
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
108
118
|
if (isWrappedFieldStruct(abiType)) {
|
|
109
119
|
this.encodeArgument({ kind: 'field' }, arg.inner ?? arg, `${name}.inner`);
|
|
110
120
|
break;
|
|
@@ -53,11 +53,10 @@ export class EventSelector extends Selector {
|
|
|
53
53
|
|
|
54
54
|
/**
|
|
55
55
|
* Create a Selector instance from a hex-encoded string.
|
|
56
|
-
* The input 'address' should be prefixed with '0x' or not, and have exactly 64 hex characters.
|
|
57
|
-
* Throws an error if the input length is invalid or address value is out of range.
|
|
58
56
|
*
|
|
59
57
|
* @param selector - The hex-encoded string representing the Selector.
|
|
60
58
|
* @returns An Selector instance.
|
|
59
|
+
* @throws If the selector length is invalid.
|
|
61
60
|
*/
|
|
62
61
|
static fromString(selector: string) {
|
|
63
62
|
const buf = fromHex(selector);
|
|
@@ -82,11 +82,10 @@ export class FunctionSelector extends Selector {
|
|
|
82
82
|
|
|
83
83
|
/**
|
|
84
84
|
* Create a Selector instance from a hex-encoded string.
|
|
85
|
-
* The input 'address' should be prefixed with '0x' or not, and have exactly 64 hex characters.
|
|
86
|
-
* Throws an error if the input length is invalid or address value is out of range.
|
|
87
85
|
*
|
|
88
86
|
* @param selector - The hex-encoded string representing the Selector.
|
|
89
87
|
* @returns An Selector instance.
|
|
88
|
+
* @throws If the selector length is invalid.
|
|
90
89
|
*/
|
|
91
90
|
static fromString(selector: string) {
|
|
92
91
|
const buf = fromHex(selector);
|
package/src/abi/index.ts
CHANGED
package/src/abi/u128.ts
ADDED
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { Fr } from '../fields/fields.js';
|
|
2
|
+
|
|
3
|
+
// A typescript version of noir::std::U128
|
|
4
|
+
export class U128 {
|
|
5
|
+
private readonly value: bigint;
|
|
6
|
+
|
|
7
|
+
constructor(value: bigint | number) {
|
|
8
|
+
if (typeof value === 'number') {
|
|
9
|
+
value = BigInt(value);
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
// Check value is within 128 bits
|
|
13
|
+
if (value < 0n || value >= 2n ** 128n) {
|
|
14
|
+
throw new Error(`Value ${value} is not within 128 bits and hence cannot be converted to U128.`);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
this.value = value;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
static fromU64sLE(lo: bigint, hi: bigint): U128 {
|
|
21
|
+
// Validate limbs are within valid ranges
|
|
22
|
+
if (lo < 0n || lo >= 2n ** 64n) {
|
|
23
|
+
throw new Error(`Lower limb ${lo} is not within valid range (0 to 2^64-1)`);
|
|
24
|
+
}
|
|
25
|
+
if (hi < 0n || hi >= 2n ** 64n) {
|
|
26
|
+
throw new Error(`Higher limb ${hi} is not within valid range (0 to 2^64-1)`);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
// Combine limbs into full value and create new instance
|
|
30
|
+
const value = (hi << 64n) | lo;
|
|
31
|
+
return new U128(value);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
get lo(): bigint {
|
|
35
|
+
return this.value & 0xffffffffffffffffn;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
get hi(): bigint {
|
|
39
|
+
return this.value >> 64n;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
toInteger(): bigint {
|
|
43
|
+
return this.value;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
// We use little-endian ordering to match the order in which U128 defines its limbs.
|
|
47
|
+
// This is necessary because of how Noir handles serialization:
|
|
48
|
+
// - When calling a contract function from TypeScript, the serialization below gets used and then Noir
|
|
49
|
+
// deserializes using its intrinsic serialization logic (based on the limb order in the struct).
|
|
50
|
+
// - When calling a contract function from another function, the `serialize` method is invoked
|
|
51
|
+
// on the type first.
|
|
52
|
+
// For this reason if we didn't use the ordering of U128 limbs here and in the implementation of Serialize
|
|
53
|
+
// trait for U128 we would get an arguments hash mismatch.
|
|
54
|
+
toFields(): Fr[] {
|
|
55
|
+
return [new Fr(this.lo), new Fr(this.hi)];
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
// Has to follow ordering of `toFields()`
|
|
59
|
+
static fromFields(fields: Fr[]): U128 {
|
|
60
|
+
if (fields.length !== 2) {
|
|
61
|
+
throw new Error(`Expected 2 fields for U128, got ${fields.length}`);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
return U128.fromU64sLE(fields[0].toBigInt(), fields[1].toBigInt());
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
// Has to follow ordering of `toFields()`
|
|
68
|
+
static getLimbNames(): string[] {
|
|
69
|
+
return ['lo', 'hi'];
|
|
70
|
+
}
|
|
71
|
+
}
|
package/src/abi/utils.ts
CHANGED
|
@@ -36,6 +36,14 @@ export function isFunctionSelectorStruct(abiType: AbiType) {
|
|
|
36
36
|
return abiType.kind === 'struct' && abiType.path.endsWith('types::abis::function_selector::FunctionSelector');
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
+
/**
|
|
40
|
+
* Returns whether the ABI type is the U128 defined in noir::std.
|
|
41
|
+
* @param abiType - Type to check.
|
|
42
|
+
*/
|
|
43
|
+
export function isU128Struct(abiType: AbiType) {
|
|
44
|
+
return abiType.kind === 'struct' && abiType.path.endsWith('U128');
|
|
45
|
+
}
|
|
46
|
+
|
|
39
47
|
/**
|
|
40
48
|
* Returns whether the ABI type is a struct with a single `inner` field.
|
|
41
49
|
* @param abiType - Type to check.
|
package/src/array/array.ts
CHANGED
|
@@ -27,6 +27,21 @@ export function makeTuple<T, N extends number>(length: N, fn: (i: number) => T,
|
|
|
27
27
|
return Array.from({ length }, (_: any, i: number) => fn(i + offset)) as Tuple<T, N>;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
+
/**
|
|
31
|
+
* Create an array over an integer range, filled with a function 'fn'.
|
|
32
|
+
* This is used over e.g. lodash because it resolved to a tuple type, needed for our fixed array type safety.
|
|
33
|
+
* @param n - The number of integers.
|
|
34
|
+
* @param fn - The generator function.
|
|
35
|
+
* @returns The array of numbers.
|
|
36
|
+
*/
|
|
37
|
+
export async function makeTupleAsync<T, N extends number>(length: N, fn: (i: number) => Promise<T>, offset = 0) {
|
|
38
|
+
return (await Promise.all(
|
|
39
|
+
Array(length)
|
|
40
|
+
.fill(0)
|
|
41
|
+
.map(async (_: any, i: number) => await fn(i + offset)),
|
|
42
|
+
)) as Tuple<T, N>;
|
|
43
|
+
}
|
|
44
|
+
|
|
30
45
|
/**
|
|
31
46
|
* Create an array over an integer range, filled with a function 'fn'. However, the latter half of the array are set to zeros.
|
|
32
47
|
* see `makeTuple` above.
|
|
@@ -75,11 +75,11 @@ export class AztecAddress {
|
|
|
75
75
|
/**
|
|
76
76
|
* @returns a random valid address (i.e. one that can be encrypted to).
|
|
77
77
|
*/
|
|
78
|
-
static random() {
|
|
78
|
+
static async random() {
|
|
79
79
|
// About half of random field elements result in invalid addresses, so we loop until we get a valid one.
|
|
80
80
|
while (true) {
|
|
81
81
|
const candidate = new AztecAddress(Fr.random());
|
|
82
|
-
if (candidate.isValid()) {
|
|
82
|
+
if (await candidate.isValid()) {
|
|
83
83
|
return candidate;
|
|
84
84
|
}
|
|
85
85
|
}
|
|
@@ -100,20 +100,20 @@ export class AztecAddress {
|
|
|
100
100
|
/**
|
|
101
101
|
* @returns true if the address is valid. Invalid addresses cannot receive encrypted messages.
|
|
102
102
|
*/
|
|
103
|
-
isValid() {
|
|
103
|
+
async isValid() {
|
|
104
104
|
// An address is a field value (Fr), which for some purposes is assumed to be the x coordinate of a point in the
|
|
105
105
|
// Grumpkin curve (notably in order to encrypt to it). An address that is not the x coordinate of such a point is
|
|
106
106
|
// called an 'invalid' address.
|
|
107
107
|
//
|
|
108
108
|
// For Grumpkin, y^2 = x^3 − 17 . There exist values x ∈ Fr for which no y satisfies this equation. This means that
|
|
109
109
|
// given such an x and t = x^3 − 17, then sqrt(t) does not exist in Fr.
|
|
110
|
-
return Point.YFromX(this.xCoord) !== null;
|
|
110
|
+
return (await Point.YFromX(this.xCoord)) !== null;
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
/**
|
|
114
114
|
* @returns the Point from which the address is derived. Throws if the address is invalid.
|
|
115
115
|
*/
|
|
116
|
-
toAddressPoint() {
|
|
116
|
+
toAddressPoint(): Promise<Point> {
|
|
117
117
|
return Point.fromXAndSign(this.xCoord, true);
|
|
118
118
|
}
|
|
119
119
|
|
package/src/collection/array.ts
CHANGED
|
@@ -89,6 +89,21 @@ export async function timesAsync<T>(n: number, fn: (i: number) => Promise<T>): P
|
|
|
89
89
|
return results;
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
+
/**
|
|
93
|
+
* Executes the given async function n times in parallel and returns the results in an array.
|
|
94
|
+
* @param n - How many times to repeat.
|
|
95
|
+
* @param fn - Mapper from index to value.
|
|
96
|
+
* @returns The array with the result from all executions.
|
|
97
|
+
*/
|
|
98
|
+
export async function timesParallel<T>(n: number, fn: (i: number) => Promise<T>): Promise<T[]> {
|
|
99
|
+
const results: T[] = await Promise.all(
|
|
100
|
+
Array(n)
|
|
101
|
+
.fill(0)
|
|
102
|
+
.map((_, i) => fn(i)),
|
|
103
|
+
);
|
|
104
|
+
return results;
|
|
105
|
+
}
|
|
106
|
+
|
|
92
107
|
/**
|
|
93
108
|
* Returns the serialized size of all non-empty items in an array.
|
|
94
109
|
* @param arr - Array
|
package/src/config/env_var.ts
CHANGED
|
@@ -42,7 +42,6 @@ export type EnvVar =
|
|
|
42
42
|
| 'DEBUG'
|
|
43
43
|
| 'DEPLOY_AZTEC_CONTRACTS_SALT'
|
|
44
44
|
| 'DEPLOY_AZTEC_CONTRACTS'
|
|
45
|
-
| 'ENABLE_GAS'
|
|
46
45
|
| 'ENFORCE_FEES'
|
|
47
46
|
| 'ETHEREUM_HOST'
|
|
48
47
|
| 'FEE_JUICE_CONTRACT_ADDRESS'
|
|
@@ -70,6 +69,7 @@ export type EnvVar =
|
|
|
70
69
|
| 'OTEL_EXPORTER_OTLP_LOGS_ENDPOINT'
|
|
71
70
|
| 'OTEL_SERVICE_NAME'
|
|
72
71
|
| 'OTEL_COLLECT_INTERVAL_MS'
|
|
72
|
+
| 'OTEL_EXCLUDE_METRICS'
|
|
73
73
|
| 'OTEL_EXPORT_TIMEOUT_MS'
|
|
74
74
|
| 'OUTBOX_CONTRACT_ADDRESS'
|
|
75
75
|
| 'P2P_BLOCK_CHECK_INTERVAL_MS'
|
package/src/fields/fields.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BarretenbergLazy } from '@aztec/bb.js';
|
|
2
2
|
|
|
3
3
|
import { inspect } from 'util';
|
|
4
4
|
|
|
@@ -99,6 +99,10 @@ abstract class BaseField {
|
|
|
99
99
|
return Boolean(this.toBigInt());
|
|
100
100
|
}
|
|
101
101
|
|
|
102
|
+
/**
|
|
103
|
+
* Converts this field to a number.
|
|
104
|
+
* Throws if the underlying value is greater than MAX_SAFE_INTEGER.
|
|
105
|
+
*/
|
|
102
106
|
toNumber(): number {
|
|
103
107
|
const value = this.toBigInt();
|
|
104
108
|
if (value > Number.MAX_SAFE_INTEGER) {
|
|
@@ -107,6 +111,15 @@ abstract class BaseField {
|
|
|
107
111
|
return Number(value);
|
|
108
112
|
}
|
|
109
113
|
|
|
114
|
+
/**
|
|
115
|
+
* Converts this field to a number.
|
|
116
|
+
* May cause loss of precision if the underlying value is greater than MAX_SAFE_INTEGER.
|
|
117
|
+
*/
|
|
118
|
+
toNumberUnsafe(): number {
|
|
119
|
+
const value = this.toBigInt();
|
|
120
|
+
return Number(value);
|
|
121
|
+
}
|
|
122
|
+
|
|
110
123
|
toShortString(): string {
|
|
111
124
|
const str = this.toString();
|
|
112
125
|
return `${str.slice(0, 10)}...${str.slice(-4)}`;
|
|
@@ -305,19 +318,15 @@ export class Fr extends BaseField {
|
|
|
305
318
|
* Computes a square root of the field element.
|
|
306
319
|
* @returns A square root of the field element (null if it does not exist).
|
|
307
320
|
*/
|
|
308
|
-
sqrt(): Fr | null {
|
|
309
|
-
const wasm =
|
|
310
|
-
wasm.
|
|
311
|
-
|
|
312
|
-
const isSqrtBuf = Buffer.from(wasm.getMemorySlice(Fr.SIZE_IN_BYTES, Fr.SIZE_IN_BYTES + 1));
|
|
313
|
-
const isSqrt = isSqrtBuf[0] === 1;
|
|
321
|
+
async sqrt(): Promise<Fr | null> {
|
|
322
|
+
const wasm = (await BarretenbergLazy.getSingleton()).getWasm();
|
|
323
|
+
const [buf] = await wasm.callWasmExport('bn254_fr_sqrt', [this.toBuffer()], [Fr.SIZE_IN_BYTES + 1]);
|
|
324
|
+
const isSqrt = buf[0] === 1;
|
|
314
325
|
if (!isSqrt) {
|
|
315
326
|
// Field element is not a quadratic residue mod p so it has no square root.
|
|
316
327
|
return null;
|
|
317
328
|
}
|
|
318
|
-
|
|
319
|
-
const rootBuf = Buffer.from(wasm.getMemorySlice(Fr.SIZE_IN_BYTES + 1, Fr.SIZE_IN_BYTES * 2 + 1));
|
|
320
|
-
return Fr.fromBuffer(rootBuf);
|
|
329
|
+
return new Fr(Buffer.from(buf.slice(1)));
|
|
321
330
|
}
|
|
322
331
|
|
|
323
332
|
toJSON() {
|
package/src/fields/point.ts
CHANGED
|
@@ -50,10 +50,10 @@ export class Point {
|
|
|
50
50
|
*
|
|
51
51
|
* @returns A randomly generated Point instance.
|
|
52
52
|
*/
|
|
53
|
-
static random() {
|
|
53
|
+
static async random() {
|
|
54
54
|
while (true) {
|
|
55
55
|
try {
|
|
56
|
-
return Point.fromXAndSign(Fr.random(), randomBoolean());
|
|
56
|
+
return await Point.fromXAndSign(Fr.random(), randomBoolean());
|
|
57
57
|
} catch (e: any) {
|
|
58
58
|
if (!(e instanceof NotOnCurveError)) {
|
|
59
59
|
throw e;
|
|
@@ -83,7 +83,7 @@ export class Point {
|
|
|
83
83
|
* @param buffer - The buffer containing the x coordinate and the sign of the y coordinate.
|
|
84
84
|
* @returns A Point instance.
|
|
85
85
|
*/
|
|
86
|
-
static fromCompressedBuffer(buffer: Buffer | BufferReader) {
|
|
86
|
+
static fromCompressedBuffer(buffer: Buffer | BufferReader): Promise<Point> {
|
|
87
87
|
const reader = BufferReader.asReader(buffer);
|
|
88
88
|
const value = toBigIntBE(reader.readBytes(Point.COMPRESSED_SIZE_IN_BYTES));
|
|
89
89
|
|
|
@@ -127,8 +127,8 @@ export class Point {
|
|
|
127
127
|
* Instead it is a boolean flag that determines whether the y coordinate is <= (Fr.MODULUS - 1) / 2
|
|
128
128
|
* @returns The point as an array of 2 fields
|
|
129
129
|
*/
|
|
130
|
-
static fromXAndSign(x: Fr, sign: boolean) {
|
|
131
|
-
const y = Point.YFromX(x);
|
|
130
|
+
static async fromXAndSign(x: Fr, sign: boolean) {
|
|
131
|
+
const y = await Point.YFromX(x);
|
|
132
132
|
if (y == null) {
|
|
133
133
|
throw new NotOnCurveError(x);
|
|
134
134
|
}
|
|
@@ -146,7 +146,7 @@ export class Point {
|
|
|
146
146
|
/**
|
|
147
147
|
* @returns
|
|
148
148
|
*/
|
|
149
|
-
static YFromX(x: Fr): Fr | null {
|
|
149
|
+
static YFromX(x: Fr): Promise<Fr | null> {
|
|
150
150
|
// Calculate y^2 = x^3 - 17 (i.e. the Grumpkin curve equation)
|
|
151
151
|
const ySquared = x.square().mul(x).sub(new Fr(17));
|
|
152
152
|
|