@aztec/p2p 0.0.1-commit.4eabbdb → 0.0.1-commit.5358163d3

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 (163) hide show
  1. package/dest/client/factory.d.ts +4 -5
  2. package/dest/client/factory.d.ts.map +1 -1
  3. package/dest/client/factory.js +15 -26
  4. package/dest/client/interface.d.ts +6 -13
  5. package/dest/client/interface.d.ts.map +1 -1
  6. package/dest/client/p2p_client.d.ts +5 -13
  7. package/dest/client/p2p_client.d.ts.map +1 -1
  8. package/dest/client/p2p_client.js +3 -58
  9. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +1 -2
  10. package/dest/config.d.ts +10 -14
  11. package/dest/config.d.ts.map +1 -1
  12. package/dest/config.js +25 -35
  13. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +1 -1
  14. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  15. package/dest/mem_pools/attestation_pool/attestation_pool.js +5 -1
  16. package/dest/mem_pools/instrumentation.d.ts +4 -2
  17. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  18. package/dest/mem_pools/instrumentation.js +16 -14
  19. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +1 -1
  20. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +1 -1
  21. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -1
  22. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +2 -0
  23. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +2 -2
  24. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts +2 -2
  25. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts.map +1 -1
  26. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.js +10 -6
  27. package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -2
  28. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
  29. package/dest/mem_pools/tx_pool_v2/index.js +1 -1
  30. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +7 -5
  31. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
  32. package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
  33. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +26 -4
  34. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
  35. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +48 -7
  36. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +1 -1
  37. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -1
  38. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +9 -10
  39. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +2 -2
  40. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
  41. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +3 -0
  42. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +3 -2
  43. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
  44. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +175 -145
  45. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +2 -1
  46. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -1
  47. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +2 -1
  48. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -1
  49. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +3 -1
  50. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -1
  51. package/dest/msg_validators/proposal_validator/proposal_validator.js +10 -0
  52. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +2 -1
  53. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +1 -1
  54. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +166 -0
  55. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +2 -2
  56. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
  57. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +3 -3
  58. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts +2 -1
  59. package/dest/msg_validators/tx_validator/allowed_public_setup.d.ts.map +1 -1
  60. package/dest/msg_validators/tx_validator/allowed_public_setup.js +25 -10
  61. package/dest/msg_validators/tx_validator/factory.d.ts +114 -6
  62. package/dest/msg_validators/tx_validator/factory.d.ts.map +1 -1
  63. package/dest/msg_validators/tx_validator/factory.js +219 -58
  64. package/dest/msg_validators/tx_validator/gas_validator.d.ts +58 -3
  65. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  66. package/dest/msg_validators/tx_validator/gas_validator.js +73 -36
  67. package/dest/msg_validators/tx_validator/index.d.ts +2 -1
  68. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  69. package/dest/msg_validators/tx_validator/index.js +1 -0
  70. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts +14 -0
  71. package/dest/msg_validators/tx_validator/nullifier_cache.d.ts.map +1 -0
  72. package/dest/msg_validators/tx_validator/nullifier_cache.js +24 -0
  73. package/dest/msg_validators/tx_validator/phases_validator.d.ts +2 -2
  74. package/dest/msg_validators/tx_validator/phases_validator.d.ts.map +1 -1
  75. package/dest/msg_validators/tx_validator/phases_validator.js +25 -24
  76. package/dest/services/dummy_service.d.ts +2 -3
  77. package/dest/services/dummy_service.d.ts.map +1 -1
  78. package/dest/services/dummy_service.js +1 -4
  79. package/dest/services/encoding.d.ts +2 -2
  80. package/dest/services/encoding.d.ts.map +1 -1
  81. package/dest/services/encoding.js +7 -7
  82. package/dest/services/libp2p/libp2p_service.d.ts +15 -13
  83. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  84. package/dest/services/libp2p/libp2p_service.js +72 -83
  85. package/dest/services/peer-manager/metrics.d.ts +3 -1
  86. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  87. package/dest/services/peer-manager/metrics.js +6 -0
  88. package/dest/services/peer-manager/peer_manager.d.ts +1 -1
  89. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  90. package/dest/services/peer-manager/peer_manager.js +2 -1
  91. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +1 -1
  92. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  93. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +14 -37
  94. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts +17 -11
  95. package/dest/services/reqresp/batch-tx-requester/peer_collection.d.ts.map +1 -1
  96. package/dest/services/reqresp/batch-tx-requester/peer_collection.js +49 -15
  97. package/dest/services/reqresp/batch-tx-requester/tx_validator.js +2 -2
  98. package/dest/services/reqresp/reqresp.d.ts +1 -1
  99. package/dest/services/reqresp/reqresp.d.ts.map +1 -1
  100. package/dest/services/reqresp/reqresp.js +2 -1
  101. package/dest/services/service.d.ts +2 -2
  102. package/dest/services/service.d.ts.map +1 -1
  103. package/dest/services/tx_provider.d.ts +3 -3
  104. package/dest/services/tx_provider.d.ts.map +1 -1
  105. package/dest/services/tx_provider.js +4 -4
  106. package/dest/test-helpers/make-test-p2p-clients.d.ts +5 -6
  107. package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
  108. package/dest/test-helpers/make-test-p2p-clients.js +1 -2
  109. package/dest/test-helpers/mock-pubsub.d.ts +2 -3
  110. package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
  111. package/dest/test-helpers/mock-pubsub.js +2 -2
  112. package/dest/test-helpers/reqresp-nodes.d.ts +2 -3
  113. package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
  114. package/dest/test-helpers/reqresp-nodes.js +2 -2
  115. package/dest/test-helpers/testbench-utils.d.ts +2 -2
  116. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  117. package/dest/testbench/p2p_client_testbench_worker.js +5 -5
  118. package/package.json +14 -14
  119. package/src/client/factory.ts +22 -46
  120. package/src/client/interface.ts +5 -19
  121. package/src/client/p2p_client.ts +4 -88
  122. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +1 -2
  123. package/src/config.ts +36 -42
  124. package/src/mem_pools/attestation_pool/attestation_pool.ts +5 -4
  125. package/src/mem_pools/instrumentation.ts +17 -13
  126. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +1 -1
  127. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +3 -0
  128. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +2 -2
  129. package/src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts +10 -6
  130. package/src/mem_pools/tx_pool_v2/index.ts +1 -1
  131. package/src/mem_pools/tx_pool_v2/interfaces.ts +7 -4
  132. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +65 -10
  133. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +11 -11
  134. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +4 -1
  135. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +184 -148
  136. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +1 -1
  137. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +1 -1
  138. package/src/msg_validators/proposal_validator/proposal_validator.ts +15 -1
  139. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +144 -1
  140. package/src/msg_validators/tx_validator/README.md +115 -0
  141. package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +3 -3
  142. package/src/msg_validators/tx_validator/allowed_public_setup.ts +27 -13
  143. package/src/msg_validators/tx_validator/factory.ts +353 -77
  144. package/src/msg_validators/tx_validator/gas_validator.ts +90 -27
  145. package/src/msg_validators/tx_validator/index.ts +1 -0
  146. package/src/msg_validators/tx_validator/nullifier_cache.ts +30 -0
  147. package/src/msg_validators/tx_validator/phases_validator.ts +25 -29
  148. package/src/services/dummy_service.ts +1 -5
  149. package/src/services/encoding.ts +5 -6
  150. package/src/services/libp2p/libp2p_service.ts +84 -92
  151. package/src/services/peer-manager/metrics.ts +7 -0
  152. package/src/services/peer-manager/peer_manager.ts +2 -1
  153. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +14 -42
  154. package/src/services/reqresp/batch-tx-requester/peer_collection.ts +63 -24
  155. package/src/services/reqresp/batch-tx-requester/tx_validator.ts +2 -2
  156. package/src/services/reqresp/reqresp.ts +3 -1
  157. package/src/services/service.ts +1 -1
  158. package/src/services/tx_provider.ts +2 -2
  159. package/src/test-helpers/make-test-p2p-clients.ts +0 -2
  160. package/src/test-helpers/mock-pubsub.ts +3 -6
  161. package/src/test-helpers/reqresp-nodes.ts +2 -5
  162. package/src/test-helpers/testbench-utils.ts +1 -1
  163. package/src/testbench/p2p_client_testbench_worker.ts +2 -6
