@aztec/world-state 0.62.0 → 0.63.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/native/message.d.ts +96 -10
- package/dest/native/message.d.ts.map +1 -1
- package/dest/native/message.js +116 -1
- package/dest/native/native_world_state.d.ts +9 -7
- package/dest/native/native_world_state.d.ts.map +1 -1
- package/dest/native/native_world_state.js +55 -24
- package/dest/native/native_world_state_instance.d.ts +1 -1
- package/dest/native/native_world_state_instance.d.ts.map +1 -1
- package/dest/native/native_world_state_instance.js +4 -4
- package/dest/native/world_state_version.d.ts +15 -0
- package/dest/native/world_state_version.d.ts.map +1 -0
- package/dest/native/world_state_version.js +38 -0
- package/dest/synchronizer/config.d.ts +4 -0
- package/dest/synchronizer/config.d.ts.map +1 -1
- package/dest/synchronizer/config.js +10 -1
- package/dest/synchronizer/factory.d.ts +2 -2
- package/dest/synchronizer/factory.d.ts.map +1 -1
- package/dest/synchronizer/factory.js +8 -4
- package/dest/synchronizer/server_world_state_synchronizer.js +3 -3
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +4 -4
- package/dest/world-state-db/merkle_tree_db.d.ts +7 -7
- package/dest/world-state-db/merkle_tree_db.d.ts.map +1 -1
- package/dest/world-state-db/merkle_trees.d.ts +6 -6
- package/dest/world-state-db/merkle_trees.d.ts.map +1 -1
- package/dest/world-state-db/merkle_trees.js +7 -6
- package/package.json +8 -8
- package/src/native/message.ts +216 -10
- package/src/native/native_world_state.ts +58 -24
- package/src/native/native_world_state_instance.ts +3 -2
- package/src/native/world_state_version.ts +41 -0
- package/src/synchronizer/config.ts +15 -0
- package/src/synchronizer/factory.ts +17 -5
- package/src/synchronizer/server_world_state_synchronizer.ts +4 -4
- package/src/test/utils.ts +2 -3
- package/src/world-state-db/merkle_tree_db.ts +7 -7
- package/src/world-state-db/merkle_trees.ts +15 -10
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _MerkleTrees_instances, _MerkleTrees_init, _MerkleTrees_saveInitialStateReference, _MerkleTrees_loadInitialStateReference, _MerkleTrees_updateArchive, _MerkleTrees_getTreeInfo, _MerkleTrees_getIndexedTree, _MerkleTrees_appendLeaves, _MerkleTrees_commit, _MerkleTrees_rollback, _MerkleTrees_snapshot, _MerkleTrees_handleL2BlockAndMessages, _MerkleTrees_isDbPopulated;
|
|
2
2
|
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import { MerkleTreeId,
|
|
4
|
-
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, Fr, Header, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, StateReference, } from '@aztec/circuits.js';
|
|
3
|
+
import { MerkleTreeId, TxEffect } from '@aztec/circuit-types';
|
|
4
|
+
import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, Fr, Header, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, PublicDataWrite, StateReference, } from '@aztec/circuits.js';
|
|
5
5
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
6
6
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
7
7
|
import { SerialQueue } from '@aztec/foundation/queue';
|
|
@@ -9,6 +9,7 @@ import { Timer, elapsed } from '@aztec/foundation/timer';
|
|
|
9
9
|
import { openTmpStore } from '@aztec/kv-store/utils';
|
|
10
10
|
import { Poseidon, StandardIndexedTree, StandardTree, getTreeMeta, loadTree, newTree, } from '@aztec/merkle-tree';
|
|
11
11
|
import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
|
|
12
|
+
import { buildEmptyWorldStateStatusFull, } from '../native/message.js';
|
|
12
13
|
import { INITIAL_NULLIFIER_TREE_SIZE, INITIAL_PUBLIC_DATA_TREE_SIZE, } from './merkle_tree_db.js';
|
|
13
14
|
import { MerkleTreeReadOperationsFacade } from './merkle_tree_operations_facade.js';
|
|
14
15
|
import { MerkleTreeSnapshotOperationsFacade } from './merkle_tree_snapshot_operations_facade.js';
|
|
@@ -70,7 +71,7 @@ export class MerkleTrees {
|
|
|
70
71
|
setFinalised(_toBlockNumber) {
|
|
71
72
|
throw new Error('Method not implemented.');
|
|
72
73
|
}
|
|
73
|
-
|
|
74
|
+
getStatusSummary() {
|
|
74
75
|
throw new Error('Method not implemented.');
|
|
75
76
|
}
|
|
76
77
|
async fork(blockNumber) {
|
|
@@ -423,7 +424,7 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
|
423
424
|
// We insert the public data tree leaves with one batch per tx to avoid updating the same key twice
|
|
424
425
|
for (const txEffect of paddedTxEffects) {
|
|
425
426
|
const publicDataWrites = padArrayEnd(txEffect.publicDataWrites, PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
|
|
426
|
-
await publicDataTree.batchInsert(publicDataWrites.map(write =>
|
|
427
|
+
await publicDataTree.batchInsert(publicDataWrites.map(write => write.toBuffer()), PUBLIC_DATA_SUBTREE_HEIGHT);
|
|
427
428
|
}
|
|
428
429
|
}
|
|
429
430
|
// The last thing remaining is to update the archive
|
|
@@ -447,7 +448,7 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
|
447
448
|
await __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_snapshot).call(this, l2Block.number);
|
|
448
449
|
this.metrics.recordDbSize(this.store.estimateSize().bytes);
|
|
449
450
|
this.metrics.recordSyncDuration('commit', timer);
|
|
450
|
-
return
|
|
451
|
+
return buildEmptyWorldStateStatusFull();
|
|
451
452
|
}, _MerkleTrees_isDbPopulated = function _MerkleTrees_isDbPopulated() {
|
|
452
453
|
try {
|
|
453
454
|
getTreeMeta(this.store, MerkleTreeId[MerkleTreeId.NULLIFIER_TREE]);
|
|
@@ -459,4 +460,4 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
|
|
|
459
460
|
return false;
|
|
460
461
|
}
|
|
461
462
|
};
|
|
462
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
|
463
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/world-state",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.63.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -62,13 +62,13 @@
|
|
|
62
62
|
]
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@aztec/circuit-types": "0.
|
|
66
|
-
"@aztec/circuits.js": "0.
|
|
67
|
-
"@aztec/foundation": "0.
|
|
68
|
-
"@aztec/kv-store": "0.
|
|
69
|
-
"@aztec/merkle-tree": "0.
|
|
70
|
-
"@aztec/telemetry-client": "0.
|
|
71
|
-
"@aztec/types": "0.
|
|
65
|
+
"@aztec/circuit-types": "0.63.0",
|
|
66
|
+
"@aztec/circuits.js": "0.63.0",
|
|
67
|
+
"@aztec/foundation": "0.63.0",
|
|
68
|
+
"@aztec/kv-store": "0.63.0",
|
|
69
|
+
"@aztec/merkle-tree": "0.63.0",
|
|
70
|
+
"@aztec/telemetry-client": "0.63.0",
|
|
71
|
+
"@aztec/types": "0.63.0",
|
|
72
72
|
"bindings": "^1.5.0",
|
|
73
73
|
"msgpackr": "^1.10.2",
|
|
74
74
|
"tslib": "^2.4.0"
|
package/src/native/message.ts
CHANGED
|
@@ -84,13 +84,223 @@ interface WithTreeId {
|
|
|
84
84
|
treeId: MerkleTreeId;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
-
export interface
|
|
87
|
+
export interface WorldStateStatusSummary {
|
|
88
88
|
/** Last block number that can still be unwound. */
|
|
89
89
|
unfinalisedBlockNumber: bigint;
|
|
90
90
|
/** Last block number that is finalised and cannot be unwound. */
|
|
91
91
|
finalisedBlockNumber: bigint;
|
|
92
92
|
/** Oldest block still available for historical queries and forks. */
|
|
93
93
|
oldestHistoricalBlock: bigint;
|
|
94
|
+
/** Whether the trees are in sync with each other */
|
|
95
|
+
treesAreSynched: boolean;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
export interface TreeMeta {
|
|
99
|
+
/** The name of the tree */
|
|
100
|
+
name: string;
|
|
101
|
+
/** The depth of the tree */
|
|
102
|
+
depth: number;
|
|
103
|
+
/** The current size of the tree (number of leaves) */
|
|
104
|
+
size: bigint;
|
|
105
|
+
/** The committed size of the tree */
|
|
106
|
+
committedSize: bigint;
|
|
107
|
+
/** The current root of the tree */
|
|
108
|
+
root: Fr;
|
|
109
|
+
/** The tree's initial size */
|
|
110
|
+
initialSize: bigint;
|
|
111
|
+
/** The tree's initial root value */
|
|
112
|
+
initialRoot: Fr;
|
|
113
|
+
/** The current oldest historical block number of the tree */
|
|
114
|
+
oldestHistoricBlock: bigint;
|
|
115
|
+
/** The current unfinalised block number of the tree */
|
|
116
|
+
unfinalisedBlockHeight: bigint;
|
|
117
|
+
/** The current finalised block number of the tree */
|
|
118
|
+
finalisedBlockHeight: bigint;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
export interface DBStats {
|
|
122
|
+
/** The name of the DB */
|
|
123
|
+
name: string;
|
|
124
|
+
/** The total number of key/value pairs in the DB */
|
|
125
|
+
numDataItems: bigint;
|
|
126
|
+
/** The current mapped size of the DB */
|
|
127
|
+
totalUsedSize: bigint;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
export interface TreeDBStats {
|
|
131
|
+
/** The configured max size of the DB mapping file (effectively the max possible size of the DB) */
|
|
132
|
+
mapSize: bigint;
|
|
133
|
+
/** Stats for the 'blocks' DB */
|
|
134
|
+
blocksDBStats: DBStats;
|
|
135
|
+
/** Stats for the 'nodes' DB */
|
|
136
|
+
nodesDBStats: DBStats;
|
|
137
|
+
/** Stats for the 'leaf pre-images' DB */
|
|
138
|
+
leafPreimagesDBStats: DBStats;
|
|
139
|
+
/** Stats for the 'leaf keys' DB */
|
|
140
|
+
leafKeysDBStats: DBStats;
|
|
141
|
+
/** Stats for the 'leaf indices' DB */
|
|
142
|
+
leafIndicesDBStats: DBStats;
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
export interface WorldStateMeta {
|
|
146
|
+
/** Tree meta for the note hash tree */
|
|
147
|
+
noteHashTreeMeta: TreeMeta;
|
|
148
|
+
/** Tree meta for the message tree */
|
|
149
|
+
messageTreeMeta: TreeMeta;
|
|
150
|
+
/** Tree meta for the archive tree */
|
|
151
|
+
archiveTreeMeta: TreeMeta;
|
|
152
|
+
/** Tree meta for the public data tree */
|
|
153
|
+
publicDataTreeMeta: TreeMeta;
|
|
154
|
+
/** Tree meta for the nullifier tree */
|
|
155
|
+
nullifierTreeMeta: TreeMeta;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
export interface WorldStateDBStats {
|
|
159
|
+
/** Full stats for the note hash tree */
|
|
160
|
+
noteHashTreeStats: TreeDBStats;
|
|
161
|
+
/** Full stats for the message tree */
|
|
162
|
+
messageTreeStats: TreeDBStats;
|
|
163
|
+
/** Full stats for the archive tree */
|
|
164
|
+
archiveTreeStats: TreeDBStats;
|
|
165
|
+
/** Full stats for the public data tree */
|
|
166
|
+
publicDataTreeStats: TreeDBStats;
|
|
167
|
+
/** Full stats for the nullifier tree */
|
|
168
|
+
nullifierTreeStats: TreeDBStats;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
export interface WorldStateStatusFull {
|
|
172
|
+
summary: WorldStateStatusSummary;
|
|
173
|
+
dbStats: WorldStateDBStats;
|
|
174
|
+
meta: WorldStateMeta;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
export function buildEmptyDBStats() {
|
|
178
|
+
return {
|
|
179
|
+
name: '',
|
|
180
|
+
numDataItems: 0n,
|
|
181
|
+
totalUsedSize: 0n,
|
|
182
|
+
} as DBStats;
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
export function buildEmptyTreeDBStats() {
|
|
186
|
+
return {
|
|
187
|
+
mapSize: 0n,
|
|
188
|
+
blocksDBStats: buildEmptyDBStats(),
|
|
189
|
+
nodesDBStats: buildEmptyDBStats(),
|
|
190
|
+
leafIndicesDBStats: buildEmptyDBStats(),
|
|
191
|
+
leafKeysDBStats: buildEmptyDBStats(),
|
|
192
|
+
leafPreimagesDBStats: buildEmptyDBStats(),
|
|
193
|
+
} as TreeDBStats;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
export function buildEmptyTreeMeta() {
|
|
197
|
+
return {
|
|
198
|
+
name: '',
|
|
199
|
+
depth: 0,
|
|
200
|
+
size: 0n,
|
|
201
|
+
committedSize: 0n,
|
|
202
|
+
unfinalisedBlockHeight: 0n,
|
|
203
|
+
finalisedBlockHeight: 0n,
|
|
204
|
+
oldestHistoricBlock: 0n,
|
|
205
|
+
root: Fr.ZERO,
|
|
206
|
+
initialRoot: Fr.ZERO,
|
|
207
|
+
initialSize: 0n,
|
|
208
|
+
} as TreeMeta;
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
export function buildEmptyWorldStateMeta() {
|
|
212
|
+
return {
|
|
213
|
+
noteHashTreeMeta: buildEmptyTreeMeta(),
|
|
214
|
+
messageTreeMeta: buildEmptyTreeMeta(),
|
|
215
|
+
publicDataTreeMeta: buildEmptyTreeMeta(),
|
|
216
|
+
nullifierTreeMeta: buildEmptyTreeMeta(),
|
|
217
|
+
archiveTreeMeta: buildEmptyTreeMeta(),
|
|
218
|
+
} as WorldStateMeta;
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
export function buildEmptyWorldStateDBStats() {
|
|
222
|
+
return {
|
|
223
|
+
noteHashTreeStats: buildEmptyTreeDBStats(),
|
|
224
|
+
archiveTreeStats: buildEmptyTreeDBStats(),
|
|
225
|
+
messageTreeStats: buildEmptyTreeDBStats(),
|
|
226
|
+
publicDataTreeStats: buildEmptyTreeDBStats(),
|
|
227
|
+
nullifierTreeStats: buildEmptyTreeDBStats(),
|
|
228
|
+
} as WorldStateDBStats;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
export function buildEmptyWorldStateSummary() {
|
|
232
|
+
return {
|
|
233
|
+
unfinalisedBlockNumber: 0n,
|
|
234
|
+
finalisedBlockNumber: 0n,
|
|
235
|
+
oldestHistoricalBlock: 0n,
|
|
236
|
+
treesAreSynched: true,
|
|
237
|
+
} as WorldStateStatusSummary;
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
export function buildEmptyWorldStateStatusFull() {
|
|
241
|
+
return {
|
|
242
|
+
meta: buildEmptyWorldStateMeta(),
|
|
243
|
+
dbStats: buildEmptyWorldStateDBStats(),
|
|
244
|
+
summary: buildEmptyWorldStateSummary(),
|
|
245
|
+
} as WorldStateStatusFull;
|
|
246
|
+
}
|
|
247
|
+
|
|
248
|
+
export function sanitiseSummary(summary: WorldStateStatusSummary) {
|
|
249
|
+
summary.finalisedBlockNumber = BigInt(summary.finalisedBlockNumber);
|
|
250
|
+
summary.unfinalisedBlockNumber = BigInt(summary.unfinalisedBlockNumber);
|
|
251
|
+
summary.oldestHistoricalBlock = BigInt(summary.oldestHistoricalBlock);
|
|
252
|
+
return summary;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
export function sanitiseDBStats(stats: DBStats) {
|
|
256
|
+
stats.numDataItems = BigInt(stats.numDataItems);
|
|
257
|
+
stats.totalUsedSize = BigInt(stats.totalUsedSize);
|
|
258
|
+
return stats;
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
export function sanitiseMeta(meta: TreeMeta) {
|
|
262
|
+
meta.committedSize = BigInt(meta.committedSize);
|
|
263
|
+
meta.finalisedBlockHeight = BigInt(meta.finalisedBlockHeight);
|
|
264
|
+
meta.initialSize = BigInt(meta.initialSize);
|
|
265
|
+
meta.oldestHistoricBlock = BigInt(meta.oldestHistoricBlock);
|
|
266
|
+
meta.size = BigInt(meta.size);
|
|
267
|
+
meta.unfinalisedBlockHeight = BigInt(meta.unfinalisedBlockHeight);
|
|
268
|
+
return meta;
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
export function sanitiseTreeDBStats(stats: TreeDBStats) {
|
|
272
|
+
stats.blocksDBStats = sanitiseDBStats(stats.blocksDBStats);
|
|
273
|
+
stats.leafIndicesDBStats = sanitiseDBStats(stats.leafIndicesDBStats);
|
|
274
|
+
stats.leafKeysDBStats = sanitiseDBStats(stats.leafKeysDBStats);
|
|
275
|
+
stats.leafPreimagesDBStats = sanitiseDBStats(stats.leafPreimagesDBStats);
|
|
276
|
+
stats.nodesDBStats = sanitiseDBStats(stats.nodesDBStats);
|
|
277
|
+
stats.mapSize = BigInt(stats.mapSize);
|
|
278
|
+
return stats;
|
|
279
|
+
}
|
|
280
|
+
|
|
281
|
+
export function sanitiseWorldStateDBStats(stats: WorldStateDBStats) {
|
|
282
|
+
stats.archiveTreeStats = sanitiseTreeDBStats(stats.archiveTreeStats);
|
|
283
|
+
stats.messageTreeStats = sanitiseTreeDBStats(stats.messageTreeStats);
|
|
284
|
+
stats.noteHashTreeStats = sanitiseTreeDBStats(stats.noteHashTreeStats);
|
|
285
|
+
stats.nullifierTreeStats = sanitiseTreeDBStats(stats.nullifierTreeStats);
|
|
286
|
+
stats.publicDataTreeStats = sanitiseTreeDBStats(stats.publicDataTreeStats);
|
|
287
|
+
return stats;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
export function sanitiseWorldStateTreeMeta(meta: WorldStateMeta) {
|
|
291
|
+
meta.archiveTreeMeta = sanitiseMeta(meta.archiveTreeMeta);
|
|
292
|
+
meta.messageTreeMeta = sanitiseMeta(meta.messageTreeMeta);
|
|
293
|
+
meta.noteHashTreeMeta = sanitiseMeta(meta.noteHashTreeMeta);
|
|
294
|
+
meta.nullifierTreeMeta = sanitiseMeta(meta.nullifierTreeMeta);
|
|
295
|
+
meta.publicDataTreeMeta = sanitiseMeta(meta.publicDataTreeMeta);
|
|
296
|
+
return meta;
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
export function sanitiseFullStatus(status: WorldStateStatusFull) {
|
|
300
|
+
status.dbStats = sanitiseWorldStateDBStats(status.dbStats);
|
|
301
|
+
status.summary = sanitiseSummary(status.summary);
|
|
302
|
+
status.meta = sanitiseWorldStateTreeMeta(status.meta);
|
|
303
|
+
return status;
|
|
94
304
|
}
|
|
95
305
|
|
|
96
306
|
interface WithForkId {
|
|
@@ -193,10 +403,6 @@ interface SyncBlockRequest {
|
|
|
193
403
|
batchesOfPaddedPublicDataWrites: readonly SerializedLeafValue[][];
|
|
194
404
|
}
|
|
195
405
|
|
|
196
|
-
interface SyncBlockResponse {
|
|
197
|
-
status: WorldStateStatus;
|
|
198
|
-
}
|
|
199
|
-
|
|
200
406
|
interface CreateForkRequest {
|
|
201
407
|
latest: boolean;
|
|
202
408
|
blockNumber: number;
|
|
@@ -272,16 +478,16 @@ export type WorldStateResponse = {
|
|
|
272
478
|
[WorldStateMessageType.COMMIT]: void;
|
|
273
479
|
[WorldStateMessageType.ROLLBACK]: void;
|
|
274
480
|
|
|
275
|
-
[WorldStateMessageType.SYNC_BLOCK]:
|
|
481
|
+
[WorldStateMessageType.SYNC_BLOCK]: WorldStateStatusFull;
|
|
276
482
|
|
|
277
483
|
[WorldStateMessageType.CREATE_FORK]: CreateForkResponse;
|
|
278
484
|
[WorldStateMessageType.DELETE_FORK]: void;
|
|
279
485
|
|
|
280
|
-
[WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS]:
|
|
281
|
-
[WorldStateMessageType.UNWIND_BLOCKS]:
|
|
282
|
-
[WorldStateMessageType.FINALISE_BLOCKS]:
|
|
486
|
+
[WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS]: WorldStateStatusFull;
|
|
487
|
+
[WorldStateMessageType.UNWIND_BLOCKS]: WorldStateStatusFull;
|
|
488
|
+
[WorldStateMessageType.FINALISE_BLOCKS]: WorldStateStatusSummary;
|
|
283
489
|
|
|
284
|
-
[WorldStateMessageType.GET_STATUS]:
|
|
490
|
+
[WorldStateMessageType.GET_STATUS]: WorldStateStatusSummary;
|
|
285
491
|
|
|
286
492
|
[WorldStateMessageType.CLOSE]: void;
|
|
287
493
|
};
|
|
@@ -24,7 +24,7 @@ import { padArrayEnd } from '@aztec/foundation/collection';
|
|
|
24
24
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
25
25
|
|
|
26
26
|
import assert from 'assert/strict';
|
|
27
|
-
import { mkdir, mkdtemp,
|
|
27
|
+
import { mkdir, mkdtemp, rm } from 'fs/promises';
|
|
28
28
|
import { tmpdir } from 'os';
|
|
29
29
|
import { join } from 'path';
|
|
30
30
|
|
|
@@ -32,14 +32,24 @@ import { type MerkleTreeAdminDatabase as MerkleTreeDatabase } from '../world-sta
|
|
|
32
32
|
import { MerkleTreesFacade, MerkleTreesForkFacade, serializeLeaf } from './merkle_trees_facade.js';
|
|
33
33
|
import {
|
|
34
34
|
WorldStateMessageType,
|
|
35
|
-
type
|
|
35
|
+
type WorldStateStatusFull,
|
|
36
36
|
blockStateReference,
|
|
37
|
+
sanitiseFullStatus,
|
|
38
|
+
sanitiseSummary,
|
|
37
39
|
treeStateReferenceToSnapshot,
|
|
38
40
|
worldStateRevision,
|
|
39
41
|
} from './message.js';
|
|
40
42
|
import { NativeWorldState } from './native_world_state_instance.js';
|
|
43
|
+
import { WorldStateVersion } from './world_state_version.js';
|
|
41
44
|
|
|
42
|
-
const
|
|
45
|
+
export const WORLD_STATE_VERSION_FILE = 'version';
|
|
46
|
+
|
|
47
|
+
// A crude way of maintaining DB versioning
|
|
48
|
+
// We don't currently have any method of performing data migrations
|
|
49
|
+
// should the world state db structure change
|
|
50
|
+
// For now we will track versions using this hardcoded value and delete
|
|
51
|
+
// the state if a change is detected
|
|
52
|
+
export const WORLD_STATE_DB_VERSION = 1; // The initial version
|
|
43
53
|
|
|
44
54
|
export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
45
55
|
protected initialHeader: Header | undefined;
|
|
@@ -53,31 +63,47 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
53
63
|
static async new(
|
|
54
64
|
rollupAddress: EthAddress,
|
|
55
65
|
dataDir: string,
|
|
66
|
+
dbMapSizeKb: number,
|
|
56
67
|
log = createDebugLogger('aztec:world-state:database'),
|
|
57
68
|
cleanup = () => Promise.resolve(),
|
|
58
69
|
): Promise<NativeWorldStateService> {
|
|
59
|
-
const
|
|
60
|
-
const
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
if (
|
|
64
|
-
log.warn('
|
|
65
|
-
await rm(
|
|
70
|
+
const worldStateDirectory = join(dataDir, 'world_state');
|
|
71
|
+
const versionFile = join(worldStateDirectory, WORLD_STATE_VERSION_FILE);
|
|
72
|
+
const storedWorldStateVersion = await WorldStateVersion.readVersion(versionFile);
|
|
73
|
+
|
|
74
|
+
if (!storedWorldStateVersion) {
|
|
75
|
+
log.warn('No world state version found, deleting world state directory');
|
|
76
|
+
await rm(worldStateDirectory, { recursive: true, force: true });
|
|
77
|
+
} else if (!rollupAddress.equals(storedWorldStateVersion.rollupAddress)) {
|
|
78
|
+
log.warn('Rollup address changed, deleting world state directory');
|
|
79
|
+
await rm(worldStateDirectory, { recursive: true, force: true });
|
|
80
|
+
} else if (storedWorldStateVersion.version != WORLD_STATE_DB_VERSION) {
|
|
81
|
+
log.warn('World state version change detected, deleting world state directory');
|
|
82
|
+
await rm(worldStateDirectory, { recursive: true, force: true });
|
|
66
83
|
}
|
|
67
84
|
|
|
68
|
-
|
|
69
|
-
|
|
85
|
+
const newWorldStateVersion = new WorldStateVersion(WORLD_STATE_DB_VERSION, rollupAddress);
|
|
86
|
+
|
|
87
|
+
await mkdir(worldStateDirectory, { recursive: true });
|
|
88
|
+
await newWorldStateVersion.writeVersionFile(versionFile);
|
|
70
89
|
|
|
71
|
-
const instance = new NativeWorldState(
|
|
90
|
+
const instance = new NativeWorldState(worldStateDirectory, dbMapSizeKb);
|
|
72
91
|
const worldState = new this(instance, log, cleanup);
|
|
73
|
-
|
|
92
|
+
try {
|
|
93
|
+
await worldState.init();
|
|
94
|
+
} catch (e) {
|
|
95
|
+
log.error(`Error initialising world state: ${e}`);
|
|
96
|
+
throw e;
|
|
97
|
+
}
|
|
98
|
+
|
|
74
99
|
return worldState;
|
|
75
100
|
}
|
|
76
101
|
|
|
77
102
|
static async tmp(rollupAddress = EthAddress.ZERO, cleanupTmpDir = true): Promise<NativeWorldStateService> {
|
|
78
103
|
const log = createDebugLogger('aztec:world-state:database');
|
|
79
104
|
const dataDir = await mkdtemp(join(tmpdir(), 'aztec-world-state-'));
|
|
80
|
-
|
|
105
|
+
const dbMapSizeKb = 10 * 1024 * 1024;
|
|
106
|
+
log.debug(`Created temporary world state database at: ${dataDir} with size: ${dbMapSizeKb}`);
|
|
81
107
|
|
|
82
108
|
// pass a cleanup callback because process.on('beforeExit', cleanup) does not work under Jest
|
|
83
109
|
const cleanup = async () => {
|
|
@@ -89,10 +115,14 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
89
115
|
}
|
|
90
116
|
};
|
|
91
117
|
|
|
92
|
-
return this.new(rollupAddress, dataDir, log, cleanup);
|
|
118
|
+
return this.new(rollupAddress, dataDir, dbMapSizeKb, log, cleanup);
|
|
93
119
|
}
|
|
94
120
|
|
|
95
121
|
protected async init() {
|
|
122
|
+
const status = await this.getStatusSummary();
|
|
123
|
+
if (!status.treesAreSynched) {
|
|
124
|
+
throw new Error('World state trees are out of sync, please delete your data directory and re-sync');
|
|
125
|
+
}
|
|
96
126
|
this.initialHeader = await this.buildInitialHeader();
|
|
97
127
|
const committed = this.getCommitted();
|
|
98
128
|
|
|
@@ -128,7 +158,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
128
158
|
return this.initialHeader!;
|
|
129
159
|
}
|
|
130
160
|
|
|
131
|
-
public async handleL2BlockAndMessages(l2Block: L2Block, l1ToL2Messages: Fr[]): Promise<
|
|
161
|
+
public async handleL2BlockAndMessages(l2Block: L2Block, l1ToL2Messages: Fr[]): Promise<WorldStateStatusFull> {
|
|
132
162
|
// We have to pad both the tx effects and the values within tx effects because that's how the trees are built
|
|
133
163
|
// by circuits.
|
|
134
164
|
const paddedTxEffects = padArrayEnd(
|
|
@@ -153,7 +183,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
153
183
|
PublicDataTreeLeaf.empty(),
|
|
154
184
|
);
|
|
155
185
|
for (const [i, write] of txEffect.publicDataWrites.entries()) {
|
|
156
|
-
batch[i] = new PublicDataTreeLeaf(write.
|
|
186
|
+
batch[i] = new PublicDataTreeLeaf(write.leafSlot, write.value);
|
|
157
187
|
}
|
|
158
188
|
|
|
159
189
|
batchesOfPaddedPublicDataWrites.push(batch);
|
|
@@ -168,7 +198,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
168
198
|
batchesOfPaddedPublicDataWrites: batchesOfPaddedPublicDataWrites.map(batch => batch.map(serializeLeaf)),
|
|
169
199
|
blockStateRef: blockStateReference(l2Block.header.state),
|
|
170
200
|
});
|
|
171
|
-
return response
|
|
201
|
+
return sanitiseFullStatus(response);
|
|
172
202
|
}
|
|
173
203
|
|
|
174
204
|
public async close(): Promise<void> {
|
|
@@ -187,9 +217,10 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
187
217
|
* @returns The new WorldStateStatus
|
|
188
218
|
*/
|
|
189
219
|
public async setFinalised(toBlockNumber: bigint) {
|
|
190
|
-
|
|
220
|
+
const response = await this.instance.call(WorldStateMessageType.FINALISE_BLOCKS, {
|
|
191
221
|
toBlockNumber,
|
|
192
222
|
});
|
|
223
|
+
return sanitiseSummary(response);
|
|
193
224
|
}
|
|
194
225
|
|
|
195
226
|
/**
|
|
@@ -198,9 +229,10 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
198
229
|
* @returns The new WorldStateStatus
|
|
199
230
|
*/
|
|
200
231
|
public async removeHistoricalBlocks(toBlockNumber: bigint) {
|
|
201
|
-
|
|
232
|
+
const response = await this.instance.call(WorldStateMessageType.REMOVE_HISTORICAL_BLOCKS, {
|
|
202
233
|
toBlockNumber,
|
|
203
234
|
});
|
|
235
|
+
return sanitiseFullStatus(response);
|
|
204
236
|
}
|
|
205
237
|
|
|
206
238
|
/**
|
|
@@ -209,13 +241,15 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
|
|
|
209
241
|
* @returns The new WorldStateStatus
|
|
210
242
|
*/
|
|
211
243
|
public async unwindBlocks(toBlockNumber: bigint) {
|
|
212
|
-
|
|
244
|
+
const response = await this.instance.call(WorldStateMessageType.UNWIND_BLOCKS, {
|
|
213
245
|
toBlockNumber,
|
|
214
246
|
});
|
|
247
|
+
return sanitiseFullStatus(response);
|
|
215
248
|
}
|
|
216
249
|
|
|
217
|
-
public async
|
|
218
|
-
|
|
250
|
+
public async getStatusSummary() {
|
|
251
|
+
const response = await this.instance.call(WorldStateMessageType.GET_STATUS, void 0);
|
|
252
|
+
return sanitiseSummary(response);
|
|
219
253
|
}
|
|
220
254
|
|
|
221
255
|
updateLeaf<ID extends IndexedTreeId>(
|
|
@@ -82,7 +82,8 @@ export class NativeWorldState implements NativeWorldStateInstance {
|
|
|
82
82
|
private queue = new SerialQueue();
|
|
83
83
|
|
|
84
84
|
/** Creates a new native WorldState instance */
|
|
85
|
-
constructor(dataDir: string, private log = createDebugLogger('aztec:world-state:database')) {
|
|
85
|
+
constructor(dataDir: string, dbMapSizeKb: number, private log = createDebugLogger('aztec:world-state:database')) {
|
|
86
|
+
log.info(`Creating world state data store at directory ${dataDir} with map size ${dbMapSizeKb} KB`);
|
|
86
87
|
this.instance = new NATIVE_MODULE[NATIVE_CLASS_NAME](
|
|
87
88
|
dataDir,
|
|
88
89
|
{
|
|
@@ -97,7 +98,7 @@ export class NativeWorldState implements NativeWorldStateInstance {
|
|
|
97
98
|
[MerkleTreeId.PUBLIC_DATA_TREE]: 2 * MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
|
|
98
99
|
},
|
|
99
100
|
GeneratorIndex.BLOCK_HASH,
|
|
100
|
-
|
|
101
|
+
dbMapSizeKb,
|
|
101
102
|
Math.min(cpus().length, MAX_WORLD_STATE_THREADS),
|
|
102
103
|
);
|
|
103
104
|
this.queue.start();
|