@aztec/p2p 0.0.1-commit.03f7ef2 → 0.0.1-commit.0b941701

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 (235) hide show
  1. package/dest/client/factory.js +1 -1
  2. package/dest/client/interface.d.ts +18 -5
  3. package/dest/client/interface.d.ts.map +1 -1
  4. package/dest/client/p2p_client.d.ts +10 -13
  5. package/dest/client/p2p_client.d.ts.map +1 -1
  6. package/dest/client/p2p_client.js +451 -120
  7. package/dest/config.d.ts +4 -7
  8. package/dest/config.d.ts.map +1 -1
  9. package/dest/config.js +8 -11
  10. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +61 -42
  11. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  12. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +1 -1
  13. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  14. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +237 -263
  15. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +21 -18
  16. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
  17. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +113 -108
  18. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +17 -16
  19. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
  20. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +89 -128
  21. package/dest/mem_pools/attestation_pool/mocks.d.ts +9 -6
  22. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  23. package/dest/mem_pools/attestation_pool/mocks.js +16 -12
  24. package/dest/mem_pools/instrumentation.d.ts +3 -3
  25. package/dest/mem_pools/instrumentation.d.ts.map +1 -1
  26. package/dest/mem_pools/instrumentation.js +10 -17
  27. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +35 -26
  28. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
  29. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +312 -336
  30. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +32 -0
  31. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts.map +1 -0
  32. package/dest/mem_pools/tx_pool/eviction/eviction_manager.js +112 -0
  33. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +157 -0
  34. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts.map +1 -0
  35. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.js +52 -0
  36. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts +16 -0
  37. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -0
  38. package/dest/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.js +122 -0
  39. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts +17 -0
  40. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.d.ts.map +1 -0
  41. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.js +84 -0
  42. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts +19 -0
  43. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.d.ts.map +1 -0
  44. package/dest/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.js +78 -0
  45. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts +26 -0
  46. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.d.ts.map +1 -0
  47. package/dest/mem_pools/tx_pool/eviction/low_priority_eviction_rule.js +84 -0
  48. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts +25 -0
  49. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.d.ts.map +1 -0
  50. package/dest/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.js +57 -0
  51. package/dest/mem_pools/tx_pool/index.d.ts +1 -2
  52. package/dest/mem_pools/tx_pool/index.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool/index.js +0 -1
  54. package/dest/mem_pools/tx_pool/priority.d.ts +5 -1
  55. package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool/priority.js +6 -1
  57. package/dest/mem_pools/tx_pool/tx_pool.d.ts +8 -4
  58. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
  59. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +7 -7
  60. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +4 -4
  61. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  62. package/dest/msg_validators/attestation_validator/attestation_validator.js +51 -18
  63. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +5 -5
  64. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  65. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +18 -14
  66. package/dest/msg_validators/clock_tolerance.d.ts +21 -0
  67. package/dest/msg_validators/clock_tolerance.d.ts.map +1 -0
  68. package/dest/msg_validators/clock_tolerance.js +37 -0
  69. package/dest/msg_validators/index.d.ts +2 -2
  70. package/dest/msg_validators/index.d.ts.map +1 -1
  71. package/dest/msg_validators/index.js +1 -1
  72. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +9 -0
  73. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -0
  74. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +6 -0
  75. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +9 -0
  76. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -0
  77. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +6 -0
  78. package/dest/msg_validators/proposal_validator/index.d.ts +4 -0
  79. package/dest/msg_validators/proposal_validator/index.d.ts.map +1 -0
  80. package/dest/msg_validators/proposal_validator/index.js +3 -0
  81. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +13 -0
  82. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -0
  83. package/dest/msg_validators/proposal_validator/proposal_validator.js +104 -0
  84. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +23 -0
  85. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +1 -0
  86. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +212 -0
  87. package/dest/msg_validators/tx_validator/block_header_validator.d.ts +1 -1
  88. package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
  89. package/dest/msg_validators/tx_validator/block_header_validator.js +1 -1
  90. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  91. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  92. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts +10 -0
  93. package/dest/msg_validators/tx_validator/fee_payer_balance.d.ts.map +1 -0
  94. package/dest/msg_validators/tx_validator/fee_payer_balance.js +20 -0
  95. package/dest/msg_validators/tx_validator/gas_validator.d.ts +1 -1
  96. package/dest/msg_validators/tx_validator/gas_validator.d.ts.map +1 -1
  97. package/dest/msg_validators/tx_validator/gas_validator.js +8 -14
  98. package/dest/msg_validators/tx_validator/index.d.ts +2 -1
  99. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -1
  100. package/dest/msg_validators/tx_validator/index.js +1 -0
  101. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  102. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  103. package/dest/msg_validators/tx_validator/size_validator.d.ts +6 -0
  104. package/dest/msg_validators/tx_validator/size_validator.d.ts.map +1 -0
  105. package/dest/msg_validators/tx_validator/size_validator.js +20 -0
  106. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +1 -1
  107. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
  108. package/dest/services/dummy_service.d.ts +6 -2
  109. package/dest/services/dummy_service.d.ts.map +1 -1
  110. package/dest/services/dummy_service.js +3 -0
  111. package/dest/services/encoding.d.ts +1 -1
  112. package/dest/services/encoding.d.ts.map +1 -1
  113. package/dest/services/encoding.js +6 -5
  114. package/dest/services/libp2p/instrumentation.d.ts +1 -1
  115. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  116. package/dest/services/libp2p/instrumentation.js +20 -73
  117. package/dest/services/libp2p/libp2p_service.d.ts +28 -11
  118. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  119. package/dest/services/libp2p/libp2p_service.js +711 -152
  120. package/dest/services/peer-manager/metrics.d.ts +6 -1
  121. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  122. package/dest/services/peer-manager/metrics.js +18 -21
  123. package/dest/services/peer-manager/peer_manager.d.ts +2 -2
  124. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  125. package/dest/services/peer-manager/peer_manager.js +2 -10
  126. package/dest/services/peer-manager/peer_scoring.d.ts +1 -1
  127. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  128. package/dest/services/peer-manager/peer_scoring.js +2 -5
  129. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +1 -1
  130. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -1
  131. package/dest/services/reqresp/constants.d.ts +12 -0
  132. package/dest/services/reqresp/constants.d.ts.map +1 -0
  133. package/dest/services/reqresp/constants.js +7 -0
  134. package/dest/services/reqresp/metrics.d.ts +1 -1
  135. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  136. package/dest/services/reqresp/metrics.js +5 -21
  137. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts +1 -1
  138. package/dest/services/reqresp/protocols/block_txs/bitvector.d.ts.map +1 -1
  139. package/dest/services/reqresp/protocols/block_txs/bitvector.js +7 -0
  140. package/dest/services/reqresp/protocols/status.d.ts +1 -1
  141. package/dest/services/reqresp/protocols/status.d.ts.map +1 -1
  142. package/dest/services/reqresp/protocols/status.js +4 -1
  143. package/dest/services/reqresp/reqresp.js +402 -24
  144. package/dest/services/service.d.ts +16 -3
  145. package/dest/services/service.d.ts.map +1 -1
  146. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  147. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  148. package/dest/services/tx_collection/instrumentation.js +4 -14
  149. package/dest/services/tx_collection/slow_tx_collection.d.ts +3 -3
  150. package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
  151. package/dest/services/tx_collection/tx_collection.d.ts +5 -5
  152. package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
  153. package/dest/services/tx_provider.d.ts +3 -3
  154. package/dest/services/tx_provider.d.ts.map +1 -1
  155. package/dest/services/tx_provider.js +3 -1
  156. package/dest/services/tx_provider_instrumentation.d.ts +1 -1
  157. package/dest/services/tx_provider_instrumentation.d.ts.map +1 -1
  158. package/dest/services/tx_provider_instrumentation.js +6 -19
  159. package/dest/testbench/p2p_client_testbench_worker.js +31 -17
  160. package/dest/testbench/worker_client_manager.d.ts +1 -1
  161. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  162. package/dest/testbench/worker_client_manager.js +6 -1
  163. package/package.json +16 -16
  164. package/src/client/factory.ts +1 -1
  165. package/src/client/interface.ts +19 -4
  166. package/src/client/p2p_client.ts +84 -134
  167. package/src/config.ts +10 -16
  168. package/src/mem_pools/attestation_pool/attestation_pool.ts +68 -41
  169. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +239 -287
  170. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +162 -140
  171. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +141 -164
  172. package/src/mem_pools/attestation_pool/mocks.ts +19 -13
  173. package/src/mem_pools/instrumentation.ts +18 -25
  174. package/src/mem_pools/tx_pool/README.md +270 -0
  175. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +360 -368
  176. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +132 -0
  177. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +208 -0
  178. package/src/mem_pools/tx_pool/eviction/fee_payer_balance_eviction_rule.ts +162 -0
  179. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +104 -0
  180. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +93 -0
  181. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +106 -0
  182. package/src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts +75 -0
  183. package/src/mem_pools/tx_pool/index.ts +0 -1
  184. package/src/mem_pools/tx_pool/priority.ts +8 -1
  185. package/src/mem_pools/tx_pool/tx_pool.ts +8 -3
  186. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +7 -7
  187. package/src/msg_validators/attestation_validator/attestation_validator.ts +36 -21
  188. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +13 -16
  189. package/src/msg_validators/clock_tolerance.ts +51 -0
  190. package/src/msg_validators/index.ts +1 -1
  191. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +10 -0
  192. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +13 -0
  193. package/src/msg_validators/proposal_validator/index.ts +3 -0
  194. package/src/msg_validators/proposal_validator/proposal_validator.ts +92 -0
  195. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +230 -0
  196. package/src/msg_validators/tx_validator/block_header_validator.ts +3 -1
  197. package/src/msg_validators/tx_validator/data_validator.ts +12 -4
  198. package/src/msg_validators/tx_validator/fee_payer_balance.ts +40 -0
  199. package/src/msg_validators/tx_validator/gas_validator.ts +8 -25
  200. package/src/msg_validators/tx_validator/index.ts +1 -0
  201. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  202. package/src/msg_validators/tx_validator/size_validator.ts +18 -0
  203. package/src/msg_validators/tx_validator/timestamp_validator.ts +3 -1
  204. package/src/services/dummy_service.ts +6 -0
  205. package/src/services/encoding.ts +5 -4
  206. package/src/services/libp2p/instrumentation.ts +19 -73
  207. package/src/services/libp2p/libp2p_service.ts +351 -115
  208. package/src/services/peer-manager/metrics.ts +22 -21
  209. package/src/services/peer-manager/peer_manager.ts +3 -2
  210. package/src/services/peer-manager/peer_scoring.ts +1 -5
  211. package/src/services/reqresp/connection-sampler/connection_sampler.ts +3 -1
  212. package/src/services/reqresp/constants.ts +14 -0
  213. package/src/services/reqresp/metrics.ts +7 -23
  214. package/src/services/reqresp/protocols/block_txs/bitvector.ts +9 -0
  215. package/src/services/reqresp/protocols/status.ts +7 -4
  216. package/src/services/service.ts +19 -4
  217. package/src/services/tx_collection/instrumentation.ts +4 -21
  218. package/src/services/tx_collection/slow_tx_collection.ts +2 -2
  219. package/src/services/tx_collection/tx_collection.ts +4 -4
  220. package/src/services/tx_provider.ts +6 -3
  221. package/src/services/tx_provider_instrumentation.ts +11 -24
  222. package/src/testbench/p2p_client_testbench_worker.ts +41 -21
  223. package/src/testbench/worker_client_manager.ts +6 -1
  224. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +0 -81
  225. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +0 -1
  226. package/dest/mem_pools/tx_pool/memory_tx_pool.js +0 -242
  227. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +0 -12
  228. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +0 -1
  229. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +0 -82
  230. package/dest/msg_validators/block_proposal_validator/index.d.ts +0 -2
  231. package/dest/msg_validators/block_proposal_validator/index.d.ts.map +0 -1
  232. package/dest/msg_validators/block_proposal_validator/index.js +0 -1
  233. package/src/mem_pools/tx_pool/memory_tx_pool.ts +0 -288
  234. package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +0 -97
  235. package/src/msg_validators/block_proposal_validator/index.ts +0 -1
