@aztec/node-lib 0.0.1-commit.d431d1c → 0.0.1-commit.e310a4c8

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.
Files changed (11) hide show
  1. package/dest/actions/snapshot-sync.d.ts +3 -2
  2. package/dest/actions/snapshot-sync.d.ts.map +1 -1
  3. package/dest/actions/snapshot-sync.js +4 -2
  4. package/dest/factories/l1_tx_utils.js +1 -1
  5. package/dest/metrics/l1_tx_metrics.d.ts +1 -1
  6. package/dest/metrics/l1_tx_metrics.d.ts.map +1 -1
  7. package/dest/metrics/l1_tx_metrics.js +10 -5
  8. package/package.json +21 -21
  9. package/src/actions/snapshot-sync.ts +4 -2
  10. package/src/factories/l1_tx_utils.ts +1 -1
  11. package/src/metrics/l1_tx_metrics.ts +13 -5
package/dest/actions/snapshot-sync.d.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import { type ArchiverConfig } from '@aztec/archiver';
2
2
  import { type EthereumClientConfig } from '@aztec/ethereum/client';
3
+ import type { L1ContractsConfig } from '@aztec/ethereum/config';
3
4
  import type { EthAddress } from '@aztec/foundation/eth-address';
4
5
  import type { Logger } from '@aztec/foundation/log';
5
6
  import type { DataStoreConfig } from '@aztec/kv-store/config';
6
7
  import type { ChainConfig } from '@aztec/stdlib/config';
7
8
  import { type SnapshotMetadata } from '@aztec/stdlib/snapshots';
8
9
  import type { SharedNodeConfig } from '../config/index.js';
9
- type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
10
+ type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<L1ContractsConfig, 'aztecEpochDuration'> & Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & Required<DataStoreConfig> & EthereumClientConfig & {
10
11
  snapshotsUrls?: string[];
11
12
  minL1BlocksToTriggerReplace?: number;
12
13
  };
@@ -24,4 +25,4 @@ export declare function snapshotSync(snapshot: Pick<SnapshotMetadata, 'dataUrls'
24
25
  snapshotsUrl: string;
25
26
  }): Promise<void>;
26
27
  export {};
27
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBR3hELE9BQU8sRUFDTCxLQUFLLGdCQUFnQixFQUt0QixNQUFNLHlCQUF5QixDQUFDO0FBTWpDLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFLM0QsS0FBSyxrQkFBa0IsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsVUFBVSxDQUFDLEdBQzFELElBQUksQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLGVBQWUsQ0FBQyxHQUNoRCxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFpSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic25hcHNob3Qtc3luYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FjdGlvbnMvc25hcHNob3Qtc3luYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRDLEtBQUssY0FBYyxFQUF1QixNQUFNLGlCQUFpQixDQUFDO0FBRXJILE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFtQixNQUFNLHdCQUF3QixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHeEQsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBS3RCLE1BQU0seUJBQXlCLENBQUM7QUFNakMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUszRCxLQUFLLGtCQUFrQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxVQUFVLENBQUMsR0FDMUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsZUFBZSxDQUFDLEdBQ2hELElBQUksQ0FBQyxpQkFBaUIsRUFBRSxvQkFBb0IsQ0FBQyxHQUM3QyxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUMxRCxRQUFRLENBQUMsZUFBZSxDQUFDLEdBQ3pCLG9CQUFvQixHQUFHO0lBQ3JCLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3pCLDJCQUEyQixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3RDLENBQUM7QUFFSjs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxvQkFpSzVFO0FBRUQ7O0dBRUc7QUFDSCx3QkFBc0IsWUFBWSxDQUNoQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLFVBQVUsQ0FBQyxFQUM1QyxHQUFHLEVBQUUsTUFBTSxFQUNYLE1BQU0sRUFBRTtJQUFFLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFBQyxhQUFhLEVBQUUsVUFBVSxDQUFDO0lBQUMsWUFBWSxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQXFEbkYifQ==
package/dest/actions/snapshot-sync.d.ts.map CHANGED
@@ -1 +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,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,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,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAC1D,QAAQ,CAAC,eAAe,CAAC,GACzB,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,oBAiK5E;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"}
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;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,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,QAAQ,CAAC,eAAe,CAAC,GACzB,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,oBAiK5E;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"}
package/dest/actions/snapshot-sync.js CHANGED
@@ -3,7 +3,7 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
3
3
  import { getPublicClient } from '@aztec/ethereum/client';
4
4
  import { tryRmDir } from '@aztec/foundation/fs';