@@ -128,6 +128,28 @@ import { TxPoolIndices } from './tx_pool_indices.js';
128
128
  const rejected = [];
129
129
  const errors = new Map();
130
130
  const acceptedPending = new Set();
131
+ // Phase 1: Pre-compute all throwable I/O outside the transaction.
132
+ // If any pre-computation throws, the entire call fails before mutations happen.
133
+ const precomputed = new Map();
134
+ const validator = await this.#createTxValidator();
135
+ for (const tx of txs){
136
+ const txHash = tx.getTxHash();
137
+ const txHashStr = txHash.toString();
138
+ const meta = await buildTxMetaData(tx);
139
+ const minedBlockId = await this.#getMinedBlockId(txHash);
140
+ // Validate non-mined txs (mined and pre-protected txs bypass validation inside the transaction)
141
+ let isValid = true;
142
+ if (!minedBlockId) {
143
+ isValid = await this.#validateMeta(meta, validator);
144
+ }
145
+ precomputed.set(txHashStr, {
146
+ meta,
147
+ minedBlockId,
148
+ isValid
149
+ });
150
+ }
151
+ // Phase 2: Apply mutations inside the transaction using only pre-computed results,
152
+ // in-memory reads, and buffered DB writes. Nothing here can throw an unhandled exception.
131
153
  const poolAccess = this.#createPreAddPoolAccess();
132
154
  const preAddContext = opts.feeComparisonOnly !== undefined ? {
133
155
  feeComparisonOnly: opts.feeComparisonOnly
@@ -141,33 +163,41 @@ import { TxPoolIndices } from './tx_pool_indices.js';
141
163
  ignored.push(txHash);
142
164
  continue;
143
165
  }
144
- // Check mined status first (applies to all paths)
145
- const minedBlockId = await this.#getMinedBlockId(txHash);
166
+ const { meta, minedBlockId, isValid } = precomputed.get(txHashStr);
146
167
  const preProtectedSlot = this.#indices.getProtectionSlot(txHashStr);
147
168
  if (minedBlockId) {
148
169
  // Already mined - add directly (protection already set if pre-protected)
149
170
  await this.#addTx(tx, {
150
171
  mined: minedBlockId
151
- }, opts);
172
+ }, opts, meta);
152
173
  accepted.push(txHash);
153
174
  } else if (preProtectedSlot !== undefined) {
154
175
  // Pre-protected and not mined - add as protected (bypass validation)
155
176
  await this.#addTx(tx, {
156
177
  protected: preProtectedSlot
157
- }, opts);
178
+ }, opts, meta);
158
179
  accepted.push(txHash);
