@aztec/archiver 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.76.0

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 (83) hide show
  1. package/dest/archiver/archiver.d.ts +186 -0
  2. package/dest/archiver/archiver.d.ts.map +1 -0
  3. package/dest/archiver/archiver.js +711 -729
  4. package/dest/archiver/archiver_store.d.ts +217 -0
  5. package/dest/archiver/archiver_store.d.ts.map +1 -0
  6. package/dest/archiver/archiver_store.js +2 -4
  7. package/dest/archiver/archiver_store_test_suite.d.ts +8 -0
  8. package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -0
  9. package/dest/archiver/archiver_store_test_suite.js +224 -385
  10. package/dest/archiver/config.d.ts +37 -0
  11. package/dest/archiver/config.d.ts.map +1 -0
  12. package/dest/archiver/config.js +15 -9
  13. package/dest/archiver/data_retrieval.d.ts +71 -0
  14. package/dest/archiver/data_retrieval.d.ts.map +1 -0
  15. package/dest/archiver/data_retrieval.js +67 -77
  16. package/dest/archiver/errors.d.ts +4 -0
  17. package/dest/archiver/errors.d.ts.map +1 -0
  18. package/dest/archiver/errors.js +2 -1
  19. package/dest/archiver/index.d.ts +8 -0
  20. package/dest/archiver/index.d.ts.map +1 -0
  21. package/dest/archiver/index.js +1 -0
  22. package/dest/archiver/instrumentation.d.ts +27 -0
  23. package/dest/archiver/instrumentation.d.ts.map +1 -0
  24. package/dest/archiver/instrumentation.js +17 -29
  25. package/dest/archiver/kv_archiver_store/block_store.d.ts +87 -0
  26. package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -0
  27. package/dest/archiver/kv_archiver_store/block_store.js +127 -118
  28. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +17 -0
  29. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -0
  30. package/dest/archiver/kv_archiver_store/contract_class_store.js +37 -43
  31. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +13 -0
  32. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -0
  33. package/dest/archiver/kv_archiver_store/contract_instance_store.js +12 -7
  34. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +147 -0
  35. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -0
  36. package/dest/archiver/kv_archiver_store/kv_archiver_store.js +158 -135
  37. package/dest/archiver/kv_archiver_store/log_store.d.ts +47 -0
  38. package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -0
  39. package/dest/archiver/kv_archiver_store/log_store.js +256 -271
  40. package/dest/archiver/kv_archiver_store/message_store.d.ts +33 -0
  41. package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -0
  42. package/dest/archiver/kv_archiver_store/message_store.js +48 -42
  43. package/dest/archiver/kv_archiver_store/nullifier_store.d.ts +12 -0
  44. package/dest/archiver/kv_archiver_store/nullifier_store.d.ts.map +1 -0
  45. package/dest/archiver/kv_archiver_store/nullifier_store.js +42 -35
  46. package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +23 -0
  47. package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -0
  48. package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +24 -15
  49. package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +168 -0
  50. package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -0
  51. package/dest/archiver/memory_archiver_store/memory_archiver_store.js +231 -227
  52. package/dest/archiver/structs/data_retrieval.d.ts +27 -0
  53. package/dest/archiver/structs/data_retrieval.d.ts.map +1 -0
  54. package/dest/archiver/structs/data_retrieval.js +2 -5
  55. package/dest/archiver/structs/published.d.ts +11 -0
  56. package/dest/archiver/structs/published.d.ts.map +1 -0
  57. package/dest/archiver/structs/published.js +2 -1
  58. package/dest/factory.d.ts +10 -0
  59. package/dest/factory.d.ts.map +1 -0
  60. package/dest/factory.js +24 -32
  61. package/dest/index.d.ts +5 -0
  62. package/dest/index.d.ts.map +1 -0
  63. package/dest/index.js +1 -0
  64. package/dest/rpc/index.d.ts +9 -0
  65. package/dest/rpc/index.d.ts.map +1 -0
  66. package/dest/rpc/index.js +8 -7
  67. package/dest/test/index.d.ts +4 -0
  68. package/dest/test/index.d.ts.map +1 -0
  69. package/dest/test/index.js +1 -0
  70. package/dest/test/mock_archiver.d.ts +22 -0
  71. package/dest/test/mock_archiver.d.ts.map +1 -0
  72. package/dest/test/mock_archiver.js +13 -8
  73. package/dest/test/mock_l1_to_l2_message_source.d.ts +16 -0
  74. package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -0
  75. package/dest/test/mock_l1_to_l2_message_source.js +4 -4
  76. package/dest/test/mock_l2_block_source.d.ts +80 -0
  77. package/dest/test/mock_l2_block_source.d.ts.map +1 -0
  78. package/dest/test/mock_l2_block_source.js +67 -68
  79. package/package.json +15 -14
  80. package/src/archiver/config.ts +7 -1
  81. package/src/archiver/index.ts +1 -1
  82. package/src/factory.ts +7 -3
  83. package/src/rpc/index.ts +16 -3
