@aztec/archiver 0.0.1-commit.9b94fc1 → 0.0.1-commit.c7c42ec

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 (123) hide show
  1. package/dest/archiver/archiver.d.ts +96 -79
  2. package/dest/archiver/archiver.d.ts.map +1 -1
  3. package/dest/archiver/archiver.js +451 -214
  4. package/dest/archiver/archiver_store.d.ts +100 -47
  5. package/dest/archiver/archiver_store.d.ts.map +1 -1
  6. package/dest/archiver/archiver_store_test_suite.d.ts +1 -1
  7. package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
  8. package/dest/archiver/archiver_store_test_suite.js +1867 -386
  9. package/dest/archiver/config.d.ts +5 -4
  10. package/dest/archiver/config.d.ts.map +1 -1
  11. package/dest/archiver/config.js +10 -3
  12. package/dest/archiver/errors.d.ts +25 -1
  13. package/dest/archiver/errors.d.ts.map +1 -1
  14. package/dest/archiver/errors.js +37 -0
  15. package/dest/archiver/index.d.ts +2 -2
  16. package/dest/archiver/index.d.ts.map +1 -1
  17. package/dest/archiver/instrumentation.d.ts +3 -1
  18. package/dest/archiver/instrumentation.d.ts.map +1 -1
  19. package/dest/archiver/instrumentation.js +11 -0
  20. package/dest/archiver/kv_archiver_store/block_store.d.ts +51 -18
  21. package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
  22. package/dest/archiver/kv_archiver_store/block_store.js +324 -87
  23. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +2 -2
  24. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -1
  25. package/dest/archiver/kv_archiver_store/contract_class_store.js +1 -1
  26. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +2 -2
  27. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -1
  28. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +46 -56
  29. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
  30. package/dest/archiver/kv_archiver_store/kv_archiver_store.js +65 -48
  31. package/dest/archiver/kv_archiver_store/log_store.d.ts +12 -16
  32. package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
  33. package/dest/archiver/kv_archiver_store/log_store.js +149 -84
  34. package/dest/archiver/kv_archiver_store/message_store.d.ts +6 -5
  35. package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -1
  36. package/dest/archiver/kv_archiver_store/message_store.js +15 -14
  37. package/dest/archiver/l1/bin/retrieve-calldata.d.ts +3 -0
  38. package/dest/archiver/l1/bin/retrieve-calldata.d.ts.map +1 -0
  39. package/dest/archiver/l1/bin/retrieve-calldata.js +149 -0
  40. package/dest/archiver/l1/calldata_retriever.d.ts +112 -0
  41. package/dest/archiver/l1/calldata_retriever.d.ts.map +1 -0
  42. package/dest/archiver/l1/calldata_retriever.js +471 -0
  43. package/dest/archiver/l1/data_retrieval.d.ts +90 -0
  44. package/dest/archiver/l1/data_retrieval.d.ts.map +1 -0
  45. package/dest/archiver/{data_retrieval.js → l1/data_retrieval.js} +52 -107
  46. package/dest/archiver/l1/debug_tx.d.ts +19 -0
  47. package/dest/archiver/l1/debug_tx.d.ts.map +1 -0
  48. package/dest/archiver/l1/debug_tx.js +73 -0
  49. package/dest/archiver/l1/spire_proposer.d.ts +70 -0
  50. package/dest/archiver/l1/spire_proposer.d.ts.map +1 -0
  51. package/dest/archiver/l1/spire_proposer.js +157 -0
  52. package/dest/archiver/l1/trace_tx.d.ts +97 -0
  53. package/dest/archiver/l1/trace_tx.d.ts.map +1 -0
  54. package/dest/archiver/l1/trace_tx.js +91 -0
  55. package/dest/archiver/l1/types.d.ts +12 -0
  56. package/dest/archiver/l1/types.d.ts.map +1 -0
  57. package/dest/archiver/l1/types.js +3 -0
  58. package/dest/archiver/l1/validate_trace.d.ts +29 -0
  59. package/dest/archiver/l1/validate_trace.d.ts.map +1 -0
  60. package/dest/archiver/l1/validate_trace.js +150 -0
  61. package/dest/archiver/structs/inbox_message.d.ts +4 -4
  62. package/dest/archiver/structs/inbox_message.d.ts.map +1 -1
  63. package/dest/archiver/structs/inbox_message.js +6 -5
  64. package/dest/archiver/structs/published.d.ts +1 -2
  65. package/dest/archiver/structs/published.d.ts.map +1 -1
  66. package/dest/factory.d.ts +2 -2
  67. package/dest/factory.d.ts.map +1 -1
  68. package/dest/factory.js +4 -3
  69. package/dest/index.d.ts +2 -2
  70. package/dest/index.d.ts.map +1 -1
  71. package/dest/index.js +1 -1
  72. package/dest/test/mock_archiver.d.ts +16 -8
  73. package/dest/test/mock_archiver.d.ts.map +1 -1
  74. package/dest/test/mock_archiver.js +19 -14
  75. package/dest/test/mock_l1_to_l2_message_source.d.ts +7 -6
  76. package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
  77. package/dest/test/mock_l1_to_l2_message_source.js +10 -9
  78. package/dest/test/mock_l2_block_source.d.ts +18 -7
  79. package/dest/test/mock_l2_block_source.d.ts.map +1 -1
  80. package/dest/test/mock_l2_block_source.js +37 -23
  81. package/dest/test/mock_structs.d.ts +3 -2
  82. package/dest/test/mock_structs.d.ts.map +1 -1
  83. package/dest/test/mock_structs.js +9 -8
  84. package/package.json +17 -16
  85. package/src/archiver/archiver.ts +595 -296
  86. package/src/archiver/archiver_store.ts +113 -46
  87. package/src/archiver/archiver_store_test_suite.ts +1932 -353
  88. package/src/archiver/config.ts +15 -10
  89. package/src/archiver/errors.ts +64 -0
  90. package/src/archiver/index.ts +1 -1
  91. package/src/archiver/instrumentation.ts +14 -0
  92. package/src/archiver/kv_archiver_store/block_store.ts +442 -101
  93. package/src/archiver/kv_archiver_store/contract_class_store.ts +1 -1
  94. package/src/archiver/kv_archiver_store/contract_instance_store.ts +1 -1
  95. package/src/archiver/kv_archiver_store/kv_archiver_store.ts +87 -71
  96. package/src/archiver/kv_archiver_store/log_store.ts +209 -99
  97. package/src/archiver/kv_archiver_store/message_store.ts +21 -18
  98. package/src/archiver/l1/README.md +98 -0
  99. package/src/archiver/l1/bin/retrieve-calldata.ts +182 -0
  100. package/src/archiver/l1/calldata_retriever.ts +641 -0
  101. package/src/archiver/{data_retrieval.ts → l1/data_retrieval.ts} +101 -165
  102. package/src/archiver/l1/debug_tx.ts +99 -0
  103. package/src/archiver/l1/spire_proposer.ts +160 -0
  104. package/src/archiver/l1/trace_tx.ts +128 -0
  105. package/src/archiver/l1/types.ts +13 -0
  106. package/src/archiver/l1/validate_trace.ts +211 -0
  107. package/src/archiver/structs/inbox_message.ts +8 -8
  108. package/src/archiver/structs/published.ts +0 -1
  109. package/src/factory.ts +4 -3
  110. package/src/index.ts +1 -1
  111. package/src/test/fixtures/debug_traceTransaction-multicall3.json +88 -0
  112. package/src/test/fixtures/debug_traceTransaction-multiplePropose.json +153 -0
  113. package/src/test/fixtures/debug_traceTransaction-proxied.json +122 -0
  114. package/src/test/fixtures/trace_transaction-multicall3.json +65 -0
  115. package/src/test/fixtures/trace_transaction-multiplePropose.json +319 -0
  116. package/src/test/fixtures/trace_transaction-proxied.json +128 -0
  117. package/src/test/fixtures/trace_transaction-randomRevert.json +216 -0
  118. package/src/test/mock_archiver.ts +22 -16
  119. package/src/test/mock_l1_to_l2_message_source.ts +10 -9
  120. package/src/test/mock_l2_block_source.ts +45 -25
  121. package/src/test/mock_structs.ts +10 -9
  122. package/dest/archiver/data_retrieval.d.ts +0 -79
  123. package/dest/archiver/data_retrieval.d.ts.map +0 -1
