@aztec/archiver 0.0.1-commit.7d4e6cd → 0.0.1-commit.87a0206

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 (191) hide show
  1. package/README.md +156 -22
  2. package/dest/archiver.d.ts +136 -0
  3. package/dest/archiver.d.ts.map +1 -0
  4. package/dest/archiver.js +781 -0
  5. package/dest/{archiver/config.d.ts → config.d.ts} +9 -1
  6. package/dest/config.d.ts.map +1 -0
  7. package/dest/{archiver/config.js → config.js} +9 -0
  8. package/dest/errors.d.ts +41 -0
  9. package/dest/errors.d.ts.map +1 -0
  10. package/dest/{archiver/errors.js → errors.js} +8 -0
  11. package/dest/factory.d.ts +9 -7
  12. package/dest/factory.d.ts.map +1 -1
  13. package/dest/factory.js +89 -11
  14. package/dest/index.d.ts +10 -4
  15. package/dest/index.d.ts.map +1 -1
  16. package/dest/index.js +8 -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/{archiver/l1 → l1}/bin/retrieve-calldata.d.ts +1 -1
  21. package/dest/l1/bin/retrieve-calldata.d.ts.map +1 -0
  22. package/dest/{archiver/l1 → l1}/bin/retrieve-calldata.js +17 -18
  23. package/dest/{archiver/l1 → l1}/calldata_retriever.d.ts +2 -2
  24. package/dest/l1/calldata_retriever.d.ts.map +1 -0
  25. package/dest/l1/data_retrieval.d.ts +88 -0
  26. package/dest/l1/data_retrieval.d.ts.map +1 -0
  27. package/dest/{archiver/l1 → l1}/data_retrieval.js +36 -55
  28. package/dest/{archiver/l1 → l1}/debug_tx.d.ts +1 -1
  29. package/dest/l1/debug_tx.d.ts.map +1 -0
  30. package/dest/{archiver/l1 → l1}/spire_proposer.d.ts +1 -1
  31. package/dest/l1/spire_proposer.d.ts.map +1 -0
  32. package/dest/{archiver/l1 → l1}/trace_tx.d.ts +1 -1
  33. package/dest/l1/trace_tx.d.ts.map +1 -0
  34. package/dest/l1/types.d.ts +12 -0
  35. package/dest/l1/types.d.ts.map +1 -0
  36. package/dest/{archiver/l1 → l1}/validate_trace.d.ts +6 -3
  37. package/dest/l1/validate_trace.d.ts.map +1 -0
  38. package/dest/{archiver/l1 → l1}/validate_trace.js +13 -9
  39. package/dest/modules/data_source_base.d.ts +84 -0
  40. package/dest/modules/data_source_base.d.ts.map +1 -0
  41. package/dest/modules/data_source_base.js +260 -0
  42. package/dest/modules/data_store_updater.d.ts +73 -0
  43. package/dest/modules/data_store_updater.d.ts.map +1 -0
  44. package/dest/modules/data_store_updater.js +302 -0
  45. package/dest/modules/instrumentation.d.ts +37 -0
  46. package/dest/modules/instrumentation.d.ts.map +1 -0
  47. package/dest/{archiver → modules}/instrumentation.js +17 -10
  48. package/dest/modules/l1_synchronizer.d.ts +75 -0
  49. package/dest/modules/l1_synchronizer.d.ts.map +1 -0
  50. package/dest/modules/l1_synchronizer.js +1112 -0
  51. package/dest/{archiver → modules}/validation.d.ts +1 -1
  52. package/dest/modules/validation.d.ts.map +1 -0
  53. package/dest/{archiver → modules}/validation.js +6 -0
  54. package/dest/store/block_store.d.ts +192 -0
  55. package/dest/store/block_store.d.ts.map +1 -0
  56. package/dest/{archiver/kv_archiver_store → store}/block_store.js +142 -47
  57. package/dest/store/contract_class_store.d.ts +18 -0
  58. package/dest/store/contract_class_store.d.ts.map +1 -0
  59. package/dest/{archiver/kv_archiver_store → store}/contract_class_store.js +12 -8
  60. package/dest/store/contract_instance_store.d.ts +24 -0
  61. package/dest/store/contract_instance_store.d.ts.map +1 -0
  62. package/dest/{archiver/kv_archiver_store → store}/contract_instance_store.js +1 -1
  63. package/dest/store/kv_archiver_store.d.ts +340 -0
  64. package/dest/store/kv_archiver_store.d.ts.map +1 -0
  65. package/dest/store/kv_archiver_store.js +446 -0
  66. package/dest/store/log_store.d.ts +54 -0
  67. package/dest/store/log_store.d.ts.map +1 -0
  68. package/dest/{archiver/kv_archiver_store → store}/log_store.js +146 -91
  69. package/dest/{archiver/kv_archiver_store → store}/message_store.d.ts +1 -1
  70. package/dest/store/message_store.d.ts.map +1 -0
  71. package/dest/{archiver/structs → structs}/data_retrieval.d.ts +1 -1
  72. package/dest/structs/data_retrieval.d.ts.map +1 -0
  73. package/dest/structs/inbox_message.d.ts +15 -0
  74. package/dest/structs/inbox_message.d.ts.map +1 -0
  75. package/dest/{archiver/structs → structs}/published.d.ts +1 -1
  76. package/dest/structs/published.d.ts.map +1 -0
  77. package/dest/test/fake_l1_state.d.ts +190 -0
  78. package/dest/test/fake_l1_state.d.ts.map +1 -0
  79. package/dest/test/fake_l1_state.js +383 -0
  80. package/dest/test/index.d.ts +2 -1
  81. package/dest/test/index.d.ts.map +1 -1
  82. package/dest/test/index.js +4 -1
  83. package/dest/test/mock_archiver.d.ts +2 -2
  84. package/dest/test/mock_archiver.d.ts.map +1 -1
  85. package/dest/test/mock_archiver.js +1 -2
  86. package/dest/test/mock_l2_block_source.d.ts +20 -17
  87. package/dest/test/mock_l2_block_source.d.ts.map +1 -1
  88. package/dest/test/mock_l2_block_source.js +108 -48
  89. package/dest/test/mock_structs.d.ts +78 -3
  90. package/dest/test/mock_structs.d.ts.map +1 -1
  91. package/dest/test/mock_structs.js +140 -7
  92. package/dest/test/noop_l1_archiver.d.ts +23 -0
  93. package/dest/test/noop_l1_archiver.d.ts.map +1 -0
  94. package/dest/test/noop_l1_archiver.js +68 -0
  95. package/package.json +16 -17
  96. package/src/archiver.ts +543 -0
  97. package/src/{archiver/config.ts → config.ts} +11 -0
  98. package/src/{archiver/errors.ts → errors.ts} +12 -0
  99. package/src/factory.ts +125 -11
  100. package/src/index.ts +10 -3
  101. package/src/interfaces.ts +9 -0
  102. package/src/{archiver/l1 → l1}/bin/retrieve-calldata.ts +16 -17
  103. package/src/{archiver/l1 → l1}/calldata_retriever.ts +1 -1
  104. package/src/{archiver/l1 → l1}/data_retrieval.ts +57 -74
  105. package/src/{archiver/l1 → l1}/validate_trace.ts +24 -6
  106. package/src/modules/data_source_base.ts +367 -0
  107. package/src/modules/data_store_updater.ts +423 -0
  108. package/src/{archiver → modules}/instrumentation.ts +17 -12
  109. package/src/modules/l1_synchronizer.ts +930 -0
  110. package/src/{archiver → modules}/validation.ts +5 -0
  111. package/src/{archiver/kv_archiver_store → store}/block_store.ts +179 -63
  112. package/src/{archiver/kv_archiver_store → store}/contract_class_store.ts +12 -8
  113. package/src/{archiver/kv_archiver_store → store}/contract_instance_store.ts +1 -1
  114. package/src/{archiver/kv_archiver_store → store}/kv_archiver_store.ts +234 -37
  115. package/src/{archiver/kv_archiver_store → store}/log_store.ts +242 -121
  116. package/src/test/fake_l1_state.ts +599 -0
  117. package/src/test/index.ts +4 -0
  118. package/src/test/mock_archiver.ts +2 -2
  119. package/src/test/mock_l2_block_source.ts +114 -66
  120. package/src/test/mock_structs.ts +269 -8
  121. package/src/test/noop_l1_archiver.ts +109 -0
  122. package/dest/archiver/archiver.d.ts +0 -307
  123. package/dest/archiver/archiver.d.ts.map +0 -1
  124. package/dest/archiver/archiver.js +0 -2102
  125. package/dest/archiver/archiver_store.d.ts +0 -315
  126. package/dest/archiver/archiver_store.d.ts.map +0 -1
  127. package/dest/archiver/archiver_store.js +0 -4
  128. package/dest/archiver/archiver_store_test_suite.d.ts +0 -8
  129. package/dest/archiver/archiver_store_test_suite.d.ts.map +0 -1
  130. package/dest/archiver/archiver_store_test_suite.js +0 -2770
  131. package/dest/archiver/config.d.ts.map +0 -1
  132. package/dest/archiver/errors.d.ts +0 -36
  133. package/dest/archiver/errors.d.ts.map +0 -1
  134. package/dest/archiver/index.d.ts +0 -7
  135. package/dest/archiver/index.d.ts.map +0 -1
  136. package/dest/archiver/index.js +0 -4
  137. package/dest/archiver/instrumentation.d.ts +0 -37
  138. package/dest/archiver/instrumentation.d.ts.map +0 -1
  139. package/dest/archiver/kv_archiver_store/block_store.d.ts +0 -164
  140. package/dest/archiver/kv_archiver_store/block_store.d.ts.map +0 -1
  141. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +0 -18
  142. package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +0 -1
  143. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +0 -24
  144. package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +0 -1
  145. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +0 -159
  146. package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +0 -1
  147. package/dest/archiver/kv_archiver_store/kv_archiver_store.js +0 -316
  148. package/dest/archiver/kv_archiver_store/log_store.d.ts +0 -45
  149. package/dest/archiver/kv_archiver_store/log_store.d.ts.map +0 -1
  150. package/dest/archiver/kv_archiver_store/message_store.d.ts.map +0 -1
  151. package/dest/archiver/l1/bin/retrieve-calldata.d.ts.map +0 -1
  152. package/dest/archiver/l1/calldata_retriever.d.ts.map +0 -1
  153. package/dest/archiver/l1/data_retrieval.d.ts +0 -90
  154. package/dest/archiver/l1/data_retrieval.d.ts.map +0 -1
  155. package/dest/archiver/l1/debug_tx.d.ts.map +0 -1
  156. package/dest/archiver/l1/spire_proposer.d.ts.map +0 -1
  157. package/dest/archiver/l1/trace_tx.d.ts.map +0 -1
  158. package/dest/archiver/l1/types.d.ts +0 -12
  159. package/dest/archiver/l1/types.d.ts.map +0 -1
  160. package/dest/archiver/l1/validate_trace.d.ts.map +0 -1
  161. package/dest/archiver/structs/data_retrieval.d.ts.map +0 -1
  162. package/dest/archiver/structs/inbox_message.d.ts +0 -15
  163. package/dest/archiver/structs/inbox_message.d.ts.map +0 -1
  164. package/dest/archiver/structs/published.d.ts.map +0 -1
  165. package/dest/archiver/validation.d.ts.map +0 -1
  166. package/dest/rpc/index.d.ts +0 -9
  167. package/dest/rpc/index.d.ts.map +0 -1
  168. package/dest/rpc/index.js +0 -15
  169. package/src/archiver/archiver.ts +0 -2265
  170. package/src/archiver/archiver_store.ts +0 -380
  171. package/src/archiver/archiver_store_test_suite.ts +0 -2842
  172. package/src/archiver/index.ts +0 -6
  173. package/src/rpc/index.ts +0 -16
  174. /package/dest/{archiver/l1 → l1}/calldata_retriever.js +0 -0
  175. /package/dest/{archiver/l1 → l1}/debug_tx.js +0 -0
  176. /package/dest/{archiver/l1 → l1}/spire_proposer.js +0 -0
  177. /package/dest/{archiver/l1 → l1}/trace_tx.js +0 -0
  178. /package/dest/{archiver/l1 → l1}/types.js +0 -0
  179. /package/dest/{archiver/kv_archiver_store → store}/message_store.js +0 -0
  180. /package/dest/{archiver/structs → structs}/data_retrieval.js +0 -0
  181. /package/dest/{archiver/structs → structs}/inbox_message.js +0 -0
  182. /package/dest/{archiver/structs → structs}/published.js +0 -0
  183. /package/src/{archiver/l1 → l1}/README.md +0 -0
  184. /package/src/{archiver/l1 → l1}/debug_tx.ts +0 -0
  185. /package/src/{archiver/l1 → l1}/spire_proposer.ts +0 -0
  186. /package/src/{archiver/l1 → l1}/trace_tx.ts +0 -0
  187. /package/src/{archiver/l1 → l1}/types.ts +0 -0
  188. /package/src/{archiver/kv_archiver_store → store}/message_store.ts +0 -0
  189. /package/src/{archiver/structs → structs}/data_retrieval.ts +0 -0
  190. /package/src/{archiver/structs → structs}/inbox_message.ts +0 -0
  191. /package/src/{archiver/structs → structs}/published.ts +0 -0
