@aztec/archiver 0.55.1 → 0.57.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 (78) hide show
  1. package/README.md +1 -1
  2. package/dest/archiver/archiver.d.ts +27 -25
  3. package/dest/archiver/archiver.d.ts.map +1 -1
  4. package/dest/archiver/archiver.js +391 -169
  5. package/dest/archiver/archiver_store.d.ts +47 -23
  6. package/dest/archiver/archiver_store.d.ts.map +1 -1
  7. package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
  8. package/dest/archiver/archiver_store_test_suite.js +75 -42
  9. package/dest/archiver/config.js +6 -6
  10. package/dest/archiver/data_retrieval.d.ts +32 -5
  11. package/dest/archiver/data_retrieval.d.ts.map +1 -1
  12. package/dest/archiver/data_retrieval.js +126 -16
  13. package/dest/archiver/epoch_helpers.d.ts +15 -0
  14. package/dest/archiver/epoch_helpers.d.ts.map +1 -0
  15. package/dest/archiver/epoch_helpers.js +23 -0
  16. package/dest/archiver/kv_archiver_store/block_store.d.ts +22 -3
  17. package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
  18. package/dest/archiver/kv_archiver_store/block_store.js +75 -12
  19. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +2 -1
  20. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -1
  21. package/dest/archiver/kv_archiver_store/contract_class_store.js +11 -4
  22. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +1 -0
  23. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -1
  24. package/dest/archiver/kv_archiver_store/contract_instance_store.js +4 -1
  25. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +31 -23
  26. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
  27. package/dest/archiver/kv_archiver_store/kv_archiver_store.js +65 -38
  28. package/dest/archiver/kv_archiver_store/log_store.d.ts +4 -5
  29. package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
  30. package/dest/archiver/kv_archiver_store/log_store.js +18 -14
  31. package/dest/archiver/kv_archiver_store/message_store.d.ts +2 -0
  32. package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
  33. package/dest/archiver/kv_archiver_store/message_store.js +18 -8
  34. package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +1 -0
  35. package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -1
  36. package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +4 -1
  37. package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +23 -39
  38. package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
  39. package/dest/archiver/memory_archiver_store/memory_archiver_store.js +132 -91
  40. package/dest/index.d.ts +0 -1
  41. package/dest/index.d.ts.map +1 -1
  42. package/dest/index.js +2 -2
  43. package/dest/test/index.d.ts +2 -0
  44. package/dest/test/index.d.ts.map +1 -0
  45. package/dest/test/index.js +2 -0
  46. package/dest/test/mock_l2_block_source.d.ts +73 -0
  47. package/dest/test/mock_l2_block_source.d.ts.map +1 -0
  48. package/dest/test/mock_l2_block_source.js +134 -0
  49. package/package.json +15 -11
  50. package/src/archiver/archiver.ts +531 -248
  51. package/src/archiver/archiver_store.ts +53 -31
  52. package/src/archiver/archiver_store_test_suite.ts +93 -81
  53. package/src/archiver/config.ts +5 -5
  54. package/src/archiver/data_retrieval.ts +189 -30
  55. package/src/archiver/epoch_helpers.ts +26 -0
  56. package/src/archiver/kv_archiver_store/block_store.ts +87 -12
  57. package/src/archiver/kv_archiver_store/contract_class_store.ts +18 -5
  58. package/src/archiver/kv_archiver_store/contract_instance_store.ts +4 -0
  59. package/src/archiver/kv_archiver_store/kv_archiver_store.ts +74 -47
  60. package/src/archiver/kv_archiver_store/log_store.ts +18 -18
  61. package/src/archiver/kv_archiver_store/message_store.ts +18 -5
  62. package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts +4 -0
  63. package/src/archiver/memory_archiver_store/memory_archiver_store.ts +155 -108
  64. package/src/index.ts +1 -2
  65. package/src/test/index.ts +1 -0
  66. package/src/test/mock_l2_block_source.ts +165 -0
  67. package/dest/archiver/eth_log_handlers.d.ts +0 -59
  68. package/dest/archiver/eth_log_handlers.d.ts.map +0 -1
  69. package/dest/archiver/eth_log_handlers.js +0 -155
  70. package/dest/archiver/kv_archiver_store/block_body_store.d.ts +0 -34
  71. package/dest/archiver/kv_archiver_store/block_body_store.d.ts.map +0 -1
  72. package/dest/archiver/kv_archiver_store/block_body_store.js +0 -65
  73. package/dest/archiver/kv_archiver_store/proven_store.d.ts +0 -14
  74. package/dest/archiver/kv_archiver_store/proven_store.d.ts.map +0 -1
  75. package/dest/archiver/kv_archiver_store/proven_store.js +0 -30
  76. package/src/archiver/eth_log_handlers.ts +0 -213
  77. package/src/archiver/kv_archiver_store/block_body_store.ts +0 -74
  78. package/src/archiver/kv_archiver_store/proven_store.ts +0 -34