@@ -1,24 +1,27 @@
1
- import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
2
- import { Fr } from '@aztec/foundation/fields';
1
+ import { INITIAL_CHECKPOINT_NUMBER, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
2
+ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
3
3
  import { toArray } from '@aztec/foundation/iterable';
4
4
  import { createLogger } from '@aztec/foundation/log';
5
5
  import { BufferReader } from '@aztec/foundation/serialize';
6
6
  import { bufferToHex } from '@aztec/foundation/string';
7
- import { Body, CommitteeAttestation, L2Block, L2BlockHash, PublishedL2Block } from '@aztec/stdlib/block';
8
- import { L2BlockHeader, deserializeValidateBlockResult, serializeValidateBlockResult } from '@aztec/stdlib/block';
7
+ import { isDefined } from '@aztec/foundation/types';
8
+ import { Body, CheckpointedL2Block, CommitteeAttestation, L2BlockHash, L2BlockNew, deserializeValidateBlockResult, serializeValidateBlockResult } from '@aztec/stdlib/block';
9
+ import { L1PublishedData } from '@aztec/stdlib/checkpoint';
10
+ import { CheckpointHeader } from '@aztec/stdlib/rollup';
9
11
  import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
10
- import { TxHash, TxReceipt, deserializeIndexedTxEffect, serializeIndexedTxEffect } from '@aztec/stdlib/tx';
11
- import { BlockNumberNotSequentialError, InitialBlockNumberNotSequentialError } from '../errors.js';
12
+ import { BlockHeader, TxHash, TxReceipt, deserializeIndexedTxEffect, serializeIndexedTxEffect } from '@aztec/stdlib/tx';
13
+ import { BlockArchiveNotConsistentError, BlockIndexNotSequentialError, BlockNotFoundError, BlockNumberNotSequentialError, CheckpointNotFoundError, CheckpointNumberNotConsistentError, CheckpointNumberNotSequentialError, InitialBlockNumberNotSequentialError, InitialCheckpointNumberNotSequentialError } from '../errors.js';
12
14
  export { TxReceipt } from '@aztec/stdlib/tx';
13
15
  /**
14
16
  * LMDB implementation of the ArchiverDataStore interface.
15
17
  */ export class BlockStore {
16
18
  db;
17
19
  /** Map block number to block data */ #blocks;
20
+ /** Map checkpoint number to checkpoint data */ #checkpoints;
18
21
  /** Map block hash to list of tx hashes */ #blockTxs;
19
22
  /** Tx hash to serialized IndexedTxEffect */ #txEffects;
20
23
  /** Stores L1 block number in which the last processed L2 block was included */ #lastSynchedL1Block;
21
- /** Stores l2 block number of the last proven block */ #lastProvenL2Block;
24
+ /** Stores last proven checkpoint */ #lastProvenCheckpoint;
22
25
  /** Stores the pending chain validation status */ #pendingChainValidationStatus;
23
26
  /** Index mapping a contract's address (as a string) to its location in a block */ #contractIndex;
24
27
  /** Index mapping block hash to block number */ #blockHashIndex;
@@ -34,11 +37,12 @@ export { TxReceipt } from '@aztec/stdlib/tx';
34
37
  this.#blockHashIndex = db.openMap('archiver_block_hash_index');
35
38
  this.#blockArchiveIndex = db.openMap('archiver_block_archive_index');
36
39
  this.#lastSynchedL1Block = db.openSingleton('archiver_last_synched_l1_block');
37
- this.#lastProvenL2Block = db.openSingleton('archiver_last_proven_l2_block');
40
+ this.#lastProvenCheckpoint = db.openSingleton('archiver_last_proven_l2_checkpoint');
38
41
  this.#pendingChainValidationStatus = db.openSingleton('archiver_pending_chain_validation_status');
42
+ this.#checkpoints = db.openMap('archiver_checkpoints');
39
43
  }
40
44
  /**
41
- * Append new blocks to the store's list.
45
+ * Append new blocks to the store's list. All blocks must be for the 'current' checkpoint
42
46
  * @param blocks - The L2 blocks to be added to the store.
43
47
  * @returns True if the operation is successful.
44
48
  */ async addBlocks(blocks, opts = {}) {
@@ -47,84 +51,313 @@ export { TxReceipt } from '@aztec/stdlib/tx';
47
51
  }
48
52
  return await this.db.transactionAsync(async ()=>{
49
53
  // Check that the block immediately before the first block to be added is present in the store.
50
- const firstBlockNumber = blocks[0].block.number;
51
- const [previousBlockNumber] = await toArray(this.#blocks.keysAsync({
52
- reverse: true,
53
- limit: 1,
54
- end: firstBlockNumber - 1
55
- }));
56
- const hasPreviousBlock = firstBlockNumber === INITIAL_L2_BLOCK_NUM || previousBlockNumber !== undefined && previousBlockNumber === firstBlockNumber - 1;
57
- if (!opts.force && !hasPreviousBlock) {
54
+ const firstBlockNumber = blocks[0].number;
55
+ const firstBlockCheckpointNumber = blocks[0].checkpointNumber;
56
+ const firstBlockIndex = blocks[0].indexWithinCheckpoint;
57
+ const firstBlockLastArchive = blocks[0].header.lastArchive.root;
58
+ // Extract the latest block and checkpoint numbers
59
+ const previousBlockNumber = await this.getLatestBlockNumber();
60
+ const previousCheckpointNumber = await this.getLatestCheckpointNumber();
61
+ // Check that the first block number is the expected one
62
+ if (!opts.force && previousBlockNumber !== firstBlockNumber - 1) {
58
63
  throw new InitialBlockNumberNotSequentialError(firstBlockNumber, previousBlockNumber);
59
64
  }
60
- // Iterate over blocks array and insert them, checking that the block numbers are sequential.
65
+ // The same check as above but for checkpoints
66
+ if (!opts.force && previousCheckpointNumber !== firstBlockCheckpointNumber - 1) {
67
+ throw new InitialCheckpointNumberNotSequentialError(firstBlockCheckpointNumber, previousCheckpointNumber);
68
+ }
69
+ // Extract the previous block if there is one and see if it is for the same checkpoint or not
70
+ const previousBlockResult = await this.getBlock(previousBlockNumber);
71
+ let expectedFirstblockIndex = 0;
72
+ let previousBlockIndex = undefined;
73
+ if (previousBlockResult !== undefined) {
74
+ if (previousBlockResult.checkpointNumber === firstBlockCheckpointNumber) {
75
+ // The previous block is for the same checkpoint, therefore our index should follow it
76
+ previousBlockIndex = previousBlockResult.indexWithinCheckpoint;
77
+ expectedFirstblockIndex = previousBlockIndex + 1;
78
+ }
79
+ if (!previousBlockResult.archive.root.equals(firstBlockLastArchive)) {
80
+ throw new BlockArchiveNotConsistentError(firstBlockNumber, previousBlockResult.number, firstBlockLastArchive, previousBlockResult.archive.root);
81
+ }
82
+ }
83
+ // Now check that the first block has the expected index value
84
+ if (!opts.force && expectedFirstblockIndex !== firstBlockIndex) {
85
+ throw new BlockIndexNotSequentialError(firstBlockIndex, previousBlockIndex);
86
+ }
87
+ // Iterate over blocks array and insert them, checking that the block numbers and indexes are sequential. Also check they are for the correct checkpoint.
61
88
  let previousBlock = undefined;
62
89
  for (const block of blocks){
63
- if (!opts.force && previousBlock && previousBlock.block.number + 1 !== block.block.number) {
64
- throw new BlockNumberNotSequentialError(block.block.number, previousBlock.block.number);
90
+ if (!opts.force && previousBlock) {
91
+ if (previousBlock.number + 1 !== block.number) {
92
+ throw new BlockNumberNotSequentialError(block.number, previousBlock.number);
93
+ }
94
+ if (previousBlock.indexWithinCheckpoint + 1 !== block.indexWithinCheckpoint) {
95
+ throw new BlockIndexNotSequentialError(block.indexWithinCheckpoint, previousBlock.indexWithinCheckpoint);
96
+ }
97
+ if (!previousBlock.archive.root.equals(block.header.lastArchive.root)) {
98
+ throw new BlockArchiveNotConsistentError(block.number, previousBlock.number, block.header.lastArchive.root, previousBlock.archive.root);
99
+ }
100
+ }
101
+ if (!opts.force && firstBlockCheckpointNumber !== block.checkpointNumber) {
102
+ throw new CheckpointNumberNotConsistentError(block.checkpointNumber, firstBlockCheckpointNumber);
65
103
  }
66
104
  previousBlock = block;
67
- const blockHash = L2BlockHash.fromField(await block.block.hash());
68
- await this.#blocks.set(block.block.number, {
69
- header: block.block.header.toBuffer(),
70
- blockHash: blockHash.toBuffer(),
71
- archive: block.block.archive.toBuffer(),
72
- l1: block.l1,
73
- attestations: block.attestations.map((attestation)=>attestation.toBuffer())
74
- });
75
- for(let i = 0; i < block.block.body.txEffects.length; i++){
76
- const txEffect = {
77
- data: block.block.body.txEffects[i],
78
- l2BlockNumber: block.block.number,
79
- l2BlockHash: blockHash,
80
- txIndexInBlock: i
81
- };
82
- await this.#txEffects.set(txEffect.data.txHash.toString(), serializeIndexedTxEffect(txEffect));
105
+ await this.addBlockToDatabase(block, block.checkpointNumber, block.indexWithinCheckpoint);
106
+ }
107
+ return true;
108
+ });
109
+ }
110
+ /**
111
+ * Append new cheskpoints to the store's list.
112
+ * @param checkpoints - The L2 checkpoints to be added to the store.
113
+ * @returns True if the operation is successful.
114
+ */ async addCheckpoints(checkpoints, opts = {}) {
115
+ if (checkpoints.length === 0) {
116
+ return true;
117
+ }
118
+ return await this.db.transactionAsync(async ()=>{
119
+ // Check that the checkpoint immediately before the first block to be added is present in the store.
120
+ const firstCheckpointNumber = checkpoints[0].checkpoint.number;
121
+ const previousCheckpointNumber = await this.getLatestCheckpointNumber();
122
+ if (previousCheckpointNumber !== firstCheckpointNumber - 1 && !opts.force) {
123
+ throw new InitialCheckpointNumberNotSequentialError(firstCheckpointNumber, previousCheckpointNumber);
124
+ }
125
+ // Extract the previous checkpoint if there is one
126
+ let previousCheckpointData = undefined;
127
+ if (previousCheckpointNumber !== INITIAL_CHECKPOINT_NUMBER - 1) {
128
+ // There should be a previous checkpoint
129
+ previousCheckpointData = await this.getCheckpointData(previousCheckpointNumber);
130
+ if (previousCheckpointData === undefined) {
131
+ throw new CheckpointNotFoundError(previousCheckpointNumber);
83
132
  }
84
- await this.#blockTxs.set(blockHash.toString(), Buffer.concat(block.block.body.txEffects.map((tx)=>tx.txHash.toBuffer())));
85
- // Update indices for block hash and archive
86
- await this.#blockHashIndex.set(blockHash.toString(), block.block.number);
87
- await this.#blockArchiveIndex.set(block.block.archive.root.toString(), block.block.number);
88
133
  }
89
- await this.#lastSynchedL1Block.set(blocks[blocks.length - 1].l1.blockNumber);
134
+ let previousBlockNumber = undefined;
135
+ let previousBlock = undefined;
136
+ // If we have a previous checkpoint then we need to get the previous block number
137
+ if (previousCheckpointData !== undefined) {
138
+ previousBlockNumber = BlockNumber(previousCheckpointData.startBlock + previousCheckpointData.numBlocks - 1);
139
+ previousBlock = await this.getBlock(previousBlockNumber);
140
+ if (previousBlock === undefined) {
141
+ // We should be able to get the required previous block
142
+ throw new BlockNotFoundError(previousBlockNumber);
143
+ }
144
+ }
145
+ // Iterate over checkpoints array and insert them, checking that the block numbers are sequential.
146
+ let previousCheckpoint = undefined;
147
+ for (const checkpoint of checkpoints){
148
+ if (!opts.force && previousCheckpoint && previousCheckpoint.checkpoint.number + 1 !== checkpoint.checkpoint.number) {
149
+ throw new CheckpointNumberNotSequentialError(checkpoint.checkpoint.number, previousCheckpoint.checkpoint.number);
150
+ }
151
+ previousCheckpoint = checkpoint;
152
+ // Store every block in the database. the block may already exist, but this has come from chain and is assumed to be correct.
153
+ for(let i = 0; i < checkpoint.checkpoint.blocks.length; i++){
154
+ const block = checkpoint.checkpoint.blocks[i];
155
+ if (previousBlock) {
156
+ // The blocks should have a sequential block number
157
+ if (previousBlock.number !== block.number - 1) {
158
+ throw new BlockNumberNotSequentialError(block.number, previousBlock.number);
159
+ }
160
+ // If the blocks are for the same checkpoint then they should have sequential indexes
161
+ if (previousBlock.checkpointNumber === block.checkpointNumber && previousBlock.indexWithinCheckpoint !== block.indexWithinCheckpoint - 1) {
162
+ throw new BlockIndexNotSequentialError(block.indexWithinCheckpoint, previousBlock.indexWithinCheckpoint);
163
+ }
164
+ if (!previousBlock.archive.root.equals(block.header.lastArchive.root)) {
165
+ throw new BlockArchiveNotConsistentError(block.number, previousBlock.number, block.header.lastArchive.root, previousBlock.archive.root);
166
+ }
167
+ } else {
168
+ // No previous block, must be block 1 at checkpoint index 0
169
+ if (block.indexWithinCheckpoint !== 0) {
170
+ throw new BlockIndexNotSequentialError(block.indexWithinCheckpoint, undefined);
171
+ }
172
+ if (block.number !== INITIAL_L2_BLOCK_NUM) {
173
+ throw new BlockNumberNotSequentialError(block.number, undefined);
174
+ }
175
+ }
176
+ previousBlock = block;
177
+ await this.addBlockToDatabase(block, checkpoint.checkpoint.number, i);
178
+ }
179
+ // Store the checkpoint in the database
180
+ await this.#checkpoints.set(checkpoint.checkpoint.number, {
181
+ header: checkpoint.checkpoint.header.toBuffer(),
182
+ archive: checkpoint.checkpoint.archive.toBuffer(),
183
+ l1: checkpoint.l1.toBuffer(),
184
+ attestations: checkpoint.attestations.map((attestation)=>attestation.toBuffer()),
185
+ checkpointNumber: checkpoint.checkpoint.number,
186
+ startBlock: checkpoint.checkpoint.blocks[0].number,
187
+ numBlocks: checkpoint.checkpoint.blocks.length
188
+ });
189
+ }
190
+ await this.#lastSynchedL1Block.set(checkpoints[checkpoints.length - 1].l1.blockNumber);
90
191
  return true;
91
192
  });