180
+ } else if (!isValid) {
181
+ // Failed pre-computed validation
182
+ rejected.push(txHash);
159
183
  } else {
160
- // Regular pending tx - validate and run pre-add rules
161
- const result = await this.#tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
184
+ // Regular pending tx - run pre-add rules using pre-computed metadata
185
+ const result = await this.#tryAddRegularPendingTx(tx, meta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext);
162
186
  if (result.status === 'accepted') {
163
187
  acceptedPending.add(txHashStr);
164
- } else if (result.status === 'rejected') {
165
- rejected.push(txHash);
166
188
  } else {
167
189
  ignored.push(txHash);
168
190
  }
169
191
  }
170
192
  }
193
+ // Run post-add eviction rules for pending txs (inside transaction for atomicity)
194
+ if (acceptedPending.size > 0) {
195
+ const feePayers = Array.from(acceptedPending).map((txHash)=>this.#indices.getMetadata(txHash).feePayer);
196
+ const uniqueFeePayers = new Set(feePayers);
197
+ await this.#evictionManager.evictAfterNewTxs(Array.from(acceptedPending), [
198
+ ...uniqueFeePayers
199
+ ]);
200
+ }
171
201
  });
172
202
  // Build final accepted list for pending txs (excludes intra-batch evictions)
173
203
  for (const txHashStr of acceptedPending){
@@ -180,14 +210,6 @@ import { TxPoolIndices } from './tx_pool_indices.js';
180
210
  if (rejected.length > 0) {
181
211
  this.#instrumentation.recordRejected(rejected.length);
182
212
  }
183
- // Run post-add eviction rules for pending txs
184
- if (acceptedPending.size > 0) {
185
- const feePayers = Array.from(acceptedPending).map((txHash)=>this.#indices.getMetadata(txHash).feePayer);
186
- const uniqueFeePayers = new Set(feePayers);
187
- await this.#evictionManager.evictAfterNewTxs(Array.from(acceptedPending), [
188
- ...uniqueFeePayers
189
- ]);
190
- }
191
213
  return {
192
214
  accepted,
193
215
  ignored,
@@ -197,18 +219,10 @@ import { TxPoolIndices } from './tx_pool_indices.js';
197
219
  } : {}
198
220
  };
199
221
  }
200
- /** Validates and adds a regular pending tx. Returns status. */ async #tryAddRegularPendingTx(tx, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
201
- const txHash = tx.getTxHash();
202
- const txHashStr = txHash.toString();
203
- // Build metadata and validate using metadata
204
- const meta = await buildTxMetaData(tx);
205
- if (!await this.#validateMeta(meta)) {
206
- return {
207
- status: 'rejected'
208
- };
209
- }
222
+ /** Adds a validated pending tx, running pre-add rules and evicting conflicts. */ async #tryAddRegularPendingTx(tx, precomputedMeta, opts, poolAccess, acceptedPending, ignored, errors, preAddContext) {
223
+ const txHashStr = tx.getTxHash().toString();
210
224
  // Run pre-add rules
211
- const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess, preAddContext);
225
+ const preAddResult = await this.#evictionManager.runPreAddRules(precomputedMeta, poolAccess, preAddContext);
212
226
  if (preAddResult.shouldIgnore) {
213
227
  this.#log.debug(`Ignoring tx ${txHashStr}: ${preAddResult.reason?.message ?? 'unknown reason'}`);
214
228
  if (preAddResult.reason && preAddResult.reason.code !== TxPoolRejectionCode.INTERNAL_ERROR) {
@@ -246,8 +260,15 @@ import { TxPoolIndices } from './tx_pool_indices.js';
246
260
  }
247
261
  }
248
262
  }
263
+ // Randomly drop the transaction for testing purposes (report as accepted so it propagates)
264
+ if (this.#config.dropTransactionsProbability > 0 && Math.random() < this.#config.dropTransactionsProbability) {
265
+ this.#log.debug(`Dropping tx ${txHashStr} (simulated drop for testing)`);
266
+ return {
267
+ status: 'accepted'
268
+ };
269
+ }
249
270
  // Add the transaction
250
- await this.#addTx(tx, 'pending', opts);
271
+ await this.#addTx(tx, 'pending', opts, precomputedMeta);
251
272
  return {
252
273
  status: 'accepted'
253
274
  };
@@ -258,13 +279,8 @@ import { TxPoolIndices } from './tx_pool_indices.js';
258
279
  if (this.#indices.has(txHashStr)) {
259
280
  return 'ignored';
260
281
  }
261
- // Build metadata and validate using metadata
282
+ // Build metadata and check pre-add rules
262
283
  const meta = await buildTxMetaData(tx);
263
- const validationResult = await this.#validateMeta(meta, undefined, 'can add pending');
264
- if (validationResult !== true) {
265
- return 'rejected';
266
- }
267
- // Use pre-add rules
268
284
  const poolAccess = this.#createPreAddPoolAccess();
269
285
  const preAddResult = await this.#evictionManager.runPreAddRules(meta, poolAccess);
270
286
  return preAddResult.shouldIgnore ? 'ignored' : 'accepted';
@@ -305,34 +321,36 @@ import { TxPoolIndices } from './tx_pool_indices.js';
305
321
  const missing = [];
306
322
  let softDeletedHits = 0;
307
323
  let missingPreviouslyEvicted = 0;