@@ -0,0 +1,37 @@
1
+ import { type BlobSinkConfig } from '@aztec/blob-sink/client';
2
+ import { type ChainConfig } from '@aztec/circuit-types/config';
3
+ import { type L1ContractAddresses, type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
4
+ import { type ConfigMappingsType } from '@aztec/foundation/config';
5
+ /**
6
+ * There are 2 polling intervals used in this configuration. The first is the archiver polling interval, archiverPollingIntervalMS.
7
+ * This is the interval between successive calls to eth_blockNumber via viem.
8
+ * Results of calls to eth_blockNumber are cached by viem with this cache being updated periodically at the interval specified by viemPollingIntervalMS.
9
+ * As a result the maximum observed polling time for new blocks will be viemPollingIntervalMS + archiverPollingIntervalMS.
10
+ */
11
+ /**
12
+ * The archiver configuration.
13
+ */
14
+ export type ArchiverConfig = {
15
+ /** URL for an archiver service. If set, will return an archiver client as opposed to starting a new one. */
16
+ archiverUrl?: string;
17
+ /** URL for an L1 consensus client */
18
+ l1ConsensusHostUrl?: string;
19
+ /** The polling interval in ms for retrieving new L2 blocks and encrypted logs. */
20
+ archiverPollingIntervalMS?: number;
21
+ /** The number of L2 blocks the archiver will attempt to download at a time. */
22
+ archiverBatchSize?: number;
23
+ /** The polling interval viem uses in ms */
24
+ viemPollingIntervalMS?: number;
25
+ /** The deployed L1 contract addresses */
26
+ l1Contracts: L1ContractAddresses;
27
+ /** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
28
+ maxLogs?: number;
29
+ } & L1ReaderConfig & L1ContractsConfig & BlobSinkConfig & ChainConfig;
30
+ export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
31
+ /**
32
+ * Returns the archiver configuration from the environment variables.
33
+ * Note: If an environment variable is not set, the default value is used.
34
+ * @returns The archiver configuration.
35
+ */
36
+ export declare function getArchiverConfigFromEnv(): ArchiverConfig;
37
+ //# sourceMappingURL=config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,6BAA6B,CAAC;AACpF,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,qCAAqC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,GACjB,cAAc,GACd,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAmCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}
@@ -1,42 +1,48 @@
1
- import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
1
+ import { blobSinkConfigMapping } from '@aztec/blob-sink/client';
2
+ import { chainConfigMappings } from '@aztec/circuit-types/config';
3
+ import { l1ContractsConfigMappings, l1ReaderConfigMappings, } from '@aztec/ethereum';
2
4
  import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
3
5
  export const archiverConfigMappings = {
6
+ ...blobSinkConfigMapping,
4
7
  archiverUrl: {
5
8
  env: 'ARCHIVER_URL',
6
- description: 'URL for an archiver service. If set, will return an archiver client as opposed to starting a new one.'
9
+ description: 'URL for an archiver service. If set, will return an archiver client as opposed to starting a new one.',
7
10
  },
8
11
  l1ConsensusHostUrl: {
9
12
  env: 'L1_CONSENSUS_HOST_URL',
10
13
  description: 'URL for an L1 consensus client.',
11
- parseEnv: (val)=>val
14
+ parseEnv: (val) => val,
12
15
  },
13
16
  archiverPollingIntervalMS: {
14
17
  env: 'ARCHIVER_POLLING_INTERVAL_MS',
15
18
  description: 'The polling interval in ms for retrieving new L2 blocks and encrypted logs.',
16
- ...numberConfigHelper(500)
19
+ ...numberConfigHelper(500),
17
20
  },
18
21
  archiverBatchSize: {
19
22
  env: 'ARCHIVER_BATCH_SIZE',
20
23
  description: 'The number of L2 blocks the archiver will attempt to download at a time.',
21
- ...numberConfigHelper(100)
24
+ ...numberConfigHelper(100),
22
25
  },
23
26
  maxLogs: {
24
27
  env: 'ARCHIVER_MAX_LOGS',
25
28
  description: 'The max number of logs that can be obtained in 1 "getPublicLogs" call.',
26
- ...numberConfigHelper(1_000)
29
+ ...numberConfigHelper(1000),
27
30
  },
31
+ ...chainConfigMappings,
28
32
  ...l1ReaderConfigMappings,
29
33
  viemPollingIntervalMS: {
30
34
  env: 'ARCHIVER_VIEM_POLLING_INTERVAL_MS',
31
35
  description: 'The polling interval viem uses in ms',
32
- ...numberConfigHelper(1000)
36
+ ...numberConfigHelper(1000),
33
37
  },
34
- ...l1ContractsConfigMappings
38
+ ...l1ContractsConfigMappings,
35
39
  };
36
40
  /**
37
41
  * Returns the archiver configuration from the environment variables.
38
42
  * Note: If an environment variable is not set, the default value is used.
39
43
  * @returns The archiver configuration.
40
- */ export function getArchiverConfigFromEnv() {
44
+ */
45
+ export function getArchiverConfigFromEnv() {
41
46
  return getConfigFromMappings(archiverConfigMappings);
42
47
  }
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXVCLHFCQUFxQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckYsT0FBTyxFQUFvQixtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BGLE9BQU8sRUFJTCx5QkFBeUIsRUFDekIsc0JBQXNCLEdBQ3ZCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUEyQixxQkFBcUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBc0M5RyxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBdUM7SUFDeEUsR0FBRyxxQkFBcUI7SUFDeEIsV0FBVyxFQUFFO1FBQ1gsR0FBRyxFQUFFLGNBQWM7UUFDbkIsV0FBVyxFQUNULHVHQUF1RztLQUMxRztJQUNELGtCQUFrQixFQUFFO1FBQ2xCLEdBQUcsRUFBRSx1QkFBdUI7UUFDNUIsV0FBVyxFQUFFLGlDQUFpQztRQUM5QyxRQUFRLEVBQUUsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLEdBQUc7S0FDL0I7SUFDRCx5QkFBeUIsRUFBRTtRQUN6QixHQUFHLEVBQUUsOEJBQThCO1FBQ25DLFdBQVcsRUFBRSw2RUFBNkU7UUFDMUYsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUM7S0FDM0I7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSwwRUFBMEU7UUFDdkYsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUM7S0FDM0I7SUFDRCxPQUFPLEVBQUU7UUFDUCxHQUFHLEVBQUUsbUJBQW1CO1FBQ3hCLFdBQVcsRUFBRSx3RUFBd0U7UUFDckYsR0FBRyxrQkFBa0IsQ0FBQyxJQUFLLENBQUM7S0FDN0I7SUFDRCxHQUFHLG1CQUFtQjtJQUN0QixHQUFHLHNCQUFzQjtJQUN6QixxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsbUNBQW1DO1FBQ3hDLFdBQVcsRUFBRSxzQ0FBc0M7UUFDbkQsR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUM7S0FDNUI7SUFDRCxHQUFHLHlCQUF5QjtDQUM3QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx3QkFBd0I7SUFDdEMsT0FBTyxxQkFBcUIsQ0FBaUIsc0JBQXNCLENBQUMsQ0FBQztBQUN2RSxDQUFDIn0=
@@ -0,0 +1,71 @@
1
+ /// <reference types="node" resolution-mode="require"/>
2
+ /// <reference types="node" resolution-mode="require"/>
3
+ import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
4
+ import { InboxLeaf, L2Block } from '@aztec/circuit-types';
5
+ import { Fr, Proof } from '@aztec/circuits.js';
6
+ import { type EthAddress } from '@aztec/foundation/eth-address';
7
+ import { type Logger } from '@aztec/foundation/log';
8
+ import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
9
+ import { type Chain, type GetContractEventsReturnType, type GetContractReturnType, type Hex, type HttpTransport, type PublicClient } from 'viem';
10
+ import { type DataRetrieval } from './structs/data_retrieval.js';
11
+ import { type L1Published } from './structs/published.js';
12
+ /**
13
+ * Fetches new L2 blocks.
14
+ * @param publicClient - The viem public client to use for transaction retrieval.
15
+ * @param rollupAddress - The address of the rollup contract.
16
+ * @param searchStartBlock - The block number to use for starting the search.
17
+ * @param searchEndBlock - The highest block number that we should search up to.
18
+ * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
19
+ * @returns An array of block; as well as the next eth block to search from.
20
+ */
21
+ export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>, publicClient: PublicClient, blobSinkClient: BlobSinkClientInterface, searchStartBlock: bigint, searchEndBlock: bigint, logger?: Logger): Promise<L1Published<L2Block>[]>;
22
+ /**
23
+ * Processes newly received L2BlockProposed logs.
24
+ * @param rollup - The rollup contract
25
+ * @param publicClient - The viem public client to use for transaction retrieval.
26
+ * @param logs - L2BlockProposed logs.
27
+ * @returns - An array blocks.
28
+ */
29
+ export declare function processL2BlockProposedLogs(rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>, publicClient: PublicClient, blobSinkClient: BlobSinkClientInterface, logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>, logger: Logger): Promise<L1Published<L2Block>[]>;
30
+ export declare function getL1BlockTime(publicClient: PublicClient, blockNumber: bigint): Promise<bigint>;
31
+ /**
32
+ * Fetch L1 to L2 messages.
33
+ * @param publicClient - The viem public client to use for transaction retrieval.
34
+ * @param inboxAddress - The address of the inbox contract to fetch messages from.
35
+ * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
36
+ * @param searchStartBlock - The block number to use for starting the search.
37
+ * @param searchEndBlock - The highest block number that we should search up to.
38
+ * @returns An array of InboxLeaf and next eth block to search from.
39
+ */
40
+ export declare function retrieveL1ToL2Messages(inbox: GetContractReturnType<typeof InboxAbi, PublicClient<HttpTransport, Chain>>, searchStartBlock: bigint, searchEndBlock: bigint): Promise<DataRetrieval<InboxLeaf>>;
41
+ /** Retrieves L2ProofVerified events from the rollup contract. */
42
+ export declare function retrieveL2ProofVerifiedEvents(publicClient: PublicClient, rollupAddress: EthAddress, searchStartBlock: bigint, searchEndBlock?: bigint): Promise<{
43
+ l1BlockNumber: bigint;
44
+ l2BlockNumber: bigint;
45
+ proverId: Fr;
46
+ txHash: Hex;
47
+ }[]>;
48
+ /** Retrieve submitted proofs from the rollup contract */
49
+ export declare function retrieveL2ProofsFromRollup(publicClient: PublicClient, rollupAddress: EthAddress, searchStartBlock: bigint, searchEndBlock?: bigint): Promise<DataRetrieval<{
50
+ proof: Proof;
51
+ proverId: Fr;
52
+ l2BlockNumber: bigint;
53
+ txHash: `0x${string}`;
54
+ }>>;
55
+ export type SubmitBlockProof = {
56
+ archiveRoot: Fr;
57
+ proverId: Fr;
58
+ aggregationObject: Buffer;
59
+ proof: Proof;
60
+ };
61
+ /**
62
+ * Gets block metadata (header and archive snapshot) from the calldata of an L1 transaction.
63
+ * Assumes that the block was published from an EOA.
64
+ * TODO: Add retries and error management.
65
+ * @param publicClient - The viem public client to use for transaction retrieval.
66
+ * @param txHash - Hash of the tx that published it.
67
+ * @param l2BlockNum - L2 block number.
68
+ * @returns L2 block metadata (header and archive) from the calldata, deserialized
69
+ */
70
+ export declare function getProofFromSubmitProofTx(publicClient: PublicClient, txHash: `0x${string}`, expectedProverId: Fr): Promise<SubmitBlockProof>;
71
+ //# sourceMappingURL=data_retrieval.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { asyncPool } from '@aztec/foundation/async-pool';
5
5
  import { createLogger } from '@aztec/foundation/log';
6
6
  import { numToUInt32BE } from '@aztec/foundation/serialize';
7
7
  import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
8
- import { decodeFunctionData, getAbiItem, hexToBytes } from 'viem';
8
+ import { decodeFunctionData, getAbiItem, hexToBytes, } from 'viem';
9
9
  import { NoBlobBodiesFoundError } from './errors.js';
10
10
  /**
11
11
  * Fetches new L2 blocks.
@@ -15,7 +15,8 @@ import { NoBlobBodiesFoundError } from './errors.js';
15
15
  * @param searchEndBlock - The highest block number that we should search up to.
16
16
  * @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
17
17
  * @returns An array of block; as well as the next eth block to search from.
18
- */ export async function retrieveBlocksFromRollup(rollup, publicClient, blobSinkClient, searchStartBlock, searchEndBlock, logger = createLogger('archiver')) {
18
+ */
19
+ export async function retrieveBlocksFromRollup(rollup, publicClient, blobSinkClient, searchStartBlock, searchEndBlock, logger = createLogger('archiver')) {
19
20
  const retrievedBlocks = [];
20
21
  do {
21
22
  if (searchStartBlock > searchEndBlock) {
@@ -23,8 +24,8 @@ import { NoBlobBodiesFoundError } from './errors.js';
23
24
  }
24
25
  const l2BlockProposedLogs = (await rollup.getEvents.L2BlockProposed({}, {
25
26
  fromBlock: searchStartBlock,
26
- toBlock: searchEndBlock
27
- })).filter((log)=>log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
27
+ toBlock: searchEndBlock,
28
+ })).filter(log => log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
28
29
  if (l2BlockProposedLogs.length === 0) {
29
30
  break;
30
31
  }
@@ -33,7 +34,7 @@ import { NoBlobBodiesFoundError } from './errors.js';
33
34
  const newBlocks = await processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, l2BlockProposedLogs, logger);
34
35
  retrievedBlocks.push(...newBlocks);
35
36
  searchStartBlock = lastLog.blockNumber + 1n;
36
- }while (searchStartBlock <= searchEndBlock)
37
+ } while (searchStartBlock <= searchEndBlock);
37
38
  return retrievedBlocks;
38
39
  }
