@aztec/archiver 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

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 (132) hide show
  1. package/README.md +19 -13
  2. package/dest/archiver.d.ts +76 -18
  3. package/dest/archiver.d.ts.map +1 -1
  4. package/dest/archiver.js +329 -162
  5. package/dest/config.d.ts +7 -3
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +43 -14
  8. package/dest/errors.d.ts +55 -9
  9. package/dest/errors.d.ts.map +1 -1
  10. package/dest/errors.js +81 -14
  11. package/dest/factory.d.ts +20 -9
  12. package/dest/factory.d.ts.map +1 -1
  13. package/dest/factory.js +87 -39
  14. package/dest/index.d.ts +12 -3
  15. package/dest/index.d.ts.map +1 -1
  16. package/dest/index.js +11 -2
  17. package/dest/l1/bin/retrieve-calldata.js +32 -28
  18. package/dest/l1/calldata_retriever.d.ts +81 -50
  19. package/dest/l1/calldata_retriever.d.ts.map +1 -1
  20. package/dest/l1/calldata_retriever.js +202 -260
  21. package/dest/l1/data_retrieval.d.ts +32 -18
  22. package/dest/l1/data_retrieval.d.ts.map +1 -1
  23. package/dest/l1/data_retrieval.js +42 -47
  24. package/dest/l1/spire_proposer.d.ts +5 -5
  25. package/dest/l1/spire_proposer.d.ts.map +1 -1
  26. package/dest/l1/spire_proposer.js +9 -17
  27. package/dest/l1/trace_tx.d.ts +12 -66
  28. package/dest/l1/trace_tx.d.ts.map +1 -1
  29. package/dest/l1/validate_historical_logs.d.ts +23 -0
  30. package/dest/l1/validate_historical_logs.d.ts.map +1 -0
  31. package/dest/l1/validate_historical_logs.js +108 -0
  32. package/dest/modules/contract_data_source_adapter.d.ts +25 -0
  33. package/dest/modules/contract_data_source_adapter.d.ts.map +1 -0
  34. package/dest/modules/contract_data_source_adapter.js +32 -0
  35. package/dest/modules/data_source_base.d.ts +74 -46
  36. package/dest/modules/data_source_base.d.ts.map +1 -1
  37. package/dest/modules/data_source_base.js +252 -190
  38. package/dest/modules/data_store_updater.d.ts +49 -17
  39. package/dest/modules/data_store_updater.d.ts.map +1 -1
  40. package/dest/modules/data_store_updater.js +218 -122
  41. package/dest/modules/instrumentation.d.ts +29 -3
  42. package/dest/modules/instrumentation.d.ts.map +1 -1
  43. package/dest/modules/instrumentation.js +67 -11
  44. package/dest/modules/l1_synchronizer.d.ts +16 -14
  45. package/dest/modules/l1_synchronizer.d.ts.map +1 -1
  46. package/dest/modules/l1_synchronizer.js +488 -219
  47. package/dest/modules/outbox_trees_resolver.d.ts +64 -0
  48. package/dest/modules/outbox_trees_resolver.d.ts.map +1 -0
  49. package/dest/modules/outbox_trees_resolver.js +184 -0
  50. package/dest/modules/validation.d.ts +30 -7
  51. package/dest/modules/validation.d.ts.map +1 -1
  52. package/dest/modules/validation.js +35 -17
  53. package/dest/store/block_store.d.ts +186 -74
  54. package/dest/store/block_store.d.ts.map +1 -1
  55. package/dest/store/block_store.js +810 -285
  56. package/dest/store/contract_class_store.d.ts +17 -4
  57. package/dest/store/contract_class_store.d.ts.map +1 -1
  58. package/dest/store/contract_class_store.js +42 -68
  59. package/dest/store/contract_instance_store.d.ts +28 -1
  60. package/dest/store/contract_instance_store.d.ts.map +1 -1
  61. package/dest/store/contract_instance_store.js +58 -6
  62. package/dest/store/data_stores.d.ts +68 -0
  63. package/dest/store/data_stores.d.ts.map +1 -0
  64. package/dest/store/data_stores.js +54 -0
  65. package/dest/store/function_names_cache.d.ts +17 -0
  66. package/dest/store/function_names_cache.d.ts.map +1 -0
  67. package/dest/store/function_names_cache.js +30 -0
  68. package/dest/store/l2_tips_cache.d.ts +25 -0
  69. package/dest/store/l2_tips_cache.d.ts.map +1 -0
  70. package/dest/store/l2_tips_cache.js +26 -0
  71. package/dest/store/log_store.d.ts +42 -37
  72. package/dest/store/log_store.d.ts.map +1 -1
  73. package/dest/store/log_store.js +262 -408
  74. package/dest/store/log_store_codec.d.ts +78 -0
  75. package/dest/store/log_store_codec.d.ts.map +1 -0
  76. package/dest/store/log_store_codec.js +110 -0
  77. package/dest/store/message_store.d.ts +11 -1
  78. package/dest/store/message_store.d.ts.map +1 -1
  79. package/dest/store/message_store.js +51 -9
  80. package/dest/test/fake_l1_state.d.ts +25 -1
  81. package/dest/test/fake_l1_state.d.ts.map +1 -1
  82. package/dest/test/fake_l1_state.js +166 -32
  83. package/dest/test/mock_archiver.d.ts +1 -1
  84. package/dest/test/mock_archiver.d.ts.map +1 -1
  85. package/dest/test/mock_archiver.js +3 -2
  86. package/dest/test/mock_l2_block_source.d.ts +61 -47
  87. package/dest/test/mock_l2_block_source.d.ts.map +1 -1
  88. package/dest/test/mock_l2_block_source.js +306 -211
  89. package/dest/test/mock_structs.d.ts +4 -1
  90. package/dest/test/mock_structs.d.ts.map +1 -1
  91. package/dest/test/mock_structs.js +15 -3
  92. package/dest/test/noop_l1_archiver.d.ts +17 -6
  93. package/dest/test/noop_l1_archiver.d.ts.map +1 -1
  94. package/dest/test/noop_l1_archiver.js +31 -11
  95. package/package.json +15 -14
  96. package/src/archiver.ts +427 -185
  97. package/src/config.ts +51 -13
  98. package/src/errors.ts +122 -21
  99. package/src/factory.ts +104 -29
  100. package/src/index.ts +19 -2
  101. package/src/l1/README.md +25 -68
  102. package/src/l1/bin/retrieve-calldata.ts +40 -27
  103. package/src/l1/calldata_retriever.ts +267 -379
  104. package/src/l1/data_retrieval.ts +66 -70
  105. package/src/l1/spire_proposer.ts +7 -15
  106. package/src/l1/validate_historical_logs.ts +140 -0
  107. package/src/modules/contract_data_source_adapter.ts +46 -0
  108. package/src/modules/data_source_base.ts +337 -238
  109. package/src/modules/data_store_updater.ts +259 -154
  110. package/src/modules/instrumentation.ts +71 -11
  111. package/src/modules/l1_synchronizer.ts +659 -269
  112. package/src/modules/outbox_trees_resolver.ts +220 -0
  113. package/src/modules/validation.ts +80 -23
  114. package/src/store/block_store.ts +989 -358
  115. package/src/store/contract_class_store.ts +49 -103
  116. package/src/store/contract_instance_store.ts +74 -11
  117. package/src/store/data_stores.ts +104 -0
  118. package/src/store/function_names_cache.ts +37 -0
  119. package/src/store/l2_tips_cache.ts +35 -0
  120. package/src/store/log_store.ts +302 -559
  121. package/src/store/log_store_codec.ts +143 -0
  122. package/src/store/message_store.ts +60 -10
  123. package/src/structs/inbox_message.ts +1 -1
  124. package/src/test/fake_l1_state.ts +213 -42
  125. package/src/test/mock_archiver.ts +3 -2
  126. package/src/test/mock_l2_block_source.ts +378 -233
  127. package/src/test/mock_structs.ts +25 -8
  128. package/src/test/noop_l1_archiver.ts +61 -12
  129. package/dest/store/kv_archiver_store.d.ts +0 -340
  130. package/dest/store/kv_archiver_store.d.ts.map +0 -1
  131. package/dest/store/kv_archiver_store.js +0 -446
  132. package/src/store/kv_archiver_store.ts +0 -639
