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

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 (213) hide show
  1. package/README.md +162 -22
  2. package/dest/archiver.d.ts +140 -0
  3. package/dest/archiver.d.ts.map +1 -0
  4. package/dest/archiver.js +750 -0
  5. package/dest/config.d.ts +30 -0
  6. package/dest/config.d.ts.map +1 -0
  7. package/dest/{archiver/config.js → config.js} +24 -7
  8. package/dest/errors.d.ts +65 -0
  9. package/dest/errors.d.ts.map +1 -0
  10. package/dest/errors.js +91 -0
  11. package/dest/factory.d.ts +8 -7
  12. package/dest/factory.d.ts.map +1 -1
  13. package/dest/factory.js +99 -15
  14. package/dest/index.d.ts +11 -4
  15. package/dest/index.d.ts.map +1 -1
  16. package/dest/index.js +9 -3
  17. package/dest/interfaces.d.ts +9 -0
  18. package/dest/interfaces.d.ts.map +1 -0
  19. package/dest/interfaces.js +3 -0
  20. package/dest/l1/bin/retrieve-calldata.d.ts +3 -0
  21. package/dest/l1/bin/retrieve-calldata.d.ts.map +1 -0
  22. package/dest/l1/bin/retrieve-calldata.js +152 -0
  23. package/dest/l1/calldata_retriever.d.ts +135 -0
  24. package/dest/l1/calldata_retriever.d.ts.map +1 -0
  25. package/dest/l1/calldata_retriever.js +403 -0
  26. package/dest/l1/data_retrieval.d.ts +88 -0
  27. package/dest/l1/data_retrieval.d.ts.map +1 -0
  28. package/dest/{archiver → l1}/data_retrieval.js +87 -160
  29. package/dest/l1/debug_tx.d.ts +19 -0
  30. package/dest/l1/debug_tx.d.ts.map +1 -0
  31. package/dest/l1/debug_tx.js +73 -0
  32. package/dest/l1/spire_proposer.d.ts +70 -0
  33. package/dest/l1/spire_proposer.d.ts.map +1 -0
  34. package/dest/l1/spire_proposer.js +149 -0
  35. package/dest/l1/trace_tx.d.ts +97 -0
  36. package/dest/l1/trace_tx.d.ts.map +1 -0
  37. package/dest/l1/trace_tx.js +91 -0
  38. package/dest/l1/types.d.ts +12 -0
  39. package/dest/l1/types.d.ts.map +1 -0
  40. package/dest/l1/types.js +3 -0
  41. package/dest/l1/validate_trace.d.ts +32 -0
  42. package/dest/l1/validate_trace.d.ts.map +1 -0
  43. package/dest/l1/validate_trace.js +154 -0
  44. package/dest/modules/data_source_base.d.ts +91 -0
  45. package/dest/modules/data_source_base.d.ts.map +1 -0
  46. package/dest/modules/data_source_base.js +222 -0
  47. package/dest/modules/data_store_updater.d.ts +86 -0
  48. package/dest/modules/data_store_updater.d.ts.map +1 -0
  49. package/dest/modules/data_store_updater.js +333 -0
  50. package/dest/modules/instrumentation.d.ts +52 -0
  51. package/dest/modules/instrumentation.d.ts.map +1 -0
  52. package/dest/modules/instrumentation.js +138 -0
  53. package/dest/modules/l1_synchronizer.d.ts +73 -0
  54. package/dest/modules/l1_synchronizer.d.ts.map +1 -0
  55. package/dest/modules/l1_synchronizer.js +1154 -0
  56. package/dest/modules/validation.d.ts +17 -0
  57. package/dest/modules/validation.d.ts.map +1 -0
  58. package/dest/{archiver → modules}/validation.js +9 -3
  59. package/dest/store/block_store.d.ts +230 -0
  60. package/dest/store/block_store.d.ts.map +1 -0
  61. package/dest/store/block_store.js +942 -0
  62. package/dest/store/contract_class_store.d.ts +17 -0
  63. package/dest/store/contract_class_store.d.ts.map +1 -0
  64. package/dest/store/contract_class_store.js +64 -0
  65. package/dest/store/contract_instance_store.d.ts +24 -0
  66. package/dest/store/contract_instance_store.d.ts.map +1 -0
  67. package/dest/{archiver/kv_archiver_store → store}/contract_instance_store.js +7 -3
  68. package/dest/store/kv_archiver_store.d.ts +377 -0
  69. package/dest/store/kv_archiver_store.d.ts.map +1 -0
  70. package/dest/store/kv_archiver_store.js +494 -0
  71. package/dest/store/l2_tips_cache.d.ts +20 -0
  72. package/dest/store/l2_tips_cache.d.ts.map +1 -0
  73. package/dest/store/l2_tips_cache.js +109 -0
  74. package/dest/store/log_store.d.ts +57 -0
  75. package/dest/store/log_store.d.ts.map +1 -0
  76. package/dest/store/log_store.js +531 -0
  77. package/dest/store/message_store.d.ts +44 -0
  78. package/dest/store/message_store.d.ts.map +1 -0
  79. package/dest/{archiver/kv_archiver_store → store}/message_store.js +36 -23
  80. package/dest/{archiver/structs → structs}/data_retrieval.d.ts +1 -1
  81. package/dest/structs/data_retrieval.d.ts.map +1 -0
  82. package/dest/structs/inbox_message.d.ts +15 -0
  83. package/dest/structs/inbox_message.d.ts.map +1 -0
  84. package/dest/{archiver/structs → structs}/inbox_message.js +6 -5
  85. package/dest/structs/published.d.ts +2 -0
  86. package/dest/structs/published.d.ts.map +1 -0
  87. package/dest/test/fake_l1_state.d.ts +210 -0
  88. package/dest/test/fake_l1_state.d.ts.map +1 -0
  89. package/dest/test/fake_l1_state.js +490 -0
  90. package/dest/test/index.d.ts +2 -1
  91. package/dest/test/index.d.ts.map +1 -1
  92. package/dest/test/index.js +4 -1
  93. package/dest/test/mock_archiver.d.ts +16 -8
  94. package/dest/test/mock_archiver.d.ts.map +1 -1
  95. package/dest/test/mock_archiver.js +19 -14
  96. package/dest/test/mock_l1_to_l2_message_source.d.ts +7 -6
  97. package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -1
  98. package/dest/test/mock_l1_to_l2_message_source.js +23 -12
  99. package/dest/test/mock_l2_block_source.d.ts +59 -20
  100. package/dest/test/mock_l2_block_source.d.ts.map +1 -1
  101. package/dest/test/mock_l2_block_source.js +276 -85
  102. package/dest/test/mock_structs.d.ts +83 -4
  103. package/dest/test/mock_structs.d.ts.map +1 -1
  104. package/dest/test/mock_structs.js +157 -11
  105. package/dest/test/noop_l1_archiver.d.ts +26 -0
  106. package/dest/test/noop_l1_archiver.d.ts.map +1 -0
  107. package/dest/test/noop_l1_archiver.js +71 -0
  108. package/package.json +20 -20
  109. package/src/archiver.ts +510 -0
  110. package/src/{archiver/config.ts → config.ts} +37 -14
  111. package/src/errors.ts +146 -0
  112. package/src/factory.ts +154 -17
  113. package/src/index.ts +11 -3
  114. package/src/interfaces.ts +9 -0
  115. package/src/l1/README.md +55 -0
  116. package/src/l1/bin/retrieve-calldata.ts +194 -0
  117. package/src/l1/calldata_retriever.ts +512 -0
  118. package/src/{archiver → l1}/data_retrieval.ts +146 -233
  119. package/src/l1/debug_tx.ts +99 -0
  120. package/src/l1/spire_proposer.ts +152 -0
  121. package/src/l1/trace_tx.ts +128 -0
  122. package/src/l1/types.ts +13 -0
  123. package/src/l1/validate_trace.ts +229 -0
  124. package/src/modules/data_source_base.ts +347 -0
  125. package/src/modules/data_store_updater.ts +437 -0
  126. package/src/modules/instrumentation.ts +196 -0
  127. package/src/modules/l1_synchronizer.ts +961 -0
  128. package/src/{archiver → modules}/validation.ts +13 -8
  129. package/src/store/block_store.ts +1245 -0
  130. package/src/store/contract_class_store.ts +82 -0
  131. package/src/{archiver/kv_archiver_store → store}/contract_instance_store.ts +10 -7
  132. package/src/store/kv_archiver_store.ts +713 -0
  133. package/src/store/l2_tips_cache.ts +134 -0
  134. package/src/store/log_store.ts +733 -0
  135. package/src/{archiver/kv_archiver_store → store}/message_store.ts +48 -28
  136. package/src/{archiver/structs → structs}/inbox_message.ts +7 -7
  137. package/src/{archiver/structs → structs}/published.ts +0 -1
  138. package/src/test/fake_l1_state.ts +747 -0
  139. package/src/test/fixtures/debug_traceTransaction-multicall3.json +88 -0
  140. package/src/test/fixtures/debug_traceTransaction-multiplePropose.json +153 -0
  141. package/src/test/fixtures/debug_traceTransaction-proxied.json +122 -0
  142. package/src/test/fixtures/trace_transaction-multicall3.json +65 -0
  143. package/src/test/fixtures/trace_transaction-multiplePropose.json +319 -0
  144. package/src/test/fixtures/trace_transaction-proxied.json +128 -0
  145. package/src/test/fixtures/trace_transaction-randomRevert.json +216 -0
  146. package/src/test/index.ts +4 -0
  147. package/src/test/mock_archiver.ts +23 -16
  148. package/src/test/mock_l1_to_l2_message_source.ts +19 -11
  149. package/src/test/mock_l2_block_source.ts +346 -93
  150. package/src/test/mock_structs.ts +289 -13
  151. package/src/test/noop_l1_archiver.ts +114 -0
  152. package/dest/archiver/archiver.d.ts +0 -287
  153. package/dest/archiver/archiver.d.ts.map +0 -1
  154. package/dest/archiver/archiver.js +0 -1408
  155. package/dest/archiver/archiver_store.d.ts +0 -255
  156. package/dest/archiver/archiver_store.d.ts.map +0 -1
  157. package/dest/archiver/archiver_store.js +0 -4
  158. package/dest/archiver/archiver_store_test_suite.d.ts +0 -8
  159. package/dest/archiver/archiver_store_test_suite.d.ts.map +0 -1
  160. package/dest/archiver/archiver_store_test_suite.js +0 -1289
  161. package/dest/archiver/config.d.ts +0 -21
  162. package/dest/archiver/config.d.ts.map +0 -1
  163. package/dest/archiver/data_retrieval.d.ts +0 -79
  164. package/dest/archiver/data_retrieval.d.ts.map +0 -1
  165. package/dest/archiver/errors.d.ts +0 -12
  166. package/dest/archiver/errors.d.ts.map +0 -1
  167. package/dest/archiver/errors.js +0 -17
  168. package/dest/archiver/index.d.ts +0 -7
  169. package/dest/archiver/index.d.ts.map +0 -1
  170. package/dest/archiver/index.js +0 -4
  171. package/dest/archiver/instrumentation.d.ts +0 -35
  172. package/dest/archiver/instrumentation.d.ts.map +0 -1
  173. package/dest/archiver/instrumentation.js +0 -140
  174. package/dest/archiver/kv_archiver_store/block_store.d.ts +0 -124
  175. package/dest/archiver/kv_archiver_store/block_store.d.ts.map +0 -1
  176. package/dest/archiver/kv_archiver_store/block_store.js +0 -370
  177. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +0 -18
  178. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +0 -1
  179. package/dest/archiver/kv_archiver_store/contract_class_store.js +0 -120
  180. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +0 -24
  181. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +0 -1
  182. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +0 -168
  183. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +0 -1
  184. package/dest/archiver/kv_archiver_store/kv_archiver_store.js +0 -296
  185. package/dest/archiver/kv_archiver_store/log_store.d.ts +0 -49
  186. package/dest/archiver/kv_archiver_store/log_store.d.ts.map +0 -1
  187. package/dest/archiver/kv_archiver_store/log_store.js +0 -336
  188. package/dest/archiver/kv_archiver_store/message_store.d.ts +0 -39
  189. package/dest/archiver/kv_archiver_store/message_store.d.ts.map +0 -1
  190. package/dest/archiver/structs/data_retrieval.d.ts.map +0 -1
  191. package/dest/archiver/structs/inbox_message.d.ts +0 -15
  192. package/dest/archiver/structs/inbox_message.d.ts.map +0 -1
  193. package/dest/archiver/structs/published.d.ts +0 -3
  194. package/dest/archiver/structs/published.d.ts.map +0 -1
  195. package/dest/archiver/validation.d.ts +0 -17
  196. package/dest/archiver/validation.d.ts.map +0 -1
  197. package/dest/rpc/index.d.ts +0 -9
  198. package/dest/rpc/index.d.ts.map +0 -1
  199. package/dest/rpc/index.js +0 -15
  200. package/src/archiver/archiver.ts +0 -1858
  201. package/src/archiver/archiver_store.ts +0 -305
  202. package/src/archiver/archiver_store_test_suite.ts +0 -1264
  203. package/src/archiver/errors.ts +0 -26
  204. package/src/archiver/index.ts +0 -6
  205. package/src/archiver/instrumentation.ts +0 -187
  206. package/src/archiver/kv_archiver_store/block_store.ts +0 -481
  207. package/src/archiver/kv_archiver_store/contract_class_store.ts +0 -176
  208. package/src/archiver/kv_archiver_store/kv_archiver_store.ts +0 -422
  209. package/src/archiver/kv_archiver_store/log_store.ts +0 -406
  210. package/src/rpc/index.ts +0 -16
  211. /package/dest/{archiver/structs → structs}/data_retrieval.js +0 -0
  212. /package/dest/{archiver/structs → structs}/published.js +0 -0
  213. /package/src/{archiver/structs → structs}/data_retrieval.ts +0 -0