308
- for (const txHash of txHashes){
309
- const txHashStr = txHash.toString();
310
- if (this.#indices.has(txHashStr)) {
311
- // Update protection for existing tx
312
- this.#indices.updateProtection(txHashStr, slotNumber);
313
- } else if (this.#deletedPool.isSoftDeleted(txHashStr)) {
314
- // Resurrect soft-deleted tx as protected
315
- const buffer = await this.#txsDB.getAsync(txHashStr);
316
- if (buffer) {
317
- const tx = Tx.fromBuffer(buffer);
318
- await this.#addTx(tx, {
319
- protected: slotNumber
320
- });
321
- softDeletedHits++;
324
+ await this.#store.transactionAsync(async ()=>{
325
+ for (const txHash of txHashes){
326
+ const txHashStr = txHash.toString();
327
+ if (this.#indices.has(txHashStr)) {
328
+ // Update protection for existing tx
329
+ this.#indices.updateProtection(txHashStr, slotNumber);
330
+ } else if (this.#deletedPool.isSoftDeleted(txHashStr)) {
331
+ // Resurrect soft-deleted tx as protected
332
+ const buffer = await this.#txsDB.getAsync(txHashStr);
333
+ if (buffer) {
334
+ const tx = Tx.fromBuffer(buffer);
335
+ await this.#addTx(tx, {
336
+ protected: slotNumber
337
+ });
338
+ softDeletedHits++;
339
+ } else {
340
+ // Data missing despite soft-delete flag — treat as truly missing
341
+ this.#indices.setProtection(txHashStr, slotNumber);
342
+ missing.push(txHash);
343
+ }
322
344
  } else {
323
- // Data missing despite soft-delete flag treat as truly missing
345
+ // Truly missing pre-record protection for tx we don't have yet
324
346
  this.#indices.setProtection(txHashStr, slotNumber);
325
347
  missing.push(txHash);
326
- }
327
- } else {
328
- // Truly missing — pre-record protection for tx we don't have yet
329
- this.#indices.setProtection(txHashStr, slotNumber);
330
- missing.push(txHash);
331
- if (this.#evictedTxHashes.has(txHashStr)) {
332
- missingPreviouslyEvicted++;
348
+ if (this.#evictedTxHashes.has(txHashStr)) {
349
+ missingPreviouslyEvicted++;
350
+ }
333
351
  }
334
352
  }
335
- }
353
+ });
336
354
  // Record metrics
337
355
  if (softDeletedHits > 0) {
338
356
  this.#instrumentation.recordSoftDeletedHits(softDeletedHits);
@@ -383,44 +401,51 @@ import { TxPoolIndices } from './tx_pool_indices.js';
383
401
  found.push(meta);
384
402
  }
385
403
  }
386
- // Step 4: Mark txs as mined (only those we have in the pool)
387
- for (const meta of found){
388
- this.#indices.markAsMined(meta, blockId);
389
- await this.#deletedPool.clearIfMinedHigher(meta.txHash, blockId.number);
404
+ await this.#store.transactionAsync(async ()=>{
405
+ // Step 4: Mark txs as mined (only those we have in the pool)
406
+ for (const meta of found){
407
+ this.#indices.markAsMined(meta, blockId);
408
+ await this.#deletedPool.clearIfMinedHigher(meta.txHash, blockId.number);
409
+ }
410
+ // Step 5: Run post-event eviction rules (inside transaction for atomicity)
411
+ await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
412
+ });
413
+ if (found.length > 0) {
414
+ this.#callbacks.onTxsMined(found.map((m)=>m.txHash));
390
415
  }
391
- // Step 5: Run eviction rules (remove pending txs with conflicting nullifiers/expired timestamps)
392
- await this.#evictionManager.evictAfterNewBlock(block.header, nullifiers, feePayers);
393
416
  this.#log.info(`Marked ${found.length} txs as mined in block ${blockId.number}`);
394
417
  }
395
418
  async prepareForSlot(slotNumber) {
396
- // Step 0: Clean up slot-deleted txs from previous slots
397
- await this.#deletedPool.cleanupSlotDeleted(slotNumber);
398
- // Step 1: Find expired protected txs
399
- const expiredProtected = this.#indices.findExpiredProtectedTxs(slotNumber);
400
- // Step 2: Clear protection for all expired entries (including those without metadata)
401
- this.#indices.clearProtection(expiredProtected);
402
- // Step 3: Filter to only txs that have metadata and are not mined
403
- const txsToRestore = this.#indices.filterRestorable(expiredProtected);
404
- if (txsToRestore.length === 0) {
405
- this.#log.debug(`Preparing for slot ${slotNumber}, no txs to unprotect`);
406
- return;
407
- }
408
- this.#log.info(`Preparing for slot ${slotNumber}: unprotecting ${txsToRestore.length} txs`);
409
- // Step 4: Validate for pending pool
410
- const { valid, invalid } = await this.#revalidateMetadata(txsToRestore, 'during prepareForSlot');
411
- // Step 5: Resolve nullifier conflicts and add winners to pending indices
412
- const { added, toEvict } = this.#applyNullifierConflictResolution(valid);
413
- // Step 6: Delete invalid txs and evict conflict losers
414
- await this.#deleteTxsBatch(invalid);
415
- await this.#evictTxs(toEvict, 'NullifierConflict');
416
- // Step 7: Run eviction rules (enforce pool size limit)
417
- if (added.length > 0) {
418
- const feePayers = added.map((meta)=>meta.feePayer);
419
- const uniqueFeePayers = new Set(feePayers);
420
- await this.#evictionManager.evictAfterNewTxs(added.map((m)=>m.txHash), [
421
- ...uniqueFeePayers
422
- ]);
423
- }
419
+ await this.#store.transactionAsync(async ()=>{
420
+ // Step 0: Clean up slot-deleted txs from previous slots
421
+ await this.#deletedPool.cleanupSlotDeleted(slotNumber);
422
+ // Step 1: Find expired protected txs
423
+ const expiredProtected = this.#indices.findExpiredProtectedTxs(slotNumber);
424
+ // Step 2: Clear protection for all expired entries (including those without metadata)
425
+ this.#indices.clearProtection(expiredProtected);
426
+ // Step 3: Filter to only txs that have metadata and are not mined
427
+ const txsToRestore = this.#indices.filterRestorable(expiredProtected);
428
+ if (txsToRestore.length === 0) {
429
+ this.#log.debug(`Preparing for slot ${slotNumber}, no txs to unprotect`);
430
+ return;
431
+ }
432
+ this.#log.info(`Preparing for slot ${slotNumber}: unprotecting ${txsToRestore.length} txs`);
433
+ // Step 4: Validate for pending pool
434
+ const { valid, invalid } = await this.#revalidateMetadata(txsToRestore, 'during prepareForSlot');
435
+ // Step 5: Resolve nullifier conflicts and add winners to pending indices
436
+ const { added, toEvict } = this.#applyNullifierConflictResolution(valid);
437
+ // Step 6: Delete invalid txs and evict conflict losers
438
+ await this.#deleteTxsBatch(invalid);
439
+ await this.#evictTxs(toEvict, 'NullifierConflict');
440
+ // Step 7: Run eviction rules (enforce pool size limit)
441
+ if (added.length > 0) {
442
+ const feePayers = added.map((meta)=>meta.feePayer);
443
+ const uniqueFeePayers = new Set(feePayers);
444
+ await this.#evictionManager.evictAfterNewTxs(added.map((m)=>m.txHash), [
445
+ ...uniqueFeePayers
446
+ ]);
447
+ }
448
+ });
424
449
  }
