@aztec/world-state 0.49.2 → 0.51.0
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/synchronizer/factory.d.ts +2 -1
- package/dest/synchronizer/factory.d.ts.map +1 -1
- package/dest/synchronizer/factory.js +3 -3
- package/dest/world-state-db/merkle_trees.d.ts +4 -1
- package/dest/world-state-db/merkle_trees.d.ts.map +1 -1
- package/dest/world-state-db/merkle_trees.js +22 -10
- package/dest/world-state-db/metrics.d.ts +14 -0
- package/dest/world-state-db/metrics.d.ts.map +1 -0
- package/dest/world-state-db/metrics.js +44 -0
- package/package.json +8 -7
- package/src/synchronizer/factory.ts +3 -1
- package/src/world-state-db/merkle_trees.ts +24 -9
- package/src/world-state-db/metrics.ts +64 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
3
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
3
4
|
import { type WorldStateConfig } from './config.js';
|
|
4
5
|
import { ServerWorldStateSynchronizer } from './server_world_state_synchronizer.js';
|
|
5
|
-
export declare function createWorldStateSynchronizer(config: WorldStateConfig, store: AztecKVStore, l2BlockSource: L2BlockSource & L1ToL2MessageSource): Promise<ServerWorldStateSynchronizer>;
|
|
6
|
+
export declare function createWorldStateSynchronizer(config: WorldStateConfig, store: AztecKVStore, l2BlockSource: L2BlockSource & L1ToL2MessageSource, client: TelemetryClient): Promise<ServerWorldStateSynchronizer>;
|
|
6
7
|
//# sourceMappingURL=factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/synchronizer/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/synchronizer/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACpF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AAEpF,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,gBAAgB,EACxB,KAAK,EAAE,YAAY,EACnB,aAAa,EAAE,aAAa,GAAG,mBAAmB,EAClD,MAAM,EAAE,eAAe,yCAIxB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MerkleTrees } from '../world-state-db/merkle_trees.js';
|
|
2
2
|
import { ServerWorldStateSynchronizer } from './server_world_state_synchronizer.js';
|
|
3
|
-
export async function createWorldStateSynchronizer(config, store, l2BlockSource) {
|
|
4
|
-
const merkleTrees = await MerkleTrees.new(store);
|
|
3
|
+
export async function createWorldStateSynchronizer(config, store, l2BlockSource, client) {
|
|
4
|
+
const merkleTrees = await MerkleTrees.new(store, client);
|
|
5
5
|
return new ServerWorldStateSynchronizer(store, merkleTrees, l2BlockSource, config);
|
|
6
6
|
}
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zeW5jaHJvbml6ZXIvZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFaEUsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFFcEYsTUFBTSxDQUFDLEtBQUssVUFBVSw0QkFBNEIsQ0FDaEQsTUFBd0IsRUFDeEIsS0FBbUIsRUFDbkIsYUFBa0QsRUFDbEQsTUFBdUI7SUFFdkIsTUFBTSxXQUFXLEdBQUcsTUFBTSxXQUFXLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN6RCxPQUFPLElBQUksNEJBQTRCLENBQUMsS0FBSyxFQUFFLFdBQVcsRUFBRSxhQUFhLEVBQUUsTUFBTSxDQUFDLENBQUM7QUFDckYsQ0FBQyJ9
|
|
@@ -4,6 +4,7 @@ import { type BatchInsertionResult, type HandleL2BlockAndMessagesResult, type In
|
|
|
4
4
|
import { Fr, Header, StateReference } from '@aztec/circuits.js';
|
|
5
5
|
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
6
6
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
7
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
7
8
|
import { type MerkleTreeDb, type TreeSnapshots } from './merkle_tree_db.js';
|
|
8
9
|
/**
|
|
9
10
|
* A convenience class for managing multiple merkle trees.
|
|
@@ -11,17 +12,19 @@ import { type MerkleTreeDb, type TreeSnapshots } from './merkle_tree_db.js';
|
|
|
11
12
|
export declare class MerkleTrees implements MerkleTreeDb {
|
|
12
13
|
#private;
|
|
13
14
|
private store;
|
|
15
|
+
private telemetryClient;
|
|
14
16
|
private log;
|
|
15
17
|
private trees;
|
|
16
18
|
private jobQueue;
|
|
17
19
|
private initialStateReference;
|
|
20
|
+
private metrics;
|
|
18
21
|
private constructor();
|
|
19
22
|
/**
|
|
20
23
|
* Method to asynchronously create and initialize a MerkleTrees instance.
|
|
21
24
|
* @param store - The db instance to use for data persistance.
|
|
22
25
|
* @returns - A fully initialized MerkleTrees instance.
|
|
23
26
|
*/
|
|
24
|
-
static new(store: AztecKVStore, log?: import("@aztec/foundation/log").Logger): Promise<MerkleTrees>;
|
|
27
|
+
static new(store: AztecKVStore, client: TelemetryClient, log?: import("@aztec/foundation/log").Logger): Promise<MerkleTrees>;
|
|
25
28
|
fork(): Promise<MerkleTrees>;
|
|
26
29
|
delete(): Promise<void>;
|
|
27
30
|
getInitialHeader(): Header;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,YAAY,EAAmB,KAAK,WAAW,EAAY,MAAM,sBAAsB,CAAC;AAC/G,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,8BAA8B,EACnC,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAGL,EAAE,EACF,MAAM,EAgBN,cAAc,EACf,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,11 @@ import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, Fr, Header, L1_TO_L2_MSG_TREE_H
|
|
|
5
5
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
6
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
7
|
import { SerialQueue } from '@aztec/foundation/queue';
|
|
8
|
+
import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
8
9
|
import { Poseidon, StandardIndexedTree, StandardTree, getTreeMeta, loadTree, newTree, } from '@aztec/merkle-tree';
|
|
9
10
|
import { INITIAL_NULLIFIER_TREE_SIZE, INITIAL_PUBLIC_DATA_TREE_SIZE, } from './merkle_tree_db.js';
|
|
10
11
|
import { MerkleTreeOperationsFacade } from './merkle_tree_operations_facade.js';
|
|
12
|
+
import { WorldStateMetrics } from './metrics.js';
|
|
11
13
|
/**
|
|
12
14
|
* The nullifier tree is an indexed tree.
|
|
13
15
|
*/
|
|
@@ -28,32 +30,38 @@ class PublicDataTree extends StandardIndexedTree {
|
|
|
28
30
|
* A convenience class for managing multiple merkle trees.
|
|
29
31
|
*/
|
|
30
32
|
export class MerkleTrees {
|
|
31
|
-
constructor(store, log) {
|
|
33
|
+
constructor(store, telemetryClient, log) {
|
|
32
34
|
_MerkleTrees_instances.add(this);
|
|
33
35
|
this.store = store;
|
|
36
|
+
this.telemetryClient = telemetryClient;
|
|
34
37
|
this.log = log;
|
|
35
38
|
// gets initialized in #init
|
|
36
39
|
this.trees = null;
|
|
37
40
|
this.jobQueue = new SerialQueue();
|
|
38
41
|
this.initialStateReference = store.openSingleton('merkle_trees_initial_state_reference');
|
|
42
|
+
this.metrics = new WorldStateMetrics(telemetryClient);
|
|
39
43
|
}
|
|
40
44
|
/**
|
|
41
45
|
* Method to asynchronously create and initialize a MerkleTrees instance.
|
|
42
46
|
* @param store - The db instance to use for data persistance.
|
|
43
47
|
* @returns - A fully initialized MerkleTrees instance.
|
|
44
48
|
*/
|
|
45
|
-
static async new(store, log = createDebugLogger('aztec:merkle_trees')) {
|
|
46
|
-
const merkleTrees = new MerkleTrees(store, log);
|
|
49
|
+
static async new(store, client, log = createDebugLogger('aztec:merkle_trees')) {
|
|
50
|
+
const merkleTrees = new MerkleTrees(store, client, log);
|
|
47
51
|
await __classPrivateFieldGet(merkleTrees, _MerkleTrees_instances, "m", _MerkleTrees_init).call(merkleTrees);
|
|
48
52
|
return merkleTrees;
|
|
49
53
|
}
|
|
50
54
|
async fork() {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
const [ms, db] = await elapsed(async () => {
|
|
56
|
+
// TODO(palla/prover-node): If the underlying store is being shared with other components, we're unnecessarily
|
|
57
|
+
// copying a lot of data unrelated to merkle trees. This may be fine for now, and we may be able to ditch backup-based
|
|
58
|
+
// forking in favor of a more elegant proposal. But if we see this operation starts taking a lot of time, we may want
|
|
59
|
+
// to open separate stores for merkle trees and other components.
|
|
60
|
+
const forked = await this.store.fork();
|
|
61
|
+
return MerkleTrees.new(forked, this.telemetryClient, this.log);
|
|
62
|
+
});
|
|
63
|
+
this.metrics.recordForkDuration(ms);
|
|
64
|
+
return db;
|
|
57
65
|
}
|
|
58
66
|
async delete() {
|
|
59
67
|
await this.store.delete();
|
|
@@ -359,6 +367,7 @@ async function _MerkleTrees_rollback() {
|
|
|
359
367
|
* @param l1ToL2Messages - The L1 to L2 messages for the block.
|
|
360
368
|
*/
|
|
361
369
|
async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
370
|
+
const timer = new Timer();
|
|
362
371
|
const treeRootWithIdPairs = [
|
|
363
372
|
[l2Block.header.state.partial.nullifierTree.root, MerkleTreeId.NULLIFIER_TREE],
|
|
364
373
|
[l2Block.header.state.partial.noteHashTree.root, MerkleTreeId.NOTE_HASH_TREE],
|
|
@@ -414,9 +423,12 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
|
414
423
|
}
|
|
415
424
|
else {
|
|
416
425
|
this.log.debug(`Tree ${treeName} synched with size ${info.size} root ${rootStr}`);
|
|
426
|
+
this.metrics.recordTreeSize(treeName, info.size);
|
|
417
427
|
}
|
|
418
428
|
}
|
|
419
429
|
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_snapshot).call(this, l2Block.number);
|
|
430
|
+
this.metrics.recordDbSize(this.store.estimateSize().bytes);
|
|
431
|
+
this.metrics.recordSyncDuration(ourBlock ? 'commit' : 'rollback_and_update', timer);
|
|
420
432
|
return { isBlockOurs: ourBlock };
|
|
421
433
|
}, _MerkleTrees_isDbPopulated = function _MerkleTrees_isDbPopulated() {
|
|
422
434
|
try {
|
|
@@ -429,4 +441,4 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
|
429
441
|
return false;
|
|
430
442
|
}
|
|
431
443
|
};
|
|
432
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
|
444
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type Timer } from '@aztec/foundation/timer';
|
|
2
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
3
|
+
export declare class WorldStateMetrics {
|
|
4
|
+
private treeSize;
|
|
5
|
+
private dbSize;
|
|
6
|
+
private forkDuration;
|
|
7
|
+
private syncDuration;
|
|
8
|
+
constructor(client: TelemetryClient, name?: string);
|
|
9
|
+
recordTreeSize(treeName: string, treeSize: bigint): void;
|
|
10
|
+
recordDbSize(dbSizeInBytes: number): void;
|
|
11
|
+
recordForkDuration(timerOrMs: Timer | number): void;
|
|
12
|
+
recordSyncDuration(syncType: 'commit' | 'rollback_and_update', timerOrMs: Timer | number): void;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=metrics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/world-state-db/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAKL,KAAK,eAAe,EAErB,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,YAAY,CAAY;gBAEpB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAkB;IA0B3D,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAMjD,YAAY,CAAC,aAAa,EAAE,MAAM;IAIlC,kBAAkB,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM;IAK5C,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,GAAG,qBAAqB,EAAE,SAAS,EAAE,KAAK,GAAG,MAAM;CAMzF"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Attributes, Metrics, ValueType, } from '@aztec/telemetry-client';
|
|
2
|
+
export class WorldStateMetrics {
|
|
3
|
+
constructor(client, name = 'MerkleTreesDb') {
|
|
4
|
+
const meter = client.getMeter(name);
|
|
5
|
+
this.treeSize = meter.createGauge(Metrics.WORLD_STATE_MERKLE_TREE_SIZE, {
|
|
6
|
+
description: 'The size of Merkle trees',
|
|
7
|
+
valueType: ValueType.INT,
|
|
8
|
+
});
|
|
9
|
+
this.dbSize = meter.createGauge(Metrics.WORLD_STATE_DB_SIZE, {
|
|
10
|
+
description: 'The size of the World State DB',
|
|
11
|
+
valueType: ValueType.INT,
|
|
12
|
+
unit: 'By',
|
|
13
|
+
});
|
|
14
|
+
this.forkDuration = meter.createHistogram(Metrics.WORLD_STATE_FORK_DURATION, {
|
|
15
|
+
description: 'The duration of a fork operation',
|
|
16
|
+
unit: 'ms',
|
|
17
|
+
valueType: ValueType.INT,
|
|
18
|
+
});
|
|
19
|
+
this.syncDuration = meter.createHistogram(Metrics.WORLD_STATE_SYNC_DURATION, {
|
|
20
|
+
description: 'The duration of a sync operation',
|
|
21
|
+
unit: 'ms',
|
|
22
|
+
valueType: ValueType.INT,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
recordTreeSize(treeName, treeSize) {
|
|
26
|
+
this.treeSize.record(Number(treeSize), {
|
|
27
|
+
[Attributes.MERKLE_TREE_NAME]: treeName,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
recordDbSize(dbSizeInBytes) {
|
|
31
|
+
this.dbSize.record(dbSizeInBytes);
|
|
32
|
+
}
|
|
33
|
+
recordForkDuration(timerOrMs) {
|
|
34
|
+
const ms = Math.ceil(typeof timerOrMs === 'number' ? timerOrMs : timerOrMs.ms());
|
|
35
|
+
this.forkDuration.record(ms);
|
|
36
|
+
}
|
|
37
|
+
recordSyncDuration(syncType, timerOrMs) {
|
|
38
|
+
const ms = Math.ceil(typeof timerOrMs === 'number' ? timerOrMs : timerOrMs.ms());
|
|
39
|
+
this.syncDuration.record(ms, {
|
|
40
|
+
[Attributes.STATUS]: syncType,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy93b3JsZC1zdGF0ZS1kYi9tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFDTCxVQUFVLEVBR1YsT0FBTyxFQUVQLFNBQVMsR0FDVixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE1BQU0sT0FBTyxpQkFBaUI7SUFNNUIsWUFBWSxNQUF1QixFQUFFLElBQUksR0FBRyxlQUFlO1FBQ3pELE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDcEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsRUFBRTtZQUN0RSxXQUFXLEVBQUUsMEJBQTBCO1lBQ3ZDLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztTQUN6QixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFO1lBQzNELFdBQVcsRUFBRSxnQ0FBZ0M7WUFDN0MsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1lBQ3hCLElBQUksRUFBRSxJQUFJO1NBQ1gsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyx5QkFBeUIsRUFBRTtZQUMzRSxXQUFXLEVBQUUsa0NBQWtDO1lBQy9DLElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMseUJBQXlCLEVBQUU7WUFDM0UsV0FBVyxFQUFFLGtDQUFrQztZQUMvQyxJQUFJLEVBQUUsSUFBSTtZQUNWLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztTQUN6QixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsY0FBYyxDQUFDLFFBQWdCLEVBQUUsUUFBZ0I7UUFDL0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ3JDLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsUUFBUTtTQUN4QyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsWUFBWSxDQUFDLGFBQXFCO1FBQ2hDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxTQUF5QjtRQUMxQyxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sU0FBUyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqRixJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRUQsa0JBQWtCLENBQUMsUUFBMEMsRUFBRSxTQUF5QjtRQUN0RixNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sU0FBUyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqRixJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUU7WUFDM0IsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUTtTQUM5QixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/world-state",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.51.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -53,12 +53,13 @@
|
|
|
53
53
|
]
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@aztec/circuit-types": "0.
|
|
57
|
-
"@aztec/circuits.js": "0.
|
|
58
|
-
"@aztec/foundation": "0.
|
|
59
|
-
"@aztec/kv-store": "0.
|
|
60
|
-
"@aztec/merkle-tree": "0.
|
|
61
|
-
"@aztec/
|
|
56
|
+
"@aztec/circuit-types": "0.51.0",
|
|
57
|
+
"@aztec/circuits.js": "0.51.0",
|
|
58
|
+
"@aztec/foundation": "0.51.0",
|
|
59
|
+
"@aztec/kv-store": "0.51.0",
|
|
60
|
+
"@aztec/merkle-tree": "0.51.0",
|
|
61
|
+
"@aztec/telemetry-client": "0.51.0",
|
|
62
|
+
"@aztec/types": "0.51.0",
|
|
62
63
|
"tslib": "^2.4.0"
|
|
63
64
|
},
|
|
64
65
|
"devDependencies": {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types';
|
|
2
2
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
3
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
3
4
|
|
|
4
5
|
import { MerkleTrees } from '../world-state-db/merkle_trees.js';
|
|
5
6
|
import { type WorldStateConfig } from './config.js';
|
|
@@ -9,7 +10,8 @@ export async function createWorldStateSynchronizer(
|
|
|
9
10
|
config: WorldStateConfig,
|
|
10
11
|
store: AztecKVStore,
|
|
11
12
|
l2BlockSource: L2BlockSource & L1ToL2MessageSource,
|
|
13
|
+
client: TelemetryClient,
|
|
12
14
|
) {
|
|
13
|
-
const merkleTrees = await MerkleTrees.new(store);
|
|
15
|
+
const merkleTrees = await MerkleTrees.new(store, client);
|
|
14
16
|
return new ServerWorldStateSynchronizer(store, merkleTrees, l2BlockSource, config);
|
|
15
17
|
}
|
|
@@ -32,6 +32,7 @@ import {
|
|
|
32
32
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
33
33
|
import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
34
34
|
import { SerialQueue } from '@aztec/foundation/queue';
|
|
35
|
+
import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
35
36
|
import { type IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
36
37
|
import { type AztecKVStore, type AztecSingleton } from '@aztec/kv-store';
|
|
37
38
|
import {
|
|
@@ -45,6 +46,7 @@ import {
|
|
|
45
46
|
loadTree,
|
|
46
47
|
newTree,
|
|
47
48
|
} from '@aztec/merkle-tree';
|
|
49
|
+
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
48
50
|
import { type Hasher } from '@aztec/types/interfaces';
|
|
49
51
|
|
|
50
52
|
import {
|
|
@@ -55,6 +57,7 @@ import {
|
|
|
55
57
|
} from './merkle_tree_db.js';
|
|
56
58
|
import { type MerkleTreeMap } from './merkle_tree_map.js';
|
|
57
59
|
import { MerkleTreeOperationsFacade } from './merkle_tree_operations_facade.js';
|
|
60
|
+
import { WorldStateMetrics } from './metrics.js';
|
|
58
61
|
|
|
59
62
|
/**
|
|
60
63
|
* The nullifier tree is an indexed tree.
|
|
@@ -98,9 +101,11 @@ export class MerkleTrees implements MerkleTreeDb {
|
|
|
98
101
|
private trees: MerkleTreeMap = null as any;
|
|
99
102
|
private jobQueue = new SerialQueue();
|
|
100
103
|
private initialStateReference: AztecSingleton<Buffer>;
|
|
104
|
+
private metrics: WorldStateMetrics;
|
|
101
105
|
|
|
102
|
-
private constructor(private store: AztecKVStore, private log: DebugLogger) {
|
|
106
|
+
private constructor(private store: AztecKVStore, private telemetryClient: TelemetryClient, private log: DebugLogger) {
|
|
103
107
|
this.initialStateReference = store.openSingleton('merkle_trees_initial_state_reference');
|
|
108
|
+
this.metrics = new WorldStateMetrics(telemetryClient);
|
|
104
109
|
}
|
|
105
110
|
|
|
106
111
|
/**
|
|
@@ -108,8 +113,8 @@ export class MerkleTrees implements MerkleTreeDb {
|
|
|
108
113
|
* @param store - The db instance to use for data persistance.
|
|
109
114
|
* @returns - A fully initialized MerkleTrees instance.
|
|
110
115
|
*/
|
|
111
|
-
public static async new(store: AztecKVStore, log = createDebugLogger('aztec:merkle_trees')) {
|
|
112
|
-
const merkleTrees = new MerkleTrees(store, log);
|
|
116
|
+
public static async new(store: AztecKVStore, client: TelemetryClient, log = createDebugLogger('aztec:merkle_trees')) {
|
|
117
|
+
const merkleTrees = new MerkleTrees(store, client, log);
|
|
113
118
|
await merkleTrees.#init();
|
|
114
119
|
return merkleTrees;
|
|
115
120
|
}
|
|
@@ -181,12 +186,17 @@ export class MerkleTrees implements MerkleTreeDb {
|
|
|
181
186
|
}
|
|
182
187
|
|
|
183
188
|
public async fork(): Promise<MerkleTrees> {
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
189
|
+
const [ms, db] = await elapsed(async () => {
|
|
190
|
+
// TODO(palla/prover-node): If the underlying store is being shared with other components, we're unnecessarily
|
|
191
|
+
// copying a lot of data unrelated to merkle trees. This may be fine for now, and we may be able to ditch backup-based
|
|
192
|
+
// forking in favor of a more elegant proposal. But if we see this operation starts taking a lot of time, we may want
|
|
193
|
+
// to open separate stores for merkle trees and other components.
|
|
194
|
+
const forked = await this.store.fork();
|
|
195
|
+
return MerkleTrees.new(forked, this.telemetryClient, this.log);
|
|
196
|
+
});
|
|
197
|
+
|
|
198
|
+
this.metrics.recordForkDuration(ms);
|
|
199
|
+
return db;
|
|
190
200
|
}
|
|
191
201
|
|
|
192
202
|
public async delete() {
|
|
@@ -581,6 +591,8 @@ export class MerkleTrees implements MerkleTreeDb {
|
|
|
581
591
|
* @param l1ToL2Messages - The L1 to L2 messages for the block.
|
|
582
592
|
*/
|
|
583
593
|
async #handleL2BlockAndMessages(l2Block: L2Block, l1ToL2Messages: Fr[]): Promise<HandleL2BlockAndMessagesResult> {
|
|
594
|
+
const timer = new Timer();
|
|
595
|
+
|
|
584
596
|
const treeRootWithIdPairs = [
|
|
585
597
|
[l2Block.header.state.partial.nullifierTree.root, MerkleTreeId.NULLIFIER_TREE],
|
|
586
598
|
[l2Block.header.state.partial.noteHashTree.root, MerkleTreeId.NOTE_HASH_TREE],
|
|
@@ -664,10 +676,13 @@ export class MerkleTrees implements MerkleTreeDb {
|
|
|
664
676
|
);
|
|
665
677
|
} else {
|
|
666
678
|
this.log.debug(`Tree ${treeName} synched with size ${info.size} root ${rootStr}`);
|
|
679
|
+
this.metrics.recordTreeSize(treeName, info.size);
|
|
667
680
|
}
|
|
668
681
|
}
|
|
669
682
|
await this.#snapshot(l2Block.number);
|
|
670
683
|
|
|
684
|
+
this.metrics.recordDbSize(this.store.estimateSize().bytes);
|
|
685
|
+
this.metrics.recordSyncDuration(ourBlock ? 'commit' : 'rollback_and_update', timer);
|
|
671
686
|
return { isBlockOurs: ourBlock };
|
|
672
687
|
}
|
|
673
688
|
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { type Timer } from '@aztec/foundation/timer';
|
|
2
|
+
import {
|
|
3
|
+
Attributes,
|
|
4
|
+
type Gauge,
|
|
5
|
+
type Histogram,
|
|
6
|
+
Metrics,
|
|
7
|
+
type TelemetryClient,
|
|
8
|
+
ValueType,
|
|
9
|
+
} from '@aztec/telemetry-client';
|
|
10
|
+
|
|
11
|
+
export class WorldStateMetrics {
|
|
12
|
+
private treeSize: Gauge;
|
|
13
|
+
private dbSize: Gauge;
|
|
14
|
+
private forkDuration: Histogram;
|
|
15
|
+
private syncDuration: Histogram;
|
|
16
|
+
|
|
17
|
+
constructor(client: TelemetryClient, name = 'MerkleTreesDb') {
|
|
18
|
+
const meter = client.getMeter(name);
|
|
19
|
+
this.treeSize = meter.createGauge(Metrics.WORLD_STATE_MERKLE_TREE_SIZE, {
|
|
20
|
+
description: 'The size of Merkle trees',
|
|
21
|
+
valueType: ValueType.INT,
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
this.dbSize = meter.createGauge(Metrics.WORLD_STATE_DB_SIZE, {
|
|
25
|
+
description: 'The size of the World State DB',
|
|
26
|
+
valueType: ValueType.INT,
|
|
27
|
+
unit: 'By',
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
this.forkDuration = meter.createHistogram(Metrics.WORLD_STATE_FORK_DURATION, {
|
|
31
|
+
description: 'The duration of a fork operation',
|
|
32
|
+
unit: 'ms',
|
|
33
|
+
valueType: ValueType.INT,
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
this.syncDuration = meter.createHistogram(Metrics.WORLD_STATE_SYNC_DURATION, {
|
|
37
|
+
description: 'The duration of a sync operation',
|
|
38
|
+
unit: 'ms',
|
|
39
|
+
valueType: ValueType.INT,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
recordTreeSize(treeName: string, treeSize: bigint) {
|
|
44
|
+
this.treeSize.record(Number(treeSize), {
|
|
45
|
+
[Attributes.MERKLE_TREE_NAME]: treeName,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
recordDbSize(dbSizeInBytes: number) {
|
|
50
|
+
this.dbSize.record(dbSizeInBytes);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
recordForkDuration(timerOrMs: Timer | number) {
|
|
54
|
+
const ms = Math.ceil(typeof timerOrMs === 'number' ? timerOrMs : timerOrMs.ms());
|
|
55
|
+
this.forkDuration.record(ms);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
recordSyncDuration(syncType: 'commit' | 'rollback_and_update', timerOrMs: Timer | number) {
|
|
59
|
+
const ms = Math.ceil(typeof timerOrMs === 'number' ? timerOrMs : timerOrMs.ms());
|
|
60
|
+
this.syncDuration.record(ms, {
|
|
61
|
+
[Attributes.STATUS]: syncType,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
}
|