@aztec/node-lib 0.0.1-commit.fcb71a6 → 0.0.1-commit.ff7989d6c

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.
@@ -1,10 +1,10 @@
1
1
  export async function buildSnapshotMetadata(archiver, config) {
2
- const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
2
+ const [rollupAddress, l1BlockNumber, tips] = await Promise.all([
3
3
  archiver.getRollupAddress(),
4
4
  archiver.getL1BlockNumber(),
5
5
  archiver.getL2Tips()
6
6
  ]);
7
- const { number: l2BlockNumber, hash: l2BlockHash } = latest;
7
+ const { number: l2BlockNumber, hash: l2BlockHash } = tips.proposed;
8
8
  if (!l2BlockHash) {
9
9
  throw new Error(`Failed to get L2 block hash from archiver.`);
10
10
  }
@@ -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==
@@ -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"}
@@ -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 {
@@ -1,79 +1,66 @@
1
+ import type { BlobKzgInstance } from '@aztec/blob-lib/types';
1
2
  import type { EthSigner } from '@aztec/ethereum/eth-signer';
2
3
  import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
3
4
  import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
5
+ import type { EthAddress } from '@aztec/foundation/eth-address';
4
6
  import { createLogger } from '@aztec/foundation/log';
5
7
  import type { DateProvider } from '@aztec/foundation/timer';
6
8
  import type { DataStoreConfig } from '@aztec/kv-store/config';
7
9
  import type { TelemetryClient } from '@aztec/telemetry-client';
8
10
  import type { L1TxScope } from '../metrics/l1_tx_metrics.js';
9
11
  /**
10
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
12
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
13
+ * When kzg is provided in deps, blob support is enabled.
11
14
  */
12
- export declare function createL1TxUtilsWithBlobsFromViemWallet(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
15
+ export declare function createL1TxUtilsFromWallets(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
13
16
  debugMaxGasLimit?: boolean;
14
17
  scope?: L1TxScope;
15
18
  }, deps: {
16
19
  telemetry: TelemetryClient;
17
20
  logger?: ReturnType<typeof createLogger>;
18
- dateProvider?: DateProvider;
19
- }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
20
- /**
21
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
22
- */
23
- export declare function createL1TxUtilsWithBlobsFromEthSigner(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
24
- debugMaxGasLimit?: boolean;
25
- scope?: L1TxScope;
26
- }, deps: {
27
- telemetry: TelemetryClient;
28
- logger?: ReturnType<typeof createLogger>;
29
- dateProvider?: DateProvider;
30
- }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").L1TxUtilsWithBlobs[]>;
31
- /**
32
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
33
- */
34
- export declare function createL1TxUtilsFromViemWalletWithStore(clients: ExtendedViemWalletClient[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
35
- debugMaxGasLimit?: boolean;
36
- scope?: L1TxScope;
37
- }, deps: {
38
- telemetry: TelemetryClient;
39
- logger?: ReturnType<typeof createLogger>;
40
- dateProvider?: DateProvider;
41
- scope?: L1TxScope;
21
+ dateProvider: DateProvider;
22
+ kzg?: BlobKzgInstance;
42
23
  }): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
43
24
  /**
44
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
25
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
26
+ * When kzg is provided in deps, blob support is enabled.
27
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
45
28
  */
46
- export declare function createL1TxUtilsFromEthSignerWithStore(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
29
+ export declare function createL1TxUtilsFromSigners(client: ViemClient, signers: EthSigner[], config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
47
30
  debugMaxGasLimit?: boolean;
48
31
  scope?: L1TxScope;
49
32
  }, deps: {
50
33
  telemetry: TelemetryClient;
51
34
  logger?: ReturnType<typeof createLogger>;
52
- dateProvider?: DateProvider;
53
- scope?: L1TxScope;
35
+ dateProvider: DateProvider;
36
+ kzg?: BlobKzgInstance;
54
37
  }): Promise<import("@aztec/ethereum/l1-tx-utils").L1TxUtils[]>;
55
38
  /**
56
- * Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
57
- * This wraps all transactions through a forwarder contract for testing purposes.
39
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
40
+ * Wraps all transactions through a forwarder contract for testing purposes.
41
+ * When kzg is provided in deps, blob support is enabled.
58
42
  */
59
- export declare function createForwarderL1TxUtilsFromViemWallet(clients: ExtendedViemWalletClient[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
43
+ export declare function createForwarderL1TxUtilsFromWallets(clients: ExtendedViemWalletClient[], forwarderAddress: EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
60
44
  debugMaxGasLimit?: boolean;
61
45
  scope?: L1TxScope;
62
46
  }, deps: {
63
47
  telemetry: TelemetryClient;
64
48
  logger?: ReturnType<typeof createLogger>;
65
- dateProvider?: DateProvider;
49
+ dateProvider: DateProvider;
50
+ kzg?: BlobKzgInstance;
66
51
  }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
67
52
  /**
68
- * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
69
- * This wraps all transactions through a forwarder contract for testing purposes.
53
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
54
+ * Wraps all transactions through a forwarder contract for testing purposes.
55
+ * When kzg is provided in deps, blob support is enabled.
70
56
  */
71
- export declare function createForwarderL1TxUtilsFromEthSigner(client: ViemClient, signers: EthSigner[], forwarderAddress: import('@aztec/foundation/eth-address').EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
57
+ export declare function createForwarderL1TxUtilsFromSigners(client: ViemClient, signers: EthSigner[], forwarderAddress: EthAddress, config: DataStoreConfig & Partial<L1TxUtilsConfig> & {
72
58
  debugMaxGasLimit?: boolean;
73
59
  scope?: L1TxScope;
74
60
  }, deps: {
75
61
  telemetry: TelemetryClient;
76
62
  logger?: ReturnType<typeof createLogger>;
77
- dateProvider?: DateProvider;
63
+ dateProvider: DateProvider;
64
+ kzg?: BlobKzgInstance;
78
65
  }): Promise<import("@aztec/ethereum/l1-tx-utils-with-blobs").ForwarderL1TxUtils[]>;
79
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFPbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBK0I3RDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFPRjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLHFDQUFxQyxDQUN6RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkF5QkY7QUFFRDs7R0FFRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixLQUFLLENBQUMsRUFBRSxTQUFTLENBQUM7Q0FDbkIsOERBS0Y7QUFFRDs7R0FFRztBQUNILHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLFVBQVUsRUFDbEIsT0FBTyxFQUFFLFNBQVMsRUFBRSxFQUNwQixNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFDO0NBQ25CLDhEQXVCRjtBQUVEOzs7R0FHRztBQUNILHdCQUFzQixzQ0FBc0MsQ0FDMUQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLGdCQUFnQixFQUFFLE9BQU8sK0JBQStCLEVBQUUsVUFBVSxFQUNwRSxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDN0Isa0ZBT0Y7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IscUNBQXFDLENBQ3pELE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsZ0JBQWdCLEVBQUUsT0FBTywrQkFBK0IsRUFBRSxVQUFVLEVBQ3BFLE1BQU0sRUFBRSxlQUFlLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxHQUFHO0lBQUUsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUE7Q0FBRSxFQUN0RyxJQUFJLEVBQUU7SUFDSixTQUFTLEVBQUUsZUFBZSxDQUFDO0lBQzNCLE1BQU0sQ0FBQyxFQUFFLFVBQVUsQ0FBQyxPQUFPLFlBQVksQ0FBQyxDQUFDO0lBQ3pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztDQUM3QixrRkFjRiJ9
66
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mYWN0b3JpZXMvbDFfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFbkUsT0FBTyxLQUFLLEVBQUUsd0JBQXdCLEVBQUUsVUFBVSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbEYsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRS9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBc0M3RDs7O0dBR0c7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxFQUNuQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsR0FBRztJQUFFLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQUMsS0FBSyxDQUFDLEVBQUUsU0FBUyxDQUFBO0NBQUUsRUFDdEcsSUFBSSxFQUFFO0lBQ0osU0FBUyxFQUFFLGVBQWUsQ0FBQztJQUMzQixNQUFNLENBQUMsRUFBRSxVQUFVLENBQUMsT0FBTyxZQUFZLENBQUMsQ0FBQztJQUN6QyxZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLEdBQUcsQ0FBQyxFQUFFLGVBQWUsQ0FBQztDQUN2Qiw4REFLRjtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLE9BQU8sRUFBRSxTQUFTLEVBQUUsRUFDcEIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsOERBdUJGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQixtQ0FBbUMsQ0FDdkQsT0FBTyxFQUFFLHdCQUF3QixFQUFFLEVBQ25DLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0Y7QUFFRDs7OztHQUlHO0FBQ0gsd0JBQXNCLG1DQUFtQyxDQUN2RCxNQUFNLEVBQUUsVUFBVSxFQUNsQixPQUFPLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLGdCQUFnQixFQUFFLFVBQVUsRUFDNUIsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLEdBQUc7SUFBRSxnQkFBZ0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQTtDQUFFLEVBQ3RHLElBQUksRUFBRTtJQUNKLFNBQVMsRUFBRSxlQUFlLENBQUM7SUFDM0IsTUFBTSxDQUFDLEVBQUUsVUFBVSxDQUFDLE9BQU8sWUFBWSxDQUFDLENBQUM7SUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztJQUMzQixHQUFHLENBQUMsRUFBRSxlQUFlLENBQUM7Q0FDdkIsa0ZBT0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"l1_tx_utils.d.ts","sourceRoot":"","sources":["../../src/factories/l1_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAsC7D;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,wBAAwB,EAAE,EACnC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,8DAKF;AAED;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,8DAuBF;AAED;;;;GAIG;AACH,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,wBAAwB,EAAE,EACnC,gBAAgB,EAAE,UAAU,EAC5B,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,kFAOF;AAED;;;;GAIG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,SAAS,EAAE,EACpB,gBAAgB,EAAE,UAAU,EAC5B,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,EACtG,IAAI,EAAE;IACJ,SAAS,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,kFAOF"}
@@ -1,5 +1,5 @@
1
- import { createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase, createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils';
2
- import { createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase, createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase, createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase, createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
1
+ import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
2
+ import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
3
3
  import { omit } from '@aztec/foundation/collection';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
5
  import { createStore } from '@aztec/kv-store/lmdb-v2';
@@ -7,32 +7,44 @@ import { L1TxMetrics } from '../metrics/l1_tx_metrics.js';
7
7
  import { L1TxStore } from '../stores/l1_tx_store.js';
8
8
  const L1_TX_STORE_NAME = 'l1-tx-utils';
9
9
  /**
10
- * Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
10
+ * Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
11
+ * When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
11
12
  */ async function createSharedDeps(config, deps) {
12
13
  const logger = deps.logger ?? createLogger('l1-tx-utils');
13
14
  // Note that we do NOT bind them to the rollup address, since we still need to
14
15
  // monitor and cancel txs for previous rollups to free up our nonces.
15
16
  const noRollupConfig = omit(config, 'l1Contracts');
16
- const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger);
17
+ const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
17
18
  const store = new L1TxStore(kvStore, logger);
18
19
  const meter = deps.telemetry.getMeter('L1TxUtils');
19
20
  const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
21
+ // Create a single shared delayer for all L1TxUtils instances in this group
22
+ const delayer = config.enableDelayer && config.ethereumSlotDuration !== undefined ? createDelayer(deps.dateProvider, {
23
+ ethereumSlotDuration: config.ethereumSlotDuration
24
+ }, logger.getBindings()) : undefined;
20
25
  return {
21
26
  logger,
22
27
  store,
23
28
  metrics,
24
- dateProvider: deps.dateProvider
29
+ dateProvider: deps.dateProvider,
30
+ delayer
25
31
  };
26
32
  }
27
33
  /**
28
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
29
- */ export async function createL1TxUtilsWithBlobsFromViemWallet(clients, config, deps) {
34
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
35
+ * When kzg is provided in deps, blob support is enabled.
36
+ */ export async function createL1TxUtilsFromWallets(clients, config, deps) {
30
37
  const sharedDeps = await createSharedDeps(config, deps);
31
- return clients.map((client)=>createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit));
38
+ return clients.map((client)=>createL1TxUtilsBase(client, {
39
+ ...sharedDeps,
40
+ kzg: deps.kzg
41
+ }, config));
32
42
  }
33
43
  /**
34
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
35
- */ export async function createL1TxUtilsWithBlobsFromEthSigner(client, signers, config, deps) {
44
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
45
+ * When kzg is provided in deps, blob support is enabled.
46
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
47
+ */ export async function createL1TxUtilsFromSigners(client, signers, config, deps) {
36
48
  const sharedDeps = await createSharedDeps(config, deps);
37
49
  // Deduplicate signers by address to avoid creating multiple L1TxUtils instances
38
50
  // for the same publisher address (e.g., when multiple attesters share the same publisher key)
@@ -47,44 +59,36 @@ const L1_TX_STORE_NAME = 'l1-tx-utils';
47
59
  if (uniqueSigners.length < signers.length) {
48
60
  sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
49
61
  }
50
- return uniqueSigners.map((signer)=>createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit));
62
+ return uniqueSigners.map((signer)=>createL1TxUtilsBase({
63
+ client,
64
+ signer
65
+ }, {
66
+ ...sharedDeps,
67
+ kzg: deps.kzg
68
+ }, config));
51
69
  }
52
70
  /**
53
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
54
- */ export async function createL1TxUtilsFromViemWalletWithStore(clients, config, deps) {
71
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
72
+ * Wraps all transactions through a forwarder contract for testing purposes.
73
+ * When kzg is provided in deps, blob support is enabled.
74
+ */ export async function createForwarderL1TxUtilsFromWallets(clients, forwarderAddress, config, deps) {
55
75
  const sharedDeps = await createSharedDeps(config, deps);
56
- return clients.map((client)=>createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
76
+ return clients.map((client)=>createForwarderL1TxUtilsBase(client, forwarderAddress, {
77
+ ...sharedDeps,
78
+ kzg: deps.kzg
79
+ }, config));
57
80
  }
58
81
  /**
59
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
60
- */ export async function createL1TxUtilsFromEthSignerWithStore(client, signers, config, deps) {
82
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
83
+ * Wraps all transactions through a forwarder contract for testing purposes.
84
+ * When kzg is provided in deps, blob support is enabled.
85
+ */ export async function createForwarderL1TxUtilsFromSigners(client, signers, forwarderAddress, config, deps) {
61
86
  const sharedDeps = await createSharedDeps(config, deps);
62
- // Deduplicate signers by address to avoid creating multiple L1TxUtils instances
63
- // for the same publisher address (e.g., when multiple attesters share the same publisher key)
64
- const signersByAddress = new Map();
65
- for (const signer of signers){
66
- const addressKey = signer.address.toString().toLowerCase();
67
- if (!signersByAddress.has(addressKey)) {
68
- signersByAddress.set(addressKey, signer);
69
- }
70
- }
71
- const uniqueSigners = Array.from(signersByAddress.values());
72
- if (uniqueSigners.length < signers.length) {
73
- sharedDeps.logger.info(`Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`);
74
- }
75
- return uniqueSigners.map((signer)=>createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
76
- }
77
- /**
78
- * Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
79
- * This wraps all transactions through a forwarder contract for testing purposes.
80
- */ export async function createForwarderL1TxUtilsFromViemWallet(clients, forwarderAddress, config, deps) {
81
- const sharedDeps = await createSharedDeps(config, deps);
82
- return clients.map((client)=>createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
83
- }
84
- /**
85
- * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
86
- * This wraps all transactions through a forwarder contract for testing purposes.
87
- */ export async function createForwarderL1TxUtilsFromEthSigner(client, signers, forwarderAddress, config, deps) {
88
- const sharedDeps = await createSharedDeps(config, deps);
89
- return signers.map((signer)=>createForwarderL1TxUtilsFromEthSignerBase(client, signer, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit));
87
+ return signers.map((signer)=>createForwarderL1TxUtilsBase({
88
+ client,
89
+ signer
90
+ }, forwarderAddress, {
91
+ ...sharedDeps,
92
+ kzg: deps.kzg
93
+ }, config));
90
94
  }
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFtRHJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfbWV0cmljcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21ldHJpY3MvbDFfdHhfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFHM0UsT0FBTyxFQUdMLEtBQUssS0FBSyxFQUlYLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxNQUFNLFNBQVMsR0FBRyxXQUFXLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQztBQUV6RDs7R0FFRztBQUNILHFCQUFhLFdBQVksWUFBVyxZQUFZO0lBbUI1QyxPQUFPLENBQUMsS0FBSztJQUNiLE9BQU8sQ0FBQyxLQUFLO0lBQ2IsT0FBTyxDQUFDLE1BQU07SUFuQmhCLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFHbkMsT0FBTyxDQUFDLG9CQUFvQixDQUFZO0lBR3hDLE9BQU8sQ0FBQyxZQUFZLENBQWdCO0lBQ3BDLE9BQU8sQ0FBQyxlQUFlLENBQWdCO0lBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBZ0I7SUFDeEMsT0FBTyxDQUFDLGVBQWUsQ0FBZ0I7SUFHdkMsT0FBTyxDQUFDLHVCQUF1QixDQUFZO0lBQzNDLE9BQU8sQ0FBQyxlQUFlLENBQVk7SUFDbkMsT0FBTyxDQUFDLGdCQUFnQixDQUFZO0lBRXBDLFlBQ1UsS0FBSyxFQUFFLEtBQUssRUFDWixLQUFLLEdBQUUsU0FBbUIsRUFDMUIsTUFBTSx5Q0FBc0MsRUFvQnJEO0lBRUQ7Ozs7T0FJRztJQUNJLGFBQWEsQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFLFdBQVcsRUFBRSxJQUFJLEdBQUcsSUFBSSxDQW9EOUQ7SUFFTSxlQUFlLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxJQUFJLENBaUI3QztDQUNGIn0=
@@ -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,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,EAmDrD;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"}
@@ -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, ValueType } 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 {
@@ -24,47 +24,20 @@ import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
24
24
  this.meter = meter;
25
25
  this.scope = scope;
26
26
  this.logger = logger;
27
- this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION, {
28
- description: 'Time from initial tx send until mined',
29
- unit: 's',
30
- valueType: ValueType.INT
31
- });
32
- this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED, {
33
- description: 'Number of tx attempts (including speed-ups) until mined',
34
- unit: 'attempts',
35
- valueType: ValueType.INT
36
- });
37
- this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT, {
38
- description: 'Count of transactions successfully mined',
39
- valueType: ValueType.INT
40
- });
41
- this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT, {
42
- description: 'Count of transactions that reverted',
43
- valueType: ValueType.INT
44
- });
45
- this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT, {
46
- description: 'Count of transactions cancelled',
47
- valueType: ValueType.INT
48
- });
49
- this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT, {
50
- description: 'Count of transactions not mined (timed out)',
51
- valueType: ValueType.INT
52
- });
53
- this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE, {
54
- description: 'Max priority fee per gas at tx end state (in wei)',
55
- unit: 'wei',
56
- valueType: ValueType.INT
57
- });
58
- this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE, {
59
- description: 'Max fee per gas at tx end state (in wei)',
60
- unit: 'wei',
61
- valueType: ValueType.INT
62
- });
63
- this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE, {
64
- description: 'Max fee per blob gas at tx end state (in wei)',
65
- unit: 'wei',
66
- valueType: ValueType.INT
67
- });
27
+ this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION);
28
+ this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED);
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);
38
+ this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE);
39
+ this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE);
40
+ this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE);
68
41
  }
