@aztec/merkle-tree 0.1.0-alpha17 → 0.1.0-alpha21

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.
Files changed (29) hide show
  1. package/.tsbuildinfo +1 -1
  2. package/dest/interfaces/indexed_tree.d.ts +1 -8
  3. package/dest/interfaces/indexed_tree.d.ts.map +1 -1
  4. package/dest/new_tree.js +1 -1
  5. package/dest/standard_indexed_tree/standard_indexed_tree.d.ts +37 -22
  6. package/dest/standard_indexed_tree/standard_indexed_tree.d.ts.map +1 -1
  7. package/dest/standard_indexed_tree/standard_indexed_tree.js +78 -87
  8. package/dest/standard_indexed_tree/test/standard_indexed_tree.test.d.ts.map +1 -0
  9. package/dest/standard_indexed_tree/test/standard_indexed_tree.test.js +337 -0
  10. package/dest/standard_indexed_tree/test/standard_indexed_tree_with_append.d.ts +23 -0
  11. package/dest/standard_indexed_tree/test/standard_indexed_tree_with_append.d.ts.map +1 -0
  12. package/dest/standard_indexed_tree/test/standard_indexed_tree_with_append.js +59 -0
  13. package/dest/standard_tree/standard_tree.d.ts +0 -10
  14. package/dest/standard_tree/standard_tree.d.ts.map +1 -1
  15. package/dest/standard_tree/standard_tree.js +3 -38
  16. package/dest/tree_base.d.ts +22 -9
  17. package/dest/tree_base.d.ts.map +1 -1
  18. package/dest/tree_base.js +48 -5
  19. package/package.json +3 -3
  20. package/src/interfaces/indexed_tree.ts +0 -10
  21. package/src/new_tree.ts +1 -1
  22. package/src/standard_indexed_tree/standard_indexed_tree.ts +86 -96
  23. package/src/standard_indexed_tree/{standard_indexed_tree.test.ts → test/standard_indexed_tree.test.ts} +35 -9
  24. package/src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts +63 -0
  25. package/src/standard_tree/standard_tree.ts +2 -40
  26. package/src/tree_base.ts +55 -8
  27. package/dest/standard_indexed_tree/standard_indexed_tree.test.d.ts.map +0 -1
  28. package/dest/standard_indexed_tree/standard_indexed_tree.test.js +0 -316
  29. /package/dest/standard_indexed_tree/{standard_indexed_tree.test.d.ts → test/standard_indexed_tree.test.d.ts} +0 -0