5
5
  import { P2P_STORE_NAME } from '@aztec/p2p';
6
- import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
6
+ import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
7
7
  import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
8
8
  import { downloadSnapshot, getLatestSnapshotMetadata, makeSnapshotPaths } from '@aztec/stdlib/snapshots';
9
9
  import { NATIVE_WORLD_STATE_DBS, WORLD_STATE_DB_VERSION, WORLD_STATE_DIR } from '@aztec/world-state';
@@ -32,7 +32,9 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
32
32
  }
33
33
  // Create an archiver store to check the current state (do this only once)
34
34
  log.verbose(`Creating temporary archiver data store`);
35
- const archiverStore = await createArchiverStore(config);
35
+ const archiverStore = await createArchiverStore(config, {
36
+ epochDuration: config.aztecEpochDuration
37
+ });
36
38
  let archiverL1BlockNumber;
37
39
  let archiverL2BlockNumber;
38
40
  try {
package/dest/factories/l1_tx_utils.js CHANGED
@@ -13,7 +13,7 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
13
13
  // Note that we do NOT bind them to the rollup address, since we still need to
14
14
  // monitor and cancel txs for previous rollups to free up our nonces.
15
15
  const noRollupConfig = omit(config, 'l1Contracts');
16
- const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger);
16
+ const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
17
17
  const store = new L1TxStore(kvStore, logger);
18
18
  const meter = deps.telemetry.getMeter('L1TxUtils');
19
19
  const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
package/dest/metrics/l1_tx_metrics.d.ts CHANGED
@@ -26,4 +26,4 @@ export declare class L1TxMetrics implements IL1TxMetrics {
26
26
  recordMinedTx(state: L1TxState, l1Timestamp: Date): void;
27
27
  recordDroppedTx(state: L1TxState): void;
28
28
  }
29
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUE4QixLQUFLLEtBQUssRUFBK0IsTUFBTSx5QkFBeUIsQ0FBQztBQUU5RyxNQUFNLE1BQU0sU0FBUyxHQUFHLFdBQVcsR0FBRyxRQUFRLEdBQUcsT0FBTyxDQUFDO0FBRXpEOztHQUVHO0FBQ0gscUJBQWEsV0FBWSxZQUFXLFlBQVk7SUFtQjVDLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsTUFBTTtJQW5CaEIsT0FBTyxDQUFDLGVBQWUsQ0FBWTtJQUduQyxPQUFPLENBQUMsb0JBQW9CLENBQVk7SUFHeEMsT0FBTyxDQUFDLFlBQVksQ0FBZ0I7SUFDcEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFDdkMsT0FBTyxDQUFDLGdCQUFnQixDQUFnQjtJQUN4QyxPQUFPLENBQUMsZUFBZSxDQUFnQjtJQUd2QyxPQUFPLENBQUMsdUJBQXVCLENBQVk7SUFDM0MsT0FBTyxDQUFDLGVBQWUsQ0FBWTtJQUNuQyxPQUFPLENBQUMsZ0JBQWdCLENBQVk7SUFFcEMsWUFDVSxLQUFLLEVBQUUsS0FBSyxFQUNaLEtBQUssR0FBRSxTQUFtQixFQUMxQixNQUFNLHlDQUFzQyxFQW1CckQ7SUFFRDs7OztPQUlHO0lBQ0ksYUFBYSxDQUFDLEtBQUssRUFBRSxTQUFTLEVBQUUsV0FBVyxFQUFFLElBQUksR0FBRyxJQUFJLENBb0Q5RDtJQUVNLGVBQWUsQ0FBQyxLQUFLLEVBQUUsU0FBUyxHQUFHLElBQUksQ0FpQjdDO0NBQ0YifQ==
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
package/dest/metrics/l1_tx_metrics.d.ts.map CHANGED
@@ -1 +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,EAA8B,KAAK,KAAK,EAA+B,MAAM,yBAAyB,CAAC;AAE9G,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,EAmBrD;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"}
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"}
package/dest/metrics/l1_tx_metrics.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { TxUtilsState } from '@aztec/ethereum/l1-tx-utils';
2
2
  import { createLogger } from '@aztec/foundation/log';
3
- import { Attributes, Metrics } from '@aztec/telemetry-client';
3
+ import { Attributes, Metrics, createUpDownCounterWithDefault } from '@aztec/telemetry-client';
4
4
  /**
5
5
  * Metrics for L1 transaction utils tracking tx lifecycle and gas costs.
6
6
  */ export class L1TxMetrics {
@@ -26,10 +26,15 @@ import { Attributes, Metrics } from '@aztec/telemetry-client';
26
26
  this.logger = logger;
27
27
  this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION);