package/dest/config.d.ts CHANGED
@@ -2,7 +2,7 @@ import { type BlobClientConfig } from '@aztec/blob-client/client/config';
2
2
  import { type L1ContractsConfig } from '@aztec/ethereum/config';
3
3
  import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
4
4
  import { type ConfigMappingsType } from '@aztec/foundation/config';
5
- import { type ChainConfig } from '@aztec/stdlib/config';
5
+ import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
6
6
  import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
7
7
  /**
8
8
  * The archiver configuration.
@@ -11,7 +11,7 @@ import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
11
11
  * Results of calls to eth_blockNumber are cached by viem with this cache being updated periodically at the interval specified by viemPollingIntervalMS.
12
12
  * As a result the maximum observed polling time for new blocks will be viemPollingIntervalMS + archiverPollingIntervalMS.
13
13
  */
14
- export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & BlobClientConfig & ChainConfig;
14
+ export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & BlobClientConfig & ChainConfig & Pick<SequencerConfig, 'blockDurationMs' | 'checkpointProposalSyncGraceSeconds'>;
15
15
  export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
16
16
  /**
17
17
  * Returns the archiver configuration from the environment variables.
@@ -24,7 +24,11 @@ export declare function mapArchiverConfig(config: Partial<ArchiverConfig>): {
24
24
  pollingIntervalMs: number | undefined;
25
25
  batchSize: number | undefined;
26
26
  skipValidateCheckpointAttestations: boolean | undefined;
27
+ skipPromoteProposedCheckpointDuringL1Sync: boolean | undefined;
27
28
  maxAllowedEthClientDriftSeconds: number | undefined;
28
29
  ethereumAllowNoDebugHosts: boolean | undefined;
30
+ skipHistoricalLogsCheck: boolean | undefined;
31
+ orphanPruneNoProposalTolerance: number | undefined;
32
+ skipOrphanProposedBlockPruning: boolean | undefined;
29
33
  };
30
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUEyQixNQUFNLGtDQUFrQyxDQUFDO0FBQ2xHLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQXVCLE1BQU0sc0JBQXNCLENBQUM7QUFDN0UsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHLHNCQUFzQixHQUNqRCxjQUFjLEdBQ2QsaUJBQWlCLEdBQ2pCLGdCQUFnQixHQUNoQixXQUFXLENBQUM7QUFFZCxlQUFPLE1BQU0sc0JBQXNCLEVBQUUsa0JBQWtCLENBQUMsY0FBYyxDQWdEckUsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBZ0Isd0JBQXdCLElBQUksY0FBYyxDQUV6RDtBQUVELGdGQUFnRjtBQUNoRix3QkFBZ0IsaUJBQWlCLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxjQUFjLENBQUM7Ozs7OztFQVFoRSJ9
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUEyQixNQUFNLGtDQUFrQyxDQUFDO0FBQ2xHLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQUUsS0FBSyxlQUFlLEVBQXVCLE1BQU0sc0JBQXNCLENBQUM7QUFDbkcsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUc5RTs7Ozs7O0dBTUc7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHLHNCQUFzQixHQUNqRCxjQUFjLEdBQ2QsaUJBQWlCLEdBQ2pCLGdCQUFnQixHQUNoQixXQUFXLEdBQ1gsSUFBSSxDQUFDLGVBQWUsRUFBRSxpQkFBaUIsR0FBRyxvQ0FBb0MsQ0FBQyxDQUFDO0FBRWxGLGVBQU8sTUFBTSxzQkFBc0IsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLENBZ0ZyRSxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQix3QkFBd0IsSUFBSSxjQUFjLENBRXpEO0FBRUQsZ0ZBQWdGO0FBQ2hGLHdCQUFnQixpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQzs7Ozs7Ozs7OztFQVloRSJ9
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,sBAAsB,GACjD,cAAc,GACd,iBAAiB,GACjB,gBAAgB,GAChB,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAgDrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;;;;;;EAQhE"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACnG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAG9E;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,sBAAsB,GACjD,cAAc,GACd,iBAAiB,GACjB,gBAAgB,GAChB,WAAW,GACX,IAAI,CAAC,eAAe,EAAE,iBAAiB,GAAG,oCAAoC,CAAC,CAAC;AAElF,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAgFrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;;;;;;;;;;EAYhE"}
package/dest/config.js CHANGED
@@ -1,9 +1,9 @@
1
1
  import { blobClientConfigMapping } from '@aztec/blob-client/client/config';
2
2
  import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
3
- import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
4
3
  import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
5
- import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
4
+ import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
6
5
  import { chainConfigMappings } from '@aztec/stdlib/config';
6
+ import { DEFAULT_ORPHAN_PRUNE_NO_PROPOSAL_TOLERANCE } from '@aztec/stdlib/timetable';
7
7
  export const archiverConfigMappings = {
8
8
  ...blobClientConfigMapping,
9
9
  archiverPollingIntervalMS: {
@@ -16,20 +16,29 @@ export const archiverConfigMappings = {
16
16
  description: 'The number of L2 blocks the archiver will attempt to download at a time.',
17
17
  ...numberConfigHelper(100)
18
18
  },
19
- maxLogs: {
20
- env: 'ARCHIVER_MAX_LOGS',
21
- description: 'The max number of logs that can be obtained in 1 "getPublicLogs" call.',
22
- ...numberConfigHelper(1_000)
23
- },
24
19
  archiverStoreMapSizeKb: {
25
20
  env: 'ARCHIVER_STORE_MAP_SIZE_KB',
26
- parseEnv: (val)=>val ? +val : undefined,
21
+ ...optionalNumberConfigHelper(),
27
22
  description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.'
28
23
  },
24
+ blockDurationMs: {
25
+ env: 'SEQ_BLOCK_DURATION_MS',
26
+ description: 'Duration per block in milliseconds when building multiple blocks per slot. Used to derive orphan proposed block pruning timing.',
27
+ ...optionalNumberConfigHelper()
28
+ },
29
+ checkpointProposalSyncGraceSeconds: {
30
+ env: 'CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS',
31
+ description: 'Consensus grace in seconds for a received checkpoint proposal to materialize into local proposed state.',
32
+ ...optionalNumberConfigHelper()
33
+ },
29
34
  skipValidateCheckpointAttestations: {
30
35
  description: 'Skip validating checkpoint attestations (for testing purposes only)',
31
36
  ...booleanConfigHelper(false)
32
37
  },
38
+ skipPromoteProposedCheckpointDuringL1Sync: {
39
+ description: 'Skip promoting proposed checkpoints during L1 sync (for testing purposes only)',
40
+ ...booleanConfigHelper(false)
41
+ },
33
42
  maxAllowedEthClientDriftSeconds: {
34
43
  env: 'MAX_ALLOWED_ETH_CLIENT_DRIFT_SECONDS',
35
44
  description: 'Maximum allowed drift in seconds between the Ethereum client and current time.',
@@ -40,6 +49,26 @@ export const archiverConfigMappings = {
40
49
  description: 'Whether to allow starting the archiver without debug/trace method support on Ethereum hosts',
41
50
  ...booleanConfigHelper(true)
42
51
  },
52
+ archiverSkipHistoricalLogsCheck: {
53
+ env: 'ARCHIVER_SKIP_HISTORICAL_LOGS_CHECK',
54
+ description: 'Skip the startup check that probes the L1 RPC for historical Rollup contract logs. ' + 'Set to true to bypass the check when the connected RPC node is known to prune old logs.',
55
+ ...booleanConfigHelper(false)
56
+ },
57
+ orphanPruneNoProposalTolerance: {
58
+ env: 'ARCHIVER_ORPHAN_PRUNE_NO_PROPOSAL_TOLERANCE',
59
+ description: 'Local tolerance in seconds before pruning an orphan block when no checkpoint proposal was received.',
60
+ ...numberConfigHelper(DEFAULT_ORPHAN_PRUNE_NO_PROPOSAL_TOLERANCE)
61
+ },
62
+ skipOrphanProposedBlockPruning: {
63
+ env: 'ARCHIVER_SKIP_ORPHAN_PROPOSED_BLOCK_PRUNING',
64
+ description: 'Skip pruning orphan proposed blocks that have no matching proposed checkpoint.',
65
+ ...booleanConfigHelper(false)
66
+ },
67
+ testPreloadStandardContracts: {
68
+ env: 'TEST_PRELOAD_STANDARD_CONTRACTS',
69
+ description: 'Preload the standard contracts (AuthRegistry, PublicChecks, HandshakeRegistry) into the contract store at ' + 'block 0. For test environments only, and only safe when genesis seeds the matching registration/deployment ' + 'nullifiers; otherwise a later on-chain publish would collide with the block-0 preload.',
70
+ ...booleanConfigHelper(false)
71
+ },
43
72
  ...chainConfigMappings,
44
73
  ...l1ReaderConfigMappings,
45
74
  viemPollingIntervalMS: {
@@ -47,11 +76,7 @@ export const archiverConfigMappings = {
47
76
  description: 'The polling interval viem uses in ms',
48
77
  ...numberConfigHelper(1000)
49
78
  },
50
- ...l1ContractsConfigMappings,
51
- l1Contracts: {
52
- description: 'The deployed L1 contract addresses',
53
- nested: l1ContractAddressesMapping
54
- }
79
+ ...l1ContractsConfigMappings
55
80
  };
56
81
  /**
57
82
  * Returns the archiver configuration from the environment variables.
@@ -65,7 +90,11 @@ export const archiverConfigMappings = {
65
90
  pollingIntervalMs: config.archiverPollingIntervalMS,
66
91
  batchSize: config.archiverBatchSize,
67
92
  skipValidateCheckpointAttestations: config.skipValidateCheckpointAttestations,
93
+ skipPromoteProposedCheckpointDuringL1Sync: config.skipPromoteProposedCheckpointDuringL1Sync,
68
94
  maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds,
69
- ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts
95
+ ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts,
96
+ skipHistoricalLogsCheck: config.archiverSkipHistoricalLogsCheck,
97
+ orphanPruneNoProposalTolerance: config.orphanPruneNoProposalTolerance,
98
+ skipOrphanProposedBlockPruning: config.skipOrphanProposedBlockPruning
70
99
  };
71
100
  }
package/dest/errors.d.ts CHANGED
@@ -1,12 +1,8 @@
1
+ import type { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
1
2
  import type { Fr } from '@aztec/foundation/schemas';
2
3
  export declare class NoBlobBodiesFoundError extends Error {
3
4
  constructor(l2BlockNum: number);
4
5
  }
5
- export declare class InitialBlockNumberNotSequentialError extends Error {
6
- readonly newBlockNumber: number;
7
- readonly previousBlockNumber: number | undefined;
8
- constructor(newBlockNumber: number, previousBlockNumber: number | undefined);
9
- }
10
6
  export declare class BlockNumberNotSequentialError extends Error {
11
7
  constructor(newBlockNumber: number, previous: number | undefined);
12
8
  }
@@ -16,10 +12,13 @@ export declare class InitialCheckpointNumberNotSequentialError extends Error {
16
12
  constructor(newCheckpointNumber: number, previousCheckpointNumber: number | undefined);
17
13
  }
18
14
  export declare class CheckpointNumberNotSequentialError extends Error {
19
- constructor(newCheckpointNumber: number, previous: number | undefined);
15
+ readonly newCheckpointNumber: CheckpointNumber;
16
+ readonly previousCheckpointNumber: CheckpointNumber | undefined;
17
+ constructor(newCheckpointNumber: CheckpointNumber, previousCheckpointNumber: CheckpointNumber | undefined, source?: 'proposed' | 'confirmed');
20
18
  }
21
- export declare class CheckpointNumberNotConsistentError extends Error {
22
- constructor(newCheckpointNumber: number, previous: number | undefined);
19
+ /** Thrown when a proposed block carries a checkpoint number that does not follow the latest one. */
20
+ export declare class BlockCheckpointNumberNotSequentialError extends Error {
21
+ constructor(blockNumber: BlockNumber, blockCheckpointNumber: CheckpointNumber, previous: CheckpointNumber | undefined);
23
22
  }
