@aztec/foundation 0.0.1-commit.d3ec352c → 0.0.1-commit.e61ad554
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/array/index.d.ts +2 -1
- package/dest/array/index.d.ts.map +1 -1
- package/dest/array/index.js +1 -0
- package/dest/array/sorted_array.d.ts +10 -0
- package/dest/array/sorted_array.d.ts.map +1 -0
- package/dest/array/sorted_array.js +106 -0
- package/dest/branded-types/block_number.d.ts +4 -1
- package/dest/branded-types/block_number.d.ts.map +1 -1
- package/dest/branded-types/block_number.js +3 -0
- package/dest/branded-types/checkpoint_number.d.ts +10 -2
- package/dest/branded-types/checkpoint_number.d.ts.map +1 -1
- package/dest/branded-types/checkpoint_number.js +17 -8
- package/dest/branded-types/index.d.ts +3 -2
- package/dest/branded-types/index.d.ts.map +1 -1
- package/dest/branded-types/index.js +2 -1
- package/dest/branded-types/index_within_checkpoint.d.ts +42 -0
- package/dest/branded-types/index_within_checkpoint.d.ts.map +1 -0
- package/dest/branded-types/index_within_checkpoint.js +59 -0
- package/dest/buffer/buffer16.d.ts +5 -2
- package/dest/buffer/buffer16.d.ts.map +1 -1
- package/dest/buffer/buffer16.js +4 -2
- package/dest/buffer/buffer32.d.ts +5 -2
- package/dest/buffer/buffer32.d.ts.map +1 -1
- package/dest/buffer/buffer32.js +4 -2
- package/dest/collection/array.d.ts +6 -1
- package/dest/collection/array.d.ts.map +1 -1
- package/dest/collection/array.js +27 -0
- package/dest/config/env_var.d.ts +2 -2
- package/dest/config/env_var.d.ts.map +1 -1
- package/dest/config/index.d.ts +15 -4
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +32 -9
- package/dest/config/network_config.d.ts +13 -1
- package/dest/config/network_config.d.ts.map +1 -1
- package/dest/config/network_config.js +3 -1
- package/dest/config/parse-env.d.ts +3 -0
- package/dest/config/parse-env.d.ts.map +1 -0
- package/dest/config/parse-env.js +7 -0
- package/dest/config/secret_value.js +3 -1
- package/dest/crypto/bls/bn254_keystore.js +1 -1
- package/dest/crypto/bls/index.js +1 -1
- package/dest/crypto/bn254/index.d.ts +35 -51
- package/dest/crypto/bn254/index.d.ts.map +1 -1
- package/dest/crypto/bn254/index.js +51 -140
- package/dest/crypto/ecdsa/signature.d.ts +11 -2
- package/dest/crypto/ecdsa/signature.d.ts.map +1 -1
- package/dest/crypto/ecdsa/signature.js +2 -2
- package/dest/crypto/grumpkin/index.d.ts +4 -2
- package/dest/crypto/grumpkin/index.d.ts.map +1 -1
- package/dest/crypto/grumpkin/index.js +2 -1
- package/dest/crypto/keys/index.d.ts +2 -2
- package/dest/crypto/keys/index.d.ts.map +1 -1
- package/dest/crypto/keys/index.js +1 -1
- package/dest/crypto/pedersen/pedersen.wasm.d.ts +2 -2
- package/dest/crypto/pedersen/pedersen.wasm.d.ts.map +1 -1
- package/dest/crypto/pedersen/pedersen.wasm.js +1 -1
- package/dest/crypto/poseidon/index.d.ts +2 -3
- package/dest/crypto/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/poseidon/index.js +1 -10
- package/dest/crypto/random/randomness_singleton.d.ts +2 -2
- package/dest/crypto/random/randomness_singleton.d.ts.map +1 -1
- package/dest/crypto/random/randomness_singleton.js +3 -3
- package/dest/crypto/schnorr/index.d.ts +3 -2
- package/dest/crypto/schnorr/index.d.ts.map +1 -1
- package/dest/crypto/schnorr/index.js +1 -1
- package/dest/crypto/schnorr/signature.d.ts +2 -2
- package/dest/crypto/schnorr/signature.d.ts.map +1 -1
- package/dest/crypto/schnorr/signature.js +2 -2
- package/dest/crypto/sha256/index.d.ts +2 -2
- package/dest/crypto/sha256/index.d.ts.map +1 -1
- package/dest/crypto/sha256/index.js +1 -1
- package/dest/crypto/sha512/index.d.ts +2 -2
- package/dest/crypto/sha512/index.d.ts.map +1 -1
- package/dest/crypto/sha512/index.js +1 -1
- package/dest/crypto/signature/index.d.ts +2 -2
- package/dest/crypto/signature/index.d.ts.map +1 -1
- package/dest/crypto/sync/pedersen/index.d.ts +2 -2
- package/dest/crypto/sync/pedersen/index.d.ts.map +1 -1
- package/dest/crypto/sync/pedersen/index.js +1 -1
- package/dest/crypto/sync/poseidon/index.d.ts +2 -3
- package/dest/crypto/sync/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/sync/poseidon/index.js +1 -9
- package/dest/{fields/bls12_fields.d.ts → curves/bls12/field.d.ts} +3 -3
- package/dest/curves/bls12/field.d.ts.map +1 -0
- package/dest/{fields/bls12_fields.js → curves/bls12/field.js} +12 -9
- package/dest/curves/bls12/index.d.ts +3 -0
- package/dest/curves/bls12/index.d.ts.map +1 -0
- package/dest/curves/bls12/index.js +2 -0
- package/dest/{fields/bls12_point.d.ts → curves/bls12/point.d.ts} +13 -4
- package/dest/curves/bls12/point.d.ts.map +1 -0
- package/dest/{fields/bls12_point.js → curves/bls12/point.js} +10 -8
- package/dest/{fields/fields.d.ts → curves/bn254/field.d.ts} +7 -15
- package/dest/curves/bn254/field.d.ts.map +1 -0
- package/dest/{fields/fields.js → curves/bn254/field.js} +35 -49
- package/dest/curves/bn254/index.d.ts +3 -0
- package/dest/curves/bn254/index.d.ts.map +1 -0
- package/dest/curves/bn254/index.js +2 -0
- package/dest/curves/bn254/point.d.ts +54 -0
- package/dest/curves/bn254/point.d.ts.map +1 -0
- package/dest/curves/bn254/point.js +143 -0
- package/dest/curves/grumpkin/index.d.ts +10 -0
- package/dest/curves/grumpkin/index.d.ts.map +1 -0
- package/dest/curves/grumpkin/index.js +3 -0
- package/dest/{fields → curves/grumpkin}/point.d.ts +13 -4
- package/dest/curves/grumpkin/point.d.ts.map +1 -0
- package/dest/{fields → curves/grumpkin}/point.js +7 -7
- package/dest/error/index.d.ts +4 -4
- package/dest/error/index.d.ts.map +1 -1
- package/dest/eth-address/index.d.ts +3 -2
- package/dest/eth-address/index.d.ts.map +1 -1
- package/dest/eth-address/index.js +10 -3
- package/dest/eth-signature/eth_signature.d.ts +4 -1
- package/dest/eth-signature/eth_signature.d.ts.map +1 -1
- package/dest/iterator/filter.d.ts +3 -0
- package/dest/iterator/filter.d.ts.map +1 -0
- package/dest/iterator/filter.js +7 -0
- package/dest/iterator/index.d.ts +2 -0
- package/dest/iterator/index.d.ts.map +1 -0
- package/dest/iterator/index.js +1 -0
- package/dest/json-rpc/client/undici.d.ts +1 -1
- package/dest/json-rpc/client/undici.d.ts.map +1 -1
- package/dest/json-rpc/client/undici.js +21 -4
- package/dest/json-rpc/fixtures/class_a.d.ts +3 -3
- package/dest/json-rpc/fixtures/class_a.d.ts.map +1 -1
- package/dest/json-rpc/fixtures/class_b.d.ts +3 -3
- package/dest/json-rpc/fixtures/class_b.d.ts.map +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.js +1 -1
- package/dest/log/pino-logger.d.ts +1 -1
- package/dest/log/pino-logger.d.ts.map +1 -1
- package/dest/log/pino-logger.js +1 -1
- package/dest/retry/index.d.ts +11 -1
- package/dest/retry/index.d.ts.map +1 -1
- package/dest/retry/index.js +11 -0
- package/dest/schemas/schemas.d.ts +7 -3
- package/dest/schemas/schemas.d.ts.map +1 -1
- package/dest/schemas/schemas.js +9 -3
- package/dest/schemas/types.d.ts +31 -1
- package/dest/schemas/types.d.ts.map +1 -1
- package/dest/schemas/types.js +25 -1
- package/dest/serialize/buffer_reader.d.ts +7 -4
- package/dest/serialize/buffer_reader.d.ts.map +1 -1
- package/dest/serialize/buffer_reader.js +13 -4
- package/dest/serialize/field_reader.d.ts +2 -2
- package/dest/serialize/field_reader.d.ts.map +1 -1
- package/dest/serialize/field_reader.js +1 -1
- package/dest/serialize/free_funcs.d.ts +2 -2
- package/dest/serialize/free_funcs.d.ts.map +1 -1
- package/dest/serialize/free_funcs.js +1 -1
- package/dest/serialize/serialize.d.ts +2 -2
- package/dest/serialize/serialize.d.ts.map +1 -1
- package/dest/serialize/serialize.js +1 -1
- package/dest/sleep/index.d.ts +3 -1
- package/dest/sleep/index.d.ts.map +1 -1
- package/dest/sleep/index.js +4 -0
- package/dest/timer/date.d.ts +2 -1
- package/dest/timer/date.d.ts.map +1 -1
- package/dest/timer/date.js +3 -0
- package/dest/trees/balanced_merkle_tree_root.d.ts +17 -0
- package/dest/trees/balanced_merkle_tree_root.d.ts.map +1 -0
- package/dest/trees/{balanced_merkle_tree.js → balanced_merkle_tree_root.js} +2 -15
- package/dest/trees/hasher.d.ts +3 -1
- package/dest/trees/hasher.d.ts.map +1 -1
- package/dest/trees/hasher.js +10 -5
- package/dest/trees/index.d.ts +4 -4
- package/dest/trees/index.d.ts.map +1 -1
- package/dest/trees/index.js +3 -3
- package/dest/trees/indexed_merkle_tree.js +1 -1
- package/dest/trees/membership_witness.d.ts +12 -2
- package/dest/trees/membership_witness.d.ts.map +1 -1
- package/dest/trees/membership_witness.js +10 -1
- package/dest/trees/merkle_tree_calculator.d.ts +1 -1
- package/dest/trees/merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/merkle_tree_calculator.js +2 -2
- package/dest/trees/sibling_path.d.ts +3 -2
- package/dest/trees/sibling_path.d.ts.map +1 -1
- package/dest/trees/sibling_path.js +3 -3
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts +2 -3
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/unbalanced_merkle_tree_calculator.js +1 -5
- package/dest/trees/{unbalanced_merkle_tree.d.ts → unbalanced_merkle_tree_root.d.ts} +3 -5
- package/dest/trees/unbalanced_merkle_tree_root.d.ts.map +1 -0
- package/dest/trees/{unbalanced_merkle_tree.js → unbalanced_merkle_tree_root.js} +11 -49
- package/dest/trees/unbalanced_tree_store.d.ts +5 -1
- package/dest/trees/unbalanced_tree_store.d.ts.map +1 -1
- package/dest/trees/unbalanced_tree_store.js +49 -1
- package/dest/types/index.d.ts +4 -2
- package/dest/types/index.d.ts.map +1 -1
- package/dest/types/index.js +3 -0
- package/package.json +25 -7
- package/src/array/index.ts +1 -0
- package/src/array/sorted_array.ts +133 -0
- package/src/branded-types/block_number.ts +5 -0
- package/src/branded-types/checkpoint_number.ts +22 -7
- package/src/branded-types/index.ts +2 -1
- package/src/branded-types/index_within_checkpoint.ts +88 -0
- package/src/buffer/buffer16.ts +2 -2
- package/src/buffer/buffer32.ts +2 -2
- package/src/collection/array.ts +31 -0
- package/src/config/env_var.ts +33 -12
- package/src/config/index.ts +39 -6
- package/src/config/network_config.ts +2 -0
- package/src/config/parse-env.ts +4 -0
- package/src/crypto/bls/bn254_keystore.ts +1 -1
- package/src/crypto/bls/index.ts +1 -1
- package/src/crypto/bn254/index.ts +50 -159
- package/src/crypto/ecdsa/signature.ts +2 -2
- package/src/crypto/grumpkin/index.ts +3 -1
- package/src/crypto/keys/index.ts +1 -1
- package/src/crypto/pedersen/pedersen.wasm.ts +1 -1
- package/src/crypto/poseidon/index.ts +1 -11
- package/src/crypto/random/randomness_singleton.ts +2 -4
- package/src/crypto/schnorr/index.ts +2 -1
- package/src/crypto/schnorr/signature.ts +2 -2
- package/src/crypto/sha256/index.ts +1 -1
- package/src/crypto/sha512/index.ts +1 -1
- package/src/crypto/signature/index.ts +1 -1
- package/src/crypto/sync/pedersen/index.ts +1 -1
- package/src/crypto/sync/poseidon/index.ts +1 -10
- package/src/{fields/bls12_fields.ts → curves/bls12/field.ts} +6 -6
- package/src/curves/bls12/index.ts +2 -0
- package/src/{fields/bls12_point.ts → curves/bls12/point.ts} +7 -7
- package/src/{fields/fields.ts → curves/bn254/field.ts} +33 -56
- package/src/curves/bn254/index.ts +2 -0
- package/src/curves/bn254/point.ts +170 -0
- package/src/curves/grumpkin/index.ts +11 -0
- package/src/{fields → curves/grumpkin}/point.ts +7 -7
- package/src/eth-address/index.ts +8 -2
- package/src/iterator/filter.ts +11 -0
- package/src/iterator/index.ts +1 -0
- package/src/json-rpc/client/undici.ts +21 -3
- package/src/json-rpc/server/safe_json_rpc_server.ts +1 -1
- package/src/log/pino-logger.ts +2 -1
- package/src/retry/index.ts +18 -0
- package/src/schemas/schemas.ts +14 -3
- package/src/schemas/types.ts +33 -0
- package/src/serialize/buffer_reader.ts +21 -9
- package/src/serialize/field_reader.ts +1 -1
- package/src/serialize/free_funcs.ts +1 -1
- package/src/serialize/serialize.ts +1 -1
- package/src/sleep/index.ts +6 -0
- package/src/timer/date.ts +4 -0
- package/src/trees/{balanced_merkle_tree.ts → balanced_merkle_tree_root.ts} +2 -16
- package/src/trees/hasher.ts +9 -0
- package/src/trees/index.ts +3 -3
- package/src/trees/indexed_merkle_tree.ts +1 -1
- package/src/trees/membership_witness.ts +9 -1
- package/src/trees/merkle_tree_calculator.ts +2 -2
- package/src/trees/sibling_path.ts +3 -3
- package/src/trees/unbalanced_merkle_tree_calculator.ts +1 -12
- package/src/trees/{unbalanced_merkle_tree.ts → unbalanced_merkle_tree_root.ts} +17 -61
- package/src/trees/unbalanced_tree_store.ts +57 -2
- package/src/types/index.ts +6 -1
- package/dest/crypto/bn254/bn254_utils.d.ts +0 -39
- package/dest/crypto/bn254/bn254_utils.d.ts.map +0 -1
- package/dest/crypto/bn254/bn254_utils.js +0 -56
- package/dest/crypto/index.d.ts +0 -17
- package/dest/crypto/index.d.ts.map +0 -1
- package/dest/crypto/index.js +0 -16
- package/dest/fields/bls12_fields.d.ts.map +0 -1
- package/dest/fields/bls12_point.d.ts.map +0 -1
- package/dest/fields/coordinate.d.ts +0 -63
- package/dest/fields/coordinate.d.ts.map +0 -1
- package/dest/fields/coordinate.js +0 -96
- package/dest/fields/fields.d.ts.map +0 -1
- package/dest/fields/index.d.ts +0 -6
- package/dest/fields/index.d.ts.map +0 -1
- package/dest/fields/index.js +0 -5
- package/dest/fields/point.d.ts.map +0 -1
- package/dest/index.d.ts +0 -31
- package/dest/index.d.ts.map +0 -1
- package/dest/index.js +0 -31
- package/dest/json-rpc/server/telemetry.d.ts +0 -2
- package/dest/json-rpc/server/telemetry.d.ts.map +0 -1
- package/dest/json-rpc/server/telemetry.js +0 -0
- package/dest/trees/balanced_merkle_tree.d.ts +0 -22
- package/dest/trees/balanced_merkle_tree.d.ts.map +0 -1
- package/dest/trees/unbalanced_merkle_tree.d.ts.map +0 -1
- package/src/crypto/bn254/bn254_utils.ts +0 -64
- package/src/crypto/index.ts +0 -16
- package/src/fields/coordinate.ts +0 -104
- package/src/fields/index.ts +0 -5
- package/src/index.ts +0 -31
- package/src/json-rpc/server/telemetry.ts +0 -0
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
type Cmp<T> = (a: T, b: T) => -1 | 0 | 1;
|
|
2
|
+
|
|
3
|
+
export function dedupeSortedArray<T>(arr: T[], cmp: Cmp<T>): void {
|
|
4
|
+
for (let i = 0; i < arr.length; i++) {
|
|
5
|
+
let j = i + 1;
|
|
6
|
+
for (; j < arr.length; j++) {
|
|
7
|
+
const res = cmp(arr[i], arr[j]);
|
|
8
|
+
if (res === 0) {
|
|
9
|
+
continue;
|
|
10
|
+
} else if (res < 0) {
|
|
11
|
+
break;
|
|
12
|
+
} else {
|
|
13
|
+
throw new Error('Array not sorted');
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
if (j - i > 1) {
|
|
18
|
+
arr.splice(i + 1, j - i - 1);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function insertIntoSortedArray<T>(arr: T[], item: T, cmp: Cmp<T>, allowDuplicates = true): boolean {
|
|
24
|
+
let start = 0;
|
|
25
|
+
let end = arr.length;
|
|
26
|
+
|
|
27
|
+
while (start < end) {
|
|
28
|
+
const mid = start + (((end - start) / 2) | 0);
|
|
29
|
+
const comparison = cmp(arr[mid], item);
|
|
30
|
+
|
|
31
|
+
if (comparison < 0) {
|
|
32
|
+
start = mid + 1;
|
|
33
|
+
} else {
|
|
34
|
+
end = mid;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
if (!allowDuplicates) {
|
|
39
|
+
// Check element at insertion point
|
|
40
|
+
if (start < arr.length && cmp(arr[start], item) === 0) {
|
|
41
|
+
return false;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// Check element before insertion point (in case we landed after duplicates)
|
|
45
|
+
if (start > 0 && cmp(arr[start - 1], item) === 0) {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
arr.splice(start, 0, item);
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export function findIndexInSortedArray<T, N>(values: T[], needle: N, cmp: (a: T, b: N) => number): number {
|
|
55
|
+
let start = 0;
|
|
56
|
+
let end = values.length - 1;
|
|
57
|
+
|
|
58
|
+
while (start <= end) {
|
|
59
|
+
const mid = start + (((end - start) / 2) | 0);
|
|
60
|
+
const comparison = cmp(values[mid], needle);
|
|
61
|
+
|
|
62
|
+
if (comparison === 0) {
|
|
63
|
+
return mid;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
if (comparison > 0) {
|
|
67
|
+
end = mid - 1;
|
|
68
|
+
} else {
|
|
69
|
+
start = mid + 1;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
return -1;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
export function findInSortedArray<T, N>(values: T[], needle: N, cmp: (a: T, b: N) => number): T | undefined {
|
|
77
|
+
const idx = findIndexInSortedArray(values, needle, cmp);
|
|
78
|
+
return idx > -1 ? values[idx] : undefined;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
export function removeAnyOf<T, N>(arr: T[], vals: N[], cmp: (a: T, b: N) => -1 | 0 | 1): void {
|
|
82
|
+
let writeIdx = 0;
|
|
83
|
+
let readIdx = 0;
|
|
84
|
+
let valIdx = 0;
|
|
85
|
+
|
|
86
|
+
while (readIdx < arr.length && valIdx < vals.length) {
|
|
87
|
+
const comparison = cmp(arr[readIdx], vals[valIdx]);
|
|
88
|
+
|
|
89
|
+
if (comparison < 0) {
|
|
90
|
+
arr[writeIdx++] = arr[readIdx++];
|
|
91
|
+
} else if (comparison > 0) {
|
|
92
|
+
valIdx++;
|
|
93
|
+
} else {
|
|
94
|
+
readIdx++;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
while (readIdx < arr.length) {
|
|
99
|
+
arr[writeIdx++] = arr[readIdx++];
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
arr.length = writeIdx;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
export function removeFromSortedArray<T, N>(arr: T[], val: N, cmp: (a: T, b: N) => -1 | 0 | 1) {
|
|
106
|
+
const idx = findIndexInSortedArray(arr, val, cmp);
|
|
107
|
+
if (idx > -1) {
|
|
108
|
+
arr.splice(idx, 1);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
export function merge<T>(arr: T[], toInsert: T[], cmp: (a: T, b: T) => -1 | 0 | 1): void {
|
|
113
|
+
const result = new Array<T>(arr.length + toInsert.length);
|
|
114
|
+
let i = 0,
|
|
115
|
+
j = 0,
|
|
116
|
+
k = 0;
|
|
117
|
+
|
|
118
|
+
while (i < arr.length && j < toInsert.length) {
|
|
119
|
+
result[k++] = cmp(arr[i], toInsert[j]) <= 0 ? arr[i++] : toInsert[j++];
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
while (i < arr.length) {
|
|
123
|
+
result[k++] = arr[i++];
|
|
124
|
+
}
|
|
125
|
+
while (j < toInsert.length) {
|
|
126
|
+
result[k++] = toInsert[j++];
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
for (i = 0; i < result.length; i++) {
|
|
130
|
+
arr[i] = result[i];
|
|
131
|
+
}
|
|
132
|
+
arr.length = result.length;
|
|
133
|
+
}
|
|
@@ -87,6 +87,11 @@ BlockNumber.isValid = function (value: unknown): value is BlockNumber {
|
|
|
87
87
|
return typeof value === 'number' && Number.isInteger(value) && value >= 0;
|
|
88
88
|
};
|
|
89
89
|
|
|
90
|
+
/** Increments a BlockNumber by a given value. */
|
|
91
|
+
BlockNumber.add = function (bn: BlockNumber, increment: number): BlockNumber {
|
|
92
|
+
return BlockNumber(bn + increment);
|
|
93
|
+
};
|
|
94
|
+
|
|
90
95
|
/**
|
|
91
96
|
* The zero block value (genesis block).
|
|
92
97
|
*/
|
|
@@ -85,16 +85,31 @@ CheckpointNumber.isValid = function (value: unknown): value is CheckpointNumber
|
|
|
85
85
|
return typeof value === 'number' && Number.isInteger(value) && value >= 0;
|
|
86
86
|
};
|
|
87
87
|
|
|
88
|
-
/**
|
|
89
|
-
* The zero checkpoint value.
|
|
90
|
-
*/
|
|
88
|
+
/** The zero checkpoint value. */
|
|
91
89
|
CheckpointNumber.ZERO = CheckpointNumber(0);
|
|
92
90
|
|
|
91
|
+
/** Initial checkpoint. */
|
|
92
|
+
CheckpointNumber.INITIAL = CheckpointNumber(1);
|
|
93
|
+
|
|
93
94
|
/**
|
|
94
95
|
* Zod schema for parsing and validating CheckpointNumber values.
|
|
95
96
|
* Accepts numbers, bigints, or strings and coerces them to CheckpointNumber.
|
|
96
97
|
*/
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
function makeCheckpointNumberSchema(minValue: number) {
|
|
99
|
+
return z
|
|
100
|
+
.union([z.number(), z.bigint(), z.string()])
|
|
101
|
+
.pipe(z.coerce.number().int().min(minValue))
|
|
102
|
+
.transform(value => CheckpointNumber(value));
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* Zod schema for parsing and validating Checkpoint values.
|
|
107
|
+
* Accepts numbers, bigints, or strings and coerces them to CheckpointNumber.
|
|
108
|
+
*/
|
|
109
|
+
export const CheckpointNumberSchema = makeCheckpointNumberSchema(0);
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* Zod schema for parsing and validating CheckpointNumber values that are strictly positive.
|
|
113
|
+
* Accepts numbers, bigints, or strings and coerces them to CheckpointNumber.
|
|
114
|
+
*/
|
|
115
|
+
export const CheckpointNumberPositiveSchema = makeCheckpointNumberSchema(1);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { BlockNumber, BlockNumberSchema, BlockNumberPositiveSchema } from './block_number.js';
|
|
2
|
-
export { CheckpointNumber, CheckpointNumberSchema } from './checkpoint_number.js';
|
|
2
|
+
export { CheckpointNumber, CheckpointNumberSchema, CheckpointNumberPositiveSchema } from './checkpoint_number.js';
|
|
3
3
|
export { EpochNumber, EpochNumberSchema } from './epoch.js';
|
|
4
|
+
export { IndexWithinCheckpoint, IndexWithinCheckpointSchema } from './index_within_checkpoint.js';
|
|
4
5
|
export { SlotNumber, SlotNumberSchema } from './slot.js';
|
|
5
6
|
|
|
6
7
|
export type { Branded } from './types.js';
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
|
|
3
|
+
import type { Branded } from './types.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* A branded type representing the index of a block within a checkpoint.
|
|
7
|
+
* The first block in a checkpoint has index 0, the second has index 1, etc.
|
|
8
|
+
*
|
|
9
|
+
* This is a nominal type backed by a number, but TypeScript will treat it as
|
|
10
|
+
* incompatible with plain numbers and other branded numeric types.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* ```ts
|
|
14
|
+
* const index = IndexWithinCheckpoint(0);
|
|
15
|
+
* const plainNumber: number = index; // OK - IndexWithinCheckpoint is assignable to number
|
|
16
|
+
* const indexFromNumber: IndexWithinCheckpoint = 0; // ERROR - number is not assignable to IndexWithinCheckpoint
|
|
17
|
+
* ```
|
|
18
|
+
*/
|
|
19
|
+
export type IndexWithinCheckpoint = Branded<number, 'IndexWithinCheckpoint'>;
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Creates an IndexWithinCheckpoint from a number.
|
|
23
|
+
* @param value - The index (must be a non-negative integer)
|
|
24
|
+
* @returns The branded IndexWithinCheckpoint value
|
|
25
|
+
* @throws If the value is negative or not an integer
|
|
26
|
+
*/
|
|
27
|
+
export function IndexWithinCheckpoint(value: number): IndexWithinCheckpoint {
|
|
28
|
+
if (!Number.isInteger(value)) {
|
|
29
|
+
throw new Error(`IndexWithinCheckpoint must be an integer, got ${value}`);
|
|
30
|
+
}
|
|
31
|
+
if (value < 0) {
|
|
32
|
+
throw new Error(`IndexWithinCheckpoint must be non-negative, got ${value}`);
|
|
33
|
+
}
|
|
34
|
+
return value as IndexWithinCheckpoint;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Creates an IndexWithinCheckpoint from a bigint.
|
|
39
|
+
* @param value - The index as bigint (must be a non-negative integer within safe integer range)
|
|
40
|
+
* @returns The branded IndexWithinCheckpoint value
|
|
41
|
+
* @throws If the value is negative or exceeds Number.MAX_SAFE_INTEGER
|
|
42
|
+
*/
|
|
43
|
+
IndexWithinCheckpoint.fromBigInt = function (value: bigint): IndexWithinCheckpoint {
|
|
44
|
+
if (value < 0n) {
|
|
45
|
+
throw new Error(`IndexWithinCheckpoint must be non-negative, got ${value}`);
|
|
46
|
+
}
|
|
47
|
+
if (value > BigInt(Number.MAX_SAFE_INTEGER)) {
|
|
48
|
+
throw new Error(`IndexWithinCheckpoint ${value} exceeds MAX_SAFE_INTEGER`);
|
|
49
|
+
}
|
|
50
|
+
return Number(value) as IndexWithinCheckpoint;
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Creates an IndexWithinCheckpoint from a string.
|
|
55
|
+
* @param value - The index as a string
|
|
56
|
+
* @returns The branded IndexWithinCheckpoint value
|
|
57
|
+
* @throws If the string cannot be parsed as a valid index
|
|
58
|
+
*/
|
|
59
|
+
IndexWithinCheckpoint.fromString = function (value: string): IndexWithinCheckpoint {
|
|
60
|
+
const parsed = parseInt(value, 10);
|
|
61
|
+
if (isNaN(parsed)) {
|
|
62
|
+
throw new Error(`Cannot parse IndexWithinCheckpoint from string: ${value}`);
|
|
63
|
+
}
|
|
64
|
+
return IndexWithinCheckpoint(parsed);
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Type guard to check if a value is a valid IndexWithinCheckpoint.
|
|
69
|
+
* Note: At runtime, an IndexWithinCheckpoint is just a number, so this checks if the value
|
|
70
|
+
* is a non-negative integer.
|
|
71
|
+
*/
|
|
72
|
+
IndexWithinCheckpoint.isValid = function (value: unknown): value is IndexWithinCheckpoint {
|
|
73
|
+
return typeof value === 'number' && Number.isInteger(value) && value >= 0;
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
/**
|
|
77
|
+
* The zero index value (first block in checkpoint).
|
|
78
|
+
*/
|
|
79
|
+
IndexWithinCheckpoint.ZERO = IndexWithinCheckpoint(0);
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Zod schema for parsing and validating IndexWithinCheckpoint values.
|
|
83
|
+
* Accepts numbers, bigints, or strings and coerces them to IndexWithinCheckpoint.
|
|
84
|
+
*/
|
|
85
|
+
export const IndexWithinCheckpointSchema = z
|
|
86
|
+
.union([z.number(), z.bigint(), z.string()])
|
|
87
|
+
.pipe(z.coerce.number().int().min(0))
|
|
88
|
+
.transform(value => IndexWithinCheckpoint(value));
|
package/src/buffer/buffer16.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { randomBytes } from '@aztec/foundation/crypto';
|
|
2
|
-
import type { Fr } from '@aztec/foundation/
|
|
1
|
+
import { randomBytes } from '@aztec/foundation/crypto/random';
|
|
2
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import { BufferReader, deserializeBigInt, serializeBigInt } from '@aztec/foundation/serialize';
|
|
4
4
|
|
|
5
5
|
import { inspect } from 'util';
|
package/src/buffer/buffer32.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { randomBytes } from '@aztec/foundation/crypto';
|
|
2
|
-
import type { Fr } from '@aztec/foundation/
|
|
1
|
+
import { randomBytes } from '@aztec/foundation/crypto/random';
|
|
2
|
+
import type { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import { BufferReader, deserializeBigInt, serializeBigInt } from '@aztec/foundation/serialize';
|
|
4
4
|
|
|
5
5
|
import { inspect } from 'util';
|
package/src/collection/array.ts
CHANGED
|
@@ -250,6 +250,37 @@ export function chunk<T>(items: T[], chunkSize: number): T[][] {
|
|
|
250
250
|
return chunks;
|
|
251
251
|
}
|
|
252
252
|
|
|
253
|
+
const UNINITIALIZED = Symbol('uninitialized');
|
|
254
|
+
|
|
255
|
+
/**
|
|
256
|
+
* Splits the given iterable into chunks based on the key returned by the given function.
|
|
257
|
+
* Items must be contiguous to be included in the same chunk.
|
|
258
|
+
*/
|
|
259
|
+
export function chunkBy<T, U>(items: T[], fn: (item: T) => U): T[][] {
|
|
260
|
+
const chunks: T[][] = [];
|
|
261
|
+
let currentChunk: T[] = [];
|
|
262
|
+
let currentKey: U | typeof UNINITIALIZED = UNINITIALIZED;
|
|
263
|
+
|
|
264
|
+
for (const item of items) {
|
|
265
|
+
const key = fn(item);
|
|
266
|
+
if (currentKey === UNINITIALIZED || key !== currentKey) {
|
|
267
|
+
if (currentChunk.length > 0) {
|
|
268
|
+
chunks.push(currentChunk);
|
|
269
|
+
}
|
|
270
|
+
currentChunk = [item];
|
|
271
|
+
currentKey = key;
|
|
272
|
+
} else {
|
|
273
|
+
currentChunk.push(item);
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
if (currentChunk.length > 0) {
|
|
278
|
+
chunks.push(currentChunk);
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
return chunks;
|
|
282
|
+
}
|
|
283
|
+
|
|
253
284
|
/** Partitions the given iterable into two arrays based on the predicate. */
|
|
254
285
|
export function partition<T>(items: T[], predicate: (item: T) => boolean): [T[], T[]] {
|
|
255
286
|
const pass: T[] = [];
|
package/src/config/env_var.ts
CHANGED
|
@@ -21,12 +21,13 @@ export type EnvVar =
|
|
|
21
21
|
| 'BB_NUM_IVC_VERIFIERS'
|
|
22
22
|
| 'BB_IVC_CONCURRENCY'
|
|
23
23
|
| 'BOOTSTRAP_NODES'
|
|
24
|
-
| '
|
|
25
|
-
| '
|
|
26
|
-
| '
|
|
24
|
+
| 'BLOB_ARCHIVE_API_URL'
|
|
25
|
+
| 'BLOB_FILE_STORE_URLS'
|
|
26
|
+
| 'BLOB_FILE_STORE_UPLOAD_URL'
|
|
27
|
+
| 'BLOB_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES'
|
|
27
28
|
| 'BOT_DA_GAS_LIMIT'
|
|
28
29
|
| 'BOT_FEE_PAYMENT_METHOD'
|
|
29
|
-
| '
|
|
30
|
+
| 'BOT_MIN_FEE_PADDING'
|
|
30
31
|
| 'BOT_FLUSH_SETUP_TRANSACTIONS'
|
|
31
32
|
| 'BOT_FOLLOW_CHAIN'
|
|
32
33
|
| 'BOT_L2_GAS_LIMIT'
|
|
@@ -63,8 +64,9 @@ export type EnvVar =
|
|
|
63
64
|
| 'PUBLIC_DATA_TREE_MAP_SIZE_KB'
|
|
64
65
|
| 'DEBUG'
|
|
65
66
|
| 'DEBUG_P2P_DISABLE_COLOCATION_PENALTY'
|
|
66
|
-
| 'DEPLOY_AZTEC_CONTRACTS_SALT'
|
|
67
67
|
| 'ETHEREUM_HOSTS'
|
|
68
|
+
| 'ETHEREUM_DEBUG_HOSTS'
|
|
69
|
+
| 'ETHEREUM_ALLOW_NO_DEBUG_HOSTS'
|
|
68
70
|
| 'FEE_RECIPIENT'
|
|
69
71
|
| 'FORCE_COLOR'
|
|
70
72
|
| 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS'
|
|
@@ -131,8 +133,7 @@ export type EnvVar =
|
|
|
131
133
|
| 'P2P_TRUSTED_PEERS'
|
|
132
134
|
| 'P2P_PRIVATE_PEERS'
|
|
133
135
|
| 'P2P_PREFERRED_PEERS'
|
|
134
|
-
| '
|
|
135
|
-
| 'P2P_TX_POOL_OVERFLOW_FACTOR'
|
|
136
|
+
| 'P2P_MAX_PENDING_TX_COUNT'
|
|
136
137
|
| 'P2P_SEEN_MSG_CACHE_SIZE'
|
|
137
138
|
| 'P2P_DROP_TX'
|
|
138
139
|
| 'P2P_DROP_TX_CHANCE'
|
|
@@ -150,6 +151,7 @@ export type EnvVar =
|
|
|
150
151
|
| 'PROVER_BROKER_BATCH_INTERVAL_MS'
|
|
151
152
|
| 'PROVER_BROKER_BATCH_SIZE'
|
|
152
153
|
| 'PROVER_BROKER_MAX_EPOCHS_TO_KEEP_RESULTS_FOR'
|
|
154
|
+
| 'PROVER_CANCEL_JOBS_ON_STOP'
|
|
153
155
|
| 'PROVER_COORDINATION_NODE_URLS'
|
|
154
156
|
| 'PROVER_FAILED_PROOF_STORE'
|
|
155
157
|
| 'PROVER_NODE_FAILED_EPOCH_STORE'
|
|
@@ -166,6 +168,7 @@ export type EnvVar =
|
|
|
166
168
|
| 'PROVER_PUBLISHER_PRIVATE_KEYS'
|
|
167
169
|
| 'PROVER_PUBLISHER_ADDRESSES'
|
|
168
170
|
| 'PROVER_PUBLISHER_ALLOW_INVALID_STATES'
|
|
171
|
+
| 'PROVER_PUBLISHER_FORWARDER_ADDRESS'
|
|
169
172
|
| 'PROVER_REAL_PROOFS'
|
|
170
173
|
| 'PROVER_TEST_DELAY_FACTOR'
|
|
171
174
|
| 'PROVER_TEST_DELAY_MS'
|
|
@@ -173,6 +176,7 @@ export type EnvVar =
|
|
|
173
176
|
| 'PROVER_TEST_VERIFICATION_DELAY_MS'
|
|
174
177
|
| 'PXE_L2_BLOCK_BATCH_SIZE'
|
|
175
178
|
| 'PXE_PROVER_ENABLED'
|
|
179
|
+
| 'PXE_SYNC_CHAIN_TIP'
|
|
176
180
|
| 'RPC_MAX_BATCH_SIZE'
|
|
177
181
|
| 'RPC_MAX_BODY_SIZE'
|
|
178
182
|
| 'RPC_SIMULATE_PUBLIC_MAX_GAS_LIMIT'
|
|
@@ -190,10 +194,13 @@ export type EnvVar =
|
|
|
190
194
|
| 'SEQ_PUBLISHER_PRIVATE_KEYS'
|
|
191
195
|
| 'SEQ_PUBLISHER_ADDRESSES'
|
|
192
196
|
| 'SEQ_PUBLISHER_ALLOW_INVALID_STATES'
|
|
193
|
-
| '
|
|
197
|
+
| 'SEQ_PUBLISHER_FORWARDER_ADDRESS'
|
|
198
|
+
| 'SEQ_POLLING_INTERVAL_MS'
|
|
194
199
|
| 'SEQ_ENFORCE_TIME_TABLE'
|
|
195
|
-
| '
|
|
200
|
+
| 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT'
|
|
196
201
|
| 'SEQ_ATTESTATION_PROPAGATION_TIME'
|
|
202
|
+
| 'SEQ_BLOCK_DURATION_MS'
|
|
203
|
+
| 'SEQ_BUILD_CHECKPOINT_IF_EMPTY'
|
|
197
204
|
| 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER'
|
|
198
205
|
| 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER'
|
|
199
206
|
| 'SLASH_MIN_PENALTY_PERCENTAGE'
|
|
@@ -241,7 +248,6 @@ export type EnvVar =
|
|
|
241
248
|
| 'VALIDATOR_ADDRESSES'
|
|
242
249
|
| 'ROLLUP_VERSION'
|
|
243
250
|
| 'WS_BLOCK_CHECK_INTERVAL_MS'
|
|
244
|
-
| 'WS_PROVEN_BLOCKS_ONLY'
|
|
245
251
|
| 'WS_BLOCK_REQUEST_BATCH_SIZE'
|
|
246
252
|
| 'L1_READER_VIEM_POLLING_INTERVAL_MS'
|
|
247
253
|
| 'WS_DATA_DIRECTORY'
|
|
@@ -252,12 +258,14 @@ export type EnvVar =
|
|
|
252
258
|
| 'AZTEC_TARGET_COMMITTEE_SIZE'
|
|
253
259
|
| 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET'
|
|
254
260
|
| 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO'
|
|
261
|
+
| 'AZTEC_INBOX_LAG'
|
|
255
262
|
| 'AZTEC_PROOF_SUBMISSION_EPOCHS'
|
|
256
263
|
| 'AZTEC_ACTIVATION_THRESHOLD'
|
|
257
264
|
| 'AZTEC_EJECTION_THRESHOLD'
|
|
258
265
|
| 'AZTEC_LOCAL_EJECTION_THRESHOLD'
|
|
259
266
|
| 'AZTEC_MANA_TARGET'
|
|
260
267
|
| 'AZTEC_PROVING_COST_PER_MANA'
|
|
268
|
+
| 'AZTEC_INITIAL_ETH_PER_FEE_ASSET'
|
|
261
269
|
| 'AZTEC_SLASHING_QUORUM'
|
|
262
270
|
| 'AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS'
|
|
263
271
|
| 'AZTEC_SLASHING_LIFETIME_IN_ROUNDS'
|
|
@@ -271,6 +279,7 @@ export type EnvVar =
|
|
|
271
279
|
| 'AZTEC_SLASHER_FLAVOR'
|
|
272
280
|
| 'AZTEC_GOVERNANCE_PROPOSER_QUORUM'
|
|
273
281
|
| 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE'
|
|
282
|
+
| 'AZTEC_GOVERNANCE_VOTING_DURATION'
|
|
274
283
|
| 'AZTEC_EXIT_DELAY_SECONDS'
|
|
275
284
|
| 'L1_GAS_LIMIT_BUFFER_PERCENTAGE'
|
|
276
285
|
| 'L1_GAS_PRICE_MAX'
|
|
@@ -279,6 +288,7 @@ export type EnvVar =
|
|
|
279
288
|
| 'L1_BLOB_FEE_PER_GAS_GWEI_MAX'
|
|
280
289
|
| 'L1_PRIORITY_FEE_BUMP_PERCENTAGE'
|
|
281
290
|
| 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE'
|
|
291
|
+
| 'L1_MINIMUM_PRIORITY_FEE_PER_GAS_GWEI'
|
|
282
292
|
| 'L1_FIXED_PRIORITY_FEE_PER_GAS'
|
|
283
293
|
| 'L1_FIXED_PRIORITY_FEE_PER_GAS_GWEI'
|
|
284
294
|
| 'L1_TX_MONITOR_MAX_ATTEMPTS'
|
|
@@ -296,7 +306,6 @@ export type EnvVar =
|
|
|
296
306
|
| 'K8S_POD_UID'
|
|
297
307
|
| 'K8S_NAMESPACE_NAME'
|
|
298
308
|
| 'VALIDATOR_REEXECUTE_DEADLINE_MS'
|
|
299
|
-
| 'ALWAYS_REEXECUTE_BLOCK_PROPOSALS'
|
|
300
309
|
| 'AUTO_UPDATE'
|
|
301
310
|
| 'AUTO_UPDATE_URL'
|
|
302
311
|
| 'WEB3_SIGNER_URL'
|
|
@@ -304,4 +313,16 @@ export type EnvVar =
|
|
|
304
313
|
| 'BLOB_ALLOW_EMPTY_SOURCES'
|
|
305
314
|
| 'FISHERMAN_MODE'
|
|
306
315
|
| 'MAX_ALLOWED_ETH_CLIENT_DRIFT_SECONDS'
|
|
307
|
-
| 'LEGACY_BLS_CLI'
|
|
316
|
+
| 'LEGACY_BLS_CLI'
|
|
317
|
+
| 'DEBUG_FORCE_TX_PROOF_VERIFICATION'
|
|
318
|
+
| 'VALIDATOR_HA_SIGNING_ENABLED'
|
|
319
|
+
| 'VALIDATOR_HA_NODE_ID'
|
|
320
|
+
| 'VALIDATOR_HA_POLLING_INTERVAL_MS'
|
|
321
|
+
| 'VALIDATOR_HA_SIGNING_TIMEOUT_MS'
|
|
322
|
+
| 'VALIDATOR_HA_MAX_STUCK_DUTIES_AGE_MS'
|
|
323
|
+
| 'VALIDATOR_HA_DATABASE_URL'
|
|
324
|
+
| 'VALIDATOR_HA_RUN_MIGRATIONS'
|
|
325
|
+
| 'VALIDATOR_HA_POOL_MAX'
|
|
326
|
+
| 'VALIDATOR_HA_POOL_MIN'
|
|
327
|
+
| 'VALIDATOR_HA_POOL_IDLE_TIMEOUT_MS'
|
|
328
|
+
| 'VALIDATOR_HA_POOL_CONNECTION_TIMEOUT_MS';
|
package/src/config/index.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { Fq, Fr } from '../
|
|
1
|
+
import { Fq, Fr } from '../curves/bn254/field.js';
|
|
2
|
+
import { createConsoleLogger } from '../log/console.js';
|
|
2
3
|
import type { EnvVar } from './env_var.js';
|
|
3
4
|
import { type NetworkNames, getActiveNetworkName } from './network_name.js';
|
|
5
|
+
import { parseBooleanEnv } from './parse-env.js';
|
|
4
6
|
import { SecretValue } from './secret_value.js';
|
|
5
7
|
|
|
6
8
|
export { SecretValue, getActiveNetworkName };
|
|
@@ -17,6 +19,11 @@ export interface ConfigMapping {
|
|
|
17
19
|
isBoolean?: boolean;
|
|
18
20
|
nested?: Record<string, ConfigMapping>;
|
|
19
21
|
fallback?: EnvVar[];
|
|
22
|
+
/**
|
|
23
|
+
* List of deprecated env vars that are still supported but will log a warning.
|
|
24
|
+
* These should also be included in the fallback array for parsing.
|
|
25
|
+
*/
|
|
26
|
+
deprecatedFallback?: { env: EnvVar; message?: string }[];
|
|
20
27
|
}
|
|
21
28
|
|
|
22
29
|
export function isBooleanConfigValue<T>(obj: T, key: keyof T): boolean {
|
|
@@ -72,12 +79,24 @@ export function getConfigFromMappings<T>(configMappings: ConfigMappingsType<T>):
|
|
|
72
79
|
const config = {} as T;
|
|
73
80
|
|
|
74
81
|
for (const key in configMappings) {
|
|
75
|
-
const { env, parseEnv, defaultValue, nested, fallback } = configMappings[key];
|
|
82
|
+
const { env, parseEnv, defaultValue, nested, fallback, deprecatedFallback } = configMappings[key];
|
|
76
83
|
if (nested) {
|
|
77
84
|
(config as any)[key] = getConfigFromMappings(nested);
|
|
78
85
|
} else {
|
|
79
86
|
// Use the shared utility function
|
|
80
87
|
(config as any)[key] = getValueFromEnvWithFallback(env, parseEnv, defaultValue, fallback);
|
|
88
|
+
|
|
89
|
+
// Check for deprecated env vars and warn if logger is set
|
|
90
|
+
if (deprecatedFallback?.length) {
|
|
91
|
+
const userLog = createConsoleLogger('[DEPRECATED]');
|
|
92
|
+
for (const { env: deprecatedEnv, message } of deprecatedFallback) {
|
|
93
|
+
if (process.env[deprecatedEnv]) {
|
|
94
|
+
const warningMessage =
|
|
95
|
+
message ?? `Environment variable ${deprecatedEnv} is deprecated. Please use ${env} instead.`;
|
|
96
|
+
userLog(warningMessage, { deprecatedEnvVar: deprecatedEnv, newEnvVar: env });
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
81
100
|
}
|
|
82
101
|
}
|
|
83
102
|
|
|
@@ -130,6 +149,23 @@ export function floatConfigHelper(
|
|
|
130
149
|
};
|
|
131
150
|
}
|
|
132
151
|
|
|
152
|
+
/**
|
|
153
|
+
* Parses an environment variable to a 0-1 percentage value
|
|
154
|
+
*/
|
|
155
|
+
export function percentageConfigHelper(defaultVal: number): Pick<ConfigMapping, 'parseEnv' | 'defaultValue'> {
|
|
156
|
+
return {
|
|
157
|
+
parseEnv: (val: string): number => {
|
|
158
|
+
const parsed = safeParseFloat(val, defaultVal);
|
|
159
|
+
if (parsed < 0 || parsed > 1) {
|
|
160
|
+
throw new TypeError(`Invalid percentage value: ${parsed} should be between 0 and 1`);
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
return parsed;
|
|
164
|
+
},
|
|
165
|
+
defaultValue: defaultVal,
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
|
|
133
169
|
/**
|
|
134
170
|
* Generates parseEnv and default values for a numerical config value.
|
|
135
171
|
* @param defaultVal - The default numerical value to use if the environment variable is not set or is invalid
|
|
@@ -213,10 +249,7 @@ export function secretValueConfigHelper<T>(parse: (val: string | undefined) => T
|
|
|
213
249
|
};
|
|
214
250
|
}
|
|
215
251
|
|
|
216
|
-
|
|
217
|
-
export function parseBooleanEnv(val: string | undefined): boolean {
|
|
218
|
-
return val !== undefined && ['1', 'true', 'TRUE'].includes(val);
|
|
219
|
-
}
|
|
252
|
+
export { parseBooleanEnv } from './parse-env.js';
|
|
220
253
|
|
|
221
254
|
export function secretStringConfigHelper(): Required<
|
|
222
255
|
Pick<ConfigMapping, 'parseEnv' | 'defaultValue' | 'isBoolean'> & {
|
|
@@ -4,9 +4,11 @@ export const NetworkConfigSchema = z
|
|
|
4
4
|
.object({
|
|
5
5
|
bootnodes: z.array(z.string()),
|
|
6
6
|
snapshots: z.array(z.string()),
|
|
7
|
+
blobFileStoreUrls: z.array(z.string()).optional(),
|
|
7
8
|
registryAddress: z.string(),
|
|
8
9
|
feeAssetHandlerAddress: z.string().optional(),
|
|
9
10
|
l1ChainId: z.number(),
|
|
11
|
+
blockDurationMs: z.number().positive().optional(),
|
|
10
12
|
})
|
|
11
13
|
.passthrough(); // Allow additional unknown fields to pass through
|
|
12
14
|
|
package/src/crypto/bls/index.ts
CHANGED