@@ -0,0 +1,490 @@
1
+ import { getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
2
+ import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
3
+ import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
4
+ import { CheckpointNumber } from '@aztec/foundation/branded-types';
5
+ import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
6
+ import { createLogger } from '@aztec/foundation/log';
7
+ import { RollupAbi } from '@aztec/l1-artifacts';
8
+ import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
9
+ import { getSlotAtTimestamp } from '@aztec/stdlib/epoch-helpers';
10
+ import { InboxLeaf } from '@aztec/stdlib/messaging';
11
+ import { ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
12
+ import { makeAndSignCommitteeAttestationsAndSigners, makeCheckpointAttestationFromCheckpoint, mockCheckpointAndMessages } from '@aztec/stdlib/testing';
13
+ import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
14
+ import { mock } from 'jest-mock-extended';
15
+ import { encodeAbiParameters, encodeFunctionData, keccak256, multicall3Abi, toHex } from 'viem';
16
+ import { updateRollingHash } from '../structs/inbox_message.js';
17
+ /**
18
+ * Stateful fake for L1 data used by the archiver.
19
+ *
20
+ * This class simulates the L1 blockchain state that the archiver reads from:
21
+ * - RollupContract: status(), archiveAt(), getVersion(), getTargetCommitteeSize(), CheckpointProposed events
22
+ * - InboxContract: getState(), MessageSent events
23
+ * - PublicClient: getBlockNumber(), getBlock(), getTransaction()
24
+ * - BlobClient: getBlobSidecar()
25
+ *
26
+ * @example
27
+ * ```ts
28
+ * const fake = new FakeL1State(config);
29
+ *
30
+ * // Add checkpoint (creates messages automatically)
31
+ * const { checkpoint, messages } = await fake.addCheckpoint(CheckpointNumber(1), { l1BlockNumber: 101n });
32
+ * fake.setL1BlockNumber(105n);
33
+ *
34
+ * // Status auto-updated
35
+ * expect(fake.getRollupStatus().pendingCheckpointNumber).toEqual(CheckpointNumber(1));
36
+ * ```
37
+ */ export class FakeL1State {
38
+ config;
39
+ log;
40
+ l1BlockNumber;
41
+ checkpoints;
42
+ messages;
43
+ messagesRollingHash;
44
+ lastArchive;
45
+ provenCheckpointNumber;
46
+ targetCommitteeSize;
47
+ version;
48
+ canPruneResult;
49
+ // Computed from checkpoints based on L1 block visibility
50
+ pendingCheckpointNumber;
51
+ // The L1 block number reported as "finalized" (defaults to the start block)
52
+ finalizedL1BlockNumber;
53
+ constructor(config){
54
+ this.config = config;
55
+ this.log = createLogger('archiver:test:fake-l1');
56
+ this.checkpoints = [];
57
+ this.messages = [];
58
+ this.messagesRollingHash = Buffer16.ZERO;
59
+ this.provenCheckpointNumber = CheckpointNumber(0);
60
+ this.targetCommitteeSize = 0;
61
+ this.version = 1n;
62
+ this.canPruneResult = false;
63
+ this.pendingCheckpointNumber = CheckpointNumber(0);
64
+ this.l1BlockNumber = config.l1StartBlock;
65
+ this.finalizedL1BlockNumber = config.l1StartBlock;
66
+ this.lastArchive = new AppendOnlyTreeSnapshot(config.genesisArchiveRoot, 1);
67
+ }
68
+ /**
69
+ * Adds messages for a checkpoint. Returns the message leaves.
70
+ * Auto-updates rolling hash.
71
+ *
72
+ * Note: For most use cases, use `addCheckpoint` which creates both checkpoint and messages.
73
+ * Use this method only when you need to add messages without creating a checkpoint (e.g., for reorg tests).
74
+ */ addMessages(checkpointNumber, l1BlockNumber, messageLeaves) {
75
+ messageLeaves.forEach((leaf, i)=>{
76
+ const index = InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) + BigInt(i);
77
+ this.messagesRollingHash = updateRollingHash(this.messagesRollingHash, leaf);
78
+ this.messages.push({
79
+ l1BlockNumber,
80
+ checkpointNumber,
81
+ index,
82
+ leaf,
83
+ rollingHash: this.messagesRollingHash
84
+ });
85
+ });
86
+ }
87
+ /**
88
+ * Creates blocks for a checkpoint without adding them to L1 state.
89
+ * Useful for creating blocks to pass to addBlock() for testing provisional block handling.
90
+ * Returns the blocks directly.
91
+ */ async makeBlocks(checkpointNumber, options) {
92
+ return (await this.makeCheckpointAndMessages(checkpointNumber, options)).checkpoint.blocks;
93
+ }
94
+ /**
95
+ * Creates and adds a checkpoint with its L1-to-L2 messages.
96
+ * Returns both the checkpoint and the message leaves.
97
+ * Auto-chains from lastArchive, auto-updates pending status if L1 block >= checkpoint's L1 block.
98
+ */ async addCheckpoint(checkpointNumber, options) {
99
+ this.log.warn(`Adding checkpoint ${checkpointNumber}`);
100
+ const { l1BlockNumber, signers = [], messagesL1BlockNumber = l1BlockNumber - 3n } = options;
101
+ // Create the checkpoint using the stdlib helper
102
+ const { checkpoint, messages, lastArchive } = await this.makeCheckpointAndMessages(checkpointNumber, {
103
+ ...options,
104
+ numL1ToL2Messages: options.numL1ToL2Messages ?? 3
105
+ });
106
+ // Store the messages internally so they match the checkpoint's inHash
107
+ this.addMessages(checkpointNumber, messagesL1BlockNumber, messages);
108
+ // Create the transaction, blobs, and event hashes
109
+ const { tx, attestationsHash, payloadDigest } = await this.makeRollupTx(checkpoint, signers);
110
+ const blobHashes = await this.makeVersionedBlobHashes(checkpoint);
111
+ const blobs = await this.makeBlobsFromCheckpoint(checkpoint);
112
+ // Store the checkpoint data
113
+ this.checkpoints.push({
114
+ checkpointNumber,
115
+ checkpoint,
116
+ l1BlockNumber,
117
+ tx,
118
+ blobHashes,
119
+ blobs,
120
+ signers,
121
+ attestationsHash,
122
+ payloadDigest
123
+ });
124
+ // Update last archive for auto-chaining
125
+ this.lastArchive = lastArchive ?? checkpoint.blocks.at(-1).archive;
126
+ // Auto-update pending checkpoint number
127
+ this.updatePendingCheckpointNumber();
128
+ return {
129
+ checkpoint,
130
+ messages
131
+ };
132
+ }
133
+ /** Creates a checkpoint and messages without adding them to L1 state. */ makeCheckpointAndMessages(checkpointNumber, options) {
134
+ const { numBlocks = 1, txsPerBlock = 4, maxEffects, slotNumber, previousArchive = this.lastArchive, timestamp, l1BlockNumber, numL1ToL2Messages = 0, blocks } = options;
135
+ return mockCheckpointAndMessages(checkpointNumber, {
136
+ startBlockNumber: this.getNextBlockNumber(checkpointNumber),
137
+ numBlocks,
138
+ blocks,
139
+ numTxsPerBlock: txsPerBlock,
140
+ numL1ToL2Messages,
141
+ previousArchive,
142
+ slotNumber: slotNumber ?? (l1BlockNumber !== undefined ? this.getL2SlotAtL1Block(l1BlockNumber) : undefined),
143
+ timestamp: timestamp ?? (l1BlockNumber !== undefined ? this.getTimestampAtL1Block(l1BlockNumber) : undefined),
144
+ ...maxEffects !== undefined ? {
145
+ maxEffects
146
+ } : {}
147
+ });
148
+ }
149
+ /** Returns the L2 slot at the given L1 block (assuming all L1 blocks are mined) */ getL2SlotAtL1Block(l1BlockNumber) {
150
+ const timestamp = this.getTimestampAtL1Block(l1BlockNumber);
151
+ return getSlotAtTimestamp(timestamp, this.config);
152
+ }
153
+ /** Returns the timestamp at the given L1 block (assuming all L1 blocks are mined) */ getTimestampAtL1Block(l1BlockNumber) {
154
+ const { l1GenesisTime, l1StartBlock, ethereumSlotDuration } = this.config;
155
+ return l1GenesisTime + (l1BlockNumber - l1StartBlock) * BigInt(ethereumSlotDuration);
156
+ }
157
+ /**
158
+ * Sets the current L1 block number.
159
+ * Auto-updates pending checkpoint number based on visible checkpoints.
160
+ */ setL1BlockNumber(blockNumber) {
161
+ this.l1BlockNumber = blockNumber;
162
+ this.updatePendingCheckpointNumber();
163
+ }
164
+ /** Sets the L1 block number that will be reported as "finalized". */ setFinalizedL1BlockNumber(blockNumber) {
165
+ this.finalizedL1BlockNumber = blockNumber;
166
+ }
167
+ /** Marks a checkpoint as proven. Updates provenCheckpointNumber. */ markCheckpointAsProven(checkpointNumber) {
168
+ this.provenCheckpointNumber = checkpointNumber;
169
+ }
170
+ /**
171
+ * Simulates what `rollup.getProvenCheckpointNumber({ blockNumber: atL1Block })` would return.
172
+ */ getProvenCheckpointNumberAtL1Block(atL1Block) {
173
+ if (this.provenCheckpointNumber === 0) {
174
+ return CheckpointNumber(0);
175
+ }
176
+ const checkpoint = this.checkpoints.find((cp)=>cp.checkpointNumber === this.provenCheckpointNumber);
177
+ if (checkpoint && checkpoint.l1BlockNumber <= atL1Block) {
178
+ return this.provenCheckpointNumber;
179
+ }
180
+ return CheckpointNumber(0);
181
+ }
182
+ /** Sets the target committee size for attestation validation. */ setTargetCommitteeSize(size) {
183
+ this.targetCommitteeSize = size;
184
+ }
185
+ /** Sets whether the rollup contract would allow pruning at the next block. */ setCanPrune(value) {
186
+ this.canPruneResult = value;
187
+ }
188
+ /**
189
+ * Removes all entries for a checkpoint number (simulates L1 reorg or prune).
190
+ * Note: Does NOT remove messages for this checkpoint (use numL1ToL2Messages: 0 when re-adding).
191
+ * Auto-updates pending status.
192
+ */ removeCheckpoint(checkpointNumber) {
193
+ this.checkpoints = this.checkpoints.filter((cpData)=>cpData.checkpointNumber !== checkpointNumber);
194
+ this.updatePendingCheckpointNumber();
195
+ }
196
+ /**
197
+ * Moves a checkpoint to a different L1 block number (simulates L1 reorg that
198
+ * re-includes the same checkpoint transaction in a different block).
199
+ * The checkpoint content stays the same — only the L1 metadata changes.
200
+ * Auto-updates pending status.
201
+ */ moveCheckpointToL1Block(checkpointNumber, newL1BlockNumber) {
202
+ for (const cpData of this.checkpoints){
203
+ if (cpData.checkpointNumber === checkpointNumber) {
204
+ cpData.l1BlockNumber = newL1BlockNumber;
205
+ }
206
+ }
207
+ this.updatePendingCheckpointNumber();
208
+ }
209
+ /**
210
+ * Removes messages after a given total index (simulates L1 reorg).
211
+ * Auto-updates rolling hash.
212
+ */ removeMessagesAfter(totalIndex) {
213
+ this.messages = this.messages.slice(0, totalIndex);
214
+ // Recalculate rolling hash
215
+ this.messagesRollingHash = this.messages.reduce((hash, msg)=>updateRollingHash(hash, msg.leaf), Buffer16.ZERO);
216
+ }
217
+ /**
218
+ * Simulates a pruned checkpoint by marking all entries with this number as pruned.
219
+ * The event will still be returned, but archiveAt() will return the previous checkpoint's archive
220
+ * (or genesis if no previous checkpoint), causing a mismatch that the archiver will detect.
221
+ */ markCheckpointAsPruned(checkpointNumber) {
222
+ for (const cpData of this.checkpoints){
223
+ if (cpData.checkpointNumber === checkpointNumber) {
224
+ cpData.pruned = true;
225
+ }
226
+ }
227
+ this.updatePendingCheckpointNumber();
228
+ }
229
+ /**
230
+ * Moves messages at a given L1 block to a new L1 block.
231
+ * Useful for simulating partial message visibility (messages at higher L1 blocks won't be fetched).
232
+ */ moveMessagesToL1Block(fromL1Block, toL1Block) {
233
+ this.messages.forEach((msg)=>{
234
+ if (msg.l1BlockNumber === fromL1Block) {
235
+ msg.l1BlockNumber = toL1Block;
236
+ }
237
+ });
238
+ }
239
+ /**
240
+ * Moves a specific message (by index in the messages array) to a new L1 block.
241
+ */ moveMessageAtIndexToL1Block(index, toL1Block) {
242
+ if (this.messages[index]) {
243
+ this.messages[index].l1BlockNumber = toL1Block;
244
+ }
245
+ }
246
+ /** Gets current rollup status. */ getRollupStatus() {
247
+ return {
248
+ provenCheckpointNumber: this.provenCheckpointNumber,
249
+ pendingCheckpointNumber: this.pendingCheckpointNumber,
250
+ provenArchive: this.getArchiveAt(this.provenCheckpointNumber),
251
+ pendingArchive: this.getArchiveAt(this.pendingCheckpointNumber)
252
+ };
253
+ }
254
+ /** Gets the last archive (for manual chaining if needed). */ getLastArchive() {
255
+ return this.lastArchive;
256
+ }
257
+ /** Gets the latest checkpoint entry by number (returns the last added one). */ getCheckpoint(checkpointNumber) {
258
+ return this.checkpoints.findLast((cpData)=>cpData.checkpointNumber === checkpointNumber)?.checkpoint;
259
+ }
260
+ /** Gets messages for a checkpoint. */ getMessages(checkpointNumber) {
261
+ return this.messages.filter((m)=>m.checkpointNumber === checkpointNumber).map((m)=>m.leaf);
262
+ }
263
+ /** Gets the blobs for a checkpoint. */ getCheckpointBlobs(checkpointNumber) {
264
+ return this.checkpoints.findLast((cpData)=>cpData.checkpointNumber === checkpointNumber)?.blobs ?? [];
265
+ }
266
+ /** Creates mock RollupContract that reads from this fake state. */ createMockRollupContract(_publicClient) {
267
+ const mockRollup = mock();
268
+ mockRollup.getVersion.mockImplementation(()=>Promise.resolve(this.version));
269
+ mockRollup.getTargetCommitteeSize.mockImplementation(()=>Promise.resolve(this.targetCommitteeSize));
270
+ mockRollup.archiveAt.mockImplementation((cpNum)=>Promise.resolve(this.getArchiveAt(cpNum)));
271
+ mockRollup.status.mockImplementation((localCheckpointNum)=>{
272
+ const status = this.getRollupStatus();
273
+ return Promise.resolve({
274
+ provenCheckpointNumber: status.provenCheckpointNumber,
275
+ provenArchive: status.provenArchive,
276
+ pendingCheckpointNumber: status.pendingCheckpointNumber,
277
+ pendingArchive: status.pendingArchive,
278
+ archiveOfMyCheckpoint: this.getArchiveAt(localCheckpointNum)
279
+ });
280
+ });
281
+ mockRollup.getProvenCheckpointNumber.mockImplementation((options)=>{
282
+ const atBlock = options?.blockNumber ?? this.l1BlockNumber;
283
+ return Promise.resolve(this.getProvenCheckpointNumberAtL1Block(atBlock));
284
+ });
285
+ mockRollup.canPruneAtTime.mockImplementation(()=>Promise.resolve(this.canPruneResult));
286
+ // Mock the wrapper method for fetching checkpoint events
287
+ mockRollup.getCheckpointProposedEvents.mockImplementation((fromBlock, toBlock)=>Promise.resolve(this.getCheckpointProposedLogs(fromBlock, toBlock)));
288
+ Object.defineProperty(mockRollup, 'address', {
289
+ get: ()=>this.config.rollupAddress.toString()
290
+ });
291
+ return mockRollup;
292
+ }
293
+ /** Creates mock InboxContract that reads from this fake state. */ createMockInboxContract(_publicClient) {
294
+ const mockInbox = mock();
295
+ mockInbox.getState.mockImplementation((opts = {})=>{
296
+ // Filter messages visible at the given block number (or all if not specified)
297
+ const blockNumber = opts.blockNumber ?? this.l1BlockNumber;
298
+ const visibleMessages = this.messages.filter((m)=>m.l1BlockNumber <= blockNumber);
299
+ // treeInProgress must be > any sealed checkpoint. On L1, a checkpoint can only be proposed
300
+ // after its messages are sealed, so treeInProgress > checkpointNumber for all published checkpoints.
301
+ const maxFromMessages = visibleMessages.length > 0 ? Math.max(...visibleMessages.map((m)=>Number(m.checkpointNumber))) + 1 : 0;
302
+ const maxFromCheckpoints = this.checkpoints.length > 0 ? Math.max(...this.checkpoints.filter((cp)=>!cp.pruned && cp.l1BlockNumber <= blockNumber).map((cp)=>Number(cp.checkpointNumber)), 0) + 1 : 0;
303
+ const treeInProgress = Math.max(maxFromMessages, maxFromCheckpoints, INITIAL_CHECKPOINT_NUMBER);
304
+ // Compute rolling hash only for visible messages
305
+ const rollingHash = visibleMessages.length > 0 ? visibleMessages[visibleMessages.length - 1].rollingHash : Buffer16.ZERO;
306
+ return Promise.resolve({
307
+ messagesRollingHash: rollingHash,
308
+ totalMessagesInserted: BigInt(visibleMessages.length),
309
+ treeInProgress: BigInt(treeInProgress)
310
+ });
311
+ });
312
+ // Mock the wrapper methods for fetching message events
313
+ mockInbox.getMessageSentEvents.mockImplementation((fromBlock, toBlock)=>Promise.resolve(this.getMessageSentLogs(fromBlock, toBlock)));
314
+ mockInbox.getMessageSentEventByHash.mockImplementation((msgHash, l1BlockHash)=>Promise.resolve(this.getMessageSentLogByHash(msgHash, l1BlockHash)));
315
+ return mockInbox;
316
+ }
317
+ /** Creates mock PublicClient that reads from this fake state. */ createMockPublicClient() {
318
+ const publicClient = mock();
319
+ publicClient.getChainId.mockResolvedValue(1);
320
+ publicClient.getBlockNumber.mockImplementation(()=>Promise.resolve(this.l1BlockNumber));
321
+ publicClient.getBlock.mockImplementation(async (args = {})=>{
322
+ let blockNum;
323
+ if (args.blockTag === 'finalized') {
324
+ blockNum = this.finalizedL1BlockNumber;
325
+ } else {
326
+ blockNum = args.blockNumber ?? await publicClient.getBlockNumber();
327
+ }
328
+ return {
329
+ number: blockNum,
330
+ timestamp: BigInt(blockNum) * BigInt(this.config.ethereumSlotDuration) + this.config.l1GenesisTime,
331
+ hash: Buffer32.fromBigInt(blockNum).toString()
332
+ };
333
+ });
334
+ // Use the same pattern as existing test for getTransaction
335
+ publicClient.getTransaction.mockImplementation((args)=>Promise.resolve(args.hash ? this.checkpoints.find((cpData)=>cpData.tx.hash === args.hash)?.tx : undefined));
336
+ return publicClient;
337
+ }
338
+ /** Creates mock BlobClient that reads from this fake state. */ createMockBlobClient() {
339
+ const blobClient = mock();
340
+ // The blockId is the transaction's blockHash, which we set to the checkpoint's archive root
341
+ blobClient.getBlobSidecar.mockImplementation((blockId)=>Promise.resolve(this.checkpoints.find((cpData)=>cpData.checkpoint.archive.root.toString() === blockId)?.blobs ?? []));
342
+ blobClient.testSources.mockResolvedValue(undefined);
343
+ return blobClient;
344
+ }
345
+ updatePendingCheckpointNumber() {
346
+ this.pendingCheckpointNumber = this.checkpoints.filter((cpData)=>cpData.l1BlockNumber <= this.l1BlockNumber && !cpData.pruned).reduce((max, cpData)=>cpData.checkpointNumber > max ? cpData.checkpointNumber : max, CheckpointNumber(0));
347
+ }
348
+ getArchiveAt(checkpointNumber) {
349
+ if (checkpointNumber === 0) {
350
+ return this.config.genesisArchiveRoot;
351
+ }
352
+ // Find the latest non-pruned entry for this checkpoint number
353
+ const entries = this.checkpoints.filter((cpData)=>cpData.checkpointNumber === checkpointNumber);
354
+ const latestEntry = entries.at(-1);
355
+ if (!latestEntry || latestEntry.pruned) {
356
+ // For pruned or missing checkpoints, return the previous non-pruned checkpoint's archive
357
+ return this.getArchiveAt(CheckpointNumber(checkpointNumber - 1));
358
+ }
359
+ return latestEntry.checkpoint.archive.root;
360
+ }
361
+ getNextBlockNumber(checkpointNumber) {
362
+ const lastBlockNumber = this.checkpoints.filter((cpData)=>cpData.checkpointNumber < checkpointNumber).flatMap((cpData)=>cpData.checkpoint.blocks.map((b)=>b.number)).reduce((max, num)=>Math.max(max, num), 0);
363
+ return lastBlockNumber + 1;
364
+ }
365
+ getCheckpointProposedLogs(fromBlock, toBlock) {
366
+ return this.checkpoints.filter((cpData)=>cpData.l1BlockNumber >= fromBlock && cpData.l1BlockNumber <= toBlock).map((cpData)=>({
367
+ l1BlockNumber: cpData.l1BlockNumber,
368
+ l1BlockHash: Buffer32.fromBigInt(cpData.l1BlockNumber),
369
+ l1TransactionHash: cpData.tx.hash,
370
+ args: {
371
+ checkpointNumber: cpData.checkpointNumber,
372
+ archive: cpData.checkpoint.archive.root,
373
+ versionedBlobHashes: cpData.blobHashes.map((h)=>Buffer.from(h.slice(2), 'hex')),
374
+ attestationsHash: cpData.attestationsHash,
375
+ payloadDigest: cpData.payloadDigest
376
+ }
377
+ }));
378
+ }
379
+ getMessageSentLogs(fromBlock, toBlock, hashFilter) {
380
+ return this.messages.filter((msg)=>(!hashFilter || msg.leaf.toString() === hashFilter) && (!fromBlock || msg.l1BlockNumber >= fromBlock) && (!toBlock || msg.l1BlockNumber <= toBlock)).map((msg)=>({
381
+ l1BlockNumber: msg.l1BlockNumber,
382
+ l1BlockHash: Buffer32.fromBigInt(msg.l1BlockNumber),
383
+ l1TransactionHash: `0x${msg.l1BlockNumber.toString(16)}`,
384
+ args: {
385
+ checkpointNumber: msg.checkpointNumber,
386
+ index: msg.index,
387
+ leaf: msg.leaf,
388
+ rollingHash: msg.rollingHash
389
+ }
390
+ }));
391
+ }
392
+ getMessageSentLogByHash(msgHash, l1BlockHash) {
393
+ const msg = this.messages.find((msg)=>msg.leaf.toString() === msgHash && Buffer32.fromBigInt(msg.l1BlockNumber).toString() === l1BlockHash);
394
+ if (!msg) {
395
+ return undefined;
396
+ }
397
+ return {
398
+ l1BlockNumber: msg.l1BlockNumber,
399
+ l1BlockHash: Buffer32.fromBigInt(msg.l1BlockNumber),
400
+ l1TransactionHash: `0x${msg.l1BlockNumber.toString(16)}`,
401
+ args: {
402
+ checkpointNumber: msg.checkpointNumber,
403
+ index: msg.index,
404
+ leaf: msg.leaf,
405
+ rollingHash: msg.rollingHash
406
+ }
407
+ };
408
+ }
409
+ async makeRollupTx(checkpoint, signers) {
410
+ const attestations = signers.map((signer)=>makeCheckpointAttestationFromCheckpoint(checkpoint, signer)).map((attestation)=>CommitteeAttestation.fromSignature(attestation.signature)).map((committeeAttestation)=>committeeAttestation.toViem());
411
+ const header = checkpoint.header.toViem();
412
+ const blobInput = getPrefixedEthBlobCommitments(await getBlobsPerL1Block(checkpoint.toBlobFields()));
413
+ const archive = toHex(checkpoint.archive.root.toBuffer());
414
+ const attestationsAndSigners = new CommitteeAttestationsAndSigners(attestations.map((attestation)=>CommitteeAttestation.fromViem(attestation)));
415
+ const attestationsAndSignersSignature = makeAndSignCommitteeAttestationsAndSigners(attestationsAndSigners, signers[0]);
416
+ const packedAttestations = attestationsAndSigners.getPackedAttestations();
417
+ const rollupInput = encodeFunctionData({
418
+ abi: RollupAbi,
419
+ functionName: 'propose',
420
+ args: [
421
+ {
422
+ header,
423
+ archive,
424
+ oracleInput: {
425
+ feeAssetPriceModifier: 0n
426
+ }
427
+ },
428
+ packedAttestations,
429
+ attestationsAndSigners.getSigners().map((signer)=>signer.toString()),
430
+ attestationsAndSignersSignature.toViemSignature(),
431
+ blobInput
432
+ ]
433
+ });
434
+ const multiCallInput = encodeFunctionData({
435
+ abi: multicall3Abi,
436
+ functionName: 'aggregate3',
437
+ args: [
438
+ [
439
+ {
440
+ target: this.config.rollupAddress.toString(),
441
+ callData: rollupInput,
442
+ allowFailure: false
443
+ }
444
+ ]
445
+ ]
446
+ });
447
+ // Compute attestationsHash (same logic as CalldataRetriever)
448
+ const attestationsHash = Buffer32.fromString(keccak256(encodeAbiParameters([
449
+ this.getCommitteeAttestationsStructDef()
450
+ ], [
451
+ packedAttestations
452
+ ])));
453
+ // Compute payloadDigest (same logic as CalldataRetriever)
454
+ const consensusPayload = ConsensusPayload.fromCheckpoint(checkpoint);
455
+ const payloadToSign = consensusPayload.getPayloadToSign(SignatureDomainSeparator.checkpointAttestation);
456
+ const payloadDigest = Buffer32.fromString(keccak256(payloadToSign));
457
+ const tx = {
458
+ input: multiCallInput,
459
+ hash: archive,
460
+ blockHash: archive,
461
+ to: MULTI_CALL_3_ADDRESS
462
+ };
463
+ return {
464
+ tx,
465
+ attestationsHash,
466
+ payloadDigest
467
+ };
468
+ }
469
+ /** Extracts the CommitteeAttestations struct definition from RollupAbi for hash computation. */ getCommitteeAttestationsStructDef() {
470
+ const proposeFunction = RollupAbi.find((item)=>item.type === 'function' && item.name === 'propose');
471
+ if (!proposeFunction) {
472
+ throw new Error('propose function not found in RollupAbi');
473
+ }
474
+ const attestationsParam = proposeFunction.inputs.find((param)=>param.name === '_attestations');
475
+ if (!attestationsParam) {
476
+ throw new Error('_attestations parameter not found in propose function');
477
+ }
478
+ const tupleParam = attestationsParam;
479
+ return {
480
+ type: 'tuple',
481
+ components: tupleParam.components || []
482
+ };
483
+ }
484
+ async makeVersionedBlobHashes(checkpoint) {
485
+ return (await getBlobsPerL1Block(checkpoint.toBlobFields())).map((b)=>`0x${b.getEthVersionedBlobHash().toString('hex')}`);
486
+ }
487
+ async makeBlobsFromCheckpoint(checkpoint) {
488
+ return await getBlobsPerL1Block(checkpoint.toBlobFields());
489
+ }
490
+ }
@@ -1,4 +1,5 @@
1
+ export * from './mock_structs.js';
1
2
  export * from './mock_l2_block_source.js';
2
3
  export * from './mock_l1_to_l2_message_source.js';
3
4
  export * from './mock_archiver.js';
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLG9CQUFvQixDQUFDIn0=
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsb0JBQW9CLENBQUMifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,oBAAoB,CAAC"}
@@ -1,3 +1,6 @@
1
+ export * from './mock_structs.js';
1
2
  export * from './mock_l2_block_source.js';
2
3
  export * from './mock_l1_to_l2_message_source.js';
3
- export * from './mock_archiver.js';
4
+ export * from './mock_archiver.js'; // NOTE: noop_l1_archiver.js is intentionally NOT exported here because it imports
5
+ // jest-mock-extended, which depends on @jest/globals and can only run inside Jest.
6
+ // Import it directly: import { NoopL1Archiver } from '@aztec/archiver/test/noop-l1';
@@ -1,5 +1,7 @@
1
- import type { Fr } from '@aztec/foundation/fields';
2
- import type { L2Block, L2BlockSource } from '@aztec/stdlib/block';
1
+ import type { CheckpointNumber } from '@aztec/foundation/branded-types';
2
+ import type { Fr } from '@aztec/foundation/curves/bn254';
3
+ import type { L2BlockSource } from '@aztec/stdlib/block';
4
+ import type { Checkpoint } from '@aztec/stdlib/checkpoint';
3
5
  import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
4
6
  import { MockL2BlockSource } from './mock_l2_block_source.js';
5
7
  /**
@@ -7,17 +9,23 @@ import { MockL2BlockSource } from './mock_l2_block_source.js';
7
9
  */
8
10
  export declare class MockArchiver extends MockL2BlockSource implements L2BlockSource, L1ToL2MessageSource {
9
11
  private messageSource;
10
- setL1ToL2Messages(blockNumber: number, msgs: Fr[]): void;
11
- getL1ToL2Messages(blockNumber: number): Promise<Fr[]>;
12
+ setL1ToL2Messages(checkpointNumber: CheckpointNumber, msgs: Fr[]): void;
13
+ getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
12
14
  getL1ToL2MessageIndex(_l1ToL2Message: Fr): Promise<bigint | undefined>;
13
15
  }
14
16
  /**
15
17
  * A mocked implementation of the archiver with a set of precomputed blocks and messages.
16
18
  */
17
19
  export declare class MockPrefilledArchiver extends MockArchiver {
18
- private precomputed;
19
- constructor(precomputed: L2Block[], messages: Fr[][]);
20
- setPrefilledBlocks(blocks: L2Block[], messages: Fr[][]): void;
20
+ private prefilled;
21
+ constructor(prefilled: {
22
+ checkpoint: Checkpoint;
23
+ messages: Fr[];
24
+ }[]);
25
+ setPrefilled(prefilled: {
26
+ checkpoint: Checkpoint;
27
+ messages: Fr[];
28
+ }[]): void;
21
29
  createBlocks(numBlocks: number): Promise<void>;
22
30
  }
23
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvbW9ja19hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEUsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUduRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUU5RDs7R0FFRztBQUNILHFCQUFhLFlBQWEsU0FBUSxpQkFBa0IsWUFBVyxhQUFhLEVBQUUsbUJBQW1CO0lBQy9GLE9BQU8sQ0FBQyxhQUFhLENBQWtDO0lBRWhELGlCQUFpQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxRQUV2RDtJQUVELGlCQUFpQixDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRXBEO0lBRUQscUJBQXFCLENBQUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVyRTtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxxQkFBc0IsU0FBUSxZQUFZO0lBQ3JELE9BQU8sQ0FBQyxXQUFXLENBQVk7SUFFL0IsWUFBWSxXQUFXLEVBQUUsT0FBTyxFQUFFLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBSW5EO0lBRU0sa0JBQWtCLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxRQUs1RDtJQUVlLFlBQVksQ0FBQyxTQUFTLEVBQUUsTUFBTSxpQkFVN0M7Q0FDRiJ9
31
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvbW9ja19hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFHbkUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFOUQ7O0dBRUc7QUFDSCxxQkFBYSxZQUFhLFNBQVEsaUJBQWtCLFlBQVcsYUFBYSxFQUFFLG1CQUFtQjtJQUMvRixPQUFPLENBQUMsYUFBYSxDQUFrQztJQUVoRCxpQkFBaUIsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFFBRXRFO0lBRUQsaUJBQWlCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRW5FO0lBRUQscUJBQXFCLENBQUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVyRTtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSxxQkFBc0IsU0FBUSxZQUFZO0lBQ3JELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBRXJDLFlBQVksU0FBUyxFQUFFO1FBQUUsVUFBVSxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQUUsRUFHbEU7SUFFTSxZQUFZLENBQUMsU0FBUyxFQUFFO1FBQUUsVUFBVSxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtLQUFFLEVBQUUsUUFRMUU7SUFFZSxZQUFZLENBQUMsU0FBUyxFQUFFLE1BQU0saUJBYTdDO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"mock_archiver.d.ts","sourceRoot":"","sources":["../../src/test/mock_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAkB,YAAW,aAAa,EAAE,mBAAmB;IAC/F,OAAO,CAAC,aAAa,CAAkC;IAEhD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,QAEvD;IAED,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAEpD;IAED,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErE;CACF;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAO,CAAC,WAAW,CAAY;IAE/B,YAAY,WAAW,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAInD;IAEM,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,QAK5D;IAEe,YAAY,CAAC,SAAS,EAAE,MAAM,iBAU7C;CACF"}
1
+ {"version":3,"file":"mock_archiver.d.ts","sourceRoot":"","sources":["../../src/test/mock_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D;;GAEG;AACH,qBAAa,YAAa,SAAQ,iBAAkB,YAAW,aAAa,EAAE,mBAAmB;IAC/F,OAAO,CAAC,aAAa,CAAkC;IAEhD,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,QAEtE;IAED,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnE;IAED,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErE;CACF;AAED;;GAEG;AACH,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAO,CAAC,SAAS,CAAoB;IAErC,YAAY,SAAS,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,EAAE,EAAE,CAAA;KAAE,EAAE,EAGlE;IAEM,YAAY,CAAC,SAAS,EAAE;QAAE,UAAU,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,EAAE,EAAE,CAAA;KAAE,EAAE,QAQ1E;IAEe,YAAY,CAAC,SAAS,EAAE,MAAM,iBAa7C;CACF"}
@@ -4,11 +4,11 @@ import { MockL2BlockSource } from './mock_l2_block_source.js';
4
4
  * A mocked implementation of the archiver that implements L2BlockSource and L1ToL2MessageSource.
5
5
  */ export class MockArchiver extends MockL2BlockSource {
6
6
  messageSource = new MockL1ToL2MessageSource(0);
7
- setL1ToL2Messages(blockNumber, msgs) {
8
- this.messageSource.setL1ToL2Messages(blockNumber, msgs);
7
+ setL1ToL2Messages(checkpointNumber, msgs) {
8
+ this.messageSource.setL1ToL2Messages(checkpointNumber, msgs);
9
9
  }
10
- getL1ToL2Messages(blockNumber) {
11
- return this.messageSource.getL1ToL2Messages(blockNumber);
10
+ getL1ToL2Messages(checkpointNumber) {
11
+ return this.messageSource.getL1ToL2Messages(checkpointNumber);
12
12
  }
13
13
  getL1ToL2MessageIndex(_l1ToL2Message) {
14
14
  return this.messageSource.getL1ToL2MessageIndex(_l1ToL2Message);
@@ -17,24 +17,29 @@ import { MockL2BlockSource } from './mock_l2_block_source.js';
17
17
  /**
18
18
  * A mocked implementation of the archiver with a set of precomputed blocks and messages.
19
19
  */ export class MockPrefilledArchiver extends MockArchiver {
20
- precomputed;
21
- constructor(precomputed, messages){
20
+ prefilled = [];
21
+ constructor(prefilled){
22
22
  super();
23
- this.precomputed = precomputed.slice();
24
- messages.forEach((msgs, i)=>this.setL1ToL2Messages(i + 1, msgs));
23
+ this.setPrefilled(prefilled);
25
24
  }
26
- setPrefilledBlocks(blocks, messages) {
27
- for (const block of blocks){
28
- this.precomputed[block.number - 1] = block;
25
+ setPrefilled(prefilled) {
26
+ for (const { checkpoint, messages } of prefilled){
27
+ this.prefilled[checkpoint.number - 1] = checkpoint;
28
+ if (checkpoint.blocks.length !== 1) {
29
+ throw new Error('Prefilled checkpoint must only have 1 block at the moment.');
30
+ }
31
+ this.setL1ToL2Messages(checkpoint.number, messages);
29
32
  }
30
- messages.forEach((msgs, i)=>this.setL1ToL2Messages(blocks[i].number, msgs));
31
33
  }
32
34
  createBlocks(numBlocks) {
33
- if (this.l2Blocks.length + numBlocks > this.precomputed.length) {
35
+ const flattenedBlocks = this.prefilled.flatMap((c)=>c.blocks);
36
+ if (this.l2Blocks.length + numBlocks > flattenedBlocks.length) {
34
37
  throw new Error(`Not enough precomputed blocks to create ${numBlocks} more blocks (already at ${this.l2Blocks.length})`);
35
38
  }
36
39
  const fromBlock = this.l2Blocks.length;
37
- this.addBlocks(this.precomputed.slice(fromBlock, fromBlock + numBlocks));
40
+ const checkpointsToAdd = this.prefilled.slice(fromBlock, fromBlock + numBlocks);
41
+ this.addProposedBlocks(checkpointsToAdd.flatMap((c)=>c.blocks));
42
+ this.checkpointList.push(...checkpointsToAdd);
38
43
  return Promise.resolve();
39
44
  }
40
45
  }
@@ -1,4 +1,5 @@
1
- import { Fr } from '@aztec/foundation/fields';
1
+ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
3
  import type { L2Tips } from '@aztec/stdlib/block';
3
4
  import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
4
5
  /**
@@ -6,13 +7,13 @@ import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
6
7
  */
7
8
  export declare class MockL1ToL2MessageSource implements L1ToL2MessageSource {
8
9
  private blockNumber;
9
- private messagesPerBlock;
10
+ private messagesPerCheckpoint;
10
11
  constructor(blockNumber: number);
11
- setL1ToL2Messages(blockNumber: number, msgs: Fr[]): void;
12
+ setL1ToL2Messages(checkpointNumber: CheckpointNumber, msgs: Fr[]): void;
12
13
  setBlockNumber(blockNumber: number): void;
13
- getL1ToL2Messages(blockNumber: number): Promise<Fr[]>;
14
+ getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]>;
14
15
  getL1ToL2MessageIndex(_l1ToL2Message: Fr): Promise<bigint | undefined>;
15
- getBlockNumber(): Promise<number>;
16
+ getBlockNumber(): Promise<BlockNumber>;
16
17
  getL2Tips(): Promise<L2Tips>;
17
18
  }
18
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19sMV90b19sMl9tZXNzYWdlX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvbW9ja19sMV90b19sMl9tZXNzYWdlX3NvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRTs7R0FFRztBQUNILHFCQUFhLHVCQUF3QixZQUFXLG1CQUFtQjtJQUdyRCxPQUFPLENBQUMsV0FBVztJQUYvQixPQUFPLENBQUMsZ0JBQWdCLENBQTJCO0lBRW5ELFlBQW9CLFdBQVcsRUFBRSxNQUFNLEVBQUk7SUFFcEMsaUJBQWlCLENBQUMsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFFBRXZEO0lBRU0sY0FBYyxDQUFDLFdBQVcsRUFBRSxNQUFNLFFBRXhDO0lBRUQsaUJBQWlCLENBQUMsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FFcEQ7SUFFRCxxQkFBcUIsQ0FBQyxjQUFjLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRXJFO0lBRUQsY0FBYyxJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FFaEM7SUFFRCxTQUFTLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQVEzQjtDQUNGIn0=
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19sMV90b19sMl9tZXNzYWdlX3NvdXJjZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvbW9ja19sMV90b19sMl9tZXNzYWdlX3NvdXJjZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFvQyxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRW5FOztHQUVHO0FBQ0gscUJBQWEsdUJBQXdCLFlBQVcsbUJBQW1CO0lBR3JELE9BQU8sQ0FBQyxXQUFXO0lBRi9CLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBcUM7SUFFbEUsWUFBb0IsV0FBVyxFQUFFLE1BQU0sRUFBSTtJQUVwQyxpQkFBaUIsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLFFBRXRFO0lBRU0sY0FBYyxDQUFDLFdBQVcsRUFBRSxNQUFNLFFBRXhDO0lBRUQsaUJBQWlCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBRW5FO0lBRUQscUJBQXFCLENBQUMsY0FBYyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVyRTtJQUVELGNBQWMseUJBRWI7SUFFRCxTQUFTLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQWUzQjtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"mock_l1_to_l2_message_source.d.ts","sourceRoot":"","sources":["../../src/test/mock_l1_to_l2_message_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IAGrD,OAAO,CAAC,WAAW;IAF/B,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,YAAoB,WAAW,EAAE,MAAM,EAAI;IAEpC,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,QAEvD;IAEM,cAAc,CAAC,WAAW,EAAE,MAAM,QAExC;IAED,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAEpD;IAED,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErE;IAED,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhC;IAED,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAQ3B;CACF"}
1
+ {"version":3,"file":"mock_l1_to_l2_message_source.d.ts","sourceRoot":"","sources":["../../src/test/mock_l1_to_l2_message_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAoC,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IAGrD,OAAO,CAAC,WAAW;IAF/B,OAAO,CAAC,qBAAqB,CAAqC;IAElE,YAAoB,WAAW,EAAE,MAAM,EAAI;IAEpC,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,QAEtE;IAEM,cAAc,CAAC,WAAW,EAAE,MAAM,QAExC;IAED,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAEnE;IAED,qBAAqB,CAAC,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAErE;IAED,cAAc,yBAEb;IAED,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAe3B;CACF"}