@@ -1,14 +1,14 @@
1
1
  import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
2
2
  import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
3
- import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
3
+ import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
4
4
  import { Buffer32 } from '@aztec/foundation/buffer';
5
5
  import { Fr } from '@aztec/foundation/curves/bn254';
6
6
  import { EthAddress } from '@aztec/foundation/eth-address';
7
7
  import { createLogger } from '@aztec/foundation/log';
8
- import { CheckpointedL2Block, L2Block, L2BlockHash, PublishedL2Block } from '@aztec/stdlib/block';
9
- import { L1PublishedData } from '@aztec/stdlib/checkpoint';
8
+ import { CheckpointedL2Block, L2Block } from '@aztec/stdlib/block';
9
+ import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
10
10
  import { EmptyL1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
11
- import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
11
+ import { TxExecutionResult, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
12
12
  /**
13
13
  * A mocked implementation of L2BlockSource to be used in tests.
14
14
  */ export class MockL2BlockSource {
@@ -20,14 +20,16 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
20
20
  async createBlocks(numBlocks) {
21
21
  for(let i = 0; i < numBlocks; i++){
22
22
  const blockNum = this.l2Blocks.length + 1;
23
- const block = await L2Block.random(BlockNumber(blockNum));
23
+ const block = await L2Block.random(BlockNumber(blockNum), {
24
+ slotNumber: SlotNumber(blockNum)
25
+ });
24
26
  this.l2Blocks.push(block);
25
27
  }
26
28
  this.log.verbose(`Created ${numBlocks} blocks in the mock L2 block source`);
27
29
  }
28
- addBlocks(blocks) {
30
+ addProposedBlocks(blocks) {
29
31
  this.l2Blocks.push(...blocks);
30
- this.log.verbose(`Added ${blocks.length} blocks to the mock L2 block source`);
32
+ this.log.verbose(`Added ${blocks.length} proposed blocks to the mock L2 block source`);
31
33
  }
32
34
  removeBlocks(numBlocks) {
33
35
  this.l2Blocks = this.l2Blocks.slice(0, -numBlocks);
@@ -66,6 +68,12 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
66
68
  getProvenBlockNumber() {
67
69
  return Promise.resolve(BlockNumber(this.provenBlockNumber));
68
70
  }
71
+ getCheckpointedL2BlockNumber() {
72
+ return Promise.resolve(BlockNumber(this.checkpointedBlockNumber));
73
+ }
74
+ getFinalizedL2BlockNumber() {
75
+ return Promise.resolve(BlockNumber(this.finalizedBlockNumber));
76
+ }
69
77
  getCheckpointedBlock(number) {
70
78
  if (number > this.checkpointedBlockNumber) {
71
79
  return Promise.resolve(undefined);
@@ -74,10 +82,10 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
74
82
  if (!block) {
75
83
  return Promise.resolve(undefined);
76
84
  }
77
- const checkpointedBlock = new CheckpointedL2Block(CheckpointNumber(number), block.toL2Block(), new L1PublishedData(BigInt(number), BigInt(number), `0x${number.toString(16).padStart(64, '0')}`), []);
85
+ const checkpointedBlock = new CheckpointedL2Block(CheckpointNumber.fromBlockNumber(number), block, new L1PublishedData(BigInt(number), BigInt(number), `0x${number.toString(16).padStart(64, '0')}`), []);
78
86
  return Promise.resolve(checkpointedBlock);
79
87
  }
80
- async getCheckpointedBlocks(from, limit, _proven) {
88
+ async getCheckpointedBlocks(from, limit) {
81
89
  const result = [];
82
90
  for(let i = 0; i < limit; i++){
83
91
  const blockNum = from + i;
@@ -96,49 +104,60 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
96
104
  * @param number - The block number to return (inclusive).
97
105
  * @returns The requested L2 block.
98
106
  */ getBlock(number) {
99
- return Promise.resolve(this.l2Blocks[number - 1]);
107
+ const block = this.l2Blocks[number - 1];
108
+ return Promise.resolve(block);
100
109
  }
101
110
  /**
102
111
  * Gets an L2 block (new format).
103
112
  * @param number - The block number to return.
104
113
  * @returns The requested L2 block.
105
- */ getL2BlockNew(number) {
114
+ */ getL2Block(number) {
106
115
  const block = this.l2Blocks[number - 1];
107
- return Promise.resolve(block?.toL2Block());
116
+ return Promise.resolve(block);
108
117
  }
109
118
  /**
110
119
  * Gets up to `limit` amount of L2 blocks starting from `from`.
111
120
  * @param from - Number of the first block to return (inclusive).
112
121
  * @param limit - The maximum number of blocks to return.
113
122
  * @returns The requested mocked L2 blocks.
114
- */ getBlocks(from, limit, proven) {
115
- return Promise.resolve(this.l2Blocks.slice(from - 1, from - 1 + limit).filter((b)=>!proven || this.provenBlockNumber === undefined || b.number <= this.provenBlockNumber));
116
- }
117
- async getPublishedCheckpoints(from, limit) {
118
- // TODO: Implement this properly. This only works when we have one block per checkpoint.
119
- return (await this.getPublishedBlocks(from, limit)).map((block)=>block.toPublishedCheckpoint());
123
+ */ getBlocks(from, limit) {
124
+ return Promise.resolve(this.l2Blocks.slice(from - 1, from - 1 + limit));
125
+ }
126
+ getCheckpoints(from, limit) {
127
+ // TODO(mbps): Implement this properly. This only works when we have one block per checkpoint.
128
+ const blocks = this.l2Blocks.slice(from - 1, from - 1 + limit);
129
+ return Promise.all(blocks.map(async (block)=>{
130
+ // Create a checkpoint from the block - manually construct since L2Block doesn't have toCheckpoint()
131
+ const checkpoint = await Checkpoint.random(block.checkpointNumber, {
132
+ numBlocks: 1
133
+ });
134
+ checkpoint.blocks = [
135
+ block
136
+ ];
137
+ return new PublishedCheckpoint(checkpoint, new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()), []);
138
+ }));
120
139
  }
121
140
  async getCheckpointByArchive(archive) {
122
- // TODO: Implement this properly. This only works when we have one block per checkpoint.
123
- return (await this.getPublishedBlockByArchive(archive))?.block.toCheckpoint();
124
- }
125
- async getPublishedBlocks(from, limit, proven) {
126
- const blocks = await this.getBlocks(from, limit, proven);
127
- return blocks.map((block)=>PublishedL2Block.fromFields({
128
- block,
129
- l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
130
- attestations: []
131
- }));
132
- }
133
- async getL2BlocksNew(from, limit, proven) {
134
- const blocks = await this.getBlocks(from, limit, proven);
135
- return blocks.map((x)=>x.toL2Block());
141
+ // TODO(mbps): Implement this properly. This only works when we have one block per checkpoint.
142
+ const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
143
+ if (!block) {
144
+ return undefined;
145
+ }
146
+ // Create a checkpoint from the block - manually construct since L2Block doesn't have toCheckpoint()
147
+ const checkpoint = await Checkpoint.random(block.checkpointNumber, {
148
+ numBlocks: 1
149
+ });
150
+ checkpoint.blocks = [
151
+ block
152
+ ];
153
+ return checkpoint;
136
154
  }
137
- async getPublishedBlockByHash(blockHash) {
155
+ async getCheckpointedBlockByHash(blockHash) {
138
156
  for (const block of this.l2Blocks){
139
157
  const hash = await block.hash();
140
158
  if (hash.equals(blockHash)) {
141
- return PublishedL2Block.fromFields({
159
+ return CheckpointedL2Block.fromFields({
160
+ checkpointNumber: CheckpointNumber.fromBlockNumber(block.number),
142
161
  block,
143
162
  l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
144
163
  attestations: []
@@ -147,38 +166,69 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
147
166
  }
148
167
  return undefined;
149
168
  }
150
- getPublishedBlockByArchive(archive) {
169
+ getCheckpointedBlockByArchive(archive) {
151
170
  const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
152
171
  if (!block) {
153
172
  return Promise.resolve(undefined);
154
173
  }
155
- return Promise.resolve(PublishedL2Block.fromFields({
174
+ return Promise.resolve(CheckpointedL2Block.fromFields({
175
+ checkpointNumber: CheckpointNumber.fromBlockNumber(block.number),
156
176
  block,
157
177
  l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
158
178
  attestations: []
159
179
  }));
160
180
  }
181
+ async getL2BlockByHash(blockHash) {
182
+ for (const block of this.l2Blocks){
183
+ const hash = await block.hash();
184
+ if (hash.equals(blockHash)) {
185
+ return block;
186
+ }
187
+ }
188
+ return undefined;
189
+ }
190
+ getL2BlockByArchive(archive) {
191
+ const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
192
+ return Promise.resolve(block);
193
+ }
161
194
  async getBlockHeaderByHash(blockHash) {
162
195
  for (const block of this.l2Blocks){
163
196
  const hash = await block.hash();
164
197
  if (hash.equals(blockHash)) {
165
- return block.getBlockHeader();
198
+ return block.header;
166
199
  }
167
200
  }
168
201
  return undefined;
169
202
  }
170
203
  getBlockHeaderByArchive(archive) {
171
204
  const block = this.l2Blocks.find((b)=>b.archive.root.equals(archive));
172
- return Promise.resolve(block?.getBlockHeader());
205
+ return Promise.resolve(block?.header);
173
206
  }
174
207
  getBlockHeader(number) {
175
- return Promise.resolve(this.l2Blocks.at(typeof number === 'number' ? number - 1 : -1)?.getBlockHeader());
208
+ return Promise.resolve(this.l2Blocks.at(typeof number === 'number' ? number - 1 : -1)?.header);
176
209
  }
177
210
  getCheckpointsForEpoch(epochNumber) {
178
- // TODO: Implement this properly. This only works when we have one block per checkpoint.
179
- return this.getBlocksForEpoch(epochNumber).then((blocks)=>blocks.map((b)=>b.toCheckpoint()));
211
+ // TODO(mbps): Implement this properly. This only works when we have one block per checkpoint.
212
+ const epochDuration = DefaultL1ContractsConfig.aztecEpochDuration;
213
+ const [start, end] = getSlotRangeForEpoch(epochNumber, {
214
+ epochDuration
215
+ });
216
+ const blocks = this.l2Blocks.filter((b)=>{
217
+ const slot = b.header.globalVariables.slotNumber;
218
+ return slot >= start && slot <= end;
219
+ });
220
+ // Create checkpoints from blocks - manually construct since L2Block doesn't have toCheckpoint()
221
+ return Promise.all(blocks.map(async (block)=>{
222
+ const checkpoint = await Checkpoint.random(block.checkpointNumber, {
223
+ numBlocks: 1
224
+ });
225
+ checkpoint.blocks = [
226
+ block
227
+ ];
228
+ return checkpoint;
229
+ }));
180
230
  }
181
- getBlocksForEpoch(epochNumber) {
231
+ getCheckpointedBlocksForEpoch(epochNumber) {
182
232
  const epochDuration = DefaultL1ContractsConfig.aztecEpochDuration;
183
233
  const [start, end] = getSlotRangeForEpoch(epochNumber, {
184
234
  epochDuration
@@ -187,11 +237,20 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
187
237
  const slot = b.header.globalVariables.slotNumber;
188
238
  return slot >= start && slot <= end;
189
239
  });
240
+ return Promise.resolve(blocks.map((block)=>CheckpointedL2Block.fromFields({
241
+ checkpointNumber: CheckpointNumber.fromBlockNumber(block.number),
242
+ block,
243
+ l1: new L1PublishedData(BigInt(block.number), BigInt(block.number), Buffer32.random().toString()),
244
+ attestations: []
245
+ })));
246
+ }
247
+ getBlocksForSlot(slotNumber) {
248
+ const blocks = this.l2Blocks.filter((b)=>b.header.globalVariables.slotNumber === slotNumber);
190
249
  return Promise.resolve(blocks);
191
250
  }
192
- async getBlockHeadersForEpoch(epochNumber) {
193
- const blocks = await this.getBlocksForEpoch(epochNumber);
194
- return blocks.map((b)=>b.getBlockHeader());
251
+ async getCheckpointedBlockHeadersForEpoch(epochNumber) {
252
+ const checkpointedBlocks = await this.getCheckpointedBlocksForEpoch(epochNumber);
253
+ return checkpointedBlocks.map((b)=>b.block.header);
195
254
  }
196
255
  /**
197
256
  * Gets a tx effect.
@@ -209,7 +268,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
209
268
  return {
210
269
  data: txEffect,
211
270
  l2BlockNumber: block.number,
212
- l2BlockHash: L2BlockHash.fromField(await block.hash()),
271
+ l2BlockHash: await block.hash(),
213
272
  txIndexInBlock: block.body.txEffects.indexOf(txEffect)
214
273
  };
215
274
  }
@@ -221,7 +280,8 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
221
280
  for (const block of this.l2Blocks){
222
281
  for (const txEffect of block.body.txEffects){
223
282
  if (txEffect.txHash.equals(txHash)) {
224
- return new TxReceipt(txHash, TxStatus.SUCCESS, '', txEffect.transactionFee.toBigInt(), L2BlockHash.fromField(await block.hash()), block.number);
283
+ // In mock, assume all txs are checkpointed with successful execution
284
+ return new TxReceipt(txHash, TxStatus.CHECKPOINTED, TxExecutionResult.SUCCESS, undefined, txEffect.transactionFee.toBigInt(), await block.hash(), block.number);
225
285
  }
226
286
  }
227
287
  }
@@ -257,7 +317,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
257
317
  const makeTipId = (blockId)=>({
258
318
  block: blockId,
259
319
  checkpoint: {
260
- number: CheckpointNumber(blockId.number),
320
+ number: CheckpointNumber.fromBlockNumber(blockId.number),
261
321
  hash: blockId.hash
262
322
  }
263
323
  });
@@ -1,10 +1,85 @@
1
1
  import { CheckpointNumber } from '@aztec/foundation/branded-types';
2
2
  import { Buffer16 } from '@aztec/foundation/buffer';
3
- import { type InboxMessage } from '../archiver/structs/inbox_message.js';
3
+ import type { Secp256k1Signer } from '@aztec/foundation/crypto/secp256k1-signer';
4
+ import { EthAddress } from '@aztec/foundation/eth-address';
5
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
6
+ import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
7
+ import { PrivateLog, PublicLog, SiloedTag, Tag } from '@aztec/stdlib/logs';
8
+ import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
9
+ import { StateReference } from '@aztec/stdlib/tx';
10
+ import { type InboxMessage } from '../structs/inbox_message.js';
4
11
  export declare function makeInboxMessage(previousRollingHash?: Buffer16, overrides?: Partial<InboxMessage>): InboxMessage;
5
- export declare function makeInboxMessages(count: number, opts?: {
12
+ export declare function makeInboxMessages(totalCount: number, opts?: {
6
13
  initialHash?: Buffer16;
7
14
  initialCheckpointNumber?: CheckpointNumber;
15
+ messagesPerCheckpoint?: number;
8
16
  overrideFn?: (msg: InboxMessage, index: number) => InboxMessage;
9
17
  }): InboxMessage[];
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19zdHJ1Y3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9tb2NrX3N0cnVjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxFQUFFLFFBQVEsRUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBSzlELE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBcUIsTUFBTSxzQ0FBc0MsQ0FBQztBQUU1Rix3QkFBZ0IsZ0JBQWdCLENBQzlCLG1CQUFtQixXQUFnQixFQUNuQyxTQUFTLEdBQUUsT0FBTyxDQUFDLFlBQVksQ0FBTSxHQUNwQyxZQUFZLENBZ0JkO0FBRUQsd0JBQWdCLGlCQUFpQixDQUMvQixLQUFLLEVBQUUsTUFBTSxFQUNiLElBQUksR0FBRTtJQUNKLFdBQVcsQ0FBQyxFQUFFLFFBQVEsQ0FBQztJQUN2Qix1QkFBdUIsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQzNDLFVBQVUsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsTUFBTSxLQUFLLFlBQVksQ0FBQztDQUM1RCxHQUNMLFlBQVksRUFBRSxDQWFoQiJ9
18
+ /** Creates inbox messages distributed across multiple blocks with proper checkpoint numbering. */
19
+ export declare function makeInboxMessagesWithFullBlocks(blockCount: number, opts?: {
20
+ initialCheckpointNumber?: CheckpointNumber;
21
+ }): InboxMessage[];
22
+ /** Creates a deterministic block hash from a block number. */
23
+ export declare function makeBlockHash(blockNumber: number): `0x${string}`;
24
+ /**
25
+ * Creates a StateReference with properly calculated noteHashTree.nextAvailableLeafIndex.
26
+ * This ensures LogStore's dataStartIndexForBlock calculation doesn't produce negative values.
27
+ */
28
+ export declare function makeStateForBlock(blockNumber: number, txsPerBlock: number): StateReference;
29
+ /** Creates L1PublishedData with deterministic values based on l1BlockNumber. */
30
+ export declare function makeL1PublishedData(l1BlockNumber: number): L1PublishedData;
31
+ /** Wraps a Checkpoint with L1 published data and random attestations. */
32
+ export declare function makePublishedCheckpoint(checkpoint: Checkpoint, l1BlockNumber: number, attestationCount?: number): PublishedCheckpoint;
33
+ export interface MakeChainedCheckpointsOptions {
34
+ /** Number of L2 blocks per checkpoint. Default: 1 */
35
+ blocksPerCheckpoint?: number;
36
+ /** Number of transactions per block. Default: 4 */
37
+ txsPerBlock?: number;
38
+ /** Starting checkpoint number. Default: CheckpointNumber(1) */
39
+ startCheckpointNumber?: CheckpointNumber;
40
+ /** Starting block number. Default: 1 */
41
+ startBlockNumber?: number;
42
+ /** Starting L1 block number. Default: 10 */
43
+ startL1BlockNumber?: number;
44
+ /** Previous archive to chain from. Default: undefined */
45
+ previousArchive?: AppendOnlyTreeSnapshot;
46
+ /** Optional function to provide per-checkpoint overrides */
47
+ makeCheckpointOptions?: (cpNumber: CheckpointNumber) => Partial<Parameters<typeof Checkpoint.random>[1]>;
48
+ }
49
+ /**
50
+ * Creates multiple checkpoints with properly chained archives.
51
+ * Each checkpoint's blocks have their lastArchive set to the previous block's archive,
52
+ * ensuring archive chain continuity for testing.
53
+ */
54
+ export declare function makeChainedCheckpoints(count: number, options?: MakeChainedCheckpointsOptions): Promise<PublishedCheckpoint[]>;
55
+ /**
56
+ * Creates a PublishedCheckpoint with attestations signed by the provided signers.
57
+ * Useful for testing attestation validation.
58
+ */
59
+ export declare function makeSignedPublishedCheckpoint(checkpoint: Checkpoint, signers: Secp256k1Signer[], committee: EthAddress[], l1BlockNumber?: number): PublishedCheckpoint;
60
+ /** Creates a deterministic SiloedTag for private log testing. */
61
+ export declare function makePrivateLogTag(blockNumber: number, txIndex: number, logIndex: number): SiloedTag;
62
+ /** Creates a PrivateLog with fields derived from the tag. */
63
+ export declare function makePrivateLog(tag: SiloedTag): PrivateLog;
64
+ /** Creates multiple private logs for a transaction. */
65
+ export declare function mockPrivateLogs(blockNumber: number, txIndex: number, numLogsPerTx: number): PrivateLog[];
66
+ /** Creates a deterministic Tag for public log testing. */
67
+ export declare function makePublicLogTag(blockNumber: number, txIndex: number, logIndex: number): Tag;
68
+ /** Creates a PublicLog with fields derived from the tag. */
69
+ export declare function makePublicLog(tag: Tag, contractAddress?: AztecAddress): PublicLog;
70
+ /** Creates multiple public logs for a transaction. */
71
+ export declare function makePublicLogs(blockNumber: number, txIndex: number, numLogsPerTx: number, contractAddress?: AztecAddress): PublicLog[];
72
+ export interface MockCheckpointWithLogsOptions {
73
+ previousArchive?: AppendOnlyTreeSnapshot;
74
+ numTxsPerBlock?: number;
75
+ privateLogs?: {
76
+ numLogsPerTx: number;
77
+ };
78
+ publicLogs?: {
79
+ numLogsPerTx: number;
80
+ contractAddress?: AztecAddress;
81
+ };
82
+ }
83
+ /** Creates a checkpoint with specified logs on each tx effect. */
84
+ export declare function makeCheckpointWithLogs(blockNumber: number, options?: MockCheckpointWithLogsOptions): Promise<PublishedCheckpoint>;
85
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ja19zdHJ1Y3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9tb2NrX3N0cnVjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUFlLGdCQUFnQixFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQ3ZHLE9BQU8sRUFBRSxRQUFRLEVBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUc5RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUVqRixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRTNELE9BQU8sRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDNUYsT0FBTyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzNFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzdELE9BQU8sRUFBeUIsY0FBYyxFQUFZLE1BQU0sa0JBQWtCLENBQUM7QUFFbkYsT0FBTyxFQUFFLEtBQUssWUFBWSxFQUFxQixNQUFNLDZCQUE2QixDQUFDO0FBRW5GLHdCQUFnQixnQkFBZ0IsQ0FDOUIsbUJBQW1CLFdBQWdCLEVBQ25DLFNBQVMsR0FBRSxPQUFPLENBQUMsWUFBWSxDQUFNLEdBQ3BDLFlBQVksQ0FnQmQ7QUFFRCx3QkFBZ0IsaUJBQWlCLENBQy9CLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLElBQUksR0FBRTtJQUNKLFdBQVcsQ0FBQyxFQUFFLFFBQVEsQ0FBQztJQUN2Qix1QkFBdUIsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0lBQzNDLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLFVBQVUsQ0FBQyxFQUFFLENBQUMsR0FBRyxF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
@@ -1 +1 @@
1
- {"version":3,"file":"mock_structs.d.ts","sourceRoot":"","sources":["../../src/test/mock_structs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAY,MAAM,0BAA0B,CAAC;AAK9D,OAAO,EAAE,KAAK,YAAY,EAAqB,MAAM,sCAAsC,CAAC;AAE5F,wBAAgB,gBAAgB,CAC9B,mBAAmB,WAAgB,EACnC,SAAS,GAAE,OAAO,CAAC,YAAY,CAAM,GACpC,YAAY,CAgBd;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IACJ,WAAW,CAAC,EAAE,QAAQ,CAAC;IACvB,uBAAuB,CAAC,EAAE,gBAAgB,CAAC;IAC3C,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,YAAY,CAAC;CAC5D,GACL,YAAY,EAAE,CAahB"}
1
+ {"version":3,"file":"mock_structs.d.ts","sourceRoot":"","sources":["../../src/test/mock_structs.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,21 @@
1
- import { CheckpointNumber } from '@aztec/foundation/branded-types';
1
+ import { MAX_NOTE_HASHES_PER_TX, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec/constants';
2
+ import { makeTuple } from '@aztec/foundation/array';
3
+ import { BlockNumber, CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
2
4
  import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
5
+ import { times, timesParallel } from '@aztec/foundation/collection';
3
6
  import { randomBigInt, randomInt } from '@aztec/foundation/crypto/random';
4
7
  import { Fr } from '@aztec/foundation/curves/bn254';
8
+ import { AztecAddress } from '@aztec/stdlib/aztec-address';
9
+ import { CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
10
+ import { Checkpoint, L1PublishedData, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
11
+ import { PrivateLog, PublicLog, SiloedTag, Tag } from '@aztec/stdlib/logs';
5
12
  import { InboxLeaf } from '@aztec/stdlib/messaging';
6
- import { updateRollingHash } from '../archiver/structs/inbox_message.js';
13
+ import { orderAttestations } from '@aztec/stdlib/p2p';
14
+ import { CheckpointHeader } from '@aztec/stdlib/rollup';
15
+ import { makeCheckpointAttestationFromCheckpoint } from '@aztec/stdlib/testing';
16
+ import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
17
+ import { PartialStateReference, StateReference, TxEffect } from '@aztec/stdlib/tx';
18
+ import { updateRollingHash } from '../structs/inbox_message.js';
7
19
  export function makeInboxMessage(previousRollingHash = Buffer16.ZERO, overrides = {}) {
8
20
  const { checkpointNumber = CheckpointNumber(randomInt(100) + 1) } = overrides;
9
21
  const { l1BlockNumber = randomBigInt(100n) + 1n } = overrides;
@@ -20,19 +32,140 @@ export function makeInboxMessage(previousRollingHash = Buffer16.ZERO, overrides
20
32
  rollingHash
21
33
  };
22
34
  }
23
- export function makeInboxMessages(count, opts = {}) {
24
- const { initialHash = Buffer16.ZERO, overrideFn = (msg)=>msg, initialCheckpointNumber = 1 } = opts;
35
+ export function makeInboxMessages(totalCount, opts = {}) {
36
+ const { initialHash = Buffer16.ZERO, overrideFn = (msg)=>msg, initialCheckpointNumber = CheckpointNumber(1), messagesPerCheckpoint = 1 } = opts;
25
37
  const messages = [];
26
38
  let rollingHash = initialHash;
27
- for(let i = 0; i < count; i++){
39
+ for(let i = 0; i < totalCount; i++){
40
+ const msgIndex = i % messagesPerCheckpoint;
41
+ const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(initialCheckpointNumber) + BigInt(i) / BigInt(messagesPerCheckpoint));
28
42
  const leaf = Fr.random();
29
- const checkpointNumber = CheckpointNumber(i + initialCheckpointNumber);
30
43
  const message = overrideFn(makeInboxMessage(rollingHash, {
31
44
  leaf,
32
- checkpointNumber
45
+ checkpointNumber,
46
+ index: InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) + BigInt(msgIndex)
33
47
  }), i);
34
48
  rollingHash = message.rollingHash;
35
49
  messages.push(message);
36
50
  }
37
51
  return messages;
38
52
  }
53
+ /** Creates inbox messages distributed across multiple blocks with proper checkpoint numbering. */ export function makeInboxMessagesWithFullBlocks(blockCount, opts = {}) {
54
+ const { initialCheckpointNumber = CheckpointNumber(13) } = opts;
55
+ return makeInboxMessages(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP * blockCount, {
56
+ overrideFn: (msg, i)=>{
57
+ const checkpointNumber = CheckpointNumber(initialCheckpointNumber + Math.floor(i / NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
58
+ const index = InboxLeaf.smallestIndexForCheckpoint(checkpointNumber) + BigInt(i % NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
59
+ return {
60
+ ...msg,
61
+ checkpointNumber,
62
+ index
63
+ };
64
+ }
65
+ });
66
+ }
67
+ /** Creates a deterministic block hash from a block number. */ export function makeBlockHash(blockNumber) {
68
+ return `0x${blockNumber.toString(16).padStart(64, '0')}`;
69
+ }
70
+ /**
71
+ * Creates a StateReference with properly calculated noteHashTree.nextAvailableLeafIndex.
72
+ * This ensures LogStore's dataStartIndexForBlock calculation doesn't produce negative values.
73
+ */ export function makeStateForBlock(blockNumber, txsPerBlock) {
74
+ const noteHashIndex = blockNumber * txsPerBlock * MAX_NOTE_HASHES_PER_TX;
75
+ return new StateReference(AppendOnlyTreeSnapshot.random(), new PartialStateReference(new AppendOnlyTreeSnapshot(Fr.random(), noteHashIndex), AppendOnlyTreeSnapshot.random(), AppendOnlyTreeSnapshot.random()));
76
+ }
77
+ /** Creates L1PublishedData with deterministic values based on l1BlockNumber. */ export function makeL1PublishedData(l1BlockNumber) {
78
+ return new L1PublishedData(BigInt(l1BlockNumber), BigInt(l1BlockNumber * 1000), makeBlockHash(l1BlockNumber));
79
+ }
80
+ /** Wraps a Checkpoint with L1 published data and random attestations. */ export function makePublishedCheckpoint(checkpoint, l1BlockNumber, attestationCount = 3) {
81
+ return new PublishedCheckpoint(checkpoint, makeL1PublishedData(l1BlockNumber), times(attestationCount, CommitteeAttestation.random));
82
+ }
83
+ /**
84
+ * Creates multiple checkpoints with properly chained archives.
85
+ * Each checkpoint's blocks have their lastArchive set to the previous block's archive,
86
+ * ensuring archive chain continuity for testing.
87
+ */ export async function makeChainedCheckpoints(count, options = {}) {
88
+ const { blocksPerCheckpoint = 1, txsPerBlock = 4, startCheckpointNumber = CheckpointNumber(1), startBlockNumber = 1, startL1BlockNumber = 10, makeCheckpointOptions } = options;
89
+ let previousArchive = options.previousArchive;
90
+ const checkpoints = [];
91
+ for(let i = 0; i < count; i++){
92
+ const cpNumber = CheckpointNumber(startCheckpointNumber + i);
93
+ const blockStart = startBlockNumber + i * blocksPerCheckpoint;
94
+ const customOptions = makeCheckpointOptions?.(cpNumber) ?? {};
95
+ const checkpoint = await Checkpoint.random(cpNumber, {
96
+ numBlocks: blocksPerCheckpoint,
97
+ startBlockNumber: blockStart,
98
+ previousArchive,
99
+ txsPerBlock,
100
+ state: makeStateForBlock(blockStart, txsPerBlock),
101
+ txOptions: {
102
+ numPublicCallsPerTx: 2,
103
+ numPublicLogsPerCall: 2
104
+ },
105
+ ...customOptions
106
+ });
107
+ previousArchive = checkpoint.blocks.at(-1).archive;
108
+ checkpoints.push(makePublishedCheckpoint(checkpoint, startL1BlockNumber + i * 10));
109
+ }
110
+ return checkpoints;
111
+ }
112
+ /**
113
+ * Creates a PublishedCheckpoint with attestations signed by the provided signers.
114
+ * Useful for testing attestation validation.
115
+ */ export function makeSignedPublishedCheckpoint(checkpoint, signers, committee, l1BlockNumber = 1) {
116
+ const attestations = signers.map((signer)=>makeCheckpointAttestationFromCheckpoint(checkpoint, signer));
117
+ const committeeAttestations = orderAttestations(attestations, committee);
118
+ return new PublishedCheckpoint(checkpoint, makeL1PublishedData(l1BlockNumber), committeeAttestations);
119
+ }
120
+ /** Creates a deterministic SiloedTag for private log testing. */ export function makePrivateLogTag(blockNumber, txIndex, logIndex) {
121
+ return new SiloedTag(blockNumber === 1 && txIndex === 0 && logIndex === 0 ? Fr.ZERO : new Fr(blockNumber * 100 + txIndex * 10 + logIndex));
122
+ }
123
+ /** Creates a PrivateLog with fields derived from the tag. */ export function makePrivateLog(tag) {
124
+ return PrivateLog.from({
125
+ fields: makeTuple(PRIVATE_LOG_SIZE_IN_FIELDS, (i)=>!i ? tag.value : new Fr(tag.value.toBigInt() + BigInt(i))),
126
+ emittedLength: PRIVATE_LOG_SIZE_IN_FIELDS
127
+ });
128
+ }
129
+ /** Creates multiple private logs for a transaction. */ export function mockPrivateLogs(blockNumber, txIndex, numLogsPerTx) {
130
+ return times(numLogsPerTx, (logIndex)=>{
131
+ const tag = makePrivateLogTag(blockNumber, txIndex, logIndex);
132
+ return makePrivateLog(tag);
133
+ });
134
+ }
135
+ /** Creates a deterministic Tag for public log testing. */ export function makePublicLogTag(blockNumber, txIndex, logIndex) {
136
+ return new Tag(blockNumber === 1 && txIndex === 0 && logIndex === 0 ? Fr.ZERO : new Fr((blockNumber * 100 + txIndex * 10 + logIndex) * 123));
137
+ }
138
+ /** Creates a PublicLog with fields derived from the tag. */ export function makePublicLog(tag, contractAddress = AztecAddress.fromNumber(543254)) {
139
+ return PublicLog.from({
140
+ contractAddress,
141
+ fields: new Array(10).fill(null).map((_, i)=>!i ? tag.value : new Fr(tag.value.toBigInt() + BigInt(i)))
142
+ });
143
+ }
144
+ /** Creates multiple public logs for a transaction. */ export function makePublicLogs(blockNumber, txIndex, numLogsPerTx, contractAddress = AztecAddress.fromNumber(543254)) {
145
+ return times(numLogsPerTx, (logIndex)=>{
146
+ const tag = makePublicLogTag(blockNumber, txIndex, logIndex);
147
+ return makePublicLog(tag, contractAddress);
148
+ });
149
+ }
150
+ /** Creates a checkpoint with specified logs on each tx effect. */ export async function makeCheckpointWithLogs(blockNumber, options = {}) {
151
+ const { previousArchive, numTxsPerBlock = 4, privateLogs, publicLogs } = options;
152
+ const block = await L2Block.random(BlockNumber(blockNumber), {
153
+ checkpointNumber: CheckpointNumber.fromBlockNumber(BlockNumber(blockNumber)),
154
+ indexWithinCheckpoint: IndexWithinCheckpoint(0),
155
+ state: makeStateForBlock(blockNumber, numTxsPerBlock),
156
+ ...previousArchive ? {
157
+ lastArchive: previousArchive
158
+ } : {}
159
+ });
160
+ block.header.globalVariables.blockNumber = BlockNumber(blockNumber);
161
+ block.body.txEffects = await timesParallel(numTxsPerBlock, async (txIndex)=>{
162
+ const txEffect = await TxEffect.random();
163
+ txEffect.privateLogs = privateLogs ? mockPrivateLogs(blockNumber, txIndex, privateLogs.numLogsPerTx) : [];
164
+ txEffect.publicLogs = publicLogs ? makePublicLogs(blockNumber, txIndex, publicLogs.numLogsPerTx, publicLogs.contractAddress) : [];
165
+ return txEffect;
166
+ });
167
+ const checkpoint = new Checkpoint(AppendOnlyTreeSnapshot.random(), CheckpointHeader.random(), [
168
+ block
169
+ ], CheckpointNumber.fromBlockNumber(BlockNumber(blockNumber)));
170
+ return makePublishedCheckpoint(checkpoint, blockNumber);
171
+ }
@@ -0,0 +1,23 @@
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
+ import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
3
+ import { type TelemetryClient } from '@aztec/telemetry-client';
4
+ import { Archiver } from '../archiver.js';
5
+ import { ArchiverInstrumentation } from '../modules/instrumentation.js';
6
+ import type { KVArchiverDataStore } from '../store/kv_archiver_store.js';
7
+ /**
8
+ * Archiver with mocked L1 connectivity for testing.
9
+ * Uses mock L1 clients and a noop synchronizer, enabling tests that
10
+ * don't require real Ethereum connectivity.
11
+ */
12
+ export declare class NoopL1Archiver extends Archiver {
13
+ constructor(dataStore: KVArchiverDataStore, l1Constants: L1RollupConstants & {
14
+ genesisArchiveRoot: Fr;
15
+ }, instrumentation: ArchiverInstrumentation);
16
+ /** Override start to skip L1 validation checks. */
17
+ start(_blockUntilSynced?: boolean): Promise<void>;
18
+ }
19
+ /** Creates an archiver with mocked L1 connectivity for testing. */
20
+ export declare function createNoopL1Archiver(dataStore: KVArchiverDataStore, l1Constants: L1RollupConstants & {
21
+ genesisArchiveRoot: Fr;
22
+ }, telemetry?: TelemetryClient): Promise<NoopL1Archiver>;
23
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9vcF9sMV9hcmNoaXZlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qvbm9vcF9sMV9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJcEQsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQW1DLE1BQU0seUJBQXlCLENBQUM7QUFLaEcsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQzFDLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRXhFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUF5QnpFOzs7O0dBSUc7QUFDSCxxQkFBYSxjQUFlLFNBQVEsUUFBUTtJQUMxQyxZQUNFLFNBQVMsRUFBRSxtQkFBbUIsRUFDOUIsV0FBVyxFQUFFLGlCQUFpQixHQUFHO1FBQUUsa0JBQWtCLEVBQUUsRUFBRSxDQUFBO0tBQUUsRUFDM0QsZUFBZSxFQUFFLHVCQUF1QixFQXVDekM7SUFFRCxtREFBbUQ7SUFDbkMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLEVBQUUsT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJaEU7Q0FDRjtBQUVELG1FQUFtRTtBQUNuRSx3QkFBc0Isb0JBQW9CLENBQ3hDLFNBQVMsRUFBRSxtQkFBbUIsRUFDOUIsV0FBVyxFQUFFLGlCQUFpQixHQUFHO0lBQUUsa0JBQWtCLEVBQUUsRUFBRSxDQUFBO0NBQUUsRUFDM0QsU0FBUyxHQUFFLGVBQXNDLEdBQ2hELE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FHekIifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"noop_l1_archiver.d.ts","sourceRoot":"","sources":["../../src/test/noop_l1_archiver.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,eAAe,EAAmC,MAAM,yBAAyB,CAAC;AAKhG,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAyBzE;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,QAAQ;IAC1C,YACE,SAAS,EAAE,mBAAmB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;QAAE,kBAAkB,EAAE,EAAE,CAAA;KAAE,EAC3D,eAAe,EAAE,uBAAuB,EAuCzC;IAED,mDAAmD;IACnC,KAAK,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhE;CACF;AAED,mEAAmE;AACnE,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,mBAAmB,EAC9B,WAAW,EAAE,iBAAiB,GAAG;IAAE,kBAAkB,EAAE,EAAE,CAAA;CAAE,EAC3D,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,cAAc,CAAC,CAGzB"}