@@ -0,0 +1,78 @@
1
+ import { findIndexInSortedArray, insertIntoSortedArray } from '@aztec/foundation/array';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
3
+ import { createLogger } from '@aztec/foundation/log';
4
+ import { MerkleTreeId } from '@aztec/stdlib/trees';
5
+ import { EvictionEvent } from './eviction_strategy.js';
6
+ /**
7
+ * Eviction rule that removes invalid transactions after a blockchain reorganization.
8
+ * Only triggers on CHAIN_PRUNED events.
9
+ *
10
+ * Eviction criteria includes:
11
+ * - Transactions that reference pruned block hashes (invalid by definition)
12
+ */ export class InvalidTxsAfterReorgRule {
13
+ worldState;
14
+ name;
15
+ log;
16
+ constructor(worldState){
17
+ this.worldState = worldState;
18
+ this.name = 'InvalidTxsAfterReorg';
19
+ this.log = createLogger('p2p:mempool:tx_pool:invalid_txs_after_reorg_rule');
20
+ }
21
+ async evict(context, txPool) {
22
+ if (context.event !== EvictionEvent.CHAIN_PRUNED) {
23
+ return {
24
+ reason: 'reorg_invalid_txs',
25
+ success: true,
26
+ txsEvicted: []
27
+ };
28
+ }
29
+ try {
30
+ const candidateTxs = (await txPool.getPendingTxInfos()).filter(({ isEvictable })=>isEvictable);
31
+ // Deduplicate block hashes to reduce redundant DB lookups (many txs may share the same blockHash).
32
+ const uniqueBlockHashes = [];
33
+ candidateTxs.forEach(({ blockHash })=>{
34
+ insertIntoSortedArray(uniqueBlockHashes, blockHash, Fr.cmp, false);
35
+ });
36
+ // Ensure world state is synced to this block before accessing the snapshot.
37
+ await this.worldState.syncImmediate(context.blockNumber);
38
+ const db = this.worldState.getSnapshot(context.blockNumber);
39
+ const blocksFromDb = await db.findLeafIndices(MerkleTreeId.ARCHIVE, uniqueBlockHashes);
40
+ // Identify txs whose blockHash is not found in the archive (pruned)
41
+ const txsToEvict = [];
42
+ for (const tx of candidateTxs){
43
+ const idx = findIndexInSortedArray(uniqueBlockHashes, tx.blockHash, Fr.cmp);
44
+ const blockPruned = idx === -1 || blocksFromDb[idx] === undefined;
45
+ if (blockPruned) {
46
+ txsToEvict.push(tx.txHash);
47
+ }
48
+ }
49
+ if (txsToEvict.length > 0) {
50
+ this.log.verbose(`Evicting ${txsToEvict.length} txs from pool due to referencing pruned blocks`);
51
+ await txPool.deleteTxs(txsToEvict);
52
+ }
53
+ const keptCount = candidateTxs.length - txsToEvict.length;
54
+ if (keptCount > 0) {
55
+ this.log.verbose(`Kept ${keptCount} txs that did not reference pruned blocks`);
56
+ }
57
+ this.log.debug(`Evicted ${txsToEvict.length} invalid txs after reorg`);
58
+ return {
59
+ reason: 'reorg_invalid_txs',
60
+ success: true,
61
+ txsEvicted: txsToEvict
62
+ };
63
+ } catch (err) {
64
+ this.log.error('Failed to evict invalid transactions after reorg', {
65
+ err
66
+ });
67
+ return {
68
+ reason: 'reorg_invalid_txs',
69
+ success: false,
70
+ txsEvicted: [],
71
+ error: new Error('Failed to evict invalid txs after reorg', {
72
+ cause: err
73
+ })
74
+ };
75
+ }
76
+ }
77
+ updateConfig(_config) {}
78
+ }
@@ -0,0 +1,26 @@
1
+ import type { TxPoolOptions } from '../tx_pool.js';
2
+ import { type EvictionContext, type EvictionResult, type EvictionRule, type TxPoolOperations } from './eviction_strategy.js';
3
+ export interface LowPriorityEvictionConfig {
4
+ /** Maximum number of pending transactions before eviction kicks in */
5
+ maxPoolSize: number;
6
+ }
7
+ /**
8
+ * Eviction rule that removes low-priority transactions when the number of pending transactions exceeds configured limits.
9
+ * Only triggers on TXS_ADDED events and respects non-evictable transactions.
10
+ */
11
+ export declare class LowPriorityEvictionRule implements EvictionRule {
12
+ private config;
13
+ readonly name = "LowPriorityEviction";
14
+ private log;
15
+ constructor(config: LowPriorityEvictionConfig);
16
+ evict(context: EvictionContext, txPool: TxPoolOperations): Promise<EvictionResult>;
17
+ /**
18
+ * Updates the configuration for this eviction rule
19
+ */
20
+ updateConfig(config: TxPoolOptions): void;
21
+ /**
22
+ * Gets the current configuration
23
+ */
24
+ getConfig(): LowPriorityEvictionConfig;
25
+ }
26
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG93X3ByaW9yaXR5X2V2aWN0aW9uX3J1bGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9ldmljdGlvbi9sb3dfcHJpb3JpdHlfZXZpY3Rpb25fcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDbkQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUVwQixLQUFLLGNBQWMsRUFDbkIsS0FBSyxZQUFZLEVBQ2pCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sd0JBQXdCLENBQUM7QUFFaEMsTUFBTSxXQUFXLHlCQUF5QjtJQUN4QyxzRUFBc0U7SUFDdEUsV0FBVyxFQUFFLE1BQU0sQ0FBQztDQUNyQjtBQUVEOzs7R0FHRztBQUNILHFCQUFhLHVCQUF3QixZQUFXLFlBQVk7SUFLOUMsT0FBTyxDQUFDLE1BQU07SUFKMUIsU0FBZ0IsSUFBSSx5QkFBeUI7SUFFN0MsT0FBTyxDQUFDLEdBQUcsQ0FBa0U7SUFFN0UsWUFBb0IsTUFBTSxFQUFFLHlCQUF5QixFQUFJO0lBRTVDLEtBQUssQ0FBQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBNEQ5RjtJQUVEOztPQUVHO0lBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxhQUFhLEdBQUcsSUFBSSxDQUl4QztJQUVEOztPQUVHO0lBQ0gsU0FBUyxJQUFJLHlCQUF5QixDQUVyQztDQUNGIn0=
@@ -0,0 +1 @@
1
+ {"version":3,"file":"low_priority_eviction_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACtB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,yBAAyB;IACxC,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,qBAAa,uBAAwB,YAAW,YAAY;IAK9C,OAAO,CAAC,MAAM;IAJ1B,SAAgB,IAAI,yBAAyB;IAE7C,OAAO,CAAC,GAAG,CAAkE;IAE7E,YAAoB,MAAM,EAAE,yBAAyB,EAAI;IAE5C,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CA4D9F;IAED;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAIxC;IAED;;OAEG;IACH,SAAS,IAAI,yBAAyB,CAErC;CACF"}
@@ -0,0 +1,84 @@
1
+ import { createLogger } from '@aztec/foundation/log';
2
+ import { EvictionEvent } from './eviction_strategy.js';
3
+ /**
4
+ * Eviction rule that removes low-priority transactions when the number of pending transactions exceeds configured limits.
5
+ * Only triggers on TXS_ADDED events and respects non-evictable transactions.
6
+ */ export class LowPriorityEvictionRule {
7
+ config;
8
+ name;
9
+ log;
10
+ constructor(config){
11
+ this.config = config;
12
+ this.name = 'LowPriorityEviction';
13
+ this.log = createLogger('p2p:mempool:tx_pool:low_priority_eviction_rule');
14
+ }
15
+ async evict(context, txPool) {
16
+ if (context.event !== EvictionEvent.TXS_ADDED) {
17
+ return {
18
+ reason: 'low_priority',
19
+ success: true,
20
+ txsEvicted: []
21
+ };
22
+ }
23
+ if (this.config.maxPoolSize === 0) {
24
+ return {
25
+ reason: 'low_priority',
26
+ success: true,
27
+ txsEvicted: []
28
+ };
29
+ }
30
+ try {
31
+ const currentTxCount = await txPool.getPendingTxCount();
32
+ const maxCount = this.config.maxPoolSize;
33
+ if (currentTxCount <= maxCount) {
34
+ this.log.trace(`Not evicting low priority txs. Pending tx count below limit ${currentTxCount} <= ${maxCount}`);
35
+ return {
36
+ reason: 'low_priority',
37
+ success: true,
38
+ txsEvicted: []
39
+ };
40
+ }
41
+ this.log.verbose(`Evicting low priority txs. Pending tx count above limit: ${currentTxCount} > ${maxCount}`);
42
+ const numberToEvict = currentTxCount - maxCount;
43
+ const txsToEvict = await txPool.getLowestPriorityEvictable(numberToEvict);
44
+ if (txsToEvict.length > 0) {
45
+ await txPool.deleteTxs(txsToEvict);
46
+ }
47
+ const numNewTxsEvicted = context.newTxs.filter((newTxHash)=>txsToEvict.some((evictedTx)=>evictedTx.equals(newTxHash))).length;
48
+ this.log.verbose(`Evicted ${txsToEvict.length} low priority txs, including ${numNewTxsEvicted} newly added txs`, {
49
+ txsEvicted: txsToEvict
50
+ });
51
+ return {
52
+ reason: 'low_priority',
53
+ success: true,
54
+ txsEvicted: txsToEvict
55
+ };
56
+ } catch (err) {
57
+ this.log.error('Failed to evict low priority transactions', {
58
+ err
59
+ });
60
+ return {
61
+ reason: 'low_priority',
62
+ success: false,
63
+ txsEvicted: [],
64
+ error: new Error('Failed to evict low priority txs', {
65
+ cause: err
66
+ })
67
+ };
68
+ }
69
+ }
70
+ /**
71
+ * Updates the configuration for this eviction rule
72
+ */ updateConfig(config) {
73
+ if (config.maxPendingTxCount !== undefined) {
74
+ this.config.maxPoolSize = config.maxPendingTxCount;
75
+ }
76
+ }
77
+ /**
78
+ * Gets the current configuration
79
+ */ getConfig() {
80
+ return {
81
+ ...this.config
82
+ };
83
+ }
84
+ }
@@ -0,0 +1,25 @@
1
+ import { type Tx } from '@aztec/stdlib/tx';
2
+ import type { PreAddEvictionResult, PreAddEvictionRule, PreAddPoolAccess } from './eviction_strategy.js';
3
+ /**
4
+ * Pre-add eviction rule that checks for nullifier conflicts between incoming and existing transactions.
5
+ *
6
+ * When an incoming tx shares nullifiers with existing pending txs:
7
+ * - If the incoming tx has strictly higher priority fee, evict all conflicting txs
8
+ * - If any conflicting tx has equal or higher priority fee, reject the incoming tx
9
+ *
10
+ * This prevents nullifier spam attacks where an attacker floods the mempool with
11
+ * transactions spending the same nullifiers.
12
+ */
13
+ export declare class NullifierConflictPreAddRule implements PreAddEvictionRule {
14
+ readonly name = "NullifierConflictPreAdd";
15
+ private log;
16
+ /**
17
+ * Check if the incoming transaction conflicts with existing transactions via nullifiers.
18
+ *
19
+ * @param tx - The incoming transaction
20
+ * @param poolAccess - Read-only access to pool state
21
+ * @returns Result with rejection status and txs to evict
22
+ */
23
+ check(tx: Tx, poolAccess: PreAddPoolAccess): Promise<PreAddEvictionResult>;
24
+ }
25
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX2NvbmZsaWN0X3ByZV9hZGRfcnVsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL2V2aWN0aW9uL251bGxpZmllcl9jb25mbGljdF9wcmVfYWRkX3J1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFVLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsa0JBQWtCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUl6Rzs7Ozs7Ozs7O0dBU0c7QUFDSCxxQkFBYSwyQkFBNEIsWUFBVyxrQkFBa0I7SUFDcEUsU0FBZ0IsSUFBSSw2QkFBNkI7SUFFakQsT0FBTyxDQUFDLEdBQUcsQ0FBdUU7SUFFbEY7Ozs7OztPQU1HO0lBQ0csS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsVUFBVSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQTBDL0U7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nullifier_conflict_pre_add_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool/eviction/nullifier_conflict_pre_add_rule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,EAAU,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAIzG;;;;;;;;;GASG;AACH,qBAAa,2BAA4B,YAAW,kBAAkB;IACpE,SAAgB,IAAI,6BAA6B;IAEjD,OAAO,CAAC,GAAG,CAAuE;IAElF;;;;;;OAMG;IACG,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA0C/E;CACF"}
@@ -0,0 +1,57 @@
1
+ import { findIndexInSortedArray, insertIntoSortedArray } from '@aztec/foundation/array';
2
+ import { Fr } from '@aztec/foundation/curves/bn254';
3
+ import { createLogger } from '@aztec/foundation/log';
4
+ const cmpTxHash = (a, b)=>Fr.cmp(a.hash, b.hash);
5
+ /**
6
+ * Pre-add eviction rule that checks for nullifier conflicts between incoming and existing transactions.
7
+ *
8
+ * When an incoming tx shares nullifiers with existing pending txs:
9
+ * - If the incoming tx has strictly higher priority fee, evict all conflicting txs
10
+ * - If any conflicting tx has equal or higher priority fee, reject the incoming tx
11
+ *
12
+ * This prevents nullifier spam attacks where an attacker floods the mempool with
13
+ * transactions spending the same nullifiers.
14
+ */ export class NullifierConflictPreAddRule {
15
+ name = 'NullifierConflictPreAdd';
16
+ log = createLogger('p2p:mempool:tx_pool:nullifier_conflict_pre_add_rule');
17
+ /**
18
+ * Check if the incoming transaction conflicts with existing transactions via nullifiers.
19
+ *
20
+ * @param tx - The incoming transaction
21
+ * @param poolAccess - Read-only access to pool state
22
+ * @returns Result with rejection status and txs to evict
23
+ */ async check(tx, poolAccess) {
24
+ const txHash = tx.getTxHash();
25
+ const nullifiers = tx.data.getNonEmptyNullifiers();
26
+ const txHashesToEvict = [];
27
+ const incomingPriority = poolAccess.getTxPriority(tx);
28
+ for (const nullifier of nullifiers){
29
+ const conflictingHash = await poolAccess.getTxHashByNullifier(nullifier);
30
+ if (!conflictingHash || conflictingHash.equals(txHash) || findIndexInSortedArray(txHashesToEvict, conflictingHash, cmpTxHash) !== -1) {
31
+ continue;
32
+ }
33
+ // Get the conflicting tx's priority
34
+ const conflictingTx = await poolAccess.getPendingTxByHash(conflictingHash);
35
+ if (!conflictingTx) {
36
+ continue;
37
+ }
38
+ const conflictingPriority = poolAccess.getTxPriority(conflictingTx);
39
+ // If incoming tx has strictly higher priority, mark for eviction
40
+ // Otherwise, reject incoming tx (ties go to existing tx)
41
+ if (incomingPriority > conflictingPriority) {
42
+ insertIntoSortedArray(txHashesToEvict, conflictingHash, cmpTxHash);
43
+ } else {
44
+ this.log.debug(`Rejecting tx ${txHash.toString()}: nullifier conflict with ${conflictingHash.toString()} which has higher or equal fee`);
45
+ return {
46
+ shouldReject: true,
47
+ txHashesToEvict: [],
48
+ reason: `nullifier conflict with ${conflictingHash.toString()}`
49
+ };
50
+ }
51
+ }
52
+ return {
53
+ shouldReject: false,
54
+ txHashesToEvict
55
+ };
56
+ }
57
+ }
@@ -1,4 +1,3 @@
1
1
  export * from './tx_pool.js';