92
193
  }
194
+ async addBlockToDatabase(block, checkpointNumber, indexWithinCheckpoint) {
195
+ const blockHash = L2BlockHash.fromField(await block.hash());
196
+ await this.#blocks.set(block.number, {
197
+ header: block.header.toBuffer(),
198
+ blockHash: blockHash.toBuffer(),
199
+ archive: block.archive.toBuffer(),
200
+ checkpointNumber,
201
+ indexWithinCheckpoint
202
+ });
203
+ for(let i = 0; i < block.body.txEffects.length; i++){
204
+ const txEffect = {
205
+ data: block.body.txEffects[i],
206
+ l2BlockNumber: block.number,
207
+ l2BlockHash: blockHash,
208
+ txIndexInBlock: i
209
+ };
210
+ await this.#txEffects.set(txEffect.data.txHash.toString(), serializeIndexedTxEffect(txEffect));
211
+ }
212
+ await this.#blockTxs.set(blockHash.toString(), Buffer.concat(block.body.txEffects.map((tx)=>tx.txHash.toBuffer())));
213
+ // Update indices for block hash and archive
214
+ await this.#blockHashIndex.set(blockHash.toString(), block.number);
215
+ await this.#blockArchiveIndex.set(block.archive.root.toString(), block.number);
216
+ }
93
217
  /**
94
- * Unwinds blocks from the database
218
+ * Unwinds checkpoints from the database
95
219
  * @param from - The tip of the chain, passed for verification purposes,
96
220
  * ensuring that we don't end up deleting something we did not intend
97
- * @param blocksToUnwind - The number of blocks we are to unwind
221
+ * @param checkpointsToUnwind - The number of checkpoints we are to unwind
98
222
  * @returns True if the operation is successful
99
- */ async unwindBlocks(from, blocksToUnwind) {
223
+ */ async unwindCheckpoints(from, checkpointsToUnwind) {
100
224
  return await this.db.transactionAsync(async ()=>{
101
- const last = await this.getSynchedL2BlockNumber();
225
+ const last = await this.getLatestCheckpointNumber();
102
226
  if (from !== last) {
103
- throw new Error(`Can only unwind blocks from the tip (requested ${from} but current tip is ${last})`);
227
+ throw new Error(`Can only unwind checkpoints from the tip (requested ${from} but current tip is ${last})`);
104
228
  }
105
- const proven = await this.getProvenL2BlockNumber();
106
- if (from - blocksToUnwind < proven) {
107
- await this.setProvenL2BlockNumber(from - blocksToUnwind);
229
+ const proven = await this.getProvenCheckpointNumber();
230
+ if (from - checkpointsToUnwind < proven) {
231
+ await this.setProvenCheckpointNumber(CheckpointNumber(from - checkpointsToUnwind));
108
232
  }
109
- for(let i = 0; i < blocksToUnwind; i++){
110
- const blockNumber = from - i;
111
- const block = await this.getBlock(blockNumber);
112
- if (block === undefined) {
113
- this.#log.warn(`Cannot remove block ${blockNumber} from the store since we don't have it`);
233
+ for(let i = 0; i < checkpointsToUnwind; i++){
234
+ const checkpointNumber = from - i;
235
+ const checkpoint = await this.#checkpoints.getAsync(checkpointNumber);
236
+ if (checkpoint === undefined) {
237
+ this.#log.warn(`Cannot remove checkpoint ${checkpointNumber} from the store since we don't have it`);
114
238
  continue;
115
239
  }
116
- await this.#blocks.delete(block.block.number);
117
- await Promise.all(block.block.body.txEffects.map((tx)=>this.#txEffects.delete(tx.txHash.toString())));
118
- const blockHash = (await block.block.hash()).toString();
119
- await this.#blockTxs.delete(blockHash);
120
- // Clean up indices
121
- await this.#blockHashIndex.delete(blockHash);
122
- await this.#blockArchiveIndex.delete(block.block.archive.root.toString());
123
- this.#log.debug(`Unwound block ${blockNumber} ${blockHash}`);
240
+ await this.#checkpoints.delete(checkpointNumber);
241
+ const maxBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
242
+ for(let blockNumber = checkpoint.startBlock; blockNumber <= maxBlock; blockNumber++){
243
+ const block = await this.getBlock(BlockNumber(blockNumber));
244
+ if (block === undefined) {
245
+ this.#log.warn(`Cannot remove block ${blockNumber} from the store since we don't have it`);
246
+ continue;
247
+ }
248
+ await this.#blocks.delete(block.number);
249
+ await Promise.all(block.body.txEffects.map((tx)=>this.#txEffects.delete(tx.txHash.toString())));
250
+ const blockHash = (await block.hash()).toString();
251
+ await this.#blockTxs.delete(blockHash);
252
+ // Clean up indices
253
+ await this.#blockHashIndex.delete(blockHash);
254
+ await this.#blockArchiveIndex.delete(block.archive.root.toString());
255
+ this.#log.debug(`Unwound block ${blockNumber} ${blockHash} for checkpoint ${checkpointNumber}`);
256
+ }
124
257
  }
125
258
  return true;
126
259
  });
127
260
  }
261
+ async getCheckpointData(checkpointNumber) {
262
+ const checkpointStorage = await this.#checkpoints.getAsync(checkpointNumber);
263
+ if (!checkpointStorage) {
264
+ return undefined;
265
+ }
266
+ return this.checkpointDataFromCheckpointStorage(checkpointStorage);
267
+ }
268
+ async getRangeOfCheckpoints(from, limit) {
269
+ const checkpoints = [];
270
+ for(let checkpointNumber = from; checkpointNumber < from + limit; checkpointNumber++){
271
+ const checkpoint = await this.#checkpoints.getAsync(checkpointNumber);
272
+ if (!checkpoint) {
273
+ break;
274
+ }
275
+ checkpoints.push(this.checkpointDataFromCheckpointStorage(checkpoint));
276
+ }
277
+ return checkpoints;
278
+ }
279
+ checkpointDataFromCheckpointStorage(checkpointStorage) {
280
+ const data = {
281
+ header: CheckpointHeader.fromBuffer(checkpointStorage.header),
282
+ archive: AppendOnlyTreeSnapshot.fromBuffer(checkpointStorage.archive),
283
+ checkpointNumber: CheckpointNumber(checkpointStorage.checkpointNumber),
284
+ startBlock: checkpointStorage.startBlock,
285
+ numBlocks: checkpointStorage.numBlocks,
286
+ l1: L1PublishedData.fromBuffer(checkpointStorage.l1),
287
+ attestations: checkpointStorage.attestations
288
+ };
289
+ return data;
290
+ }
291
+ async getBlocksForCheckpoint(checkpointNumber) {
292
+ const checkpoint = await this.#checkpoints.getAsync(checkpointNumber);
293
+ if (!checkpoint) {
294
+ return undefined;
295
+ }
296
+ const blocksForCheckpoint = await toArray(this.#blocks.entriesAsync({
297
+ start: checkpoint.startBlock,
298
+ end: checkpoint.startBlock + checkpoint.numBlocks
299
+ }));
300
+ const converted = await Promise.all(blocksForCheckpoint.map((x)=>this.getBlockFromBlockStorage(x[0], x[1])));
301
+ return converted.filter(isDefined);
302
+ }
303
+ async getProvenBlockNumber() {
304
+ const provenCheckpointNumber = await this.getProvenCheckpointNumber();
305
+ if (provenCheckpointNumber === INITIAL_CHECKPOINT_NUMBER - 1) {
306
+ return BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
307
+ }
308
+ const checkpointStorage = await this.#checkpoints.getAsync(provenCheckpointNumber);
309
+ if (!checkpointStorage) {
310
+ throw new CheckpointNotFoundError(provenCheckpointNumber);
311
+ } else {
312
+ return BlockNumber(checkpointStorage.startBlock + checkpointStorage.numBlocks - 1);
313
+ }
314
+ }
315
+ async getLatestBlockNumber() {
316
+ const [latestBlocknumber] = await toArray(this.#blocks.keysAsync({
317
+ reverse: true,
318
+ limit: 1
319
+ }));
320
+ return typeof latestBlocknumber === 'number' ? BlockNumber(latestBlocknumber) : BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
321
+ }
322
+ async getLatestCheckpointNumber() {
323
+ const [latestCheckpointNumber] = await toArray(this.#checkpoints.keysAsync({
324
+ reverse: true,
325
+ limit: 1
326
+ }));
327
+ if (latestCheckpointNumber === undefined) {
328
+ return CheckpointNumber(INITIAL_CHECKPOINT_NUMBER - 1);
329
+ }
330
+ return CheckpointNumber(latestCheckpointNumber);
331
+ }
332
+ async getCheckpointedBlock(number) {
333
+ const blockStorage = await this.#blocks.getAsync(number);
334
+ if (!blockStorage) {
335
+ return undefined;
336
+ }
337
+ const checkpoint = await this.#checkpoints.getAsync(blockStorage.checkpointNumber);
338
+ if (!checkpoint) {
339
+ return undefined;
340
+ }
341
+ const block = await this.getBlockFromBlockStorage(number, blockStorage);
342
+ if (!block) {
343
+ return undefined;
344
+ }
345
+ return new CheckpointedL2Block(CheckpointNumber(checkpoint.checkpointNumber), block, L1PublishedData.fromBuffer(checkpoint.l1), checkpoint.attestations.map((buf)=>CommitteeAttestation.fromBuffer(buf)));
346
+ }
347
+ async getCheckpointedBlockByHash(blockHash) {
348
+ const blockNumber = await this.#blockHashIndex.getAsync(blockHash.toString());
349
+ if (blockNumber === undefined) {
350
+ return undefined;
351
+ }
352
+ return this.getCheckpointedBlock(BlockNumber(blockNumber));
353
+ }
354
+ async getCheckpointedBlockByArchive(archive) {
355
+ const blockNumber = await this.#blockArchiveIndex.getAsync(archive.toString());
356
+ if (blockNumber === undefined) {
357
+ return undefined;
358
+ }
359
+ return this.getCheckpointedBlock(BlockNumber(blockNumber));
360
+ }
128
361
  /**
129
362
  * Gets up to `limit` amount of L2 blocks starting from `from`.
130
363
  * @param start - Number of the first block to return (inclusive).
@@ -158,7 +391,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
158
391
  if (blockNumber === undefined) {
159
392
  return undefined;
160
393
  }
161
- return this.getBlock(blockNumber);
394
+ return this.getBlock(BlockNumber(blockNumber));
162
395
  }
163
396
  /**
164
397
  * Gets an L2 block by its archive root.
@@ -169,7 +402,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
169
402
  if (blockNumber === undefined) {
170
403
  return undefined;
171
404
  }
172
- return this.getBlock(blockNumber);
405
+ return this.getBlock(BlockNumber(blockNumber));
173
406
  }
174
407
  /**
175
408
  * Gets a block header by its hash.
@@ -184,7 +417,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
184
417
  if (!blockStorage || !blockStorage.header) {
185
418
  return undefined;
186
419
  }
187
- return L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
420
+ return BlockHeader.fromBuffer(blockStorage.header);
188
421
  }
189
422
  /**
190
423
  * Gets a block header by its archive root.
@@ -199,7 +432,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
199
432
  if (!blockStorage || !blockStorage.header) {
200
433
  return undefined;
201
434
  }
202
- return L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
435
+ return BlockHeader.fromBuffer(blockStorage.header);
203
436
  }
204
437
  /**
205
438
  * Gets the headers for a sequence of L2 blocks.
@@ -208,7 +441,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
208
441
  * @returns The requested L2 block headers
209
442
  */ async *getBlockHeaders(start, limit) {
210
443
  for await (const [blockNumber, blockStorage] of this.getBlockStorages(start, limit)){
211
- const header = L2BlockHeader.fromBuffer(blockStorage.header).toBlockHeader();
444
+ const header = BlockHeader.fromBuffer(blockStorage.header);
212
445
  if (header.getBlockNumber() !== blockNumber) {
213
446
  throw new Error(`Block number mismatch when retrieving block header from archive (expected ${blockNumber} but got ${header.getBlockNumber()})`);
214
447
  }
@@ -229,7 +462,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
229
462
  }
230
463
  }
231
464
  async getBlockFromBlockStorage(blockNumber, blockStorage) {
232
- const header = L2BlockHeader.fromBuffer(blockStorage.header);
465
+ const header = BlockHeader.fromBuffer(blockStorage.header);
233
466
  const archive = AppendOnlyTreeSnapshot.fromBuffer(blockStorage.archive);
234
467
  const blockHash = blockStorage.blockHash;
235
468
  const blockHashString = bufferToHex(blockHash);
@@ -250,16 +483,11 @@ export { TxReceipt } from '@aztec/stdlib/tx';
250
483
  txEffects.push(deserializeIndexedTxEffect(txEffect).data);
251
484
  }
252
485
  const body = new Body(txEffects);
253
- const block = new L2Block(archive, header, body, Fr.fromBuffer(blockHash));
486
+ const block = new L2BlockNew(archive, header, body, CheckpointNumber(blockStorage.checkpointNumber), blockStorage.indexWithinCheckpoint);
254
487
  if (block.number !== blockNumber) {
255
488
  throw new Error(`Block number mismatch when retrieving block from archive (expected ${blockNumber} but got ${block.number} with hash ${blockHashString})`);
256
489
  }
257
- const attestations = blockStorage.attestations.map(CommitteeAttestation.fromBuffer);
258
- return PublishedL2Block.fromFields({
259
- block,
260
- l1: blockStorage.l1,
261
- attestations
262
- });
490
+ return block;
263
491
  }
264
492
  /**
265
493
  * Gets a tx effect.
@@ -281,7 +509,7 @@ export { TxReceipt } from '@aztec/stdlib/tx';
281
509
  if (!txEffect) {
282
510
  return undefined;
283
511
  }
284
- return new TxReceipt(txHash, TxReceipt.statusFromRevertCode(txEffect.data.revertCode), '', txEffect.data.transactionFee.toBigInt(), txEffect.l2BlockHash, txEffect.l2BlockNumber);
512
+ return new TxReceipt(txHash, TxReceipt.statusFromRevertCode(txEffect.data.revertCode), '', txEffect.data.transactionFee.toBigInt(), txEffect.l2BlockHash, BlockNumber(txEffect.l2BlockNumber));
285
513
  }
286
514
  /**
287
515
  * Looks up which block included the requested tx effect.
@@ -306,14 +534,22 @@ export { TxReceipt } from '@aztec/stdlib/tx';
306
534
  return this.#contractIndex.getAsync(contractAddress.toString());
307
535
  }
308
536
  /**
309
- * Gets the number of the latest L2 block processed.
310
- * @returns The number of the latest L2 block processed.
311
- */ async getSynchedL2BlockNumber() {
537
+ * Gets the number of the latest L2 block checkpointed.
538
+ * @returns The number of the latest L2 block checkpointed.
539
+ */ async getCheckpointedL2BlockNumber() {
540
+ const latestCheckpointNumber = await this.getLatestCheckpointNumber();
541
+ const checkpoint = await this.getCheckpointData(latestCheckpointNumber);
542
+ if (!checkpoint) {
543
+ return BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
544
+ }
545
+ return BlockNumber(checkpoint.startBlock + checkpoint.numBlocks - 1);
546
+ }
547
+ async getLatestL2BlockNumber() {
312
548
  const [lastBlockNumber] = await toArray(this.#blocks.keysAsync({
313
549
  reverse: true,
314
550
  limit: 1
315
551
  }));
316
- return typeof lastBlockNumber === 'number' ? lastBlockNumber : INITIAL_L2_BLOCK_NUM - 1;
552
+ return typeof lastBlockNumber === 'number' ? BlockNumber(lastBlockNumber) : BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
317
553
  }