@@ -0,0 +1,337 @@
1
+ import { default as levelup } from 'levelup';
2
+ import { INITIAL_LEAF, Pedersen, SiblingPath } from '../../index.js';
3
+ import { treeTestSuite } from '../../test/test_suite.js';
4
+ import { createMemDown } from '../../test/utils/create_mem_down.js';
5
+ import { newTree } from '../../new_tree.js';
6
+ import { loadTree } from '../../load_tree.js';
7
+ import { toBufferBE } from '@aztec/foundation/bigint-buffer';
8
+ import { CircuitsWasm } from '@aztec/circuits.js';
9
+ import { StandardIndexedTreeWithAppend } from './standard_indexed_tree_with_append.js';
10
+ const createDb = async (levelUp, hasher, name, depth, prefilledSize = 1) => {
11
+ return await newTree(StandardIndexedTreeWithAppend, levelUp, hasher, name, depth, prefilledSize);
12
+ };
13
+ const createFromName = async (levelUp, hasher, name) => {
14
+ return await loadTree(StandardIndexedTreeWithAppend, levelUp, hasher, name);
15
+ };
16
+ const createIndexedTreeLeaf = (value, nextIndex, nextValue) => {
17
+ return [toBufferBE(BigInt(value), 32), toBufferBE(BigInt(nextIndex), 32), toBufferBE(BigInt(nextValue), 32)];
18
+ };
19
+ const verifyCommittedState = async (tree, root, siblingPathIndex, emptySiblingPath) => {
20
+ expect(tree.getRoot(false)).toEqual(root);
21
+ expect(tree.getNumLeaves(false)).toEqual(1n);
22
+ expect(await tree.getSiblingPath(siblingPathIndex, false)).toEqual(emptySiblingPath);
23
+ };
24
+ const TEST_TREE_DEPTH = 3;
25
+ treeTestSuite('StandardIndexedTree', createDb, createFromName);
26
+ describe('StandardIndexedTreeSpecific', () => {
27
+ let wasm;
28
+ let pedersen;
29
+ beforeEach(async () => {
30
+ wasm = await CircuitsWasm.get();
31
+ pedersen = new Pedersen(wasm);
32
+ });
33
+ it('produces the correct roots and sibling paths', async () => {
34
+ // Create a depth-3 indexed merkle tree
35
+ const db = levelup(createMemDown());
36
+ const tree = await createDb(db, pedersen, 'test', 3);
37
+ /**
38
+ * Initial state:
39
+ *
40
+ * index 0 1 2 3 4 5 6 7
41
+ * ---------------------------------------------------------------------
42
+ * val 0 0 0 0 0 0 0 0
43
+ * nextIdx 0 0 0 0 0 0 0 0
44
+ * nextVal 0 0 0 0 0 0 0 0.
45
+ */
46
+ const initialLeafHash = pedersen.compressInputs(createIndexedTreeLeaf(0, 0, 0));
47
+ const level1ZeroHash = pedersen.compress(INITIAL_LEAF, INITIAL_LEAF);
48
+ const level2ZeroHash = pedersen.compress(level1ZeroHash, level1ZeroHash);
49
+ let index0Hash = initialLeafHash;
50
+ // Each element is named by the level followed by the index on that level. E.g. e10 -> level 1, index 0, e21 -> level 2, index 1
51
+ let e10 = pedersen.compress(index0Hash, INITIAL_LEAF);
52
+ let e20 = pedersen.compress(e10, level1ZeroHash);
53
+ const initialE20 = e20; // Kept for calculating committed state later
54
+ const initialE10 = e10;
55
+ let root = pedersen.compress(e20, level2ZeroHash);
56
+ const initialRoot = root;
57
+ const emptySiblingPath = new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, level2ZeroHash]);
58
+ expect(tree.getRoot(true)).toEqual(root);
59
+ expect(tree.getNumLeaves(true)).toEqual(1n);
60
+ expect(await tree.getSiblingPath(0n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, level2ZeroHash]));
61
+ await verifyCommittedState(tree, initialRoot, 0n, emptySiblingPath);
62
+ /**
63
+ * Add new value 30:
64
+ *
65
+ * index 0 1 2 3 4 5 6 7
66
+ * ---------------------------------------------------------------------
67
+ * val 0 30 0 0 0 0 0 0
68
+ * nextIdx 1 0 0 0 0 0 0 0
69
+ * nextVal 30 0 0 0 0 0 0 0.
70
+ */
71
+ index0Hash = pedersen.compressInputs(createIndexedTreeLeaf(0, 1, 30));
72
+ let index1Hash = pedersen.compressInputs(createIndexedTreeLeaf(30, 0, 0));
73
+ e10 = pedersen.compress(index0Hash, index1Hash);
74
+ e20 = pedersen.compress(e10, level1ZeroHash);
75
+ root = pedersen.compress(e20, level2ZeroHash);
76
+ await tree.appendLeaves([toBufferBE(30n, 32)]);
77
+ expect(tree.getRoot(true)).toEqual(root);
78
+ expect(tree.getNumLeaves(true)).toEqual(2n);
79
+ expect(await tree.getSiblingPath(1n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index0Hash, level1ZeroHash, level2ZeroHash]));
80
+ // ensure the committed state is correct
81
+ const initialSiblingPath = new SiblingPath(TEST_TREE_DEPTH, [initialLeafHash, level1ZeroHash, level2ZeroHash]);
82
+ await verifyCommittedState(tree, initialRoot, 1n, initialSiblingPath);
83
+ /**
84
+ * Add new value 10:
85
+ *
86
+ * index 0 1 2 3 4 5 6 7
87
+ * ---------------------------------------------------------------------
88
+ * val 0 30 10 0 0 0 0 0
89
+ * nextIdx 2 0 1 0 0 0 0 0
90
+ * nextVal 10 0 30 0 0 0 0 0.
91
+ */
92
+ index0Hash = pedersen.compressInputs(createIndexedTreeLeaf(0, 2, 10));
93
+ let index2Hash = pedersen.compressInputs(createIndexedTreeLeaf(10, 1, 30));
94
+ e10 = pedersen.compress(index0Hash, index1Hash);
95
+ let e11 = pedersen.compress(index2Hash, INITIAL_LEAF);
96
+ e20 = pedersen.compress(e10, e11);
97
+ root = pedersen.compress(e20, level2ZeroHash);
98
+ await tree.appendLeaves([toBufferBE(10n, 32)]);
99
+ expect(tree.getRoot(true)).toEqual(root);
100
+ expect(tree.getNumLeaves(true)).toEqual(3n);
101
+ expect(await tree.getSiblingPath(2n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, e10, level2ZeroHash]));
102
+ // ensure the committed state is correct
103
+ await verifyCommittedState(tree, initialRoot, 2n, new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, initialE10, level2ZeroHash]));
104
+ /**
105
+ * Add new value 20:
106
+ *
107
+ * index 0 1 2 3 4 5 6 7
108
+ * ---------------------------------------------------------------------
109
+ * val 0 30 10 20 0 0 0 0
110
+ * nextIdx 2 0 3 1 0 0 0 0
111
+ * nextVal 10 0 20 30 0 0 0 0.
112
+ */
113
+ e10 = pedersen.compress(index0Hash, index1Hash);
114
+ index2Hash = pedersen.compressInputs(createIndexedTreeLeaf(10, 3, 20));
115
+ const index3Hash = pedersen.compressInputs(createIndexedTreeLeaf(20, 1, 30));
116
+ e11 = pedersen.compress(index2Hash, index3Hash);
117
+ e20 = pedersen.compress(e10, e11);
118
+ root = pedersen.compress(e20, level2ZeroHash);
119
+ await tree.appendLeaves([toBufferBE(20n, 32)]);
120
+ expect(tree.getRoot(true)).toEqual(root);
121
+ expect(tree.getNumLeaves(true)).toEqual(4n);
122
+ expect(await tree.getSiblingPath(3n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index2Hash, e10, level2ZeroHash]));
123
+ // ensure the committed state is correct
124
+ await verifyCommittedState(tree, initialRoot, 3n, new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, initialE10, level2ZeroHash]));
125
+ /**
126
+ * Add new value 50:
127
+ *
128
+ * index 0 1 2 3 4 5 6 7
129
+ * ---------------------------------------------------------------------
130
+ * val 0 30 10 20 50 0 0 0
131
+ * nextIdx 2 4 3 1 0 0 0 0
132
+ * nextVal 10 50 20 30 0 0 0 0.
133
+ */
134
+ index1Hash = pedersen.compressInputs(createIndexedTreeLeaf(30, 4, 50));
135
+ const index4Hash = pedersen.compressInputs(createIndexedTreeLeaf(50, 0, 0));
136
+ e10 = pedersen.compress(index0Hash, index1Hash);
137
+ e20 = pedersen.compress(e10, e11);
138
+ const e12 = pedersen.compress(index4Hash, INITIAL_LEAF);
139
+ const e21 = pedersen.compress(e12, level1ZeroHash);
140
+ root = pedersen.compress(e20, e21);
141
+ await tree.appendLeaves([toBufferBE(50n, 32)]);
142
+ expect(tree.getRoot(true)).toEqual(root);
143
+ expect(tree.getNumLeaves(true)).toEqual(5n);
144
+ // ensure the committed state is correct
145
+ await verifyCommittedState(tree, initialRoot, 4n, new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, initialE20]));
146
+ // check all uncommitted hash paths
147
+ expect(await tree.getSiblingPath(0n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index1Hash, e11, e21]));
148
+ expect(await tree.getSiblingPath(1n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index0Hash, e11, e21]));
149
+ expect(await tree.getSiblingPath(2n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index3Hash, e10, e21]));
150
+ expect(await tree.getSiblingPath(3n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index2Hash, e10, e21]));
151
+ expect(await tree.getSiblingPath(4n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, e20]));
152
+ expect(await tree.getSiblingPath(5n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index4Hash, level1ZeroHash, e20]));
153
+ expect(await tree.getSiblingPath(6n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, e12, e20]));
154
+ expect(await tree.getSiblingPath(7n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, e12, e20]));
155
+ // check all committed hash paths
156
+ expect(await tree.getSiblingPath(0n, false)).toEqual(emptySiblingPath);
157
+ expect(await tree.getSiblingPath(1n, false)).toEqual(initialSiblingPath);
158
+ expect(await tree.getSiblingPath(2n, false)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, initialE10, level2ZeroHash]));
159
+ expect(await tree.getSiblingPath(3n, false)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, initialE10, level2ZeroHash]));
160
+ const e2SiblingPath = new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, initialE20]);
161
+ expect(await tree.getSiblingPath(4n, false)).toEqual(e2SiblingPath);
162
+ expect(await tree.getSiblingPath(5n, false)).toEqual(e2SiblingPath);
163
+ expect(await tree.getSiblingPath(6n, false)).toEqual(e2SiblingPath);
164
+ expect(await tree.getSiblingPath(7n, false)).toEqual(e2SiblingPath);
165
+ await tree.commit();
166
+ // check all committed hash paths equal uncommitted hash paths
167
+ for (let i = 0; i < 8; i++) {
168
+ expect(await tree.getSiblingPath(BigInt(i), false)).toEqual(await tree.getSiblingPath(BigInt(i), true));
169
+ }
170
+ });
171
+ it('Can append empty leaves and handle insertions', async () => {
172
+ // Create a depth-3 indexed merkle tree
173
+ const db = levelup(createMemDown());
174
+ const tree = await createDb(db, pedersen, 'test', 3);
175
+ /**
176
+ * Initial state:
177
+ *
178
+ * index 0 1 2 3 4 5 6 7
179
+ * ---------------------------------------------------------------------
180
+ * val 0 0 0 0 0 0 0 0
181
+ * nextIdx 0 0 0 0 0 0 0 0
182
+ * nextVal 0 0 0 0 0 0 0 0.
183
+ */
184
+ const INITIAL_LEAF = toBufferBE(0n, 32);
185
+ const initialLeafHash = pedersen.compressInputs(createIndexedTreeLeaf(0, 0, 0));
186
+ const level1ZeroHash = pedersen.compress(INITIAL_LEAF, INITIAL_LEAF);
187
+ const level2ZeroHash = pedersen.compress(level1ZeroHash, level1ZeroHash);
188
+ let index0Hash = initialLeafHash;
189
+ let e10 = pedersen.compress(index0Hash, INITIAL_LEAF);
190
+ let e20 = pedersen.compress(e10, level1ZeroHash);
191
+ const inite10 = e10;
192
+ const inite20 = e20;
193
+ let root = pedersen.compress(e20, level2ZeroHash);
194
+ const initialRoot = root;
195
+ const emptySiblingPath = new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, level2ZeroHash]);
196
+ const initialSiblingPath = new SiblingPath(TEST_TREE_DEPTH, [initialLeafHash, level1ZeroHash, level2ZeroHash]);
197
+ expect(tree.getRoot(true)).toEqual(root);
198
+ expect(tree.getNumLeaves(true)).toEqual(1n);
199
+ expect(await tree.getSiblingPath(0n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, level2ZeroHash]));
200
+ await verifyCommittedState(tree, initialRoot, 0n, emptySiblingPath);
201
+ /**
202
+ * Add new value 30:
203
+ *
204
+ * index 0 1 2 3 4 5 6 7
205
+ * ---------------------------------------------------------------------
206
+ * val 0 30 0 0 0 0 0 0
207
+ * nextIdx 1 0 0 0 0 0 0 0
208
+ * nextVal 30 0 0 0 0 0 0 0.
209
+ */
210
+ index0Hash = pedersen.compressInputs(createIndexedTreeLeaf(0, 1, 30));
211
+ let index1Hash = pedersen.compressInputs(createIndexedTreeLeaf(30, 0, 0));
212
+ e10 = pedersen.compress(index0Hash, index1Hash);
213
+ e20 = pedersen.compress(e10, level1ZeroHash);
214
+ root = pedersen.compress(e20, level2ZeroHash);
215
+ await tree.appendLeaves([toBufferBE(30n, 32)]);
216
+ expect(tree.getRoot(true)).toEqual(root);
217
+ expect(tree.getNumLeaves(true)).toEqual(2n);
218
+ expect(await tree.getSiblingPath(1n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index0Hash, level1ZeroHash, level2ZeroHash]));
219
+ // ensure the committed state is correct
220
+ await verifyCommittedState(tree, initialRoot, 1n, initialSiblingPath);
221
+ /**
222
+ * Add new value 10:
223
+ *
224
+ * index 0 1 2 3 4 5 6 7
225
+ * ---------------------------------------------------------------------
226
+ * val 0 30 10 0 0 0 0 0
227
+ * nextIdx 2 0 1 0 0 0 0 0
228
+ * nextVal 10 0 30 0 0 0 0 0.
229
+ */
230
+ index0Hash = pedersen.compressInputs(createIndexedTreeLeaf(0, 2, 10));
231
+ let index2Hash = pedersen.compressInputs(createIndexedTreeLeaf(10, 1, 30));
232
+ e10 = pedersen.compress(index0Hash, index1Hash);
233
+ let e11 = pedersen.compress(index2Hash, INITIAL_LEAF);
234
+ e20 = pedersen.compress(e10, e11);
235
+ root = pedersen.compress(e20, level2ZeroHash);
236
+ await tree.appendLeaves([toBufferBE(10n, 32)]);
237
+ expect(tree.getRoot(true)).toEqual(root);
238
+ expect(tree.getNumLeaves(true)).toEqual(3n);
239
+ expect(await tree.getSiblingPath(2n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, e10, level2ZeroHash]));
240
+ // ensure the committed state is correct
241
+ await verifyCommittedState(tree, initialRoot, 2n, new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, inite10, level2ZeroHash]));
242
+ /**
243
+ * Add new value 20:
244
+ *
245
+ * index 0 1 2 3 4 5 6 7
246
+ * ---------------------------------------------------------------------
247
+ * val 0 30 10 20 0 0 0 0
248
+ * nextIdx 2 0 3 1 0 0 0 0
249
+ * nextVal 10 0 20 30 0 0 0 0.
250
+ */
251
+ e10 = pedersen.compress(index0Hash, index1Hash);
252
+ index2Hash = pedersen.compressInputs(createIndexedTreeLeaf(10, 3, 20));
253
+ const index3Hash = pedersen.compressInputs(createIndexedTreeLeaf(20, 1, 30));
254
+ e11 = pedersen.compress(index2Hash, index3Hash);
255
+ e20 = pedersen.compress(e10, e11);
256
+ root = pedersen.compress(e20, level2ZeroHash);
257
+ await tree.appendLeaves([toBufferBE(20n, 32)]);
258
+ expect(tree.getRoot(true)).toEqual(root);
259
+ expect(tree.getNumLeaves(true)).toEqual(4n);
260
+ expect(await tree.getSiblingPath(3n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index2Hash, e10, level2ZeroHash]));
261
+ // ensure the committed state is correct
262
+ await verifyCommittedState(tree, initialRoot, 3n, new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, inite10, level2ZeroHash]));
263
+ // Add 2 empty values
264
+ const emptyLeaves = [toBufferBE(0n, 32), toBufferBE(0n, 32)];
265
+ await tree.appendLeaves(emptyLeaves);
266
+ // The root should be the same but the size should have increased
267
+ expect(tree.getRoot(true)).toEqual(root);
268
+ expect(tree.getNumLeaves(true)).toEqual(6n);
269
+ /**
270
+ * Add new value 50:
271
+ *
272
+ * index 0 1 2 3 4 5 6 7
273
+ * --------------------------------------------------------------------
274
+ * val 0 30 10 20 0 0 50 0
275
+ * nextIdx 2 6 3 1 0 0 0 0
276
+ * nextVal 10 50 20 30 0 0 0 0.
277
+ */
278
+ index1Hash = pedersen.compressInputs(createIndexedTreeLeaf(30, 6, 50));
279
+ const index6Hash = pedersen.compressInputs(createIndexedTreeLeaf(50, 0, 0));
280
+ e10 = pedersen.compress(index0Hash, index1Hash);
281
+ e20 = pedersen.compress(e10, e11);
282
+ const e13 = pedersen.compress(index6Hash, INITIAL_LEAF);
283
+ const e21 = pedersen.compress(level1ZeroHash, e13);
284
+ root = pedersen.compress(e20, e21);
285
+ await tree.appendLeaves([toBufferBE(50n, 32)]);
286
+ expect(tree.getRoot(true)).toEqual(root);
287
+ expect(tree.getNumLeaves(true)).toEqual(7n);
288
+ // ensure the committed state is correct
289
+ await verifyCommittedState(tree, initialRoot, 6n, new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, inite20]));
290
+ // // check all uncommitted hash paths
291
+ expect(await tree.getSiblingPath(0n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index1Hash, e11, e21]));
292
+ expect(await tree.getSiblingPath(1n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index0Hash, e11, e21]));
293
+ expect(await tree.getSiblingPath(2n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index3Hash, e10, e21]));
294
+ expect(await tree.getSiblingPath(3n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index2Hash, e10, e21]));
295
+ expect(await tree.getSiblingPath(4n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, e13, e20]));
296
+ expect(await tree.getSiblingPath(5n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, e13, e20]));
297
+ expect(await tree.getSiblingPath(6n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, e20]));
298
+ expect(await tree.getSiblingPath(7n, true)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [index6Hash, level1ZeroHash, e20]));
299
+ // check all committed hash paths
300
+ expect(await tree.getSiblingPath(0n, false)).toEqual(emptySiblingPath);
301
+ expect(await tree.getSiblingPath(1n, false)).toEqual(initialSiblingPath);
302
+ expect(await tree.getSiblingPath(2n, false)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, inite10, level2ZeroHash]));
303
+ expect(await tree.getSiblingPath(3n, false)).toEqual(new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, inite10, level2ZeroHash]));
304
+ const e2SiblingPath = new SiblingPath(TEST_TREE_DEPTH, [INITIAL_LEAF, level1ZeroHash, inite20]);
305
+ expect(await tree.getSiblingPath(4n, false)).toEqual(e2SiblingPath);
306
+ expect(await tree.getSiblingPath(5n, false)).toEqual(e2SiblingPath);
307
+ expect(await tree.getSiblingPath(6n, false)).toEqual(e2SiblingPath);
308
+ expect(await tree.getSiblingPath(7n, false)).toEqual(e2SiblingPath);
309
+ await tree.commit();
310
+ // check all committed hash paths equal uncommitted hash paths
311
+ for (let i = 0; i < 8; i++) {
312
+ expect(await tree.getSiblingPath(BigInt(i), false)).toEqual(await tree.getSiblingPath(BigInt(i), true));
313
+ }
314
+ });
315
+ // For varying orders of insertions assert the local batch insertion generator creates the correct proofs
316
+ it.each([
317
+ // These are arbitrary but it needs to be higher than the constant `INITIAL_NULLIFIER_TREE_SIZE` and `KERNEL_NEW_NULLIFIERS_LENGTH * 2`
318
+ [[1003, 1002, 1001, 1000, 0, 0, 0, 0]],
319
+ [[1003, 1004, 1005, 1006, 0, 0, 0, 0]],
320
+ [[1234, 1098, 0, 0, 99999, 1096, 1054, 0]],
321
+ [[1970, 1980, 1040, 0, 99999, 1880, 100001, 9000000]],
322
+ ])('performs nullifier tree batch insertion correctly', async (nullifiers) => {
323
+ const leaves = nullifiers.map(i => toBufferBE(BigInt(i), 32));
324
+ const TREE_HEIGHT = 16; // originally from NULLIFIER_TREE_HEIGHT
325
+ const INITIAL_TREE_SIZE = 8; // originally from INITIAL_NULLIFIER_TREE_SIZE
326
+ const SUBTREE_HEIGHT = 5; // originally from BaseRollupInputs.NULLIFIER_SUBTREE_HEIGHT
327
+ // Create a depth-3 indexed merkle tree
328
+ const appendTree = await createDb(levelup(createMemDown()), pedersen, 'test', TREE_HEIGHT, INITIAL_TREE_SIZE);
329
+ const insertTree = await createDb(levelup(createMemDown()), pedersen, 'test', TREE_HEIGHT, INITIAL_TREE_SIZE);
330
+ await appendTree.appendLeaves(leaves);
331
+ await insertTree.batchInsert(leaves, SUBTREE_HEIGHT);
332
+ const expectedRoot = appendTree.getRoot(true);
333
+ const actualRoot = insertTree.getRoot(true);
334
+ expect(actualRoot).toEqual(expectedRoot);
335
+ });
336
+ });
337
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standard_indexed_tree.test.js","sourceRoot":"","sources":["../../../src/standard_indexed_tree/test/standard_indexed_tree.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ /// <reference types="node" resolution-mode="require"/>
2
+ import { StandardIndexedTree } from '../../index.js';
3
+ /**
4
+ * A testing utility which is here to store the original implementation of StandardIndexedTree.appendLeaves method
5
+ * that was replaced by the more efficient batchInsert method. We keep the original implementation around as it useful
6
+ * for testing that the more complex batchInsert method works correctly.
7
+ */
8
+ export declare class StandardIndexedTreeWithAppend extends StandardIndexedTree {
9
+ /**
10
+ * Appends the given leaves to the tree.
11
+ * @param leaves - The leaves to append.
12
+ * @returns Empty promise.
13
+ * @remarks This method is inefficient and is here mostly for testing. Use batchInsert instead.
14
+ */
15
+ appendLeaves(leaves: Buffer[]): Promise<void>;
16
+ /**
17
+ * Appends the given leaf to the tree.
18
+ * @param leaf - The leaf to append.
19
+ * @returns Empty promise.
20
+ */
21
+ private appendLeaf;
22
+ }
23
+ //# sourceMappingURL=standard_indexed_tree_with_append.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"standard_indexed_tree_with_append.d.ts","sourceRoot":"","sources":["../../../src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts"],"names":[],"mappings":";AACA,OAAO,EAAY,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE/D;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,mBAAmB;IACpE;;;;;OAKG;IACU,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAM1D;;;;OAIG;YACW,UAAU;CAoCzB"}
@@ -0,0 +1,59 @@
1
+ import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
2
+ import { StandardIndexedTree } from '../../index.js';
3
+ /**
4
+ * A testing utility which is here to store the original implementation of StandardIndexedTree.appendLeaves method
5
+ * that was replaced by the more efficient batchInsert method. We keep the original implementation around as it useful
6
+ * for testing that the more complex batchInsert method works correctly.
7
+ */
8
+ export class StandardIndexedTreeWithAppend extends StandardIndexedTree {
9
+ /**
10
+ * Appends the given leaves to the tree.
11
+ * @param leaves - The leaves to append.
12
+ * @returns Empty promise.
13
+ * @remarks This method is inefficient and is here mostly for testing. Use batchInsert instead.
14
+ */
15
+ async appendLeaves(leaves) {
16
+ for (const leaf of leaves) {
17
+ await this.appendLeaf(leaf);
18
+ }
19
+ }
20
+ /**
21
+ * Appends the given leaf to the tree.
22
+ * @param leaf - The leaf to append.
23
+ * @returns Empty promise.
24
+ */
25
+ async appendLeaf(leaf) {
26
+ const newValue = toBigIntBE(leaf);
27
+ // Special case when appending zero
28
+ if (newValue === 0n) {
29
+ const newSize = (this.cachedSize ?? this.size) + 1n;
30
+ if (newSize - 1n > this.maxIndex) {
31
+ throw Error(`Can't append beyond max index. Max index: ${this.maxIndex}`);
32
+ }
33
+ this.cachedSize = newSize;
34
+ return;
35
+ }
36
+ const indexOfPrevious = this.findIndexOfPreviousValue(newValue, true);
37
+ const previousLeafCopy = this.getLatestLeafDataCopy(indexOfPrevious.index, true);
38
+ if (previousLeafCopy === undefined) {
39
+ throw new Error(`Previous leaf not found!`);
40
+ }
41
+ const newLeaf = {
42
+ value: newValue,
43
+ nextIndex: previousLeafCopy.nextIndex,
44
+ nextValue: previousLeafCopy.nextValue,
45
+ };
46
+ if (indexOfPrevious.alreadyPresent) {
47
+ return;
48
+ }
49
+ // insert a new leaf at the highest index and update the values of our previous leaf copy
50
+ const currentSize = this.getNumLeaves(true);
51
+ previousLeafCopy.nextIndex = BigInt(currentSize);
52
+ previousLeafCopy.nextValue = newLeaf.value;
53
+ this.cachedLeaves[Number(currentSize)] = newLeaf;
54
+ this.cachedLeaves[Number(indexOfPrevious.index)] = previousLeafCopy;
55
+ await this.updateLeaf(previousLeafCopy, BigInt(indexOfPrevious.index));
56
+ await this.updateLeaf(newLeaf, this.getNumLeaves(true));
57
+ }
58
+ }
59
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRfaW5kZXhlZF90cmVlX3dpdGhfYXBwZW5kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YW5kYXJkX2luZGV4ZWRfdHJlZS90ZXN0L3N0YW5kYXJkX2luZGV4ZWRfdHJlZV93aXRoX2FwcGVuZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFZLG1CQUFtQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFL0Q7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyw2QkFBOEIsU0FBUSxtQkFBbUI7SUFDcEU7Ozs7O09BS0c7SUFDSSxLQUFLLENBQUMsWUFBWSxDQUFDLE1BQWdCO1FBQ3hDLEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxFQUFFO1lBQ3pCLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUM3QjtJQUNILENBQUM7SUFFRDs7OztPQUlHO0lBQ0ssS0FBSyxDQUFDLFVBQVUsQ0FBQyxJQUFZO1FBQ25DLE1BQU0sUUFBUSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVsQyxtQ0FBbUM7UUFDbkMsSUFBSSxRQUFRLEtBQUssRUFBRSxFQUFFO1lBQ25CLE1BQU0sT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3BELElBQUksT0FBTyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxFQUFFO2dCQUNoQyxNQUFNLEtBQUssQ0FBQyw2Q0FBNkMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7YUFDM0U7WUFDRCxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQztZQUMxQixPQUFPO1NBQ1I7UUFFRCxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsd0JBQXdCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3RFLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLHFCQUFxQixDQUFDLGVBQWUsQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFakYsSUFBSSxnQkFBZ0IsS0FBSyxTQUFTLEVBQUU7WUFDbEMsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1NBQzdDO1FBQ0QsTUFBTSxPQUFPLEdBQUc7WUFDZCxLQUFLLEVBQUUsUUFBUTtZQUNmLFNBQVMsRUFBRSxnQkFBZ0IsQ0FBQyxTQUFTO1lBQ3JDLFNBQVMsRUFBRSxnQkFBZ0IsQ0FBQyxTQUFTO1NBQzFCLENBQUM7UUFDZCxJQUFJLGVBQWUsQ0FBQyxjQUFjLEVBQUU7WUFDbEMsT0FBTztTQUNSO1FBQ0QseUZBQXlGO1FBQ3pGLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDNUMsZ0JBQWdCLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNqRCxnQkFBZ0IsQ0FBQyxTQUFTLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztRQUMzQyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQztRQUNqRCxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxnQkFBZ0IsQ0FBQztRQUNwRSxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLEVBQUUsTUFBTSxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzFELENBQUM7Q0FDRiJ9
@@ -9,16 +9,6 @@ export declare class StandardTree extends TreeBase implements AppendOnlyTree {
9
9
  * Appends the given leaves to the tree.
10
10
  * @param leaves - The leaves to append.
11
11
  * @returns Empty promise.
12
- *
13
- * @remarks The batch insertion algorithm works as follows:
14
- * 1. Insert all the leaves,
15
- * 2. start iterating over levels from the bottom up,
16
- * 3. on each level iterate over all the affected nodes (i.e. nodes whose preimages have changed),
17
- * 4. fetch the preimage, hash it and insert the updated value.
18
- * @remarks This algorithm is optimal when it comes to the number of hashing operations. It might not be optimal when
19
- * it comes to the number of database reads, but that should be irrelevant given that most of the time
20
- * `getLatestValueAtIndex` will return a value from cache (because at least one of the 2 children was
21
- * touched in previous iteration).
22
12
  */
23
13
  appendLeaves(leaves: Buffer[]): Promise<void>;
24
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"standard_tree.d.ts","sourceRoot":"","sources":["../../src/standard_tree/standard_tree.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAkB,MAAM,iBAAiB,CAAC;AAE3D;;GAEG;AACH,qBAAa,YAAa,SAAQ,QAAS,YAAW,cAAc;IAClE;;;;;;;;;;;;;;OAcG;IACU,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CA+B3D"}
1
+ {"version":3,"file":"standard_tree.d.ts","sourceRoot":"","sources":["../../src/standard_tree/standard_tree.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;GAEG;AACH,qBAAa,YAAa,SAAQ,QAAS,YAAW,cAAc;IAClE;;;;OAIG;IACU,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}
@@ -1,4 +1,4 @@
1
- import { TreeBase, indexToKeyHash } from '../tree_base.js';
1
+ import { TreeBase } from '../tree_base.js';
2
2
  /**
3
3
  * A Merkle tree implementation that uses a LevelDB database to store the tree.
4
4
  */
@@ -7,44 +7,9 @@ export class StandardTree extends TreeBase {
7
7
  * Appends the given leaves to the tree.
8
8
  * @param leaves - The leaves to append.
9
9
  * @returns Empty promise.
10
- *
11
- * @remarks The batch insertion algorithm works as follows:
12
- * 1. Insert all the leaves,
13
- * 2. start iterating over levels from the bottom up,
14
- * 3. on each level iterate over all the affected nodes (i.e. nodes whose preimages have changed),
15
- * 4. fetch the preimage, hash it and insert the updated value.
16
- * @remarks This algorithm is optimal when it comes to the number of hashing operations. It might not be optimal when
17
- * it comes to the number of database reads, but that should be irrelevant given that most of the time
18
- * `getLatestValueAtIndex` will return a value from cache (because at least one of the 2 children was
19
- * touched in previous iteration).
20
10
  */
21
11
  async appendLeaves(leaves) {
22
- const numLeaves = this.getNumLeaves(true);
23
- if (numLeaves + BigInt(leaves.length) - 1n > this.maxIndex) {
24
- throw Error(`Can't append beyond max index. Max index: ${this.maxIndex}`);
25
- }
26
- // 1. Insert all the leaves
27
- let firstIndex = numLeaves;
28
- let level = this.depth;
29
- for (let i = 0; i < leaves.length; i++) {
30
- const cacheKey = indexToKeyHash(this.name, level, firstIndex + BigInt(i));
31
- this.cache[cacheKey] = leaves[i];
32
- }
33
- let lastIndex = firstIndex + BigInt(leaves.length);
34
- // 2. Iterate over all the levels from the bottom up
35
- while (level > 0) {
36
- firstIndex >>= 1n;
37
- lastIndex >>= 1n;
38
- // 3.Iterate over all the affected nodes at this level and update them
39
- for (let index = firstIndex; index <= lastIndex; index++) {
40
- const lhs = await this.getLatestValueAtIndex(level, index * 2n, true);
41
- const rhs = await this.getLatestValueAtIndex(level, index * 2n + 1n, true);
42
- const cacheKey = indexToKeyHash(this.name, level - 1, index);
43
- this.cache[cacheKey] = this.hasher.compress(lhs, rhs);
44
- }
45
- level -= 1;
46
- }
47
- this.cachedSize = numLeaves + BigInt(leaves.length);
12
+ await super.appendLeaves(leaves);
48
13
  }
49
14
  }
50
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGFuZGFyZF90cmVlL3N0YW5kYXJkX3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUUzRDs7R0FFRztBQUNILE1BQU0sT0FBTyxZQUFhLFNBQVEsUUFBUTtJQUN4Qzs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNJLEtBQUssQ0FBQyxZQUFZLENBQUMsTUFBZ0I7UUFDeEMsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUMxQyxJQUFJLFNBQVMsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQzFELE1BQU0sS0FBSyxDQUFDLDZDQUE2QyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztTQUMzRTtRQUVELDJCQUEyQjtRQUMzQixJQUFJLFVBQVUsR0FBRyxTQUFTLENBQUM7UUFDM0IsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUN2QixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUN0QyxNQUFNLFFBQVEsR0FBRyxjQUFjLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsVUFBVSxHQUFHLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzFFLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2xDO1FBRUQsSUFBSSxTQUFTLEdBQUcsVUFBVSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDbkQsb0RBQW9EO1FBQ3BELE9BQU8sS0FBSyxHQUFHLENBQUMsRUFBRTtZQUNoQixVQUFVLEtBQUssRUFBRSxDQUFDO1lBQ2xCLFNBQVMsS0FBSyxFQUFFLENBQUM7WUFDakIsc0VBQXNFO1lBQ3RFLEtBQUssSUFBSSxLQUFLLEdBQUcsVUFBVSxFQUFFLEtBQUssSUFBSSxTQUFTLEVBQUUsS0FBSyxFQUFFLEVBQUU7Z0JBQ3hELE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLHFCQUFxQixDQUFDLEtBQUssRUFBRSxLQUFLLEdBQUcsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO2dCQUN0RSxNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxLQUFLLEVBQUUsS0FBSyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7Z0JBQzNFLE1BQU0sUUFBUSxHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUM7Z0JBQzdELElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO2FBQ3ZEO1lBRUQsS0FBSyxJQUFJLENBQUMsQ0FBQztTQUNaO1FBQ0QsSUFBSSxDQUFDLFVBQVUsR0FBRyxTQUFTLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0RCxDQUFDO0NBQ0YifQ==
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGFuZGFyZF90cmVlL3N0YW5kYXJkX3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTNDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQWEsU0FBUSxRQUFRO0lBQ3hDOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsWUFBWSxDQUFDLE1BQWdCO1FBQ3hDLE1BQU0sS0FBSyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNuQyxDQUFDO0NBQ0YifQ==
@@ -3,7 +3,6 @@ import { LevelUp, LevelUpChain } from 'levelup';
3
3
  import { SiblingPath } from './sibling_path/sibling_path.js';
4
4
  import { Hasher } from './hasher.js';
5
5
  import { MerkleTree } from './interfaces/merkle_tree.js';
6
- export declare const indexToKeyHash: (name: string, level: number, index: bigint) => string;
7
6
  export declare const decodeMeta: (meta: Buffer) => {
8
7
  root: Buffer;
9
8
  depth: number;
@@ -16,26 +15,24 @@ export declare const INITIAL_LEAF: Buffer;
16
15
  export declare abstract class TreeBase implements MerkleTree {
17
16
  protected db: LevelUp;
18
17
  protected hasher: Hasher;
19
- protected name: string;
20
- protected depth: number;
18
+ private name;
19
+ private depth;
21
20
  protected size: bigint;
22
21
  protected readonly maxIndex: bigint;
23
22
  protected cachedSize?: bigint;
24
23
  private root;
25
24
  private zeroHashes;
26
- protected cache: {
27
- [key: string]: Buffer;
28
- };
25
+ private cache;
29
26
  constructor(db: LevelUp, hasher: Hasher, name: string, depth: number, size?: bigint, root?: Buffer);
30
27
  /**
31
28
  * Returns the root of the tree.
32
- * @param includeUncommitted - If true, root incorporating uncomitted changes is returned.
29
+ * @param includeUncommitted - If true, root incorporating uncommitted changes is returned.
33
30
  * @returns The root of the tree.
34
31
  */
35
32
  getRoot(includeUncommitted: boolean): Buffer;
36
33
  /**
37
34
  * Returns the number of leaves in the tree.
38
- * @param includeUncommitted - If true, the returned number of leaves includes uncomitted changes.
35
+ * @param includeUncommitted - If true, the returned number of leaves includes uncommitted changes.
39
36
  * @returns The number of leaves in the tree.
40
37
  */
41
38
  getNumLeaves(includeUncommitted: boolean): bigint;
@@ -92,7 +89,7 @@ export declare abstract class TreeBase implements MerkleTree {
92
89
  * @returns The latest value at the given index.
93
90
  * Note: If the value is not in the cache, it will be fetched from the database.
94
91
  */
95
- protected getLatestValueAtIndex(level: number, index: bigint, includeUncommitted: boolean): Promise<Buffer>;
92
+ private getLatestValueAtIndex;
96
93
  /**
97
94
  * Gets a value from db by key.
98
95
  * @param key - The key to by which to get the value.
@@ -114,5 +111,21 @@ export declare abstract class TreeBase implements MerkleTree {
114
111
  * @param batch - The batch to which to write the meta data.
115
112
  */
116
113
  protected writeMeta(batch?: LevelUpChain<string, Buffer>): Promise<void>;
114
+ /**
115
+ * Appends the given leaves to the tree.
116
+ * @param leaves - The leaves to append.
117
+ * @returns Empty promise.
118
+ *
119
+ * @remarks The batch insertion algorithm works as follows:
120
+ * 1. Insert all the leaves,
121
+ * 2. start iterating over levels from the bottom up,
122
+ * 3. on each level iterate over all the affected nodes (i.e. nodes whose preimages have changed),
123
+ * 4. fetch the preimage, hash it and insert the updated value.
124
+ * @remarks This algorithm is optimal when it comes to the number of hashing operations. It might not be optimal when
125
+ * it comes to the number of database reads, but that should be irrelevant given that most of the time
126
+ * `getLatestValueAtIndex` will return a value from cache (because at least one of the 2 children was
127
+ * touched in previous iteration).
128
+ */
129
+ protected appendLeaves(leaves: Buffer[]): Promise<void>;
117
130
  }
118
131
  //# sourceMappingURL=tree_base.d.ts.map