2
- export * from './memory_tx_pool.js';
3
2
  export * from './aztec_kv_tx_pool.js';
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsdUJBQXVCLENBQUMifQ==
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHVCQUF1QixDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC"}
@@ -1,3 +1,2 @@
1
1
  export * from './tx_pool.js';
2
- export * from './memory_tx_pool.js';
3
2
  export * from './aztec_kv_tx_pool.js';
@@ -5,4 +5,8 @@ import type { Tx } from '@aztec/stdlib/tx';
5
5
  * We currently use the sum of the priority fees for the tx for this value, represented as hex.
6
6
  */
7
7
  export declare function getPendingTxPriority(tx: Tx): string;
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpb3JpdHkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9wcmlvcml0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQzs7OztHQUlHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUluRCJ9
8
+ /**
9
+ * Returns the priority of a tx.
10
+ */
11
+ export declare function getTxPriorityFee(tx: Tx): bigint;
12
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpb3JpdHkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbC9wcmlvcml0eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQzs7OztHQUlHO0FBQ0gsd0JBQWdCLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUVuRDtBQUVEOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcsTUFBTSxDQUkvQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"priority.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/priority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAInD"}
1
+ {"version":3,"file":"priority.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/priority.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,MAAM,CAI/C"}
@@ -4,7 +4,12 @@ import { Buffer32 } from '@aztec/foundation/buffer';
4
4
  * Txs with a higher priority value are returned first when retrieving pending tx hashes.
