@aztec/world-state 0.72.1 → 0.74.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/native/merkle_trees_facade.js +2 -2
- package/dest/native/message.d.ts +0 -30
- package/dest/native/message.d.ts.map +1 -1
- package/dest/native/message.js +1 -23
- package/dest/native/native_world_state.js +3 -3
- package/dest/native/native_world_state_instance.d.ts +1 -13
- package/dest/native/native_world_state_instance.d.ts.map +1 -1
- package/dest/native/native_world_state_instance.js +27 -94
- package/dest/native/world_state_version.js +2 -2
- package/dest/synchronizer/server_world_state_synchronizer.d.ts +1 -1
- package/dest/synchronizer/server_world_state_synchronizer.d.ts.map +1 -1
- package/dest/synchronizer/server_world_state_synchronizer.js +6 -6
- package/dest/test/index.d.ts +2 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +2 -0
- package/dest/world-state-db/index.d.ts +0 -3
- package/dest/world-state-db/index.d.ts.map +1 -1
- package/dest/world-state-db/index.js +1 -4
- package/package.json +13 -17
- package/src/native/merkle_trees_facade.ts +1 -1
- package/src/native/message.ts +0 -44
- package/src/native/native_world_state.ts +2 -2
- package/src/native/native_world_state_instance.ts +28 -124
- package/src/native/world_state_version.ts +1 -1
- package/src/synchronizer/server_world_state_synchronizer.ts +6 -6
- package/src/test/index.ts +1 -0
- package/src/world-state-db/index.ts +0 -3
- package/dest/world-state-db/merkle_tree_map.d.ts +0 -11
- package/dest/world-state-db/merkle_tree_map.d.ts.map +0 -1
- package/dest/world-state-db/merkle_tree_map.js +0 -2
- package/dest/world-state-db/merkle_tree_operations_facade.d.ts +0 -116
- package/dest/world-state-db/merkle_tree_operations_facade.d.ts.map +0 -1
- package/dest/world-state-db/merkle_tree_operations_facade.js +0 -133
- package/dest/world-state-db/merkle_tree_snapshot_operations_facade.d.ts +0 -32
- package/dest/world-state-db/merkle_tree_snapshot_operations_facade.d.ts.map +0 -1
- package/dest/world-state-db/merkle_tree_snapshot_operations_facade.js +0 -76
- package/dest/world-state-db/merkle_trees.d.ts +0 -174
- package/dest/world-state-db/merkle_trees.d.ts.map +0 -1
- package/dest/world-state-db/merkle_trees.js +0 -461
- package/dest/world-state-db/metrics.d.ts +0 -14
- package/dest/world-state-db/metrics.d.ts.map +0 -1
- package/dest/world-state-db/metrics.js +0 -44
- package/src/world-state-db/merkle_tree_map.ts +0 -11
- package/src/world-state-db/merkle_tree_operations_facade.ts +0 -199
- package/src/world-state-db/merkle_tree_snapshot_operations_facade.ts +0 -151
- package/src/world-state-db/merkle_trees.ts +0 -727
- package/src/world-state-db/metrics.ts +0 -64
|
@@ -1,461 +0,0 @@
|
|
|
1
|
-
var _MerkleTrees_instances, _MerkleTrees_init, _MerkleTrees_saveInitialStateReference, _MerkleTrees_loadInitialStateReference, _MerkleTrees_updateArchive, _MerkleTrees_getTreeInfo, _MerkleTrees_getIndexedTree, _MerkleTrees_appendLeaves, _MerkleTrees_commit, _MerkleTrees_rollback, _MerkleTrees_snapshot, _MerkleTrees_handleL2BlockAndMessages, _MerkleTrees_isDbPopulated;
|
|
2
|
-
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import { MerkleTreeId } from '@aztec/circuit-types';
|
|
4
|
-
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BlockHeader, Fr, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, PublicDataWrite, StateReference, } from '@aztec/circuits.js';
|
|
5
|
-
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
6
|
-
import { createLogger } from '@aztec/foundation/log';
|
|
7
|
-
import { SerialQueue } from '@aztec/foundation/queue';
|
|
8
|
-
import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
9
|
-
import { openTmpStore } from '@aztec/kv-store/lmdb';
|
|
10
|
-
import { Poseidon, StandardIndexedTree, StandardTree, getTreeMeta, loadTree, newTree, } from '@aztec/merkle-tree';
|
|
11
|
-
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
12
|
-
import { buildEmptyWorldStateStatusFull, } from '../native/message.js';
|
|
13
|
-
import { INITIAL_NULLIFIER_TREE_SIZE, INITIAL_PUBLIC_DATA_TREE_SIZE, } from './merkle_tree_db.js';
|
|
14
|
-
import { MerkleTreeReadOperationsFacade } from './merkle_tree_operations_facade.js';
|
|
15
|
-
import { MerkleTreeSnapshotOperationsFacade } from './merkle_tree_snapshot_operations_facade.js';
|
|
16
|
-
import { WorldStateMetrics } from './metrics.js';
|
|
17
|
-
/**
|
|
18
|
-
* The nullifier tree is an indexed tree.
|
|
19
|
-
*/
|
|
20
|
-
class NullifierTree extends StandardIndexedTree {
|
|
21
|
-
constructor(store, hasher, name, depth, size = 0n, _noop, root) {
|
|
22
|
-
super(store, hasher, name, depth, size, NullifierLeafPreimage, NullifierLeaf, root);
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
/**
|
|
26
|
-
* The public data tree is an indexed tree.
|
|
27
|
-
*/
|
|
28
|
-
class PublicDataTree extends StandardIndexedTree {
|
|
29
|
-
constructor(store, hasher, name, depth, size = 0n, _noop, root) {
|
|
30
|
-
super(store, hasher, name, depth, size, PublicDataTreeLeafPreimage, PublicDataTreeLeaf, root);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
/**
|
|
34
|
-
* A convenience class for managing multiple merkle trees.
|
|
35
|
-
*/
|
|
36
|
-
export class MerkleTrees {
|
|
37
|
-
constructor(store, telemetryClient, log) {
|
|
38
|
-
_MerkleTrees_instances.add(this);
|
|
39
|
-
this.store = store;
|
|
40
|
-
this.telemetryClient = telemetryClient;
|
|
41
|
-
this.log = log;
|
|
42
|
-
// gets initialized in #init
|
|
43
|
-
this.trees = null;
|
|
44
|
-
this.jobQueue = new SerialQueue();
|
|
45
|
-
this.initialStateReference = store.openSingleton('merkle_trees_initial_state_reference');
|
|
46
|
-
this.metrics = new WorldStateMetrics(telemetryClient);
|
|
47
|
-
}
|
|
48
|
-
/**
|
|
49
|
-
* Method to asynchronously create and initialize a MerkleTrees instance.
|
|
50
|
-
* @param store - The db instance to use for data persistance.
|
|
51
|
-
* @returns - A fully initialized MerkleTrees instance.
|
|
52
|
-
*/
|
|
53
|
-
static async new(store, client = getTelemetryClient(), log = createLogger('world-state:merkle_trees')) {
|
|
54
|
-
const merkleTrees = new MerkleTrees(store, client, log);
|
|
55
|
-
await __classPrivateFieldGet(merkleTrees, _MerkleTrees_instances, "m", _MerkleTrees_init).call(merkleTrees);
|
|
56
|
-
return merkleTrees;
|
|
57
|
-
}
|
|
58
|
-
/**
|
|
59
|
-
* Creates a temporary store. Useful for testing.
|
|
60
|
-
*/
|
|
61
|
-
static tmp() {
|
|
62
|
-
const store = openTmpStore();
|
|
63
|
-
return MerkleTrees.new(store, getTelemetryClient());
|
|
64
|
-
}
|
|
65
|
-
removeHistoricalBlocks(_toBlockNumber) {
|
|
66
|
-
throw new Error('Method not implemented.');
|
|
67
|
-
}
|
|
68
|
-
unwindBlocks(_toBlockNumber) {
|
|
69
|
-
throw new Error('Method not implemented.');
|
|
70
|
-
}
|
|
71
|
-
setFinalised(_toBlockNumber) {
|
|
72
|
-
throw new Error('Method not implemented.');
|
|
73
|
-
}
|
|
74
|
-
getStatusSummary() {
|
|
75
|
-
throw new Error('Method not implemented.');
|
|
76
|
-
}
|
|
77
|
-
async fork(blockNumber) {
|
|
78
|
-
if (blockNumber) {
|
|
79
|
-
throw new Error('Block number forking is not supported in js world state');
|
|
80
|
-
}
|
|
81
|
-
const [ms, db] = await elapsed(async () => {
|
|
82
|
-
const forked = await this.store.fork();
|
|
83
|
-
return MerkleTrees.new(forked, this.telemetryClient, this.log);
|
|
84
|
-
});
|
|
85
|
-
this.metrics.recordForkDuration(ms);
|
|
86
|
-
return new MerkleTreeReadOperationsFacade(db, true);
|
|
87
|
-
}
|
|
88
|
-
// REFACTOR: We're hiding the `commit` operations in the tree behind a type check only, but
|
|
89
|
-
// we should make sure it's not accidentally called elsewhere by splitting this class into one
|
|
90
|
-
// that can work on a read-only store and one that actually writes to the store. This implies
|
|
91
|
-
// having read-only versions of the kv-stores, all kv-containers, and all trees.
|
|
92
|
-
async ephemeralFork() {
|
|
93
|
-
const forked = new MerkleTrees(this.store, this.telemetryClient, createLogger('world-state:merkle_trees:ephemeral_fork'));
|
|
94
|
-
await __classPrivateFieldGet(forked, _MerkleTrees_instances, "m", _MerkleTrees_init).call(forked, true);
|
|
95
|
-
return new MerkleTreeReadOperationsFacade(forked, true);
|
|
96
|
-
}
|
|
97
|
-
async delete() {
|
|
98
|
-
await this.store.delete();
|
|
99
|
-
}
|
|
100
|
-
getInitialHeader() {
|
|
101
|
-
return BlockHeader.empty({ state: __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_loadInitialStateReference).call(this) });
|
|
102
|
-
}
|
|
103
|
-
/**
|
|
104
|
-
* Stops the job queue (waits for all jobs to finish).
|
|
105
|
-
*/
|
|
106
|
-
async close() {
|
|
107
|
-
await this.jobQueue.end();
|
|
108
|
-
}
|
|
109
|
-
/**
|
|
110
|
-
* Gets a view of this db that returns uncommitted data.
|
|
111
|
-
* @returns - A facade for this instance.
|
|
112
|
-
*/
|
|
113
|
-
getLatest() {
|
|
114
|
-
return Promise.resolve(new MerkleTreeReadOperationsFacade(this, true));
|
|
115
|
-
}
|
|
116
|
-
/**
|
|
117
|
-
* Gets a view of this db that returns committed data only.
|
|
118
|
-
* @returns - A facade for this instance.
|
|
119
|
-
*/
|
|
120
|
-
getCommitted() {
|
|
121
|
-
return new MerkleTreeReadOperationsFacade(this, false);
|
|
122
|
-
}
|
|
123
|
-
getSnapshot(blockNumber) {
|
|
124
|
-
return new MerkleTreeSnapshotOperationsFacade(this, blockNumber);
|
|
125
|
-
}
|
|
126
|
-
/**
|
|
127
|
-
* Updates the archive with the new block/header hash.
|
|
128
|
-
* @param header - The header whose hash to insert into the archive.
|
|
129
|
-
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
130
|
-
*/
|
|
131
|
-
async updateArchive(header) {
|
|
132
|
-
await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_updateArchive).call(this, header));
|
|
133
|
-
}
|
|
134
|
-
/**
|
|
135
|
-
* Gets the tree info for the specified tree.
|
|
136
|
-
* @param treeId - Id of the tree to get information from.
|
|
137
|
-
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
138
|
-
* @returns The tree info for the specified tree.
|
|
139
|
-
*/
|
|
140
|
-
async getTreeInfo(treeId, includeUncommitted) {
|
|
141
|
-
return await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_getTreeInfo).call(this, treeId, includeUncommitted));
|
|
142
|
-
}
|
|
143
|
-
/**
|
|
144
|
-
* Get the current state reference
|
|
145
|
-
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
146
|
-
* @returns The current state reference
|
|
147
|
-
*/
|
|
148
|
-
getStateReference(includeUncommitted) {
|
|
149
|
-
const getAppendOnlyTreeSnapshot = (treeId) => {
|
|
150
|
-
const tree = this.trees[treeId];
|
|
151
|
-
return new AppendOnlyTreeSnapshot(Fr.fromBuffer(tree.getRoot(includeUncommitted)), Number(tree.getNumLeaves(includeUncommitted)));
|
|
152
|
-
};
|
|
153
|
-
const state = new StateReference(getAppendOnlyTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), new PartialStateReference(getAppendOnlyTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE), getAppendOnlyTreeSnapshot(MerkleTreeId.NULLIFIER_TREE), getAppendOnlyTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE)));
|
|
154
|
-
return Promise.resolve(state);
|
|
155
|
-
}
|
|
156
|
-
/**
|
|
157
|
-
* Gets the value at the given index.
|
|
158
|
-
* @param treeId - The ID of the tree to get the leaf value from.
|
|
159
|
-
* @param index - The index of the leaf.
|
|
160
|
-
* @param includeUncommitted - Indicates whether to include uncommitted changes.
|
|
161
|
-
* @returns Leaf value at the given index (undefined if not found).
|
|
162
|
-
*/
|
|
163
|
-
async getLeafValue(treeId, index, includeUncommitted) {
|
|
164
|
-
return await this.synchronize(() => Promise.resolve(this.trees[treeId].getLeafValue(index, includeUncommitted)));
|
|
165
|
-
}
|
|
166
|
-
/**
|
|
167
|
-
* Gets the sibling path for a leaf in a tree.
|
|
168
|
-
* @param treeId - The ID of the tree.
|
|
169
|
-
* @param index - The index of the leaf.
|
|
170
|
-
* @param includeUncommitted - Indicates whether the sibling path should include uncommitted data.
|
|
171
|
-
* @returns The sibling path for the leaf.
|
|
172
|
-
*/
|
|
173
|
-
async getSiblingPath(treeId, index, includeUncommitted) {
|
|
174
|
-
return await this.synchronize(() => this.trees[treeId].getSiblingPath(index, includeUncommitted));
|
|
175
|
-
}
|
|
176
|
-
/**
|
|
177
|
-
* Appends leaves to a tree.
|
|
178
|
-
* @param treeId - The ID of the tree.
|
|
179
|
-
* @param leaves - The leaves to append.
|
|
180
|
-
* @returns Empty promise.
|
|
181
|
-
*/
|
|
182
|
-
async appendLeaves(treeId, leaves) {
|
|
183
|
-
return await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_appendLeaves).call(this, treeId, leaves));
|
|
184
|
-
}
|
|
185
|
-
/**
|
|
186
|
-
* Commits all pending updates.
|
|
187
|
-
* @returns Empty promise.
|
|
188
|
-
*/
|
|
189
|
-
async commit() {
|
|
190
|
-
return await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_commit).call(this));
|
|
191
|
-
}
|
|
192
|
-
/**
|
|
193
|
-
* Rolls back all pending updates.
|
|
194
|
-
* @returns Empty promise.
|
|
195
|
-
*/
|
|
196
|
-
async rollback() {
|
|
197
|
-
return await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_rollback).call(this));
|
|
198
|
-
}
|
|
199
|
-
/**
|
|
200
|
-
* Finds the index of the largest leaf whose value is less than or equal to the provided value.
|
|
201
|
-
* @param treeId - The ID of the tree to search.
|
|
202
|
-
* @param value - The value to be inserted into the tree.
|
|
203
|
-
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
204
|
-
* @returns The found leaf index and a flag indicating if the corresponding leaf's value is equal to `newValue`.
|
|
205
|
-
*/
|
|
206
|
-
async getPreviousValueIndex(treeId, value, includeUncommitted) {
|
|
207
|
-
return await this.synchronize(() => Promise.resolve(__classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_getIndexedTree).call(this, treeId).findIndexOfPreviousKey(value, includeUncommitted)));
|
|
208
|
-
}
|
|
209
|
-
/**
|
|
210
|
-
* Gets the leaf data at a given index and tree.
|
|
211
|
-
* @param treeId - The ID of the tree get the leaf from.
|
|
212
|
-
* @param index - The index of the leaf to get.
|
|
213
|
-
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
214
|
-
* @returns Leaf preimage.
|
|
215
|
-
*/
|
|
216
|
-
async getLeafPreimage(treeId, index, includeUncommitted) {
|
|
217
|
-
return await this.synchronize(() => Promise.resolve(__classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_getIndexedTree).call(this, treeId).getLatestLeafPreimageCopy(index, includeUncommitted)));
|
|
218
|
-
}
|
|
219
|
-
/**
|
|
220
|
-
* Returns the index of a leaf given its value, or undefined if no leaf with that value is found.
|
|
221
|
-
* @param treeId - The ID of the tree.
|
|
222
|
-
* @param value - The leaf value to look for.
|
|
223
|
-
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
224
|
-
* @returns The index of the first leaf found with a given value (undefined if not found).
|
|
225
|
-
*/
|
|
226
|
-
async findLeafIndex(treeId, value, includeUncommitted) {
|
|
227
|
-
return await this.synchronize(() => {
|
|
228
|
-
const tree = this.trees[treeId];
|
|
229
|
-
// TODO #5448 fix "as any"
|
|
230
|
-
return Promise.resolve(tree.findLeafIndex(value, includeUncommitted));
|
|
231
|
-
});
|
|
232
|
-
}
|
|
233
|
-
/**
|
|
234
|
-
* Returns the first index containing a leaf value after `startIndex`.
|
|
235
|
-
* @param treeId - The tree for which the index should be returned.
|
|
236
|
-
* @param value - The value to search for in the tree.
|
|
237
|
-
* @param startIndex - The index to start searching from (used when skipping nullified messages)
|
|
238
|
-
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
239
|
-
*/
|
|
240
|
-
async findLeafIndexAfter(treeId, value, startIndex, includeUncommitted) {
|
|
241
|
-
return await this.synchronize(() => {
|
|
242
|
-
const tree = this.trees[treeId];
|
|
243
|
-
// TODO #5448 fix "as any"
|
|
244
|
-
return Promise.resolve(tree.findLeafIndexAfter(value, startIndex, includeUncommitted));
|
|
245
|
-
});
|
|
246
|
-
}
|
|
247
|
-
/**
|
|
248
|
-
* Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
|
|
249
|
-
* @param block - The L2 block to handle.
|
|
250
|
-
* @param l1ToL2Messages - The L1 to L2 messages for the block.
|
|
251
|
-
* @returns Whether the block handled was produced by this same node.
|
|
252
|
-
*/
|
|
253
|
-
async handleL2BlockAndMessages(block, l1ToL2Messages) {
|
|
254
|
-
return await this.synchronize(() => __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_handleL2BlockAndMessages).call(this, block, l1ToL2Messages));
|
|
255
|
-
}
|
|
256
|
-
/**
|
|
257
|
-
* Batch insert multiple leaves into the tree.
|
|
258
|
-
* @param treeId - The ID of the tree.
|
|
259
|
-
* @param leaves - Leaves to insert into the tree.
|
|
260
|
-
* @param subtreeHeight - Height of the subtree.
|
|
261
|
-
* @returns The data for the leaves to be updated when inserting the new ones.
|
|
262
|
-
*/
|
|
263
|
-
async batchInsert(treeId, leaves, subtreeHeight) {
|
|
264
|
-
const tree = this.trees[treeId];
|
|
265
|
-
if (!('batchInsert' in tree)) {
|
|
266
|
-
throw new Error('Tree does not support `batchInsert` method');
|
|
267
|
-
}
|
|
268
|
-
return await this.synchronize(() => tree.batchInsert(leaves, subtreeHeight));
|
|
269
|
-
}
|
|
270
|
-
/**
|
|
271
|
-
* Waits for all jobs to finish before executing the given function.
|
|
272
|
-
* @param fn - The function to execute.
|
|
273
|
-
* @returns Promise containing the result of the function.
|
|
274
|
-
*/
|
|
275
|
-
async synchronize(fn) {
|
|
276
|
-
return await this.jobQueue.put(fn);
|
|
277
|
-
}
|
|
278
|
-
async getTreeSnapshots(blockNumber) {
|
|
279
|
-
const snapshots = await Promise.all([
|
|
280
|
-
this.trees[MerkleTreeId.NULLIFIER_TREE].getSnapshot(blockNumber),
|
|
281
|
-
this.trees[MerkleTreeId.NOTE_HASH_TREE].getSnapshot(blockNumber),
|
|
282
|
-
this.trees[MerkleTreeId.PUBLIC_DATA_TREE].getSnapshot(blockNumber),
|
|
283
|
-
this.trees[MerkleTreeId.L1_TO_L2_MESSAGE_TREE].getSnapshot(blockNumber),
|
|
284
|
-
this.trees[MerkleTreeId.ARCHIVE].getSnapshot(blockNumber),
|
|
285
|
-
]);
|
|
286
|
-
return {
|
|
287
|
-
[MerkleTreeId.NULLIFIER_TREE]: snapshots[0],
|
|
288
|
-
[MerkleTreeId.NOTE_HASH_TREE]: snapshots[1],
|
|
289
|
-
[MerkleTreeId.PUBLIC_DATA_TREE]: snapshots[2],
|
|
290
|
-
[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: snapshots[3],
|
|
291
|
-
[MerkleTreeId.ARCHIVE]: snapshots[4],
|
|
292
|
-
};
|
|
293
|
-
}
|
|
294
|
-
}
|
|
295
|
-
_MerkleTrees_instances = new WeakSet(), _MerkleTrees_init =
|
|
296
|
-
/**
|
|
297
|
-
* Initializes the collection of Merkle Trees.
|
|
298
|
-
*/
|
|
299
|
-
async function _MerkleTrees_init(loadFromDb) {
|
|
300
|
-
const fromDb = loadFromDb === undefined ? __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_isDbPopulated).call(this) : loadFromDb;
|
|
301
|
-
const initializeTree = fromDb ? loadTree : newTree;
|
|
302
|
-
const hasher = new Poseidon();
|
|
303
|
-
const nullifierTree = await initializeTree(NullifierTree, this.store, hasher, `${MerkleTreeId[MerkleTreeId.NULLIFIER_TREE]}`, {}, NULLIFIER_TREE_HEIGHT, INITIAL_NULLIFIER_TREE_SIZE);
|
|
304
|
-
const noteHashTree = await initializeTree(StandardTree, this.store, hasher, `${MerkleTreeId[MerkleTreeId.NOTE_HASH_TREE]}`, Fr, NOTE_HASH_TREE_HEIGHT);
|
|
305
|
-
const publicDataTree = await initializeTree(PublicDataTree, this.store, hasher, `${MerkleTreeId[MerkleTreeId.PUBLIC_DATA_TREE]}`, {}, PUBLIC_DATA_TREE_HEIGHT, INITIAL_PUBLIC_DATA_TREE_SIZE);
|
|
306
|
-
const l1Tol2MessageTree = await initializeTree(StandardTree, this.store, hasher, `${MerkleTreeId[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]}`, Fr, L1_TO_L2_MSG_TREE_HEIGHT);
|
|
307
|
-
const archive = await initializeTree(StandardTree, this.store, hasher, `${MerkleTreeId[MerkleTreeId.ARCHIVE]}`, Fr, ARCHIVE_HEIGHT);
|
|
308
|
-
this.trees = [nullifierTree, noteHashTree, publicDataTree, l1Tol2MessageTree, archive];
|
|
309
|
-
this.jobQueue.start();
|
|
310
|
-
if (!fromDb) {
|
|
311
|
-
// We are not initializing from db so we need to populate the first leaf of the archive tree which is a hash of the initial header,
|
|
312
|
-
// and persist the initial header state reference so we can later load it when requested.
|
|
313
|
-
const initialState = await this.getStateReference(true);
|
|
314
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_saveInitialStateReference).call(this, initialState);
|
|
315
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_updateArchive).call(this, this.getInitialHeader());
|
|
316
|
-
// And commit anything we did to initialize this set of trees
|
|
317
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_commit).call(this);
|
|
318
|
-
}
|
|
319
|
-
}, _MerkleTrees_saveInitialStateReference = function _MerkleTrees_saveInitialStateReference(state) {
|
|
320
|
-
return this.initialStateReference.set(state.toBuffer());
|
|
321
|
-
}, _MerkleTrees_loadInitialStateReference = function _MerkleTrees_loadInitialStateReference() {
|
|
322
|
-
const serialized = this.initialStateReference.get();
|
|
323
|
-
if (!serialized) {
|
|
324
|
-
throw new Error('Initial state reference not found');
|
|
325
|
-
}
|
|
326
|
-
return StateReference.fromBuffer(serialized);
|
|
327
|
-
}, _MerkleTrees_updateArchive = async function _MerkleTrees_updateArchive(header) {
|
|
328
|
-
const state = await this.getStateReference(true);
|
|
329
|
-
// This method should be called only when the block builder already updated the state so we sanity check that it's
|
|
330
|
-
// the case here.
|
|
331
|
-
if (!state.toBuffer().equals(header.state.toBuffer())) {
|
|
332
|
-
throw new Error('State in header does not match current state');
|
|
333
|
-
}
|
|
334
|
-
const blockHash = header.hash();
|
|
335
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_appendLeaves).call(this, MerkleTreeId.ARCHIVE, [blockHash]);
|
|
336
|
-
}, _MerkleTrees_getTreeInfo = function _MerkleTrees_getTreeInfo(treeId, includeUncommitted) {
|
|
337
|
-
const treeInfo = {
|
|
338
|
-
treeId,
|
|
339
|
-
root: this.trees[treeId].getRoot(includeUncommitted),
|
|
340
|
-
size: this.trees[treeId].getNumLeaves(includeUncommitted),
|
|
341
|
-
depth: this.trees[treeId].getDepth(),
|
|
342
|
-
};
|
|
343
|
-
return Promise.resolve(treeInfo);
|
|
344
|
-
}, _MerkleTrees_getIndexedTree = function _MerkleTrees_getIndexedTree(treeId) {
|
|
345
|
-
return this.trees[treeId];
|
|
346
|
-
}, _MerkleTrees_appendLeaves =
|
|
347
|
-
/**
|
|
348
|
-
* Appends leaves to a tree.
|
|
349
|
-
* @param treeId - Id of the tree to append leaves to.
|
|
350
|
-
* @param leaves - Leaves to append.
|
|
351
|
-
* @returns Empty promise.
|
|
352
|
-
*/
|
|
353
|
-
async function _MerkleTrees_appendLeaves(treeId, leaves) {
|
|
354
|
-
const tree = this.trees[treeId];
|
|
355
|
-
if (!('appendLeaves' in tree)) {
|
|
356
|
-
throw new Error('Tree does not support `appendLeaves` method');
|
|
357
|
-
}
|
|
358
|
-
// TODO #5448 fix "as any"
|
|
359
|
-
return await tree.appendLeaves(leaves);
|
|
360
|
-
}, _MerkleTrees_commit =
|
|
361
|
-
/**
|
|
362
|
-
* Commits all pending updates.
|
|
363
|
-
* @returns Empty promise.
|
|
364
|
-
*/
|
|
365
|
-
async function _MerkleTrees_commit() {
|
|
366
|
-
for (const tree of Object.values(this.trees)) {
|
|
367
|
-
await tree.commit();
|
|
368
|
-
}
|
|
369
|
-
}, _MerkleTrees_rollback =
|
|
370
|
-
/**
|
|
371
|
-
* Rolls back all pending updates.
|
|
372
|
-
* @returns Empty promise.
|
|
373
|
-
*/
|
|
374
|
-
async function _MerkleTrees_rollback() {
|
|
375
|
-
for (const tree of Object.values(this.trees)) {
|
|
376
|
-
await tree.rollback();
|
|
377
|
-
}
|
|
378
|
-
}, _MerkleTrees_snapshot = async function _MerkleTrees_snapshot(blockNumber) {
|
|
379
|
-
for (const tree of Object.values(this.trees)) {
|
|
380
|
-
await tree.snapshot(blockNumber);
|
|
381
|
-
}
|
|
382
|
-
}, _MerkleTrees_handleL2BlockAndMessages =
|
|
383
|
-
/**
|
|
384
|
-
* Handles a single L2 block (i.e. Inserts the new note hashes into the merkle tree).
|
|
385
|
-
* @param l2Block - The L2 block to handle.
|
|
386
|
-
* @param l1ToL2Messages - The L1 to L2 messages for the block.
|
|
387
|
-
*/
|
|
388
|
-
async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
389
|
-
const timer = new Timer();
|
|
390
|
-
const treeRootWithIdPairs = [
|
|
391
|
-
[l2Block.header.state.partial.nullifierTree.root, MerkleTreeId.NULLIFIER_TREE],
|
|
392
|
-
[l2Block.header.state.partial.noteHashTree.root, MerkleTreeId.NOTE_HASH_TREE],
|
|
393
|
-
[l2Block.header.state.partial.publicDataTree.root, MerkleTreeId.PUBLIC_DATA_TREE],
|
|
394
|
-
[l2Block.header.state.l1ToL2MessageTree.root, MerkleTreeId.L1_TO_L2_MESSAGE_TREE],
|
|
395
|
-
[l2Block.archive.root, MerkleTreeId.ARCHIVE],
|
|
396
|
-
];
|
|
397
|
-
const compareRoot = (root, treeId) => {
|
|
398
|
-
const treeRoot = this.trees[treeId].getRoot(true);
|
|
399
|
-
return treeRoot.equals(root.toBuffer());
|
|
400
|
-
};
|
|
401
|
-
const ourBlock = treeRootWithIdPairs.every(([root, id]) => compareRoot(root, id));
|
|
402
|
-
if (ourBlock) {
|
|
403
|
-
this.log.verbose(`Block ${l2Block.number} is ours, committing world state`);
|
|
404
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_commit).call(this);
|
|
405
|
-
}
|
|
406
|
-
else {
|
|
407
|
-
this.log.verbose(`Block ${l2Block.number} is not ours, rolling back world state and committing state from chain`);
|
|
408
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_rollback).call(this);
|
|
409
|
-
// We have to pad the values within tx effects because that's how the trees are built by circuits.
|
|
410
|
-
// Sync the append only trees
|
|
411
|
-
{
|
|
412
|
-
const noteHashesPadded = l2Block.body.txEffects.flatMap(txEffect => padArrayEnd(txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX));
|
|
413
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_appendLeaves).call(this, MerkleTreeId.NOTE_HASH_TREE, noteHashesPadded);
|
|
414
|
-
const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
|
|
415
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_appendLeaves).call(this, MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2MessagesPadded);
|
|
416
|
-
}
|
|
417
|
-
// Sync the indexed trees
|
|
418
|
-
{
|
|
419
|
-
const nullifiersPadded = l2Block.body.txEffects.flatMap(txEffect => padArrayEnd(txEffect.nullifiers, Fr.ZERO, MAX_NULLIFIERS_PER_TX));
|
|
420
|
-
await this.trees[MerkleTreeId.NULLIFIER_TREE].batchInsert(nullifiersPadded.map(nullifier => nullifier.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
|
|
421
|
-
const publicDataTree = this.trees[MerkleTreeId.PUBLIC_DATA_TREE];
|
|
422
|
-
// We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
|
|
423
|
-
for (const txEffect of l2Block.body.txEffects) {
|
|
424
|
-
const publicDataWrites = padArrayEnd(txEffect.publicDataWrites, PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
425
|
-
await publicDataTree.batchInsert(publicDataWrites.map(write => write.toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
|
|
426
|
-
}
|
|
427
|
-
}
|
|
428
|
-
// The last thing remaining is to update the archive
|
|
429
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_updateArchive).call(this, l2Block.header);
|
|
430
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_commit).call(this);
|
|
431
|
-
}
|
|
432
|
-
for (const [root, treeId] of treeRootWithIdPairs) {
|
|
433
|
-
const treeName = MerkleTreeId[treeId];
|
|
434
|
-
const info = await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_getTreeInfo).call(this, treeId, false);
|
|
435
|
-
const syncedStr = '0x' + info.root.toString('hex');
|
|
436
|
-
const rootStr = root.toString();
|
|
437
|
-
// Sanity check that the rebuilt trees match the roots published by the L2 block
|
|
438
|
-
if (!info.root.equals(root.toBuffer())) {
|
|
439
|
-
throw new Error(`Synced tree root ${treeName} does not match published L2 block root: ${syncedStr} != ${rootStr}`);
|
|
440
|
-
}
|
|
441
|
-
else {
|
|
442
|
-
this.log.debug(`Tree ${treeName} synched with size ${info.size} root ${rootStr}`);
|
|
443
|
-
this.metrics.recordTreeSize(treeName, info.size);
|
|
444
|
-
}
|
|
445
|
-
}
|
|
446
|
-
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_snapshot).call(this, l2Block.number);
|
|
447
|
-
this.metrics.recordDbSize(this.store.estimateSize().actualSize);
|
|
448
|
-
this.metrics.recordSyncDuration('commit', timer);
|
|
449
|
-
return buildEmptyWorldStateStatusFull();
|
|
450
|
-
}, _MerkleTrees_isDbPopulated = function _MerkleTrees_isDbPopulated() {
|
|
451
|
-
try {
|
|
452
|
-
getTreeMeta(this.store, MerkleTreeId[MerkleTreeId.NULLIFIER_TREE]);
|
|
453
|
-
// Tree meta was found --> db is populated
|
|
454
|
-
return true;
|
|
455
|
-
}
|
|
456
|
-
catch (e) {
|
|
457
|
-
// Tree meta was not found --> db is not populated
|
|
458
|
-
return false;
|
|
459
|
-
}
|
|
460
|
-
};
|
|
461
|
-
//# 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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"}
|
|
@@ -1,14 +0,0 @@
|
|
|
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
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1,44 +0,0 @@
|
|
|
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==
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { type MerkleTreeId } from '@aztec/circuit-types';
|
|
2
|
-
import { type Fr } from '@aztec/circuits.js';
|
|
3
|
-
import { type AppendOnlyTree, type IndexedTree } from '@aztec/merkle-tree';
|
|
4
|
-
|
|
5
|
-
export type MerkleTreeMap = {
|
|
6
|
-
[MerkleTreeId.NULLIFIER_TREE]: IndexedTree;
|
|
7
|
-
[MerkleTreeId.NOTE_HASH_TREE]: AppendOnlyTree<Fr>;
|
|
8
|
-
[MerkleTreeId.PUBLIC_DATA_TREE]: IndexedTree;
|
|
9
|
-
[MerkleTreeId.L1_TO_L2_MESSAGE_TREE]: AppendOnlyTree<Fr>;
|
|
10
|
-
[MerkleTreeId.ARCHIVE]: AppendOnlyTree<Fr>;
|
|
11
|
-
};
|