@aztec/merkle-tree 0.20.0 → 0.21.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/interfaces/indexed_tree.d.ts +30 -4
- package/dest/interfaces/indexed_tree.d.ts.map +1 -1
- package/dest/interfaces/merkle_tree.d.ts +2 -2
- package/dest/interfaces/merkle_tree.d.ts.map +1 -1
- package/dest/load_tree.d.ts +2 -2
- package/dest/load_tree.d.ts.map +1 -1
- package/dest/load_tree.js +6 -7
- package/dest/new_tree.d.ts +2 -2
- package/dest/new_tree.d.ts.map +1 -1
- package/dest/new_tree.js +3 -3
- package/dest/snapshots/append_only_snapshot.d.ts +2 -2
- package/dest/snapshots/append_only_snapshot.d.ts.map +1 -1
- package/dest/snapshots/append_only_snapshot.js +80 -91
- package/dest/snapshots/base_full_snapshot.d.ts +22 -10
- package/dest/snapshots/base_full_snapshot.d.ts.map +1 -1
- package/dest/snapshots/base_full_snapshot.js +64 -82
- package/dest/snapshots/full_snapshot.js +2 -2
- package/dest/snapshots/indexed_tree_snapshot.d.ts +5 -5
- package/dest/snapshots/indexed_tree_snapshot.d.ts.map +1 -1
- package/dest/snapshots/indexed_tree_snapshot.js +20 -18
- package/dest/snapshots/snapshot_builder.d.ts +6 -6
- package/dest/snapshots/snapshot_builder.d.ts.map +1 -1
- package/dest/snapshots/snapshot_builder_test_suite.js +8 -8
- package/dest/sparse_tree/sparse_tree.d.ts +1 -1
- package/dest/sparse_tree/sparse_tree.d.ts.map +1 -1
- package/dest/sparse_tree/sparse_tree.js +7 -6
- package/dest/standard_indexed_tree/standard_indexed_tree.d.ts +15 -38
- package/dest/standard_indexed_tree/standard_indexed_tree.d.ts.map +1 -1
- package/dest/standard_indexed_tree/standard_indexed_tree.js +51 -72
- package/dest/standard_indexed_tree/test/standard_indexed_tree_with_append.d.ts.map +1 -1
- package/dest/standard_indexed_tree/test/standard_indexed_tree_with_append.js +10 -9
- package/dest/standard_tree/standard_tree.d.ts +4 -4
- package/dest/standard_tree/standard_tree.d.ts.map +1 -1
- package/dest/standard_tree/standard_tree.js +12 -11
- package/dest/tree_base.d.ts +12 -10
- package/dest/tree_base.d.ts.map +1 -1
- package/dest/tree_base.js +40 -34
- package/package.json +5 -8
|
@@ -1,38 +1,13 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { IndexedTreeLeaf, IndexedTreeLeafPreimage } from '@aztec/foundation/trees';
|
|
3
|
+
import { AztecKVStore, AztecMap } from '@aztec/kv-store';
|
|
3
4
|
import { Hasher } from '@aztec/types/interfaces';
|
|
4
5
|
import { SiblingPath } from '@aztec/types/membership';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
6
|
+
import { BatchInsertionResult, IndexedTree, PreimageFactory } from '../interfaces/indexed_tree.js';
|
|
7
|
+
import { IndexedTreeSnapshot } from '../snapshots/snapshot_builder.js';
|
|
7
8
|
import { TreeBase } from '../tree_base.js';
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
*/
|
|
11
|
-
export interface PreimageFactory {
|
|
12
|
-
/**
|
|
13
|
-
* Creates a new preimage from a leaf.
|
|
14
|
-
* @param leaf - Leaf to create a preimage from.
|
|
15
|
-
* @param nextKey - Next key of the leaf.
|
|
16
|
-
* @param nextIndex - Next index of the leaf.
|
|
17
|
-
*/
|
|
18
|
-
fromLeaf(leaf: IndexedTreeLeaf, nextKey: bigint, nextIndex: bigint): IndexedTreeLeafPreimage;
|
|
19
|
-
/**
|
|
20
|
-
* Creates a new preimage from a buffer.
|
|
21
|
-
* @param buffer - Buffer to create a preimage from.
|
|
22
|
-
*/
|
|
23
|
-
fromBuffer(buffer: Buffer): IndexedTreeLeafPreimage;
|
|
24
|
-
/**
|
|
25
|
-
* Creates an empty preimage.
|
|
26
|
-
*/
|
|
27
|
-
empty(): IndexedTreeLeafPreimage;
|
|
28
|
-
/**
|
|
29
|
-
* Creates a copy of a preimage.
|
|
30
|
-
* @param preimage - Preimage to be cloned.
|
|
31
|
-
*/
|
|
32
|
-
clone(preimage: IndexedTreeLeafPreimage): IndexedTreeLeafPreimage;
|
|
33
|
-
}
|
|
34
|
-
export declare const buildDbKeyForPreimage: (name: string, index: bigint) => string;
|
|
35
|
-
export declare const buildDbKeyForLeafIndex: (name: string, key: bigint) => string;
|
|
9
|
+
export declare const buildDbKeyForPreimage: (name: string, index: bigint) => `${string}:leaf_by_index:${string}`;
|
|
10
|
+
export declare const buildDbKeyForLeafIndex: (name: string, key: bigint) => `${string}:leaf_index_by_leaf_key:${string}`;
|
|
36
11
|
/**
|
|
37
12
|
* Factory for creating leaves.
|
|
38
13
|
*/
|
|
@@ -58,7 +33,9 @@ export declare class StandardIndexedTree extends TreeBase implements IndexedTree
|
|
|
58
33
|
protected cachedLeafPreimages: {
|
|
59
34
|
[key: string]: IndexedTreeLeafPreimage;
|
|
60
35
|
};
|
|
61
|
-
|
|
36
|
+
protected leaves: AztecMap<ReturnType<typeof buildDbKeyForPreimage>, Buffer>;
|
|
37
|
+
protected leafIndex: AztecMap<ReturnType<typeof buildDbKeyForLeafIndex>, bigint>;
|
|
38
|
+
constructor(store: AztecKVStore, hasher: Hasher, name: string, depth: number, size: bigint | undefined, leafPreimageFactory: PreimageFactory, leafFactory: LeafFactory, root?: Buffer);
|
|
62
39
|
/**
|
|
63
40
|
* Appends the given leaves to the tree.
|
|
64
41
|
* @param _leaves - The leaves to append.
|
|
@@ -82,14 +59,14 @@ export declare class StandardIndexedTree extends TreeBase implements IndexedTree
|
|
|
82
59
|
* @param includeUncommitted - Indicates whether to include uncommitted leaves in the computation.
|
|
83
60
|
* @returns The value of the leaf at the given index or undefined if the leaf is empty.
|
|
84
61
|
*/
|
|
85
|
-
getLeafValue(index: bigint, includeUncommitted: boolean):
|
|
62
|
+
getLeafValue(index: bigint, includeUncommitted: boolean): Buffer | undefined;
|
|
86
63
|
/**
|
|
87
64
|
* Finds the index of the largest leaf whose value is less than or equal to the provided value.
|
|
88
65
|
* @param newKey - The new key to be inserted into the tree.
|
|
89
66
|
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
90
67
|
* @returns The found leaf index and a flag indicating if the corresponding leaf's value is equal to `newValue`.
|
|
91
68
|
*/
|
|
92
|
-
findIndexOfPreviousKey(newKey: bigint, includeUncommitted: boolean):
|
|
69
|
+
findIndexOfPreviousKey(newKey: bigint, includeUncommitted: boolean): {
|
|
93
70
|
/**
|
|
94
71
|
* The index of the found leaf.
|
|
95
72
|
*/
|
|
@@ -98,7 +75,7 @@ export declare class StandardIndexedTree extends TreeBase implements IndexedTree
|
|
|
98
75
|
* A flag indicating if the corresponding leaf's value is equal to `newValue`.
|
|
99
76
|
*/
|
|
100
77
|
alreadyPresent: boolean;
|
|
101
|
-
} | undefined
|
|
78
|
+
} | undefined;
|
|
102
79
|
private getCachedLowLeafIndex;
|
|
103
80
|
private getCachedLeafIndex;
|
|
104
81
|
private getDbLowLeafIndex;
|
|
@@ -110,14 +87,14 @@ export declare class StandardIndexedTree extends TreeBase implements IndexedTree
|
|
|
110
87
|
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
111
88
|
* @returns A copy of the leaf preimage at the given index or undefined if the leaf was not found.
|
|
112
89
|
*/
|
|
113
|
-
getLatestLeafPreimageCopy(index: bigint, includeUncommitted: boolean):
|
|
90
|
+
getLatestLeafPreimageCopy(index: bigint, includeUncommitted: boolean): IndexedTreeLeafPreimage | undefined;
|
|
114
91
|
/**
|
|
115
92
|
* Returns the index of a leaf given its value, or undefined if no leaf with that value is found.
|
|
116
93
|
* @param value - The leaf value to look for.
|
|
117
94
|
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
118
95
|
* @returns The index of the first leaf found with a given value (undefined if not found).
|
|
119
96
|
*/
|
|
120
|
-
findLeafIndex(value: Buffer, includeUncommitted: boolean):
|
|
97
|
+
findLeafIndex(value: Buffer, includeUncommitted: boolean): bigint | undefined;
|
|
121
98
|
/**
|
|
122
99
|
* Initializes the tree.
|
|
123
100
|
* @param prefilledSize - A number of leaves that are prefilled with values.
|
|
@@ -146,7 +123,7 @@ export declare class StandardIndexedTree extends TreeBase implements IndexedTree
|
|
|
146
123
|
* @param preimage - New contents of the leaf.
|
|
147
124
|
* @param index - Index of the leaf to be updated.
|
|
148
125
|
*/
|
|
149
|
-
protected updateLeaf(preimage: IndexedTreeLeafPreimage, index: bigint):
|
|
126
|
+
protected updateLeaf(preimage: IndexedTreeLeafPreimage, index: bigint): void;
|
|
150
127
|
/**
|
|
151
128
|
*
|
|
152
129
|
* Each base rollup needs to provide non membership / inclusion proofs for each of the nullifier.
|
|
@@ -289,7 +266,7 @@ export declare class StandardIndexedTree extends TreeBase implements IndexedTree
|
|
|
289
266
|
batchInsert<TreeHeight extends number, SubtreeHeight extends number, SubtreeSiblingPathHeight extends number>(leaves: Buffer[], subtreeHeight: SubtreeHeight): Promise<BatchInsertionResult<TreeHeight, SubtreeSiblingPathHeight>>;
|
|
290
267
|
getSubtreeSiblingPath<SubtreeHeight extends number, SubtreeSiblingPathHeight extends number>(subtreeHeight: SubtreeHeight, includeUncommitted: boolean): Promise<SiblingPath<SubtreeSiblingPathHeight>>;
|
|
291
268
|
snapshot(blockNumber: number): Promise<IndexedTreeSnapshot>;
|
|
292
|
-
getSnapshot(
|
|
269
|
+
getSnapshot(blockNumber: number): Promise<IndexedTreeSnapshot>;
|
|
293
270
|
/**
|
|
294
271
|
* Encodes leaves and appends them to a tree.
|
|
295
272
|
* @param preimages - Leaves to encode.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standard_indexed_tree.d.ts","sourceRoot":"","sources":["../../src/standard_indexed_tree/standard_indexed_tree.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"standard_indexed_tree.d.ts","sourceRoot":"","sources":["../../src/standard_indexed_tree/standard_indexed_tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
var _StandardIndexedTree_snapshotBuilder;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import {
|
|
4
|
-
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
|
+
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
5
4
|
import { Timer } from '@aztec/foundation/timer';
|
|
6
5
|
import { SiblingPath } from '@aztec/types/membership';
|
|
7
|
-
import { IndexedTreeSnapshotBuilder
|
|
6
|
+
import { IndexedTreeSnapshotBuilder } from '../snapshots/indexed_tree_snapshot.js';
|
|
8
7
|
import { TreeBase } from '../tree_base.js';
|
|
9
|
-
const log = createDebugLogger('aztec:standard-indexed-tree');
|
|
10
8
|
export const buildDbKeyForPreimage = (name, index) => {
|
|
11
9
|
return `${name}:leaf_by_index:${toBufferBE(index, 32).toString('hex')}`;
|
|
12
10
|
};
|
|
@@ -29,12 +27,14 @@ function getEmptyLowLeafWitness(treeHeight, leafPreimageFactory) {
|
|
|
29
27
|
* Standard implementation of an indexed tree.
|
|
30
28
|
*/
|
|
31
29
|
export class StandardIndexedTree extends TreeBase {
|
|
32
|
-
constructor(
|
|
33
|
-
super(
|
|
30
|
+
constructor(store, hasher, name, depth, size = 0n, leafPreimageFactory, leafFactory, root) {
|
|
31
|
+
super(store, hasher, name, depth, size, root);
|
|
34
32
|
this.leafPreimageFactory = leafPreimageFactory;
|
|
35
33
|
this.leafFactory = leafFactory;
|
|
36
|
-
_StandardIndexedTree_snapshotBuilder.set(this, new IndexedTreeSnapshotBuilder(this.
|
|
34
|
+
_StandardIndexedTree_snapshotBuilder.set(this, new IndexedTreeSnapshotBuilder(this.store, this, this.leafPreimageFactory));
|
|
37
35
|
this.cachedLeafPreimages = {};
|
|
36
|
+
this.leaves = store.openMap(`tree_${name}_leaves`);
|
|
37
|
+
this.leafIndex = store.openMap(`tree_${name}_leaf_index`);
|
|
38
38
|
}
|
|
39
39
|
/**
|
|
40
40
|
* Appends the given leaves to the tree.
|
|
@@ -67,8 +67,8 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
67
67
|
* @param includeUncommitted - Indicates whether to include uncommitted leaves in the computation.
|
|
68
68
|
* @returns The value of the leaf at the given index or undefined if the leaf is empty.
|
|
69
69
|
*/
|
|
70
|
-
|
|
71
|
-
const preimage =
|
|
70
|
+
getLeafValue(index, includeUncommitted) {
|
|
71
|
+
const preimage = this.getLatestLeafPreimageCopy(index, includeUncommitted);
|
|
72
72
|
return preimage && preimage.toBuffer();
|
|
73
73
|
}
|
|
74
74
|
/**
|
|
@@ -77,9 +77,9 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
77
77
|
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
78
78
|
* @returns The found leaf index and a flag indicating if the corresponding leaf's value is equal to `newValue`.
|
|
79
79
|
*/
|
|
80
|
-
|
|
81
|
-
let lowLeafIndex =
|
|
82
|
-
let lowLeafPreimage = lowLeafIndex !== undefined ?
|
|
80
|
+
findIndexOfPreviousKey(newKey, includeUncommitted) {
|
|
81
|
+
let lowLeafIndex = this.getDbLowLeafIndex(newKey);
|
|
82
|
+
let lowLeafPreimage = lowLeafIndex !== undefined ? this.getDbPreimage(lowLeafIndex) : undefined;
|
|
83
83
|
if (includeUncommitted) {
|
|
84
84
|
const cachedLowLeafIndex = this.getCachedLowLeafIndex(newKey);
|
|
85
85
|
if (cachedLowLeafIndex !== undefined) {
|
|
@@ -118,35 +118,17 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
118
118
|
}
|
|
119
119
|
return undefined;
|
|
120
120
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
limit: 1,
|
|
129
|
-
reverse: true,
|
|
130
|
-
})
|
|
131
|
-
.on('data', data => {
|
|
132
|
-
lowLeafIndex = toBigIntBE(data.value);
|
|
133
|
-
})
|
|
134
|
-
.on('close', function () { })
|
|
135
|
-
.on('end', function () {
|
|
136
|
-
resolve(lowLeafIndex);
|
|
137
|
-
})
|
|
138
|
-
.on('error', function () {
|
|
139
|
-
log.error('stream error');
|
|
140
|
-
reject();
|
|
141
|
-
});
|
|
142
|
-
});
|
|
121
|
+
getDbLowLeafIndex(key) {
|
|
122
|
+
const values = Array.from(this.leafIndex.values({
|
|
123
|
+
end: buildDbKeyForLeafIndex(this.getName(), key),
|
|
124
|
+
limit: 1,
|
|
125
|
+
reverse: true,
|
|
126
|
+
}));
|
|
127
|
+
return values[0];
|
|
143
128
|
}
|
|
144
|
-
|
|
145
|
-
const
|
|
146
|
-
|
|
147
|
-
.then(data => this.leafPreimageFactory.fromBuffer(data))
|
|
148
|
-
.catch(() => undefined);
|
|
149
|
-
return dbPreimage;
|
|
129
|
+
getDbPreimage(index) {
|
|
130
|
+
const value = this.leaves.get(buildDbKeyForPreimage(this.getName(), index));
|
|
131
|
+
return value ? this.leafPreimageFactory.fromBuffer(value) : undefined;
|
|
150
132
|
}
|
|
151
133
|
getCachedPreimage(index) {
|
|
152
134
|
return this.cachedLeafPreimages[index.toString()];
|
|
@@ -157,10 +139,10 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
157
139
|
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
158
140
|
* @returns A copy of the leaf preimage at the given index or undefined if the leaf was not found.
|
|
159
141
|
*/
|
|
160
|
-
|
|
142
|
+
getLatestLeafPreimageCopy(index, includeUncommitted) {
|
|
161
143
|
const preimage = !includeUncommitted
|
|
162
|
-
?
|
|
163
|
-
: this.getCachedPreimage(index) ??
|
|
144
|
+
? this.getDbPreimage(index)
|
|
145
|
+
: this.getCachedPreimage(index) ?? this.getDbPreimage(index);
|
|
164
146
|
return preimage && this.leafPreimageFactory.clone(preimage);
|
|
165
147
|
}
|
|
166
148
|
/**
|
|
@@ -169,12 +151,9 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
169
151
|
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
170
152
|
* @returns The index of the first leaf found with a given value (undefined if not found).
|
|
171
153
|
*/
|
|
172
|
-
|
|
154
|
+
findLeafIndex(value, includeUncommitted) {
|
|
173
155
|
const leaf = this.leafFactory.fromBuffer(value);
|
|
174
|
-
let index =
|
|
175
|
-
.get(buildDbKeyForLeafIndex(this.getName(), leaf.getKey()))
|
|
176
|
-
.then(data => toBigIntBE(data))
|
|
177
|
-
.catch(() => undefined);
|
|
156
|
+
let index = this.leafIndex.get(buildDbKeyForLeafIndex(this.getName(), leaf.getKey()));
|
|
178
157
|
if (includeUncommitted && index === undefined) {
|
|
179
158
|
const cachedIndex = this.getCachedLeafIndex(leaf.getKey());
|
|
180
159
|
index = cachedIndex;
|
|
@@ -207,23 +186,23 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
207
186
|
}
|
|
208
187
|
// Make the last leaf point to the first leaf
|
|
209
188
|
leaves[prefilledSize - 1] = this.leafPreimageFactory.fromLeaf(leaves[prefilledSize - 1].asLeaf(), 0n, 0n);
|
|
210
|
-
|
|
189
|
+
this.encodeAndAppendLeaves(leaves, true);
|
|
211
190
|
await this.commit();
|
|
212
191
|
}
|
|
213
192
|
/**
|
|
214
193
|
* Commits all the leaves to the database and removes them from a cache.
|
|
215
194
|
*/
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
195
|
+
commitLeaves() {
|
|
196
|
+
return this.store.transaction(() => {
|
|
197
|
+
const keys = Object.getOwnPropertyNames(this.cachedLeafPreimages);
|
|
198
|
+
for (const key of keys) {
|
|
199
|
+
const leaf = this.cachedLeafPreimages[key];
|
|
200
|
+
const index = BigInt(key);
|
|
201
|
+
void this.leaves.set(buildDbKeyForPreimage(this.getName(), index), leaf.toBuffer());
|
|
202
|
+
void this.leafIndex.set(buildDbKeyForLeafIndex(this.getName(), leaf.getKey()), index);
|
|
203
|
+
}
|
|
204
|
+
this.clearCachedLeaves();
|
|
205
|
+
});
|
|
227
206
|
}
|
|
228
207
|
/**
|
|
229
208
|
* Clears the cache.
|
|
@@ -236,13 +215,13 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
236
215
|
* @param preimage - New contents of the leaf.
|
|
237
216
|
* @param index - Index of the leaf to be updated.
|
|
238
217
|
*/
|
|
239
|
-
|
|
218
|
+
updateLeaf(preimage, index) {
|
|
240
219
|
if (index > this.maxIndex) {
|
|
241
220
|
throw Error(`Index out of bounds. Index ${index}, max index: ${this.maxIndex}.`);
|
|
242
221
|
}
|
|
243
222
|
this.cachedLeafPreimages[index.toString()] = preimage;
|
|
244
223
|
const encodedLeaf = this.encodeLeaf(preimage, true);
|
|
245
|
-
|
|
224
|
+
this.addLeafToCacheAndHashToRoot(encodedLeaf, index);
|
|
246
225
|
const numLeaves = this.getNumLeaves(true);
|
|
247
226
|
if (index >= numLeaves) {
|
|
248
227
|
this.cachedSize = index + 1n;
|
|
@@ -417,7 +396,7 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
417
396
|
else {
|
|
418
397
|
insertedKeys.set(newLeaf.getKey(), true);
|
|
419
398
|
}
|
|
420
|
-
const indexOfPrevious =
|
|
399
|
+
const indexOfPrevious = this.findIndexOfPreviousKey(newLeaf.getKey(), true);
|
|
421
400
|
if (indexOfPrevious === undefined) {
|
|
422
401
|
return {
|
|
423
402
|
lowLeavesWitnessData: undefined,
|
|
@@ -428,7 +407,7 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
428
407
|
}
|
|
429
408
|
const isUpdate = indexOfPrevious.alreadyPresent;
|
|
430
409
|
// get the low leaf (existence checked in getting index)
|
|
431
|
-
const lowLeafPreimage =
|
|
410
|
+
const lowLeafPreimage = this.getLatestLeafPreimageCopy(indexOfPrevious.index, true);
|
|
432
411
|
const siblingPath = await this.getSiblingPath(BigInt(indexOfPrevious.index), true);
|
|
433
412
|
const witness = {
|
|
434
413
|
leafPreimage: lowLeafPreimage,
|
|
@@ -440,12 +419,12 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
440
419
|
if (isUpdate) {
|
|
441
420
|
const newLowLeaf = lowLeafPreimage.asLeaf().updateTo(newLeaf);
|
|
442
421
|
const newLowLeafPreimage = this.leafPreimageFactory.fromLeaf(newLowLeaf, lowLeafPreimage.getNextKey(), lowLeafPreimage.getNextIndex());
|
|
443
|
-
|
|
422
|
+
this.updateLeaf(newLowLeafPreimage, indexOfPrevious.index);
|
|
444
423
|
pendingInsertionSubtree[originalIndex] = this.leafPreimageFactory.empty();
|
|
445
424
|
}
|
|
446
425
|
else {
|
|
447
426
|
const newLowLeafPreimage = this.leafPreimageFactory.fromLeaf(lowLeafPreimage.asLeaf(), newLeaf.getKey(), startInsertionIndex + BigInt(originalIndex));
|
|
448
|
-
|
|
427
|
+
this.updateLeaf(newLowLeafPreimage, indexOfPrevious.index);
|
|
449
428
|
const currentPendingPreimageLeaf = this.leafPreimageFactory.fromLeaf(newLeaf, lowLeafPreimage.getNextKey(), lowLeafPreimage.getNextIndex());
|
|
450
429
|
pendingInsertionSubtree[originalIndex] = currentPendingPreimageLeaf;
|
|
451
430
|
}
|
|
@@ -454,7 +433,7 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
454
433
|
// Perform batch insertion of new pending values
|
|
455
434
|
// Note: In this case we set `hash0Leaf` param to false because batch insertion algorithm use forced null leaf
|
|
456
435
|
// inclusion. See {@link encodeLeaf} for a more through param explanation.
|
|
457
|
-
|
|
436
|
+
this.encodeAndAppendLeaves(pendingInsertionSubtree, false);
|
|
458
437
|
this.log(`Inserted ${leaves.length} leaves into ${this.getName()} tree`, {
|
|
459
438
|
eventName: 'tree-insertion',
|
|
460
439
|
duration: timer.ms(),
|
|
@@ -480,8 +459,8 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
480
459
|
snapshot(blockNumber) {
|
|
481
460
|
return __classPrivateFieldGet(this, _StandardIndexedTree_snapshotBuilder, "f").snapshot(blockNumber);
|
|
482
461
|
}
|
|
483
|
-
getSnapshot(
|
|
484
|
-
return __classPrivateFieldGet(this, _StandardIndexedTree_snapshotBuilder, "f").getSnapshot(
|
|
462
|
+
getSnapshot(blockNumber) {
|
|
463
|
+
return __classPrivateFieldGet(this, _StandardIndexedTree_snapshotBuilder, "f").getSnapshot(blockNumber);
|
|
485
464
|
}
|
|
486
465
|
/**
|
|
487
466
|
* Encodes leaves and appends them to a tree.
|
|
@@ -489,13 +468,13 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
489
468
|
* @param hash0Leaf - Indicates whether 0 value leaf should be hashed. See {@link encodeLeaf}.
|
|
490
469
|
* @returns Empty promise
|
|
491
470
|
*/
|
|
492
|
-
|
|
471
|
+
encodeAndAppendLeaves(preimages, hash0Leaf) {
|
|
493
472
|
const startInsertionIndex = this.getNumLeaves(true);
|
|
494
473
|
const hashedLeaves = preimages.map((preimage, i) => {
|
|
495
474
|
this.cachedLeafPreimages[(startInsertionIndex + BigInt(i)).toString()] = preimage;
|
|
496
475
|
return this.encodeLeaf(preimage, hash0Leaf);
|
|
497
476
|
});
|
|
498
|
-
|
|
477
|
+
super.appendLeaves(hashedLeaves);
|
|
499
478
|
}
|
|
500
479
|
/**
|
|
501
480
|
* Encode a leaf into a buffer.
|
|
@@ -517,4 +496,4 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
517
496
|
}
|
|
518
497
|
}
|
|
519
498
|
_StandardIndexedTree_snapshotBuilder = new WeakMap();
|
|
520
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standard_indexed_tree.js","sourceRoot":"","sources":["../../src/standard_indexed_tree/standard_indexed_tree.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAItD,OAAO,EAIL,0BAA0B,GAE3B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,MAAM,GAAG,GAAG,iBAAiB,CAAC,6BAA6B,CAAC,CAAC;AA6B7D,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE;IACnE,OAAO,GAAG,IAAI,kBAAkB,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AAC1E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAE,GAAW,EAAE,EAAE;IAClE,OAAO,GAAG,IAAI,2BAA2B,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AACjF,CAAC,CAAC;AAkBF;;;;GAIG;AACH,SAAS,sBAAsB,CAC7B,UAAa,EACb,mBAAoC;IAEpC,OAAO;QACL,YAAY,EAAE,mBAAmB,CAAC,KAAK,EAAE;QACzC,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,IAAI,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;KACrF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,QAAQ;IAI/C,YACE,EAAW,EACX,MAAc,EACd,IAAY,EACZ,KAAa,EACb,OAAe,EAAE,EACP,mBAAoC,EACpC,WAAwB,EAClC,IAAa;QAEb,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAJjC,wBAAmB,GAAnB,mBAAmB,CAAiB;QACpC,gBAAW,GAAX,WAAW,CAAa;QAVpC,+CAAmB,IAAI,0BAA0B,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAAC;QACjF,wBAAmB,GAA+C,EAAE,CAAC;IAa/E,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,OAAiB;QAC5B,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM;QACjB,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,QAAQ;QACnB,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,kBAA2B;QAClE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;QACjF,OAAO,QAAQ,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACzC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,sBAAsB,CAC1B,MAAc,EACd,kBAA2B;QAc3B,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,eAAe,GAAG,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEtG,IAAI,kBAAkB,EAAE;YACtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YAC9D,IAAI,kBAAkB,KAAK,SAAS,EAAE;gBACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAE,CAAC;gBAC1E,IAAI,CAAC,eAAe,IAAI,qBAAqB,CAAC,MAAM,EAAE,GAAG,eAAe,CAAC,MAAM,EAAE,EAAE;oBACjF,YAAY,GAAG,kBAAkB,CAAC;oBAClC,eAAe,GAAG,qBAAqB,CAAC;iBACzC;aACF;SACF;QAED,IAAI,YAAY,KAAK,SAAS,IAAI,CAAC,eAAe,EAAE;YAClD,OAAO,SAAS,CAAC;SAClB;QAED,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,cAAc,EAAE,eAAe,CAAC,MAAM,EAAE,KAAK,MAAM;SACpD,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAAC,GAAW;QACvC,MAAM,OAAO,GAAG,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACrE,MAAM,cAAc,GAAG,OAAO;aAC3B,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACb,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;YACpB,GAAG,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;SAC9C,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,IAAI,GAAG,CAAC;aACtD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,OAAO,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;IAClC,CAAC;IAEO,kBAAkB,CAAC,GAAW;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC/D,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;SACtB;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAW;QACzC,OAAO,MAAM,IAAI,OAAO,CAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/D,IAAI,YAAgC,CAAC;YACrC,IAAI,CAAC,EAAE;iBACJ,gBAAgB,CAAC;gBAChB,GAAG,EAAE,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC;gBAC/C,GAAG,EAAE,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC;gBAChD,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,IAAI;aACd,CAAC;iBACD,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACjB,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE,cAAa,CAAC,CAAC;iBAC3B,EAAE,CAAC,KAAK,EAAE;gBACT,OAAO,CAAC,YAAY,CAAC,CAAC;YACxB,CAAC,CAAC;iBACD,EAAE,CAAC,OAAO,EAAE;gBACX,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAC1B,MAAM,EAAE,CAAC;YACX,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAa;QACvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE;aAC7B,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;aACjD,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACvD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,iBAAiB,CAAC,KAAa;QACrC,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,yBAAyB,CACpC,KAAa,EACb,kBAA2B;QAE3B,MAAM,QAAQ,GAAG,CAAC,kBAAkB;YAClC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;YACjC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,OAAO,QAAQ,IAAI,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,kBAA2B;QACnE,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE;aACtB,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;aAC1D,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aAC9B,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAE1B,IAAI,kBAAkB,IAAI,KAAK,KAAK,SAAS,EAAE;YAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC3D,KAAK,GAAG,WAAW,CAAC;SACrB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;;;;;OAaG;IACI,KAAK,CAAC,IAAI,CAAC,aAAqB;QACrC,IAAI,aAAa,GAAG,CAAC,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QAED,MAAM,MAAM,GAA8B,EAAE,CAAC;QAC7C,KAAK,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YACnF,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAC9B;QAED,6CAA6C;QAC7C,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAE1G,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAClE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;YAC3C,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzE,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;SACzF;QACD,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,UAAU,CAAC,QAAiC,EAAE,KAAa;QACzE,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE;YACzB,MAAM,KAAK,CAAC,8BAA8B,KAAK,gBAAgB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;SAClF;QAED,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,KAAK,IAAI,SAAS,EAAE;YACtB,IAAI,CAAC,UAAU,GAAG,KAAK,GAAG,EAAE,CAAC;SAC9B;IACH,CAAC;IAED,gEAAgE;IAChE,qFAAqF;IAErF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0IG;IACI,KAAK,CAAC,WAAW,CAKtB,MAAgB,EAChB,aAA4B;QAE5B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,IAAI,GAAG,EAAmB,CAAC;QAChD,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,IAAI,CAAC,QAAQ,EAAgB,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC5G,eAAe;QACf,MAAM,kBAAkB,GAAqC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAC;QACnG,MAAM,uBAAuB,GAA8B,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC;QAE9G,aAAa;QACb,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEpD,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7E,MAAM,0BAA0B,GAAG,cAAc;aAC9C,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;aACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7D,MAAM,sBAAsB,GAAG,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE3F,mCAAmC;QACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,OAAO,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;YAC1C,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;gBACrB,SAAS;aACV;YAED,IAAI,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;aACpE;iBAAM;gBACL,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;aAC1C;YAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;YAClF,IAAI,eAAe,KAAK,SAAS,EAAE;gBACjC,OAAO;oBACL,oBAAoB,EAAE,SAAS;oBAC/B,eAAe,EAAE,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACvF,sBAAsB,EAAE,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC;oBACpF,qBAAqB,EAAE,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,IAAI,CAAC;iBAC7E,CAAC;aACH;YAED,MAAM,QAAQ,GAAG,eAAe,CAAC,cAAc,CAAC;YAEhD,wDAAwD;YACxD,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAE,CAAC;YAC7F,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAa,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;YAE/F,MAAM,OAAO,GAAmC;gBAC9C,YAAY,EAAE,eAAe;gBAC7B,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC;gBACpC,WAAW;aACZ,CAAC;YAEF,2BAA2B;YAC3B,kBAAkB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;YAEhC,IAAI,QAAQ,EAAE;gBACZ,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAE9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAC1D,UAAU,EACV,eAAe,CAAC,UAAU,EAAE,EAC5B,eAAe,CAAC,YAAY,EAAE,CAC/B,CAAC;gBAEF,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;gBAEjE,uBAAuB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;aAC3E;iBAAM;gBACL,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAC1D,eAAe,CAAC,MAAM,EAAE,EACxB,OAAO,CAAC,MAAM,EAAE,EAChB,mBAAmB,GAAG,MAAM,CAAC,aAAa,CAAC,CAC5C,CAAC;gBAEF,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;gBAEjE,MAAM,0BAA0B,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAClE,OAAO,EACP,eAAe,CAAC,UAAU,EAAE,EAC5B,eAAe,CAAC,YAAY,EAAE,CAC/B,CAAC;gBAEF,uBAAuB,CAAC,aAAa,CAAC,GAAG,0BAA0B,CAAC;aACrE;SACF;QAED,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC5D,aAAa,EACb,IAAI,CACL,CAAC;QAEF,gDAAgD;QAChD,8GAA8G;QAC9G,2EAA2E;QAC3E,MAAM,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAEjE,IAAI,CAAC,GAAG,CAAC,YAAY,MAAM,CAAC,MAAM,gBAAgB,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE;YACvE,SAAS,EAAE,gBAAgB;YAC3B,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,SAAS,EAAE,MAAM,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE;YACxB,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE;YAC1B,QAAQ,EAAE,SAAS;YACnB,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;SACM,CAAC,CAAC;QAEhC,OAAO;YACL,oBAAoB,EAAE,kBAAkB;YACxC,eAAe,EAAE,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvF,sBAAsB,EAAE,0BAA0B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC;YACpF,qBAAqB;SACtB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,aAA4B,EAC5B,kBAA2B;QAE3B,MAAM,sBAAsB,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;QACrE,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CAAC;QAE9F,2FAA2F;QAC3F,OAAO,eAAe,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAC9D,CAAC;IAED,QAAQ,CAAC,WAAmB;QAC1B,OAAO,uBAAA,IAAI,4CAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,OAAO,uBAAA,IAAI,4CAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,qBAAqB,CAAC,SAAoC,EAAE,SAAkB;QAC1F,MAAM,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEpD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,CAAC,mBAAmB,CAAC,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;YAClF,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC;IAED;;;;;;;OAOG;IACK,UAAU,CAAC,IAA6B,EAAE,SAAkB;QAClE,IAAI,WAAW,CAAC;QAChB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACrC,WAAW,GAAG,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAClC;aAAM;YACL,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;SAC3D;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CACF"}
|
|
499
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"standard_indexed_tree.js","sourceRoot":"","sources":["../../src/standard_indexed_tree/standard_indexed_tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,mBAAmB;IACpE;;;;;OAKG;
|
|
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":";AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,mBAAmB;IACpE;;;;;OAKG;IACI,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD,OAAO,CAAC,eAAe;IAQvB;;;;OAIG;IACH,OAAO,CAAC,UAAU;CA6CnB"}
|
|
@@ -11,10 +11,11 @@ export class StandardIndexedTreeWithAppend extends StandardIndexedTree {
|
|
|
11
11
|
* @returns Empty promise.
|
|
12
12
|
* @remarks This method is inefficient and is here mostly for testing. Use batchInsert instead.
|
|
13
13
|
*/
|
|
14
|
-
|
|
14
|
+
appendLeaves(leaves) {
|
|
15
15
|
for (const leaf of leaves) {
|
|
16
|
-
|
|
16
|
+
this.appendLeaf(leaf);
|
|
17
17
|
}
|
|
18
|
+
return Promise.resolve();
|
|
18
19
|
}
|
|
19
20
|
appendEmptyLeaf() {
|
|
20
21
|
const newSize = (this.cachedSize ?? this.size) + 1n;
|
|
@@ -28,33 +29,33 @@ export class StandardIndexedTreeWithAppend extends StandardIndexedTree {
|
|
|
28
29
|
* @param leaf - The leaf to append.
|
|
29
30
|
* @returns Empty promise.
|
|
30
31
|
*/
|
|
31
|
-
|
|
32
|
+
appendLeaf(leaf) {
|
|
32
33
|
const newLeaf = this.leafFactory.fromBuffer(leaf);
|
|
33
34
|
// Special case when appending zero
|
|
34
35
|
if (newLeaf.getKey() === 0n) {
|
|
35
36
|
this.appendEmptyLeaf();
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
|
-
const lowLeafIndex =
|
|
39
|
+
const lowLeafIndex = this.findIndexOfPreviousKey(newLeaf.getKey(), true);
|
|
39
40
|
if (lowLeafIndex === undefined) {
|
|
40
41
|
throw new Error(`Previous leaf not found!`);
|
|
41
42
|
}
|
|
42
43
|
const isUpdate = lowLeafIndex.alreadyPresent;
|
|
43
|
-
const lowLeafPreimage =
|
|
44
|
+
const lowLeafPreimage = this.getLatestLeafPreimageCopy(lowLeafIndex.index, true);
|
|
44
45
|
const currentSize = this.getNumLeaves(true);
|
|
45
46
|
if (isUpdate) {
|
|
46
47
|
const newLowLeaf = lowLeafPreimage.asLeaf().updateTo(newLeaf);
|
|
47
48
|
const newLowLeafPreimage = this.leafPreimageFactory.fromLeaf(newLowLeaf, lowLeafPreimage.getNextKey(), lowLeafPreimage.getNextIndex());
|
|
48
|
-
|
|
49
|
+
this.updateLeaf(newLowLeafPreimage, BigInt(lowLeafIndex.index));
|
|
49
50
|
this.appendEmptyLeaf();
|
|
50
51
|
}
|
|
51
52
|
else {
|
|
52
53
|
const newLeafPreimage = this.leafPreimageFactory.fromLeaf(newLeaf, lowLeafPreimage.getNextKey(), lowLeafPreimage.getNextIndex());
|
|
53
54
|
// insert a new leaf at the highest index and update the values of our previous leaf copy
|
|
54
55
|
const newLowLeafPreimage = this.leafPreimageFactory.fromLeaf(lowLeafPreimage.asLeaf(), newLeaf.getKey(), BigInt(currentSize));
|
|
55
|
-
|
|
56
|
-
|
|
56
|
+
this.updateLeaf(newLowLeafPreimage, BigInt(lowLeafIndex.index));
|
|
57
|
+
this.updateLeaf(newLeafPreimage, currentSize);
|
|
57
58
|
}
|
|
58
59
|
}
|
|
59
60
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRfaW5kZXhlZF90cmVlX3dpdGhfYXBwZW5kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3N0YW5kYXJkX2luZGV4ZWRfdHJlZS90ZXN0L3N0YW5kYXJkX2luZGV4ZWRfdHJlZV93aXRoX2FwcGVuZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUVyRDs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLDZCQUE4QixTQUFRLG1CQUFtQjtJQUNwRTs7Ozs7T0FLRztJQUNJLFlBQVksQ0FBQyxNQUFnQjtRQUNsQyxLQUFLLE1BQU0sSUFBSSxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQzFCLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDeEIsQ0FBQztRQUVELE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFTyxlQUFlO1FBQ3JCLE1BQU0sT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3BELElBQUksT0FBTyxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDakMsTUFBTSxLQUFLLENBQUMsNkNBQTZDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQzVFLENBQUM7UUFDRCxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQztJQUM1QixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNLLFVBQVUsQ0FBQyxJQUFZO1FBQzdCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRWxELG1DQUFtQztRQUNuQyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztZQUM1QixJQUFJLENBQUMsZUFBZSxFQUFFLENBQUM7WUFDdkIsT0FBTztRQUNULENBQUM7UUFFRCxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsc0JBQXNCLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3pFLElBQUksWUFBWSxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQy9CLE1BQU0sSUFBSSxLQUFLLENBQUMsMEJBQTBCLENBQUMsQ0FBQztRQUM5QyxDQUFDO1FBRUQsTUFBTSxRQUFRLEdBQUcsWUFBWSxDQUFDLGNBQWMsQ0FBQztRQUM3QyxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMseUJBQXlCLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUUsQ0FBQztRQUNsRixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRTVDLElBQUksUUFBUSxFQUFFLENBQUM7WUFDYixNQUFNLFVBQVUsR0FBRyxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQzlELE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FDMUQsVUFBVSxFQUNWLGVBQWUsQ0FBQyxVQUFVLEVBQUUsRUFDNUIsZUFBZSxDQUFDLFlBQVksRUFBRSxDQUMvQixDQUFDO1lBRUYsSUFBSSxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDaEUsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1FBQ3pCLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxlQUFlLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FDdkQsT0FBTyxFQUNQLGVBQWUsQ0FBQyxVQUFVLEVBQUUsRUFDNUIsZUFBZSxDQUFDLFlBQVksRUFBRSxDQUMvQixDQUFDO1lBRUYseUZBQXlGO1lBQ3pGLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxDQUFDLG1CQUFtQixDQUFDLFFBQVEsQ0FDMUQsZUFBZSxDQUFDLE1BQU0sRUFBRSxFQUN4QixPQUFPLENBQUMsTUFBTSxFQUFFLEVBQ2hCLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FDcEIsQ0FBQztZQUNGLElBQUksQ0FBQyxVQUFVLENBQUMsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1lBQ2hFLElBQUksQ0FBQyxVQUFVLENBQUMsZUFBZSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2hELENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { TreeSnapshot } from '../index.js';
|
|
3
2
|
import { AppendOnlyTree } from '../interfaces/append_only_tree.js';
|
|
3
|
+
import { TreeSnapshot } from '../snapshots/snapshot_builder.js';
|
|
4
4
|
import { TreeBase } from '../tree_base.js';
|
|
5
5
|
/**
|
|
6
6
|
* A Merkle tree implementation that uses a LevelDB database to store the tree.
|
|
@@ -13,8 +13,8 @@ export declare class StandardTree extends TreeBase implements AppendOnlyTree {
|
|
|
13
13
|
* @returns Empty promise.
|
|
14
14
|
*/
|
|
15
15
|
appendLeaves(leaves: Buffer[]): Promise<void>;
|
|
16
|
-
snapshot(
|
|
17
|
-
getSnapshot(
|
|
18
|
-
findLeafIndex(value: Buffer, includeUncommitted: boolean):
|
|
16
|
+
snapshot(blockNumber: number): Promise<TreeSnapshot>;
|
|
17
|
+
getSnapshot(blockNumber: number): Promise<TreeSnapshot>;
|
|
18
|
+
findLeafIndex(value: Buffer, includeUncommitted: boolean): bigint | undefined;
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=standard_tree.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standard_tree.d.ts","sourceRoot":"","sources":["../../src/standard_tree/standard_tree.ts"],"names":[],"mappings":";AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"standard_tree.d.ts","sourceRoot":"","sources":["../../src/standard_tree/standard_tree.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;GAEG;AACH,qBAAa,YAAa,SAAQ,QAAS,YAAW,cAAc;;IAGlE;;;;OAIG;IACI,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7C,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIpD,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIvD,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;CASrF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _StandardTree_snapshotBuilder;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
3
|
import { Timer } from '@aztec/foundation/timer';
|
|
4
|
-
import { AppendOnlySnapshotBuilder } from '../
|
|
4
|
+
import { AppendOnlySnapshotBuilder } from '../snapshots/append_only_snapshot.js';
|
|
5
5
|
import { TreeBase } from '../tree_base.js';
|
|
6
6
|
/**
|
|
7
7
|
* A Merkle tree implementation that uses a LevelDB database to store the tree.
|
|
@@ -9,17 +9,17 @@ import { TreeBase } from '../tree_base.js';
|
|
|
9
9
|
export class StandardTree extends TreeBase {
|
|
10
10
|
constructor() {
|
|
11
11
|
super(...arguments);
|
|
12
|
-
_StandardTree_snapshotBuilder.set(this, new AppendOnlySnapshotBuilder(this.
|
|
12
|
+
_StandardTree_snapshotBuilder.set(this, new AppendOnlySnapshotBuilder(this.store, this, this.hasher));
|
|
13
13
|
}
|
|
14
14
|
/**
|
|
15
15
|
* Appends the given leaves to the tree.
|
|
16
16
|
* @param leaves - The leaves to append.
|
|
17
17
|
* @returns Empty promise.
|
|
18
18
|
*/
|
|
19
|
-
|
|
19
|
+
appendLeaves(leaves) {
|
|
20
20
|
this.hasher.reset();
|
|
21
21
|
const timer = new Timer();
|
|
22
|
-
|
|
22
|
+
super.appendLeaves(leaves);
|
|
23
23
|
this.log(`Inserted ${leaves.length} leaves into ${this.getName()} tree`, {
|
|
24
24
|
eventName: 'tree-insertion',
|
|
25
25
|
duration: timer.ms(),
|
|
@@ -29,16 +29,17 @@ export class StandardTree extends TreeBase {
|
|
|
29
29
|
treeType: 'append-only',
|
|
30
30
|
...this.hasher.stats(),
|
|
31
31
|
});
|
|
32
|
+
return Promise.resolve();
|
|
32
33
|
}
|
|
33
|
-
snapshot(
|
|
34
|
-
return __classPrivateFieldGet(this, _StandardTree_snapshotBuilder, "f").snapshot(
|
|
34
|
+
snapshot(blockNumber) {
|
|
35
|
+
return __classPrivateFieldGet(this, _StandardTree_snapshotBuilder, "f").snapshot(blockNumber);
|
|
35
36
|
}
|
|
36
|
-
getSnapshot(
|
|
37
|
-
return __classPrivateFieldGet(this, _StandardTree_snapshotBuilder, "f").getSnapshot(
|
|
37
|
+
getSnapshot(blockNumber) {
|
|
38
|
+
return __classPrivateFieldGet(this, _StandardTree_snapshotBuilder, "f").getSnapshot(blockNumber);
|
|
38
39
|
}
|
|
39
|
-
|
|
40
|
+
findLeafIndex(value, includeUncommitted) {
|
|
40
41
|
for (let i = 0n; i < this.getNumLeaves(includeUncommitted); i++) {
|
|
41
|
-
const currentValue =
|
|
42
|
+
const currentValue = this.getLeafValue(i, includeUncommitted);
|
|
42
43
|
if (currentValue && currentValue.equals(value)) {
|
|
43
44
|
return i;
|
|
44
45
|
}
|
|
@@ -47,4 +48,4 @@ export class StandardTree extends TreeBase {
|
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
_StandardTree_snapshotBuilder = new WeakMap();
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRhcmRfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdGFuZGFyZF90cmVlL3N0YW5kYXJkX3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHaEQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFFakYsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTNDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQWEsU0FBUSxRQUFRO0lBQTFDOztRQUNFLHdDQUFtQixJQUFJLHlCQUF5QixDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBQztJQXlDbEYsQ0FBQztJQXZDQzs7OztPQUlHO0lBQ0ksWUFBWSxDQUFDLE1BQWdCO1FBQ2xDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDcEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUMxQixLQUFLLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzNCLElBQUksQ0FBQyxHQUFHLENBQUMsWUFBWSxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsSUFBSSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUU7WUFDdkUsU0FBUyxFQUFFLGdCQUFnQjtZQUMzQixRQUFRLEVBQUUsS0FBSyxDQUFDLEVBQUUsRUFBRTtZQUNwQixTQUFTLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDeEIsUUFBUSxFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUU7WUFDeEIsU0FBUyxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDMUIsUUFBUSxFQUFFLGFBQWE7WUFDdkIsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRTtTQUNNLENBQUMsQ0FBQztRQUVoQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRU0sUUFBUSxDQUFDLFdBQW1CO1FBQ2pDLE9BQU8sdUJBQUEsSUFBSSxxQ0FBaUIsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVNLFdBQVcsQ0FBQyxXQUFtQjtRQUNwQyxPQUFPLHVCQUFBLElBQUkscUNBQWlCLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ3hELENBQUM7SUFFTSxhQUFhLENBQUMsS0FBYSxFQUFFLGtCQUEyQjtRQUM3RCxLQUFLLElBQUksQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDaEUsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztZQUM5RCxJQUFJLFlBQVksSUFBSSxZQUFZLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQy9DLE9BQU8sQ0FBQyxDQUFDO1lBQ1gsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0NBQ0YifQ==
|