@@ -12,6 +12,9 @@ export class L1ToL2MessageStore {
12
12
  this.store = new Map();
13
13
  _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize.set(this, 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT);
14
14
  }
15
+ getTotalL1ToL2MessageCount() {
16
+ return BigInt(this.store.size);
17
+ }
15
18
  addMessage(message) {
16
19
  if (message.index >= __classPrivateFieldGet(this, _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize, "f")) {
17
20
  throw new Error(`Message index ${message.index} out of subtree range`);
@@ -62,4 +65,4 @@ export class L1ToL2MessageStore {
62
65
  }
63
66
  }
64
67
  _L1ToL2MessageStore_l1ToL2MessagesSubtreeSize = new WeakMap();
65
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsMkJBQTJCLEVBQzNCLG1DQUFtQyxHQUNwQyxNQUFNLDhCQUE4QixDQUFDO0FBR3RDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQVE3QjtRQVBBOztXQUVHO1FBQ08sVUFBSyxHQUFvQixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBRTdDLHdEQUE2QixDQUFDLElBQUksMkJBQTJCLEVBQUM7SUFFL0MsQ0FBQztJQUVoQixVQUFVLENBQUMsT0FBa0I7UUFDM0IsSUFBSSxPQUFPLENBQUMsS0FBSyxJQUFJLHVCQUFBLElBQUkscURBQTJCLEVBQUUsQ0FBQztZQUNyRCxNQUFNLElBQUksS0FBSyxDQUFDLGlCQUFpQixPQUFPLENBQUMsS0FBSyx1QkFBdUIsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxNQUFNLEdBQUcsR0FBRyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3RELElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELFdBQVcsQ0FBQyxXQUFtQjtRQUM3QixNQUFNLFFBQVEsR0FBUyxFQUFFLENBQUM7UUFDMUIsSUFBSSxxQkFBcUIsR0FBRyxLQUFLLENBQUM7UUFDbEMsS0FBSyxJQUFJLFlBQVksR0FBRyxDQUFDLEVBQUUsWUFBWSxHQUFHLHVCQUFBLElBQUkscURBQTJCLEVBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQztZQUMxRixpREFBaUQ7WUFDakQsTUFBTSxHQUFHLEdBQUcsR0FBRyxXQUFXLElBQUksWUFBWSxFQUFFLENBQUM7WUFDN0MsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDcEMsSUFBSSxPQUFPLEVBQUUsQ0FBQztnQkFDWixJQUFJLHFCQUFxQixFQUFFLENBQUM7b0JBQzFCLE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLFdBQVcsRUFBRSxDQUFDLENBQUM7Z0JBQ3hFLENBQUM7Z0JBQ0QsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUN6QixDQUFDO2lCQUFNLENBQUM7Z0JBQ04scUJBQXFCLEdBQUcsSUFBSSxDQUFDO2dCQUM3Qiw4R0FBOEc7Z0JBQzlHLG1GQUFtRjtZQUNyRixDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFRDs7Ozs7T0FLRztJQUNILGVBQWUsQ0FBQyxhQUFpQixFQUFFLFVBQWtCO1FBQ25ELEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7WUFDbEQsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7Z0JBQ2xDLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2hDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsWUFBWSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQy9FLE1BQU0sbUJBQW1CLEdBQ3ZCLENBQUMsV0FBVyxHQUFHLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDLG1DQUFtQyxDQUFDLEdBQUcsWUFBWSxDQUFDO2dCQUM1RyxJQUFJLG1CQUFtQixHQUFHLFVBQVUsRUFBRSxDQUFDO29CQUNyQyxTQUFTO2dCQUNYLENBQUM7Z0JBQ0QsT0FBTyxtQkFBbUIsQ0FBQztZQUM3QixDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7Q0FDRiJ9
68
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIsMkJBQTJCLEVBQzNCLG1DQUFtQyxHQUNwQyxNQUFNLDhCQUE4QixDQUFDO0FBR3RDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQVE3QjtRQVBBOztXQUVHO1FBQ08sVUFBSyxHQUFvQixJQUFJLEdBQUcsRUFBRSxDQUFDO1FBRTdDLHdEQUE2QixDQUFDLElBQUksMkJBQTJCLEVBQUM7SUFFL0MsQ0FBQztJQUVoQiwwQkFBMEI7UUFDeEIsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsVUFBVSxDQUFDLE9BQWtCO1FBQzNCLElBQUksT0FBTyxDQUFDLEtBQUssSUFBSSx1QkFBQSxJQUFJLHFEQUEyQixFQUFFLENBQUM7WUFDckQsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsT0FBTyxDQUFDLEtBQUssdUJBQXVCLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBQ0QsTUFBTSxHQUFHLEdBQUcsR0FBRyxPQUFPLENBQUMsV0FBVyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN0RCxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxXQUFXLENBQUMsV0FBbUI7UUFDN0IsTUFBTSxRQUFRLEdBQVMsRUFBRSxDQUFDO1FBQzFCLElBQUkscUJBQXFCLEdBQUcsS0FBSyxDQUFDO1FBQ2xDLEtBQUssSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFLFlBQVksR0FBRyx1QkFBQSxJQUFJLHFEQUEyQixFQUFFLFlBQVksRUFBRSxFQUFFLENBQUM7WUFDMUYsaURBQWlEO1lBQ2pELE1BQU0sR0FBRyxHQUFHLEdBQUcsV0FBVyxJQUFJLFlBQVksRUFBRSxDQUFDO1lBQzdDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3BDLElBQUksT0FBTyxFQUFFLENBQUM7Z0JBQ1osSUFBSSxxQkFBcUIsRUFBRSxDQUFDO29CQUMxQixNQUFNLElBQUksS0FBSyxDQUFDLHVDQUF1QyxXQUFXLEVBQUUsQ0FBQyxDQUFDO2dCQUN4RSxDQUFDO2dCQUNELFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDekIsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLHFCQUFxQixHQUFHLElBQUksQ0FBQztnQkFDN0IsOEdBQThHO2dCQUM5RyxtRkFBbUY7WUFDckYsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxlQUFlLENBQUMsYUFBaUIsRUFBRSxVQUFrQjtRQUNuRCxLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLElBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO1lBQ2xELElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO2dCQUNsQyxNQUFNLFFBQVEsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO2dCQUNoQyxNQUFNLENBQUMsV0FBVyxFQUFFLFlBQVksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUMvRSxNQUFNLG1CQUFtQixHQUN2QixDQUFDLFdBQVcsR0FBRyxNQUFNLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxtQ0FBbUMsQ0FBQyxHQUFHLFlBQVksQ0FBQztnQkFDNUcsSUFBSSxtQkFBbUIsR0FBRyxVQUFVLEVBQUUsQ0FBQztvQkFDckMsU0FBUztnQkFDWCxDQUFDO2dCQUNELE9BQU8sbUJBQW1CLENBQUM7WUFDN0IsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLFNBQVMsQ0FBQztJQUNuQixDQUFDO0NBQ0YifQ==
@@ -1,11 +1,10 @@
1
- /// <reference types="node" resolution-mode="require"/>
2
- import { type Body, type EncryptedL2BlockL2Logs, type EncryptedNoteL2BlockL2Logs, type FromLogType, type GetUnencryptedLogsResponse, type InboxLeaf, type L2Block, type L2BlockL2Logs, type LogFilter, LogType, type TxEffect, type TxHash, TxReceipt, type UnencryptedL2BlockL2Logs } from '@aztec/circuit-types';
3
- import { Fr } from '@aztec/circuits.js';
1
+ import { type FromLogType, type GetUnencryptedLogsResponse, type InboxLeaf, type L2Block, type L2BlockL2Logs, type LogFilter, LogType, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
2
+ import { Fr, type Header } from '@aztec/circuits.js';
4
3
  import { type ContractArtifact } from '@aztec/foundation/abi';
5
4
  import { type AztecAddress } from '@aztec/foundation/aztec-address';
6
5
  import { type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts';
7
6
  import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js';
8
- import { type DataRetrieval, type SingletonDataRetrieval } from '../structs/data_retrieval.js';
7
+ import { type DataRetrieval } from '../structs/data_retrieval.js';
9
8
  import { type L1Published } from '../structs/published.js';
10
9
  /**
11
10
  * Simple, in-memory implementation of an archiver data store.
@@ -17,28 +16,12 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
17
16
  * An array containing all the L2 blocks that have been fetched so far.
18
17
  */
19
18
  private l2Blocks;
20
- /**
21
- * A mapping of body hash to body
22
- */
23
- private l2BlockBodies;
24
19
  /**
25
20
  * An array containing all the tx effects in the L2 blocks that have been fetched so far.
26
21
  */
27
22
  private txEffects;
28
- /**
29
- * An array containing all the encrypted logs that have been fetched so far.
30
- * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
31
- */
32
23
  private noteEncryptedLogsPerBlock;
33
- /**
34
- * An array containing all the encrypted logs that have been fetched so far.
35
- * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
36
- */
37
24
  private encryptedLogsPerBlock;
38
- /**
39
- * An array containing all the unencrypted logs that have been fetched so far.
40
- * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
41
- */
42
25
  private unencryptedLogsPerBlock;
43
26
  /**
44
27
  * Contains all L1 to L2 messages.
@@ -50,10 +33,9 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
50
33
  private unconstrainedFunctions;
51
34
  private contractInstances;
52
35
  private lastL1BlockNewBlocks;
53
- private lastL1BlockNewBlockBodies;
54
36
  private lastL1BlockNewMessages;
55
- private lastL1BlockNewProvenLogs;
56
37
  private lastProvenL2BlockNumber;
38
+ private lastProvenL2EpochNumber;
57
39
  constructor(
58
40
  /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
59
41
  maxLogs: number);
@@ -61,8 +43,10 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
61
43
  getContractClassIds(): Promise<Fr[]>;
62
44
  getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined>;
63
45
  addFunctions(contractClassId: Fr, newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[], newUnconstrainedFunctions: UnconstrainedFunctionWithMembershipProof[]): Promise<boolean>;
64
- addContractClasses(data: ContractClassPublic[], _blockNumber: number): Promise<boolean>;
46
+ addContractClasses(data: ContractClassPublic[], blockNumber: number): Promise<boolean>;
47
+ deleteContractClasses(data: ContractClassPublic[], blockNumber: number): Promise<boolean>;
65
48
  addContractInstances(data: ContractInstanceWithAddress[], _blockNumber: number): Promise<boolean>;
49
+ deleteContractInstances(data: ContractInstanceWithAddress[], _blockNumber: number): Promise<boolean>;
66
50
  /**
67
51
  * Append new blocks to the store's list.
68
52
  * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
@@ -70,26 +54,21 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
70
54
  */
71
55
  addBlocks(blocks: L1Published<L2Block>[]): Promise<boolean>;
72
56
  /**
73
- * Append new block bodies to the store's list.
74
- * @param blockBodies - The L2 block bodies to be added to the store.
75
- * @returns True if the operation is successful.
76
- */
77
- addBlockBodies(blockBodies: DataRetrieval<Body>): Promise<boolean>;
78
- /**
79
- * Gets block bodies that have the same txHashes as we supply.
80
- *
81
- * @param txsEffectsHashes - A list of txsEffectsHashes (body hashes).
82
- * @returns The requested L2 block bodies
57
+ * Unwinds blocks from the database
58
+ * @param from - The tip of the chain, passed for verification purposes,
59
+ * ensuring that we don't end up deleting something we did not intend
60
+ * @param blocksToUnwind - The number of blocks we are to unwind
61
+ * @returns True if the operation is successful
83
62
  */
84
- getBlockBodies(txsEffectsHashes: Buffer[]): Promise<(Body | undefined)[]>;
63
+ unwindBlocks(from: number, blocksToUnwind: number): Promise<boolean>;
85
64
  /**
86
65
  * Append new logs to the store's list.
87
- * @param encryptedLogs - The encrypted logs to be added to the store.
88
- * @param unencryptedLogs - The unencrypted logs to be added to the store.
89
- * @param blockNumber - The block for which to add the logs.
66
+ * @param block - The block for which to add the logs.
90
67
  * @returns True if the operation is successful.
91
68
  */
92
- addLogs(noteEncryptedLogs: EncryptedNoteL2BlockL2Logs, encryptedLogs: EncryptedL2BlockL2Logs, unencryptedLogs: UnencryptedL2BlockL2Logs, blockNumber: number): Promise<boolean>;
69
+ addLogs(blocks: L2Block[]): Promise<boolean>;
70
+ deleteLogs(blocks: L2Block[]): Promise<boolean>;
71
+ getTotalL1ToL2MessageCount(): Promise<bigint>;
93
72
  /**
94
73
  * Append L1 to L2 messages to the store.
95
74
  * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
@@ -111,6 +90,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
111
90
  * @remarks When "from" is smaller than genesis block number, blocks from the beginning are returned.
112
91
  */
113
92
  getBlocks(from: number, limit: number): Promise<L1Published<L2Block>[]>;
93
+ getBlockHeaders(from: number, limit: number): Promise<Header[]>;
114
94
  /**
115
95
  * Gets a tx effect.
116
96
  * @param txHash - The txHash of the tx effect.
@@ -150,7 +130,11 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
150
130
  */
151
131
  getSynchedL2BlockNumber(): Promise<number>;
152
132
  getProvenL2BlockNumber(): Promise<number>;
153
- setProvenL2BlockNumber(l2BlockNumber: SingletonDataRetrieval<number>): Promise<void>;
133
+ getProvenL2EpochNumber(): Promise<number | undefined>;
134
+ setProvenL2BlockNumber(l2BlockNumber: number): Promise<void>;
135
+ setProvenL2EpochNumber(l2EpochNumber: number): Promise<void>;
136
+ setBlockSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void>;
137
+ setMessageSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void>;
154
138
  getSynchPoint(): Promise<ArchiverL1SynchPoint>;
155
139
  addContractArtifact(address: AztecAddress, contract: ContractArtifact): Promise<void>;
156
140
  getContractArtifact(address: AztecAddress): Promise<ContractArtifact | undefined>;
@@ -1 +1 @@
1
- {"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
@@ -13,29 +13,13 @@ export class MemoryArchiverStore {
13
13
  * An array containing all the L2 blocks that have been fetched so far.
14
14
  */
15
15
  this.l2Blocks = [];
16
- /**
17
- * A mapping of body hash to body
18
- */
19
- this.l2BlockBodies = new Map();
20
16
  /**
21
17
  * An array containing all the tx effects in the L2 blocks that have been fetched so far.
22
18
  */
23
19
  this.txEffects = [];
24
- /**
25
- * An array containing all the encrypted logs that have been fetched so far.
26
- * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
27
- */
28
- this.noteEncryptedLogsPerBlock = [];
29
- /**
30
- * An array containing all the encrypted logs that have been fetched so far.
31
- * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
32
- */
33
- this.encryptedLogsPerBlock = [];
34
- /**
35
- * An array containing all the unencrypted logs that have been fetched so far.
36
- * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
37
- */
38
- this.unencryptedLogsPerBlock = [];
20
+ this.noteEncryptedLogsPerBlock = new Map();
21
+ this.encryptedLogsPerBlock = new Map();
22
+ this.unencryptedLogsPerBlock = new Map();
39
23
  /**
40
24
  * Contains all L1 to L2 messages.
41
25
  */
@@ -46,10 +30,9 @@ export class MemoryArchiverStore {
46
30
  this.unconstrainedFunctions = new Map();
47
31
  this.contractInstances = new Map();
48
32
  this.lastL1BlockNewBlocks = undefined;
49
- this.lastL1BlockNewBlockBodies = undefined;
50
33
  this.lastL1BlockNewMessages = undefined;
51
- this.lastL1BlockNewProvenLogs = undefined;
52
34
  this.lastProvenL2BlockNumber = 0;
35
+ this.lastProvenL2EpochNumber = 0;
53
36
  }
54
37
  getContractClass(id) {
55
38
  const contractClass = this.contractClasses.get(id.toString());
@@ -80,9 +63,23 @@ export class MemoryArchiverStore {
80
63
  this.unconstrainedFunctions.set(contractClassId.toString(), updatedUnconstrainedFunctions);
81
64
  return Promise.resolve(true);
82
65
  }
83
- addContractClasses(data, _blockNumber) {
66
+ addContractClasses(data, blockNumber) {
84
67
  for (const contractClass of data) {
85
- this.contractClasses.set(contractClass.id.toString(), contractClass);
68
+ if (!this.contractClasses.has(contractClass.id.toString())) {
69
+ this.contractClasses.set(contractClass.id.toString(), {
70
+ ...contractClass,
71
+ l2BlockNumber: blockNumber,
72
+ });
73
+ }
74
+ }
75
+ return Promise.resolve(true);
76
+ }
77
+ deleteContractClasses(data, blockNumber) {
78
+ for (const contractClass of data) {
79
+ const restored = this.contractClasses.get(contractClass.id.toString());
80
+ if (restored && restored.l2BlockNumber >= blockNumber) {
81
+ this.contractClasses.delete(contractClass.id.toString());
82
+ }
86
83
  }
87
84
  return Promise.resolve(true);
88
85
  }
@@ -92,6 +89,12 @@ export class MemoryArchiverStore {
92
89
  }
93
90
  return Promise.resolve(true);
94
91
  }
92
+ deleteContractInstances(data, _blockNumber) {
93
+ for (const contractInstance of data) {
94
+ this.contractInstances.delete(contractInstance.address.toString());
95
+ }
96
+ return Promise.resolve(true);
97
+ }
95
98
  /**
96
99
  * Append new blocks to the store's list.
97
100
  * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.
@@ -107,45 +110,51 @@ export class MemoryArchiverStore {
107
110
  return Promise.resolve(true);
108
111
  }
109
112
  /**
110
- * Append new block bodies to the store's list.
111
- * @param blockBodies - The L2 block bodies to be added to the store.
112
- * @returns True if the operation is successful.
113
+ * Unwinds blocks from the database
114
+ * @param from - The tip of the chain, passed for verification purposes,
115
+ * ensuring that we don't end up deleting something we did not intend
116
+ * @param blocksToUnwind - The number of blocks we are to unwind
117
+ * @returns True if the operation is successful
113
118
  */
114
- addBlockBodies(blockBodies) {
115
- for (const body of blockBodies.retrievedData) {
116
- void this.l2BlockBodies.set(body.getTxsEffectsHash().toString('hex'), body);
119
+ async unwindBlocks(from, blocksToUnwind) {
120
+ const last = await this.getSynchedL2BlockNumber();
121
+ if (from != last) {
122
+ throw new Error(`Can only remove the tip`);
123
+ }
124
+ const stopAt = from - blocksToUnwind;
125
+ while ((await this.getSynchedL2BlockNumber()) > stopAt) {
126
+ const block = this.l2Blocks.pop();
127
+ if (block == undefined) {
128
+ break;
129
+ }
130
+ block.data.body.txEffects.forEach(() => this.txEffects.pop());
117
131
  }
118
- this.lastL1BlockNewBlockBodies = blockBodies.lastProcessedL1BlockNumber;
119
132
  return Promise.resolve(true);
120
133
  }
121
- /**
122
- * Gets block bodies that have the same txHashes as we supply.
123
- *
124
- * @param txsEffectsHashes - A list of txsEffectsHashes (body hashes).
125
- * @returns The requested L2 block bodies
126
- */
127
- getBlockBodies(txsEffectsHashes) {
128
- return Promise.resolve(txsEffectsHashes.map(txsEffectsHash => this.l2BlockBodies.get(txsEffectsHash.toString('hex'))));
129
- }
130
134
  /**
131
135
  * Append new logs to the store's list.
132
- * @param encryptedLogs - The encrypted logs to be added to the store.
133
- * @param unencryptedLogs - The unencrypted logs to be added to the store.
134
- * @param blockNumber - The block for which to add the logs.
136
+ * @param block - The block for which to add the logs.
135
137
  * @returns True if the operation is successful.
136
138
  */
137
- addLogs(noteEncryptedLogs, encryptedLogs, unencryptedLogs, blockNumber) {
138
- if (noteEncryptedLogs) {
139
- this.noteEncryptedLogsPerBlock[blockNumber - INITIAL_L2_BLOCK_NUM] = noteEncryptedLogs;
140
- }
141
- if (encryptedLogs) {
142
- this.encryptedLogsPerBlock[blockNumber - INITIAL_L2_BLOCK_NUM] = encryptedLogs;
143
- }
144
- if (unencryptedLogs) {
145
- this.unencryptedLogsPerBlock[blockNumber - INITIAL_L2_BLOCK_NUM] = unencryptedLogs;
146
- }
139
+ addLogs(blocks) {
140
+ blocks.forEach(block => {
141
+ this.noteEncryptedLogsPerBlock.set(block.number, block.body.noteEncryptedLogs);
142
+ this.encryptedLogsPerBlock.set(block.number, block.body.encryptedLogs);
143
+ this.unencryptedLogsPerBlock.set(block.number, block.body.unencryptedLogs);
144
+ });
147
145
  return Promise.resolve(true);
148
146
  }
147
+ deleteLogs(blocks) {
148
+ blocks.forEach(block => {
149
+ this.encryptedLogsPerBlock.delete(block.number);
150
+ this.noteEncryptedLogsPerBlock.delete(block.number);
151
+ this.unencryptedLogsPerBlock.delete(block.number);
152
+ });
153
+ return Promise.resolve(true);
154
+ }
155
+ getTotalL1ToL2MessageCount() {
156
+ return Promise.resolve(this.l1ToL2Messages.getTotalL1ToL2MessageCount());
157
+ }
149
158
  /**
150
159
  * Append L1 to L2 messages to the store.
151
160
  * @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
@@ -179,17 +188,23 @@ export class MemoryArchiverStore {
179
188
  * @remarks When "from" is smaller than genesis block number, blocks from the beginning are returned.
180
189
  */
181
190
  getBlocks(from, limit) {
182
- // Return an empty array if we are outside of range
183
191
  if (limit < 1) {
184
192
  return Promise.reject(new Error(`Invalid limit: ${limit}`));
185
193
  }
186
- const fromIndex = Math.max(from - INITIAL_L2_BLOCK_NUM, 0);
194
+ if (from < INITIAL_L2_BLOCK_NUM) {
195
+ return Promise.reject(new Error(`Invalid start: ${from}`));
196
+ }
197
+ const fromIndex = from - INITIAL_L2_BLOCK_NUM;
187
198
  if (fromIndex >= this.l2Blocks.length) {
188
199
  return Promise.resolve([]);
189
200
  }
190
201
  const toIndex = fromIndex + limit;
191
202
  return Promise.resolve(this.l2Blocks.slice(fromIndex, toIndex));
192
203
  }
204
+ async getBlockHeaders(from, limit) {
205
+ const blocks = await this.getBlocks(from, limit);
206
+ return blocks.map(block => block.data.header);
207
+ }
193
208
  /**
194
209
  * Gets a tx effect.
195
210
  * @param txHash - The txHash of the tx effect.
@@ -231,9 +246,12 @@ export class MemoryArchiverStore {
231
246
  */
232
247
  getLogs(from, limit, logType) {
233
248
  if (from < INITIAL_L2_BLOCK_NUM || limit < 1) {
234
- throw new Error(`Invalid limit: ${limit}`);
249
+ return Promise.resolve([]);
235
250
  }
236
- const logs = (() => {
251
+ if (from > this.l2Blocks.length) {
252
+ return Promise.resolve([]);
253
+ }
254
+ const logMap = (() => {
237
255
  switch (logType) {
238
256
  case LogType.ENCRYPTED:
239
257
  return this.encryptedLogsPerBlock;
@@ -244,12 +262,21 @@ export class MemoryArchiverStore {
244
262
  return this.unencryptedLogsPerBlock;
245
263
  }
246
264
  })();
247
- if (from > logs.length) {
248
- return Promise.resolve([]);
249
- }
250
- const startIndex = from - INITIAL_L2_BLOCK_NUM;
265
+ const startIndex = from;
251
266
  const endIndex = startIndex + limit;
252
- return Promise.resolve(logs.slice(startIndex, endIndex));
267
+ const upper = Math.min(endIndex, this.l2Blocks.length + INITIAL_L2_BLOCK_NUM);
268
+ const l = [];
269
+ for (let i = startIndex; i < upper; i++) {
270
+ const log = logMap.get(i);
271
+ if (log) {
272
+ l.push(log);
273
+ }
274
+ else {
275
+ // I hate typescript sometimes
276
+ l.push(undefined);
277
+ }
278
+ }
279
+ return Promise.resolve(l);
253
280
  }
254
281
  /**
255
282
  * Gets unencrypted logs based on the provided filter.
@@ -259,34 +286,34 @@ export class MemoryArchiverStore {
259
286
  */
260
287
  getUnencryptedLogs(filter) {
261
288
  let txHash;
262
- let fromBlockIndex = 0;
263
- let toBlockIndex = this.unencryptedLogsPerBlock.length;
289
+ let fromBlock = 0;
290
+ let toBlock = this.l2Blocks.length + INITIAL_L2_BLOCK_NUM;
264
291
  let txIndexInBlock = 0;
265
292
  let logIndexInTx = 0;
266
293
  if (filter.afterLog) {
267
294
  // Continuation parameter is set --> tx hash is ignored
268
295
  if (filter.fromBlock == undefined || filter.fromBlock <= filter.afterLog.blockNumber) {
269
- fromBlockIndex = filter.afterLog.blockNumber - INITIAL_L2_BLOCK_NUM;
296
+ fromBlock = filter.afterLog.blockNumber;
270
297
  txIndexInBlock = filter.afterLog.txIndex;
271
298
  logIndexInTx = filter.afterLog.logIndex + 1; // We want to start from the next log
272
299
  }
273
300
  else {
274
- fromBlockIndex = filter.fromBlock - INITIAL_L2_BLOCK_NUM;
301
+ fromBlock = filter.fromBlock;
275
302
  }
276
303
  }
277
304
  else {
278
305
  txHash = filter.txHash;
279
306
  if (filter.fromBlock !== undefined) {
280
- fromBlockIndex = filter.fromBlock - INITIAL_L2_BLOCK_NUM;
307
+ fromBlock = filter.fromBlock;
281
308
  }
282
309
  }
283
310
  if (filter.toBlock !== undefined) {
284
- toBlockIndex = filter.toBlock - INITIAL_L2_BLOCK_NUM;
311
+ toBlock = filter.toBlock;
285
312
  }
286
313
  // Ensure the indices are within block array bounds
287
- fromBlockIndex = Math.max(fromBlockIndex, 0);
288
- toBlockIndex = Math.min(toBlockIndex, this.unencryptedLogsPerBlock.length);
289
- if (fromBlockIndex > this.unencryptedLogsPerBlock.length || toBlockIndex < fromBlockIndex || toBlockIndex <= 0) {
314
+ fromBlock = Math.max(fromBlock, INITIAL_L2_BLOCK_NUM);
315
+ toBlock = Math.min(toBlock, this.l2Blocks.length + INITIAL_L2_BLOCK_NUM);
316
+ if (fromBlock > this.l2Blocks.length || toBlock < fromBlock || toBlock <= 0) {
290
317
  return Promise.resolve({
291
318
  logs: [],
292
319
  maxLogsHit: false,
@@ -294,25 +321,27 @@ export class MemoryArchiverStore {
294
321
  }
295
322
  const contractAddress = filter.contractAddress;
296
323
  const logs = [];
297
- for (; fromBlockIndex < toBlockIndex; fromBlockIndex++) {
298
- const block = this.l2Blocks[fromBlockIndex];
299
- const blockLogs = this.unencryptedLogsPerBlock[fromBlockIndex];
300
- for (; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++) {
301
- const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
302
- for (; logIndexInTx < txLogs.length; logIndexInTx++) {
303
- const log = txLogs[logIndexInTx];
304
- if ((!txHash || block.data.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
305
- (!contractAddress || log.contractAddress.equals(contractAddress))) {
306
- logs.push(new ExtendedUnencryptedL2Log(new LogId(block.data.number, txIndexInBlock, logIndexInTx), log));
307
- if (logs.length === this.maxLogs) {
308
- return Promise.resolve({
309
- logs,
310
- maxLogsHit: true,
311
- });
324
+ for (; fromBlock < toBlock; fromBlock++) {
325
+ const block = this.l2Blocks[fromBlock - INITIAL_L2_BLOCK_NUM];
326
+ const blockLogs = this.unencryptedLogsPerBlock.get(fromBlock);
327
+ if (blockLogs) {
328
+ for (; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++) {
329
+ const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
330
+ for (; logIndexInTx < txLogs.length; logIndexInTx++) {
331
+ const log = txLogs[logIndexInTx];
332
+ if ((!txHash || block.data.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
333
+ (!contractAddress || log.contractAddress.equals(contractAddress))) {
334
+ logs.push(new ExtendedUnencryptedL2Log(new LogId(block.data.number, txIndexInBlock, logIndexInTx), log));
335
+ if (logs.length === this.maxLogs) {
336
+ return Promise.resolve({
337
+ logs,
338
+ maxLogsHit: true,
339
+ });
340
+ }
312
341
  }
313
342
  }
343
+ logIndexInTx = 0;
314
344
  }
315
- logIndexInTx = 0;
316
345
  }
317
346
  txIndexInBlock = 0;
318
347
  }
@@ -334,17 +363,29 @@ export class MemoryArchiverStore {
334
363
  getProvenL2BlockNumber() {
335
364
  return Promise.resolve(this.lastProvenL2BlockNumber);
336
365
  }
366
+ getProvenL2EpochNumber() {
367
+ return Promise.resolve(this.lastProvenL2EpochNumber);
368
+ }
337
369
  setProvenL2BlockNumber(l2BlockNumber) {
338
- this.lastProvenL2BlockNumber = l2BlockNumber.retrievedData;
339
- this.lastL1BlockNewProvenLogs = l2BlockNumber.lastProcessedL1BlockNumber;
370
+ this.lastProvenL2BlockNumber = l2BlockNumber;
371
+ return Promise.resolve();
372
+ }
373
+ setProvenL2EpochNumber(l2EpochNumber) {
374
+ this.lastProvenL2EpochNumber = l2EpochNumber;
375
+ return Promise.resolve();
376
+ }
377
+ setBlockSynchedL1BlockNumber(l1BlockNumber) {
378
+ this.lastL1BlockNewBlocks = l1BlockNumber;
379
+ return Promise.resolve();
380
+ }
381
+ setMessageSynchedL1BlockNumber(l1BlockNumber) {
382
+ this.lastL1BlockNewMessages = l1BlockNumber;
340
383
  return Promise.resolve();
341
384
  }
342
385
  getSynchPoint() {
343
386
  return Promise.resolve({
344
387
  blocksSynchedTo: this.lastL1BlockNewBlocks,
345
388
  messagesSynchedTo: this.lastL1BlockNewMessages,
346
- blockBodiesSynchedTo: this.lastL1BlockNewBlockBodies,
347
- provenLogsSynchedTo: this.lastL1BlockNewProvenLogs,
348
389
  });
349
390
  }
350
391
  addContractArtifact(address, contract) {
@@ -355,4 +396,4 @@ export class MemoryArchiverStore {
355
396
  return Promise.resolve(this.contractArtifacts.get(address.toString()));
356
397
  }
357
398
  }
358
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
399
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
package/dest/index.d.ts CHANGED
@@ -2,5 +2,4 @@ export * from './archiver/index.js';
2
2
  export * from './rpc/index.js';
3
3
  export * from './factory.js';
4
4
  export { retrieveL2ProofVerifiedEvents, retrieveBlockFromRollup } from './archiver/data_retrieval.js';
5
- export { getL2BlockProposedLogs } from './archiver/eth_log_handlers.js';
6
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEtG,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAWA,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC"}