5
5
  * We currently use the sum of the priority fees for the tx for this value, represented as hex.
6
6
  */ export function getPendingTxPriority(tx) {
7
+ return Buffer32.fromBigInt(getTxPriorityFee(tx)).toString();
8
+ }
9
+ /**
10
+ * Returns the priority of a tx.
11
+ */ export function getTxPriorityFee(tx) {
7
12
  const priorityFees = tx.getGasSettings().maxPriorityFeesPerGas;
8
13
  const totalFees = priorityFees.feePerDaGas + priorityFees.feePerL2Gas;
9
- return Buffer32.fromBigInt(totalFees).toString();
14
+ return totalFees;
10
15
  }
@@ -2,8 +2,7 @@ import type { BlockNumber } from '@aztec/foundation/branded-types';
2
2
  import type { TypedEventEmitter } from '@aztec/foundation/types';
3
3
  import type { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
4
4
  export type TxPoolOptions = {
5
- maxTxPoolSize?: number;
6
- txPoolOverflowFactor?: number;
5
+ maxPendingTxCount?: number;
7
6
  archivedTxLimit?: number;
8
7
  };
9
8
  export type TxPoolEvents = {
@@ -64,8 +63,9 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
64
63
  * Moves mined txs back to the pending set in the case of a reorg.
65
64
  * Note: txs not known by this peer will be ignored.
66
65
  * @param txHashes - Hashes of the txs to flag as pending.
66
+ * @param latestBlock - The block number the chain was pruned to.
67
67
  */
68
- markMinedAsPending(txHashes: TxHash[]): Promise<void>;
68
+ markMinedAsPending(txHashes: TxHash[], latestBlock: BlockNumber): Promise<void>;
69
69
  /**
70
70
  * Deletes transactions from the pool. Tx hashes that are not present are ignored.
71
71
  * @param txHashes - An array of tx hashes to be removed from the tx pool.
@@ -113,6 +113,10 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
113
113
  * @param txHashes - Hashes of the transactions to mark as non-evictible.
114
114
  */
115
115
  markTxsAsNonEvictable(txHashes: TxHash[]): Promise<void>;
116
+ /**
117
+ * Clears collection of non-evictable transactions in the pool
118
+ */
119
+ clearNonEvictableTxs(): Promise<void>;
116
120
  /**
117
121
  * Permanently deletes deleted mined transactions from blocks up to and including the specified block number.
118
122
  * @param blockNumber - Block number threshold. Deleted mined txs from this block or earlier will be permanently deleted.
@@ -120,4 +124,4 @@ export interface TxPool extends TypedEventEmitter<TxPoolEvents> {
120
124
  */
121
125
  cleanupDeletedMinedTxs(blockNumber: BlockNumber): Promise<number>;
122
126
  }
123
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL3R4X3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhFLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQzlCLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMxQixDQUFDO0FBRUYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFO1FBQUUsR0FBRyxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQUMsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsS0FBSyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQy9FLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFPLFNBQVEsaUJBQWlCLENBQUMsWUFBWSxDQUFDO0lBQzdEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsTUFBTSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7SUFFL0Q7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFckQ7Ozs7T0FJRztJQUNILFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUU5RDs7OztPQUlHO0lBQ0gsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUUvQzs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXhDOzs7O09BSUc7SUFDSCxtQkFBbUIsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFN0Q7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEVBQUUsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFekU7Ozs7T0FJRztJQUNILGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFdEQ7OztPQUdHO0lBQ0gsU0FBUyxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtRQUFFLFdBQVcsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtLQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRS9FOzs7T0FHRztJQUNILFNBQVMsSUFBSSxPQUFPLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUUzQjs7O09BR0c7SUFDSCxjQUFjLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFFcEM7OztPQUdHO0lBQ0gsa0JBQWtCLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7SUFFeEMscURBQXFEO0lBQ3JELGlCQUFpQixJQUFJLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUVyQzs7O09BR0c7SUFDSCxnQkFBZ0IsSUFBSSxPQUFPLENBQUMsQ0FBQyxFQUFFLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7SUFFdEU7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLEdBQUcsT0FBTyxHQUFHLFNBQVMsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVsRjs7O09BR0c7SUFDSCxZQUFZLENBQUMsTUFBTSxFQUFFLGFBQWEsR0FBRyxJQUFJLENBQUM7SUFFMUMseUNBQXlDO0lBQ3pDLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFNUI7OztPQUdHO0lBQ0gscUJBQXFCLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV6RDs7OztPQUlHO0lBQ0gsc0JBQXNCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7Q0FDbkUifQ==
127
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sL3R4X3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRWhFLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsaUJBQWlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDM0IsZUFBZSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQzFCLENBQUM7QUFFRixNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUU7UUFBRSxHQUFHLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFBQyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxLQUFLLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDL0UsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxXQUFXLE1BQU8sU0FBUSxpQkFBaUIsQ0FBQyxZQUFZLENBQUM7SUFDN0Q7Ozs7T0FJRztJQUNILE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLEVBQUU7UUFBRSxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUUvRDs7OztPQUlHO0lBQ0gsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVyRDs7OztPQUlHO0lBQ0gsWUFBWSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRTlEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO0lBRS9DOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFFeEM7Ozs7T0FJRztJQUNILG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUU3RDs7OztPQUlHO0lBQ0gsV0FBVyxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUV6RTs7Ozs7T0FLRztJQUNILGtCQUFrQixDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsRUFBRSxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUVoRjs7O09BR0c7SUFDSCxTQUFTLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksQ0FBQyxFQUFFO1FBQUUsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFBO0tBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0U7OztPQUdHO0lBQ0gsU0FBUyxJQUFJLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRTNCOzs7T0FHRztJQUNILGNBQWMsSUFBSSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUVwQzs7O09BR0c7SUFDSCxrQkFBa0IsSUFBSSxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUV4QyxxREFBcUQ7SUFDckQsaUJBQWlCLElBQUksT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXJDOzs7T0FHRztJQUNILGdCQUFnQixJQUFJLE9BQU8sQ0FBQyxDQUFDLEVBQUUsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUV0RTs7OztPQUlHO0lBQ0gsV0FBVyxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsR0FBRyxPQUFPLEdBQUcsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRWxGOzs7T0FHRztJQUNILFlBQVksQ0FBQyxNQUFNLEVBQUUsYUFBYSxHQUFHLElBQUksQ0FBQztJQUUxQyx5Q0FBeUM7SUFDekMsT0FBTyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUU1Qjs7O09BR0c7SUFDSCxxQkFBcUIsQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXpEOztPQUVHO0lBQ0gsb0JBQW9CLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBRXRDOzs7O09BSUc7SUFDSCxzQkFBc0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztDQUNuRSJ9
@@ -1 +1 @@
1
- {"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"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"}
@@ -21,7 +21,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
21
21
  pool.removeAllListeners('txs-added');
22
22
  });