28
28
  this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED);
29
- this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT);
30
- this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT);
31
- this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT);
32
- this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT);
29
+ const scopeAttributes = [
30
+ {
31
+ [Attributes.L1_TX_SCOPE]: this.scope
32
+ }
33
+ ];
34
+ this.txMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_MINED_COUNT, scopeAttributes);
35
+ this.txRevertedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_REVERTED_COUNT, scopeAttributes);
36
+ this.txCancelledCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_CANCELLED_COUNT, scopeAttributes);
37
+ this.txNotMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_NOT_MINED_COUNT, scopeAttributes);
33
38
  this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE);
34
39
  this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE);
35
40
  this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/node-lib",
3
- "version": "0.0.1-commit.d431d1c",
3
+ "version": "0.0.1-commit.e310a4c8",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./actions": "./dest/actions/index.js",
@@ -57,29 +57,29 @@
57
57
  ]
58
58
  },
59
59
  "dependencies": {
60
- "@aztec/archiver": "0.0.1-commit.d431d1c",
61
- "@aztec/bb-prover": "0.0.1-commit.d431d1c",
62
- "@aztec/blob-client": "0.0.1-commit.d431d1c",
63
- "@aztec/constants": "0.0.1-commit.d431d1c",
64
- "@aztec/epoch-cache": "0.0.1-commit.d431d1c",
65
- "@aztec/ethereum": "0.0.1-commit.d431d1c",
66
- "@aztec/foundation": "0.0.1-commit.d431d1c",
67
- "@aztec/kv-store": "0.0.1-commit.d431d1c",
68
- "@aztec/merkle-tree": "0.0.1-commit.d431d1c",
69
- "@aztec/p2p": "0.0.1-commit.d431d1c",
70
- "@aztec/protocol-contracts": "0.0.1-commit.d431d1c",
71
- "@aztec/prover-client": "0.0.1-commit.d431d1c",
72
- "@aztec/sequencer-client": "0.0.1-commit.d431d1c",
73
- "@aztec/simulator": "0.0.1-commit.d431d1c",
74
- "@aztec/stdlib": "0.0.1-commit.d431d1c",
75
- "@aztec/telemetry-client": "0.0.1-commit.d431d1c",
76
- "@aztec/validator-client": "0.0.1-commit.d431d1c",
77
- "@aztec/world-state": "0.0.1-commit.d431d1c",
60
+ "@aztec/archiver": "0.0.1-commit.e310a4c8",
61
+ "@aztec/bb-prover": "0.0.1-commit.e310a4c8",
62
+ "@aztec/blob-client": "0.0.1-commit.e310a4c8",
63
+ "@aztec/constants": "0.0.1-commit.e310a4c8",
64
+ "@aztec/epoch-cache": "0.0.1-commit.e310a4c8",
65
+ "@aztec/ethereum": "0.0.1-commit.e310a4c8",
66
+ "@aztec/foundation": "0.0.1-commit.e310a4c8",
67
+ "@aztec/kv-store": "0.0.1-commit.e310a4c8",
68
+ "@aztec/merkle-tree": "0.0.1-commit.e310a4c8",
69
+ "@aztec/p2p": "0.0.1-commit.e310a4c8",
70
+ "@aztec/protocol-contracts": "0.0.1-commit.e310a4c8",
71
+ "@aztec/prover-client": "0.0.1-commit.e310a4c8",
72
+ "@aztec/sequencer-client": "0.0.1-commit.e310a4c8",
73
+ "@aztec/simulator": "0.0.1-commit.e310a4c8",
74
+ "@aztec/stdlib": "0.0.1-commit.e310a4c8",
75
+ "@aztec/telemetry-client": "0.0.1-commit.e310a4c8",
76
+ "@aztec/validator-client": "0.0.1-commit.e310a4c8",
77
+ "@aztec/world-state": "0.0.1-commit.e310a4c8",
78
78
  "tslib": "^2.4.0"
79
79
  },
