@aztec/archiver 0.18.0 → 0.19.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.
@@ -1,8 +1,8 @@
1
- import { CancelledL1ToL2Message, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, PendingL1ToL2Message, TxHash } from '@aztec/circuit-types';
1
+ import { ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, TxHash } from '@aztec/circuit-types';
2
2
  import { Fr } from '@aztec/circuits.js';
3
3
  import { AztecAddress } from '@aztec/foundation/aztec-address';
4
4
  import { RootDatabase } from 'lmdb';
5
- import { ArchiverDataStore } from './archiver_store.js';
5
+ import { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
6
6
  /**
7
7
  * LMDB implementation of the ArchiverDataStore interface.
8
8
  */
@@ -40,15 +40,17 @@ export declare class LMDBArchiverStore implements ArchiverDataStore {
40
40
  /**
41
41
  * Append new pending L1 to L2 messages to the store.
42
42
  * @param messages - The L1 to L2 messages to be added to the store.
43
+ * @param l1BlockNumber - The L1 block number for which to add the messages.
43
44
  * @returns True if the operation is successful.
44
45
  */
45
- addPendingL1ToL2Messages(messages: PendingL1ToL2Message[]): Promise<boolean>;
46
+ addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
46
47
  /**
47
48
  * Remove pending L1 to L2 messages from the store (if they were cancelled).
48
- * @param messages - The message keys to be removed from the store.
49
+ * @param cancelledMessages - The message keys to be removed from the store.
50
+ * @param l1BlockNumber - The L1 block number for which to remove the messages.
49
51
  * @returns True if the operation is successful.
50
52
  */
51
- cancelPendingL1ToL2Messages(messages: CancelledL1ToL2Message[]): Promise<boolean>;
53
+ cancelPendingL1ToL2Messages(cancelledMessages: Fr[], l1BlockNumber: bigint): Promise<boolean>;
52
54
  /**
53
55
  * Messages that have been published in an L2 block are confirmed.
54
56
  * Add them to the confirmed store, also remove them from the pending store.
@@ -120,6 +122,9 @@ export declare class LMDBArchiverStore implements ArchiverDataStore {
120
122
  * @returns The number of the latest L2 block processed.
121
123
  */
122
124
  getBlockNumber(): Promise<number>;
123
- getL1BlockNumber(): Promise<bigint>;
125
+ /**
126
+ * Gets the last L1 block number processed by the archiver
127
+ */
128
+ getL1BlockNumber(): Promise<ArchiverL1SynchPoint>;
124
129
  }
125
130
  //# sourceMappingURL=lmdb_archiver_store.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"lmdb_archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,YAAY,EACZ,oBAAoB,EAEpB,0BAA0B,EAE1B,aAAa,EACb,OAAO,EACP,aAAa,EACb,IAAI,EACJ,SAAS,EAET,OAAO,EACP,oBAAoB,EACpB,MAAM,EAEP,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAI/D,OAAO,EAA0B,YAAY,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AA+BxD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,iBAAiB;;gBAoB7C,EAAE,EAAE,YAAY,EAAE,eAAe,GAAE,MAAa;IAgC/C,KAAK;IAIlB;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAmC9C;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoB3D;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAUlD;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;;OAIG;IACH,wBAAwB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAyC5E;;;;OAIG;IACH,2BAA2B,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA0BjF;;;;;OAKG;IACH,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWxD;;;;OAIG;IACH,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IA2CzD;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAajE;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAejF;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA6F1E;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAczF;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAsBjG;;;;OAIG;IACH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IASjF;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAUjF;;;;;OAKG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAKhF;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAMjC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;CAwHpC"}
1
+ {"version":3,"file":"lmdb_archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,oBAAoB,EAEpB,0BAA0B,EAE1B,aAAa,EACb,OAAO,EACP,aAAa,EACb,IAAI,EACJ,SAAS,EAET,OAAO,EACP,MAAM,EAEP,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D,OAAO,EAA0B,YAAY,EAAE,MAAM,MAAM,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAwB9E;;GAEG;AACH,qBAAa,iBAAkB,YAAW,iBAAiB;;gBAoB7C,EAAE,EAAE,YAAY,EAAE,eAAe,GAAE,MAAa;IAgC/C,KAAK;IAIlB;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAmC9C;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoB3D;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAUlD;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAiBnB;;;;;OAKG;IACH,wBAAwB,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+B5F;;;;;OAKG;IACH,2BAA2B,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmB7F;;;;;OAKG;IACH,qBAAqB,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAWxD;;;;OAIG;IACH,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IA2CzD;;;;OAIG;IACH,yBAAyB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAajE;;;;;;OAMG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAejF;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IA6F1E;;;;;OAKG;IACH,uBAAuB,CAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAczF;;;;OAIG;IACH,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAsBjG;;;;OAIG;IACH,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IASjF;;;;;OAKG;IACH,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAUjF;;;;;OAKG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC;IAKhF;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAMjC;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAAC,oBAAoB,CAAC;CAuHlD"}
@@ -2,11 +2,9 @@ var _LMDBArchiverStore_instances, _LMDBArchiverStore_tables, _LMDBArchiverStore_
2
2
  import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
3
3
  import { ExtendedContractData, ExtendedUnencryptedL2Log, INITIAL_L2_BLOCK_NUM, L1ToL2Message, L2Block, L2BlockL2Logs, LogId, LogType, UnencryptedL2Log, } from '@aztec/circuit-types';
4
4
  import { Fr } from '@aztec/circuits.js';
5
- import { toBigIntBE, toBufferBE } from '@aztec/foundation/bigint-buffer';
6
5
  import { createDebugLogger } from '@aztec/foundation/log';
7
- function l1ToL2MessageBlockKey(l1BlockNumber, key, indexInBlock) {
8
- return `${toBufferBE(l1BlockNumber, 32).toString('hex')}:${key}:${indexInBlock}`;
9
- }
6
+ const L1_BLOCK_ADDED_PENDING_MESSAGE = 'l1BlockAddedPendingMessage';
7
+ const L1_BLOCK_CANCELLED_MESSAGE = 'l1BlockCancelledMessage';
10
8
  /* eslint-enable */
11
9
  /**
12
10
  * LMDB implementation of the ArchiverDataStore interface.
@@ -36,7 +34,7 @@ export class LMDBArchiverStore {
36
34
  }),
37
35
  l1ToL2MessagesByBlock: db.openDB('l1_to_l2_message_nonces', {
38
36
  keyEncoding: 'ordered-binary',
39
- encoding: 'binary',
37
+ encoding: 'msgpack',
40
38
  }),
41
39
  pendingMessagesByFee: db.openDB('pending_messages_by_fee', {
42
40
  keyEncoding: 'ordered-binary',
@@ -61,7 +59,7 @@ export class LMDBArchiverStore {
61
59
  for (const block of blocks) {
62
60
  const blockCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.get(block.number) ?? {};
63
61
  blockCtx.block = block.toBuffer();
64
- blockCtx.l1BlockNumber = toBufferBE(block.getL1BlockNumber(), 32);
62
+ blockCtx.l1BlockNumber = block.getL1BlockNumber();
65
63
  blockCtx.blockHash = block.getBlockHash();
66
64
  // no need to await, all writes are enqueued in the transaction
67
65
  // awaiting would interrupt the execution flow of this callback and "leak" the transaction to some other part
@@ -141,34 +139,29 @@ export class LMDBArchiverStore {
141
139
  /**
142
140
  * Append new pending L1 to L2 messages to the store.
143
141
  * @param messages - The L1 to L2 messages to be added to the store.
142
+ * @param l1BlockNumber - The L1 block number for which to add the messages.
144
143
  * @returns True if the operation is successful.
145
144
  */
146
- addPendingL1ToL2Messages(messages) {
145
+ addPendingL1ToL2Messages(messages, l1BlockNumber) {
147
146
  return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.transaction(() => {
148
- for (const { message, blockNumber, indexInBlock } of messages) {
147
+ if ((__classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_ADDED_PENDING_MESSAGE) ?? 0n) >= l1BlockNumber) {
148
+ return false;
149
+ }
150
+ // ensure we don't add the same messages twice
151
+ void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(L1_BLOCK_ADDED_PENDING_MESSAGE, l1BlockNumber);
152
+ for (const message of messages) {
149
153
  const messageKey = message.entryKey?.toBuffer();
150
154
  if (!messageKey) {
151
155
  throw new Error('Message does not have an entry key');
152
156
  }
153
- const dupeKey = l1ToL2MessageBlockKey(blockNumber, 'newMessage', indexInBlock);
154
- const messageInBlock = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(dupeKey);
155
- if (messageInBlock?.equals(messageKey)) {
156
- continue;
157
- }
158
- else {
159
- if (messageInBlock) {
160
- __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Previously add pending message ${messageInBlock.toString('hex')} at ${dupeKey.toString()}, now got ${messageKey.toString('hex')}`);
161
- }
162
- void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(dupeKey, messageKey);
163
- }
164
- let messageWithCount = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(messageKey);
165
- if (!messageWithCount) {
166
- messageWithCount = {
157
+ let messageCtx = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.get(messageKey);
158
+ if (!messageCtx) {
159
+ messageCtx = {
167
160
  message: message.toBuffer(),
168
161
  pendingCount: 0,
169
162
  confirmedCount: 0,
170
163
  };
171
- void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.put(messageKey, messageWithCount);
164
+ void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.put(messageKey, messageCtx);
172
165
  }
173
166
  __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey, message, 1, 0);
174
167
  }
@@ -177,26 +170,22 @@ export class LMDBArchiverStore {
177
170
  }
178
171
  /**
179
172
  * Remove pending L1 to L2 messages from the store (if they were cancelled).
180
- * @param messages - The message keys to be removed from the store.
173
+ * @param cancelledMessages - The message keys to be removed from the store.
174
+ * @param l1BlockNumber - The L1 block number for which to remove the messages.
181
175
  * @returns True if the operation is successful.
182
176
  */
183
- cancelPendingL1ToL2Messages(messages) {
177
+ cancelPendingL1ToL2Messages(cancelledMessages, l1BlockNumber) {
184
178
  return __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2Messages.transaction(() => {
185
- for (const { blockNumber, indexInBlock, entryKey } of messages) {
186
- const messageKey = entryKey.toBuffer();
187
- const dupeKey = l1ToL2MessageBlockKey(blockNumber, 'cancelledMessage', indexInBlock);
188
- const messageInBlock = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(dupeKey);
189
- if (messageInBlock?.equals(messageKey)) {
179
+ if ((__classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_CANCELLED_MESSAGE) ?? 0n) >= l1BlockNumber) {
180
+ return false;
181
+ }
182
+ void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(L1_BLOCK_CANCELLED_MESSAGE, l1BlockNumber);
183
+ for (const messageKey of cancelledMessages) {
184
+ const message = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getL1ToL2Message).call(this, messageKey.toBuffer());
185
+ if (!message) {
190
186
  continue;
191
187
  }
192
- else {
193
- if (messageInBlock) {
194
- __classPrivateFieldGet(this, _LMDBArchiverStore_log, "f").call(this, `Previously add pending message ${messageInBlock.toString('hex')} at ${dupeKey.toString()}, now got ${messageKey.toString('hex')}`);
195
- }
196
- void __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.put(dupeKey, messageKey);
197
- }
198
- const message = __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_getL1ToL2Message).call(this, messageKey);
199
- __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey, message, -1, 0);
188
+ __classPrivateFieldGet(this, _LMDBArchiverStore_instances, "m", _LMDBArchiverStore_updateMessageCountInTx).call(this, messageKey.toBuffer(), message, -1, 0);
200
189
  }
201
190
  return true;
202
191
  });
@@ -397,21 +386,20 @@ export class LMDBArchiverStore {
397
386
  const [lastBlockNumber] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getKeys({ reverse: true, limit: 1 }).asArray;
398
387
  return Promise.resolve(typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1);
399
388
  }
389
+ /**
390
+ * Gets the last L1 block number processed by the archiver
391
+ */
400
392
  getL1BlockNumber() {
401
393
  // inverse range with no start/end will return the last value
402
- const [lastBlock] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getRange({ reverse: true, limit: 1 }).asArray;
403
- if (!lastBlock) {
404
- return Promise.resolve(0n);
405
- }
406
- else {
407
- const blockCtx = lastBlock.value;
408
- if (!blockCtx.l1BlockNumber) {
409
- return Promise.reject(new Error('L1 block number not found'));
410
- }
411
- else {
412
- return Promise.resolve(toBigIntBE(asBuffer(blockCtx.l1BlockNumber)));
413
- }
414
- }
394
+ const [lastL2Block] = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").blocks.getRange({ reverse: true, limit: 1 }).asArray;
395
+ const addedBlock = lastL2Block?.value?.l1BlockNumber ?? 0n;
396
+ const addedMessages = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_ADDED_PENDING_MESSAGE) ?? 0n;
397
+ const cancelledMessages = __classPrivateFieldGet(this, _LMDBArchiverStore_tables, "f").l1ToL2MessagesByBlock.get(L1_BLOCK_CANCELLED_MESSAGE) ?? 0n;
398
+ return Promise.resolve({
399
+ addedBlock,
400
+ addedMessages,
401
+ cancelledMessages,
402
+ });
415
403
  }
416
404
  }
417
405
  _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize = new WeakMap(), _LMDBArchiverStore_log = new WeakMap(), _LMDBArchiverStore_instances = new WeakSet(), _LMDBArchiverStore_filterUnencryptedLogsOfTx = function _LMDBArchiverStore_filterUnencryptedLogsOfTx(filter) {
@@ -537,4 +525,4 @@ _LMDBArchiverStore_tables = new WeakMap(), _LMDBArchiverStore_logsMaxPageSize =
537
525
  function asBuffer(arr) {
538
526
  return Buffer.isBuffer(arr) ? arr : Buffer.from(arr.buffer, arr.byteOffset, arr.length / arr.BYTES_PER_ELEMENT);
539
527
  }
540
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lmdb_archiver_store.js","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"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"}
528
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lmdb_archiver_store.js","sourceRoot":"","sources":["../../src/archiver/lmdb_archiver_store.ts"],"names":[],"mappings":"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"}
@@ -10,10 +10,8 @@ export declare class L1ToL2MessageStore {
10
10
  * messages (and the number of times the message has been seen).
11
11
  */
12
12
  protected store: Map<bigint, L1ToL2MessageAndCount>;
13
- private messagesByBlock;
14
13
  constructor();
15
- addMessage(messageKey: Fr, message: L1ToL2Message, l1BlocKNumber: bigint, messageIndex: number): void;
16
- addMessageUnsafe(messageKey: Fr, message: L1ToL2Message): void;
14
+ addMessage(messageKey: Fr, message: L1ToL2Message): void;
17
15
  getMessage(messageKey: Fr): L1ToL2Message | undefined;
18
16
  getMessageAndCount(messageKey: Fr): L1ToL2MessageAndCount | undefined;
19
17
  }
@@ -22,10 +20,8 @@ export declare class L1ToL2MessageStore {
22
20
  * for removing messages or fetching multiple messages.
23
21
  */
24
22
  export declare class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
25
- private cancelledMessagesByBlock;
26
23
  getMessageKeys(limit: number): Fr[];
27
- removeMessage(messageKey: Fr, l1BlockNumber: bigint, messageIndex: number): void;
28
- removeMessageUnsafe(messageKey: Fr): void;
24
+ removeMessage(messageKey: Fr): void;
29
25
  }
30
26
  /**
31
27
  * Useful to keep track of the number of times a message has been seen.
@@ -1 +1 @@
1
- {"version":3,"file":"l1_to_l2_message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/l1_to_l2_message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;IAChE,OAAO,CAAC,eAAe,CAAqB;;IAI5C,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAS9F,gBAAgB,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa;IAUvD,UAAU,CAAC,UAAU,EAAE,EAAE,GAAG,aAAa,GAAG,SAAS;IAIrD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,qBAAqB,GAAG,SAAS;CAGtE;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;IAC/D,OAAO,CAAC,wBAAwB,CAAqB;IACrD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE;IAmBnC,aAAa,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAazE,mBAAmB,CAAC,UAAU,EAAE,EAAE;CAYnC;AAED;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
1
+ {"version":3,"file":"l1_to_l2_message_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/l1_to_l2_message_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;;IAIhE,UAAU,CAAC,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa;IAUjD,UAAU,CAAC,UAAU,EAAE,EAAE,GAAG,aAAa,GAAG,SAAS;IAIrD,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,qBAAqB,GAAG,SAAS;CAGtE;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,kBAAkB;IAC/D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE;IAmBnC,aAAa,CAAC,UAAU,EAAE,EAAE;CAiB7B;AAED;;GAEG;AACH,KAAK,qBAAqB,GAAG;IAC3B;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
@@ -10,17 +10,9 @@ export class L1ToL2MessageStore {
10
10
  * messages (and the number of times the message has been seen).
11
11
  */
12
12
  this.store = new Map();
13
- this.messagesByBlock = new Set();
14
13
  }
15
- addMessage(messageKey, message, l1BlocKNumber, messageIndex) {
16
- if (this.messagesByBlock.has(`${l1BlocKNumber}-${messageIndex}`)) {
17
- return;
18
- }
19
- this.messagesByBlock.add(`${l1BlocKNumber}-${messageIndex}`);
20
- this.addMessageUnsafe(messageKey, message);
21
- }
22
- addMessageUnsafe(messageKey, message) {
23
- const messageKeyBigInt = messageKey.value;
14
+ addMessage(messageKey, message) {
15
+ const messageKeyBigInt = messageKey.toBigInt();
24
16
  const msgAndCount = this.store.get(messageKeyBigInt);
25
17
  if (msgAndCount) {
26
18
  msgAndCount.count++;
@@ -41,10 +33,6 @@ export class L1ToL2MessageStore {
41
33
  * for removing messages or fetching multiple messages.
42
34
  */
43
35
  export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
44
- constructor() {
45
- super(...arguments);
46
- this.cancelledMessagesByBlock = new Set();
47
- }
48
36
  getMessageKeys(limit) {
49
37
  if (limit < 1) {
50
38
  return [];
@@ -63,18 +51,11 @@ export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
63
51
  }
64
52
  return messages;
65
53
  }
66
- removeMessage(messageKey, l1BlockNumber, messageIndex) {
54
+ removeMessage(messageKey) {
67
55
  // ignore 0 - messageKey is a hash, so a 0 can probabilistically never occur. It is best to skip it.
68
56
  if (messageKey.equals(Fr.ZERO)) {
69
57
  return;
70
58
  }
71
- if (this.cancelledMessagesByBlock.has(`${l1BlockNumber}-${messageIndex}`)) {
72
- return;
73
- }
74
- this.cancelledMessagesByBlock.add(`${l1BlockNumber}-${messageIndex}`);
75
- this.removeMessageUnsafe(messageKey);
76
- }
77
- removeMessageUnsafe(messageKey) {
78
59
  const messageKeyBigInt = messageKey.value;
79
60
  const msgAndCount = this.store.get(messageKeyBigInt);
80
61
  if (!msgAndCount) {
@@ -88,4 +69,4 @@ export class PendingL1ToL2MessageStore extends L1ToL2MessageStore {
88
69
  }
89
70
  }
90
71
  }
91
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQVE3QjtRQVBBOzs7V0FHRztRQUNPLFVBQUssR0FBdUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUN4RCxvQkFBZSxHQUFHLElBQUksR0FBRyxFQUFVLENBQUM7SUFFN0IsQ0FBQztJQUVoQixVQUFVLENBQUMsVUFBYyxFQUFFLE9BQXNCLEVBQUUsYUFBcUIsRUFBRSxZQUFvQjtRQUM1RixJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsR0FBRyxDQUFDLEdBQUcsYUFBYSxJQUFJLFlBQVksRUFBRSxDQUFDLEVBQUU7WUFDaEUsT0FBTztTQUNSO1FBQ0QsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsR0FBRyxhQUFhLElBQUksWUFBWSxFQUFFLENBQUMsQ0FBQztRQUU3RCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsVUFBVSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxVQUFjLEVBQUUsT0FBc0I7UUFDckQsTUFBTSxnQkFBZ0IsR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBQzFDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFDckQsSUFBSSxXQUFXLEVBQUU7WUFDZixXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7U0FDckI7YUFBTTtZQUNMLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLGdCQUFnQixFQUFFLEVBQUUsT0FBTyxFQUFFLEtB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
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZV9zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9tZW1vcnlfYXJjaGl2ZXJfc3RvcmUvbDFfdG9fbDJfbWVzc2FnZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFOUM7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQU83QjtRQU5BOzs7V0FHRztRQUNPLFVBQUssR0FBdUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUVqRCxDQUFDO0lBRWhCLFVBQVUsQ0FBQyxVQUFjLEVBQUUsT0FBc0I7UUFDL0MsTUFBTSxnQkFBZ0IsR0FBRyxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDL0MsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUNyRCxJQUFJLFdBQVcsRUFBRTtZQUNmLFdBQVcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztTQUNyQjthQUFNO1lBQ0wsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDekQ7SUFDSCxDQUFDO0lBRUQsVUFBVSxDQUFDLFVBQWM7UUFDdkIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ25ELENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxVQUFjO1FBQy9CLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQUVEOzs7R0FHRztBQUNILE1BQU0sT0FBTyx5QkFBMEIsU0FBUSxrQkFBa0I7SUFDL0QsY0FBYyxDQUFDLEtBQWE7UUFDMUIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFO1lBQ2IsT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELHdFQUF3RTtRQUN4RSxvSEFBb0g7UUFDcEgsTUFBTSxRQUFRLEdBQVMsRUFBRSxDQUFDO1FBQzFCLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckcsS0FBSyxNQUFNLGVBQWUsSUFBSSxjQUFjLEVBQUU7WUFDNUMsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGVBQWUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLEVBQUU7Z0JBQzlDLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxRQUFTLENBQUMsQ0FBQztnQkFDakQsSUFBSSxRQUFRLENBQUMsTUFBTSxLQUFLLEtBQUssRUFBRTtvQkFDN0IsT0FBTyxRQUFRLENBQUM7aUJBQ2pCO2FBQ0Y7U0FDRjtRQUNELE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxhQUFhLENBQUMsVUFBYztRQUMxQixvR0FBb0c7UUFDcEcsSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUM5QixPQUFPO1NBQ1I7UUFFRCxNQUFNLGdCQUFnQixHQUFHLFVBQVUsQ0FBQyxLQUFLLENBQUM7UUFDMUMsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUNyRCxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsdURBQXVELGdCQUFnQixxQkFBcUIsQ0FBQyxDQUFDO1NBQy9HO1FBQ0QsSUFBSSxXQUFXLENBQUMsS0FBSyxHQUFHLENBQUMsRUFBRTtZQUN6QixXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7U0FDckI7YUFBTTtZQUNMLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLENBQUM7U0FDckM7SUFDSCxDQUFDO0NBQ0YifQ==
@@ -1,4 +1,4 @@
1
- import { CancelledL1ToL2Message, ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, PendingL1ToL2Message, TxHash } from '@aztec/circuit-types';
1
+ import { ContractData, ExtendedContractData, GetUnencryptedLogsResponse, L1ToL2Message, L2Block, L2BlockL2Logs, L2Tx, LogFilter, LogType, TxHash } from '@aztec/circuit-types';
2
2
  import { Fr } from '@aztec/circuits.js';
3
3
  import { AztecAddress } from '@aztec/foundation/aztec-address';
4
4
  import { ArchiverDataStore } from '../archiver_store.js';
@@ -43,6 +43,8 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
43
43
  * Contains all the pending L1 to L2 messages (accounts for duplication of messages)
44
44
  */
45
45
  private pendingL1ToL2Messages;
46
+ private lastL1BlockAddedMessages;
47
+ private lastL1BlockCancelledMessages;
46
48
  constructor(
47
49
  /** The max number of logs that can be obtained in 1 "getUnencryptedLogs" call. */
48
50
  maxLogs: number);
@@ -63,15 +65,17 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
63
65
  /**
64
66
  * Append new pending L1 to L2 messages to the store.
65
67
  * @param messages - The L1 to L2 messages to be added to the store.
68
+ * @param l1BlockNumber - The L1 block number for which to add the messages.
66
69
  * @returns True if the operation is successful (always in this implementation).
67
70
  */
68
- addPendingL1ToL2Messages(messages: PendingL1ToL2Message[]): Promise<boolean>;
71
+ addPendingL1ToL2Messages(messages: L1ToL2Message[], l1BlockNumber: bigint): Promise<boolean>;
69
72
  /**
70
73
  * Remove pending L1 to L2 messages from the store (if they were cancelled).
71
74
  * @param messages - The message keys to be removed from the store.
75
+ * @param l1BlockNumber - The L1 block number for which to remove the messages.
72
76
  * @returns True if the operation is successful (always in this implementation).
73
77
  */
74
- cancelPendingL1ToL2Messages(messages: CancelledL1ToL2Message[]): Promise<boolean>;
78
+ cancelPendingL1ToL2Messages(messages: Fr[], l1BlockNumber: bigint): Promise<boolean>;
75
79
  /**
76
80
  * Messages that have been published in an L2 block are confirmed.
77
81
  * Add them to the confirmed store, also remove them from the pending store.
@@ -158,6 +162,10 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
158
162
  * @returns The number of the latest L2 block processed.
159
163
  */
160
164
  getBlockNumber(): Promise<number>;
161
- getL1BlockNumber(): Promise<bigint>;
165
+ getL1BlockNumber(): Promise<{
166
+ addedBlock: bigint;
167
+ addedMessages: bigint;
168
+ cancelledMessages: bigint;
169
+ }>;
162
170
  }
163
171
  //# sourceMappingURL=memory_archiver_store.d.ts.map
@@ -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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"}
@@ -44,6 +44,8 @@ export class MemoryArchiverStore {
44
44
  * Contains all the pending L1 to L2 messages (accounts for duplication of messages)
45
45
  */
46
46
  this.pendingL1ToL2Messages = new PendingL1ToL2MessageStore();
47
+ this.lastL1BlockAddedMessages = 0n;
48
+ this.lastL1BlockCancelledMessages = 0n;
47
49
  }
48
50
  /**
49
51
  * Append new blocks to the store's list.
@@ -74,22 +76,32 @@ export class MemoryArchiverStore {
74
76
  /**
75
77
  * Append new pending L1 to L2 messages to the store.
76
78
  * @param messages - The L1 to L2 messages to be added to the store.
79
+ * @param l1BlockNumber - The L1 block number for which to add the messages.
77
80
  * @returns True if the operation is successful (always in this implementation).
78
81
  */
79
- addPendingL1ToL2Messages(messages) {
80
- for (const { message, blockNumber, indexInBlock } of messages) {
81
- this.pendingL1ToL2Messages.addMessage(message.entryKey, message, blockNumber, indexInBlock);
82
+ addPendingL1ToL2Messages(messages, l1BlockNumber) {
83
+ if (l1BlockNumber <= this.lastL1BlockAddedMessages) {
84
+ return Promise.resolve(false);
85
+ }
86
+ this.lastL1BlockAddedMessages = l1BlockNumber;
87
+ for (const message of messages) {
88
+ this.pendingL1ToL2Messages.addMessage(message.entryKey, message);
82
89
  }
83
90
  return Promise.resolve(true);
84
91
  }
85
92
  /**
86
93
  * Remove pending L1 to L2 messages from the store (if they were cancelled).
87
94
  * @param messages - The message keys to be removed from the store.
95
+ * @param l1BlockNumber - The L1 block number for which to remove the messages.
88
96
  * @returns True if the operation is successful (always in this implementation).
89
97
  */
90
- cancelPendingL1ToL2Messages(messages) {
91
- messages.forEach(({ entryKey, blockNumber, indexInBlock }) => {
92
- this.pendingL1ToL2Messages.removeMessage(entryKey, blockNumber, indexInBlock);
98
+ cancelPendingL1ToL2Messages(messages, l1BlockNumber) {
99
+ if (l1BlockNumber <= this.lastL1BlockCancelledMessages) {
100
+ return Promise.resolve(false);
101
+ }
102
+ this.lastL1BlockCancelledMessages = l1BlockNumber;
103
+ messages.forEach(entryKey => {
104
+ this.pendingL1ToL2Messages.removeMessage(entryKey);
93
105
  });
94
106
  return Promise.resolve(true);
95
107
  }
@@ -101,8 +113,8 @@ export class MemoryArchiverStore {
101
113
  */
102
114
  confirmL1ToL2Messages(messageKeys) {
103
115
  messageKeys.forEach(messageKey => {
104
- this.confirmedL1ToL2Messages.addMessageUnsafe(messageKey, this.pendingL1ToL2Messages.getMessage(messageKey));
105
- this.pendingL1ToL2Messages.removeMessageUnsafe(messageKey);
116
+ this.confirmedL1ToL2Messages.addMessage(messageKey, this.pendingL1ToL2Messages.getMessage(messageKey));
117
+ this.pendingL1ToL2Messages.removeMessage(messageKey);
106
118
  });
107
119
  return Promise.resolve(true);
108
120
  }
@@ -329,10 +341,14 @@ export class MemoryArchiverStore {
329
341
  return Promise.resolve(this.l2BlockContexts[this.l2BlockContexts.length - 1].block.number);
330
342
  }
331
343
  getL1BlockNumber() {
332
- if (this.l2BlockContexts.length === 0) {
333
- return Promise.resolve(0n);
334
- }
335
- return Promise.resolve(this.l2BlockContexts[this.l2BlockContexts.length - 1].block.getL1BlockNumber());
344
+ const addedBlock = this.l2BlockContexts[this.l2BlockContexts.length - 1]?.block?.getL1BlockNumber() ?? 0n;
345
+ const addedMessages = this.lastL1BlockAddedMessages;
346
+ const cancelledMessages = this.lastL1BlockCancelledMessages;
347
+ return Promise.resolve({
348
+ addedBlock,
349
+ addedMessages,
350
+ cancelledMessages,
351
+ });
336
352
  }
337
353
  }
338
- //# 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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"}
354
+ //# 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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"}