@aztec/archiver 0.48.0 → 0.49.2
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/archiver/archiver.d.ts +4 -0
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +26 -10
- package/dest/archiver/archiver_store.d.ts +4 -2
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +21 -5
- package/dest/archiver/data_retrieval.d.ts +4 -4
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +8 -5
- package/dest/archiver/kv_archiver_store/block_body_store.d.ts +7 -1
- package/dest/archiver/kv_archiver_store/block_body_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_body_store.js +15 -4
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +2 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +2 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +5 -2
- package/package.json +10 -10
- package/src/archiver/archiver.ts +32 -12
- package/src/archiver/archiver_store.ts +4 -2
- package/src/archiver/archiver_store_test_suite.ts +26 -9
- package/src/archiver/data_retrieval.ts +14 -6
- package/src/archiver/kv_archiver_store/block_body_store.ts +18 -4
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +2 -1
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +5 -3
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
var _BlockBodyStore_blockBodies;
|
|
1
|
+
var _BlockBodyStore_blockBodies, _BlockBodyStore_lastSynchedL1Block;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { Body } from '@aztec/circuit-types';
|
|
4
4
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
@@ -8,7 +8,10 @@ export class BlockBodyStore {
|
|
|
8
8
|
this.log = log;
|
|
9
9
|
/** Map block body hash to block body */
|
|
10
10
|
_BlockBodyStore_blockBodies.set(this, void 0);
|
|
11
|
+
/** Stores L1 block number in which the last processed L2 block body was included */
|
|
12
|
+
_BlockBodyStore_lastSynchedL1Block.set(this, void 0);
|
|
11
13
|
__classPrivateFieldSet(this, _BlockBodyStore_blockBodies, db.openMap('archiver_block_bodies'), "f");
|
|
14
|
+
__classPrivateFieldSet(this, _BlockBodyStore_lastSynchedL1Block, db.openSingleton('archiver_block_bodies_last_synched_l1_block'), "f");
|
|
12
15
|
}
|
|
13
16
|
/**
|
|
14
17
|
* Append new block bodies to the store's map.
|
|
@@ -17,9 +20,10 @@ export class BlockBodyStore {
|
|
|
17
20
|
*/
|
|
18
21
|
addBlockBodies(blockBodies) {
|
|
19
22
|
return this.db.transaction(() => {
|
|
20
|
-
for (const body of blockBodies) {
|
|
23
|
+
for (const body of blockBodies.retrievedData) {
|
|
21
24
|
void __classPrivateFieldGet(this, _BlockBodyStore_blockBodies, "f").set(body.getTxsEffectsHash().toString('hex'), body.toBuffer());
|
|
22
25
|
}
|
|
26
|
+
void __classPrivateFieldGet(this, _BlockBodyStore_lastSynchedL1Block, "f").set(blockBodies.lastProcessedL1BlockNumber);
|
|
23
27
|
return true;
|
|
24
28
|
});
|
|
25
29
|
}
|
|
@@ -49,6 +53,13 @@ export class BlockBodyStore {
|
|
|
49
53
|
const blockBody = __classPrivateFieldGet(this, _BlockBodyStore_blockBodies, "f").get(txsEffectsHash.toString('hex'));
|
|
50
54
|
return blockBody && Body.fromBuffer(blockBody);
|
|
51
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Gets the last L1 block number in which a L2 block body was included
|
|
58
|
+
* @returns The L1 block number
|
|
59
|
+
*/
|
|
60
|
+
getSynchedL1BlockNumber() {
|
|
61
|
+
return __classPrivateFieldGet(this, _BlockBodyStore_lastSynchedL1Block, "f").get() ?? 0n;
|
|
62
|
+
}
|
|
52
63
|
}
|
|
53
|
-
_BlockBodyStore_blockBodies = new WeakMap();
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
_BlockBodyStore_blockBodies = new WeakMap(), _BlockBodyStore_lastSynchedL1Block = new WeakMap();
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfYm9keV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9ibG9ja19ib2R5X3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSzFELE1BQU0sT0FBTyxjQUFjO0lBT3pCLFlBQW9CLEVBQWdCLEVBQVUsTUFBTSxpQkFBaUIsQ0FBQyxpQ0FBaUMsQ0FBQztRQUFwRixPQUFFLEdBQUYsRUFBRSxDQUFjO1FBQVUsUUFBRyxHQUFILEdBQUcsQ0FBdUQ7UUFOeEcsd0NBQXdDO1FBQ3hDLDhDQUF1QztRQUV2QyxvRkFBb0Y7UUFDcEYscURBQTRDO1FBRzFDLHVCQUFBLElBQUksK0JBQWdCLEVBQUUsQ0FBQyxPQUFPLENBQUMsdUJBQXVCLENBQUMsTUFBQSxDQUFDO1FBQ3hELHVCQUFBLElBQUksc0NBQXVCLEVBQUUsQ0FBQyxhQUFhLENBQUMsNkNBQTZDLENBQUMsTUFBQSxDQUFDO0lBQzdGLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsY0FBYyxDQUFDLFdBQWdDO1FBQzdDLE9BQU8sSUFBSSxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsR0FBRyxFQUFFO1lBQzlCLEtBQUssTUFBTSxJQUFJLElBQUksV0FBVyxDQUFDLGFBQWEsRUFBRSxDQUFDO2dCQUM3QyxLQUFLLHVCQUFBLElBQUksbUNBQWEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ3hGLENBQUM7WUFDRCxLQUFLLHVCQUFBLElBQUksMENBQW9CLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1lBQzFFLE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILEtBQUssQ0FBQyxjQUFjLENBQUMsZ0JBQTBCO1FBQzdDLE1BQU0saUJBQWlCLEdBQUcsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxHQUFHLEVBQUUsQ0FDdkQsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUMsdUJBQUEsSUFBSSxtQ0FBYSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FDOUYsQ0FBQztRQUVGLE1BQU0sV0FBVyxHQUF5QixFQUFFLENBQUM7UUFDN0MsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGlCQUFpQixDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ2xELE1BQU0sZUFBZSxHQUFHLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzdDLElBQUksZUFBZSxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUNsQyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxzREFBc0QsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUM3RyxDQUFDO1lBQ0QsV0FBVyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ25GLENBQUM7UUFFRCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxjQUFzQjtRQUNqQyxNQUFNLFNBQVMsR0FBRyx1QkFBQSxJQUFJLG1DQUFhLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUV4RSxPQUFPLFNBQVMsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRDs7O09BR0c7SUFDSCx1QkFBdUI7UUFDckIsT0FBTyx1QkFBQSxJQUFJLDBDQUFvQixDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUM5QyxDQUFDO0NBQ0YifQ==
|
|
@@ -26,7 +26,7 @@ export declare class KVArchiverDataStore implements ArchiverDataStore {
|
|
|
26
26
|
* @param blockBodies - The L2 block bodies to be added to the store.
|
|
27
27
|
* @returns True if the operation is successful.
|
|
28
28
|
*/
|
|
29
|
-
addBlockBodies(blockBodies: Body
|
|
29
|
+
addBlockBodies(blockBodies: DataRetrieval<Body>): Promise<boolean>;
|
|
30
30
|
/**
|
|
31
31
|
* Gets block bodies that have the same txHashes as we supply.
|
|
32
32
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAC/B,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,SAAS,EACd,KAAK,wBAAwB,EAC9B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAChC,KAAK,4CAA4C,EACjD,KAAK,wCAAwC,EAC9C,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS1D;;GAEG;AACH,qBAAa,mBAAoB,YAAW,iBAAiB;;gBAW/C,EAAE,EAAE,YAAY,EAAE,eAAe,GAAE,MAAa;IAU5D,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAIjF,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrF,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIlE,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAItF,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7F,YAAY,CACV,eAAe,EAAE,EAAE,EACnB,gBAAgB,EAAE,4CAA4C,EAAE,EAChE,sBAAsB,EAAE,wCAAwC,EAAE,GACjE,OAAO,CAAC,OAAO,CAAC;IAIb,oBAAoB,CAAC,IAAI,EAAE,2BAA2B,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvG;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"kv_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -197,9 +197,10 @@ export class KVArchiverDataStore {
|
|
|
197
197
|
getSynchPoint() {
|
|
198
198
|
return Promise.resolve({
|
|
199
199
|
blocksSynchedTo: __classPrivateFieldGet(this, _KVArchiverDataStore_blockStore, "f").getSynchedL1BlockNumber(),
|
|
200
|
+
blockBodiesSynchedTo: __classPrivateFieldGet(this, _KVArchiverDataStore_blockBodyStore, "f").getSynchedL1BlockNumber(),
|
|
200
201
|
messagesSynchedTo: __classPrivateFieldGet(this, _KVArchiverDataStore_messageStore, "f").getSynchedL1BlockNumber(),
|
|
201
202
|
});
|
|
202
203
|
}
|
|
203
204
|
}
|
|
204
205
|
_KVArchiverDataStore_blockStore = new WeakMap(), _KVArchiverDataStore_blockBodyStore = new WeakMap(), _KVArchiverDataStore_logStore = new WeakMap(), _KVArchiverDataStore_messageStore = new WeakMap(), _KVArchiverDataStore_contractClassStore = new WeakMap(), _KVArchiverDataStore_contractInstanceStore = new WeakMap(), _KVArchiverDataStore_contractArtifactStore = new WeakMap(), _KVArchiverDataStore_log = new WeakMap();
|
|
205
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
206
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia3ZfYXJjaGl2ZXJfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIva3ZfYXJjaGl2ZXJfc3RvcmUva3ZfYXJjaGl2ZXJfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFtQkEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFXMUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMvRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDMUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQVc5QixZQUFZLEVBQWdCLEVBQUUsa0JBQTBCLElBQUk7UUFWNUQsa0RBQXdCO1FBQ3hCLHNEQUFnQztRQUNoQyxnREFBb0I7UUFDcEIsb0RBQTRCO1FBQzVCLDBEQUF3QztRQUN4Qyw2REFBOEM7UUFDOUMsNkRBQStDO1FBRS9DLG1DQUFPLGlCQUFpQixDQUFDLDJCQUEyQixDQUFDLEVBQUM7UUFHcEQsdUJBQUEsSUFBSSx1Q0FBbUIsSUFBSSxjQUFjLENBQUMsRUFBRSxDQUFDLE1BQUEsQ0FBQztRQUM5Qyx1QkFBQSxJQUFJLG1DQUFlLElBQUksVUFBVSxDQUFDLEVBQUUsRUFBRSx1QkFBQSxJQUFJLDJDQUFnQixDQUFDLE1BQUEsQ0FBQztRQUM1RCx1QkFBQSxJQUFJLGlDQUFhLElBQUksUUFBUSxDQUFDLEVBQUUsRUFBRSx1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
|
|
@@ -49,6 +49,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
49
49
|
private unconstrainedFunctions;
|
|
50
50
|
private contractInstances;
|
|
51
51
|
private lastL1BlockNewBlocks;
|
|
52
|
+
private lastL1BlockNewBlockBodies;
|
|
52
53
|
private lastL1BlockNewMessages;
|
|
53
54
|
private lastProvenL2BlockNumber;
|
|
54
55
|
constructor(
|
|
@@ -71,7 +72,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
71
72
|
* @param blockBodies - The L2 block bodies to be added to the store.
|
|
72
73
|
* @returns True if the operation is successful.
|
|
73
74
|
*/
|
|
74
|
-
addBlockBodies(blockBodies: Body
|
|
75
|
+
addBlockBodies(blockBodies: DataRetrieval<Body>): Promise<boolean>;
|
|
75
76
|
/**
|
|
76
77
|
* Gets block bodies that have the same txHashes as we supply.
|
|
77
78
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAE/B,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,SAAS,EAEd,OAAO,EACP,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,SAAS,EACT,KAAK,wBAAwB,EAC9B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAwB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAChC,KAAK,4CAA4C,EACjD,KAAK,wCAAwC,EAC9C,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D;;GAEG;AACH,qBAAa,mBAAoB,YAAW,iBAAiB;
|
|
1
|
+
{"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,7 @@ export class MemoryArchiverStore {
|
|
|
46
46
|
this.unconstrainedFunctions = new Map();
|
|
47
47
|
this.contractInstances = new Map();
|
|
48
48
|
this.lastL1BlockNewBlocks = 0n;
|
|
49
|
+
this.lastL1BlockNewBlockBodies = 0n;
|
|
49
50
|
this.lastL1BlockNewMessages = 0n;
|
|
50
51
|
this.lastProvenL2BlockNumber = 0;
|
|
51
52
|
}
|
|
@@ -107,9 +108,10 @@ export class MemoryArchiverStore {
|
|
|
107
108
|
* @returns True if the operation is successful.
|
|
108
109
|
*/
|
|
109
110
|
addBlockBodies(blockBodies) {
|
|
110
|
-
for (const body of blockBodies) {
|
|
111
|
+
for (const body of blockBodies.retrievedData) {
|
|
111
112
|
void this.l2BlockBodies.set(body.getTxsEffectsHash().toString('hex'), body);
|
|
112
113
|
}
|
|
114
|
+
this.lastL1BlockNewBlockBodies = blockBodies.lastProcessedL1BlockNumber;
|
|
113
115
|
return Promise.resolve(true);
|
|
114
116
|
}
|
|
115
117
|
/**
|
|
@@ -335,6 +337,7 @@ export class MemoryArchiverStore {
|
|
|
335
337
|
return Promise.resolve({
|
|
336
338
|
blocksSynchedTo: this.lastL1BlockNewBlocks,
|
|
337
339
|
messagesSynchedTo: this.lastL1BlockNewMessages,
|
|
340
|
+
blockBodiesSynchedTo: this.lastL1BlockNewBlockBodies,
|
|
338
341
|
});
|
|
339
342
|
}
|
|
340
343
|
addContractArtifact(address, contract) {
|
|
@@ -345,4 +348,4 @@ export class MemoryArchiverStore {
|
|
|
345
348
|
return Promise.resolve(this.contractArtifacts.get(address.toString()));
|
|
346
349
|
}
|
|
347
350
|
}
|
|
348
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
351
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/archiver",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.49.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -58,15 +58,15 @@
|
|
|
58
58
|
]
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@aztec/circuit-types": "0.
|
|
62
|
-
"@aztec/circuits.js": "0.
|
|
63
|
-
"@aztec/ethereum": "0.
|
|
64
|
-
"@aztec/foundation": "0.
|
|
65
|
-
"@aztec/kv-store": "0.
|
|
66
|
-
"@aztec/l1-artifacts": "0.
|
|
67
|
-
"@aztec/protocol-contracts": "0.
|
|
68
|
-
"@aztec/telemetry-client": "0.
|
|
69
|
-
"@aztec/types": "0.
|
|
61
|
+
"@aztec/circuit-types": "0.49.2",
|
|
62
|
+
"@aztec/circuits.js": "0.49.2",
|
|
63
|
+
"@aztec/ethereum": "0.49.2",
|
|
64
|
+
"@aztec/foundation": "0.49.2",
|
|
65
|
+
"@aztec/kv-store": "0.49.2",
|
|
66
|
+
"@aztec/l1-artifacts": "0.49.2",
|
|
67
|
+
"@aztec/protocol-contracts": "0.49.2",
|
|
68
|
+
"@aztec/telemetry-client": "0.49.2",
|
|
69
|
+
"@aztec/types": "0.49.2",
|
|
70
70
|
"debug": "^4.3.4",
|
|
71
71
|
"lodash.groupby": "^4.6.0",
|
|
72
72
|
"lodash.omit": "^4.5.0",
|
package/src/archiver/archiver.ts
CHANGED
|
@@ -145,10 +145,21 @@ export class Archiver implements ArchiveSource {
|
|
|
145
145
|
await this.sync(blockUntilSynced);
|
|
146
146
|
}
|
|
147
147
|
|
|
148
|
-
this.runningPromise = new RunningPromise(() => this.
|
|
148
|
+
this.runningPromise = new RunningPromise(() => this.safeSync(), this.pollingIntervalMs);
|
|
149
149
|
this.runningPromise.start();
|
|
150
150
|
}
|
|
151
151
|
|
|
152
|
+
/**
|
|
153
|
+
* Syncs and catches exceptions.
|
|
154
|
+
*/
|
|
155
|
+
private async safeSync() {
|
|
156
|
+
try {
|
|
157
|
+
await this.sync(false);
|
|
158
|
+
} catch (error) {
|
|
159
|
+
this.log.error('Error syncing archiver', error);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
|
|
152
163
|
/**
|
|
153
164
|
* Fetches logs from L1 contracts and processes them.
|
|
154
165
|
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
@@ -166,10 +177,14 @@ export class Archiver implements ArchiveSource {
|
|
|
166
177
|
*
|
|
167
178
|
* This code does not handle reorgs.
|
|
168
179
|
*/
|
|
169
|
-
const { blocksSynchedTo, messagesSynchedTo } = await this.store.getSynchPoint();
|
|
180
|
+
const { blockBodiesSynchedTo, blocksSynchedTo, messagesSynchedTo } = await this.store.getSynchPoint();
|
|
170
181
|
const currentL1BlockNumber = await this.publicClient.getBlockNumber();
|
|
171
182
|
|
|
172
|
-
if (
|
|
183
|
+
if (
|
|
184
|
+
currentL1BlockNumber <= blocksSynchedTo &&
|
|
185
|
+
currentL1BlockNumber <= messagesSynchedTo &&
|
|
186
|
+
currentL1BlockNumber <= blockBodiesSynchedTo
|
|
187
|
+
) {
|
|
173
188
|
// chain hasn't moved forward
|
|
174
189
|
// or it's been rolled back
|
|
175
190
|
this.log.debug(`Nothing to sync`, { currentL1BlockNumber, blocksSynchedTo, messagesSynchedTo });
|
|
@@ -220,16 +235,19 @@ export class Archiver implements ArchiveSource {
|
|
|
220
235
|
// Read all data from chain and then write to our stores at the end
|
|
221
236
|
const nextExpectedL2BlockNum = BigInt((await this.store.getSynchedL2BlockNumber()) + 1);
|
|
222
237
|
|
|
238
|
+
this.log.debug(`Retrieving block bodies from ${blockBodiesSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
223
239
|
const retrievedBlockBodies = await retrieveBlockBodiesFromAvailabilityOracle(
|
|
224
240
|
this.publicClient,
|
|
225
241
|
this.availabilityOracleAddress,
|
|
226
242
|
blockUntilSynced,
|
|
227
|
-
|
|
243
|
+
blockBodiesSynchedTo + 1n,
|
|
228
244
|
currentL1BlockNumber,
|
|
229
245
|
);
|
|
230
246
|
|
|
231
|
-
|
|
232
|
-
|
|
247
|
+
this.log.debug(
|
|
248
|
+
`Retrieved ${retrievedBlockBodies.retrievedData.length} block bodies up to L1 block ${retrievedBlockBodies.lastProcessedL1BlockNumber}`,
|
|
249
|
+
);
|
|
250
|
+
await this.store.addBlockBodies(retrievedBlockBodies);
|
|
233
251
|
|
|
234
252
|
// Now that we have block bodies we will retrieve block metadata and build L2 blocks from the bodies and
|
|
235
253
|
// the metadata
|
|
@@ -237,6 +255,7 @@ export class Archiver implements ArchiveSource {
|
|
|
237
255
|
{
|
|
238
256
|
// @todo @LHerskind Investigate how necessary that nextExpectedL2BlockNum really is.
|
|
239
257
|
// Also, I would expect it to break horribly if we have a reorg.
|
|
258
|
+
this.log.debug(`Retrieving block metadata from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
|
|
240
259
|
const retrievedBlockMetadata = await retrieveBlockMetadataFromRollup(
|
|
241
260
|
this.publicClient,
|
|
242
261
|
this.rollupAddress,
|
|
@@ -278,17 +297,18 @@ export class Archiver implements ArchiveSource {
|
|
|
278
297
|
} and ${currentL1BlockNumber}.`,
|
|
279
298
|
);
|
|
280
299
|
|
|
281
|
-
// Set the `lastProcessedL1BlockNumber` to the smallest of the header and body retrieval
|
|
282
|
-
const min = (a: bigint, b: bigint) => (a < b ? a : b);
|
|
283
300
|
retrievedBlocks = {
|
|
284
|
-
lastProcessedL1BlockNumber:
|
|
285
|
-
retrievedBlockMetadata.lastProcessedL1BlockNumber,
|
|
286
|
-
retrievedBlockBodies.lastProcessedL1BlockNumber,
|
|
287
|
-
),
|
|
301
|
+
lastProcessedL1BlockNumber: retrievedBlockMetadata.lastProcessedL1BlockNumber,
|
|
288
302
|
retrievedData: blocks,
|
|
289
303
|
};
|
|
290
304
|
}
|
|
291
305
|
|
|
306
|
+
this.log.debug(
|
|
307
|
+
`Processing retrieved blocks ${retrievedBlocks.retrievedData
|
|
308
|
+
.map(b => b.number)
|
|
309
|
+
.join(',')} with last processed L1 block ${retrievedBlocks.lastProcessedL1BlockNumber}`,
|
|
310
|
+
);
|
|
311
|
+
|
|
292
312
|
await Promise.all(
|
|
293
313
|
retrievedBlocks.retrievedData.map(block => {
|
|
294
314
|
const noteEncryptedLogs = block.body.noteEncryptedLogs;
|
|
@@ -30,8 +30,10 @@ import { type DataRetrieval } from './data_retrieval.js';
|
|
|
30
30
|
* Represents the latest L1 block processed by the archiver for various objects in L2.
|
|
31
31
|
*/
|
|
32
32
|
export type ArchiverL1SynchPoint = {
|
|
33
|
-
/** Number of the last L1 block that added a new L2 block. */
|
|
33
|
+
/** Number of the last L1 block that added a new L2 block metadata. */
|
|
34
34
|
blocksSynchedTo: bigint;
|
|
35
|
+
/** Number of the last L1 block that added a new L2 block body. */
|
|
36
|
+
blockBodiesSynchedTo: bigint;
|
|
35
37
|
/** Number of the last L1 block that added L1 -> L2 messages from the Inbox. */
|
|
36
38
|
messagesSynchedTo: bigint;
|
|
37
39
|
};
|
|
@@ -53,7 +55,7 @@ export interface ArchiverDataStore {
|
|
|
53
55
|
* @param blockBodies - The L2 block bodies to be added to the store.
|
|
54
56
|
* @returns True if the operation is successful.
|
|
55
57
|
*/
|
|
56
|
-
addBlockBodies(blockBodies: Body
|
|
58
|
+
addBlockBodies(blockBodies: DataRetrieval<Body>): Promise<boolean>;
|
|
57
59
|
|
|
58
60
|
/**
|
|
59
61
|
* Gets block bodies that have the same txsEffectsHashes as we supply.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { InboxLeaf, L2Block, LogId, LogType, TxHash } from '@aztec/circuit-types';
|
|
1
|
+
import { type Body, InboxLeaf, L2Block, LogId, LogType, TxHash } from '@aztec/circuit-types';
|
|
2
2
|
import '@aztec/circuit-types/jest';
|
|
3
3
|
import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
|
|
4
4
|
import {
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
SerializableContractInstance,
|
|
15
15
|
} from '@aztec/types/contracts';
|
|
16
16
|
|
|
17
|
-
import { type ArchiverDataStore } from './archiver_store.js';
|
|
17
|
+
import { type ArchiverDataStore, type ArchiverL1SynchPoint } from './archiver_store.js';
|
|
18
18
|
import { type DataRetrieval } from './data_retrieval.js';
|
|
19
19
|
|
|
20
20
|
/**
|
|
@@ -25,6 +25,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
25
25
|
describe(testName, () => {
|
|
26
26
|
let store: ArchiverDataStore;
|
|
27
27
|
let blocks: DataRetrieval<L2Block>;
|
|
28
|
+
let blockBodies: DataRetrieval<Body>;
|
|
28
29
|
const blockTests: [number, number, () => L2Block[]][] = [
|
|
29
30
|
[1, 1, () => blocks.retrievedData.slice(0, 1)],
|
|
30
31
|
[10, 1, () => blocks.retrievedData.slice(9, 10)],
|
|
@@ -39,11 +40,15 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
39
40
|
lastProcessedL1BlockNumber: 5n,
|
|
40
41
|
retrievedData: Array.from({ length: 10 }).map((_, i) => L2Block.random(i + 1)),
|
|
41
42
|
};
|
|
43
|
+
blockBodies = {
|
|
44
|
+
retrievedData: blocks.retrievedData.map(block => block.body),
|
|
45
|
+
lastProcessedL1BlockNumber: 4n,
|
|
46
|
+
};
|
|
42
47
|
});
|
|
43
48
|
|
|
44
49
|
describe('addBlocks', () => {
|
|
45
50
|
it('returns success when adding block bodies', async () => {
|
|
46
|
-
await expect(store.addBlockBodies(
|
|
51
|
+
await expect(store.addBlockBodies(blockBodies)).resolves.toBe(true);
|
|
47
52
|
});
|
|
48
53
|
|
|
49
54
|
it('returns success when adding blocks', async () => {
|
|
@@ -59,7 +64,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
59
64
|
describe('getBlocks', () => {
|
|
60
65
|
beforeEach(async () => {
|
|
61
66
|
await store.addBlocks(blocks);
|
|
62
|
-
await store.addBlockBodies(
|
|
67
|
+
await store.addBlockBodies(blockBodies);
|
|
63
68
|
});
|
|
64
69
|
|
|
65
70
|
it.each(blockTests)('retrieves previously stored blocks', async (start, limit, getExpectedBlocks) => {
|
|
@@ -95,7 +100,8 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
95
100
|
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
96
101
|
blocksSynchedTo: 0n,
|
|
97
102
|
messagesSynchedTo: 0n,
|
|
98
|
-
|
|
103
|
+
blockBodiesSynchedTo: 0n,
|
|
104
|
+
} satisfies ArchiverL1SynchPoint);
|
|
99
105
|
});
|
|
100
106
|
|
|
101
107
|
it('returns the L1 block number in which the most recent L2 block was published', async () => {
|
|
@@ -103,7 +109,17 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
103
109
|
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
104
110
|
blocksSynchedTo: blocks.lastProcessedL1BlockNumber,
|
|
105
111
|
messagesSynchedTo: 0n,
|
|
106
|
-
|
|
112
|
+
blockBodiesSynchedTo: 0n,
|
|
113
|
+
} satisfies ArchiverL1SynchPoint);
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
it('returns the L1 block number in which the most recent L2 block body was published', async () => {
|
|
117
|
+
await store.addBlockBodies(blockBodies);
|
|
118
|
+
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
119
|
+
blocksSynchedTo: 0n,
|
|
120
|
+
messagesSynchedTo: 0n,
|
|
121
|
+
blockBodiesSynchedTo: blockBodies.lastProcessedL1BlockNumber,
|
|
122
|
+
} satisfies ArchiverL1SynchPoint);
|
|
107
123
|
});
|
|
108
124
|
|
|
109
125
|
it('returns the L1 block number that most recently added messages from inbox', async () => {
|
|
@@ -114,7 +130,8 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
114
130
|
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
115
131
|
blocksSynchedTo: 0n,
|
|
116
132
|
messagesSynchedTo: 1n,
|
|
117
|
-
|
|
133
|
+
blockBodiesSynchedTo: 0n,
|
|
134
|
+
} satisfies ArchiverL1SynchPoint);
|
|
118
135
|
});
|
|
119
136
|
});
|
|
120
137
|
|
|
@@ -179,7 +196,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
179
196
|
),
|
|
180
197
|
);
|
|
181
198
|
await store.addBlocks(blocks);
|
|
182
|
-
await store.addBlockBodies(
|
|
199
|
+
await store.addBlockBodies(blockBodies);
|
|
183
200
|
});
|
|
184
201
|
|
|
185
202
|
it.each([
|
|
@@ -335,7 +352,7 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
335
352
|
};
|
|
336
353
|
|
|
337
354
|
await store.addBlocks(blocks);
|
|
338
|
-
await store.addBlockBodies(
|
|
355
|
+
await store.addBlockBodies(blockBodies);
|
|
339
356
|
|
|
340
357
|
await Promise.all(
|
|
341
358
|
blocks.retrievedData.map(block =>
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type Body, type InboxLeaf } from '@aztec/circuit-types';
|
|
2
2
|
import { type AppendOnlyTreeSnapshot, Fr, type Header } from '@aztec/circuits.js';
|
|
3
3
|
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
4
|
+
import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
4
5
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
5
6
|
|
|
6
7
|
import { type PublicClient, getAbiItem } from 'viem';
|
|
@@ -45,6 +46,7 @@ export async function retrieveBlockMetadataFromRollup(
|
|
|
45
46
|
searchStartBlock: bigint,
|
|
46
47
|
searchEndBlock: bigint,
|
|
47
48
|
expectedNextL2BlockNum: bigint,
|
|
49
|
+
logger: DebugLogger = createDebugLogger('aztec:archiver'),
|
|
48
50
|
): Promise<DataRetrieval<[Header, AppendOnlyTreeSnapshot]>> {
|
|
49
51
|
const retrievedBlockMetadata: [Header, AppendOnlyTreeSnapshot][] = [];
|
|
50
52
|
do {
|
|
@@ -61,13 +63,18 @@ export async function retrieveBlockMetadataFromRollup(
|
|
|
61
63
|
break;
|
|
62
64
|
}
|
|
63
65
|
|
|
66
|
+
const lastLog = l2BlockProcessedLogs[l2BlockProcessedLogs.length - 1];
|
|
67
|
+
logger.debug(
|
|
68
|
+
`Got L2 block processed logs for ${l2BlockProcessedLogs[0].blockNumber}-${lastLog.blockNumber} between ${searchStartBlock}-${searchEndBlock} L1 blocks`,
|
|
69
|
+
);
|
|
70
|
+
|
|
64
71
|
const newBlockMetadata = await processL2BlockProcessedLogs(
|
|
65
72
|
publicClient,
|
|
66
73
|
expectedNextL2BlockNum,
|
|
67
74
|
l2BlockProcessedLogs,
|
|
68
75
|
);
|
|
69
76
|
retrievedBlockMetadata.push(...newBlockMetadata);
|
|
70
|
-
searchStartBlock =
|
|
77
|
+
searchStartBlock = lastLog.blockNumber! + 1n;
|
|
71
78
|
expectedNextL2BlockNum += BigInt(newBlockMetadata.length);
|
|
72
79
|
} while (blockUntilSynced && searchStartBlock <= searchEndBlock);
|
|
73
80
|
return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedBlockMetadata };
|
|
@@ -80,7 +87,7 @@ export async function retrieveBlockMetadataFromRollup(
|
|
|
80
87
|
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
81
88
|
* @param searchStartBlock - The block number to use for starting the search.
|
|
82
89
|
* @param searchEndBlock - The highest block number that we should search up to.
|
|
83
|
-
* @returns A array of
|
|
90
|
+
* @returns A array of L2 block bodies as well as the next eth block to search from
|
|
84
91
|
*/
|
|
85
92
|
export async function retrieveBlockBodiesFromAvailabilityOracle(
|
|
86
93
|
publicClient: PublicClient,
|
|
@@ -88,8 +95,8 @@ export async function retrieveBlockBodiesFromAvailabilityOracle(
|
|
|
88
95
|
blockUntilSynced: boolean,
|
|
89
96
|
searchStartBlock: bigint,
|
|
90
97
|
searchEndBlock: bigint,
|
|
91
|
-
): Promise<DataRetrieval<
|
|
92
|
-
const retrievedBlockBodies:
|
|
98
|
+
): Promise<DataRetrieval<Body>> {
|
|
99
|
+
const retrievedBlockBodies: Body[] = [];
|
|
93
100
|
|
|
94
101
|
do {
|
|
95
102
|
if (searchStartBlock > searchEndBlock) {
|
|
@@ -106,9 +113,10 @@ export async function retrieveBlockBodiesFromAvailabilityOracle(
|
|
|
106
113
|
}
|
|
107
114
|
|
|
108
115
|
const newBlockBodies = await processTxsPublishedLogs(publicClient, l2TxsPublishedLogs);
|
|
109
|
-
retrievedBlockBodies.push(...newBlockBodies);
|
|
110
|
-
searchStartBlock = l2TxsPublishedLogs[l2TxsPublishedLogs.length - 1].blockNumber
|
|
116
|
+
retrievedBlockBodies.push(...newBlockBodies.map(([body]) => body));
|
|
117
|
+
searchStartBlock = l2TxsPublishedLogs[l2TxsPublishedLogs.length - 1].blockNumber + 1n;
|
|
111
118
|
} while (blockUntilSynced && searchStartBlock <= searchEndBlock);
|
|
119
|
+
|
|
112
120
|
return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedBlockBodies };
|
|
113
121
|
}
|
|
114
122
|
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { Body } from '@aztec/circuit-types';
|
|
2
2
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
|
-
import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
|
|
3
|
+
import { type AztecKVStore, type AztecMap, type AztecSingleton } from '@aztec/kv-store';
|
|
4
|
+
|
|
5
|
+
import { type DataRetrieval } from '../data_retrieval.js';
|
|
4
6
|
|
|
5
7
|
export class BlockBodyStore {
|
|
6
8
|
/** Map block body hash to block body */
|
|
7
9
|
#blockBodies: AztecMap<string, Buffer>;
|
|
8
10
|
|
|
11
|
+
/** Stores L1 block number in which the last processed L2 block body was included */
|
|
12
|
+
#lastSynchedL1Block: AztecSingleton<bigint>;
|
|
13
|
+
|
|
9
14
|
constructor(private db: AztecKVStore, private log = createDebugLogger('aztec:archiver:block_body_store')) {
|
|
10
15
|
this.#blockBodies = db.openMap('archiver_block_bodies');
|
|
16
|
+
this.#lastSynchedL1Block = db.openSingleton('archiver_block_bodies_last_synched_l1_block');
|
|
11
17
|
}
|
|
12
18
|
|
|
13
19
|
/**
|
|
@@ -15,12 +21,12 @@ export class BlockBodyStore {
|
|
|
15
21
|
* @param blockBodies - The L2 block bodies to be added to the store.
|
|
16
22
|
* @returns True if the operation is successful.
|
|
17
23
|
*/
|
|
18
|
-
addBlockBodies(blockBodies: Body
|
|
24
|
+
addBlockBodies(blockBodies: DataRetrieval<Body>): Promise<boolean> {
|
|
19
25
|
return this.db.transaction(() => {
|
|
20
|
-
for (const body of blockBodies) {
|
|
26
|
+
for (const body of blockBodies.retrievedData) {
|
|
21
27
|
void this.#blockBodies.set(body.getTxsEffectsHash().toString('hex'), body.toBuffer());
|
|
22
28
|
}
|
|
23
|
-
|
|
29
|
+
void this.#lastSynchedL1Block.set(blockBodies.lastProcessedL1BlockNumber);
|
|
24
30
|
return true;
|
|
25
31
|
});
|
|
26
32
|
}
|
|
@@ -57,4 +63,12 @@ export class BlockBodyStore {
|
|
|
57
63
|
|
|
58
64
|
return blockBody && Body.fromBuffer(blockBody);
|
|
59
65
|
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Gets the last L1 block number in which a L2 block body was included
|
|
69
|
+
* @returns The L1 block number
|
|
70
|
+
*/
|
|
71
|
+
getSynchedL1BlockNumber(): bigint {
|
|
72
|
+
return this.#lastSynchedL1Block.get() ?? 0n;
|
|
73
|
+
}
|
|
60
74
|
}
|