23
23
  it('adds txs to the pool as pending', async ()=>{
24
- const tx1 = await mockTx();
24
+ const tx1 = await mockTx(1);
25
25
  await pool.addTxs([
26
26
  tx1
27
27
  ]);
@@ -34,9 +34,9 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
34
34
  await expect(pool.getPendingTxCount()).resolves.toEqual(1);
35
35
  });
36
36
  it('emits txs-added event with new txs', async ()=>{
37
- const tx1 = await mockTx(); // existing and pending
38
- const tx2 = await mockTx(); // mined but not known
39
- const tx3 = await mockTx(); // brand new
37
+ const tx1 = await mockTx(1); // existing and pending
38
+ const tx2 = await mockTx(2); // mined but not known
39
+ const tx3 = await mockTx(3); // brand new
40
40
  await pool.addTxs([
41
41
  tx1
42
42
  ]);
@@ -60,7 +60,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
60
60
  tx3.getTxHash()
61
61
  ]));
62
62
  });
63
- it('permanently deletes pending txs and soft-deletes mined txs', async ()=>{
63
+ it('removes txs from the pool', async ()=>{
64
64
  const pendingTx = await mockTx(1);
65
65
  const minedTx = await mockTx(2);
66
66
  await pool.addTxs([
@@ -121,7 +121,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
121
121
  ], minedBlockHeader);
122
122
  await pool.markMinedAsPending([
123
123
  tx1.getTxHash()
124
- ]);
124
+ ], BlockNumber(1));
125
125
  await expect(pool.getMinedTxHashes()).resolves.toEqual([]);
126
126
  const pending = await pool.getPendingTxHashes();
127
127
  expect(pending).toHaveLength(2);
@@ -158,7 +158,7 @@ import { BlockHeader, GlobalVariables } from '@aztec/stdlib/tx';
158
158
  await pool.markMinedAsPending([
159
159
  tx1.getTxHash(),
160
160
  someTxHashThatThisPeerDidNotSee
161
- ]);
161
+ ], BlockNumber(1));
162
162
  await expect(pool.getMinedTxHashes()).resolves.toEqual([]);
