@aztec/node-lib 0.0.1-commit.e588bc7e5 → 0.0.1-commit.e5a3663dd

package/dest/actions/snapshot-sync.d.ts

@@ -4,6 +4,7 @@ import type { L1ContractsConfig } from '@aztec/ethereum/config';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { Logger } from '@aztec/foundation/log';
 import type { ChainConfig } from '@aztec/stdlib/config';
+import { type ReadOnlyFileStore } from '@aztec/stdlib/file-store';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
 import type { SharedNodeConfig } from '../config/index.js';
@@ -22,7 +23,7 @@ export declare function trySnapshotSync(config: SnapshotSyncConfig, log: Logger)
 export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'>, log: Logger, config: {
     dataDirectory: string;
     rollupAddress: EthAddress;
-    snapshotsUrl: string;
+    fileStore: ReadOnlyFileStore;
 }): Promise<void>;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHeEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0seUJBQXlCLENBQUM7QUFNakMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUszRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsR0FDMUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQ2hELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxvQkFBb0IsQ0FBQyxHQUM3QyxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxlQUFlLEdBQ2YsUUFBUSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsYUFBYSxDQUFDLENBQUMsR0FDOUMsb0JBQW9CLEdBQUc7SUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDekIsMkJBQTJCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDdEMsQ0FBQztBQUVKOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQUMsTUFBTSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQXFLNUU7QUFFRDs7R0FFRztBQUNILHdCQUFzQixZQUFZLENBQ2hDLFFBQVEsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEVBQzVDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsTUFBTSxFQUFFO0lBQUUsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUFDLGFBQWEsRUFBRSxVQUFVLENBQUM7SUFBQyxZQUFZLEVBQUUsTUFBTSxDQUFBO0NBQUUsaUJBcURuRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxjQUFjLEVBR3BCLE1BQU0saUJBQWlCLENBQUM7QUFFekIsT0FBTyxFQUFFLEtBQUssb0JBQW9CLEVBQW1CLE1BQU0sd0JBQXdCLENBQUM7QUFDcEYsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV4RCxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBMkIsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFLdEIsTUFBTSx5QkFBeUIsQ0FBQztBQU1qQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzNELEtBQUssa0JBQWtCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxHQUMxRCxJQUFJLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxlQUFlLENBQUMsR0FDaEQsSUFBSSxDQUFDLGlCQUFpQixFQUFFLG9CQUFvQixDQUFDLEdBQzdDLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLEdBQUcsU0FBUyxDQUFDLEdBQzFELGVBQWUsR0FDZixRQUFRLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxhQUFhLENBQUMsQ0FBQyxHQUM5QyxvQkFBb0IsR0FBRztJQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUN6QiwyQkFBMkIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN0QyxDQUFDO0FBRUo7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBcUs1RTtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLFlBQVksQ0FDaEMsUUFBUSxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsRUFDNUMsR0FBRyxFQUFFLE1BQU0sRUFDWCxNQUFNLEVBQUU7SUFBRSxhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQUMsYUFBYSxFQUFFLFVBQVUsQ0FBQztJQUFDLFNBQVMsRUFBRSxpQkFBaUIsQ0FBQTtDQUFFLGlCQW1EM0YifQ==

package/dest/actions/snapshot-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4C,KAAK,cAAc,EAAuB,MAAM,iBAAiB,CAAC;AAErH,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,GAC9C,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAqK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,iBAqDnF"}
+{"version":3,"file":"snapshot-sync.d.ts","sourceRoot":"","sources":["../../src/actions/snapshot-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AACpF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,KAAK,iBAAiB,EAA2B,MAAM,0BAA0B,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EACL,KAAK,gBAAgB,EAKtB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAK3D,KAAK,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,GAC1D,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAC7C,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,eAAe,GACf,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,GAC9C,oBAAoB,GAAG;IACrB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,2BAA2B,CAAC,EAAE,MAAM,CAAC;CACtC,CAAC;AAEJ;;;GAGG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,oBAqK5E;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC5C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,UAAU,CAAC;IAAC,SAAS,EAAE,iBAAiB,CAAA;CAAE,iBAmD3F"}

package/dest/actions/snapshot-sync.js

@@ -1,4 +1,4 @@
-import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore } from '@aztec/archiver';
+import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, createArchiverStore, getArchiverSynchPoint } from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { getPublicClient } from '@aztec/ethereum/client';
 import { tryRmDir } from '@aztec/foundation/fs';