69
42
  /**
70
43
  * Records metrics when a transaction is mined.
@@ -9,7 +9,7 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
9
9
  export declare class L1TxStore implements IL1TxStore {
10
10
  private readonly store;
11
11
  private readonly log;
12
- static readonly SCHEMA_VERSION: number;
12
+ static readonly SCHEMA_VERSION = 2;
13
13
  private readonly states;
14
14
  private readonly blobs;
15
15
  private readonly stateIdCounter;
@@ -86,4 +86,4 @@ export declare class L1TxStore implements IL1TxStore {
86
86
  */
87
87
  private deserializeBlobInputs;
88
88
  }
89
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvbDFfdHhfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBYyxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVuRyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQTJFeEU7Ozs7R0FJRztBQUNILHFCQUFhLFNBQVUsWUFBVyxVQUFVO0lBUXhDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFSdEIsZ0JBQXVCLGNBQWMsU0FBSztJQUUxQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBZ0M7SUFDdkQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWdDO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFnQztJQUUvRCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUEwQyxFQUtqRTtJQUVEOztPQUVHO0lBQ0ksa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBTzFEO0lBRUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsT0FBTztJQUlmOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBUTVFO0lBRUQ7Ozs7O09BS0c7SUFDVSxTQUFTLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRNUc7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBb0M3RDtJQUVEOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQTBCdkY7SUFFRDs7OztPQUlHO0lBQ1UsV0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVk5RTtJQUVEOzs7T0FHRztJQUNVLFdBQVcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXdkQ7SUFFRDs7O09BR0c7SUFDVSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBUy9DO0lBRUQ7O09BRUc7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGNBQWM7SUFrQ3RCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtJQTJDeEI7O09BRUc7SUFDSCxPQUFPLENBQUMsbUJBQW1CO0lBTzNCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLHFCQUFxQjtDQVk5QiJ9
89
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdG9yZXMvbDFfdHhfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBYyxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVuRyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQTJFeEU7Ozs7R0FJRztBQUNILHFCQUFhLFNBQVUsWUFBVyxVQUFVO0lBUXhDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSztJQUN0QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFSdEIsZ0JBQXVCLGNBQWMsS0FBSztJQUUxQyxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBZ0M7SUFDdkQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQWdDO0lBQ3RELE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFnQztJQUUvRCxZQUNtQixLQUFLLEVBQUUsaUJBQWlCLEVBQ3hCLEdBQUcsR0FBRSxNQUEwQyxFQUtqRTtJQUVEOztPQUVHO0lBQ0ksa0JBQWtCLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBTzFEO0lBRUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsT0FBTztJQUlmOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBUTVFO0lBRUQ7Ozs7O09BS0c7SUFDVSxTQUFTLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FRNUc7SUFFRDs7OztPQUlHO0lBQ1UsVUFBVSxDQUFDLE9BQU8sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBb0M3RDtJQUVEOzs7OztPQUtHO0lBQ1UsU0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQTBCdkY7SUFFRDs7OztPQUlHO0lBQ1UsV0FBVyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVk5RTtJQUVEOzs7T0FHRztJQUNVLFdBQVcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FXdkQ7SUFFRDs7O09BR0c7SUFDVSxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBUy9DO0lBRUQ7O09BRUc7SUFDVSxLQUFLLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUdsQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGNBQWM7SUFrQ3RCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLGdCQUFnQjtJQTJDeEI7O09BRUc7SUFDSCxPQUFPLENBQUMsbUJBQW1CO0lBTzNCOztPQUVHO0lBQ0gsT0FBTyxDQUFDLHFCQUFxQjtDQVk5QiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,SAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;IAE/D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C,EAKjE;IAED;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1D;IAED;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ5E;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5G;IAED;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoC7D;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BvF;IAED;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;IAED;;;OAGG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvD;IAED;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAS/C;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAED;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAY9B"}
1
+ {"version":3,"file":"l1_tx_store.d.ts","sourceRoot":"","sources":["../../src/stores/l1_tx_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAc,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AA2ExE;;;;GAIG;AACH,qBAAa,SAAU,YAAW,UAAU;IAQxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARtB,gBAAuB,cAAc,KAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgC;IAE/D,YACmB,KAAK,EAAE,iBAAiB,EACxB,GAAG,GAAE,MAA0C,EAKjE;IAED;;OAEG;IACI,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAO1D;IAED;;OAEG;IACH,OAAO,CAAC,OAAO;IAIf;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ5E;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5G;IAED;;;;OAIG;IACU,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAoC7D;IAED;;;;;OAKG;IACU,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA0BvF;IAED;;;;OAIG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAY9E;IAED;;;OAGG;IACU,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvD;IAED;;;OAGG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAS/C;IAED;;OAEG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAED;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA2CxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,qBAAqB;CAY9B"}
package/package.json CHANGED
@@ -1,7 +1,16 @@
1
1
  {
2
2
  "name": "@aztec/node-lib",
3
- "version": "0.0.1-commit.fcb71a6",
3
+ "version": "0.0.1-commit.ff7989d6c",
4
4
  "type": "module",
5
+ "typedocOptions": {
6
+ "entryPoints": [
7
+ "./src/actions/index.ts",
8
+ "./src/config/index.ts",
9
+ "./src/factories/index.ts"
10
+ ],
11
+ "name": "Node Library",
12
+ "tsconfig": "./tsconfig.json"
13
+ },
5
14
  "exports": {
6
15
  "./actions": "./dest/actions/index.js",
7
16
  "./config": "./dest/config/index.js",
@@ -57,33 +66,33 @@
57
66
  ]
58
67
  },
59
68
  "dependencies": {
60
- "@aztec/archiver": "0.0.1-commit.fcb71a6",
61
- "@aztec/bb-prover": "0.0.1-commit.fcb71a6",
62
- "@aztec/blob-client": "0.0.1-commit.fcb71a6",
63
- "@aztec/constants": "0.0.1-commit.fcb71a6",
64
- "@aztec/epoch-cache": "0.0.1-commit.fcb71a6",
65
- "@aztec/ethereum": "0.0.1-commit.fcb71a6",
66
- "@aztec/foundation": "0.0.1-commit.fcb71a6",
67
- "@aztec/kv-store": "0.0.1-commit.fcb71a6",
68
- "@aztec/merkle-tree": "0.0.1-commit.fcb71a6",
69
- "@aztec/p2p": "0.0.1-commit.fcb71a6",
70
- "@aztec/protocol-contracts": "0.0.1-commit.fcb71a6",
71
- "@aztec/prover-client": "0.0.1-commit.fcb71a6",
72
- "@aztec/sequencer-client": "0.0.1-commit.fcb71a6",
73
- "@aztec/simulator": "0.0.1-commit.fcb71a6",
74
- "@aztec/stdlib": "0.0.1-commit.fcb71a6",
75
- "@aztec/telemetry-client": "0.0.1-commit.fcb71a6",
76
- "@aztec/validator-client": "0.0.1-commit.fcb71a6",
77
- "@aztec/world-state": "0.0.1-commit.fcb71a6",
69
+ "@aztec/archiver": "0.0.1-commit.ff7989d6c",
70
+ "@aztec/bb-prover": "0.0.1-commit.ff7989d6c",
71
+ "@aztec/blob-client": "0.0.1-commit.ff7989d6c",
72
+ "@aztec/constants": "0.0.1-commit.ff7989d6c",
73
+ "@aztec/epoch-cache": "0.0.1-commit.ff7989d6c",
74
+ "@aztec/ethereum": "0.0.1-commit.ff7989d6c",
75
+ "@aztec/foundation": "0.0.1-commit.ff7989d6c",
76
+ "@aztec/kv-store": "0.0.1-commit.ff7989d6c",
77
+ "@aztec/merkle-tree": "0.0.1-commit.ff7989d6c",
78
+ "@aztec/p2p": "0.0.1-commit.ff7989d6c",
79
+ "@aztec/protocol-contracts": "0.0.1-commit.ff7989d6c",
80
+ "@aztec/prover-client": "0.0.1-commit.ff7989d6c",
81
+ "@aztec/sequencer-client": "0.0.1-commit.ff7989d6c",
82
+ "@aztec/simulator": "0.0.1-commit.ff7989d6c",
83
+ "@aztec/stdlib": "0.0.1-commit.ff7989d6c",
84
+ "@aztec/telemetry-client": "0.0.1-commit.ff7989d6c",
85
+ "@aztec/validator-client": "0.0.1-commit.ff7989d6c",
86
+ "@aztec/world-state": "0.0.1-commit.ff7989d6c",
78
87
  "tslib": "^2.4.0"
79
88
  },
80
89
  "devDependencies": {
81
- "@aztec/blob-lib": "0.0.1-commit.fcb71a6",
82
- "@aztec/node-keystore": "0.0.1-commit.fcb71a6",
90
+ "@aztec/blob-lib": "0.0.1-commit.ff7989d6c",
91
+ "@aztec/node-keystore": "0.0.1-commit.ff7989d6c",
83
92
  "@jest/globals": "^30.0.0",
84
93
  "@types/jest": "^30.0.0",
85
94
  "@types/node": "^22.15.17",
86
- "@typescript/native-preview": "7.0.0-dev.20251126.1",
95
+ "@typescript/native-preview": "7.0.0-dev.20260113.1",
87
96
  "jest": "^30.0.0",
88
97
  "jest-mock-extended": "^4.0.0",
89
98
  "ts-node": "^10.9.1",
@@ -7,13 +7,13 @@ export async function buildSnapshotMetadata(
7
7
  archiver: Archiver,
8
8
  config: UploadSnapshotConfig,
9
9
  ): Promise<UploadSnapshotMetadata> {
10
- const [rollupAddress, l1BlockNumber, { latest }] = await Promise.all([
10
+ const [rollupAddress, l1BlockNumber, tips] = await Promise.all([
11
11
  archiver.getRollupAddress(),
12
12
  archiver.getL1BlockNumber(),
13
13
  archiver.getL2Tips(),
14
14
  ] as const);
15
15
 
16
- const { number: l2BlockNumber, hash: l2BlockHash } = latest;
16
+ const { number: l2BlockNumber, hash: l2BlockHash } = tips.proposed;
17
17
  if (!l2BlockHash) {
18
18
  throw new Error(`Failed to get L2 block hash from archiver.`);
19
19
  }
@@ -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 {
@@ -1,17 +1,11 @@
1
+ import type { BlobKzgInstance } from '@aztec/blob-lib/types';
1
2
  import type { EthSigner } from '@aztec/ethereum/eth-signer';
2
- import {
3
- createL1TxUtilsFromEthSigner as createL1TxUtilsFromEthSignerBase,
4
- createL1TxUtilsFromViemWallet as createL1TxUtilsFromViemWalletBase,
5
- } from '@aztec/ethereum/l1-tx-utils';
3
+ import { createDelayer, createL1TxUtils as createL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils';
6
4
  import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils';
7
- import {
8
- createForwarderL1TxUtilsFromEthSigner as createForwarderL1TxUtilsFromEthSignerBase,
9
- createForwarderL1TxUtilsFromViemWallet as createForwarderL1TxUtilsFromViemWalletBase,
10
- createL1TxUtilsWithBlobsFromEthSigner as createL1TxUtilsWithBlobsFromEthSignerBase,
11
- createL1TxUtilsWithBlobsFromViemWallet as createL1TxUtilsWithBlobsFromViemWalletBase,
12
- } from '@aztec/ethereum/l1-tx-utils-with-blobs';
5
+ import { createForwarderL1TxUtils as createForwarderL1TxUtilsBase } from '@aztec/ethereum/l1-tx-utils-with-blobs';
13
6
  import type { ExtendedViemWalletClient, ViemClient } from '@aztec/ethereum/types';
14
7
  import { omit } from '@aztec/foundation/collection';
8
+ import type { EthAddress } from '@aztec/foundation/eth-address';
15
9
  import { createLogger } from '@aztec/foundation/log';
16
10
  import type { DateProvider } from '@aztec/foundation/timer';
17
11
  import type { DataStoreConfig } from '@aztec/kv-store/config';
@@ -25,14 +19,15 @@ import { L1TxStore } from '../stores/l1_tx_store.js';
25
19
  const L1_TX_STORE_NAME = 'l1-tx-utils';
26
20
 
27
21
  /**
28
- * Creates shared dependencies (logger, store, metrics) for L1TxUtils instances.
22
+ * Creates shared dependencies (logger, store, metrics, delayer) for L1TxUtils instances.
23
+ * When enableDelayer is set in config, a single shared delayer is created and passed to all instances.
29
24
  */
30
25
  async function createSharedDeps(
31
- config: DataStoreConfig & { scope?: L1TxScope },
26
+ config: DataStoreConfig & Partial<L1TxUtilsConfig> & { scope?: L1TxScope },
32
27
  deps: {
33
28
  telemetry: TelemetryClient;
34
29
  logger?: ReturnType<typeof createLogger>;
35
- dateProvider?: DateProvider;
30
+ dateProvider: DateProvider;
36
31
  },
37
32
  ) {
38
33
  const logger = deps.logger ?? createLogger('l1-tx-utils');
@@ -40,102 +35,54 @@ async function createSharedDeps(
40
35
  // Note that we do NOT bind them to the rollup address, since we still need to
41
36
  // monitor and cancel txs for previous rollups to free up our nonces.
42
37
  const noRollupConfig = omit(config, 'l1Contracts');
43
- const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger);
38
+ const kvStore = await createStore(L1_TX_STORE_NAME, L1TxStore.SCHEMA_VERSION, noRollupConfig, logger.getBindings());
44
39
  const store = new L1TxStore(kvStore, logger);
45
40
 
46
41
  const meter = deps.telemetry.getMeter('L1TxUtils');
47
42
  const metrics = new L1TxMetrics(meter, config.scope ?? 'other', logger);
48
43
 
49
- return { logger, store, metrics, dateProvider: deps.dateProvider };
50
- }
51
-
52
- /**
53
- * Creates L1TxUtils with blobs from multiple Viem wallets, sharing store and metrics.
54
- */
55
- export async function createL1TxUtilsWithBlobsFromViemWallet(
56
- clients: ExtendedViemWalletClient[],
57
- config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
58
- deps: {
59
- telemetry: TelemetryClient;
60
- logger?: ReturnType<typeof createLogger>;
61
- dateProvider?: DateProvider;
62
- },
63
- ) {
64
- const sharedDeps = await createSharedDeps(config, deps);
44
+ // Create a single shared delayer for all L1TxUtils instances in this group
45
+ const delayer =
46
+ config.enableDelayer && config.ethereumSlotDuration !== undefined
47
+ ? createDelayer(deps.dateProvider, { ethereumSlotDuration: config.ethereumSlotDuration }, logger.getBindings())
48
+ : undefined;
65
49
 
66
- return clients.map(client =>
67
- createL1TxUtilsWithBlobsFromViemWalletBase(client, sharedDeps, config, config.debugMaxGasLimit),
68
- );
69
- }
70
-
71
- /**
72
- * Creates L1TxUtils with blobs from multiple EthSigners, sharing store and metrics. Removes duplicates
73
- */
74
- export async function createL1TxUtilsWithBlobsFromEthSigner(
75
- client: ViemClient,
76
- signers: EthSigner[],
77
- config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
78
- deps: {
79
- telemetry: TelemetryClient;
80
- logger?: ReturnType<typeof createLogger>;
81
- dateProvider?: DateProvider;
82
- },
83
- ) {
84
- const sharedDeps = await createSharedDeps(config, deps);
85
-
86
- // Deduplicate signers by address to avoid creating multiple L1TxUtils instances
87
- // for the same publisher address (e.g., when multiple attesters share the same publisher key)
88
- const signersByAddress = new Map<string, EthSigner>();
89
- for (const signer of signers) {
90
- const addressKey = signer.address.toString().toLowerCase();
91
- if (!signersByAddress.has(addressKey)) {
92
- signersByAddress.set(addressKey, signer);
93
- }
94
- }
95
-
96
- const uniqueSigners = Array.from(signersByAddress.values());
97
-
98
- if (uniqueSigners.length < signers.length) {
99
- sharedDeps.logger.info(
100
- `Deduplicated ${signers.length} signers to ${uniqueSigners.length} unique publisher addresses`,
101
- );
102
- }
103
-
104
- return uniqueSigners.map(signer =>
105
- createL1TxUtilsWithBlobsFromEthSignerBase(client, signer, sharedDeps, config, config.debugMaxGasLimit),
106
- );
50
+ return { logger, store, metrics, dateProvider: deps.dateProvider, delayer };
107
51
  }
108
52
 
109
53
  /**
110
- * Creates L1TxUtils (without blobs) from multiple Viem wallets, sharing store and metrics.
54
+ * Creates L1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
55
+ * When kzg is provided in deps, blob support is enabled.
111
56
  */
112
- export async function createL1TxUtilsFromViemWalletWithStore(
57
+ export async function createL1TxUtilsFromWallets(
113
58
  clients: ExtendedViemWalletClient[],
114
59
  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
115
60
  deps: {
116
61
  telemetry: TelemetryClient;
117
62
  logger?: ReturnType<typeof createLogger>;
118
- dateProvider?: DateProvider;
119
- scope?: L1TxScope;
63
+ dateProvider: DateProvider;
64
+ kzg?: BlobKzgInstance;
120
65
  },
121
66
  ) {
122
67
  const sharedDeps = await createSharedDeps(config, deps);
123
68
 
124
- return clients.map(client => createL1TxUtilsFromViemWalletBase(client, sharedDeps, config));
69
+ return clients.map(client => createL1TxUtilsBase(client, { ...sharedDeps, kzg: deps.kzg }, config));
125
70
  }
126
71
 
127
72
  /**
128
- * Creates L1TxUtils (without blobs) from multiple EthSigners, sharing store and metrics. Removes duplicates.
73
+ * Creates L1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
74
+ * When kzg is provided in deps, blob support is enabled.
75
+ * Deduplicates signers by address to avoid creating multiple instances for the same publisher.
129
76
  */
130
- export async function createL1TxUtilsFromEthSignerWithStore(
77
+ export async function createL1TxUtilsFromSigners(
131
78
  client: ViemClient,
132
79
  signers: EthSigner[],
133
80
  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
134
81
  deps: {
135
82
  telemetry: TelemetryClient;
136
83
  logger?: ReturnType<typeof createLogger>;
137
- dateProvider?: DateProvider;
138
- scope?: L1TxScope;
84
+ dateProvider: DateProvider;
85
+ kzg?: BlobKzgInstance;
139
86
  },
140
87
  ) {
141
88
  const sharedDeps = await createSharedDeps(config, deps);
@@ -158,55 +105,52 @@ export async function createL1TxUtilsFromEthSignerWithStore(
158
105
  );
159
106
  }
160
107
 
161
- return uniqueSigners.map(signer => createL1TxUtilsFromEthSignerBase(client, signer, sharedDeps, config));
108
+ return uniqueSigners.map(signer => createL1TxUtilsBase({ client, signer }, { ...sharedDeps, kzg: deps.kzg }, config));
162
109
  }
163
110
 
164
111
  /**
165
- * Creates ForwarderL1TxUtils from multiple Viem wallets, sharing store and metrics.
166
- * This wraps all transactions through a forwarder contract for testing purposes.
112
+ * Creates ForwarderL1TxUtils from multiple Viem wallet clients, sharing store, metrics, and delayer.
113
+ * Wraps all transactions through a forwarder contract for testing purposes.
114
+ * When kzg is provided in deps, blob support is enabled.
167
115
  */
168
- export async function createForwarderL1TxUtilsFromViemWallet(
116
+ export async function createForwarderL1TxUtilsFromWallets(
169
117
  clients: ExtendedViemWalletClient[],
170
- forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
118
+ forwarderAddress: EthAddress,
171
119
  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
172
120
  deps: {
173
121
  telemetry: TelemetryClient;
174
122
  logger?: ReturnType<typeof createLogger>;
175
- dateProvider?: DateProvider;
123
+ dateProvider: DateProvider;
124
+ kzg?: BlobKzgInstance;
176
125
  },
177
126
  ) {
178
127
  const sharedDeps = await createSharedDeps(config, deps);
179
128
 
180
129
  return clients.map(client =>
181
- createForwarderL1TxUtilsFromViemWalletBase(client, forwarderAddress, sharedDeps, config, config.debugMaxGasLimit),
130
+ createForwarderL1TxUtilsBase(client, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
182
131
  );
183
132
  }
184
133
 
185
134
  /**
186
- * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store and metrics.
187
- * This wraps all transactions through a forwarder contract for testing purposes.
135
+ * Creates ForwarderL1TxUtils from multiple EthSigners, sharing store, metrics, and delayer.
136
+ * Wraps all transactions through a forwarder contract for testing purposes.
137
+ * When kzg is provided in deps, blob support is enabled.
188
138
  */
189
- export async function createForwarderL1TxUtilsFromEthSigner(
139
+ export async function createForwarderL1TxUtilsFromSigners(
190
140
  client: ViemClient,
191
141
  signers: EthSigner[],
192
- forwarderAddress: import('@aztec/foundation/eth-address').EthAddress,
142
+ forwarderAddress: EthAddress,
193
143
  config: DataStoreConfig & Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean; scope?: L1TxScope },
194
144
  deps: {
195
145
  telemetry: TelemetryClient;
196
146
  logger?: ReturnType<typeof createLogger>;
197
- dateProvider?: DateProvider;
147
+ dateProvider: DateProvider;
148
+ kzg?: BlobKzgInstance;
198
149
  },
199
150
  ) {
200
151
  const sharedDeps = await createSharedDeps(config, deps);
201
152
 
202
153
  return signers.map(signer =>
203
- createForwarderL1TxUtilsFromEthSignerBase(
204
- client,
205
- signer,
206
- forwarderAddress,
207
- sharedDeps,
208
- config,
209
- config.debugMaxGasLimit,
210
- ),
154
+ createForwarderL1TxUtilsBase({ client, signer }, forwarderAddress, { ...sharedDeps, kzg: deps.kzg }, config),
211
155
  );
212
156
  }
@@ -7,7 +7,7 @@ import {
7
7
  type Meter,
8
8
  Metrics,
9
9
  type UpDownCounter,
10
- ValueType,
10
+ createUpDownCounterWithDefault,
11
11
  } from '@aztec/telemetry-client';
12
12
 
13
13
  export type L1TxScope = 'sequencer' | 'prover' | 'other';
@@ -38,55 +38,24 @@ export class L1TxMetrics implements IL1TxMetrics {
38
38
  private scope: L1TxScope = 'other',
39
39
  private logger = createLogger('l1-tx-utils:metrics'),
40
40
  ) {
41
- this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION, {
42
- description: 'Time from initial tx send until mined',
43
- unit: 's',
44
- valueType: ValueType.INT,
45
- });
41
+ this.txMinedDuration = this.meter.createHistogram(Metrics.L1_TX_MINED_DURATION);
46
42
 
47
- this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED, {
48
- description: 'Number of tx attempts (including speed-ups) until mined',
49
- unit: 'attempts',
50
- valueType: ValueType.INT,
51
- });
43
+ this.txAttemptsUntilMined = this.meter.createHistogram(Metrics.L1_TX_ATTEMPTS_UNTIL_MINED);
52
44
 
53
- this.txMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_MINED_COUNT, {
54
- description: 'Count of transactions successfully mined',
55
- valueType: ValueType.INT,
56
- });
45
+ const scopeAttributes = [{ [Attributes.L1_TX_SCOPE]: this.scope }];
46
+ this.txMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_MINED_COUNT, scopeAttributes);
57
47
 
58
- this.txRevertedCount = this.meter.createUpDownCounter(Metrics.L1_TX_REVERTED_COUNT, {
59
- description: 'Count of transactions that reverted',
60
- valueType: ValueType.INT,
61
- });
48
+ this.txRevertedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_REVERTED_COUNT, scopeAttributes);
62
49
 
63
- this.txCancelledCount = this.meter.createUpDownCounter(Metrics.L1_TX_CANCELLED_COUNT, {
64
- description: 'Count of transactions cancelled',
65
- valueType: ValueType.INT,
66
- });
50
+ this.txCancelledCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_CANCELLED_COUNT, scopeAttributes);
67
51
 
68
- this.txNotMinedCount = this.meter.createUpDownCounter(Metrics.L1_TX_NOT_MINED_COUNT, {
69
- description: 'Count of transactions not mined (timed out)',
70
- valueType: ValueType.INT,
71
- });
52
+ this.txNotMinedCount = createUpDownCounterWithDefault(this.meter, Metrics.L1_TX_NOT_MINED_COUNT, scopeAttributes);
72
53
 
73
- this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE, {
74
- description: 'Max priority fee per gas at tx end state (in wei)',
75
- unit: 'wei',
76
- valueType: ValueType.INT,
77
- });
54
+ this.maxPriorityFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_PRIORITY_FEE);
78
55
 
79
- this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE, {
80
- description: 'Max fee per gas at tx end state (in wei)',
81
- unit: 'wei',
82
- valueType: ValueType.INT,
83
- });
56
+ this.maxFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_MAX_FEE);
84
57
 
85
- this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE, {
86
- description: 'Max fee per blob gas at tx end state (in wei)',
87
- unit: 'wei',
88
- valueType: ValueType.INT,
89
- });
58
+ this.blobFeeHistogram = this.meter.createHistogram(Metrics.L1_TX_BLOB_FEE);
90
59
  }
91
60
 
92
61
  /**