@aztec/archiver 0.51.0 → 0.52.0

package/dest/archiver/memory_archiver_store/memory_archiver_store.js

@@ -48,6 +48,7 @@ export class MemoryArchiverStore {
         this.lastL1BlockNewBlocks = 0n;
         this.lastL1BlockNewBlockBodies = 0n;
         this.lastL1BlockNewMessages = 0n;
+        this.lastL1BlockNewProvenLogs = 0n;
         this.lastProvenL2BlockNumber = 0;
     }
     getContractClass(id) {
@@ -97,9 +98,12 @@ export class MemoryArchiverStore {
      * @returns True if the operation is successful.
      */
     addBlocks(blocks) {
-        this.lastL1BlockNewBlocks = blocks.lastProcessedL1BlockNumber;
-        this.l2Blocks.push(...blocks.retrievedData);
-        this.txEffects.push(...blocks.retrievedData.flatMap(b => b.body.txEffects));
+        if (blocks.length === 0) {
+            return Promise.resolve(true);
+        }
+        this.lastL1BlockNewBlocks = blocks[blocks.length - 1].l1.blockNumber;
+        this.l2Blocks.push(...blocks);
+        this.txEffects.push(...blocks.flatMap(b => b.data.body.txEffects));
         return Promise.resolve(true);
     }
     /**
@@ -201,9 +205,9 @@ export class MemoryArchiverStore {
      */
     getSettledTxReceipt(txHash) {
         for (const block of this.l2Blocks) {
-            for (const txEffect of block.body.txEffects) {
+            for (const txEffect of block.data.body.txEffects) {
                 if (txEffect.txHash.equals(txHash)) {
-                    return Promise.resolve(new TxReceipt(txHash, TxReceipt.statusFromRevertCode(txEffect.revertCode), '', txEffect.transactionFee.toBigInt(), block.hash().toBuffer(), block.number));
+                    return Promise.resolve(new TxReceipt(txHash, TxReceipt.statusFromRevertCode(txEffect.revertCode), '', txEffect.transactionFee.toBigInt(), block.data.hash().toBuffer(), block.data.number));
                 }
             }
         }
@@ -296,9 +300,9 @@ export class MemoryArchiverStore {
                 const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
                 for (; logIndexInTx < txLogs.length; logIndexInTx++) {
                     const log = txLogs[logIndexInTx];
-                    if ((!txHash || block.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
+                    if ((!txHash || block.data.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
                         (!contractAddress || log.contractAddress.equals(contractAddress))) {
-                        logs.push(new ExtendedUnencryptedL2Log(new LogId(block.number, txIndexInBlock, logIndexInTx), log));
+                        logs.push(new ExtendedUnencryptedL2Log(new LogId(block.data.number, txIndexInBlock, logIndexInTx), log));
                         if (logs.length === this.maxLogs) {
                             return Promise.resolve({
                                 logs,
@@ -324,13 +328,14 @@ export class MemoryArchiverStore {
         if (this.l2Blocks.length === 0) {
             return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
         }
-        return Promise.resolve(this.l2Blocks[this.l2Blocks.length - 1].number);
+        return Promise.resolve(this.l2Blocks[this.l2Blocks.length - 1].data.number);
     }
     getProvenL2BlockNumber() {
         return Promise.resolve(this.lastProvenL2BlockNumber);
     }
     setProvenL2BlockNumber(l2BlockNumber) {
-        this.lastProvenL2BlockNumber = l2BlockNumber;
+        this.lastProvenL2BlockNumber = l2BlockNumber.retrievedData;
+        this.lastL1BlockNewProvenLogs = l2BlockNumber.lastProcessedL1BlockNumber;
         return Promise.resolve();
     }
     getSynchPoint() {
@@ -338,6 +343,7 @@ export class MemoryArchiverStore {
             blocksSynchedTo: this.lastL1BlockNewBlocks,
             messagesSynchedTo: this.lastL1BlockNewMessages,
             blockBodiesSynchedTo: this.lastL1BlockNewBlockBodies,
+            provenLogsSynchedTo: this.lastL1BlockNewProvenLogs,
         });
     }
     addContractArtifact(address, contract) {
@@ -348,4 +354,4 @@ export class MemoryArchiverStore {
         return Promise.resolve(this.contractArtifacts.get(address.toString()));
     }
 }
-//# 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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"}
+//# 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/dest/archiver/structs/data_retrieval.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Data retrieved from logs
+ */
+export type DataRetrieval<T> = {
+    /**
+     * Blocknumber of the last L1 block from which we obtained data.
+     */
+    lastProcessedL1BlockNumber: bigint;
+    /**
+     * The data returned.
+     */
+    retrievedData: T[];
+};
+/**
+ * Data retrieved from logs
+ */
+export type SingletonDataRetrieval<T> = {
+    /**
+     * Blocknumber of the last L1 block from which we obtained data.
+     */
+    lastProcessedL1BlockNumber: bigint;
+    /**
+     * The data returned.
+     */
+    retrievedData: T;
+};
+//# sourceMappingURL=data_retrieval.d.ts.map

package/dest/archiver/structs/data_retrieval.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/data_retrieval.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B;;OAEG;IACH,0BAA0B,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,aAAa,EAAE,CAAC,EAAE,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;IACtC;;OAEG;IACH,0BAA0B,EAAE,MAAM,CAAC;IACnC;;OAEG;IACH,aAAa,EAAE,CAAC,CAAC;CAClB,CAAC"}

package/dest/archiver/structs/data_retrieval.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YV9yZXRyaWV2YWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIvc3RydWN0cy9kYXRhX3JldHJpZXZhbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/dest/archiver/structs/published.d.ts

@@ -0,0 +1,11 @@
+/** Extends a type with L1 published info (block number, hash, and timestamp) */
+export type L1Published<T> = {
+    data: T;
+    l1: L1PublishedData;
+};
+export type L1PublishedData = {
+    blockNumber: bigint;
+    timestamp: bigint;
+    blockHash: string;
+};
+//# sourceMappingURL=published.d.ts.map

package/dest/archiver/structs/published.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"published.d.ts","sourceRoot":"","sources":["../../../src/archiver/structs/published.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;IAC3B,IAAI,EAAE,CAAC,CAAC;IACR,EAAE,EAAE,eAAe,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dest/archiver/structs/published.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGlzaGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FyY2hpdmVyL3N0cnVjdHMvcHVibGlzaGVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAUA,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAG7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAG7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC"}

package/dest/index.js

@@ -4,6 +4,7 @@ import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { createPublicClient, http } from 'viem';
 import { localhost } from 'viem/chains';
 import { Archiver, getArchiverConfigFromEnv } from './archiver/index.js';
+import { ArchiverInstrumentation } from './archiver/instrumentation.js';
 import { MemoryArchiverStore } from './archiver/memory_archiver_store/memory_archiver_store.js';
 export * from './archiver/index.js';
 export * from './rpc/index.js';
@@ -23,7 +24,7 @@ async function main() {
         transport: http(rpcUrl),
     });
     const archiverStore = new MemoryArchiverStore(1000);
-    const archiver = new Archiver(publicClient, l1Contracts.rollupAddress, l1Contracts.availabilityOracleAddress, l1Contracts.inboxAddress, l1Contracts.registryAddress, archiverStore, 1000, new NoopTelemetryClient());
+    const archiver = new Archiver(publicClient, l1Contracts.rollupAddress, l1Contracts.availabilityOracleAddress, l1Contracts.inboxAddress, l1Contracts.registryAddress, archiverStore, 1000, new ArchiverInstrumentation(new NoopTelemetryClient()));
     const shutdown = async () => {
         await archiver.stop();
         process.exit(0);
@@ -39,4 +40,4 @@ if (process.argv[1] === fileURLToPath(import.meta.url).replace(/\/index\.js$/, '
         process.exit(1);
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRW5FLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLHdCQUF3QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDekUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkRBQTJELENBQUM7QUFFaEcsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsY0FBYyxDQUFDO0FBRTdCLHdJQUF3STtBQUN4SSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU3RSxNQUFNLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBRWhEOztHQUVHO0FBQ0gseUNBQXlDO0FBQ3pDLEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sTUFBTSxHQUFHLHdCQUF3QixFQUFFLENBQUM7SUFDMUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBRWpELE1BQU0sWUFBWSxHQUFHLGtCQUFrQixDQUFDO1FBQ3RDLEtBQUssRUFBRSxTQUFTO1FBQ2hCLFNBQVMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDO0tBQ3hCLENBQUMsQ0FBQztJQUVILE1BQU0sYUFBYSxHQUFHLElBQUksbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFcEQsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQzNCLFlBQVksRUFDWixXQUFXLENBQUMsYUFBYSxFQUN6QixXQUFXLENBQUMseUJBQXlCLEVBQ3JDLFdBQVcsQ0FBQyxZQUFZLEVBQ3hCLFdBQVcsQ0FBQyxlQUFlLEVBQzNCLGFBQWEsRUFDYixJQUFJLEVBQ0osSUFBSSxtQkFBbUIsRUFBRSxDQUMxQixDQUFDO0lBRUYsTUFBTSxRQUFRLEdBQUcsS0FBSyxJQUFJLEVBQUU7UUFDMUIsTUFBTSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQixDQUFDLENBQUM7SUFDRixPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsQ0FBQztBQUNwQyxDQUFDO0FBRUQsaUVBQWlFO0FBQ2pFLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUM7SUFDbkYsbUVBQW1FO0lBQ25FLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtRQUNqQixHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDMUQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRW5FLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV4QyxPQUFPLEVBQUUsUUFBUSxFQUFFLHdCQUF3QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDekUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDeEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkRBQTJELENBQUM7QUFFaEcsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGdCQUFnQixDQUFDO0FBQy9CLGNBQWMsY0FBYyxDQUFDO0FBRTdCLHdJQUF3STtBQUN4SSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU3RSxNQUFNLEdBQUcsR0FBRyxpQkFBaUIsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0FBRWhEOztHQUVHO0FBQ0gseUNBQXlDO0FBQ3pDLEtBQUssVUFBVSxJQUFJO0lBQ2pCLE1BQU0sTUFBTSxHQUFHLHdCQUF3QixFQUFFLENBQUM7SUFDMUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsTUFBTSxDQUFDO0lBRWpELE1BQU0sWUFBWSxHQUFHLGtCQUFrQixDQUFDO1FBQ3RDLEtBQUssRUFBRSxTQUFTO1FBQ2hCLFNBQVMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDO0tBQ3hCLENBQUMsQ0FBQztJQUVILE1BQU0sYUFBYSxHQUFHLElBQUksbUJBQW1CLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFcEQsTUFBTSxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQzNCLFlBQVksRUFDWixXQUFXLENBQUMsYUFBYSxFQUN6QixXQUFXLENBQUMseUJBQXlCLEVBQ3JDLFdBQVcsQ0FBQyxZQUFZLEVBQ3hCLFdBQVcsQ0FBQyxlQUFlLEVBQzNCLGFBQWEsRUFDYixJQUFJLEVBQ0osSUFBSSx1QkFBdUIsQ0FBQyxJQUFJLG1CQUFtQixFQUFFLENBQUMsQ0FDdkQsQ0FBQztJQUVGLE1BQU0sUUFBUSxHQUFHLEtBQUssSUFBSSxFQUFFO1FBQzFCLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3RCLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEIsQ0FBQyxDQUFDO0lBQ0YsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDakMsT0FBTyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDcEMsQ0FBQztBQUVELGlFQUFpRTtBQUNqRSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssYUFBYSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDO0lBQ25GLG1FQUFtRTtJQUNuRSxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7UUFDakIsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "0.51.0",
+  "version": "0.52.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -58,15 +58,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.51.0",
-    "@aztec/circuits.js": "0.51.0",
-    "@aztec/ethereum": "0.51.0",
-    "@aztec/foundation": "0.51.0",
-    "@aztec/kv-store": "0.51.0",
-    "@aztec/l1-artifacts": "0.51.0",
-    "@aztec/protocol-contracts": "0.51.0",
-    "@aztec/telemetry-client": "0.51.0",
-    "@aztec/types": "0.51.0",
+    "@aztec/circuit-types": "0.52.0",
+    "@aztec/circuits.js": "0.52.0",
+    "@aztec/ethereum": "0.52.0",
+    "@aztec/foundation": "0.52.0",
+    "@aztec/kv-store": "0.52.0",
+    "@aztec/l1-artifacts": "0.52.0",
+    "@aztec/protocol-contracts": "0.52.0",
+    "@aztec/telemetry-client": "0.52.0",
+    "@aztec/types": "0.52.0",
     "debug": "^4.3.4",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",

package/src/archiver/archiver.ts

@@ -24,6 +24,7 @@ import {
 import { createEthereumChain } from '@aztec/ethereum';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { compactArray, unique } from '@aztec/foundation/collection';
 import { type EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
@@ -46,13 +47,15 @@ import { type Chain, type HttpTransport, type PublicClient, createPublicClient,
 import { type ArchiverDataStore } from './archiver_store.js';
 import { type ArchiverConfig } from './config.js';
 import {
-  type DataRetrieval,
   retrieveBlockBodiesFromAvailabilityOracle,
   retrieveBlockMetadataFromRollup,
   retrieveL1ToL2Messages,
   retrieveL2ProofVerifiedEvents,
 } from './data_retrieval.js';
+import { getL1BlockTime } from './eth_log_handlers.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
+import { type SingletonDataRetrieval } from './structs/data_retrieval.js';
+import { type L1Published } from './structs/published.js';
 
 /**
  * Helper interface to combine all sources this archiver implementation provides.
@@ -70,9 +73,6 @@ export class Archiver implements ArchiveSource {
    */
   private runningPromise?: RunningPromise;
 
-  /** Capture runtime metrics */
-  private instrumentation: ArchiverInstrumentation;
-
   /**
    * Creates a new instance of the Archiver.
    * @param publicClient - A client for interacting with the Ethereum node.
@@ -91,11 +91,9 @@ export class Archiver implements ArchiveSource {
     private readonly registryAddress: EthAddress,
     private readonly store: ArchiverDataStore,
     private readonly pollingIntervalMs = 10_000,
-    telemetry: TelemetryClient,
+    private readonly instrumentation: ArchiverInstrumentation,
     private readonly log: DebugLogger = createDebugLogger('aztec:archiver'),
-  ) {
-    this.instrumentation = new ArchiverInstrumentation(telemetry);
-  }
+  ) {}
 
   /**
    * Creates a new instance of the Archiver and blocks until it syncs from chain.
@@ -125,7 +123,7 @@ export class Archiver implements ArchiveSource {
       config.l1Contracts.registryAddress,
       archiverStore,
       config.archiverPollingIntervalMS,
-      telemetry,
+      new ArchiverInstrumentation(telemetry),
     );
     await archiver.start(blockUntilSynced);
     return archiver;
@@ -177,17 +175,25 @@ export class Archiver implements ArchiveSource {
      *
      * This code does not handle reorgs.
      */
-    const { blockBodiesSynchedTo, blocksSynchedTo, messagesSynchedTo } = await this.store.getSynchPoint();
+    const { blockBodiesSynchedTo, blocksSynchedTo, messagesSynchedTo, provenLogsSynchedTo } =
+      await this.store.getSynchPoint();
     const currentL1BlockNumber = await this.publicClient.getBlockNumber();
 
     if (
       currentL1BlockNumber <= blocksSynchedTo &&
       currentL1BlockNumber <= messagesSynchedTo &&
-      currentL1BlockNumber <= blockBodiesSynchedTo
+      currentL1BlockNumber <= blockBodiesSynchedTo &&
+      currentL1BlockNumber <= provenLogsSynchedTo
     ) {
       // chain hasn't moved forward
       // or it's been rolled back
-      this.log.debug(`Nothing to sync`, { currentL1BlockNumber, blocksSynchedTo, messagesSynchedTo });
+      this.log.debug(`Nothing to sync`, {
+        currentL1BlockNumber,
+        blocksSynchedTo,
+        messagesSynchedTo,
+        provenLogsSynchedTo,
+        blockBodiesSynchedTo,
+      });
       return;
     }
 
@@ -249,9 +255,9 @@ export class Archiver implements ArchiveSource {
     );
     await this.store.addBlockBodies(retrievedBlockBodies);
 
-    // Now that we have block bodies we will retrieve block metadata and build L2 blocks from the bodies and
-    // the metadata
-    let retrievedBlocks: DataRetrieval<L2Block>;
+    // Now that we have block bodies we will retrieve block metadata and build L2 blocks from the bodies and the metadata
+    let retrievedBlocks: L1Published<L2Block>[];
+    let lastProcessedL1BlockNumber: bigint;
     {
       // @todo @LHerskind Investigate how necessary that nextExpectedL2BlockNum really is.
       //                  Also, I would expect it to break horribly if we have a reorg.
@@ -265,9 +271,7 @@ export class Archiver implements ArchiveSource {
         nextExpectedL2BlockNum,
       );
 
-      const retrievedBodyHashes = retrievedBlockMetadata.retrievedData.map(
-        ([header]) => header.contentCommitment.txsEffectsHash,
-      );
+      const retrievedBodyHashes = retrievedBlockMetadata.map(([header]) => header.contentCommitment.txsEffectsHash);
 
       // @note @LHerskind   We will occasionally be hitting this point BEFORE, we have actually retrieved the bodies.
       //                    The main reason this have not been an issue earlier is because:
@@ -276,16 +280,16 @@ export class Archiver implements ArchiveSource {
       //                    ii) We have been lucky that latency have been small enough to not matter.
       const blockBodiesFromStore = await this.store.getBlockBodies(retrievedBodyHashes);
 
-      if (retrievedBlockMetadata.retrievedData.length !== blockBodiesFromStore.length) {
+      if (retrievedBlockMetadata.length !== blockBodiesFromStore.length) {
         this.log.warn('Block headers length does not equal block bodies length');
       }
 
-      const blocks: L2Block[] = [];
-      for (let i = 0; i < retrievedBlockMetadata.retrievedData.length; i++) {
-        const [header, archive] = retrievedBlockMetadata.retrievedData[i];
+      const blocks: L1Published<L2Block>[] = [];
+      for (let i = 0; i < retrievedBlockMetadata.length; i++) {
+        const [header, archive, l1] = retrievedBlockMetadata[i];
         const blockBody = blockBodiesFromStore[i];
         if (blockBody) {
-          blocks.push(new L2Block(archive, header, blockBody));
+          blocks.push({ data: new L2Block(archive, header, blockBody), l1 });
         } else {
           this.log.warn(`Block body not found for block ${header.globalVariables.blockNumber.toBigInt()}.`);
         }
@@ -297,62 +301,63 @@ export class Archiver implements ArchiveSource {
         } and ${currentL1BlockNumber}.`,
       );
 
-      retrievedBlocks = {
-        lastProcessedL1BlockNumber: retrievedBlockMetadata.lastProcessedL1BlockNumber,
-        retrievedData: blocks,
-      };
+      retrievedBlocks = blocks;
+      lastProcessedL1BlockNumber =
+        retrievedBlockMetadata.length > 0
+          ? retrievedBlockMetadata[retrievedBlockMetadata.length - 1][2].blockNumber
+          : blocksSynchedTo;
     }
 
     this.log.debug(
-      `Processing retrieved blocks ${retrievedBlocks.retrievedData
-        .map(b => b.number)
-        .join(',')} with last processed L1 block ${retrievedBlocks.lastProcessedL1BlockNumber}`,
+      `Processing retrieved blocks ${retrievedBlocks
+        .map(b => b.data.number)
+        .join(',')} with last processed L1 block ${lastProcessedL1BlockNumber}`,
     );
 
     await Promise.all(
-      retrievedBlocks.retrievedData.map(block => {
-        const noteEncryptedLogs = block.body.noteEncryptedLogs;
-        const encryptedLogs = block.body.encryptedLogs;
-        const unencryptedLogs = block.body.unencryptedLogs;
-        return this.store.addLogs(noteEncryptedLogs, encryptedLogs, unencryptedLogs, block.number);
+      retrievedBlocks.map(block => {
+        const noteEncryptedLogs = block.data.body.noteEncryptedLogs;
+        const encryptedLogs = block.data.body.encryptedLogs;
+        const unencryptedLogs = block.data.body.unencryptedLogs;
+        return this.store.addLogs(noteEncryptedLogs, encryptedLogs, unencryptedLogs, block.data.number);
       }),
     );
 
     // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
     await Promise.all(
-      retrievedBlocks.retrievedData.map(async block => {
-        const blockLogs = block.body.txEffects
+      retrievedBlocks.map(async block => {
+        const blockLogs = block.data.body.txEffects
           .flatMap(txEffect => (txEffect ? [txEffect.unencryptedLogs] : []))
           .flatMap(txLog => txLog.unrollLogs());
-        await this.storeRegisteredContractClasses(blockLogs, block.number);
-        await this.storeDeployedContractInstances(blockLogs, block.number);
-        await this.storeBroadcastedIndividualFunctions(blockLogs, block.number);
+        await this.storeRegisteredContractClasses(blockLogs, block.data.number);
+        await this.storeDeployedContractInstances(blockLogs, block.data.number);
+        await this.storeBroadcastedIndividualFunctions(blockLogs, block.data.number);
       }),
     );
 
-    if (retrievedBlocks.retrievedData.length > 0) {
+    if (retrievedBlocks.length > 0) {
       const timer = new Timer();
       await this.store.addBlocks(retrievedBlocks);
       this.instrumentation.processNewBlocks(
-        timer.ms() / retrievedBlocks.retrievedData.length,
-        retrievedBlocks.retrievedData,
+        timer.ms() / retrievedBlocks.length,
+        retrievedBlocks.map(b => b.data),
       );
-      const lastL2BlockNumber = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
-      this.log.verbose(`Processed ${retrievedBlocks.retrievedData.length} new L2 blocks up to ${lastL2BlockNumber}`);
+      const lastL2BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].data.number;
+      this.log.verbose(`Processed ${retrievedBlocks.length} new L2 blocks up to ${lastL2BlockNumber}`);
     }
 
     // Fetch the logs for proven blocks in the block range and update the last proven block number.
-    // Note it's ok to read repeated data here, since we're just using the largest number we see on the logs.
-    await this.updateLastProvenL2Block(blocksSynchedTo, currentL1BlockNumber);
+    if (currentL1BlockNumber > provenLogsSynchedTo) {
+      await this.updateLastProvenL2Block(provenLogsSynchedTo + 1n, currentL1BlockNumber);
+    }
 
-    if (retrievedBlocks.retrievedData.length > 0 || blockUntilSynced) {
+    if (retrievedBlocks.length > 0 || blockUntilSynced) {
       (blockUntilSynced ? this.log.info : this.log.verbose)(`Synced to L1 block ${currentL1BlockNumber}`);
     }
   }
 
   private async updateLastProvenL2Block(fromBlock: bigint, toBlock: bigint) {
     const logs = await retrieveL2ProofVerifiedEvents(this.publicClient, this.rollupAddress, fromBlock, toBlock);
-
     const lastLog = logs[logs.length - 1];
     if (!lastLog) {
       return;
@@ -363,14 +368,71 @@ export class Archiver implements ArchiveSource {
       throw new Error(`Missing argument blockNumber from L2ProofVerified event`);
     }
 
+    await this.emitProofVerifiedMetrics(logs);
+
     const currentProvenBlockNumber = await this.store.getProvenL2BlockNumber();
     if (provenBlockNumber > currentProvenBlockNumber) {
+      // Update the last proven block number
       this.log.verbose(`Updated last proven block number from ${currentProvenBlockNumber} to ${provenBlockNumber}`);
-      await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
+      await this.store.setProvenL2BlockNumber({
+        retrievedData: Number(provenBlockNumber),
+        lastProcessedL1BlockNumber: lastLog.l1BlockNumber,
+      });
       this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
+    } else {
+      // We set the last processed L1 block number to the last L1 block number in the range to avoid duplicate processing
+      await this.store.setProvenL2BlockNumber({
+        retrievedData: Number(currentProvenBlockNumber),
+        lastProcessedL1BlockNumber: lastLog.l1BlockNumber,
+      });
     }
   }
 
+  /**
+   * Emits as metrics the block number proven, who proved it, and how much time passed since it was submitted.
+   * @param logs - The ProofVerified logs to emit metrics for, as collected from `retrieveL2ProofVerifiedEvents`.
+   **/
+  private async emitProofVerifiedMetrics(logs: { l1BlockNumber: bigint; l2BlockNumber: bigint; proverId: Fr }[]) {
+    if (!logs.length || !this.instrumentation.isEnabled()) {
+      return;
+    }
+
+    const l1BlockTimes = new Map(
+      await Promise.all(
+        unique(logs.map(log => log.l1BlockNumber)).map(
+          async blockNumber => [blockNumber, await getL1BlockTime(this.publicClient, blockNumber)] as const,
+        ),
+      ),
+    );
+
+    // Collect L2 block times for all the blocks verified, this is the time in which the block proven was
+    // originally submitted to L1, using the L1 timestamp of the transaction.
+    const getL2BlockTime = async (blockNumber: bigint) =>
+      (await this.store.getBlocks(Number(blockNumber), 1))[0]?.l1.timestamp;
+
+    const l2BlockTimes = new Map(
+      await Promise.all(
+        unique(logs.map(log => log.l2BlockNumber)).map(
+          async blockNumber => [blockNumber, await getL2BlockTime(blockNumber)] as const,
+        ),
+      ),
+    );
+
+    // Emit the prover id and the time difference between block submission and proof.
+    this.instrumentation.processProofsVerified(
+      compactArray(
+        logs.map(log => {
+          const l1BlockTime = l1BlockTimes.get(log.l1BlockNumber)!;
+          const l2BlockTime = l2BlockTimes.get(log.l2BlockNumber);
+          if (!l2BlockTime) {
+            return undefined;
+          }
+          return { ...log, delay: l1BlockTime - l2BlockTime, proverId: log.proverId.toString() };
+        }),
+      ),
+    );
+  }
+
   /**
    * Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
@@ -469,7 +531,7 @@ export class Archiver implements ArchiveSource {
     const limitWithProven = proven
       ? Math.min(limit, Math.max((await this.store.getProvenL2BlockNumber()) - from + 1, 0))
       : limit;
-    return limitWithProven === 0 ? [] : this.store.getBlocks(from, limitWithProven);
+    return limitWithProven === 0 ? [] : (await this.store.getBlocks(from, limitWithProven)).map(b => b.data);
   }
 
   /**
@@ -483,7 +545,7 @@ export class Archiver implements ArchiveSource {
       number = await this.store.getSynchedL2BlockNumber();
     }
     const blocks = await this.store.getBlocks(number, 1);
-    return blocks.length === 0 ? undefined : blocks[0];
+    return blocks.length === 0 ? undefined : blocks[0].data;
   }
 
   public getTxEffect(txHash: TxHash): Promise<TxEffect | undefined> {
@@ -552,7 +614,7 @@ export class Archiver implements ArchiveSource {
   }
 
   /** Forcefully updates the last proven block number. Use for testing. */
-  public setProvenBlockNumber(block: number): Promise<void> {
+  public setProvenBlockNumber(block: SingletonDataRetrieval<number>): Promise<void> {
     return this.store.setProvenL2BlockNumber(block);
   }
 

package/src/archiver/archiver_store.ts

@@ -24,7 +24,8 @@ import {
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/types/contracts';
 
-import { type DataRetrieval } from './data_retrieval.js';
+import { type DataRetrieval, type SingletonDataRetrieval } from './structs/data_retrieval.js';
+import { type L1Published } from './structs/published.js';
 
 /**
  * Represents the latest L1 block processed by the archiver for various objects in L2.
@@ -36,6 +37,8 @@ export type ArchiverL1SynchPoint = {
   blockBodiesSynchedTo: bigint;
   /** Number of the last L1 block that added L1 -> L2 messages from the Inbox. */
   messagesSynchedTo: bigint;
+  /** Number of the last L1 block that added a new proven block. */
+  provenLogsSynchedTo: bigint;
 };
 
 /**
@@ -48,7 +51,7 @@ export interface ArchiverDataStore {
    * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
    * @returns True if the operation is successful.
    */
-  addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean>;
+  addBlocks(blocks: L1Published<L2Block>[]): Promise<boolean>;
 
   /**
    * Append new block bodies to the store's list.
@@ -71,7 +74,7 @@ export interface ArchiverDataStore {
    * @param limit - The number of blocks to return.
    * @returns The requested L2 blocks.
    */
-  getBlocks(from: number, limit: number): Promise<L2Block[]>;
+  getBlocks(from: number, limit: number): Promise<L1Published<L2Block>[]>;
 
   /**
    * Gets a tx effect.
@@ -160,7 +163,7 @@ export interface ArchiverDataStore {
    * Stores the number of the latest proven L2 block processed.
    * @param l2BlockNumber - The number of the latest proven L2 block processed.
    */
-  setProvenL2BlockNumber(l2BlockNumber: number): Promise<void>;
+  setProvenL2BlockNumber(l2BlockNumber: SingletonDataRetrieval<number>): Promise<void>;
 
   /**
    * Gets the synch point of the archiver