@aztec-labs/foundation 6.0.0-rc.2 → 6.0.0-rc.4
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/bigint-buffer/index.d.ts +2 -1
- package/dest/bigint-buffer/index.d.ts.map +1 -1
- package/dest/bigint-buffer/index.js +1 -0
- package/dest/buffer/buffer16.d.ts +3 -2
- package/dest/buffer/buffer16.d.ts.map +1 -1
- package/dest/buffer/buffer16.js +2 -1
- package/dest/buffer/buffer32.d.ts +3 -2
- package/dest/buffer/buffer32.d.ts.map +1 -1
- package/dest/buffer/buffer32.js +2 -1
- package/dest/config/env.d.ts +8 -0
- package/dest/config/env.d.ts.map +1 -0
- package/dest/config/env.js +15 -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 +5 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +18 -19
- package/dest/config/network_name.d.ts +1 -1
- package/dest/config/network_name.d.ts.map +1 -1
- package/dest/config/network_name.js +2 -1
- package/dest/config/secret_value.d.ts +2 -2
- package/dest/config/secret_value.d.ts.map +1 -1
- package/dest/config/secret_value.js +1 -1
- package/dest/crypto/bls/bn254_keystore.d.ts +1 -1
- package/dest/crypto/bls/bn254_keystore.d.ts.map +1 -1
- package/dest/crypto/bls/bn254_keystore.js +1 -0
- package/dest/crypto/bls/index.d.ts +1 -1
- package/dest/crypto/bls/index.d.ts.map +1 -1
- package/dest/crypto/bls/index.js +1 -0
- package/dest/crypto/ecdsa/index.d.ts +2 -1
- package/dest/crypto/ecdsa/index.d.ts.map +1 -1
- package/dest/crypto/ecdsa/index.js +1 -0
- package/dest/crypto/ecdsa/signature.d.ts +2 -1
- package/dest/crypto/ecdsa/signature.d.ts.map +1 -1
- package/dest/crypto/ecdsa/signature.js +1 -0
- package/dest/crypto/grumpkin/index.d.ts +2 -1
- package/dest/crypto/grumpkin/index.d.ts.map +1 -1
- package/dest/crypto/grumpkin/index.js +1 -0
- package/dest/crypto/keys/index.d.ts +2 -1
- package/dest/crypto/keys/index.d.ts.map +1 -1
- package/dest/crypto/keys/index.js +1 -0
- package/dest/crypto/pedersen/pedersen.wasm.d.ts +2 -1
- package/dest/crypto/pedersen/pedersen.wasm.d.ts.map +1 -1
- package/dest/crypto/pedersen/pedersen.wasm.js +1 -0
- package/dest/crypto/poseidon/index.d.ts +2 -1
- package/dest/crypto/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/poseidon/index.js +1 -0
- package/dest/crypto/random/index.d.ts +2 -1
- package/dest/crypto/random/index.d.ts.map +1 -1
- package/dest/crypto/random/index.js +1 -0
- package/dest/crypto/random/randomness_singleton.d.ts +2 -1
- package/dest/crypto/random/randomness_singleton.d.ts.map +1 -1
- package/dest/crypto/random/randomness_singleton.js +4 -1
- package/dest/crypto/schnorr/index.d.ts +1 -1
- package/dest/crypto/schnorr/index.d.ts.map +1 -1
- package/dest/crypto/schnorr/index.js +1 -0
- package/dest/crypto/schnorr/signature.d.ts +2 -1
- package/dest/crypto/schnorr/signature.d.ts.map +1 -1
- package/dest/crypto/schnorr/signature.js +1 -0
- package/dest/crypto/secp256k1/index.d.ts +2 -1
- package/dest/crypto/secp256k1/index.d.ts.map +1 -1
- package/dest/crypto/secp256k1/index.js +1 -0
- package/dest/crypto/secp256k1-signer/utils.d.ts +2 -1
- package/dest/crypto/secp256k1-signer/utils.d.ts.map +1 -1
- package/dest/crypto/secp256k1-signer/utils.js +1 -0
- package/dest/crypto/sha256/index.d.ts +2 -1
- package/dest/crypto/sha256/index.d.ts.map +1 -1
- package/dest/crypto/sha256/index.js +2 -1
- package/dest/crypto/sha512/index.d.ts +2 -1
- package/dest/crypto/sha512/index.d.ts.map +1 -1
- package/dest/crypto/sha512/index.js +1 -0
- package/dest/crypto/sync/pedersen/index.d.ts +2 -1
- package/dest/crypto/sync/pedersen/index.d.ts.map +1 -1
- package/dest/crypto/sync/pedersen/index.js +1 -0
- package/dest/crypto/sync/poseidon/index.d.ts +2 -1
- package/dest/crypto/sync/poseidon/index.d.ts.map +1 -1
- package/dest/crypto/sync/poseidon/index.js +1 -0
- package/dest/curves/bls12/field.d.ts +3 -2
- package/dest/curves/bls12/field.d.ts.map +1 -1
- package/dest/curves/bls12/field.js +2 -1
- package/dest/curves/bls12/point.d.ts +3 -2
- package/dest/curves/bls12/point.d.ts.map +1 -1
- package/dest/curves/bls12/point.js +2 -1
- package/dest/curves/bn254/field.d.ts +3 -2
- package/dest/curves/bn254/field.d.ts.map +1 -1
- package/dest/curves/bn254/field.js +4 -2
- package/dest/curves/bn254/point.d.ts +2 -1
- package/dest/curves/bn254/point.d.ts.map +1 -1
- package/dest/curves/bn254/point.js +1 -0
- package/dest/curves/grumpkin/point.d.ts +2 -1
- package/dest/curves/grumpkin/point.d.ts.map +1 -1
- package/dest/curves/grumpkin/point.js +1 -0
- 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 +2 -1
- package/dest/fifo/fifo_frame_reader.d.ts +2 -1
- package/dest/fifo/fifo_frame_reader.d.ts.map +1 -1
- package/dest/fifo/fifo_frame_reader.js +1 -0
- package/dest/inspect/index.d.ts +11 -0
- package/dest/inspect/index.d.ts.map +1 -0
- package/dest/inspect/index.js +11 -0
- package/dest/inspect/inspect_without_node.d.ts +10 -0
- package/dest/inspect/inspect_without_node.d.ts.map +1 -0
- package/dest/inspect/inspect_without_node.js +39 -0
- package/dest/json-rpc/client/fetch.d.ts +1 -1
- package/dest/json-rpc/client/fetch.d.ts.map +1 -1
- package/dest/json-rpc/client/fetch.js +5 -2
- package/dest/json-rpc/client/safe_json_rpc_client.d.ts +1 -1
- package/dest/json-rpc/client/safe_json_rpc_client.d.ts.map +1 -1
- package/dest/json-rpc/client/safe_json_rpc_client.js +8 -3
- 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 +1 -0
- package/dest/json-rpc/server/api_key_auth.d.ts +2 -1
- package/dest/json-rpc/server/api_key_auth.d.ts.map +1 -1
- package/dest/json-rpc/server/api_key_auth.js +1 -0
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.d.ts.map +1 -1
- package/dest/json-rpc/server/safe_json_rpc_server.js +2 -1
- package/dest/log/index.d.ts +2 -1
- package/dest/log/index.d.ts.map +1 -1
- package/dest/log/index.js +1 -0
- package/dest/log/libp2p_logger.d.ts +1 -1
- package/dest/log/libp2p_logger.d.ts.map +1 -1
- package/dest/log/libp2p_logger.js +11 -17
- package/dest/log/log-filters.d.ts +8 -1
- package/dest/log/log-filters.d.ts.map +1 -1
- package/dest/log/log-filters.js +28 -4
- package/dest/log/pino-logger.d.ts +23 -2
- package/dest/log/pino-logger.d.ts.map +1 -1
- package/dest/log/pino-logger.js +78 -26
- package/dest/queue/index.d.ts +2 -1
- package/dest/queue/index.d.ts.map +1 -1
- package/dest/queue/index.js +1 -0
- package/dest/queue/read_write_lock.d.ts +21 -0
- package/dest/queue/read_write_lock.d.ts.map +1 -0
- package/dest/queue/read_write_lock.js +44 -0
- package/dest/queue/semaphore.d.ts +17 -2
- package/dest/queue/semaphore.d.ts.map +1 -1
- package/dest/queue/semaphore.js +22 -2
- package/dest/schemas/schemas.d.ts +2 -1
- package/dest/schemas/schemas.d.ts.map +1 -1
- package/dest/schemas/schemas.js +1 -0
- package/dest/schemas/utils.d.ts +2 -1
- package/dest/schemas/utils.d.ts.map +1 -1
- package/dest/schemas/utils.js +1 -0
- package/dest/serialize/buffer_reader.d.ts +2 -1
- package/dest/serialize/buffer_reader.d.ts.map +1 -1
- package/dest/serialize/buffer_reader.js +1 -0
- package/dest/serialize/buffer_sink.d.ts +2 -1
- package/dest/serialize/buffer_sink.d.ts.map +1 -1
- package/dest/serialize/buffer_sink.js +2 -4
- package/dest/serialize/free_funcs.d.ts +2 -1
- package/dest/serialize/free_funcs.d.ts.map +1 -1
- package/dest/serialize/free_funcs.js +1 -0
- package/dest/serialize/serialize.d.ts +2 -1
- package/dest/serialize/serialize.d.ts.map +1 -1
- package/dest/serialize/serialize.js +1 -0
- package/dest/serialize/type_registry.d.ts +1 -1
- package/dest/serialize/type_registry.d.ts.map +1 -1
- package/dest/serialize/type_registry.js +1 -0
- package/dest/string/index.d.ts +2 -1
- package/dest/string/index.d.ts.map +1 -1
- package/dest/string/index.js +2 -1
- 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 +2 -1
- package/dest/testing/snapshot_serializer.d.ts +1 -1
- package/dest/testing/snapshot_serializer.d.ts.map +1 -1
- package/dest/testing/snapshot_serializer.js +2 -1
- package/dest/testing/test_data.d.ts +1 -1
- package/dest/testing/test_data.d.ts.map +1 -1
- package/dest/testing/test_data.js +2 -1
- package/dest/trees/hasher.d.ts +2 -1
- package/dest/trees/hasher.d.ts.map +1 -1
- package/dest/trees/hasher.js +1 -0
- package/dest/trees/indexed_merkle_tree.d.ts +2 -1
- package/dest/trees/indexed_merkle_tree.d.ts.map +1 -1
- package/dest/trees/indexed_merkle_tree.js +1 -0
- package/dest/trees/indexed_merkle_tree_calculator.d.ts +2 -1
- package/dest/trees/indexed_merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/indexed_merkle_tree_calculator.js +1 -0
- package/dest/trees/merkle_tree.d.ts +2 -1
- package/dest/trees/merkle_tree.d.ts.map +1 -1
- package/dest/trees/merkle_tree.js +1 -0
- package/dest/trees/merkle_tree_calculator.d.ts +2 -1
- package/dest/trees/merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/merkle_tree_calculator.js +1 -0
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts +2 -1
- package/dest/trees/unbalanced_merkle_tree_calculator.d.ts.map +1 -1
- package/dest/trees/unbalanced_merkle_tree_calculator.js +1 -0
- package/dest/trees/unbalanced_merkle_tree_root.d.ts +2 -1
- package/dest/trees/unbalanced_merkle_tree_root.d.ts.map +1 -1
- package/dest/trees/unbalanced_merkle_tree_root.js +1 -0
- package/package.json +8 -5
- package/src/bigint-buffer/index.ts +2 -0
- package/src/buffer/buffer16.ts +2 -1
- package/src/buffer/buffer32.ts +2 -1
- package/src/config/env.ts +16 -0
- package/src/config/env_var.ts +3 -1
- package/src/config/index.ts +25 -18
- package/src/config/network_name.ts +3 -1
- package/src/config/secret_value.ts +2 -1
- package/src/crypto/bls/bn254_keystore.ts +1 -0
- package/src/crypto/bls/index.ts +1 -0
- package/src/crypto/ecdsa/index.ts +2 -0
- package/src/crypto/ecdsa/signature.ts +1 -0
- package/src/crypto/grumpkin/index.ts +1 -0
- package/src/crypto/keys/index.ts +2 -0
- package/src/crypto/pedersen/pedersen.wasm.ts +2 -0
- package/src/crypto/poseidon/index.ts +2 -0
- package/src/crypto/random/index.ts +2 -0
- package/src/crypto/random/randomness_singleton.ts +5 -1
- package/src/crypto/schnorr/index.ts +1 -0
- package/src/crypto/schnorr/signature.ts +1 -0
- package/src/crypto/secp256k1/index.ts +2 -0
- package/src/crypto/secp256k1-signer/utils.ts +1 -0
- package/src/crypto/sha256/index.ts +1 -0
- package/src/crypto/sha512/index.ts +1 -0
- package/src/crypto/sync/pedersen/index.ts +2 -0
- package/src/crypto/sync/poseidon/index.ts +2 -0
- package/src/curves/bls12/field.ts +2 -1
- package/src/curves/bls12/point.ts +2 -1
- package/src/curves/bn254/field.ts +4 -2
- package/src/curves/bn254/point.ts +2 -0
- package/src/curves/grumpkin/point.ts +2 -0
- package/src/eth-address/index.ts +2 -1
- package/src/fifo/fifo_frame_reader.ts +1 -0
- package/src/inspect/index.ts +14 -0
- package/src/inspect/inspect_without_node.ts +45 -0
- package/src/json-rpc/client/fetch.ts +5 -3
- package/src/json-rpc/client/safe_json_rpc_client.ts +8 -4
- package/src/json-rpc/client/undici.ts +1 -0
- package/src/json-rpc/server/api_key_auth.ts +1 -0
- package/src/json-rpc/server/safe_json_rpc_server.ts +2 -1
- package/src/log/index.ts +1 -0
- package/src/log/libp2p_logger.ts +8 -10
- package/src/log/log-filters.ts +27 -7
- package/src/log/pino-logger.ts +81 -22
- package/src/queue/index.ts +1 -0
- package/src/queue/read_write_lock.ts +53 -0
- package/src/queue/semaphore.ts +26 -2
- package/src/schemas/schemas.ts +1 -0
- package/src/schemas/utils.ts +1 -0
- package/src/serialize/buffer_reader.ts +2 -0
- package/src/serialize/buffer_sink.ts +2 -0
- package/src/serialize/free_funcs.ts +2 -0
- package/src/serialize/serialize.ts +2 -0
- package/src/serialize/type_registry.ts +2 -0
- package/src/string/index.ts +2 -0
- package/src/testing/files/index.ts +2 -1
- package/src/testing/snapshot_serializer.ts +3 -1
- package/src/testing/test_data.ts +3 -1
- package/src/trees/hasher.ts +2 -0
- package/src/trees/indexed_merkle_tree.ts +2 -0
- package/src/trees/indexed_merkle_tree_calculator.ts +1 -0
- package/src/trees/merkle_tree.ts +2 -0
- package/src/trees/merkle_tree_calculator.ts +2 -0
- package/src/trees/unbalanced_merkle_tree_calculator.ts +2 -0
- package/src/trees/unbalanced_merkle_tree_root.ts +2 -0
package/src/log/index.ts
CHANGED
package/src/log/libp2p_logger.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { ComponentLogger, Logger } from '@libp2p/interface';
|
|
2
2
|
|
|
3
|
-
import { getLogLevelFromFilters } from './log-filters.js';
|
|
4
3
|
import type { LogLevel } from './log-levels.js';
|
|
5
|
-
import { type LoggerBindings,
|
|
4
|
+
import { type LoggerBindings, createPinoChild } from './pino-logger.js';
|
|
6
5
|
|
|
7
6
|
/**
|
|
8
7
|
* Creates a libp2p compatible logger that wraps our pino logger.
|
|
@@ -28,14 +27,10 @@ function replaceFormatting(message: string) {
|
|
|
28
27
|
|
|
29
28
|
function createLibp2pLogger(component: string, bindings?: LoggerBindings): Logger {
|
|
30
29
|
// Create a direct pino logger instance for libp2p that supports string interpolation
|
|
31
|
-
const
|
|
32
|
-
const instanceId = bindings?.instanceId;
|
|
33
|
-
const log = logger.child(
|
|
34
|
-
{ module: component, ...(actor && { actor }), ...(instanceId && { instanceId }) },
|
|
35
|
-
{ level: getLogLevelFromFilters(logFilters, component) },
|
|
36
|
-
);
|
|
30
|
+
const getLog = createPinoChild(component, bindings);
|
|
37
31
|
|
|
38
32
|
const logIfEnabled = (level: LogLevel, message: string, ...args: unknown[]) => {
|
|
33
|
+
const log = getLog();
|
|
39
34
|
if (!log.isLevelEnabled(level)) {
|
|
40
35
|
return;
|
|
41
36
|
}
|
|
@@ -48,8 +43,8 @@ function createLibp2pLogger(component: string, bindings?: LoggerBindings): Logge
|
|
|
48
43
|
logIfEnabled('trace', message, ...args);
|
|
49
44
|
};
|
|
50
45
|
|
|
51
|
-
|
|
52
|
-
enabled:
|
|
46
|
+
const libp2pLogger = Object.assign(logFn, {
|
|
47
|
+
enabled: getLog().isLevelEnabled('debug'),
|
|
53
48
|
error(message: string, ...args: unknown[]) {
|
|
54
49
|
// We write error outputs as debug as they are often expected, e.g. connection errors can happen in happy paths
|
|
55
50
|
logIfEnabled('debug', `error: ${message}`, ...args);
|
|
@@ -71,6 +66,9 @@ function createLibp2pLogger(component: string, bindings?: LoggerBindings): Logge
|
|
|
71
66
|
logIfEnabled('trace', message, ...args);
|
|
72
67
|
},
|
|
73
68
|
});
|
|
69
|
+
// Redefine as a getter so the flag tracks live level changes made via setLogLevel.
|
|
70
|
+
Object.defineProperty(libp2pLogger, 'enabled', { get: () => getLog().isLevelEnabled('debug'), enumerable: true });
|
|
71
|
+
return libp2pLogger;
|
|
74
72
|
}
|
|
75
73
|
|
|
76
74
|
function formatArgs(message: string, args: unknown[]) {
|
package/src/log/log-filters.ts
CHANGED
|
@@ -46,6 +46,25 @@ export function parseLogLevelEnvVar(
|
|
|
46
46
|
return [level, parseFilters(logLevelEnvVar.slice(level.length + 1))];
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
+
/**
|
|
50
|
+
* Renders a default level and per-module filters into the `LOG_LEVEL` env var format.
|
|
51
|
+
* Inverse of {@link parseLogLevelEnvVar}: parsing the returned string yields the same level and filters.
|
|
52
|
+
*/
|
|
53
|
+
export function formatLogLevelSpec(defaultLevel: LogLevel, filters: LogFilters): string {
|
|
54
|
+
const statements = [...filters].reverse().map(([module, level]) => `${level}:${module}`);
|
|
55
|
+
return [defaultLevel, ...statements].join(';');
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** Returns whether the given string is a valid log level spec in the `LOG_LEVEL` env var format. */
|
|
59
|
+
export function isValidLogLevelSpec(spec: string): boolean {
|
|
60
|
+
try {
|
|
61
|
+
parseLogLevelEnvVar(spec, 'info');
|
|
62
|
+
return true;
|
|
63
|
+
} catch {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
49
68
|
function assertValidLogLevel(level: string): asserts level is LogLevel {
|
|
50
69
|
if (!LogLevels.includes(level as LogLevel)) {
|
|
51
70
|
throw new Error(`Invalid log level: ${level}`);
|
|
@@ -68,13 +87,14 @@ function parseFilters(definition: string | undefined): LogFilters {
|
|
|
68
87
|
const sanitizedLevel = level.trim().toLowerCase();
|
|
69
88
|
assertValidLogLevel(sanitizedLevel);
|
|
70
89
|
for (const module of modules.split(',')) {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
90
|
+
const sanitizedModule = module
|
|
91
|
+
.trim()
|
|
92
|
+
.toLowerCase()
|
|
93
|
+
.replace(/^aztec:/, '');
|
|
94
|
+
// An empty module would compile to a regex matching every module, and could not be formatted back into a spec.
|
|
95
|
+
if (sanitizedModule) {
|
|
96
|
+
filters.push([sanitizedModule, sanitizedLevel as LogLevel | 'silent']);
|
|
97
|
+
}
|
|
78
98
|
}
|
|
79
99
|
}
|
|
80
100
|
return filters.reverse();
|
package/src/log/pino-logger.ts
CHANGED
|
@@ -2,15 +2,16 @@ import { type Color, createColors, isColorSupported } from 'colorette';
|
|
|
2
2
|
import isNode from 'detect-node';
|
|
3
3
|
import { pino, symbols } from 'pino';
|
|
4
4
|
import type { Writable } from 'stream';
|
|
5
|
-
import { inspect } from 'util';
|
|
6
5
|
|
|
7
6
|
import { compactArray } from '../collection/array.js';
|
|
7
|
+
import { getEnv } from '../config/env.js';
|
|
8
8
|
import type { EnvVar } from '../config/index.js';
|
|
9
9
|
import { parseBooleanEnv } from '../config/parse-env.js';
|
|
10
|
+
import { inspect } from '../inspect/index.js';
|
|
10
11
|
import { AWSCloudLoggerConfig } from './aws-logger-config.js';
|
|
11
12
|
import { convertBigintsToStrings } from './bigint-utils.js';
|
|
12
13
|
import { GoogleCloudLoggerConfig } from './gcloud-logger-config.js';
|
|
13
|
-
import { getLogLevelFromFilters, parseLogLevelEnvVar } from './log-filters.js';
|
|
14
|
+
import { type LogFilters, formatLogLevelSpec, getLogLevelFromFilters, parseLogLevelEnvVar } from './log-filters.js';
|
|
14
15
|
import type { LogLevel } from './log-levels.js';
|
|
15
16
|
import type { LogData, LogFn } from './log_fn.js';
|
|
16
17
|
|
|
@@ -57,15 +58,14 @@ export function createLogger(module: string, bindings?: LoggerBindings): Logger
|
|
|
57
58
|
const actor = resolvedBindings?.actor;
|
|
58
59
|
const instanceId = resolvedBindings?.instanceId;
|
|
59
60
|
|
|
60
|
-
const
|
|
61
|
-
{ module, ...(actor && { actor }), ...(instanceId && { instanceId }) },
|
|
62
|
-
{ level: getLogLevelFromFilters(logFilters, module) },
|
|
63
|
-
);
|
|
61
|
+
const getPinoLogger = createPinoChild(module, { actor, instanceId });
|
|
64
62
|
|
|
65
63
|
// We check manually for isLevelEnabled to avoid calling processLogData unnecessarily.
|
|
66
64
|
// Note that isLevelEnabled is missing from the browser version of pino.
|
|
67
|
-
const logFn = (level: LogLevel, msg: string, data?: unknown) =>
|
|
68
|
-
|
|
65
|
+
const logFn = (level: LogLevel, msg: string, data?: unknown) => {
|
|
66
|
+
const pinoLogger = getPinoLogger();
|
|
67
|
+
return isLevelEnabled(pinoLogger, level) && pinoLogger[level](processLogData((data as LogData) ?? {}), msg);
|
|
68
|
+
};
|
|
69
69
|
|
|
70
70
|
return {
|
|
71
71
|
silent: () => {},
|
|
@@ -85,9 +85,11 @@ export function createLogger(module: string, bindings?: LoggerBindings): Logger
|
|
|
85
85
|
/** Log as trace. Use for when we want to denial-of-service any recipient of the logs. */
|
|
86
86
|
trace: (msg: string, data?: unknown) => logFn('trace', msg, data),
|
|
87
87
|
/** Level of the logger */
|
|
88
|
-
|
|
88
|
+
get level() {
|
|
89
|
+
return getPinoLogger().level as LogLevel;
|
|
90
|
+
},
|
|
89
91
|
/** Whether the given level is enabled for this logger. */
|
|
90
|
-
isLevelEnabled: (level: LogLevel) => isLevelEnabled(
|
|
92
|
+
isLevelEnabled: (level: LogLevel) => isLevelEnabled(getPinoLogger(), level),
|
|
91
93
|
/** Module name for the logger. */
|
|
92
94
|
module,
|
|
93
95
|
/** Creates another logger by extending this logger module name and preserving bindings. */
|
|
@@ -128,16 +130,68 @@ function isLevelEnabled(logger: pino.Logger<'verbose', boolean>, level: LogLevel
|
|
|
128
130
|
: logger.levels.values[level] >= logger.levels.values[logger.level];
|
|
129
131
|
}
|
|
130
132
|
|
|
131
|
-
// Load log levels from environment variables.
|
|
132
|
-
|
|
133
|
-
|
|
133
|
+
// Load log levels from environment variables. These exports reflect the startup configuration;
|
|
134
|
+
// the current values (mutable via setLogLevel) are tracked separately below.
|
|
135
|
+
const defaultLogLevel = getEnv().NODE_ENV === 'test' ? 'silent' : 'info';
|
|
136
|
+
export const [logLevel, logFilters] = parseLogLevelEnvVar(getEnv().LOG_LEVEL, defaultLogLevel);
|
|
137
|
+
|
|
138
|
+
let currentLogLevel: LogLevel = logLevel;
|
|
139
|
+
let currentLogFilters: LogFilters = logFilters;
|
|
140
|
+
|
|
141
|
+
// Bumped on every setLogLevel. Pino children fix their level at creation and do not follow later changes to the
|
|
142
|
+
// parent, so each child compares this against the generation it last synced to and recomputes its level lazily on
|
|
143
|
+
// its next use. This avoids keeping a registry of every live logger, since some code paths create short-lived ones.
|
|
144
|
+
let logLevelGeneration = 0;
|
|
145
|
+
|
|
146
|
+
/**
|
|
147
|
+
* Creates a pino child logger with the current per-module filter level applied. Returns an accessor rather than the
|
|
148
|
+
* logger itself: every use must go through it so the child picks up levels changed via setLogLevel.
|
|
149
|
+
* Internal to the logging module: use createLogger unless a raw pino instance is required.
|
|
150
|
+
*/
|
|
151
|
+
export function createPinoChild(module: string, bindings: LoggerBindings = {}): () => pino.Logger<'verbose'> {
|
|
152
|
+
const { actor, instanceId } = bindings;
|
|
153
|
+
const child = logger.child(
|
|
154
|
+
{ module, ...(actor && { actor }), ...(instanceId && { instanceId }) },
|
|
155
|
+
{ level: getLogLevelFromFilters(currentLogFilters, module) },
|
|
156
|
+
);
|
|
157
|
+
let syncedGeneration = logLevelGeneration;
|
|
158
|
+
return () => {
|
|
159
|
+
if (syncedGeneration !== logLevelGeneration) {
|
|
160
|
+
child.level = getLogLevelFromFilters(currentLogFilters, module) ?? currentLogLevel;
|
|
161
|
+
syncedGeneration = logLevelGeneration;
|
|
162
|
+
}
|
|
163
|
+
return child;
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* Updates the log level and per-module filters of all loggers created via createLogger, and of loggers created
|
|
169
|
+
* afterwards. Accepts the same format as the `LOG_LEVEL` env var (e.g. `info` or `debug;trace:sequencer,p2p`).
|
|
170
|
+
* Only affects the current thread: worker threads and spawned processes such as prover agents keep their own
|
|
171
|
+
* configuration.
|
|
172
|
+
* @param spec - Log level spec in `LOG_LEVEL` env var format. Throws if invalid, leaving current levels untouched.
|
|
173
|
+
*/
|
|
174
|
+
export function setLogLevel(spec: string): void {
|
|
175
|
+
const [newLevel, newFilters] = parseLogLevelEnvVar(spec, defaultLogLevel);
|
|
176
|
+
const previous = getLogLevel();
|
|
177
|
+
currentLogLevel = newLevel;
|
|
178
|
+
currentLogFilters = newFilters;
|
|
179
|
+
logger.level = newLevel;
|
|
180
|
+
logLevelGeneration++;
|
|
181
|
+
logger.info({ module: 'logger' }, `Updated log level from ${previous} to ${getLogLevel()}`);
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
/** Returns the current log level and per-module filters in the `LOG_LEVEL` env var format. */
|
|
185
|
+
export function getLogLevel(): string {
|
|
186
|
+
return formatLogLevelSpec(currentLogLevel, currentLogFilters);
|
|
187
|
+
}
|
|
134
188
|
|
|
135
189
|
// Define custom logging levels for pino.
|
|
136
190
|
const customLevels = { verbose: 25 };
|
|
137
191
|
|
|
138
192
|
// Global pino options, tweaked for the active cloud logging backend.
|
|
139
|
-
const useGcloudLogging = parseBooleanEnv(
|
|
140
|
-
const useAwsLogging = parseBooleanEnv(
|
|
193
|
+
const useGcloudLogging = parseBooleanEnv(getEnv()['USE_GCLOUD_LOGGING' satisfies EnvVar]);
|
|
194
|
+
const useAwsLogging = parseBooleanEnv(getEnv()['USE_AWS_LOGGING' satisfies EnvVar]);
|
|
141
195
|
const loggingConfig = useGcloudLogging
|
|
142
196
|
? GoogleCloudLoggerConfig
|
|
143
197
|
: useAwsLogging
|
|
@@ -190,14 +244,14 @@ export const levels = {
|
|
|
190
244
|
};
|
|
191
245
|
|
|
192
246
|
// Transport options for pretty logging to stderr via pino-pretty.
|
|
193
|
-
const colorEnv =
|
|
247
|
+
const colorEnv = getEnv()['FORCE_COLOR' satisfies EnvVar];
|
|
194
248
|
const useColor = colorEnv === undefined ? isColorSupported : parseBooleanEnv(colorEnv);
|
|
195
249
|
const { bold, reset, cyan, magenta, yellow, blue, green, magentaBright, yellowBright, blueBright, greenBright } =
|
|
196
250
|
createColors({ useColor });
|
|
197
251
|
|
|
198
252
|
// Per-actor coloring: each unique actor gets a different color for easier visual distinction.
|
|
199
253
|
// Disabled when LOG_NO_COLOR_PER_ACTOR is set to a truthy value.
|
|
200
|
-
const useColorPerActor = useColor && !parseBooleanEnv(
|
|
254
|
+
const useColorPerActor = useColor && !parseBooleanEnv(getEnv()['LOG_NO_COLOR_PER_ACTOR' satisfies EnvVar]);
|
|
201
255
|
const actorColors: Color[] = [yellow, magenta, blue, green, magentaBright, yellowBright, blueBright, greenBright];
|
|
202
256
|
const actorColorMap = new Map<string, Color>();
|
|
203
257
|
let nextColorIndex = 0;
|
|
@@ -255,7 +309,7 @@ const pinoPrettyBaseOpts = {
|
|
|
255
309
|
customLevels: 'fatal:60,error:50,warn:40,info:30,verbose:25,debug:20,trace:10',
|
|
256
310
|
customColors: 'fatal:bgRed,error:red,warn:yellow,info:green,verbose:magenta,debug:blue,trace:gray',
|
|
257
311
|
minimumLevel: 'trace' as const,
|
|
258
|
-
singleLine: !parseBooleanEnv(
|
|
312
|
+
singleLine: !parseBooleanEnv(getEnv()['LOG_MULTILINE' satisfies EnvVar]),
|
|
259
313
|
};
|
|
260
314
|
|
|
261
315
|
/**
|
|
@@ -292,7 +346,7 @@ const stdioTransport: pino.TransportTargetOptions = {
|
|
|
292
346
|
// would mean that all child loggers created before the telemetry-client is initialized would not have
|
|
293
347
|
// this transport configured. Note that the target is defined as the export in the telemetry-client,
|
|
294
348
|
// since pino will load this transport separately on a worker thread, to minimize disruption to the main loop.
|
|
295
|
-
const otlpEndpoint =
|
|
349
|
+
const otlpEndpoint = getEnv()['OTEL_EXPORTER_OTLP_LOGS_ENDPOINT' satisfies EnvVar];
|
|
296
350
|
const otlpEnabled = !!otlpEndpoint && !useGcloudLogging;
|
|
297
351
|
const otelOpts = { levels };
|
|
298
352
|
const otelTransport: pino.TransportTargetOptions = {
|
|
@@ -307,7 +361,7 @@ function makeLogger() {
|
|
|
307
361
|
}
|
|
308
362
|
// If running in a child process then cancel this if statement section by uncommenting below
|
|
309
363
|
// else if (false) {
|
|
310
|
-
else if (
|
|
364
|
+
else if (getEnv().JEST_WORKER_ID) {
|
|
311
365
|
// We are on jest, so we need sync logging and stream to stderr.
|
|
312
366
|
// We expect jest/setup.mjs to kick in later and replace set up a pretty logger,
|
|
313
367
|
// but if for some reason it doesn't, at least we're covered with a default logger.
|
|
@@ -316,7 +370,7 @@ function makeLogger() {
|
|
|
316
370
|
// Regular nodejs with transports on worker thread, using pino-pretty for console logging if LOG_JSON
|
|
317
371
|
// is not set, and an optional OTLP transport if the OTLP endpoint is set.
|
|
318
372
|
const targets: pino.TransportSingleOptions[] = compactArray([
|
|
319
|
-
parseBooleanEnv(
|
|
373
|
+
parseBooleanEnv(getEnv().LOG_JSON) ? stdioTransport : prettyTransport,
|
|
320
374
|
otlpEnabled ? otelTransport : undefined,
|
|
321
375
|
]);
|
|
322
376
|
return pino(pinoOpts, pino.transport({ targets, levels: levels.values }));
|
|
@@ -371,7 +425,12 @@ type ErrorLogFn = (msg: string, err?: unknown, data?: LogData) => void;
|
|
|
371
425
|
/**
|
|
372
426
|
* Logger that supports multiple severity levels.
|
|
373
427
|
*/
|
|
374
|
-
export type Logger = { [K in LogLevel]: LogFn } & {
|
|
428
|
+
export type Logger = { [K in LogLevel]: LogFn } & {
|
|
429
|
+
/** Fatal log function */
|
|
430
|
+
fatal: ErrorLogFn;
|
|
431
|
+
/** Error log function */
|
|
432
|
+
error: ErrorLogFn;
|
|
433
|
+
} & {
|
|
375
434
|
level: LogLevel;
|
|
376
435
|
isLevelEnabled: (level: LogLevel) => boolean;
|
|
377
436
|
module: string;
|
package/src/queue/index.ts
CHANGED
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { type PromiseWithResolvers, promiseWithResolvers } from '../promise/index.js';
|
|
2
|
+
import { Semaphore } from './semaphore.js';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* A readers-writer lock: any number of shared holders at once, or one exclusive holder with no shared holder alongside.
|
|
6
|
+
*
|
|
7
|
+
* Exclusive holders take turns in the order they asked. Only the exclusive holder whose turn it is holds back new
|
|
8
|
+
* shared holders, not those still waiting for theirs, so shared holders that asked during a turn get in between it and
|
|
9
|
+
* the next one.
|
|
10
|
+
*/
|
|
11
|
+
export class ReadWriteLock {
|
|
12
|
+
/** Gives exclusive holders their turns, one at a time, in the order they asked. */
|
|
13
|
+
private readonly exclusiveTurns = new Semaphore(1);
|
|
14
|
+
/** Set while an exclusive holder has its turn, holding back new shared holders; settles when the turn ends. */
|
|
15
|
+
private exclusiveTurn: Promise<void> | undefined;
|
|
16
|
+
private sharedHolders = 0;
|
|
17
|
+
/** Resolved when the last shared holder finishes, for an exclusive holder waiting to start its turn. */
|
|
18
|
+
private sharedDrained: PromiseWithResolvers<void> | undefined;
|
|
19
|
+
|
|
20
|
+
/** Runs `fn` alongside any other shared holders, once no exclusive holder has its turn. */
|
|
21
|
+
public async runShared<T>(fn: () => Promise<T>): Promise<T> {
|
|
22
|
+
while (this.exclusiveTurn) {
|
|
23
|
+
await this.exclusiveTurn;
|
|
24
|
+
}
|
|
25
|
+
this.sharedHolders++;
|
|
26
|
+
try {
|
|
27
|
+
return await fn();
|
|
28
|
+
} finally {
|
|
29
|
+
if (--this.sharedHolders === 0) {
|
|
30
|
+
this.sharedDrained?.resolve();
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Runs `fn` with no other holder: after the exclusive holders that asked before it and the shared ones running. */
|
|
36
|
+
public async runExclusive<T>(fn: () => Promise<T>): Promise<T> {
|
|
37
|
+
await this.exclusiveTurns.acquire();
|
|
38
|
+
const turn = promiseWithResolvers<void>();
|
|
39
|
+
this.exclusiveTurn = turn.promise;
|
|
40
|
+
try {
|
|
41
|
+
if (this.sharedHolders > 0) {
|
|
42
|
+
this.sharedDrained = promiseWithResolvers<void>();
|
|
43
|
+
await this.sharedDrained.promise;
|
|
44
|
+
this.sharedDrained = undefined;
|
|
45
|
+
}
|
|
46
|
+
return await fn();
|
|
47
|
+
} finally {
|
|
48
|
+
this.exclusiveTurn = undefined;
|
|
49
|
+
turn.resolve();
|
|
50
|
+
this.exclusiveTurns.release();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
package/src/queue/semaphore.ts
CHANGED
|
@@ -7,9 +7,12 @@ export interface ISemaphore {
|
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Allows the acquiring of up to `size` tokens before calls to acquire block, waiting for a call to release().
|
|
10
|
+
* Blocked calls acquire in the order they were made: a released token goes to the one waiting longest, never to a
|
|
11
|
+
* later call.
|
|
10
12
|
*/
|
|
11
13
|
export class Semaphore {
|
|
12
14
|
private readonly queue = new FifoMemoryQueue<boolean>();
|
|
15
|
+
private cancelled = false;
|
|
13
16
|
|
|
14
17
|
constructor(size: number) {
|
|
15
18
|
new Array(size).fill(true).map(() => this.queue.put(true));
|
|
@@ -26,13 +29,34 @@ export class Semaphore {
|
|
|
26
29
|
await this.queue.get();
|
|
27
30
|
}
|
|
28
31
|
|
|
32
|
+
/**
|
|
33
|
+
* Takes a token if one is free, without waiting. A token is never free while acquire() calls are waiting for one, so
|
|
34
|
+
* this never takes one ahead of them.
|
|
35
|
+
* @returns Whether the caller may proceed: a token was taken, or the semaphore is cancelled.
|
|
36
|
+
*/
|
|
37
|
+
public tryAcquire(): boolean {
|
|
38
|
+
return this.cancelled || this.queue.getImmediate() !== undefined;
|
|
39
|
+
}
|
|
40
|
+
|
|
29
41
|
/**
|
|
30
42
|
* Releases a token back into the semaphore, allowing another acquire call to proceed.
|
|
31
|
-
* If there are any pending calls to acquire(), one
|
|
43
|
+
* If there are any pending calls to acquire(), the one waiting longest is unblocked and allowed to proceed.
|
|
32
44
|
* This method should only be called by the holder of the acquired token to ensure proper functionality
|
|
33
45
|
* and avoid unexpected behavior.
|
|
34
46
|
*/
|
|
35
47
|
public release() {
|
|
36
|
-
this.
|
|
48
|
+
if (!this.cancelled) {
|
|
49
|
+
this.queue.put(true);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Stops limiting access: every pending acquire() call proceeds, as does every later one (and tryAcquire() succeeds),
|
|
55
|
+
* and release() does nothing.
|
|
56
|
+
* Lets callers waiting for a token stop waiting once the resource is gone, so they must check for that themselves.
|
|
57
|
+
*/
|
|
58
|
+
public cancel() {
|
|
59
|
+
this.cancelled = true;
|
|
60
|
+
this.queue.cancel();
|
|
37
61
|
}
|
|
38
62
|
}
|
package/src/schemas/schemas.ts
CHANGED
package/src/schemas/utils.ts
CHANGED
package/src/string/index.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync, readFileSync, writeFileSync } from 'fs';
|
|
2
2
|
import { dirname, join, resolve } from 'path';
|
|
3
3
|
|
|
4
|
+
import { getEnv } from '../../config/env.js';
|
|
4
5
|
import { createConsoleLogger } from '../../log/console.js';
|
|
5
6
|
import { fileURLToPath } from '../../url/index.js';
|
|
6
7
|
import { isGenerateTestDataEnabled } from '../test_data.js';
|
|
@@ -87,7 +88,7 @@ export function updateProtocolCircuitSampleInputs(circuitName: string, value: st
|
|
|
87
88
|
* relative to the running package's working directory.
|
|
88
89
|
*/
|
|
89
90
|
export function getL1FixturePath(fileName: string) {
|
|
90
|
-
return join(
|
|
91
|
+
return join(getEnv().AZTEC_L1_FIXTURES_DIR ?? '../../l1-contracts/test/fixtures', fileName);
|
|
91
92
|
}
|
|
92
93
|
|
|
93
94
|
export function getPathToFile(targetFileFromRepoRoot: string) {
|
package/src/testing/test_data.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { getEnv } from '../config/env.js';
|
|
2
|
+
|
|
1
3
|
const testData: { [key: string]: unknown[] } = {};
|
|
2
4
|
|
|
3
5
|
/** Returns whether test data generation is enabled */
|
|
4
6
|
export function isGenerateTestDataEnabled() {
|
|
5
|
-
return ['1', 'true'].includes(
|
|
7
|
+
return ['1', 'true'].includes(getEnv().AZTEC_GENERATE_TEST_DATA ?? '') && typeof expect !== 'undefined';
|
|
6
8
|
}
|
|
7
9
|
|
|
8
10
|
/** Pushes test data with the given name, only if test data generation is enabled. */
|
package/src/trees/hasher.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { toBigIntBE } from '@aztec-labs/foundation/bigint-buffer';
|
|
2
2
|
import { numToUInt32BE } from '@aztec-labs/foundation/serialize';
|
|
3
3
|
import type { IndexedTreeLeafPreimage } from '@aztec-labs/foundation/trees';
|
|
4
|
+
import { Buffer } from 'buffer';
|
|
4
5
|
|
|
5
6
|
import type { AsyncHasher } from './hasher.js';
|
|
6
7
|
import { IndexedMerkleTree } from './indexed_merkle_tree.js';
|
package/src/trees/merkle_tree.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { Buffer } from 'buffer';
|
|
2
|
+
|
|
1
3
|
import { computeBalancedMerkleTreeRoot, computeBalancedMerkleTreeRootAsync } from './balanced_merkle_tree_root.js';
|
|
2
4
|
import { shaMerkleHash } from './hasher.js';
|
|
3
5
|
import { UnbalancedMerkleTreeCalculator } from './unbalanced_merkle_tree_calculator.js';
|