24
23
  export declare class BlockIndexNotSequentialError extends Error {
25
24
  constructor(newBlockIndex: number, previousBlockIndex: number | undefined);
@@ -33,9 +32,56 @@ export declare class CheckpointNotFoundError extends Error {
33
32
  export declare class BlockNotFoundError extends Error {
34
33
  constructor(blockNumber: number);
35
34
  }
35
+ /** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */
36
+ export declare class BlockAlreadyCheckpointedError extends Error {
37
+ readonly blockNumber: number;
38
+ constructor(blockNumber: number);
39
+ }
40
+ /** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */
41
+ export declare class L1ToL2MessagesNotReadyError extends Error {
42
+ readonly checkpointNumber: number;
43
+ readonly inboxTreeInProgress: bigint;
44
+ constructor(checkpointNumber: number, inboxTreeInProgress: bigint);
45
+ }
46
+ /** Thrown when a proposed checkpoint number is stale (already processed). */
47
+ export declare class ProposedCheckpointStaleError extends Error {
48
+ readonly proposedCheckpointNumber: number;
49
+ readonly currentProposedNumber: number;
50
+ constructor(proposedCheckpointNumber: number, currentProposedNumber: number);
51
+ }
52
+ /** Thrown when a proposed checkpoint number is not the expected latestTip + 1. */
53
+ export declare class ProposedCheckpointNotSequentialError extends Error {
54
+ readonly proposedCheckpointNumber: number;
55
+ readonly latestTipNumber: number;
56
+ constructor(proposedCheckpointNumber: number, latestTipNumber: number);
57
+ }
58
+ /** Thrown when a proposed checkpoint or block L2 slot has already expired on L1. */
59
+ export declare class BlockOrCheckpointSlotExpiredError extends Error {
60
+ readonly slot: number;
61
+ readonly nextSlotStart: bigint;
62
+ readonly l1TimestampSynced: bigint | undefined;
63
+ constructor(slot: number, nextSlotStart: bigint, l1TimestampSynced: bigint | undefined);
64
+ }
65
+ /** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */
66
+ export declare class NoProposedCheckpointToPromoteError extends Error {
67
+ constructor();
68
+ }
69
+ /** Thrown when the archive root of the proposed checkpoint does not match the expected one. */
70
+ export declare class ProposedCheckpointArchiveRootMismatchError extends Error {
71
+ readonly expectedArchiveRoot: Fr;
72
+ readonly actualArchiveRoot: Fr;
73
+ constructor(expectedArchiveRoot: Fr, actualArchiveRoot: Fr);
74
+ }
75
+ /** Thrown when the proposed checkpoint does not directly follow the latest confirmed checkpoint. */
76
+ export declare class ProposedCheckpointPromotionNotSequentialError extends Error {
77
+ readonly proposedCheckpointNumber: number;
78
+ readonly latestCheckpointNumber: number;
79
+ constructor(proposedCheckpointNumber: number, latestCheckpointNumber: number);
80
+ }
81
+ /** Thrown when a proposed block conflicts with an already checkpointed block (different content). */
36
82
  export declare class CannotOverwriteCheckpointedBlockError extends Error {
37
83
  readonly blockNumber: number;
38
84
  readonly lastCheckpointedBlock: number;
39
85
  constructor(blockNumber: number, lastCheckpointedBlock: number);
40
86
  }
41
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsb0NBQXFDLFNBQVEsS0FBSzthQUUzQyxjQUFjLEVBQUUsTUFBTTthQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUztJQUZ6RCxZQUNrQixjQUFjLEVBQUUsTUFBTSxFQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU94RDtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSS9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU83RDtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxZQUFZLG1CQUFtQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFJcEU7Q0FDRjtBQUVELHFCQUFhLGtDQUFtQyxTQUFRLEtBQUs7SUFDM0QsWUFBWSxtQkFBbUIsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSXBFO0NBQ0Y7QUFFRCxxQkFBYSw0QkFBNkIsU0FBUSxLQUFLO0lBQ3JELFlBQVksYUFBYSxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUl4RTtDQUNGO0FBRUQscUJBQWEsOEJBQStCLFNBQVEsS0FBSztJQUN2RCxZQUNFLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLG1CQUFtQixFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ3ZDLGVBQWUsRUFBRSxFQUFFLEVBQ25CLG9CQUFvQixFQUFFLEVBQUUsRUFLekI7Q0FDRjtBQUVELHFCQUFhLHVCQUF3QixTQUFRLEtBQUs7SUFDaEQsWUFBWSxnQkFBZ0IsRUFBRSxNQUFNLEVBRW5DO0NBQ0Y7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksV0FBVyxFQUFFLE1BQU0sRUFFOUI7Q0FDRjtBQUVELHFCQUFhLHFDQUFzQyxTQUFRLEtBQUs7YUFFNUMsV0FBVyxFQUFFLE1BQU07YUFDbkIscUJBQXFCLEVBQUUsTUFBTTtJQUYvQyxZQUNrQixXQUFXLEVBQUUsTUFBTSxFQUNuQixxQkFBcUIsRUFBRSxNQUFNLEVBTTlDO0NBQ0YifQ==
87
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JGLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUc3QjtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBRy9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQVE3RDtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSzthQUV6QyxtQkFBbUIsRUFBRSxnQkFBZ0I7YUFDckMsd0JBQXdCLEVBQUUsZ0JBQWdCLEdBQUcsU0FBUztJQUZ4RSxZQUNrQixtQkFBbUIsRUFBRSxnQkFBZ0IsRUFDckMsd0JBQXdCLEVBQUUsZ0JBQWdCLEdBQUcsU0FBUyxFQUN0RSxNQUFNLENBQUMsRUFBRSxVQUFVLEdBQUcsV0FBVyxFQU9sQztDQUNGO0FBRUQsb0dBQW9HO0FBQ3BHLHFCQUFhLHVDQUF3QyxTQUFRLEtBQUs7SUFDaEUsWUFDRSxXQUFXLEVBQUUsV0FBVyxFQUN4QixxQkFBcUIsRUFBRSxnQkFBZ0IsRUFDdkMsUUFBUSxFQUFFLGdCQUFnQixHQUFHLFNBQVMsRUFNdkM7Q0FDRjtBQUVELHFCQUFhLDRCQUE2QixTQUFRLEtBQUs7SUFDckQs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
@@ -1 +1 @@
1
- {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED,qBAAa,oCAAqC,SAAQ,KAAK;aAE3C,cAAc,EAAE,MAAM;aACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS;IAFzD,YACkB,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EAOxD;CACF;AAED,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAI/D;CACF;AAED,qBAAa,yCAA0C,SAAQ,KAAK;aAEhD,mBAAmB,EAAE,MAAM;aAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS;IAF9D,YACkB,mBAAmB,EAAE,MAAM,EAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS,EAO7D;CACF;AAED,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,YAAY,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAIpE;CACF;AAED,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,YAAY,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAIpE;CACF;AAED,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,YAAY,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,EAIxE;CACF;AAED,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,YACE,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,eAAe,EAAE,EAAE,EACnB,oBAAoB,EAAE,EAAE,EAKzB;CACF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,YAAY,gBAAgB,EAAE,MAAM,EAEnC;CACF;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,WAAW,EAAE,MAAM,EAE9B;CACF;AAED,qBAAa,qCAAsC,SAAQ,KAAK;aAE5C,WAAW,EAAE,MAAM;aACnB,qBAAqB,EAAE,MAAM;IAF/C,YACkB,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAM9C;CACF"}
1
+ {"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
package/dest/errors.js CHANGED
@@ -1,18 +1,13 @@
1
1
  export class NoBlobBodiesFoundError extends Error {
2
2
  constructor(l2BlockNum){
3
3
  super(`No blob bodies found for block ${l2BlockNum}`);
4
- }
5
- }
6
- export class InitialBlockNumberNotSequentialError extends Error {
7
- newBlockNumber;
8
- previousBlockNumber;
9
- constructor(newBlockNumber, previousBlockNumber){
10
- super(`Cannot insert new block ${newBlockNumber} given previous block number in store is ${previousBlockNumber ?? 'undefined'}`), this.newBlockNumber = newBlockNumber, this.previousBlockNumber = previousBlockNumber;
4
+ this.name = 'NoBlobBodiesFoundError';
11
5
  }
12
6
  }
13
7
  export class BlockNumberNotSequentialError extends Error {
14
8
  constructor(newBlockNumber, previous){
15
- super(`Cannot insert new block ${newBlockNumber} given previous block number in batch is ${previous ?? 'undefined'}`);
9
+ super(`Cannot insert new block ${newBlockNumber} given previous block number is ${previous ?? 'undefined'}`);
10
+ this.name = 'BlockNumberNotSequentialError';
16
11
  }
17
12
  }
18
13
  export class InitialCheckpointNumberNotSequentialError extends Error {
@@ -20,39 +15,111 @@ export class InitialCheckpointNumberNotSequentialError extends Error {
20
15
  previousCheckpointNumber;
21
16
  constructor(newCheckpointNumber, previousCheckpointNumber){
22
17
  super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number in store is ${previousCheckpointNumber ?? 'undefined'}`), this.newCheckpointNumber = newCheckpointNumber, this.previousCheckpointNumber = previousCheckpointNumber;
18
+ this.name = 'InitialCheckpointNumberNotSequentialError';
23
19
  }
24
20
  }
25
21
  export class CheckpointNumberNotSequentialError extends Error {
26
- constructor(newCheckpointNumber, previous){
27
- super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number in batch is ${previous ?? 'undefined'}`);
22
+ newCheckpointNumber;
23
+ previousCheckpointNumber;
24
+ constructor(newCheckpointNumber, previousCheckpointNumber, source){
25
+ const qualifier = source ? `${source} ` : '';
26
+ super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous ${qualifier}checkpoint number is ${previousCheckpointNumber ?? 'undefined'}`), this.newCheckpointNumber = newCheckpointNumber, this.previousCheckpointNumber = previousCheckpointNumber;
27
+ this.name = 'CheckpointNumberNotSequentialError';
28
28
  }
29
29
  }
30
- export class CheckpointNumberNotConsistentError extends Error {
31
- constructor(newCheckpointNumber, previous){
32
- super(`Cannot insert block for new checkpoint ${newCheckpointNumber} given previous block was checkpoint ${previous ?? 'undefined'}`);
30
+ /** Thrown when a proposed block carries a checkpoint number that does not follow the latest one. */ export class BlockCheckpointNumberNotSequentialError extends Error {
31
+ constructor(blockNumber, blockCheckpointNumber, previous){
32
+ super(`Cannot insert new block ${blockNumber} for checkpoint ${blockCheckpointNumber} given previous checkpoint number is ${previous ?? 'undefined'}`);
33
+ this.name = 'BlockCheckpointNumberNotSequentialError';
33
34
  }
34
35
  }
35
36
  export class BlockIndexNotSequentialError extends Error {
36
37
  constructor(newBlockIndex, previousBlockIndex){
37
38
  super(`Cannot insert new block at checkpoint index ${newBlockIndex} given previous block index is ${previousBlockIndex ?? 'undefined'}`);
39
+ this.name = 'BlockIndexNotSequentialError';
38
40
  }
39
41
  }
40
42
  export class BlockArchiveNotConsistentError extends Error {
41
43
  constructor(newBlockNumber, previousBlockNumber, newBlockArchive, previousBlockArchive){
42
44
  super(`Cannot insert new block number ${newBlockNumber} with archive ${newBlockArchive.toString()} previous block number is ${previousBlockNumber ?? 'undefined'}, previous archive is ${previousBlockArchive?.toString() ?? 'undefined'}`);
45
+ this.name = 'BlockArchiveNotConsistentError';
43
46
  }
44
47
  }
45
48
  export class CheckpointNotFoundError extends Error {
46
49
  constructor(checkpointNumber){
47
50
  super(`Failed to find expected checkpoint number ${checkpointNumber}`);
51
+ this.name = 'CheckpointNotFoundError';
48
52
  }
49
53
  }
50
54
  export class BlockNotFoundError extends Error {
51
55
  constructor(blockNumber){
52
56
  super(`Failed to find expected block number ${blockNumber}`);
57
+ this.name = 'BlockNotFoundError';
58
+ }
59
+ }
60
+ /** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */ export class BlockAlreadyCheckpointedError extends Error {
61
+ blockNumber;
62
+ constructor(blockNumber){
63
+ super(`Block ${blockNumber} has already been checkpointed with the same content`), this.blockNumber = blockNumber;
64
+ this.name = 'BlockAlreadyCheckpointedError';
65
+ }
66
+ }
67
+ /** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */ export class L1ToL2MessagesNotReadyError extends Error {
68
+ checkpointNumber;
69
+ inboxTreeInProgress;
70
+ constructor(checkpointNumber, inboxTreeInProgress){
71
+ super(`Cannot get L1 to L2 messages for checkpoint ${checkpointNumber}: ` + `inbox tree in progress is ${inboxTreeInProgress}, messages not yet sealed`), this.checkpointNumber = checkpointNumber, this.inboxTreeInProgress = inboxTreeInProgress;
72
+ this.name = 'L1ToL2MessagesNotReadyError';
73
+ }
74
+ }
75
+ /** Thrown when a proposed checkpoint number is stale (already processed). */ export class ProposedCheckpointStaleError extends Error {
76
+ proposedCheckpointNumber;
77
+ currentProposedNumber;
78
+ constructor(proposedCheckpointNumber, currentProposedNumber){
79
+ super(`Stale proposed checkpoint ${proposedCheckpointNumber}: current proposed is ${currentProposedNumber}`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.currentProposedNumber = currentProposedNumber;
80
+ this.name = 'ProposedCheckpointStaleError';
81
+ }
82
+ }
83
+ /** Thrown when a proposed checkpoint number is not the expected latestTip + 1. */ export class ProposedCheckpointNotSequentialError extends Error {
84
+ proposedCheckpointNumber;
85
+ latestTipNumber;
86
+ constructor(proposedCheckpointNumber, latestTipNumber){
87
+ super(`Proposed checkpoint ${proposedCheckpointNumber} is not sequential: expected ${latestTipNumber + 1} (latest tip + 1, where tip is highest of confirmed or pending)`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.latestTipNumber = latestTipNumber;
88
+ this.name = 'ProposedCheckpointNotSequentialError';
89
+ }
90
+ }
91
+ /** Thrown when a proposed checkpoint or block L2 slot has already expired on L1. */ export class BlockOrCheckpointSlotExpiredError extends Error {
92
+ slot;
93
+ nextSlotStart;
94
+ l1TimestampSynced;
95
+ constructor(slot, nextSlotStart, l1TimestampSynced){
96
+ super(`Checkpoint or block for slot ${slot} is expired: L1 synced to ${l1TimestampSynced} which is past the next slot start ${nextSlotStart}. ` + `If the checkpoint still lands via a late L1 tx, the archiver will pick it up via normal L1-sync (not the pending-queue shortcut).`), this.slot = slot, this.nextSlotStart = nextSlotStart, this.l1TimestampSynced = l1TimestampSynced;
97
+ this.name = 'BlockOrCheckpointSlotExpiredError';
98
+ }
99
+ }
100
+ /** Thrown when attempting to promote a proposed checkpoint but no proposed checkpoint exists in the store. */ export class NoProposedCheckpointToPromoteError extends Error {
101
+ constructor(){
102
+ super('Cannot promote proposed checkpoint: no proposed checkpoint exists');
103
+ this.name = 'NoProposedCheckpointToPromoteError';
104
+ }
105
+ }
106
+ /** Thrown when the archive root of the proposed checkpoint does not match the expected one. */ export class ProposedCheckpointArchiveRootMismatchError extends Error {
107
+ expectedArchiveRoot;
108
+ actualArchiveRoot;
109
+ constructor(expectedArchiveRoot, actualArchiveRoot){
110
+ super(`Cannot promote proposed checkpoint: archive root mismatch (expected ${expectedArchiveRoot}, got ${actualArchiveRoot})`), this.expectedArchiveRoot = expectedArchiveRoot, this.actualArchiveRoot = actualArchiveRoot;
111
+ this.name = 'ProposedCheckpointArchiveRootMismatchError';
112
+ }
113
+ }
114
+ /** Thrown when the proposed checkpoint does not directly follow the latest confirmed checkpoint. */ export class ProposedCheckpointPromotionNotSequentialError extends Error {
115
+ proposedCheckpointNumber;
116
+ latestCheckpointNumber;
117
+ constructor(proposedCheckpointNumber, latestCheckpointNumber){
118
+ super(`Cannot promote proposed checkpoint: not sequential (latest ${latestCheckpointNumber}, proposed ${proposedCheckpointNumber})`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.latestCheckpointNumber = latestCheckpointNumber;
119
+ this.name = 'ProposedCheckpointPromotionNotSequentialError';
53
120
  }
54
121
  }
55
- export class CannotOverwriteCheckpointedBlockError extends Error {
122
+ /** Thrown when a proposed block conflicts with an already checkpointed block (different content). */ export class CannotOverwriteCheckpointedBlockError extends Error {
56
123
  blockNumber;
57
124
  lastCheckpointedBlock;
58
125
  constructor(blockNumber, lastCheckpointedBlock){
package/dest/factory.d.ts CHANGED
@@ -1,21 +1,32 @@
1
- import type { DataStoreConfig } from '@aztec/kv-store/config';
2
- import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
1
+ import type { BlockHash } from '@aztec/stdlib/block';
2
+ import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
3
+ import type { BlockHeader } from '@aztec/stdlib/tx';
3
4
  import { Archiver, type ArchiverDeps } from './archiver.js';
4
5
  import { type ArchiverConfig } from './config.js';
5
- import { KVArchiverDataStore } from './store/kv_archiver_store.js';
6
+ import { type ArchiverDataStores } from './store/data_stores.js';
6
7
  export declare const ARCHIVER_STORE_NAME = "archiver";
7
8
  /** Creates an archiver store. */
8
- export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig, l1Constants: Pick<L1RollupConstants, 'epochDuration'>): Promise<KVArchiverDataStore>;
9
+ export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb'> & DataStoreConfig, genesisBlockHash: BlockHash): Promise<ArchiverDataStores>;
9
10
  /**
10
11
  * Creates a local archiver.
11
12
  * @param config - The archiver configuration.
12
13
  * @param deps - The archiver dependencies (blobClient, epochCache, dateProvider, telemetry).
13
14
  * @param opts - The options.
15
+ * @param initialHeader - The genesis block header from world-state, used to answer block-0 queries.
16
+ * @param initialBlockHash - Precomputed hash of `initialHeader`. Hoisted to the caller so the archiver
17
+ * can expose `getGenesisBlockHash()` synchronously.
14
18
  * @returns The local archiver.
15
19
  */
16
- export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
20
+ export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts: {
17
21
  blockUntilSync: boolean;
18
- }): Promise<Archiver>;
19
- /** Registers protocol contracts in the archiver store. */
20
- export declare function registerProtocolContracts(store: KVArchiverDataStore): Promise<void>;
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFPOUQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQU1yRSxPQUFPLEVBQUUsUUFBUSxFQUFFLEtBQUssWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzVELE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBcUIsTUFBTSxhQUFhLENBQUM7QUFHckUsT0FBTyxFQUF1QixtQkFBbUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRXhGLGVBQU8sTUFBTSxtQkFBbUIsYUFBYSxDQUFDO0FBRTlDLGlDQUFpQztBQUNqQyx3QkFBc0IsbUJBQW1CLENBQ3ZDLFVBQVUsRUFBRSxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixHQUFHLFNBQVMsQ0FBQyxHQUFHLGVBQWUsRUFDeEYsV0FBVyxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxlQUFlLENBQUMsZ0NBUXREO0FBRUQ7Ozs7OztHQU1HO0FBQ0gsd0JBQXNCLGNBQWMsQ0FDbEMsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEVBQ3hDLElBQUksRUFBRSxZQUFZLEVBQ2xCLElBQUksR0FBRTtJQUFFLGNBQWMsRUFBRSxPQUFPLENBQUE7Q0FBNkIsR0FDM0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQThHbkI7QUFFRCwwREFBMEQ7QUFDMUQsd0JBQXNCLHlCQUF5QixDQUFDLEtBQUssRUFBRSxtQkFBbUIsaUJBb0J6RSJ9
22
+ } | undefined, initialHeader: BlockHeader, initialBlockHash: BlockHash): Promise<Archiver>;
23
+ /** Registers protocol contracts in the archiver store. Idempotent — skips contracts that already exist (e.g. on node restart). */
24
+ export declare function registerProtocolContracts(stores: ArchiverDataStores): Promise<void>;
25
+ /**
26
+ * Preloads the standard contracts (AuthRegistry, PublicChecks, HandshakeRegistry) into the archiver store at block 0,
27
+ * mirroring {@link registerProtocolContracts}. Only invoked for test environments (via `testPreloadStandardContracts`),
28
+ * which also seed the matching registration/deployment nullifiers into the genesis nullifier tree so the store and tree
29
+ * stay consistent. Idempotent — skips contracts that already exist (e.g. on node restart).
30
+ */
31
+ export declare function registerStandardContracts(stores: ArchiverDataStores): Promise<void>;
32
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sS0FBSyxFQUFtQixTQUFTLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUd0RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUs5RCxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQU1wRCxPQUFPLEVBQUUsUUFBUSxFQUFFLEtBQUssWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzVELE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBcUIsTUFBTSxhQUFhLENBQUM7QUFHckUsT0FBTyxFQUF1QixLQUFLLGtCQUFrQixFQUE0QixNQUFNLHdCQUF3QixDQUFDO0FBR2hILGVBQU8sTUFBTSxtQkFBbUIsYUFBYSxDQUFDO0FBRTlDLGlDQUFpQztBQUNqQyx3QkFBc0IsbUJBQW1CLENBQ3ZDLFVBQVUsRUFBRSxJQUFJLENBQUMsY0FBYyxFQUFFLHdCQUF3QixDQUFDLEdBQUcsZUFBZSxFQUM1RSxnQkFBZ0IsRUFBRSxTQUFTLEdBQzFCLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQU83QjtBQUVEOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSxjQUFjLEdBQUcsZUFBZSxFQUN4QyxJQUFJLEVBQUUsWUFBWSxFQUNsQixJQUFJOzthQUF3RCxFQUM1RCxhQUFhLEVBQUUsV0FBVyxFQUMxQixnQkFBZ0IsRUFBRSxTQUFTLEdBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0F3SW5CO0FBRUQsb0lBQWtJO0FBQ2xJLHdCQUFzQix5QkFBeUIsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLGlCQXlCekU7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQix5QkFBeUIsQ0FBQyxNQUFNLEVBQUUsa0JBQWtCLGlCQXNCekUifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAO9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAuB,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExF,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,EACxF,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,gCAQtD;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,QAAQ,CAAC,CA8GnB;AAED,0DAA0D;AAC1D,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,iBAoBzE"}
1
+ {"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAmB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAMpD,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAuB,KAAK,kBAAkB,EAA4B,MAAM,wBAAwB,CAAC;AAGhH,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,CAAC,GAAG,eAAe,EAC5E,gBAAgB,EAAE,SAAS,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAO7B;AAED;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI;;aAAwD,EAC5D,aAAa,EAAE,WAAW,EAC1B,gBAAgB,EAAE,SAAS,GAC1B,OAAO,CAAC,QAAQ,CAAC,CAwInB;AAED,oIAAkI;AAClI,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,iBAyBzE;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,iBAsBzE"}