425
450
  async handlePrunedBlocks(latestBlock, options) {
426
451
  // Step 1: Find transactions mined after the prune point
@@ -430,45 +455,48 @@ import { TxPoolIndices } from './tx_pool_indices.js';
430
455
  return;
431
456
  }
432
457
  this.#log.info(`Handling prune to block ${latestBlock.number}: un-mining ${txsToUnmine.length} txs`);
433
- // Step 2: Mark ALL un-mined txs with their original mined block number
434
- // This ensures they get soft-deleted if removed later, and only hard-deleted
435
- // when their original mined block is finalized
436
- await this.#deletedPool.markFromPrunedBlock(txsToUnmine.map((m)=>({
437
- txHash: m.txHash,
438
- minedAtBlock: BlockNumber(m.minedL2BlockId.number)
439
- })));
440
- // Step 3: Unmine - clear mined status from metadata
441
- for (const meta of txsToUnmine){
442
- this.#indices.markAsUnmined(meta);
443
- }
444
- // If deleteAllTxs is set (epoch prune), delete all un-mined txs and return early
445
- if (options?.deleteAllTxs) {
446
- const allTxHashes = txsToUnmine.map((m)=>m.txHash);
447
- await this.#deleteTxsBatch(allTxHashes);
448
- this.#log.info(`Handled prune to block ${latestBlock.number} with deleteAllTxs: deleted ${allTxHashes.length} txs`);
449
- return;
450
- }
451
- // Step 4: Filter out protected txs (they'll be handled by prepareForSlot)
452
- const unprotectedTxs = this.#indices.filterUnprotected(txsToUnmine);
453
- // Step 5: Validate for pending pool
454
- const { valid, invalid } = await this.#revalidateMetadata(unprotectedTxs, 'during handlePrunedBlocks');
455
- // Step 6: Resolve nullifier conflicts and add winners to pending indices
456
- const { toEvict } = this.#applyNullifierConflictResolution(valid);
457
- // Step 7: Delete invalid txs and evict conflict losers
458
- await this.#deleteTxsBatch(invalid);
459
- await this.#evictTxs(toEvict, 'NullifierConflict');
460
- this.#log.info(`Handled prune to block ${latestBlock.number}: ${valid.length} txs restored to pending, ${invalid.length} invalid, ${toEvict.length} evicted due to nullifier conflicts`, {
461
- txHashesRestored: valid.map((m)=>m.txHash),
462
- txHashesInvalid: invalid,
463
- txHashesEvicted: toEvict
458
+ await this.#store.transactionAsync(async ()=>{
459
+ // Step 2: Mark ALL un-mined txs with their original mined block number
460
+ // This ensures they get soft-deleted if removed later, and only hard-deleted
461
+ // when their original mined block is finalized
462
+ await this.#deletedPool.markFromPrunedBlock(txsToUnmine.map((m)=>({
463
+ txHash: m.txHash,
464
+ minedAtBlock: BlockNumber(m.minedL2BlockId.number)
465
+ })));
466
+ // Step 3: Unmine - clear mined status from metadata
467
+ for (const meta of txsToUnmine){
468
+ this.#indices.markAsUnmined(meta);
469
+ }
470
+ // If deleteAllTxs is set (epoch prune), delete all un-mined txs and return early
471
+ if (options?.deleteAllTxs) {
472
+ const allTxHashes = txsToUnmine.map((m)=>m.txHash);
473
+ await this.#deleteTxsBatch(allTxHashes);
474
+ this.#log.info(`Handled prune to block ${latestBlock.number} with deleteAllTxs: deleted ${allTxHashes.length} txs`);
475
+ return;
476
+ }
477
+ // Step 4: Filter out protected txs (they'll be handled by prepareForSlot)
478
+ const unprotectedTxs = this.#indices.filterUnprotected(txsToUnmine);
479
+ // Step 5: Validate for pending pool
480
+ const { valid, invalid } = await this.#revalidateMetadata(unprotectedTxs, 'during handlePrunedBlocks');
481
+ // Step 6: Resolve nullifier conflicts and add winners to pending indices
482
+ const { toEvict } = this.#applyNullifierConflictResolution(valid);
483
+ // Step 7: Delete invalid txs and evict conflict losers
484
+ await this.#deleteTxsBatch(invalid);
485
+ await this.#evictTxs(toEvict, 'NullifierConflict');
486
+ this.#log.info(`Handled prune to block ${latestBlock.number}: ${valid.length} txs restored to pending, ${invalid.length} invalid, ${toEvict.length} evicted due to nullifier conflicts`, {
487
+ txHashesRestored: valid.map((m)=>m.txHash),
488
+ txHashesInvalid: invalid,
489
+ txHashesEvicted: toEvict
490
+ });
491
+ // Step 8: Run eviction rules for ALL pending txs (not just restored ones)
492
+ // This handles cases like existing pending txs with invalid fee payer balances
493
+ await this.#evictionManager.evictAfterChainPrune(latestBlock.number);
464
494
  });