318
554
  /**
319
555
  * Gets the most recent L1 block processed.
@@ -324,15 +560,16 @@ export { TxReceipt } from '@aztec/stdlib/tx';
324
560
  setSynchedL1BlockNumber(l1BlockNumber) {
325
561
  return this.#lastSynchedL1Block.set(l1BlockNumber);
326
562
  }
327
- async getProvenL2BlockNumber() {
328
- const [latestBlockNumber, provenBlockNumber] = await Promise.all([
329
- this.getSynchedL2BlockNumber(),
330
- this.#lastProvenL2Block.getAsync()
563
+ async getProvenCheckpointNumber() {
564
+ const [latestCheckpointNumber, provenCheckpointNumber] = await Promise.all([
565
+ this.getLatestCheckpointNumber(),
566
+ this.#lastProvenCheckpoint.getAsync()
331
567
  ]);
332
- return (provenBlockNumber ?? 0) > latestBlockNumber ? latestBlockNumber : provenBlockNumber ?? 0;
568
+ return (provenCheckpointNumber ?? 0) > latestCheckpointNumber ? latestCheckpointNumber : CheckpointNumber(provenCheckpointNumber ?? 0);
333
569
  }
334
- setProvenL2BlockNumber(blockNumber) {
335
- return this.#lastProvenL2Block.set(blockNumber);
570
+ async setProvenCheckpointNumber(checkpointNumber) {
571
+ const result = await this.#lastProvenCheckpoint.set(checkpointNumber);
572
+ return result;
336
573
  }
337
574
  #computeBlockRange(start, limit) {
338
575
  if (limit < 1) {
@@ -1,4 +1,4 @@
1
- import { Fr } from '@aztec/foundation/fields';
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import type { AztecAsyncKVStore } from '@aztec/kv-store';
3
3
  import type { ContractClassPublic, ExecutablePrivateFunctionWithMembershipProof, UtilityFunctionWithMembershipProof } from '@aztec/stdlib/contract';
4
4
  /**
@@ -15,4 +15,4 @@ export declare class ContractClassStore {
15
15
  getContractClassIds(): Promise<Fr[]>;
16
16
  addFunctions(contractClassId: Fr, newPrivateFunctions: ExecutablePrivateFunctionWithMembershipProof[], newUtilityFunctions: UtilityFunctionWithMembershipProof[]): Promise<boolean>;
17
17
  }
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9jb250cmFjdF9jbGFzc19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHOUMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQ1YsbUJBQW1CLEVBRW5CLDRDQUE0QyxFQUM1QyxrQ0FBa0MsRUFDbkMsTUFBTSx3QkFBd0IsQ0FBQztBQUdoQzs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjs7SUFJakIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUd4QztJQUVLLGdCQUFnQixDQUNwQixhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGtCQUFrQixFQUFFLEVBQUUsRUFDdEIsV0FBVyxFQUFFLE1BQU0sR0FDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1mO0lBRUsscUJBQXFCLENBQUMsYUFBYSxFQUFFLG1CQUFtQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1sRztJQUVLLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUd2RTtJQUVLLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHM0Q7SUFFSyxtQkFBbUIsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFekM7SUFFSyxZQUFZLENBQ2hCLGVBQWUsRUFBRSxFQUFFLEVBQ25CLG1CQUFtQixFQUFFLDRDQUE0QyxFQUFFLEVBQ25FLG1CQUFtQixFQUFFLGtDQUFrQyxFQUFFLEdBQ3hELE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F5QmxCO0NBQ0YifQ==
18
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9jb250cmFjdF9jbGFzc19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQWlCLE1BQU0saUJBQWlCLENBQUM7QUFFeEUsT0FBTyxLQUFLLEVBQ1YsbUJBQW1CLEVBRW5CLDRDQUE0QyxFQUM1QyxrQ0FBa0MsRUFDbkMsTUFBTSx3QkFBd0IsQ0FBQztBQUdoQzs7R0FFRztBQUNILHFCQUFhLGtCQUFrQjs7SUFJakIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUd4QztJQUVLLGdCQUFnQixDQUNwQixhQUFhLEVBQUUsbUJBQW1CLEVBQ2xDLGtCQUFrQixFQUFFLEVBQUUsRUFDdEIsV0FBVyxFQUFFLE1BQU0sR0FDbEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1mO0lBRUsscUJBQXFCLENBQUMsYUFBYSxFQUFFLG1CQUFtQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQU1sRztJQUVLLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixHQUFHLFNBQVMsQ0FBQyxDQUd2RTtJQUVLLHFCQUFxQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FHM0Q7SUFFSyxtQkFBbUIsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFekM7SUFFSyxZQUFZLENBQ2hCLGVBQWUsRUFBRSxFQUFFLEVBQ25CLG1CQUFtQixFQUFFLDRDQUE0QyxFQUFFLEVBQ25FLG1CQUFtQixFQUFFLGtDQUFrQyxFQUFFLEdBQ3hELE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F5QmxCO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"contract_class_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_class_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EACV,mBAAmB,EAEnB,4CAA4C,EAC5C,kCAAkC,EACnC,MAAM,wBAAwB,CAAC;AAGhC;;GAEG;AACH,qBAAa,kBAAkB;;IAIjB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAGxC;IAEK,gBAAgB,CACpB,aAAa,EAAE,mBAAmB,EAClC,kBAAkB,EAAE,EAAE,EACtB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAMf;IAEK,qBAAqB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlG;IAEK,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAGvE;IAEK,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG3D;IAEK,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEzC;IAEK,YAAY,CAChB,eAAe,EAAE,EAAE,EACnB,mBAAmB,EAAE,4CAA4C,EAAE,EACnE,mBAAmB,EAAE,kCAAkC,EAAE,GACxD,OAAO,CAAC,OAAO,CAAC,CAyBlB;CACF"}
1
+ {"version":3,"file":"contract_class_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_class_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AAExE,OAAO,KAAK,EACV,mBAAmB,EAEnB,4CAA4C,EAC5C,kCAAkC,EACnC,MAAM,wBAAwB,CAAC;AAGhC;;GAEG;AACH,qBAAa,kBAAkB;;IAIjB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAGxC;IAEK,gBAAgB,CACpB,aAAa,EAAE,mBAAmB,EAClC,kBAAkB,EAAE,EAAE,EACtB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAMf;IAEK,qBAAqB,CAAC,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlG;IAEK,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAGvE;IAEK,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAG3D;IAEK,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAEzC;IAEK,YAAY,CAChB,eAAe,EAAE,EAAE,EACnB,mBAAmB,EAAE,4CAA4C,EAAE,EACnE,mBAAmB,EAAE,kCAAkC,EAAE,GACxD,OAAO,CAAC,OAAO,CAAC,CAyBlB;CACF"}
@@ -1,4 +1,4 @@
1
- import { Fr } from '@aztec/foundation/fields';
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import { toArray } from '@aztec/foundation/iterable';
3
3
  import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
4
4
  import { FunctionSelector } from '@aztec/stdlib/abi';
@@ -1,4 +1,4 @@
1
- import type { Fr } from '@aztec/foundation/fields';
1
+ import type { Fr } from '@aztec/foundation/curves/bn254';
2
2
  import type { AztecAsyncKVStore } from '@aztec/kv-store';
3
3
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
4
4
  import { type ContractInstanceUpdateWithAddress, type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
@@ -21,4 +21,4 @@ export declare class ContractInstanceStore {
21
21
  getContractInstanceDeploymentBlockNumber(address: AztecAddress): Promise<number | undefined>;
22
22
  }
23
23
  export {};
24
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2Vfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9jb250cmFjdF9pbnN0YW5jZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxpQ0FBaUMsRUFDdEMsS0FBSywyQkFBMkIsRUFHakMsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxLQUFLLHlCQUF5QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUU3RTs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjs7SUFLcEIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUl4QztJQUVELG1CQUFtQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVFyRztJQUVELHNCQUFzQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLbkY7SUFFRCxZQUFZLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FBRyx5QkFBeUIsQ0FNM0c7SUFFRCx5QkFBeUIsQ0FDdkIsc0JBQXNCLEVBQUUsaUNBQWlDLEVBQ3pELFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLEdBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtmO0lBRUQsNEJBQTRCLENBQzFCLHNCQUFzQixFQUFFLGlDQUFpQyxFQUN6RCxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsTUFBTSxHQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFZjtJQUVLLGlDQUFpQyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FvQmxIO0lBRUssbUJBQW1CLENBQ3ZCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLFNBQVMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FhbEQ7SUFFRCx3Q0FBd0MsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNGO0NBQ0YifQ==
24
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2Vfc3RvcmUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hcmNoaXZlci9rdl9hcmNoaXZlcl9zdG9yZS9jb250cmFjdF9pbnN0YW5jZV9zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBaUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN4RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxpQ0FBaUMsRUFDdEMsS0FBSywyQkFBMkIsRUFHakMsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVsRCxLQUFLLHlCQUF5QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUU3RTs7R0FFRztBQUNILHFCQUFhLHFCQUFxQjs7SUFLcEIsT0FBTyxDQUFDLEVBQUU7SUFBdEIsWUFBb0IsRUFBRSxFQUFFLGlCQUFpQixFQUl4QztJQUVELG1CQUFtQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixFQUFFLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQVFyRztJQUVELHNCQUFzQixDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FLbkY7SUFFRCxZQUFZLENBQUMsZUFBZSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FBRyx5QkFBeUIsQ0FNM0c7SUFFRCx5QkFBeUIsQ0FDdkIsc0JBQXNCLEVBQUUsaUNBQWlDLEVBQ3pELFNBQVMsRUFBRSxNQUFNLEVBQ2pCLFFBQVEsRUFBRSxNQUFNLEdBQ2YsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUtmO0lBRUQsNEJBQTRCLENBQzFCLHNCQUFzQixFQUFFLGlDQUFpQyxFQUN6RCxTQUFTLEVBQUUsTUFBTSxFQUNqQixRQUFRLEVBQUUsTUFBTSxHQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFZjtJQUVLLGlDQUFpQyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxlQUFlLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FvQmxIO0lBRUssbUJBQW1CLENBQ3ZCLE9BQU8sRUFBRSxZQUFZLEVBQ3JCLFNBQVMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FhbEQ7SUFFRCx3Q0FBd0MsQ0FBQyxPQUFPLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRTNGO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"contract_instance_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_instance_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,iCAAiC,EACtC,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,KAAK,yBAAyB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7E;;GAEG;AACH,qBAAa,qBAAqB;;IAKpB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAIxC;IAED,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQrG;IAED,sBAAsB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnF;IAED,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAM3G;IAED,yBAAyB,CACvB,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAKf;IAED,4BAA4B,CAC1B,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAEf;IAEK,iCAAiC,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAoBlH;IAEK,mBAAmB,CACvB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAalD;IAED,wCAAwC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3F;CACF"}
1
+ {"version":3,"file":"contract_instance_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/contract_instance_store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,KAAK,iCAAiC,EACtC,KAAK,2BAA2B,EAGjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,KAAK,yBAAyB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7E;;GAEG;AACH,qBAAa,qBAAqB;;IAKpB,OAAO,CAAC,EAAE;IAAtB,YAAoB,EAAE,EAAE,iBAAiB,EAIxC;IAED,mBAAmB,CAAC,gBAAgB,EAAE,2BAA2B,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQrG;IAED,sBAAsB,CAAC,gBAAgB,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnF;IAED,YAAY,CAAC,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,yBAAyB,CAM3G;IAED,yBAAyB,CACvB,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAKf;IAED,4BAA4B,CAC1B,sBAAsB,EAAE,iCAAiC,EACzD,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAEf;IAEK,iCAAiC,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAoBlH;IAEK,mBAAmB,CACvB,OAAO,EAAE,YAAY,EACrB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAalD;IAED,wCAAwC,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3F;CACF"}