@aztec/merkle-tree 0.16.1 → 0.16.3
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/index.d.ts +5 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +6 -2
- package/dest/interfaces/append_only_tree.d.ts +2 -1
- package/dest/interfaces/append_only_tree.d.ts.map +1 -1
- package/dest/interfaces/indexed_tree.d.ts +38 -17
- package/dest/interfaces/indexed_tree.d.ts.map +1 -1
- package/dest/interfaces/merkle_tree.d.ts +7 -0
- package/dest/interfaces/merkle_tree.d.ts.map +1 -1
- package/dest/interfaces/update_only_tree.d.ts +3 -3
- package/dest/interfaces/update_only_tree.d.ts.map +1 -1
- package/dest/load_tree.d.ts +2 -1
- package/dest/load_tree.d.ts.map +1 -1
- package/dest/load_tree.js +1 -2
- package/dest/new_tree.d.ts +1 -1
- package/dest/new_tree.d.ts.map +1 -1
- package/dest/new_tree.js +2 -2
- package/dest/snapshots/append_only_snapshot.d.ts +30 -0
- package/dest/snapshots/append_only_snapshot.d.ts.map +1 -0
- package/dest/snapshots/append_only_snapshot.js +200 -0
- package/dest/snapshots/base_full_snapshot.d.ts +50 -0
- package/dest/snapshots/base_full_snapshot.d.ts.map +1 -0
- package/dest/snapshots/base_full_snapshot.js +179 -0
- package/dest/snapshots/full_snapshot.d.ts +22 -0
- package/dest/snapshots/full_snapshot.d.ts.map +1 -0
- package/dest/snapshots/full_snapshot.js +21 -0
- package/dest/snapshots/indexed_tree_snapshot.d.ts +15 -0
- package/dest/snapshots/indexed_tree_snapshot.d.ts.map +1 -0
- package/dest/snapshots/indexed_tree_snapshot.js +75 -0
- package/dest/snapshots/snapshot_builder.d.ts +76 -0
- package/dest/snapshots/snapshot_builder.d.ts.map +1 -0
- package/dest/snapshots/snapshot_builder.js +2 -0
- package/dest/snapshots/snapshot_builder_test_suite.d.ts +5 -0
- package/dest/snapshots/snapshot_builder_test_suite.d.ts.map +1 -0
- package/dest/snapshots/snapshot_builder_test_suite.js +163 -0
- package/dest/sparse_tree/sparse_tree.d.ts +5 -0
- package/dest/sparse_tree/sparse_tree.d.ts.map +1 -1
- package/dest/sparse_tree/sparse_tree.js +18 -1
- package/dest/standard_indexed_tree/standard_indexed_tree.d.ts +111 -81
- package/dest/standard_indexed_tree/standard_indexed_tree.d.ts.map +1 -1
- package/dest/standard_indexed_tree/standard_indexed_tree.js +225 -259
- 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 +13 -19
- package/dest/standard_tree/standard_tree.d.ts +5 -0
- package/dest/standard_tree/standard_tree.d.ts.map +1 -1
- package/dest/standard_tree/standard_tree.js +24 -1
- package/dest/tree_base.d.ts +9 -4
- package/dest/tree_base.d.ts.map +1 -1
- package/dest/tree_base.js +16 -7
- package/package.json +4 -3
- package/src/index.ts +5 -1
- package/src/interfaces/append_only_tree.ts +2 -1
- package/src/interfaces/indexed_tree.ts +50 -28
- package/src/interfaces/merkle_tree.ts +8 -0
- package/src/interfaces/update_only_tree.ts +3 -4
- package/src/load_tree.ts +2 -2
- package/src/new_tree.ts +2 -2
- package/src/snapshots/append_only_snapshot.ts +243 -0
- package/src/snapshots/base_full_snapshot.ts +232 -0
- package/src/snapshots/full_snapshot.ts +26 -0
- package/src/snapshots/indexed_tree_snapshot.ts +108 -0
- package/src/snapshots/snapshot_builder.ts +84 -0
- package/src/snapshots/snapshot_builder_test_suite.ts +218 -0
- package/src/sparse_tree/sparse_tree.ts +16 -0
- package/src/standard_indexed_tree/standard_indexed_tree.ts +325 -304
- package/src/standard_indexed_tree/test/standard_indexed_tree_with_append.ts +23 -21
- package/src/standard_tree/standard_tree.ts +21 -0
- package/src/tree_base.ts +28 -7
|
@@ -1,57 +1,39 @@
|
|
|
1
|
+
var _StandardIndexedTree_snapshotBuilder;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
1
3
|
import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
2
4
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
5
|
import { SiblingPath } from '@aztec/types';
|
|
6
|
+
import { IndexedTreeSnapshotBuilder, } from '../index.js';
|
|
4
7
|
import { TreeBase } from '../tree_base.js';
|
|
5
8
|
const log = createDebugLogger('aztec:standard-indexed-tree');
|
|
6
|
-
const
|
|
7
|
-
return `${name}:
|
|
9
|
+
export const buildDbKeyForPreimage = (name, index) => {
|
|
10
|
+
return `${name}:leaf_by_index:${toBufferBE(index, 32).toString('hex')}`;
|
|
8
11
|
};
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
return toBigIntBE(Buffer.from(index, 'hex'));
|
|
12
|
-
};
|
|
13
|
-
const zeroLeaf = {
|
|
14
|
-
value: 0n,
|
|
15
|
-
nextValue: 0n,
|
|
16
|
-
nextIndex: 0n,
|
|
12
|
+
export const buildDbKeyForLeafIndex = (name, key) => {
|
|
13
|
+
return `${name}:leaf_index_by_leaf_key:${toBufferBE(key, 32).toString('hex')}`;
|
|
17
14
|
};
|
|
18
15
|
/**
|
|
19
16
|
* Pre-compute empty witness.
|
|
20
17
|
* @param treeHeight - Height of tree for sibling path.
|
|
21
18
|
* @returns An empty witness.
|
|
22
19
|
*/
|
|
23
|
-
function getEmptyLowLeafWitness(treeHeight) {
|
|
20
|
+
function getEmptyLowLeafWitness(treeHeight, leafPreimageFactory) {
|
|
24
21
|
return {
|
|
25
|
-
|
|
22
|
+
leafPreimage: leafPreimageFactory.empty(),
|
|
26
23
|
index: 0n,
|
|
27
24
|
siblingPath: new SiblingPath(treeHeight, Array(treeHeight).fill(toBufferBE(0n, 32))),
|
|
28
25
|
};
|
|
29
26
|
}
|
|
30
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
31
|
-
const encodeTreeValue = (leafData) => {
|
|
32
|
-
const valueAsBuffer = toBufferBE(leafData.value, 32);
|
|
33
|
-
const indexAsBuffer = toBufferBE(leafData.nextIndex, 32);
|
|
34
|
-
const nextValueAsBuffer = toBufferBE(leafData.nextValue, 32);
|
|
35
|
-
return Buffer.concat([valueAsBuffer, indexAsBuffer, nextValueAsBuffer]);
|
|
36
|
-
};
|
|
37
|
-
const decodeTreeValue = (buf) => {
|
|
38
|
-
const value = toBigIntBE(buf.subarray(0, 32));
|
|
39
|
-
const nextIndex = toBigIntBE(buf.subarray(32, 64));
|
|
40
|
-
const nextValue = toBigIntBE(buf.subarray(64, 96));
|
|
41
|
-
return {
|
|
42
|
-
value,
|
|
43
|
-
nextIndex,
|
|
44
|
-
nextValue,
|
|
45
|
-
};
|
|
46
|
-
};
|
|
47
27
|
/**
|
|
48
|
-
*
|
|
28
|
+
* Standard implementation of an indexed tree.
|
|
49
29
|
*/
|
|
50
30
|
export class StandardIndexedTree extends TreeBase {
|
|
51
|
-
constructor() {
|
|
52
|
-
super(
|
|
53
|
-
this.
|
|
54
|
-
this.
|
|
31
|
+
constructor(db, hasher, name, depth, size = 0n, leafPreimageFactory, leafFactory, root) {
|
|
32
|
+
super(db, hasher, name, depth, size, root);
|
|
33
|
+
this.leafPreimageFactory = leafPreimageFactory;
|
|
34
|
+
this.leafFactory = leafFactory;
|
|
35
|
+
_StandardIndexedTree_snapshotBuilder.set(this, new IndexedTreeSnapshotBuilder(this.db, this, this.leafPreimageFactory));
|
|
36
|
+
this.cachedLeafPreimages = {};
|
|
55
37
|
}
|
|
56
38
|
/**
|
|
57
39
|
* Appends the given leaves to the tree.
|
|
@@ -84,74 +66,119 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
84
66
|
* @param includeUncommitted - Indicates whether to include uncommitted leaves in the computation.
|
|
85
67
|
* @returns The value of the leaf at the given index or undefined if the leaf is empty.
|
|
86
68
|
*/
|
|
87
|
-
getLeafValue(index, includeUncommitted) {
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
return Promise.resolve(undefined);
|
|
91
|
-
}
|
|
92
|
-
return Promise.resolve(toBufferBE(leaf.value, 32));
|
|
69
|
+
async getLeafValue(index, includeUncommitted) {
|
|
70
|
+
const preimage = await this.getLatestLeafPreimageCopy(index, includeUncommitted);
|
|
71
|
+
return preimage && preimage.toBuffer();
|
|
93
72
|
}
|
|
94
73
|
/**
|
|
95
74
|
* Finds the index of the largest leaf whose value is less than or equal to the provided value.
|
|
96
|
-
* @param
|
|
75
|
+
* @param newKey - The new key to be inserted into the tree.
|
|
97
76
|
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
98
77
|
* @returns The found leaf index and a flag indicating if the corresponding leaf's value is equal to `newValue`.
|
|
99
78
|
*/
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
diff.push(newValue);
|
|
112
|
-
}
|
|
113
|
-
else if (storedLeaf.value === newValue) {
|
|
114
|
-
return { index: i, alreadyPresent: true };
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
diff.push(newValue - storedLeaf.value);
|
|
79
|
+
async findIndexOfPreviousKey(newKey, includeUncommitted) {
|
|
80
|
+
let lowLeafIndex = await this.getDbLowLeafIndex(newKey);
|
|
81
|
+
let lowLeafPreimage = lowLeafIndex !== undefined ? await this.getDbPreimage(lowLeafIndex) : undefined;
|
|
82
|
+
if (includeUncommitted) {
|
|
83
|
+
const cachedLowLeafIndex = this.getCachedLowLeafIndex(newKey);
|
|
84
|
+
if (cachedLowLeafIndex !== undefined) {
|
|
85
|
+
const cachedLowLeafPreimage = this.getCachedPreimage(cachedLowLeafIndex);
|
|
86
|
+
if (!lowLeafPreimage || cachedLowLeafPreimage.getKey() > lowLeafPreimage.getKey()) {
|
|
87
|
+
lowLeafIndex = cachedLowLeafIndex;
|
|
88
|
+
lowLeafPreimage = cachedLowLeafPreimage;
|
|
89
|
+
}
|
|
118
90
|
}
|
|
119
91
|
}
|
|
120
|
-
|
|
121
|
-
|
|
92
|
+
if (lowLeafIndex === undefined || !lowLeafPreimage) {
|
|
93
|
+
return undefined;
|
|
94
|
+
}
|
|
95
|
+
return {
|
|
96
|
+
index: lowLeafIndex,
|
|
97
|
+
alreadyPresent: lowLeafPreimage.getKey() === newKey,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
getCachedLowLeafIndex(key) {
|
|
101
|
+
const indexes = Object.getOwnPropertyNames(this.cachedLeafPreimages);
|
|
102
|
+
const lowLeafIndexes = indexes
|
|
103
|
+
.map(index => ({
|
|
104
|
+
index: BigInt(index),
|
|
105
|
+
key: this.cachedLeafPreimages[index].getKey(),
|
|
106
|
+
}))
|
|
107
|
+
.filter(({ key: candidateKey }) => candidateKey <= key)
|
|
108
|
+
.sort((a, b) => Number(b.key - a.key));
|
|
109
|
+
return lowLeafIndexes[0]?.index;
|
|
110
|
+
}
|
|
111
|
+
getCachedLeafIndex(key) {
|
|
112
|
+
const index = Object.keys(this.cachedLeafPreimages).find(index => {
|
|
113
|
+
return this.cachedLeafPreimages[index].getKey() === key;
|
|
114
|
+
});
|
|
115
|
+
if (index) {
|
|
116
|
+
return BigInt(index);
|
|
117
|
+
}
|
|
118
|
+
return undefined;
|
|
119
|
+
}
|
|
120
|
+
async getDbLowLeafIndex(key) {
|
|
121
|
+
return await new Promise((resolve, reject) => {
|
|
122
|
+
let lowLeafIndex;
|
|
123
|
+
this.db
|
|
124
|
+
.createReadStream({
|
|
125
|
+
gte: buildDbKeyForLeafIndex(this.getName(), 0n),
|
|
126
|
+
lte: buildDbKeyForLeafIndex(this.getName(), key),
|
|
127
|
+
limit: 1,
|
|
128
|
+
reverse: true,
|
|
129
|
+
})
|
|
130
|
+
.on('data', data => {
|
|
131
|
+
lowLeafIndex = toBigIntBE(data.value);
|
|
132
|
+
})
|
|
133
|
+
.on('close', function () { })
|
|
134
|
+
.on('end', function () {
|
|
135
|
+
resolve(lowLeafIndex);
|
|
136
|
+
})
|
|
137
|
+
.on('error', function () {
|
|
138
|
+
log.error('stream error');
|
|
139
|
+
reject();
|
|
140
|
+
});
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
async getDbPreimage(index) {
|
|
144
|
+
const dbPreimage = await this.db
|
|
145
|
+
.get(buildDbKeyForPreimage(this.getName(), index))
|
|
146
|
+
.then(data => this.leafPreimageFactory.fromBuffer(data))
|
|
147
|
+
.catch(() => undefined);
|
|
148
|
+
return dbPreimage;
|
|
149
|
+
}
|
|
150
|
+
getCachedPreimage(index) {
|
|
151
|
+
return this.cachedLeafPreimages[index.toString()];
|
|
122
152
|
}
|
|
123
153
|
/**
|
|
124
|
-
* Gets the latest
|
|
125
|
-
* @param index - Index of the leaf of which to obtain the
|
|
154
|
+
* Gets the latest LeafPreimage copy.
|
|
155
|
+
* @param index - Index of the leaf of which to obtain the LeafPreimage copy.
|
|
126
156
|
* @param includeUncommitted - If true, the uncommitted changes are included in the search.
|
|
127
|
-
* @returns A copy of the leaf
|
|
157
|
+
* @returns A copy of the leaf preimage at the given index or undefined if the leaf was not found.
|
|
128
158
|
*/
|
|
129
|
-
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
nextIndex: leaf.nextIndex,
|
|
135
|
-
nextValue: leaf.nextValue,
|
|
136
|
-
}
|
|
137
|
-
: undefined;
|
|
159
|
+
async getLatestLeafPreimageCopy(index, includeUncommitted) {
|
|
160
|
+
const preimage = !includeUncommitted
|
|
161
|
+
? await this.getDbPreimage(index)
|
|
162
|
+
: this.getCachedPreimage(index) ?? (await this.getDbPreimage(index));
|
|
163
|
+
return preimage && this.leafPreimageFactory.clone(preimage);
|
|
138
164
|
}
|
|
139
165
|
/**
|
|
140
|
-
*
|
|
141
|
-
* @param
|
|
142
|
-
* @
|
|
166
|
+
* Returns the index of a leaf given its value, or undefined if no leaf with that value is found.
|
|
167
|
+
* @param value - The leaf value to look for.
|
|
168
|
+
* @param includeUncommitted - Indicates whether to include uncommitted data.
|
|
169
|
+
* @returns The index of the first leaf found with a given value (undefined if not found).
|
|
143
170
|
*/
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
171
|
+
async findLeafIndex(value, includeUncommitted) {
|
|
172
|
+
const leaf = this.leafFactory.fromBuffer(value);
|
|
173
|
+
let index = await this.db
|
|
174
|
+
.get(buildDbKeyForLeafIndex(this.getName(), leaf.getKey()))
|
|
175
|
+
.then(data => toBigIntBE(data))
|
|
176
|
+
.catch(() => undefined);
|
|
177
|
+
if (includeUncommitted && index === undefined) {
|
|
178
|
+
const cachedIndex = this.getCachedLeafIndex(leaf.getKey());
|
|
179
|
+
index = cachedIndex;
|
|
153
180
|
}
|
|
154
|
-
return
|
|
181
|
+
return index;
|
|
155
182
|
}
|
|
156
183
|
/**
|
|
157
184
|
* Initializes the tree.
|
|
@@ -173,59 +200,26 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
173
200
|
}
|
|
174
201
|
const leaves = [];
|
|
175
202
|
for (let i = 0n; i < prefilledSize; i++) {
|
|
176
|
-
const newLeaf =
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
nextValue: i + 1n,
|
|
180
|
-
};
|
|
181
|
-
leaves.push(newLeaf);
|
|
203
|
+
const newLeaf = this.leafFactory.buildDummy(i);
|
|
204
|
+
const newLeafPreimage = this.leafPreimageFactory.fromLeaf(newLeaf, i + 1n, i + 1n);
|
|
205
|
+
leaves.push(newLeafPreimage);
|
|
182
206
|
}
|
|
183
|
-
// Make the first leaf have 0 value
|
|
184
|
-
leaves[0].value = 0n;
|
|
185
207
|
// Make the last leaf point to the first leaf
|
|
186
|
-
leaves[prefilledSize - 1]
|
|
187
|
-
leaves[prefilledSize - 1].nextValue = 0n;
|
|
208
|
+
leaves[prefilledSize - 1] = this.leafPreimageFactory.fromLeaf(leaves[prefilledSize - 1].asLeaf(), 0n, 0n);
|
|
188
209
|
await this.encodeAndAppendLeaves(leaves, true);
|
|
189
210
|
await this.commit();
|
|
190
211
|
}
|
|
191
|
-
/**
|
|
192
|
-
* Loads Merkle tree data from a database and assigns them to this object.
|
|
193
|
-
*/
|
|
194
|
-
async initFromDb() {
|
|
195
|
-
const startingIndex = 0n;
|
|
196
|
-
const values = [];
|
|
197
|
-
const promise = new Promise((resolve, reject) => {
|
|
198
|
-
this.db
|
|
199
|
-
.createReadStream({
|
|
200
|
-
gte: indexToKeyLeaf(this.getName(), startingIndex),
|
|
201
|
-
lte: indexToKeyLeaf(this.getName(), 2n ** BigInt(this.getDepth())),
|
|
202
|
-
})
|
|
203
|
-
.on('data', function (data) {
|
|
204
|
-
const index = keyLeafToIndex(data.key.toString('utf-8'));
|
|
205
|
-
values[Number(index)] = decodeTreeValue(data.value);
|
|
206
|
-
})
|
|
207
|
-
.on('close', function () { })
|
|
208
|
-
.on('end', function () {
|
|
209
|
-
resolve();
|
|
210
|
-
})
|
|
211
|
-
.on('error', function () {
|
|
212
|
-
log.error('stream error');
|
|
213
|
-
reject();
|
|
214
|
-
});
|
|
215
|
-
});
|
|
216
|
-
await promise;
|
|
217
|
-
this.leaves = values;
|
|
218
|
-
}
|
|
219
212
|
/**
|
|
220
213
|
* Commits all the leaves to the database and removes them from a cache.
|
|
221
214
|
*/
|
|
222
215
|
async commitLeaves() {
|
|
223
216
|
const batch = this.db.batch();
|
|
224
|
-
const keys = Object.getOwnPropertyNames(this.
|
|
217
|
+
const keys = Object.getOwnPropertyNames(this.cachedLeafPreimages);
|
|
225
218
|
for (const key of keys) {
|
|
226
|
-
const
|
|
227
|
-
|
|
228
|
-
this.
|
|
219
|
+
const leaf = this.cachedLeafPreimages[key];
|
|
220
|
+
const index = BigInt(key);
|
|
221
|
+
batch.put(buildDbKeyForPreimage(this.getName(), index), leaf.toBuffer());
|
|
222
|
+
batch.put(buildDbKeyForLeafIndex(this.getName(), leaf.getKey()), toBufferBE(index, 32));
|
|
229
223
|
}
|
|
230
224
|
await batch.write();
|
|
231
225
|
this.clearCachedLeaves();
|
|
@@ -234,18 +228,19 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
234
228
|
* Clears the cache.
|
|
235
229
|
*/
|
|
236
230
|
clearCachedLeaves() {
|
|
237
|
-
this.
|
|
231
|
+
this.cachedLeafPreimages = {};
|
|
238
232
|
}
|
|
239
233
|
/**
|
|
240
234
|
* Updates a leaf in the tree.
|
|
241
|
-
* @param
|
|
235
|
+
* @param preimage - New contents of the leaf.
|
|
242
236
|
* @param index - Index of the leaf to be updated.
|
|
243
237
|
*/
|
|
244
|
-
async updateLeaf(
|
|
238
|
+
async updateLeaf(preimage, index) {
|
|
245
239
|
if (index > this.maxIndex) {
|
|
246
240
|
throw Error(`Index out of bounds. Index ${index}, max index: ${this.maxIndex}.`);
|
|
247
241
|
}
|
|
248
|
-
|
|
242
|
+
this.cachedLeafPreimages[index.toString()] = preimage;
|
|
243
|
+
const encodedLeaf = this.encodeLeaf(preimage, true);
|
|
249
244
|
await this.addLeafToCacheAndHashToRoot(encodedLeaf, index);
|
|
250
245
|
const numLeaves = this.getNumLeaves(true);
|
|
251
246
|
if (index >= numLeaves) {
|
|
@@ -262,8 +257,6 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
262
257
|
*
|
|
263
258
|
* This offers massive circuit performance savings over doing incremental insertions.
|
|
264
259
|
*
|
|
265
|
-
* A description of the algorithm can be found here: https://colab.research.google.com/drive/1A0gizduSi4FIiIJZ8OylwIpO9-OTqV-R
|
|
266
|
-
*
|
|
267
260
|
* WARNING: This function has side effects, it will insert values into the tree.
|
|
268
261
|
*
|
|
269
262
|
* Assumptions:
|
|
@@ -283,81 +276,78 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
283
276
|
* roots.
|
|
284
277
|
*
|
|
285
278
|
* This become tricky when two items that are being batch inserted need to update the same low nullifier, or need to use
|
|
286
|
-
* a value that is part of the same batch insertion as their low nullifier.
|
|
287
|
-
*
|
|
279
|
+
* a value that is part of the same batch insertion as their low nullifier. What we do to avoid this case is to
|
|
280
|
+
* update the existing leaves in the tree with the nullifiers in high to low order, ensuring that this case never occurs.
|
|
281
|
+
* The circuit has to sort the nullifiers (or take a hint of the sorted nullifiers and prove that it's a valid permutation).
|
|
282
|
+
* Then we just batch insert the new nullifiers in the original order.
|
|
288
283
|
*
|
|
289
284
|
* The following example will illustrate attempting to insert 2,3,20,19 into a tree already containing 0,5,10,15
|
|
290
285
|
*
|
|
291
286
|
* The example will explore two cases. In each case the values low nullifier will exist within the batch insertion,
|
|
292
287
|
* One where the low nullifier comes before the item in the set (2,3), and one where it comes after (20,19).
|
|
293
288
|
*
|
|
289
|
+
* First, we sort the nullifiers high to low, that's 20,19,3,2
|
|
290
|
+
*
|
|
294
291
|
* The original tree: Pending insertion subtree
|
|
295
292
|
*
|
|
296
|
-
* index 0 2 3
|
|
293
|
+
* index 0 1 2 3 - - - -
|
|
297
294
|
* ------------------------------------- ----------------------------
|
|
298
295
|
* val 0 5 10 15 - - - -
|
|
299
296
|
* nextIdx 1 2 3 0 - - - -
|
|
300
297
|
* nextVal 5 10 15 0 - - - -
|
|
301
298
|
*
|
|
302
299
|
*
|
|
303
|
-
* Inserting
|
|
304
|
-
* 1. Find the low nullifier (
|
|
300
|
+
* Inserting 20:
|
|
301
|
+
* 1. Find the low nullifier (3) - provide inclusion proof
|
|
305
302
|
* 2. Update its pointers
|
|
306
|
-
* 3. Insert
|
|
303
|
+
* 3. Insert 20 into the pending subtree
|
|
307
304
|
*
|
|
308
|
-
* index 0 2 3
|
|
305
|
+
* index 0 1 2 3 - - 6 -
|
|
309
306
|
* ------------------------------------- ----------------------------
|
|
310
|
-
* val 0 5 10 15
|
|
311
|
-
* nextIdx
|
|
312
|
-
* nextVal
|
|
307
|
+
* val 0 5 10 15 - - 20 -
|
|
308
|
+
* nextIdx 1 2 3 6 - - 0 -
|
|
309
|
+
* nextVal 5 10 15 20 - - 0 -
|
|
313
310
|
*
|
|
314
|
-
* Inserting
|
|
315
|
-
* 1.
|
|
316
|
-
*
|
|
317
|
-
*
|
|
318
|
-
* - Index 0 has a val 0 and nextVal of 2. This is NOT enough to prove non inclusion of 2.
|
|
319
|
-
* - Our existing tree is in a state where we cannot prove non inclusion of 3.
|
|
320
|
-
* We do not provide a non inclusion proof to out circuit, but prompt it to look within the insertion subtree.
|
|
321
|
-
* 2. Update pending insertion subtree
|
|
322
|
-
* 3. Insert 3 into pending subtree
|
|
311
|
+
* Inserting 19:
|
|
312
|
+
* 1. Find the low nullifier (3) - provide inclusion proof
|
|
313
|
+
* 2. Update its pointers
|
|
314
|
+
* 3. Insert 19 into the pending subtree
|
|
323
315
|
*
|
|
324
|
-
*
|
|
325
|
-
* index 0 2 3 4 5 6 - -
|
|
316
|
+
* index 0 1 2 3 - - 6 7
|
|
326
317
|
* ------------------------------------- ----------------------------
|
|
327
|
-
* val 0 5 10 15
|
|
328
|
-
* nextIdx
|
|
329
|
-
* nextVal
|
|
318
|
+
* val 0 5 10 15 - - 20 19
|
|
319
|
+
* nextIdx 1 2 3 7 - - 0 6
|
|
320
|
+
* nextVal 5 10 15 19 - - 0 20
|
|
330
321
|
*
|
|
331
|
-
* Inserting
|
|
332
|
-
* 1. Find the low nullifier (
|
|
322
|
+
* Inserting 3:
|
|
323
|
+
* 1. Find the low nullifier (0) - provide inclusion proof
|
|
333
324
|
* 2. Update its pointers
|
|
334
|
-
* 3. Insert
|
|
325
|
+
* 3. Insert 3 into the pending subtree
|
|
335
326
|
*
|
|
336
|
-
* index 0 2 3
|
|
327
|
+
* index 0 1 2 3 - 5 6 7
|
|
337
328
|
* ------------------------------------- ----------------------------
|
|
338
|
-
* val 0 5 10 15
|
|
339
|
-
* nextIdx 5 2 3 7
|
|
340
|
-
* nextVal
|
|
329
|
+
* val 0 5 10 15 - 3 20 19
|
|
330
|
+
* nextIdx 5 2 3 7 - 1 0 6
|
|
331
|
+
* nextVal 3 10 15 19 - 5 0 20
|
|
341
332
|
*
|
|
342
|
-
* Inserting
|
|
343
|
-
* 1.
|
|
344
|
-
* We can provide an inclusion proof of this intermediate tree state.
|
|
333
|
+
* Inserting 2:
|
|
334
|
+
* 1. Find the low nullifier (0) - provide inclusion proof
|
|
345
335
|
* 2. Update its pointers
|
|
346
|
-
* 3. Insert
|
|
336
|
+
* 3. Insert 2 into the pending subtree
|
|
347
337
|
*
|
|
348
|
-
* index 0 2 3
|
|
338
|
+
* index 0 1 2 3 4 5 6 7
|
|
349
339
|
* ------------------------------------- ----------------------------
|
|
350
|
-
* val 0 5 10 15 2 3 20
|
|
351
|
-
* nextIdx
|
|
352
|
-
* nextVal 2 10 15 19 3 5 0
|
|
340
|
+
* val 0 5 10 15 2 3 20 19
|
|
341
|
+
* nextIdx 4 2 3 7 5 1 0 6
|
|
342
|
+
* nextVal 2 10 15 19 3 5 0 20
|
|
353
343
|
*
|
|
354
344
|
* Perform subtree insertion
|
|
355
345
|
*
|
|
356
|
-
* index 0 2 3 4 5 6 7
|
|
346
|
+
* index 0 1 2 3 4 5 6 7
|
|
357
347
|
* ---------------------------------------------------------------------
|
|
358
|
-
* val 0 5 10 15 2 3 20
|
|
359
|
-
* nextIdx
|
|
360
|
-
* nextVal 2 10 15 19 3 5 0
|
|
348
|
+
* val 0 5 10 15 2 3 20 19
|
|
349
|
+
* nextIdx 4 2 3 7 5 1 0 6
|
|
350
|
+
* nextVal 2 10 15 19 3 5 0 20
|
|
361
351
|
*
|
|
362
352
|
* TODO: this implementation will change once the zero value is changed from h(0,0,0). Changes incoming over the next sprint
|
|
363
353
|
* @param leaves - Values to insert into the tree.
|
|
@@ -365,92 +355,61 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
365
355
|
* @returns The data for the leaves to be updated when inserting the new ones.
|
|
366
356
|
*/
|
|
367
357
|
async batchInsert(leaves, subtreeHeight) {
|
|
368
|
-
|
|
369
|
-
const touched = new Map();
|
|
370
|
-
const emptyLowLeafWitness = getEmptyLowLeafWitness(this.getDepth());
|
|
358
|
+
const emptyLowLeafWitness = getEmptyLowLeafWitness(this.getDepth(), this.leafPreimageFactory);
|
|
371
359
|
// Accumulators
|
|
372
|
-
const lowLeavesWitnesses =
|
|
373
|
-
const pendingInsertionSubtree =
|
|
360
|
+
const lowLeavesWitnesses = leaves.map(() => emptyLowLeafWitness);
|
|
361
|
+
const pendingInsertionSubtree = leaves.map(() => this.leafPreimageFactory.empty());
|
|
374
362
|
// Start info
|
|
375
363
|
const startInsertionIndex = this.getNumLeaves(true);
|
|
364
|
+
const leavesToInsert = leaves.map(leaf => this.leafFactory.fromBuffer(leaf));
|
|
365
|
+
const sortedDescendingLeafTuples = leavesToInsert
|
|
366
|
+
.map((leaf, index) => ({ leaf, index }))
|
|
367
|
+
.sort((a, b) => Number(b.leaf.getKey() - a.leaf.getKey()));
|
|
368
|
+
const sortedDescendingLeaves = sortedDescendingLeafTuples.map(leafTuple => leafTuple.leaf);
|
|
376
369
|
// Get insertion path for each leaf
|
|
377
|
-
for (let i = 0; i <
|
|
378
|
-
const
|
|
379
|
-
|
|
380
|
-
if (
|
|
381
|
-
pendingInsertionSubtree.push(zeroLeaf);
|
|
382
|
-
lowLeavesWitnesses.push(emptyLowLeafWitness);
|
|
370
|
+
for (let i = 0; i < leavesToInsert.length; i++) {
|
|
371
|
+
const newLeaf = sortedDescendingLeaves[i];
|
|
372
|
+
const originalIndex = leavesToInsert.indexOf(newLeaf);
|
|
373
|
+
if (newLeaf.isEmpty()) {
|
|
383
374
|
continue;
|
|
384
375
|
}
|
|
385
|
-
const indexOfPrevious = this.
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
if (pendingInsertionSubtree[j].value === 0n) {
|
|
393
|
-
continue;
|
|
394
|
-
}
|
|
395
|
-
if (pendingInsertionSubtree[j].value < newValue &&
|
|
396
|
-
(pendingInsertionSubtree[j].nextValue > newValue || pendingInsertionSubtree[j].nextValue === 0n)) {
|
|
397
|
-
// add the new value to the pending low nullifiers
|
|
398
|
-
const currentLowLeaf = {
|
|
399
|
-
value: newValue,
|
|
400
|
-
nextValue: pendingInsertionSubtree[j].nextValue,
|
|
401
|
-
nextIndex: pendingInsertionSubtree[j].nextIndex,
|
|
402
|
-
};
|
|
403
|
-
pendingInsertionSubtree.push(currentLowLeaf);
|
|
404
|
-
// Update the pending low leaf to point at the new value
|
|
405
|
-
pendingInsertionSubtree[j].nextValue = newValue;
|
|
406
|
-
pendingInsertionSubtree[j].nextIndex = startInsertionIndex + BigInt(i);
|
|
407
|
-
break;
|
|
408
|
-
}
|
|
409
|
-
}
|
|
410
|
-
// Any node updated in this space will need to calculate its low nullifier from a previously inserted value
|
|
411
|
-
lowLeavesWitnesses.push(emptyLowLeafWitness);
|
|
412
|
-
}
|
|
413
|
-
else {
|
|
414
|
-
// Update the touched mapping
|
|
415
|
-
if (prevNodes) {
|
|
416
|
-
prevNodes.push(newValue);
|
|
417
|
-
touched.set(indexOfPrevious.index, prevNodes);
|
|
418
|
-
}
|
|
419
|
-
else {
|
|
420
|
-
touched.set(indexOfPrevious.index, [newValue]);
|
|
421
|
-
}
|
|
422
|
-
// get the low leaf
|
|
423
|
-
const lowLeaf = this.getLatestLeafDataCopy(indexOfPrevious.index, true);
|
|
424
|
-
if (lowLeaf === undefined) {
|
|
425
|
-
return [undefined, await this.getSubtreeSiblingPath(subtreeHeight, true)];
|
|
426
|
-
}
|
|
427
|
-
const siblingPath = await this.getSiblingPath(BigInt(indexOfPrevious.index), true);
|
|
428
|
-
const witness = {
|
|
429
|
-
leafData: { ...lowLeaf },
|
|
430
|
-
index: BigInt(indexOfPrevious.index),
|
|
431
|
-
siblingPath,
|
|
432
|
-
};
|
|
433
|
-
// Update the running paths
|
|
434
|
-
lowLeavesWitnesses.push(witness);
|
|
435
|
-
const currentLowLeaf = {
|
|
436
|
-
value: newValue,
|
|
437
|
-
nextValue: lowLeaf.nextValue,
|
|
438
|
-
nextIndex: lowLeaf.nextIndex,
|
|
376
|
+
const indexOfPrevious = await this.findIndexOfPreviousKey(newLeaf.getKey(), true);
|
|
377
|
+
if (indexOfPrevious === undefined) {
|
|
378
|
+
return {
|
|
379
|
+
lowLeavesWitnessData: undefined,
|
|
380
|
+
sortedNewLeaves: sortedDescendingLeafTuples.map(leafTuple => leafTuple.leaf.toBuffer()),
|
|
381
|
+
sortedNewLeavesIndexes: sortedDescendingLeafTuples.map(leafTuple => leafTuple.index),
|
|
382
|
+
newSubtreeSiblingPath: await this.getSubtreeSiblingPath(subtreeHeight, true),
|
|
439
383
|
};
|
|
440
|
-
pendingInsertionSubtree.push(currentLowLeaf);
|
|
441
|
-
lowLeaf.nextValue = newValue;
|
|
442
|
-
lowLeaf.nextIndex = startInsertionIndex + BigInt(i);
|
|
443
|
-
const lowLeafIndex = indexOfPrevious.index;
|
|
444
|
-
this.cachedLeaves[lowLeafIndex] = lowLeaf;
|
|
445
|
-
await this.updateLeaf(lowLeaf, BigInt(lowLeafIndex));
|
|
446
384
|
}
|
|
385
|
+
// get the low leaf (existence checked in getting index)
|
|
386
|
+
const lowLeafPreimage = (await this.getLatestLeafPreimageCopy(indexOfPrevious.index, true));
|
|
387
|
+
const siblingPath = await this.getSiblingPath(BigInt(indexOfPrevious.index), true);
|
|
388
|
+
const witness = {
|
|
389
|
+
leafPreimage: lowLeafPreimage,
|
|
390
|
+
index: BigInt(indexOfPrevious.index),
|
|
391
|
+
siblingPath,
|
|
392
|
+
};
|
|
393
|
+
// Update the running paths
|
|
394
|
+
lowLeavesWitnesses[i] = witness;
|
|
395
|
+
const currentPendingPreimageLeaf = this.leafPreimageFactory.fromLeaf(newLeaf, lowLeafPreimage.getNextKey(), lowLeafPreimage.getNextIndex());
|
|
396
|
+
pendingInsertionSubtree[originalIndex] = currentPendingPreimageLeaf;
|
|
397
|
+
const newLowLeafPreimage = this.leafPreimageFactory.fromLeaf(lowLeafPreimage.asLeaf(), newLeaf.getKey(), startInsertionIndex + BigInt(originalIndex));
|
|
398
|
+
const lowLeafIndex = indexOfPrevious.index;
|
|
399
|
+
this.cachedLeafPreimages[lowLeafIndex.toString()] = newLowLeafPreimage;
|
|
400
|
+
await this.updateLeaf(newLowLeafPreimage, lowLeafIndex);
|
|
447
401
|
}
|
|
448
402
|
const newSubtreeSiblingPath = await this.getSubtreeSiblingPath(subtreeHeight, true);
|
|
449
403
|
// Perform batch insertion of new pending values
|
|
450
404
|
// Note: In this case we set `hash0Leaf` param to false because batch insertion algorithm use forced null leaf
|
|
451
405
|
// inclusion. See {@link encodeLeaf} for a more through param explanation.
|
|
452
406
|
await this.encodeAndAppendLeaves(pendingInsertionSubtree, false);
|
|
453
|
-
return
|
|
407
|
+
return {
|
|
408
|
+
lowLeavesWitnessData: lowLeavesWitnesses,
|
|
409
|
+
sortedNewLeaves: sortedDescendingLeafTuples.map(leafTuple => leafTuple.leaf.toBuffer()),
|
|
410
|
+
sortedNewLeavesIndexes: sortedDescendingLeafTuples.map(leafTuple => leafTuple.index),
|
|
411
|
+
newSubtreeSiblingPath,
|
|
412
|
+
};
|
|
454
413
|
}
|
|
455
414
|
async getSubtreeSiblingPath(subtreeHeight, includeUncommitted) {
|
|
456
415
|
const nextAvailableLeafIndex = this.getNumLeaves(includeUncommitted);
|
|
@@ -458,19 +417,25 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
458
417
|
// Drop the first subtreeHeight items since we only care about the path to the subtree root
|
|
459
418
|
return fullSiblingPath.getSubtreeSiblingPath(subtreeHeight);
|
|
460
419
|
}
|
|
420
|
+
snapshot(blockNumber) {
|
|
421
|
+
return __classPrivateFieldGet(this, _StandardIndexedTree_snapshotBuilder, "f").snapshot(blockNumber);
|
|
422
|
+
}
|
|
423
|
+
getSnapshot(block) {
|
|
424
|
+
return __classPrivateFieldGet(this, _StandardIndexedTree_snapshotBuilder, "f").getSnapshot(block);
|
|
425
|
+
}
|
|
461
426
|
/**
|
|
462
427
|
* Encodes leaves and appends them to a tree.
|
|
463
|
-
* @param
|
|
428
|
+
* @param preimages - Leaves to encode.
|
|
464
429
|
* @param hash0Leaf - Indicates whether 0 value leaf should be hashed. See {@link encodeLeaf}.
|
|
465
430
|
* @returns Empty promise
|
|
466
431
|
*/
|
|
467
|
-
async encodeAndAppendLeaves(
|
|
468
|
-
const startInsertionIndex =
|
|
469
|
-
const
|
|
470
|
-
this.
|
|
471
|
-
return this.encodeLeaf(
|
|
432
|
+
async encodeAndAppendLeaves(preimages, hash0Leaf) {
|
|
433
|
+
const startInsertionIndex = this.getNumLeaves(true);
|
|
434
|
+
const hashedLeaves = preimages.map((preimage, i) => {
|
|
435
|
+
this.cachedLeafPreimages[(startInsertionIndex + BigInt(i)).toString()] = preimage;
|
|
436
|
+
return this.encodeLeaf(preimage, hash0Leaf);
|
|
472
437
|
});
|
|
473
|
-
await super.appendLeaves(
|
|
438
|
+
await super.appendLeaves(hashedLeaves);
|
|
474
439
|
}
|
|
475
440
|
/**
|
|
476
441
|
* Encode a leaf into a buffer.
|
|
@@ -482,13 +447,14 @@ export class StandardIndexedTree extends TreeBase {
|
|
|
482
447
|
*/
|
|
483
448
|
encodeLeaf(leaf, hash0Leaf) {
|
|
484
449
|
let encodedLeaf;
|
|
485
|
-
if (!hash0Leaf && leaf.
|
|
450
|
+
if (!hash0Leaf && leaf.getKey() == 0n) {
|
|
486
451
|
encodedLeaf = toBufferBE(0n, 32);
|
|
487
452
|
}
|
|
488
453
|
else {
|
|
489
|
-
encodedLeaf = this.hasher.hashInputs(
|
|
454
|
+
encodedLeaf = this.hasher.hashInputs(leaf.toHashInputs());
|
|
490
455
|
}
|
|
491
456
|
return encodedLeaf;
|
|
492
457
|
}
|
|
493
458
|
}
|
|
494
|
-
//# 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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"}
|
|
459
|
+
_StandardIndexedTree_snapshotBuilder = new WeakMap();
|
|
460
|
+
//# 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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"}
|