@aztec-labs/foundation 6.0.0-rc.1 → 6.0.0-rc.2
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/branded-types/block_number.d.ts +7 -1
- package/dest/branded-types/block_number.d.ts.map +1 -1
- package/dest/branded-types/block_number.js +14 -0
- package/dest/error/index.d.ts +10 -1
- package/dest/error/index.d.ts.map +1 -1
- package/dest/error/index.js +10 -0
- package/dest/queue/base_memory_queue.d.ts +3 -1
- package/dest/queue/base_memory_queue.d.ts.map +1 -1
- package/dest/queue/base_memory_queue.js +3 -0
- package/dest/schemas/utils.d.ts +6 -1
- package/dest/schemas/utils.d.ts.map +1 -1
- package/dest/schemas/utils.js +14 -1
- package/dest/testing/files/index.d.ts +2 -1
- package/dest/testing/files/index.d.ts.map +1 -1
- package/dest/testing/files/index.js +2 -1
- package/package.json +2 -2
- package/src/branded-types/block_number.ts +19 -0
- package/src/error/index.ts +12 -0
- package/src/queue/base_memory_queue.ts +5 -0
- package/src/schemas/utils.ts +14 -1
- package/src/testing/files/index.ts +2 -1
|
@@ -44,6 +44,12 @@ export declare namespace BlockNumber {
|
|
|
44
44
|
export declare namespace BlockNumber {
|
|
45
45
|
var add: (bn: BlockNumber, increment: number) => BlockNumber;
|
|
46
46
|
}
|
|
47
|
+
export declare namespace BlockNumber {
|
|
48
|
+
var diff: (a: BlockNumber, b: BlockNumber) => number;
|
|
49
|
+
}
|
|
50
|
+
export declare namespace BlockNumber {
|
|
51
|
+
var min: (...bns: readonly BlockNumber[]) => BlockNumber;
|
|
52
|
+
}
|
|
47
53
|
export declare namespace BlockNumber {
|
|
48
54
|
var ZERO: BlockNumber;
|
|
49
55
|
}
|
|
@@ -57,4 +63,4 @@ export declare const BlockNumberSchema: z.ZodPipe<z.ZodUnion<readonly [z.ZodNumb
|
|
|
57
63
|
* Accepts numbers, bigints, or strings and coerces them to BlockNumber.
|
|
58
64
|
*/
|
|
59
65
|
export declare const BlockNumberPositiveSchema: z.ZodPipe<z.ZodUnion<readonly [z.ZodNumber, z.ZodPipe<z.ZodBigInt, z.ZodTransform<number, bigint>>, z.ZodPipe<z.ZodString, z.ZodTransform<number, string>>]>, z.ZodTransform<BlockNumber, number>>;
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfbnVtYmVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYnJhbmRlZC10eXBlcy9ibG9ja19udW1iZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLFlBQVksQ0FBQztBQUUxQzs7Ozs7Ozs7Ozs7Ozs7O0dBZUc7QUFDSCxNQUFNLE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsYUFBYSxDQUFDLENBQUM7QUFFekQ7Ozs7O0dBS0c7QUFDSCx3QkFBZ0IsV0FBVyxDQUFDLEtBQUssRUFBRSxNQUFNLEdBQUcsV0FBVyxDQVF0RDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQXNIRDs7O0dBR0c7QUFDSCxlQUFPLE1BQU0saUJBQWlCLG9NQUEyQixDQUFDO0FBRTFEOzs7R0FHRztBQUNILGVBQU8sTUFBTSx5QkFBeUIsb01BQTJCLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_number.d.ts","sourceRoot":"","sources":["../../src/branded-types/block_number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAQtD
|
|
1
|
+
{"version":3,"file":"block_number.d.ts","sourceRoot":"","sources":["../../src/branded-types/block_number.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEzD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAQtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsHD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,oMAA2B,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,yBAAyB,oMAA2B,CAAC"}
|
|
@@ -68,6 +68,20 @@ import { z } from 'zod';
|
|
|
68
68
|
/** Increments a BlockNumber by a given value. */ BlockNumber.add = function(bn, increment) {
|
|
69
69
|
return BlockNumber(bn + increment);
|
|
70
70
|
};
|
|
71
|
+
/** Returnns the difference between two block numbers. */ BlockNumber.diff = function(a, b) {
|
|
72
|
+
const diff = a - b;
|
|
73
|
+
return diff < 0 ? -diff : diff;
|
|
74
|
+
};
|
|
75
|
+
/** Returns the smallest block number out of a list */ BlockNumber.min = function(...bns) {
|
|
76
|
+
let min = bns[0];
|
|
77
|
+
const len = bns.length;
|
|
78
|
+
for(let i = 1; i < len; i++){
|
|
79
|
+
if (bns[i] < min) {
|
|
80
|
+
min = bns[i];
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return min ?? BlockNumber.ZERO;
|
|
84
|
+
};
|
|
71
85
|
/**
|
|
72
86
|
* The zero block value (genesis block).
|
|
73
87
|
*/ BlockNumber.ZERO = BlockNumber(0);
|
package/dest/error/index.d.ts
CHANGED
|
@@ -18,4 +18,13 @@ export declare class TimeoutError extends Error {
|
|
|
18
18
|
export declare class AbortError extends Error {
|
|
19
19
|
readonly name = "AbortError";
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
/**
|
|
22
|
+
* Whether a failure was environmental, and so may be retried: the process behind a call died, its
|
|
23
|
+
* connection broke, or it could not be started.
|
|
24
|
+
*
|
|
25
|
+
* The bare `retry` property is the contract, feature-detected rather than imported, so the same check
|
|
26
|
+
* holds across bb.js, ipc-runtime and ProvingError. An error without it failed for a reason retrying
|
|
27
|
+
* cannot fix.
|
|
28
|
+
*/
|
|
29
|
+
export declare function isRetryableError(err: unknown): boolean;
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lcnJvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7OztHQUlHO0FBQ0gscUJBQWEsY0FBZSxTQUFRLEtBQUs7SUFDdkMsU0FBeUIsSUFBSSxvQkFBb0I7Q0FDbEQ7QUFFRDs7R0FFRztBQUNILHFCQUFhLFlBQWEsU0FBUSxLQUFLO0lBQ3JDLFNBQXlCLElBQUksa0JBQWtCO0NBQ2hEO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxVQUFXLFNBQVEsS0FBSztJQUNuQyxTQUF5QixJQUFJLGdCQUFnQjtDQUM5QztBQUVEOzs7Ozs7O0dBT0c7QUFDSCx3QkFBZ0IsZ0JBQWdCLENBQUMsR0FBRyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBRXREIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/error/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACvC,SAAyB,IAAI,oBAAoB;CAClD;AAED;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACrC,SAAyB,IAAI,kBAAkB;CAChD;AAED;;GAEG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC,SAAyB,IAAI,gBAAgB;CAC9C"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/error/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACvC,SAAyB,IAAI,oBAAoB;CAClD;AAED;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;IACrC,SAAyB,IAAI,kBAAkB;CAChD;AAED;;GAEG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC,SAAyB,IAAI,gBAAgB;CAC9C;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAEtD"}
|
package/dest/error/index.js
CHANGED
|
@@ -15,3 +15,13 @@
|
|
|
15
15
|
*/ export class AbortError extends Error {
|
|
16
16
|
name = 'AbortError';
|
|
17
17
|
}
|
|
18
|
+
/**
|
|
19
|
+
* Whether a failure was environmental, and so may be retried: the process behind a call died, its
|
|
20
|
+
* connection broke, or it could not be started.
|
|
21
|
+
*
|
|
22
|
+
* The bare `retry` property is the contract, feature-detected rather than imported, so the same check
|
|
23
|
+
* holds across bb.js, ipc-runtime and ProvingError. An error without it failed for a reason retrying
|
|
24
|
+
* cannot fix.
|
|
25
|
+
*/ export function isRetryableError(err) {
|
|
26
|
+
return err instanceof Error && 'retry' in err && err.retry === true;
|
|
27
|
+
}
|
|
@@ -39,6 +39,8 @@ export declare abstract class BaseMemoryQueue<T> {
|
|
|
39
39
|
* @returns A boolean indicating whether the item was successfully added to the queue.
|
|
40
40
|
*/
|
|
41
41
|
put(item: T): boolean;
|
|
42
|
+
/** Discards pending items without affecting waiting consumers, active handlers, or the queue's open/closed state. */
|
|
43
|
+
clear(): void;
|
|
42
44
|
/**
|
|
43
45
|
* Once ended, no further items are added to queue. Consumers will consume remaining items within the queue.
|
|
44
46
|
* The queue is not reusable after calling `end()`.
|
|
@@ -62,4 +64,4 @@ export declare abstract class BaseMemoryQueue<T> {
|
|
|
62
64
|
*/
|
|
63
65
|
process(handler: (item: T) => Promise<void> | void): Promise<void>;
|
|
64
66
|
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9tZW1vcnlfcXVldWUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9xdWV1ZS9iYXNlX21lbW9yeV9xdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSw4QkFBc0IsZUFBZSxDQUFDLENBQUM7SUFJekIsT0FBTyxDQUFDLEdBQUc7SUFIdkIsT0FBTyxDQUFDLE9BQU8sQ0FBb0M7SUFDbkQsT0FBTyxDQUFDLFFBQVEsQ0FBUztJQUV6QixZQUFvQixHQUFHLHlDQUF5QyxFQUFJO0lBRXBFLFNBQVMsQ0FBQyxRQUFRLEtBQUssS0FBSyxJQUFJO1FBQzlCLE1BQU0sRUFBRSxNQUFNLENBQUM7UUFDZixHQUFHLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FBQztRQUNyQixHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDbkIsS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0tBQ25CLENBQUM7SUFFRjs7Ozs7T0FLRztJQUNJLE1BQU0sV0FFWjtJQUVEOzs7T0FHRztJQUNJLFlBQVksSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUVuQztJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDSSxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBNkJqRDtJQUVEOzs7O09BSUc7SUFDSSxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsR0FBRyxPQUFPLENBVzNCO0lBRUQscUhBQXFIO0lBQzlHLEtBQUssSUFBSSxJQUFJLENBRW5CO0lBRUQ7Ozs7T0FJRztJQUNJLEdBQUcsU0FHVDtJQUVEOzs7O09BSUc7SUFDSSxNQUFNLFNBSVo7SUFFRDs7Ozs7Ozs7T0FRRztJQUNVLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLGlCQVk5RDtDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base_memory_queue.d.ts","sourceRoot":"","sources":["../../src/queue/base_memory_queue.ts"],"names":[],"mappings":"AAGA,8BAAsB,eAAe,CAAC,CAAC;IAIzB,OAAO,CAAC,GAAG;IAHvB,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,QAAQ,CAAS;IAEzB,YAAoB,GAAG,yCAAyC,EAAI;IAEpE,SAAS,CAAC,QAAQ,KAAK,KAAK,IAAI;QAC9B,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;QACrB,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IAEF;;;;;OAKG;IACI,MAAM,WAEZ;IAED;;;OAGG;IACI,YAAY,IAAI,CAAC,GAAG,SAAS,CAEnC;IAED;;;;;;;;;;OAUG;IACI,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CA6BjD;IAED;;;;OAIG;IACI,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAW3B;IAED;;;;OAIG;IACI,GAAG,SAGT;IAED;;;;OAIG;IACI,MAAM,SAIZ;IAED;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,iBAY9D;CACF"}
|
|
1
|
+
{"version":3,"file":"base_memory_queue.d.ts","sourceRoot":"","sources":["../../src/queue/base_memory_queue.ts"],"names":[],"mappings":"AAGA,8BAAsB,eAAe,CAAC,CAAC;IAIzB,OAAO,CAAC,GAAG;IAHvB,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,QAAQ,CAAS;IAEzB,YAAoB,GAAG,yCAAyC,EAAI;IAEpE,SAAS,CAAC,QAAQ,KAAK,KAAK,IAAI;QAC9B,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC;QACrB,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IAEF;;;;;OAKG;IACI,MAAM,WAEZ;IAED;;;OAGG;IACI,YAAY,IAAI,CAAC,GAAG,SAAS,CAEnC;IAED;;;;;;;;;;OAUG;IACI,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CA6BjD;IAED;;;;OAIG;IACI,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAW3B;IAED,qHAAqH;IAC9G,KAAK,IAAI,IAAI,CAEnB;IAED;;;;OAIG;IACI,GAAG,SAGT;IAED;;;;OAIG;IACI,MAAM,SAIZ;IAED;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,iBAY9D;CACF"}
|
|
@@ -75,6 +75,9 @@ export class BaseMemoryQueue {
|
|
|
75
75
|
return true;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
+
/** Discards pending items without affecting waiting consumers, active handlers, or the queue's open/closed state. */ clear() {
|
|
79
|
+
this.items.clear();
|
|
80
|
+
}
|
|
78
81
|
/**
|
|
79
82
|
* Once ended, no further items are added to queue. Consumers will consume remaining items within the queue.
|
|
80
83
|
* The queue is not reusable after calling `end()`.
|
package/dest/schemas/utils.d.ts
CHANGED
|
@@ -8,6 +8,11 @@ export type ZodNullableOptional<T extends ZodTypeAny> = ZodType<z.output<T> | un
|
|
|
8
8
|
* Declares a parameter as optional. Use this over z.optional in order to accept nulls as undefineds.
|
|
9
9
|
* This is required as JSON does not have an undefined type, and null is used to represent it, so we
|
|
10
10
|
* need to convert nulls to undefineds as we parse.
|
|
11
|
+
*
|
|
12
|
+
* A wrapped `.default(...)` must fire when the field arrives as null, so normalize null and undefined
|
|
13
|
+
* to undefined before the schema runs. A default schema is fed the value directly; wrapping it in
|
|
14
|
+
* `.optional()` would short-circuit undefined past the default. A schema without a default is made
|
|
15
|
+
* optional so a missing value is accepted.
|
|
11
16
|
*/
|
|
12
17
|
export declare function optional<T extends ZodTypeAny>(schema: T): z.ZodPipe<z.ZodOptional<z.ZodNullable<T>>, z.ZodTransform<Awaited<NonNullable<z.TypeOf<T>>> | undefined, z.TypeOf<T> | null | undefined>>;
|
|
13
18
|
type ToJsonIs<T, TRet> = T extends {
|
|
@@ -44,4 +49,4 @@ export declare function setSchema<T>(value: ZodFor<T>): ZodFor<Set<T>>;
|
|
|
44
49
|
/** Given an already parsed and validated object, extracts the keys defined in the given schema. Does not validate again. */
|
|
45
50
|
export declare function pickFromSchema<T extends object, S extends ZodObject<ZodRawShape>>(obj: T, schema: S): Partial<T>;
|
|
46
51
|
export {};
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zY2hlbWFzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBRSxLQUFLLFdBQVcsRUFBRSxLQUFLLE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFJekYsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBRXpDLGVBQU8sTUFBTSxTQUFTLHdEQUFpRixDQUFDO0FBS3hHLDZFQUE2RTtBQUM3RSxlQUFPLE1BQU0sWUFBWSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBaUJ0QyxDQUFDO0FBRUgsTUFBTSxNQUFNLG1CQUFtQixDQUFDLENBQUMsU0FBUyxVQUFVLElBQUksT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsU0FBUyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0FBRXhIOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFnQixRQUFRLENBQUMsQ0FBQyxTQUFTLFVBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQyw2SUFVdkQ7QUFFRCxLQUFLLFFBQVEsQ0FBQyxDQUFDLEVBQUUsSUFBSSxJQUFJLENBQUMsU0FBUztJQUFFLE1BQU0sSUFBSSxJQUFJLENBQUE7Q0FBRSxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7QUFFbEU7Ozs7R0FJRztBQUNILHdCQUFnQixZQUFZLENBQUMsTUFBTSxTQUFTO0lBQUUsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsR0FBRyxDQUFBO0NBQUUsR0FBRztJQUFFLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLEdBQUcsQ0FBQTtDQUFFLEVBQzdHLEtBQUssRUFBRSxNQUFNLEVBQ2IsVUFBVSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLE9BQU8sR0FDdEMsT0FBTyxDQUNSLE1BQU0sU0FBUztJQUFFLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFBO0NBQUUsR0FBRztJQUFFLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFBO0NBQUUsR0FDdEcsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsR0FDM0IsS0FBSyxFQUNULE1BQU0sQ0FDUCxDQU1BO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixlQUFlLENBQUMsTUFBTSxTQUFTO0lBQUUsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsR0FBRyxDQUFBO0NBQUUsRUFDN0UsS0FBSyxFQUFFLE1BQU0sRUFDYixVQUFVLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssT0FBTyxHQUNwQyxPQUFPLENBQUMsTUFBTSxTQUFTO0lBQUUsVUFBVSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsTUFBTSxTQUFTLENBQUE7Q0FBRSxHQUFHLFFBQVEsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLEdBQUcsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUVwSDtBQUVELCtGQUErRjtBQUMvRix3QkFBZ0IsU0FBUyxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBRTNHO0FBRUQsK0ZBQStGO0FBQy9GLHdCQUFnQixTQUFTLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUU3RDtBQUVELDRIQUE0SDtBQUM1SCx3QkFBZ0IsY0FBYyxDQUFDLENBQUMsU0FBUyxNQUFNLEVBQUUsQ0FBQyxTQUFTLFNBQVMsQ0FBQyxXQUFXLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDLGNBRW5HIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/schemas/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAO,MAAM,SAAS,wDAAiF,CAAC;AAKxG,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAiBtC,CAAC;AAEH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAExH
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/schemas/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,eAAO,MAAM,SAAS,wDAAiF,CAAC;AAKxG,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAiBtC,CAAC;AAEH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAExH;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,UAAU,EAAE,MAAM,EAAE,CAAC,6IAUvD;AAED,KAAK,QAAQ,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,SAAS;IAAE,MAAM,IAAI,IAAI,CAAA;CAAE,GAAG,CAAC,GAAG,KAAK,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7G,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,GACtC,OAAO,CACR,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GAAG;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GACtG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAC3B,KAAK,EACT,MAAM,CACP,CAMA;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7E,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GACpC,OAAO,CAAC,MAAM,SAAS;IAAE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,SAAS,CAAA;CAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,CAAC,CAEpH;AAED,+FAA+F;AAC/F,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAE3G;AAED,+FAA+F;AAC/F,wBAAgB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAE7D;AAED,4HAA4H;AAC5H,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,SAAS,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,cAEnG"}
|
package/dest/schemas/utils.js
CHANGED
|
@@ -21,8 +21,21 @@ const base64Regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}
|
|
|
21
21
|
* Declares a parameter as optional. Use this over z.optional in order to accept nulls as undefineds.
|
|
22
22
|
* This is required as JSON does not have an undefined type, and null is used to represent it, so we
|
|
23
23
|
* need to convert nulls to undefineds as we parse.
|
|
24
|
+
*
|
|
25
|
+
* A wrapped `.default(...)` must fire when the field arrives as null, so normalize null and undefined
|
|
26
|
+
* to undefined before the schema runs. A default schema is fed the value directly; wrapping it in
|
|
27
|
+
* `.optional()` would short-circuit undefined past the default. A schema without a default is made
|
|
28
|
+
* optional so a missing value is accepted.
|
|
24
29
|
*/ export function optional(schema) {
|
|
25
|
-
|
|
30
|
+
// Both null and undefined mean "absent" and normalize to undefined. JSON has no undefined, so a
|
|
31
|
+
// skipped argument arrives as null, and a wrapped `.default(...)` must still fire on it. `.nullish()`
|
|
32
|
+
// short-circuits null before a wrapped default, so a default schema is fed the normalized value
|
|
33
|
+
// directly; the cast keeps the same caller-facing type as the plain optional case.
|
|
34
|
+
const asOptional = schema.nullish().transform((value)=>value ?? undefined);
|
|
35
|
+
if (schema instanceof z.ZodDefault) {
|
|
36
|
+
return z.preprocess((value)=>value ?? undefined, schema);
|
|
37
|
+
}
|
|
38
|
+
return asOptional;
|
|
26
39
|
}
|
|
27
40
|
/**
|
|
28
41
|
* Creates a schema that accepts a hex string and uses it to hydrate an instance.
|
|
@@ -3,6 +3,7 @@ export declare function writeTestData(targetFileFromRepoRoot: string, contents:
|
|
|
3
3
|
export declare function readTestData(repoPath: string): Buffer;
|
|
4
4
|
/**
|
|
5
5
|
* Looks for a variable assignment in the target file and updates the value, only if test data generation is enabled.
|
|
6
|
+
* Matches noir `let` and `pub global` declarations and Solidity `constant` declarations.
|
|
6
7
|
* Note that a magic inline comment would be a cleaner approach, like `/* TEST-DATA-START *\/` and `/* TEST-DATA-END *\/`,
|
|
7
8
|
* but running nargo fmt on it panics since the comment would be erased, so we roll with this for now.
|
|
8
9
|
* @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set
|
|
@@ -36,4 +37,4 @@ export declare function getPathToFile(targetFileFromRepoRoot: string): string;
|
|
|
36
37
|
* means writing one directory above this repository's root.
|
|
37
38
|
*/
|
|
38
39
|
export declare function getPathToFndFile(targetFileFromFndRoot: string): string;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZXN0aW5nL2ZpbGVzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLDJGQUEyRjtBQUMzRix3QkFBZ0IsYUFBYSxDQUFDLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxHQUFHLEdBQUUsT0FBZSxRQVM1RztBQUVELHdCQUFnQixZQUFZLENBQUMsUUFBUSxFQUFFLE1BQU0sR0FBRyxNQUFNLENBR3JEO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLHNCQUFzQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLFFBS25HO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQix1QkFBdUIsQ0FBQyxxQkFBcUIsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxRQUtyRztBQW1CRDs7Ozs7O0dBTUc7QUFDSCx3QkFBZ0IsaUNBQWlDLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxRQU1uRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLFFBQVEsRUFBRSxNQUFNLFVBRWhEO0FBRUQsd0JBQWdCLGFBQWEsQ0FBQyxzQkFBc0IsRUFBRSxNQUFNLFVBTzNEO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFnQixnQkFBZ0IsQ0FBQyxxQkFBcUIsRUFBRSxNQUFNLFVBVzdEIn0=
|
|
@@ -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,EAAE,GAAG,GAAE,OAAe,QAS5G;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED
|
|
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;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAKnG;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,qBAAqB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAKrG;AAmBD;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAMnF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,UAEhD;AAED,wBAAgB,aAAa,CAAC,sBAAsB,EAAE,MAAM,UAO3D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,qBAAqB,EAAE,MAAM,UAW7D"}
|
|
@@ -19,6 +19,7 @@ export function readTestData(repoPath) {
|
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
21
21
|
* Looks for a variable assignment in the target file and updates the value, only if test data generation is enabled.
|
|
22
|
+
* Matches noir `let` and `pub global` declarations and Solidity `constant` declarations.
|
|
22
23
|
* Note that a magic inline comment would be a cleaner approach, like `/* TEST-DATA-START *\/` and `/* TEST-DATA-END *\/`,
|
|
23
24
|
* but running nargo fmt on it panics since the comment would be erased, so we roll with this for now.
|
|
24
25
|
* @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set
|
|
@@ -41,7 +42,7 @@ export function readTestData(repoPath) {
|
|
|
41
42
|
function updateInlineTestDataAt(targetFile, itemName, value) {
|
|
42
43
|
const logger = createConsoleLogger('aztec:testing:test_data');
|
|
43
44
|
const contents = readFileSync(targetFile, 'utf8').toString();
|
|
44
|
-
const regex = new RegExp(`(let|pub\\s+global)\\s+${itemName}(\\s*:\\s*[^=]+)?\\s*=\\s*([\\s\\S]*?);`, 'g');
|
|
45
|
+
const regex = new RegExp(`(let|pub\\s+global|constant)\\s+${itemName}(\\s*:\\s*[^=]+)?\\s*=\\s*([\\s\\S]*?);`, 'g');
|
|
45
46
|
if (!regex.exec(contents)) {
|
|
46
47
|
throw new Error(`Test data marker for ${itemName} not found in ${targetFile}`);
|
|
47
48
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/foundation",
|
|
3
|
-
"version": "6.0.0-rc.
|
|
3
|
+
"version": "6.0.0-rc.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dest/index.js",
|
|
6
6
|
"types": "./dest/index.d.ts",
|
|
@@ -146,7 +146,7 @@
|
|
|
146
146
|
"testEnvironment": "../../foundation/src/jest/env.mjs"
|
|
147
147
|
},
|
|
148
148
|
"dependencies": {
|
|
149
|
-
"@aztec-foundation/bb.js": "6.0.0-rc.
|
|
149
|
+
"@aztec-foundation/bb.js": "6.0.0-rc.5",
|
|
150
150
|
"@koa/cors": "^5.0.0",
|
|
151
151
|
"@noble/curves": "=1.7.0",
|
|
152
152
|
"@noble/hashes": "^1.6.1",
|
|
@@ -105,6 +105,25 @@ BlockNumber.add = function (bn: BlockNumber, increment: number): BlockNumber {
|
|
|
105
105
|
return BlockNumber(bn + increment);
|
|
106
106
|
};
|
|
107
107
|
|
|
108
|
+
/** Returnns the difference between two block numbers. */
|
|
109
|
+
BlockNumber.diff = function (a: BlockNumber, b: BlockNumber): number {
|
|
110
|
+
const diff = a - b;
|
|
111
|
+
return diff < 0 ? -diff : diff;
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
/** Returns the smallest block number out of a list */
|
|
115
|
+
BlockNumber.min = function (...bns: readonly BlockNumber[]): BlockNumber {
|
|
116
|
+
let min = bns[0];
|
|
117
|
+
const len = bns.length;
|
|
118
|
+
for (let i = 1; i < len; i++) {
|
|
119
|
+
if (bns[i] < min) {
|
|
120
|
+
min = bns[i];
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
return min ?? BlockNumber.ZERO;
|
|
125
|
+
};
|
|
126
|
+
|
|
108
127
|
/**
|
|
109
128
|
* The zero block value (genesis block).
|
|
110
129
|
*/
|
package/src/error/index.ts
CHANGED
|
@@ -20,3 +20,15 @@ export class TimeoutError extends Error {
|
|
|
20
20
|
export class AbortError extends Error {
|
|
21
21
|
public override readonly name = 'AbortError';
|
|
22
22
|
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Whether a failure was environmental, and so may be retried: the process behind a call died, its
|
|
26
|
+
* connection broke, or it could not be started.
|
|
27
|
+
*
|
|
28
|
+
* The bare `retry` property is the contract, feature-detected rather than imported, so the same check
|
|
29
|
+
* holds across bb.js, ipc-runtime and ProvingError. An error without it failed for a reason retrying
|
|
30
|
+
* cannot fix.
|
|
31
|
+
*/
|
|
32
|
+
export function isRetryableError(err: unknown): boolean {
|
|
33
|
+
return err instanceof Error && 'retry' in err && err.retry === true;
|
|
34
|
+
}
|
|
@@ -92,6 +92,11 @@ export abstract class BaseMemoryQueue<T> {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
|
|
95
|
+
/** Discards pending items without affecting waiting consumers, active handlers, or the queue's open/closed state. */
|
|
96
|
+
public clear(): void {
|
|
97
|
+
this.items.clear();
|
|
98
|
+
}
|
|
99
|
+
|
|
95
100
|
/**
|
|
96
101
|
* Once ended, no further items are added to queue. Consumers will consume remaining items within the queue.
|
|
97
102
|
* The queue is not reusable after calling `end()`.
|
package/src/schemas/utils.ts
CHANGED
|
@@ -35,9 +35,22 @@ export type ZodNullableOptional<T extends ZodTypeAny> = ZodType<z.output<T> | un
|
|
|
35
35
|
* Declares a parameter as optional. Use this over z.optional in order to accept nulls as undefineds.
|
|
36
36
|
* This is required as JSON does not have an undefined type, and null is used to represent it, so we
|
|
37
37
|
* need to convert nulls to undefineds as we parse.
|
|
38
|
+
*
|
|
39
|
+
* A wrapped `.default(...)` must fire when the field arrives as null, so normalize null and undefined
|
|
40
|
+
* to undefined before the schema runs. A default schema is fed the value directly; wrapping it in
|
|
41
|
+
* `.optional()` would short-circuit undefined past the default. A schema without a default is made
|
|
42
|
+
* optional so a missing value is accepted.
|
|
38
43
|
*/
|
|
39
44
|
export function optional<T extends ZodTypeAny>(schema: T) {
|
|
40
|
-
|
|
45
|
+
// Both null and undefined mean "absent" and normalize to undefined. JSON has no undefined, so a
|
|
46
|
+
// skipped argument arrives as null, and a wrapped `.default(...)` must still fire on it. `.nullish()`
|
|
47
|
+
// short-circuits null before a wrapped default, so a default schema is fed the normalized value
|
|
48
|
+
// directly; the cast keeps the same caller-facing type as the plain optional case.
|
|
49
|
+
const asOptional = schema.nullish().transform(value => value ?? undefined);
|
|
50
|
+
if (schema instanceof z.ZodDefault) {
|
|
51
|
+
return z.preprocess(value => value ?? undefined, schema) as unknown as typeof asOptional;
|
|
52
|
+
}
|
|
53
|
+
return asOptional;
|
|
41
54
|
}
|
|
42
55
|
|
|
43
56
|
type ToJsonIs<T, TRet> = T extends { toJSON(): TRet } ? T : never;
|
|
@@ -24,6 +24,7 @@ export function readTestData(repoPath: string): Buffer {
|
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
* Looks for a variable assignment in the target file and updates the value, only if test data generation is enabled.
|
|
27
|
+
* Matches noir `let` and `pub global` declarations and Solidity `constant` declarations.
|
|
27
28
|
* Note that a magic inline comment would be a cleaner approach, like `/* TEST-DATA-START *\/` and `/* TEST-DATA-END *\/`,
|
|
28
29
|
* but running nargo fmt on it panics since the comment would be erased, so we roll with this for now.
|
|
29
30
|
* @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set
|
|
@@ -50,7 +51,7 @@ export function updateInlineFndTestData(targetFileFromFndRoot: string, itemName:
|
|
|
50
51
|
function updateInlineTestDataAt(targetFile: string, itemName: string, value: string) {
|
|
51
52
|
const logger = createConsoleLogger('aztec:testing:test_data');
|
|
52
53
|
const contents = readFileSync(targetFile, 'utf8').toString();
|
|
53
|
-
const regex = new RegExp(`(let|pub\\s+global)\\s+${itemName}(\\s*:\\s*[^=]+)?\\s*=\\s*([\\s\\S]*?);`, 'g');
|
|
54
|
+
const regex = new RegExp(`(let|pub\\s+global|constant)\\s+${itemName}(\\s*:\\s*[^=]+)?\\s*=\\s*([\\s\\S]*?);`, 'g');
|
|
54
55
|
if (!regex.exec(contents)) {
|
|
55
56
|
throw new Error(`Test data marker for ${itemName} not found in ${targetFile}`);
|
|
56
57
|
}
|