39
40
  /**
@@ -42,41 +43,35 @@ import { NoBlobBodiesFoundError } from './errors.js';
42
43
  * @param publicClient - The viem public client to use for transaction retrieval.
43
44
  * @param logs - L2BlockProposed logs.
44
45
  * @returns - An array blocks.
45
- */ export async function processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, logs, logger) {
46
+ */
47
+ export async function processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, logs, logger) {
46
48
  const retrievedBlocks = [];
47
- await asyncPool(10, logs, async (log)=>{
49
+ await asyncPool(10, logs, async (log) => {
48
50
  const l2BlockNumber = log.args.blockNumber;
49
51
  const archive = log.args.archive;
50
- const archiveFromChain = await rollup.read.archiveAt([
51
- l2BlockNumber
52
- ]);
53
- const blobHashes = log.args.versionedBlobHashes.map((blobHash)=>Buffer.from(blobHash.slice(2), 'hex'));
52
+ const archiveFromChain = await rollup.read.archiveAt([l2BlockNumber]);
53
+ const blobHashes = log.args.versionedBlobHashes.map(blobHash => Buffer.from(blobHash.slice(2), 'hex'));
54
54
  // The value from the event and contract will match only if the block is in the chain.
55
55
  if (archive === archiveFromChain) {
56
56
  const block = await getBlockFromRollupTx(publicClient, blobSinkClient, log.transactionHash, blobHashes, l2BlockNumber, rollup.address, logger);
57
57
  const l1 = {
58
58
  blockNumber: log.blockNumber,
59
59
  blockHash: log.blockHash,
60
- timestamp: await getL1BlockTime(publicClient, log.blockNumber)
60
+ timestamp: await getL1BlockTime(publicClient, log.blockNumber),
61
61
  };
62
- retrievedBlocks.push({
63
- data: block,
64
- l1
65
- });
66
- } else {
62
+ retrievedBlocks.push({ data: block, l1 });
63
+ }
64
+ else {
67
65
  logger.warn(`Ignoring L2 block ${l2BlockNumber} due to archive root mismatch`, {
68
66
  actual: archive,
69
- expected: archiveFromChain
67
+ expected: archiveFromChain,
70
68
  });
71
69
  }
72
70
  });
73
71
  return retrievedBlocks;
74
72
  }
75
73
  export async function getL1BlockTime(publicClient, blockNumber) {
76
- const block = await publicClient.getBlock({
77
- blockNumber,
78
- includeTransactions: false
79
- });
74
+ const block = await publicClient.getBlock({ blockNumber, includeTransactions: false });
80
75
  return block.timestamp;
81
76
  }
82
77
  /**
@@ -84,11 +79,12 @@ export async function getL1BlockTime(publicClient, blockNumber) {
84
79
  * @param forwarderData - The forwarder transaction input data
85
80
  * @param rollupAddress - The address of the rollup contract
86
81
  * @returns The calldata for the first 'propose' method call to the rollup contract
87
- */ function extractRollupProposeCalldata(forwarderData, rollupAddress) {
82
+ */
83
+ function extractRollupProposeCalldata(forwarderData, rollupAddress) {
88
84
  // TODO(#11451): custom forwarders
89
85
  const { functionName: forwarderFunctionName, args: forwarderArgs } = decodeFunctionData({
90
86
  abi: ForwarderAbi,
91
- data: forwarderData
87
+ data: forwarderData,
92
88
  });
93
89
  if (forwarderFunctionName !== 'forward') {
94
90
  throw new Error(`Unexpected forwarder method called ${forwarderFunctionName}`);
@@ -99,7 +95,7 @@ export async function getL1BlockTime(publicClient, blockNumber) {
99
95
  const [to, data] = forwarderArgs;
100
96
  // Find all rollup calls
101
97
  const rollupAddressLower = rollupAddress.toLowerCase();
102
- for(let i = 0; i < to.length; i++){
98
+ for (let i = 0; i < to.length; i++) {
103
99
  const addr = to[i];
104
100
  if (addr.toLowerCase() !== rollupAddressLower) {
105
101
  continue;
@@ -108,12 +104,14 @@ export async function getL1BlockTime(publicClient, blockNumber) {
108
104
  try {
109
105
  const { functionName: rollupFunctionName } = decodeFunctionData({
110
106
  abi: RollupAbi,
111
- data: callData
107
+ data: callData,
112
108
  });
113
109
  if (rollupFunctionName === 'propose') {
114
110
  return callData;
115
111
  }
116
- } catch (err) {
112
+ }
113
+ catch (err) {
114
+ // Skip invalid function data
117
115
  continue;
118
116
  }
119
117
  }
@@ -127,14 +125,14 @@ export async function getL1BlockTime(publicClient, blockNumber) {
127
125
  * @param txHash - Hash of the tx that published it.
128
126
  * @param l2BlockNum - L2 block number.
129
127
  * @returns L2 block from the calldata, deserialized
130
- */ async function getBlockFromRollupTx(publicClient, blobSinkClient, txHash, blobHashes, l2BlockNum, rollupAddress, logger) {
131
- const { input: forwarderData, blockHash } = await publicClient.getTransaction({
132
- hash: txHash
133
- });
128
+ */
129
+ async function getBlockFromRollupTx(publicClient, blobSinkClient, txHash, blobHashes, // WORKTODO(md): buffer32?
130
+ l2BlockNum, rollupAddress, logger) {
131
+ const { input: forwarderData, blockHash } = await publicClient.getTransaction({ hash: txHash });
134
132
  const rollupData = extractRollupProposeCalldata(forwarderData, rollupAddress);
135
133
  const { functionName: rollupFunctionName, args: rollupArgs } = decodeFunctionData({
136
134
  abi: RollupAbi,
137
- data: rollupData
135
+ data: rollupData,
138
136
  });
139
137
  if (rollupFunctionName !== 'propose') {
140
138
  throw new Error(`Unexpected rollup method called ${rollupFunctionName}`);
@@ -150,11 +148,13 @@ export async function getL1BlockTime(publicClient, blockNumber) {
150
148
  // Body.fromBlobFields to accept blob buffers directly
151
149
  let blockFields;
152
150
  try {
153
- blockFields = blobBodies.flatMap((b)=>b.toEncodedFields());
154
- } catch (err) {
151
+ blockFields = blobBodies.flatMap(b => b.toEncodedFields());
152
+ }
153
+ catch (err) {
155
154
  if (err instanceof BlobDeserializationError) {
156
155
  logger.fatal(err.message);
157
- } else {
156
+ }
157
+ else {
158
158
  logger.fatal('Unable to sync: failed to decode fetched blob, this blob was likely not created by us');
159
159
  }
160
160
  throw err;
@@ -183,8 +183,8 @@ export async function getL1BlockTime(publicClient, blockNumber) {
183
183
  throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${blockNumberFromHeader}`);
184
184
  }
185
185
  const archive = AppendOnlyTreeSnapshot.fromBuffer(Buffer.concat([
186
- Buffer.from(hexToBytes(decodedArgs.archive)),
187
- numToUInt32BE(Number(l2BlockNum + 1n))
186
+ Buffer.from(hexToBytes(decodedArgs.archive)), // L2Block.archive.root
187
+ numToUInt32BE(Number(l2BlockNum + 1n)), // L2Block.archive.nextAvailableLeafIndex
188
188
  ]));
189
189
  return new L2Block(archive, header, blockBody);
190
190
  }
@@ -196,7 +196,8 @@ export async function getL1BlockTime(publicClient, blockNumber) {
196
196
  * @param searchStartBlock - The block number to use for starting the search.
197
197
  * @param searchEndBlock - The highest block number that we should search up to.
198
198
  * @returns An array of InboxLeaf and next eth block to search from.
199
- */ export async function retrieveL1ToL2Messages(inbox, searchStartBlock, searchEndBlock) {
199
+ */
200
+ export async function retrieveL1ToL2Messages(inbox, searchStartBlock, searchEndBlock) {
200
201
  const retrievedL1ToL2Messages = [];
201
202
  do {
202
203
  if (searchStartBlock > searchEndBlock) {
@@ -204,57 +205,48 @@ export async function getL1BlockTime(publicClient, blockNumber) {
204
205
  }
205
206
  const messageSentLogs = (await inbox.getEvents.MessageSent({}, {
206
207
  fromBlock: searchStartBlock,
207
- toBlock: searchEndBlock
208
- })).filter((log)=>log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
208
+ toBlock: searchEndBlock,
209
+ })).filter(log => log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
209
210
  if (messageSentLogs.length === 0) {
210
211
  break;
211
212
  }
212
- for (const log of messageSentLogs){
213
+ for (const log of messageSentLogs) {
213
214
  const { index, hash } = log.args;
214
215
  retrievedL1ToL2Messages.push(new InboxLeaf(index, Fr.fromHexString(hash)));
215
216
  }
216
217
  // handles the case when there are no new messages:
217
- searchStartBlock = (messageSentLogs.findLast((msgLog)=>!!msgLog)?.blockNumber || searchStartBlock) + 1n;
218
- }while (searchStartBlock <= searchEndBlock)
219
- return {
220
- lastProcessedL1BlockNumber: searchStartBlock - 1n,
221
- retrievedData: retrievedL1ToL2Messages
222
- };
218
+ searchStartBlock = (messageSentLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
219
+ } while (searchStartBlock <= searchEndBlock);
220
+ return { lastProcessedL1BlockNumber: searchStartBlock - 1n, retrievedData: retrievedL1ToL2Messages };
223
221
  }
224
- /** Retrieves L2ProofVerified events from the rollup contract. */ export async function retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
222
+ /** Retrieves L2ProofVerified events from the rollup contract. */
223
+ export async function retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
225
224
  const logs = await publicClient.getLogs({
226
225
  address: rollupAddress.toString(),
227
226
  fromBlock: searchStartBlock,
228
227
  toBlock: searchEndBlock ? searchEndBlock : undefined,
229
228
  strict: true,
230
- event: getAbiItem({
231
- abi: RollupAbi,
232
- name: 'L2ProofVerified'
233
- })
229
+ event: getAbiItem({ abi: RollupAbi, name: 'L2ProofVerified' }),
234
230
  });
235
- return logs.map((log)=>({
236
- l1BlockNumber: log.blockNumber,
237
- l2BlockNumber: log.args.blockNumber,
238
- proverId: Fr.fromHexString(log.args.proverId),
239
- txHash: log.transactionHash
240
- }));
231
+ return logs.map(log => ({
232
+ l1BlockNumber: log.blockNumber,
233
+ l2BlockNumber: log.args.blockNumber,
234
+ proverId: Fr.fromHexString(log.args.proverId),
235
+ txHash: log.transactionHash,
236
+ }));
241
237
  }
242
- /** Retrieve submitted proofs from the rollup contract */ export async function retrieveL2ProofsFromRollup(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
238
+ /** Retrieve submitted proofs from the rollup contract */
239
+ export async function retrieveL2ProofsFromRollup(publicClient, rollupAddress, searchStartBlock, searchEndBlock) {
243
240
  const logs = await retrieveL2ProofVerifiedEvents(publicClient, rollupAddress, searchStartBlock, searchEndBlock);
244
241
  const retrievedData = [];
245
242
  const lastProcessedL1BlockNumber = logs.length > 0 ? logs.at(-1).l1BlockNumber : searchStartBlock - 1n;
246
- for (const { txHash, proverId, l2BlockNumber } of logs){
243
+ for (const { txHash, proverId, l2BlockNumber } of logs) {
247
244
  const proofData = await getProofFromSubmitProofTx(publicClient, txHash, proverId);
248
- retrievedData.push({
249
- proof: proofData.proof,
250
- proverId: proofData.proverId,
251
- l2BlockNumber,
252
- txHash
253
- });
245
+ retrievedData.push({ proof: proofData.proof, proverId: proofData.proverId, l2BlockNumber, txHash });
254
246
  }
255
247
  return {
256
248
  retrievedData,
257
- lastProcessedL1BlockNumber
249
+ lastProcessedL1BlockNumber,
258
250
  };
259
251
  }
260
252
  /**
@@ -265,14 +257,10 @@ export async function getL1BlockTime(publicClient, blockNumber) {
265
257
  * @param txHash - Hash of the tx that published it.
266
258
  * @param l2BlockNum - L2 block number.
267
259
  * @returns L2 block metadata (header and archive) from the calldata, deserialized
268
- */ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedProverId) {
269
- const { input: data } = await publicClient.getTransaction({
270
- hash: txHash
271
- });
272
- const { functionName, args } = decodeFunctionData({
273
- abi: RollupAbi,
274
- data
275
- });
260
+ */
261
+ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedProverId) {
262
+ const { input: data } = await publicClient.getTransaction({ hash: txHash });
263
+ const { functionName, args } = decodeFunctionData({ abi: RollupAbi, data });
276
264
  let proverId;
277
265
  let archiveRoot;
278
266
  let aggregationObject;
@@ -283,7 +271,8 @@ export async function getL1BlockTime(publicClient, blockNumber) {
283
271
  proverId = Fr.fromHexString(decodedArgs.args[6]);
284
272
  archiveRoot = Fr.fromHexString(decodedArgs.args[1]);
285
273
  proof = Proof.fromBuffer(Buffer.from(hexToBytes(decodedArgs.proof)));
286
- } else {
274
+ }
275
+ else {
287
276
  throw new Error(`Unexpected proof method called ${functionName}`);
288
277
  }
289
278
  if (!proverId.equals(expectedProverId)) {
@@ -293,6 +282,7 @@ export async function getL1BlockTime(publicClient, blockNumber) {
293
282
  proverId,
294
283
  aggregationObject,
295
284
  archiveRoot,
296
- proof
285
+ proof,
297
286
  };
298
287
  }
288
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_retrieval.js","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ export declare class NoBlobBodiesFoundError extends Error {
2
+ constructor(l2BlockNum: number);
3
+ }
4
+ //# sourceMappingURL=errors.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/archiver/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,UAAU,EAAE,MAAM;CAG/B"}
@@ -1,5 +1,6 @@
1
1
  export class NoBlobBodiesFoundError extends Error {
2
- constructor(l2BlockNum){
2
+ constructor(l2BlockNum) {
3
3
  super(`No blob bodies found for block ${l2BlockNum}`);
4
4
  }
5
5
  }
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL2Vycm9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsS0FBSztJQUMvQyxZQUFZLFVBQWtCO1FBQzVCLEtBQUssQ0FBQyxrQ0FBa0MsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0NBQ0YifQ==
@@ -0,0 +1,8 @@
1
+ export * from './archiver.js';
2
+ export * from './config.js';
3
+ export { type L1Published, type L1PublishedData } from './structs/published.js';
4
+ export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
5
+ export { ArchiverDataStore } from './archiver_store.js';
6
+ export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
7
+ export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';
8
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/archiver/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC"}
@@ -3,3 +3,4 @@ export * from './config.js';
3
3
  export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
4
4
  export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
5
5
  export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxlQUFlLENBQUM7QUFDOUIsY0FBYyxhQUFhLENBQUM7QUFFNUIsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sa0RBQWtELENBQUM7QUFFdkYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDL0UsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0RBQWdELENBQUMifQ==
@@ -0,0 +1,27 @@
1
+ import { type L2Block } from '@aztec/circuit-types';
2
+ import { type LmdbStatsCallback, type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
3
+ export declare class ArchiverInstrumentation {
4
+ private telemetry;
5
+ readonly tracer: Tracer;
6
+ private blockHeight;
7
+ private txCount;
8
+ private syncDuration;
9
+ private l1BlocksSynced;
10
+ private proofsSubmittedDelay;
11
+ private proofsSubmittedCount;
12
+ private dbMetrics;
13
+ private pruneCount;
14
+ private log;
15
+ private constructor();
16
+ static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
17
+ isEnabled(): boolean;
18
+ processNewBlocks(syncTimePerBlock: number, blocks: L2Block[]): void;
19
+ processPrune(): void;
20
+ updateLastProvenBlock(blockNumber: number): void;
21
+ processProofsVerified(logs: {
22
+ proverId: string;
23
+ l2BlockNumber: bigint;
24
+ delay: bigint;
25
+ }[]): void;
26
+ }
27
+ //# sourceMappingURL=instrumentation.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/archiver/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IAcd,OAAO,CAAC,SAAS;IAbrC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO;WAiDa,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,iBAAiB;IAU1E,SAAS,IAAI,OAAO;IAIpB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAS5D,YAAY;IAIZ,qBAAqB,CAAC,WAAW,EAAE,MAAM;IAIzC,qBAAqB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE;CAYhG"}