80
80
  "devDependencies": {
81
- "@aztec/blob-lib": "0.0.1-commit.d431d1c",
82
- "@aztec/node-keystore": "0.0.1-commit.d431d1c",
81
+ "@aztec/blob-lib": "0.0.1-commit.e310a4c8",
82
+ "@aztec/node-keystore": "0.0.1-commit.e310a4c8",
83
83
  "@jest/globals": "^30.0.0",
84
84
  "@types/jest": "^30.0.0",
85
85
  "@types/node": "^22.15.17",
package/src/actions/snapshot-sync.ts CHANGED
@@ -1,13 +1,14 @@
1
1
  import { ARCHIVER_DB_VERSION, ARCHIVER_STORE_NAME, type ArchiverConfig, createArchiverStore } from '@aztec/archiver';
2
2
  import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
3
3
  import { type EthereumClientConfig, getPublicClient } from '@aztec/ethereum/client';
4
+ import type { L1ContractsConfig } from '@aztec/ethereum/config';
4
5
  import type { EthAddress } from '@aztec/foundation/eth-address';
5
6
  import { tryRmDir } from '@aztec/foundation/fs';
6
7
  import type { Logger } from '@aztec/foundation/log';
7
8
  import type { DataStoreConfig } from '@aztec/kv-store/config';
8
9
  import { P2P_STORE_NAME } from '@aztec/p2p';
9
10
  import type { ChainConfig } from '@aztec/stdlib/config';
10
- import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
11
+ import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
11
12
  import { type ReadOnlyFileStore, createReadOnlyFileStore } from '@aztec/stdlib/file-store';
12
13
  import {
13
14
  type SnapshotMetadata,
@@ -28,6 +29,7 @@ const MIN_L1_BLOCKS_TO_TRIGGER_REPLACE = 86400 / 2 / 12;
28
29
 
29
30
  type SnapshotSyncConfig = Pick<SharedNodeConfig, 'syncMode'> &
30
31
  Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> &
32
+ Pick<L1ContractsConfig, 'aztecEpochDuration'> &
31
33
  Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> &
32
34
  Required<DataStoreConfig> &
33
35
  EthereumClientConfig & {
@@ -58,7 +60,7 @@ export async function trySnapshotSync(config: SnapshotSyncConfig, log: Logger) {
58
60
 
59
61
  // Create an archiver store to check the current state (do this only once)
60
62
  log.verbose(`Creating temporary archiver data store`);
61
- const archiverStore = await createArchiverStore(config);
63
+ const archiverStore = await createArchiverStore(config, { epochDuration: config.aztecEpochDuration });
62
64
  let archiverL1BlockNumber: bigint | undefined;
63
65
  let archiverL2BlockNumber: number | undefined;
64
66
  try {
package/src/factories/l1_tx_utils.ts CHANGED
@@ -40,7 +40,7 @@ async function createSharedDeps(
40
40
  // Note that we do NOT bind them to the rollup address, since we still need to
41
41
  // monitor and cancel txs for previous rollups to free up our nonces.
42
42
  const noRollupConfig = omit(config, 'l1Contracts');
43
- const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger);
43
+ const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
44
44
  const store = new L1TxStore(kvStore, logger);
45
45
 
46
46
  const meter = deps.telemetry.getMeter('L1TxUtils');
package/src/metrics/l1_tx_metrics.ts CHANGED
@@ -1,7 +1,14 @@
1
1
  import type { IL1TxMetrics, L1TxState } from '@aztec/ethereum/l1-tx-utils';
2
2
  import { TxUtilsState } from '@aztec/ethereum/l1-tx-utils';
3
3
  import { createLogger } from '@aztec/foundation/log';
4
- import { Attributes, type Histogram, type Meter, Metrics, type UpDownCounter } from '@aztec/telemetry-client';
4
+ import {
5
+ Attributes,
6
+ type Histogram,
7
+ type Meter,
8
+ Metrics,
9
+ type UpDownCounter,
10
+ createUpDownCounterWithDefault,
11
+ } from '@aztec/telemetry-client';
5
12
 
6
13
  export type L1TxScope = 'sequencer' | 'prover' | 'other';
7
14
 
@@ -35,13 +42,14 @@ export class L1TxMetrics implements IL1TxMetrics {
35
42
 
36
43
  this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED);
37
44
 
38
- this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT);
45
+ const scopeAttributes = [{ [Attributes.L1_TX_SCOPE]: this.scope }];
46
+ this.txMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_MINED_COUNT, scopeAttributes);
39
47
 
40
- this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT);
48
+ this.txRevertedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_REVERTED_COUNT, scopeAttributes);
41
49
 
42
- this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT);
50
+ this.txCancelledCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_CANCELLED_COUNT, scopeAttributes);
43
51
 
44
- this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT);
52
+ this.txNotMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_NOT_MINED_COUNT, scopeAttributes);
45
53
 
46
54
  this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE);
47
55