@@ -37,15 +37,15 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
     let archiverL2BlockNumber;
     try {
         [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
-            archiverStore.getSynchPoint().then((s)=>s.blocksSynchedTo),
-            archiverStore.getLatestBlockNumber()
+            getArchiverSynchPoint(archiverStore).then((s)=>s.blocksSynchedTo),
+            archiverStore.blocks.getLatestL2BlockNumber()
         ]);
     } finally{
         log.verbose(`Closing temporary archiver data store`, {
             archiverL1BlockNumber,
             archiverL2BlockNumber
         });
-        await archiverStore.close();
+        await archiverStore.db.close();
     }
     const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
     if (syncMode === 'snapshot' && archiverL2BlockNumber !== undefined && archiverL2BlockNumber >= INITIAL_L2_BLOCK_NUM) {
@@ -132,7 +132,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
     // Sort candidates by L1 block number (highest first)
     snapshotCandidates.sort((a, b)=>b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
     // Try each candidate in order until one succeeds
-    for (const { snapshot, url } of snapshotCandidates){
+    for (const { snapshot, url, fileStore } of snapshotCandidates){
         const { l1BlockNumber, l2BlockNumber } = snapshot;
         log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
             snapshot,
@@ -142,7 +142,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
             await snapshotSync(snapshot, log, {
                 dataDirectory: config.dataDirectory,
                 rollupAddress: config.l1Contracts.rollupAddress,
-                snapshotsUrl: url
+                fileStore
             });
             log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
                 snapshot,
@@ -165,11 +165,10 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
 /**
  * Downloads the given snapshot replacing any local data stores.
  */ export async function snapshotSync(snapshot, log, config) {
-    const { dataDirectory, rollupAddress } = config;
+    const { dataDirectory, rollupAddress, fileStore } = config;
     if (!dataDirectory) {
         throw new Error(`No local data directory defined. Cannot sync snapshot.`);
     }
-    const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
     let downloadDir;
     try {
         // Download the snapshot to a temp location.

package/dest/metrics/l1_tx_metrics.d.ts

@@ -26,4 +26,4 @@ export declare class L1TxMetrics implements IL1TxMetrics {
     recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
     recordDroppedTx(state: L1TxState): void;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQXNEOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=

package/dest/metrics/l1_tx_metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAGL,KAAK,KAAK,EAIX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAmB5C,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,eAAe,CAAY;IAGnC,OAAO,CAAC,oBAAoB,CAAY;IAGxC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IAGvC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,gBAAgB,CAAY;IAEpC,YACU,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC,EAoBrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAoD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}
+{"version":3,"file":"l1_tx_metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/l1_tx_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG3E,OAAO,EAGL,KAAK,KAAK,EAIX,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEzD;;GAEG;AACH,qBAAa,WAAY,YAAW,YAAY;IAmB5C,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAnBhB,OAAO,CAAC,eAAe,CAAY;IAGnC,OAAO,CAAC,oBAAoB,CAAY;IAGxC,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,eAAe,CAAgB;IACvC,OAAO,CAAC,gBAAgB,CAAgB;IACxC,OAAO,CAAC,eAAe,CAAgB;IAGvC,OAAO,CAAC,uBAAuB,CAAY;IAC3C,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,gBAAgB,CAAY;IAEpC,YACU,KAAK,EAAE,KAAK,EACZ,KAAK,GAAE,SAAmB,EAC1B,MAAM,yCAAsC,EAoBrD;IAED;;;;OAIG;IACI,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAsD9D;IAEM,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAiB7C;CACF"}

package/dest/metrics/l1_tx_metrics.js

@@ -69,15 +69,15 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/tele
         // Record number of attempts until mined
         const attempts = isCancelTx ? state.cancelTxHashes.length : state.txHashes.length;
         this.txAttemptsUntilMined.record(attempts, attributes);
-        // Record gas prices at end state (in wei as integers)
-        const maxPriorityFeeWei = Number(state.gasPrice.maxPriorityFeePerGas);
-        const maxFeeWei = Number(state.gasPrice.maxFeePerGas);
-        const blobFeeWei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) : undefined;
-        this.maxPriorityFeeHistogram.record(maxPriorityFeeWei, attributes);
-        this.maxFeeHistogram.record(maxFeeWei, attributes);
-        // Record blob fee if present (in wei as integer)
-        if (blobFeeWei !== undefined) {
-            this.blobFeeHistogram.record(blobFeeWei, attributes);
+        // Record gas prices at end state, converted from wei to gwei to match metric unit definitions
+        const weiToGwei = 1e9;
+        const maxPriorityFeeGwei = Number(state.gasPrice.maxPriorityFeePerGas) / weiToGwei;
+        const maxFeeGwei = Number(state.gasPrice.maxFeePerGas) / weiToGwei;
+        const blobFeeGwei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) / weiToGwei : undefined;
+        this.maxPriorityFeeHistogram.record(maxPriorityFeeGwei, attributes);
+        this.maxFeeHistogram.record(maxFeeGwei, attributes);
+        if (blobFeeGwei !== undefined) {
+            this.blobFeeHistogram.record(blobFeeGwei, attributes);
         }
         this.logger.debug(`Recorded tx end state metrics`, {
             status: TxUtilsState[state.status],
@@ -85,9 +85,9 @@ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/tele
             isCancelTx,
             isReverted,
             scope: this.scope,
-            maxPriorityFeeWei,
-            maxFeeWei,
-            blobFeeWei
+            maxPriorityFeeGwei,
+            maxFeeGwei,
+            blobFeeGwei
         });
     }
     recordDroppedTx(state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/node-lib",
-  "version": "0.0.1-commit.e588bc7e5",
+  "version": "0.0.1-commit.e5a3663dd",
   "type": "module",
   "typedocOptions": {
     "entryPoints": [
@@ -66,28 +66,28 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.e588bc7e5",
-    "@aztec/bb-prover": "0.0.1-commit.e588bc7e5",
-    "@aztec/blob-client": "0.0.1-commit.e588bc7e5",
-    "@aztec/constants": "0.0.1-commit.e588bc7e5",
-    "@aztec/epoch-cache": "0.0.1-commit.e588bc7e5",
-    "@aztec/ethereum": "0.0.1-commit.e588bc7e5",
-    "@aztec/foundation": "0.0.1-commit.e588bc7e5",
-    "@aztec/kv-store": "0.0.1-commit.e588bc7e5",
-    "@aztec/p2p": "0.0.1-commit.e588bc7e5",
-    "@aztec/protocol-contracts": "0.0.1-commit.e588bc7e5",
-    "@aztec/prover-client": "0.0.1-commit.e588bc7e5",
-    "@aztec/sequencer-client": "0.0.1-commit.e588bc7e5",
-    "@aztec/simulator": "0.0.1-commit.e588bc7e5",
-    "@aztec/stdlib": "0.0.1-commit.e588bc7e5",
-    "@aztec/telemetry-client": "0.0.1-commit.e588bc7e5",
-    "@aztec/validator-client": "0.0.1-commit.e588bc7e5",
-    "@aztec/world-state": "0.0.1-commit.e588bc7e5",
+    "@aztec/archiver": "0.0.1-commit.e5a3663dd",
+    "@aztec/bb-prover": "0.0.1-commit.e5a3663dd",
+    "@aztec/blob-client": "0.0.1-commit.e5a3663dd",
+    "@aztec/constants": "0.0.1-commit.e5a3663dd",
+    "@aztec/epoch-cache": "0.0.1-commit.e5a3663dd",
+    "@aztec/ethereum": "0.0.1-commit.e5a3663dd",
+    "@aztec/foundation": "0.0.1-commit.e5a3663dd",
+    "@aztec/kv-store": "0.0.1-commit.e5a3663dd",
+    "@aztec/p2p": "0.0.1-commit.e5a3663dd",
+    "@aztec/protocol-contracts": "0.0.1-commit.e5a3663dd",
+    "@aztec/prover-client": "0.0.1-commit.e5a3663dd",
+    "@aztec/sequencer-client": "0.0.1-commit.e5a3663dd",
+    "@aztec/simulator": "0.0.1-commit.e5a3663dd",
+    "@aztec/stdlib": "0.0.1-commit.e5a3663dd",
+    "@aztec/telemetry-client": "0.0.1-commit.e5a3663dd",
+    "@aztec/validator-client": "0.0.1-commit.e5a3663dd",
+    "@aztec/world-state": "0.0.1-commit.e5a3663dd",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@aztec/blob-lib": "0.0.1-commit.e588bc7e5",
-    "@aztec/node-keystore": "0.0.1-commit.e588bc7e5",
+    "@aztec/blob-lib": "0.0.1-commit.e5a3663dd",
+    "@aztec/node-keystore": "0.0.1-commit.e5a3663dd",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",

package/src/actions/snapshot-sync.ts

@@ -1,4 +1,10 @@
-import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
+import {
+  ARCHIVER_DB_VERSION,
+  ARCHIVER_STORE_NAME,
+  type ArchiverConfig,
+  createArchiverStore,
+  getArchiverSynchPoint,
+} from '@aztec/archiver';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
 import type { L1ContractsConfig } from '@aztec/ethereum/config';
@@ -66,12 +72,12 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   let archiverL2BlockNumber: number | undefined;
   try {
     [archiverL1BlockNumber, archiverL2BlockNumber] = await Promise.all([
-      archiverStore.getSynchPoint().then(s => s.blocksSynchedTo),
-      archiverStore.getLatestBlockNumber(),
+      getArchiverSynchPoint(archiverStore).then(s => s.blocksSynchedTo),
+      archiverStore.blocks.getLatestL2BlockNumber(),
     ] as const);
   } finally {
     log.verbose(`Closing temporary archiver data store`, { archiverL1BlockNumber, archiverL2BlockNumber });
-    await archiverStore.close();
+    await archiverStore.db.close();
   }
 
   const minL1BlocksToTriggerReplace = config.minL1BlocksToTriggerReplace ?? MIN_L1_BLOCKS_TO_TRIGGER_REPLACE;
@@ -178,7 +184,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
   snapshotCandidates.sort((a, b) => b.snapshot.l1BlockNumber - a.snapshot.l1BlockNumber);
 
   // Try each candidate in order until one succeeds
-  for (const { snapshot, url } of snapshotCandidates) {
+  for (const { snapshot, url, fileStore } of snapshotCandidates) {
     const { l1BlockNumber, l2BlockNumber } = snapshot;
     log.info(`Attempting to sync from snapshot at L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
       snapshot,
@@ -189,7 +195,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
       await snapshotSync(snapshot, log, {
         dataDirectory: config.dataDirectory!,
         rollupAddress: config.l1Contracts.rollupAddress,
-        snapshotsUrl: url,
+        fileStore,
       });
       log.info(`Snapshot synced to L1 block ${l1BlockNumber} L2 block ${l2BlockNumber}`, {
         snapshot,
@@ -215,15 +221,13 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
 export async function snapshotSync(
   snapshot: Pick<SnapshotMetadata, 'dataUrls'>,
   log: Logger,
-  config: { dataDirectory: string; rollupAddress: EthAddress; snapshotsUrl: string },
+  config: { dataDirectory: string; rollupAddress: EthAddress; fileStore: ReadOnlyFileStore },
 ) {
-  const { dataDirectory, rollupAddress } = config;
+  const { dataDirectory, rollupAddress, fileStore } = config;
   if (!dataDirectory) {
     throw new Error(`No local data directory defined. Cannot sync snapshot.`);
   }
 
-  const fileStore = await createReadOnlyFileStore(config.snapshotsUrl, log);
-
   let downloadDir: string | undefined;
 
   try {

package/src/metrics/l1_tx_metrics.ts

@@ -92,17 +92,19 @@ export class L1TxMetrics implements IL1TxMetrics {
     const attempts = isCancelTx ? state.cancelTxHashes.length : state.txHashes.length;
     this.txAttemptsUntilMined.record(attempts, attributes);
 
-    // Record gas prices at end state (in wei as integers)
-    const maxPriorityFeeWei = Number(state.gasPrice.maxPriorityFeePerGas);
-    const maxFeeWei = Number(state.gasPrice.maxFeePerGas);
-    const blobFeeWei = state.gasPrice.maxFeePerBlobGas ? Number(state.gasPrice.maxFeePerBlobGas) : undefined;
-
-    this.maxPriorityFeeHistogram.record(maxPriorityFeeWei, attributes);
-    this.maxFeeHistogram.record(maxFeeWei, attributes);
-
-    // Record blob fee if present (in wei as integer)
-    if (blobFeeWei !== undefined) {
-      this.blobFeeHistogram.record(blobFeeWei, attributes);
+    // Record gas prices at end state, converted from wei to gwei to match metric unit definitions
+    const weiToGwei = 1e9;
+    const maxPriorityFeeGwei = Number(state.gasPrice.maxPriorityFeePerGas) / weiToGwei;
+    const maxFeeGwei = Number(state.gasPrice.maxFeePerGas) / weiToGwei;
+    const blobFeeGwei = state.gasPrice.maxFeePerBlobGas
+      ? Number(state.gasPrice.maxFeePerBlobGas) / weiToGwei
+      : undefined;
+
+    this.maxPriorityFeeHistogram.record(maxPriorityFeeGwei, attributes);
+    this.maxFeeHistogram.record(maxFeeGwei, attributes);
+
+    if (blobFeeGwei !== undefined) {
+      this.blobFeeHistogram.record(blobFeeGwei, attributes);
     }
 
     this.logger.debug(`Recorded tx end state metrics`, {
@@ -111,9 +113,9 @@ export class L1TxMetrics implements IL1TxMetrics {
       isCancelTx,
       isReverted,
       scope: this.scope,
-      maxPriorityFeeWei,
-      maxFeeWei,
-      blobFeeWei,
+      maxPriorityFeeGwei,
+      maxFeeGwei,
+      blobFeeGwei,
     });
   }