465
- // Step 8: Run eviction rules for ALL pending txs (not just restored ones)
466
- // This handles cases like existing pending txs with invalid fee payer balances
467
- await this.#evictionManager.evictAfterChainPrune(latestBlock.number);
468
495
  }
469
496
  async handleFailedExecution(txHashes) {
470
- // Delete failed txs
471
- await this.#deleteTxsBatch(txHashes.map((h)=>h.toString()));
497
+ await this.#store.transactionAsync(async ()=>{
498
+ await this.#deleteTxsBatch(txHashes.map((h)=>h.toString()));
499
+ });
472
500
  this.#log.info(`Deleted ${txHashes.length} failed txs`, {
473
501
  txHashes: txHashes.map((h)=>h.toString())
474
502
  });
@@ -477,24 +505,26 @@ import { TxPoolIndices } from './tx_pool_indices.js';
477
505
  const blockNumber = block.globalVariables.blockNumber;
478
506
  // Step 1: Find mined txs at or before finalized block
479
507
  const minedTxsToFinalize = this.#indices.findTxsMinedAtOrBefore(blockNumber);
480
- // Step 2: Collect mined txs for archiving (before deletion)
481
- const txsToArchive = [];
482
- if (this.#archive.isEnabled()) {
483
- for (const txHashStr of minedTxsToFinalize){
484
- const buffer = await this.#txsDB.getAsync(txHashStr);
485
- if (buffer) {
486
- txsToArchive.push(Tx.fromBuffer(buffer));
508
+ await this.#store.transactionAsync(async ()=>{
509
+ // Step 2: Collect mined txs for archiving (before deletion)
510
+ const txsToArchive = [];
511
+ if (this.#archive.isEnabled()) {
512
+ for (const txHashStr of minedTxsToFinalize){
513
+ const buffer = await this.#txsDB.getAsync(txHashStr);
514
+ if (buffer) {
515
+ txsToArchive.push(Tx.fromBuffer(buffer));
516
+ }
487
517
  }
488
518
  }
489
- }
490
- // Step 3: Delete mined txs from active pool
491
- await this.#deleteTxsBatch(minedTxsToFinalize);
492
- // Step 4: Finalize soft-deleted txs
493
- await this.#deletedPool.finalizeBlock(blockNumber);
494
- // Step 5: Archive mined txs
495
- if (txsToArchive.length > 0) {
496
- await this.#archive.archiveTxs(txsToArchive);
497
- }
519
+ // Step 3: Delete mined txs from active pool
520
+ await this.#deleteTxsBatch(minedTxsToFinalize);
521
+ // Step 4: Finalize soft-deleted txs
522
+ await this.#deletedPool.finalizeBlock(blockNumber);
523
+ // Step 5: Archive mined txs
524
+ if (txsToArchive.length > 0) {
525
+ await this.#archive.archiveTxs(txsToArchive);
526
+ }
527
+ });
498
528
  if (minedTxsToFinalize.length > 0) {
499
529
  this.#log.info(`Finalized ${minedTxsToFinalize.length} mined txs from blocks up to ${blockNumber}`, {
500
530
  txHashes: minedTxsToFinalize
@@ -610,9 +640,9 @@ import { TxPoolIndices } from './tx_pool_indices.js';
610
640
  /**
611
641
  * Adds a new transaction to the pool with the specified state.
612
642
  * Emits onTxsAdded callback immediately after DB write.
613
- */ async #addTx(tx, state, opts = {}) {
643
+ */ async #addTx(tx, state, opts = {}, precomputedMeta) {
614
644
  const txHashStr = tx.getTxHash().toString();
615
- const meta = await buildTxMetaData(tx);
645
+ const meta = precomputedMeta ?? await buildTxMetaData(tx);
616
646
  meta.receivedAt = this.#dateProvider.now();
617
647
  await this.#txsDB.set(txHashStr, tx.toBuffer());
618
648
  await this.#deletedPool.clearSoftDeleted(txHashStr);
@@ -4,6 +4,7 @@ import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
4
4
  export declare class BlockProposalValidator extends ProposalValidator<BlockProposal> implements P2PValidator<BlockProposal> {
5
5
  constructor(epochCache: EpochCacheInterface, opts: {
6
6
  txsPermitted: boolean;
7
+ maxTxsPerBlock?: number;
7
8
  });
8
9
  }
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSxzQkFBdUIsU0FBUSxpQkFBaUIsQ0FBQyxhQUFhLENBQUUsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ2pILFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUUzRTtDQUNGIn0=
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVyRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSxzQkFBdUIsU0FBUSxpQkFBaUIsQ0FBQyxhQUFhLENBQUUsWUFBVyxZQUFZLENBQUMsYUFBYSxDQUFDO0lBQ2pILFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUM7UUFBQyxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUVwRztDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,aAAa,CAAE,YAAW,YAAY,CAAC,aAAa,CAAC;IACjH,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAE3E;CACF"}
1
+ {"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,aAAa,CAAE,YAAW,YAAY,CAAC,aAAa,CAAC;IACjH,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAEpG;CACF"}
@@ -4,6 +4,7 @@ import { ProposalValidator } from '../proposal_validator/proposal_validator.js';
4
4
  export declare class CheckpointProposalValidator extends ProposalValidator<CheckpointProposal> implements P2PValidator<CheckpointProposal> {
5
5
  constructor(epochCache: EpochCacheInterface, opts: {
6
6
  txsPermitted: boolean;
7
+ maxTxsPerBlock?: number;
7
8
  });
8
9
  }
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSwyQkFDWCxTQUFRLGlCQUFpQixDQUFDLGtCQUFrQixDQUM1QyxZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUUzQyxZQUFZLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxZQUFZLEVBQUUsT0FBTyxDQUFBO0tBQUUsRUFFM0U7Q0FDRiJ9
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvY2hlY2twb2ludF9wcm9wb3NhbF92YWxpZGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUUxRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUVoRixxQkFBYSwyQkFDWCxTQUFRLGlCQUFpQixDQUFDLGtCQUFrQixDQUM1QyxZQUFXLFlBQVksQ0FBQyxrQkFBa0IsQ0FBQztJQUUzQyxZQUFZLFVBQVUsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLEVBQUU7UUFBRSxZQUFZLEVBQUUsT0FBTyxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFFcEc7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"checkpoint_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,2BACX,SAAQ,iBAAiB,CAAC,kBAAkB,CAC5C,YAAW,YAAY,CAAC,kBAAkB,CAAC;IAE3C,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAE3E;CACF"}
1
+ {"version":3,"file":"checkpoint_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF,qBAAa,2BACX,SAAQ,iBAAiB,CAAC,kBAAkB,CAC5C,YAAW,YAAY,CAAC,kBAAkB,CAAC;IAE3C,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAEpG;CACF"}
@@ -5,9 +5,11 @@ export declare abstract class ProposalValidator<TProposal extends BlockProposal
5
5
  protected epochCache: EpochCacheInterface;