163
163
  await expect(pool.getPendingTxHashes()).resolves.toEqual([
164
164
  tx1.getTxHash()
@@ -1,10 +1,10 @@
1
1
  import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
2
  import { type Logger } from '@aztec/foundation/log';
3
- import { type BlockAttestation, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
4
- export declare class AttestationValidator implements P2PValidator<BlockAttestation> {
3
+ import { type CheckpointAttestation, type P2PValidator, type ValidationResult } from '@aztec/stdlib/p2p';
4
+ export declare class CheckpointAttestationValidator implements P2PValidator<CheckpointAttestation> {
5
5
  protected epochCache: EpochCacheInterface;
6
6
  protected logger: Logger;
7
7
  constructor(epochCache: EpochCacheInterface);
8
- validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
8
+ validate(message: CheckpointAttestation): Promise<ValidationResult>;
9
9
  }
10
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWhHLHFCQUFhLG9CQUFxQixZQUFXLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQztJQUN6RSxTQUFTLENBQUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO0lBQzFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDO0lBRXpCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUcxQztJQUVLLFFBQVEsQ0FBQyxPQUFPLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixHQUFHLFNBQVMsQ0FBQyxDQXFEaEY7Q0FDRiJ9
10
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYXR0ZXN0YXRpb25fdmFsaWRhdG9yL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRTlELE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQ0wsS0FBSyxxQkFBcUIsRUFDMUIsS0FBSyxZQUFZLEVBRWpCLEtBQUssZ0JBQWdCLEVBQ3RCLE1BQU0sbUJBQW1CLENBQUM7QUFJM0IscUJBQWEsOEJBQStCLFlBQVcsWUFBWSxDQUFDLHFCQUFxQixDQUFDO0lBQ3hGLFNBQVMsQ0FBQyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7SUFDMUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFFekIsWUFBWSxVQUFVLEVBQUUsbUJBQW1CLEVBRzFDO0lBRUssUUFBUSxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0E2RHhFO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_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,KAAK,gBAAgB,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEhG,qBAAa,oBAAqB,YAAW,YAAY,CAAC,gBAAgB,CAAC;IACzE,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,YAAY,UAAU,EAAE,mBAAmB,EAG1C;IAEK,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAqDhF;CACF"}
1
+ {"version":3,"file":"attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,YAAY,EAEjB,KAAK,gBAAgB,EACtB,MAAM,mBAAmB,CAAC;AAI3B,qBAAa,8BAA+B,YAAW,YAAY,CAAC,qBAAqB,CAAC;IACxF,SAAS,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAC1C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,YAAY,UAAU,EAAE,mBAAmB,EAG1C;IAEK,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA6DxE;CACF"}
@@ -1,53 +1,86 @@
1
1
  import { NoCommitteeError } from '@aztec/ethereum/contracts';
2
2
  import { createLogger } from '@aztec/foundation/log';
3
3
  import { PeerErrorSeverity } from '@aztec/stdlib/p2p';
4
- export class AttestationValidator {
4
+ import { isWithinClockTolerance } from '../clock_tolerance.js';
5
+ export class CheckpointAttestationValidator {
5
6
  epochCache;
6
7
  logger;
7
8
  constructor(epochCache){
8
9
  this.epochCache = epochCache;
9
- this.logger = createLogger('p2p:attestation-validator');
10
+ this.logger = createLogger('p2p:checkpoint-attestation-validator');
10
11
  }
11
12
  async validate(message) {
12
13
  const slotNumber = message.payload.header.slotNumber;
13
14
  try {
14
- const { currentProposer, nextProposer, currentSlot, nextSlot } = await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
15
+ const { currentSlot, nextSlot } = this.epochCache.getCurrentAndNextSlot();
15
16
  if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
16
- this.logger.warn(`Attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
17
- return PeerErrorSeverity.HighToleranceError;
17
+ // Check if message is for previous slot and within clock tolerance
18
+ if (!isWithinClockTolerance(slotNumber, currentSlot, this.epochCache)) {
19
+ this.logger.warn(`Checkpoint attestation slot ${slotNumber} is not current (${currentSlot}) or next (${nextSlot}) slot`);
20
+ return {
21
+ result: 'reject',
22
+ severity: PeerErrorSeverity.HighToleranceError
23
+ };
24
+ }
25
+ this.logger.debug(`Ignoring checkpoint attestation for previous slot ${slotNumber} within clock tolerance`);
26
+ return {
27
+ result: 'ignore'
28
+ };
18
29
  }
19
30
  // Verify the signature is valid
20
31
  const attester = message.getSender();
21
32
  if (attester === undefined) {
22
- this.logger.warn(`Invalid signature in attestation for slot ${slotNumber}`);
23
- return PeerErrorSeverity.LowToleranceError;
33
+ this.logger.warn(`Invalid signature in checkpoint attestation for slot ${slotNumber}`);
34
+ return {
35
+ result: 'reject',
36
+ severity: PeerErrorSeverity.LowToleranceError
37
+ };
24
38
  }
25
39
  // Verify the attester is in the committee for this slot
26
40
  if (!await this.epochCache.isInCommittee(slotNumber, attester)) {
27
41
  this.logger.warn(`Attester ${attester.toString()} is not in committee for slot ${slotNumber}`);
28
- return PeerErrorSeverity.HighToleranceError;
42
+ return {
43
+ result: 'reject',
44
+ severity: PeerErrorSeverity.HighToleranceError
45
+ };
29
46
  }
30
- // Verify the proposer signature matches the expected proposer for this slot
47
+ // Verify the proposer signature matches the expected proposer for the attestation's slot
48
+ // We look up the proposer for the specific slot rather than using currentSlot/nextSlot
49
+ // since timing differences could cause mismatches
31
50
  const proposer = message.getProposer();
32
- const expectedProposer = slotNumber === currentSlot ? currentProposer : nextProposer;
51
+ const expectedProposer = await this.epochCache.getProposerAttesterAddressInSlot(slotNumber);
33
52
  if (!expectedProposer) {
34
53
  this.logger.warn(`No proposer defined for slot ${slotNumber}`);
35
- return PeerErrorSeverity.HighToleranceError;
54
+ return {
55
+ result: 'reject',
56
+ severity: PeerErrorSeverity.HighToleranceError
57
+ };
36
58
  }
37
59
  if (!proposer) {
38
- this.logger.warn(`Invalid proposer signature in attestation for slot ${slotNumber}`);
39
- return PeerErrorSeverity.LowToleranceError;
60
+ this.logger.warn(`Invalid proposer signature in checkpoint attestation for slot ${slotNumber}`);
61
+ return {
62
+ result: 'reject',
63
+ severity: PeerErrorSeverity.LowToleranceError
64
+ };
40
65
  }
41
66
  if (!proposer.equals(expectedProposer)) {
42
- this.logger.warn(`Proposer signature mismatch in attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
43
- return PeerErrorSeverity.HighToleranceError;
67
+ this.logger.warn(`Proposer signature mismatch in checkpoint attestation. ` + `Expected ${expectedProposer?.toString() ?? 'none'} but got ${proposer.toString()} for slot ${slotNumber}`);
68
+ return {
69
+ result: 'reject',
70
+ severity: PeerErrorSeverity.HighToleranceError
71
+ };
44
72
  }
45
- return undefined;
73
+ return {
74
+ result: 'accept'
75
+ };
46
76
  } catch (e) {
47
77
  // People shouldn't be sending us attestations if the committee doesn't exist
48
78
  if (e instanceof NoCommitteeError) {
49
- this.logger.warn(`No committee exists for attestation for slot ${slotNumber}`);
50
- return PeerErrorSeverity.LowToleranceError;
79
+ this.logger.warn(`No committee exists for checkpoint attestation for slot ${slotNumber}`);
80
+ return {
81
+ result: 'reject',
82
+ severity: PeerErrorSeverity.LowToleranceError
83
+ };
51
84
  }
52
85
  throw e;
53
86
  }
@@ -1,8 +1,8 @@
1
1
  import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
- import { type BlockAttestation, PeerErrorSeverity } from '@aztec/stdlib/p2p';
2
+ import { type CheckpointAttestation, type ValidationResult } from '@aztec/stdlib/p2p';
3
3
  import { type TelemetryClient } from '@aztec/telemetry-client';
4
4
  import type { AttestationPool } from '../../mem_pools/attestation_pool/attestation_pool.js';
5
- import { AttestationValidator } from './attestation_validator.js';
5
+ import { CheckpointAttestationValidator } from './attestation_validator.js';
6
6
  /**
7
7
  * FishermanAttestationValidator extends the base AttestationValidator to add
8
8
  * additional validation for fisherman nodes: verifying that attestations sign
@@ -11,10 +11,10 @@ import { AttestationValidator } from './attestation_validator.js';
11
11
  * handled by LibP2PService based on the fishermanMode config to ensure a better
12
12
  * view of the network.
13
13
  */
14
- export declare class FishermanAttestationValidator extends AttestationValidator {
14
+ export declare class FishermanAttestationValidator extends CheckpointAttestationValidator {
15
15
  private attestationPool;
16
16
  private invalidAttestationCounter;
17
17
  constructor(epochCache: EpochCacheInterface, attestationPool: AttestationPool, telemetryClient: TelemetryClient);
18
- validate(message: BlockAttestation): Promise<PeerErrorSeverity | undefined>;
18
+ validate(message: CheckpointAttestation): Promise<ValidationResult>;
19
19
  }
20
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUM3RSxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFhLE1BQU0seUJBQXlCLENBQUM7QUFFL0YsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFbEU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLG9CQUFvQjtJQUtuRSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBVWpDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsaUJBQWlCLEdBQUcsU0FBUyxDQUFDLENBd0R6RjtDQUNGIn0=
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlzaGVybWFuX2F0dGVzdGF0aW9uX3ZhbGlkYXRvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21zZ192YWxpZGF0b3JzL2F0dGVzdGF0aW9uX3ZhbGlkYXRvci9maXNoZXJtYW5fYXR0ZXN0YXRpb25fdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDOUQsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXFCLEtBQUssZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6RyxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEYsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0RBQXNELENBQUM7QUFDNUYsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFFNUU7Ozs7Ozs7R0FPRztBQUNILHFCQUFhLDZCQUE4QixTQUFRLDhCQUE4QjtJQUs3RSxPQUFPLENBQUMsZUFBZTtJQUp6QixPQUFPLENBQUMseUJBQXlCLENBQUM7SUFFbEMsWUFDRSxVQUFVLEVBQUUsbUJBQW1CLEVBQ3ZCLGVBQWUsRUFBRSxlQUFlLEVBQ3hDLGVBQWUsRUFBRSxlQUFlLEVBT2pDO0lBRWMsUUFBUSxDQUFDLE9BQU8sRUFBRSxxQkFBcUIsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0F3RGpGO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EAAuB,KAAK,eAAe,EAAa,MAAM,yBAAyB,CAAC;AAE/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,oBAAoB;IAKnE,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,eAAe,EACxC,eAAe,EAAE,eAAe,EAUjC;IAEc,QAAQ,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwDzF;CACF"}
1
+ {"version":3,"file":"fisherman_attestation_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/attestation_validator/fisherman_attestation_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,qBAAqB,EAAqB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACzG,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAE5E;;;;;;;GAOG;AACH,qBAAa,6BAA8B,SAAQ,8BAA8B;IAK7E,OAAO,CAAC,eAAe;IAJzB,OAAO,CAAC,yBAAyB,CAAC;IAElC,YACE,UAAU,EAAE,mBAAmB,EACvB,eAAe,EAAE,eAAe,EACxC,eAAe,EAAE,eAAe,EAOjC;IAEc,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwDjF;CACF"}