6
6
  protected logger: Logger;
7
7
  protected txsPermitted: boolean;
8
+ protected maxTxsPerBlock?: number;
8
9
  constructor(epochCache: EpochCacheInterface, opts: {
9
10
  txsPermitted: boolean;
11
+ maxTxsPerBlock?: number;
10
12
  }, loggerName: string);
11
13
  validate(proposal: TProposal): Promise<ValidationResult>;
12
14
  }
13
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFxQixLQUFLLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEgsOEJBQXNCLGlCQUFpQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQzFGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsU0FBUyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUM7SUFFaEMsWUFBWSxVQUFVLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFJL0Y7SUFFWSxRQUFRLENBQUMsUUFBUSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0F3RXBFO0NBQ0YifQ==
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvcHJvcG9zYWxfdmFsaWRhdG9yL3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFxQixLQUFLLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFJaEgsOEJBQXNCLGlCQUFpQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQzFGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDekIsU0FBUyxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUM7SUFDaEMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUVsQyxZQUNFLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBQ3hELFVBQVUsRUFBRSxNQUFNLEVBTW5CO0lBRVksUUFBUSxDQUFDLFFBQVEsRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBZ0ZwRTtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIhH,8BAAsB,iBAAiB,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC1F,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAEhC,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAAE,UAAU,EAAE,MAAM,EAI/F;IAEY,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwEpE;CACF"}
1
+ {"version":3,"file":"proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAIhH,8BAAsB,iBAAiB,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC1F,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACxD,UAAU,EAAE,MAAM,EAMnB;IAEY,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAgFpE;CACF"}
@@ -6,9 +6,11 @@ export class ProposalValidator {
6
6
  epochCache;
7
7
  logger;
8
8
  txsPermitted;
9
+ maxTxsPerBlock;
9
10
  constructor(epochCache, opts, loggerName){
10
11
  this.epochCache = epochCache;
11
12
  this.txsPermitted = opts.txsPermitted;
13
+ this.maxTxsPerBlock = opts.maxTxsPerBlock;
12
14
  this.logger = createLogger(loggerName);
13
15
  }
14
16
  async validate(proposal) {
@@ -51,6 +53,14 @@ export class ProposalValidator {
51
53
  severity: PeerErrorSeverity.MidToleranceError
52
54
  };
53
55
  }
56
+ // Max txs per block check
57
+ if (this.maxTxsPerBlock !== undefined && proposal.txHashes.length > this.maxTxsPerBlock) {
58
+ this.logger.warn(`Penalizing peer for proposal with ${proposal.txHashes.length} transaction(s) when max is ${this.maxTxsPerBlock}`);
59
+ return {
60
+ result: 'reject',
61
+ severity: PeerErrorSeverity.MidToleranceError
62
+ };
63
+ }
54
64
  // Embedded txs must be listed in txHashes
55
65
  const hashSet = new Set(proposal.txHashes.map((h)=>h.toString()));
56
66
  const missingTxHashes = embeddedTxCount > 0 ? proposal.txs.filter((tx)=>!hashSet.has(tx.getTxHash().toString())).map((tx)=>tx.getTxHash().toString()) : [];
@@ -7,6 +7,7 @@ import type { MockProxy } from 'jest-mock-extended';
7
7
  export interface ProposalValidatorTestParams<TProposal extends BlockProposal | CheckpointProposal> {
8
8
  validatorFactory: (epochCache: EpochCacheInterface, opts: {
9
9
  txsPermitted: boolean;
10
+ maxTxsPerBlock?: number;
10
11
  }) => {
11
12
  validate: (proposal: TProposal) => Promise<ValidationResult>;
12
13
  };
@@ -20,4 +21,4 @@ export interface ProposalValidatorTestParams<TProposal extends BlockProposal | C
20
21
  epochCacheMock: () => MockProxy<EpochCacheInterface>;
21
22
  }
22
23
  export declare function sharedProposalValidatorTests<TProposal extends BlockProposal | CheckpointProposal>(params: ProposalValidatorTestParams<TProposal>): void;
23
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvcHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQsTUFBTSxXQUFXLDJCQUEyQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQy9GLGdCQUFnQixFQUFFLENBQ2hCLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQTtLQUFFLEtBQzVCO1FBQUUsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLFNBQVMsS0FBSyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtLQUFFLENBQUM7SUFDdEUsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRyxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwRCxVQUFVLEVBQUUsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sS0FBSyxHQUFHLENBQUM7SUFDN0csU0FBUyxFQUFFLE1BQU0sZUFBZSxDQUFDO0lBQ2pDLFVBQVUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGVBQWUsS0FBSyxVQUFVLENBQUM7SUFDckQsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLEtBQUssR0FBRyxDQUFDO0lBQ3hDLFdBQVcsRUFBRSxDQUFDLENBQUMsRUFBRSxNQUFNLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDckMsTUFBTSxFQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFDcEIsY0FBYyxFQUFFLE1BQU0sU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7Q0FDdEQ7QUFFRCx3QkFBZ0IsNEJBQTRCLENBQUMsU0FBUyxTQUFTLGFBQWEsR0FBRyxrQkFBa0IsRUFDL0YsTUFBTSxFQUFFLDJCQUEyQixDQUFDLFNBQVMsQ0FBQyxRQXdNL0MifQ==
24
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9wcm9wb3NhbF92YWxpZGF0b3IvcHJvcG9zYWxfdmFsaWRhdG9yX3Rlc3Rfc3VpdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUNoRSxPQUFPLEVBQ0wsS0FBSyxhQUFhLEVBQ2xCLEtBQUssa0JBQWtCLEVBRXZCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHL0MsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFcEQsTUFBTSxXQUFXLDJCQUEyQixDQUFDLFNBQVMsU0FBUyxhQUFhLEdBQUcsa0JBQWtCO0lBQy9GLGdCQUFnQixFQUFFLENBQ2hCLFVBQVUsRUFBRSxtQkFBbUIsRUFDL0IsSUFBSSxFQUFFO1FBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQztRQUFDLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEtBQ3JEO1FBQUUsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLFNBQVMsS0FBSyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtLQUFFLENBQUM7SUFDdEUsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRyxLQUFLLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNwRCxVQUFVLEVBQUUsQ0FBQyxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxHQUFHLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxHQUFHLE1BQU0sS0FBSyxHQUFHLENBQUM7SUFDN0csU0FBUyxFQUFFLE1BQU0sZUFBZSxDQUFDO0lBQ2pDLFVBQVUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGVBQWUsS0FBSyxVQUFVLENBQUM7SUFDckQsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxNQUFNLEtBQUssR0FBRyxDQUFDO0lBQ3hDLFdBQVcsRUFBRSxDQUFDLENBQUMsRUFBRSxNQUFNLEtBQUssTUFBTSxFQUFFLENBQUM7SUFDckMsTUFBTSxFQUFFLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFDcEIsY0FBYyxFQUFFLE1BQU0sU0FBUyxDQUFDLG1CQUFtQixDQUFDLENBQUM7Q0FDdEQ7QUFFRCx3QkFBZ0IsNEJBQTRCLENBQUMsU0FBUyxTQUFTLGFBQWEsR0FBRyxrQkFBa0IsRUFDL0YsTUFBTSxFQUFFLDJCQUEyQixDQUFDLFNBQVMsQ0FBQyxRQXFWL0MifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"proposal_validator_test_suite.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator_test_suite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,2BAA2B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC/F,gBAAgB,EAAE,CAChB,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,KAC5B;QAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACtE,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IAC7G,SAAS,EAAE,MAAM,eAAe,CAAC;IACjC,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,UAAU,CAAC;IACrD,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IACxC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACrC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC;CACtD;AAED,wBAAgB,4BAA4B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB,EAC/F,MAAM,EAAE,2BAA2B,CAAC,SAAS,CAAC,QAwM/C"}
1
+ {"version":3,"file":"proposal_validator_test_suite.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/proposal_validator/proposal_validator_test_suite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAEvB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,2BAA2B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB;IAC/F,gBAAgB,EAAE,CAChB,UAAU,EAAE,mBAAmB,EAC/B,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,KACrD;QAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAA;KAAE,CAAC;IACtE,YAAY,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACpD,UAAU,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IAC7G,SAAS,EAAE,MAAM,eAAe,CAAC;IACjC,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,UAAU,CAAC;IACrD,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,KAAK,GAAG,CAAC;IACxC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACrC,MAAM,EAAE,MAAM,GAAG,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,SAAS,CAAC,mBAAmB,CAAC,CAAC;CACtD;AAED,wBAAgB,4BAA4B,CAAC,SAAS,SAAS,aAAa,GAAG,kBAAkB,EAC/F,MAAM,EAAE,2BAA2B,CAAC,SAAS,CAAC,QAqV/C"}