@aztec/p2p 0.0.1-commit.e3c1de76 → 0.0.1-commit.e558bd1c

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 (188) hide show
  1. package/dest/client/factory.d.ts +3 -3
  2. package/dest/client/factory.d.ts.map +1 -1
  3. package/dest/client/factory.js +5 -3
  4. package/dest/client/interface.d.ts +9 -2
  5. package/dest/client/interface.d.ts.map +1 -1
  6. package/dest/client/p2p_client.d.ts +7 -4
  7. package/dest/client/p2p_client.d.ts.map +1 -1
  8. package/dest/client/p2p_client.js +22 -7
  9. package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +1 -1
  10. package/dest/config.d.ts +9 -3
  11. package/dest/config.d.ts.map +1 -1
  12. package/dest/config.js +3 -1
  13. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +94 -87
  14. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
  15. package/dest/mem_pools/attestation_pool/attestation_pool.js +411 -3
  16. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +2 -2
  17. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
  18. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +351 -85
  19. package/dest/mem_pools/attestation_pool/index.d.ts +2 -3
  20. package/dest/mem_pools/attestation_pool/index.d.ts.map +1 -1
  21. package/dest/mem_pools/attestation_pool/index.js +1 -2
  22. package/dest/mem_pools/index.d.ts +2 -2
  23. package/dest/mem_pools/index.d.ts.map +1 -1
  24. package/dest/mem_pools/index.js +1 -1
  25. package/dest/mem_pools/interface.d.ts +3 -3
  26. package/dest/mem_pools/interface.d.ts.map +1 -1
  27. package/dest/mem_pools/tx_pool_v2/archive/index.d.ts +2 -0
  28. package/dest/mem_pools/tx_pool_v2/archive/index.d.ts.map +1 -0
  29. package/dest/mem_pools/tx_pool_v2/archive/index.js +1 -0
  30. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.d.ts +43 -0
  31. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.d.ts.map +1 -0
  32. package/dest/mem_pools/tx_pool_v2/archive/tx_archive.js +103 -0
  33. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts +47 -0
  34. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.d.ts.map +1 -0
  35. package/dest/mem_pools/tx_pool_v2/eviction/eviction_manager.js +119 -0
  36. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +17 -0
  37. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -0
  38. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +90 -0
  39. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts +19 -0
  40. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.d.ts.map +1 -0
  41. package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.js +89 -0
  42. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts +10 -0
  43. package/dest/mem_pools/tx_pool_v2/eviction/index.d.ts.map +1 -0
  44. package/dest/mem_pools/tx_pool_v2/eviction/index.js +11 -0
  45. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts +131 -0
  46. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.d.ts.map +1 -0
  47. package/dest/mem_pools/tx_pool_v2/eviction/interfaces.js +17 -0
  48. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.d.ts +15 -0
  49. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.d.ts.map +1 -0
  50. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.js +63 -0
  51. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.d.ts +17 -0
  52. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.d.ts.map +1 -0
  53. package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +91 -0
  54. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts +16 -0
  55. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts.map +1 -0
  56. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.js +70 -0
  57. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts +20 -0
  58. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.d.ts.map +1 -0
  59. package/dest/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.js +63 -0
  60. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts +15 -0
  61. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.d.ts.map +1 -0
  62. package/dest/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.js +19 -0
  63. package/dest/mem_pools/tx_pool_v2/index.d.ts +5 -0
  64. package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -0
  65. package/dest/mem_pools/tx_pool_v2/index.js +4 -0
  66. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +197 -0
  67. package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -0
  68. package/dest/mem_pools/tx_pool_v2/interfaces.js +6 -0
  69. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +71 -0
  70. package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -0
  71. package/dest/mem_pools/tx_pool_v2/tx_metadata.js +95 -0
  72. package/dest/mem_pools/tx_pool_v2/tx_pool_bench_metrics.d.ts +26 -0
  73. package/dest/mem_pools/tx_pool_v2/tx_pool_bench_metrics.d.ts.map +1 -0
  74. package/dest/mem_pools/tx_pool_v2/tx_pool_bench_metrics.js +70 -0
  75. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +99 -0
  76. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -0
  77. package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +332 -0
  78. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +55 -0
  79. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -0
  80. package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +156 -0
  81. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +69 -0
  82. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -0
  83. package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +748 -0
  84. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +3 -3
  85. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  86. package/dest/services/dummy_service.d.ts +6 -2
  87. package/dest/services/dummy_service.d.ts.map +1 -1
  88. package/dest/services/dummy_service.js +3 -0
  89. package/dest/services/index.d.ts +2 -1
  90. package/dest/services/index.d.ts.map +1 -1
  91. package/dest/services/index.js +1 -0
  92. package/dest/services/libp2p/libp2p_service.d.ts +74 -33
  93. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  94. package/dest/services/libp2p/libp2p_service.js +299 -228
  95. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +4 -4
  96. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
  97. package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +8 -8
  98. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +6 -4
  99. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
  100. package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +16 -11
  101. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +15 -10
  102. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
  103. package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +12 -11
  104. package/dest/services/service.d.ts +18 -1
  105. package/dest/services/service.d.ts.map +1 -1
  106. package/dest/services/tx_collection/config.d.ts +3 -3
  107. package/dest/services/tx_collection/config.js +3 -3
  108. package/dest/services/tx_collection/fast_tx_collection.d.ts +4 -5
  109. package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
  110. package/dest/services/tx_collection/fast_tx_collection.js +10 -14
  111. package/dest/services/tx_collection/index.d.ts +1 -1
  112. package/dest/services/tx_collection/proposal_tx_collector.d.ts +12 -12
  113. package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +1 -1
  114. package/dest/services/tx_collection/proposal_tx_collector.js +4 -5
  115. package/dest/services/tx_file_store/config.d.ts +18 -0
  116. package/dest/services/tx_file_store/config.d.ts.map +1 -0
  117. package/dest/services/tx_file_store/config.js +26 -0
  118. package/dest/services/tx_file_store/index.d.ts +4 -0
  119. package/dest/services/tx_file_store/index.d.ts.map +1 -0
  120. package/dest/services/tx_file_store/index.js +3 -0
  121. package/dest/services/tx_file_store/instrumentation.d.ts +15 -0
  122. package/dest/services/tx_file_store/instrumentation.d.ts.map +1 -0
  123. package/dest/services/tx_file_store/instrumentation.js +29 -0
  124. package/dest/services/tx_file_store/tx_file_store.d.ts +47 -0
  125. package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -0
  126. package/dest/services/tx_file_store/tx_file_store.js +149 -0
  127. package/dest/test-helpers/testbench-utils.d.ts +10 -16
  128. package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
  129. package/dest/test-helpers/testbench-utils.js +32 -30
  130. package/dest/testbench/p2p_client_testbench_worker.js +1 -1
  131. package/package.json +14 -14
  132. package/src/client/factory.ts +7 -4
  133. package/src/client/interface.ts +13 -1
  134. package/src/client/p2p_client.ts +30 -8
  135. package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +1 -1
  136. package/src/config.ts +8 -1
  137. package/src/mem_pools/attestation_pool/attestation_pool.ts +444 -90
  138. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +436 -100
  139. package/src/mem_pools/attestation_pool/index.ts +9 -2
  140. package/src/mem_pools/index.ts +1 -1
  141. package/src/mem_pools/interface.ts +2 -2
  142. package/src/mem_pools/tx_pool_v2/README.md +209 -0
  143. package/src/mem_pools/tx_pool_v2/archive/index.ts +1 -0
  144. package/src/mem_pools/tx_pool_v2/archive/tx_archive.ts +120 -0
  145. package/src/mem_pools/tx_pool_v2/eviction/eviction_manager.ts +147 -0
  146. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +118 -0
  147. package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_pre_add_rule.ts +111 -0
  148. package/src/mem_pools/tx_pool_v2/eviction/index.ts +23 -0
  149. package/src/mem_pools/tx_pool_v2/eviction/interfaces.ts +164 -0
  150. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.ts +74 -0
  151. package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +101 -0
  152. package/src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts +86 -0
  153. package/src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts +72 -0
  154. package/src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts +31 -0
  155. package/src/mem_pools/tx_pool_v2/index.ts +11 -0
  156. package/src/mem_pools/tx_pool_v2/interfaces.ts +227 -0
  157. package/src/mem_pools/tx_pool_v2/tx_metadata.ts +161 -0
  158. package/src/mem_pools/tx_pool_v2/tx_pool_bench_metrics.ts +77 -0
  159. package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +417 -0
  160. package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +212 -0
  161. package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +882 -0
  162. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +2 -2
  163. package/src/services/dummy_service.ts +6 -0
  164. package/src/services/index.ts +1 -0
  165. package/src/services/libp2p/libp2p_service.ts +304 -230
  166. package/src/services/reqresp/batch-tx-requester/README.md +7 -7
  167. package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +11 -11
  168. package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +22 -13
  169. package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +21 -15
  170. package/src/services/service.ts +20 -0
  171. package/src/services/tx_collection/config.ts +6 -6
  172. package/src/services/tx_collection/fast_tx_collection.ts +14 -24
  173. package/src/services/tx_collection/index.ts +1 -1
  174. package/src/services/tx_collection/proposal_tx_collector.ts +12 -14
  175. package/src/services/tx_file_store/config.ts +43 -0
  176. package/src/services/tx_file_store/index.ts +3 -0
  177. package/src/services/tx_file_store/instrumentation.ts +36 -0
  178. package/src/services/tx_file_store/tx_file_store.ts +173 -0
  179. package/src/test-helpers/testbench-utils.ts +18 -39
  180. package/src/testbench/p2p_client_testbench_worker.ts +1 -1
  181. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +0 -40
  182. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +0 -1
  183. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +0 -218
  184. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +0 -31
  185. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +0 -1
  186. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +0 -180
  187. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +0 -320
  188. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +0 -264
@@ -0,0 +1,131 @@
1
+ import type { BlockNumber } from '@aztec/foundation/branded-types';
2
+ import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
3
+ import type { TxMetaData } from '../tx_metadata.js';
4
+ /**
5
+ * Events that trigger eviction checks.
6
+ */
7
+ export declare const EvictionEvent: {
8
+ readonly TXS_ADDED: "txs_added";
9
+ readonly BLOCK_MINED: "block_mined";
10
+ readonly CHAIN_PRUNED: "chain_pruned";
11
+ };
12
+ export type EvictionEventType = (typeof EvictionEvent)[keyof typeof EvictionEvent];
13
+ /**
14
+ * Context passed to eviction rules based on the triggering event.
15
+ */
16
+ export type EvictionContext = {
17
+ event: typeof EvictionEvent.TXS_ADDED;
18
+ newTxHashes: string[];
19
+ feePayers: string[];
20
+ } | {
21
+ event: typeof EvictionEvent.CHAIN_PRUNED;
22
+ blockNumber: BlockNumber;
23
+ } | {
24
+ event: typeof EvictionEvent.BLOCK_MINED;
25
+ block: BlockHeader;
26
+ newNullifiers: string[];
27
+ feePayers: string[];
28
+ };
29
+ /**
30
+ * Result of an eviction operation.
31
+ */
32
+ export interface EvictionResult {
33
+ readonly txsEvicted: string[];
34
+ readonly reason: string;
35
+ readonly success: boolean;
36
+ readonly error?: Error;
37
+ }
38
+ /**
39
+ * Read-only access to pool state for pre-add checks.
40
+ */
41
+ export interface PreAddPoolAccess {
42
+ /** Get metadata for a pending tx by its hash string */
43
+ getMetadata(txHashStr: string): TxMetaData | undefined;
44
+ /** Get the pending tx hash that uses a specific nullifier (as string) */
45
+ getTxHashByNullifier(nullifier: string): string | undefined;
46
+ /** Get on-chain balance for a fee payer address */
47
+ getFeePayerBalance(feePayer: string): Promise<bigint>;
48
+ /** Get metadata for all pending txs from a specific fee payer */
49
+ getFeePayerPendingTxs(feePayer: string): TxMetaData[];
50
+ /** Get current count of pending transactions */
51
+ getPendingTxCount(): number;
52
+ /** Get the lowest priority pending tx metadata */
53
+ getLowestPriorityPendingTx(): TxMetaData | undefined;
54
+ }
55
+ /**
56
+ * Result of a pre-add check for a single transaction.
57
+ */
58
+ export interface PreAddResult {
59
+ /** Whether the incoming tx should be ignored (valid but not desired) */
60
+ readonly shouldIgnore: boolean;
61
+ /** Tx hashes (as strings) that should be evicted if this tx is added */
62
+ readonly txHashesToEvict: string[];
63
+ /** Optional reason for ignoring */
64
+ readonly reason?: string;
65
+ }
66
+ /**
67
+ * Pre-add rule interface. Rules check incoming txs before they're added to the pool.
68
+ * All methods work with TxMetaData for efficiency.
69
+ */
70
+ export interface PreAddRule {
71
+ readonly name: string;
72
+ /**
73
+ * Check if incoming tx should be added and which existing txs to evict.
74
+ * @param incomingMeta - Metadata for the incoming transaction
75
+ * @param poolAccess - Read-only access to current pool state
76
+ * @returns Result indicating whether to ignore and what to evict
77
+ */
78
+ check(incomingMeta: TxMetaData, poolAccess: PreAddPoolAccess): Promise<PreAddResult>;
79
+ /**
80
+ * Updates the configuration for this rule.
81
+ */
82
+ updateConfig?(config: EvictionConfig): void;
83
+ }
84
+ /**
85
+ * Operations that post-event eviction rules can perform on the pool.
86
+ * All methods work with metadata and strings for efficiency.
87
+ */
88
+ export interface PoolOperations {
89
+ /** Get all pending tx metadata */
90
+ getPendingTxs(): TxMetaData[];
91
+ /** Get unique fee payers from pending transactions */
92
+ getPendingFeePayers(): string[];
93
+ /** Get metadata for all pending txs from a specific fee payer */
94
+ getFeePayerPendingTxs(feePayer: string): TxMetaData[];
95
+ /** Get current count of pending transactions */
96
+ getPendingTxCount(): number;
97
+ /** Get the N lowest priority pending tx hashes */
98
+ getLowestPriorityPending(limit: number): string[];
99
+ /** Delete transactions by hash */
100
+ deleteTxs(txHashes: string[]): Promise<void>;
101
+ }
102
+ /**
103
+ * Post-event eviction rule interface. Rules run after events to clean up the pool.
104
+ */
105
+ export interface EvictionRule {
106
+ readonly name: string;
107
+ /**
108
+ * Performs the eviction logic after an event.
109
+ */
110
+ evict(context: EvictionContext, pool: PoolOperations): Promise<EvictionResult>;
111
+ /**
112
+ * Updates the configuration for this rule.
113
+ */
114
+ updateConfig?(config: EvictionConfig): void;
115
+ }
116
+ /**
117
+ * Configuration options for eviction rules.
118
+ */
119
+ export interface EvictionConfig {
120
+ /** Maximum number of pending transactions (0 = unlimited) */
121
+ maxPendingTxCount?: number;
122
+ }
123
+ /**
124
+ * Converts a TxHash to its string representation for use in eviction results.
125
+ */
126
+ export declare function txHashToString(txHash: TxHash): string;
127
+ /**
128
+ * Converts an array of TxHash to string array.
129
+ */
130
+ export declare function txHashesToStrings(txHashes: TxHash[]): string[];
131
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2V2aWN0aW9uL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTVELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRXBEOztHQUVHO0FBQ0gsZUFBTyxNQUFNLGFBQWE7Ozs7Q0FJaEIsQ0FBQztBQUVYLE1BQU0sTUFBTSxpQkFBaUIsR0FBRyxDQUFDLE9BQU8sYUFBYSxDQUFDLENBQUMsTUFBTSxPQUFPLGFBQWEsQ0FBQyxDQUFDO0FBRW5GOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FDdkI7SUFDRSxLQUFLLEVBQUUsT0FBTyxhQUFhLENBQUMsU0FBUyxDQUFDO0lBQ3RDLFdBQVcsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUN0QixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7Q0FDckIsR0FDRDtJQUNFLEtBQUssRUFBRSxPQUFPLGFBQWEsQ0FBQyxZQUFZLENBQUM7SUFDekMsV0FBVyxFQUFFLFdBQVcsQ0FBQztDQUMxQixHQUNEO0lBQ0UsS0FBSyxFQUFFLE9BQU8sYUFBYSxDQUFDLFdBQVcsQ0FBQztJQUN4QyxLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLGFBQWEsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7Q0FDckIsQ0FBQztBQUVOOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGNBQWM7SUFDN0IsUUFBUSxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUM5QixRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FB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
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/interfaces.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ /**
2
+ * Events that trigger eviction checks.
3
+ */ export const EvictionEvent = {
4
+ TXS_ADDED: 'txs_added',
5
+ BLOCK_MINED: 'block_mined',
6
+ CHAIN_PRUNED: 'chain_pruned'
7
+ };
8
+ /**
9
+ * Converts a TxHash to its string representation for use in eviction results.
10
+ */ export function txHashToString(txHash) {
11
+ return txHash.toString();
12
+ }
13
+ /**
14
+ * Converts an array of TxHash to string array.
15
+ */ export function txHashesToStrings(txHashes) {
16
+ return txHashes.map((h)=>h.toString());
17
+ }
@@ -0,0 +1,15 @@
1
+ import type { EvictionContext, EvictionResult, EvictionRule, PoolOperations } from './interfaces.js';
2
+ /**
3
+ * Eviction rule that removes invalid transactions after a block is mined.
4
+ * Only triggers on BLOCK_MINED events.
5
+ *
6
+ * Eviction criteria includes:
7
+ * - Transactions with nullifiers that are already included in the mined block
8
+ * - Transactions with an expiration timestamp less than or equal to the mined block timestamp
9
+ */
10
+ export declare class InvalidTxsAfterMiningRule implements EvictionRule {
11
+ readonly name = "InvalidTxsAfterMining";
12
+ private log;
13
+ evict(context: EvictionContext, pool: PoolOperations): Promise<EvictionResult>;
14
+ }
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW52YWxpZF90eHNfYWZ0ZXJfbWluaW5nX3J1bGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi9ldmljdGlvbi9pbnZhbGlkX3R4c19hZnRlcl9taW5pbmdfcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUdyRzs7Ozs7OztHQU9HO0FBQ0gscUJBQWEseUJBQTBCLFlBQVcsWUFBWTtJQUM1RCxTQUFnQixJQUFJLDJCQUEyQjtJQUUvQyxPQUFPLENBQUMsR0FBRyxDQUFnRTtJQUVyRSxLQUFLLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0FzRG5GO0NBQ0YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"invalid_txs_after_mining_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGrG;;;;;;;GAOG;AACH,qBAAa,yBAA0B,YAAW,YAAY;IAC5D,SAAgB,IAAI,2BAA2B;IAE/C,OAAO,CAAC,GAAG,CAAgE;IAErE,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAsDnF;CACF"}
@@ -0,0 +1,63 @@
1
+ import { createLogger } from '@aztec/foundation/log';
2
+ import { EvictionEvent } from './interfaces.js';
3
+ /**
4
+ * Eviction rule that removes invalid transactions after a block is mined.
5
+ * Only triggers on BLOCK_MINED events.
6
+ *
7
+ * Eviction criteria includes:
8
+ * - Transactions with nullifiers that are already included in the mined block
9
+ * - Transactions with an expiration timestamp less than or equal to the mined block timestamp
10
+ */ export class InvalidTxsAfterMiningRule {
11
+ name = 'InvalidTxsAfterMining';
12
+ log = createLogger('p2p:tx_pool_v2:invalid_txs_after_mining_rule');
13
+ async evict(context, pool) {
14
+ if (context.event !== EvictionEvent.BLOCK_MINED) {
15
+ return {
16
+ reason: 'block_mined_invalid_txs',
17
+ success: true,
18
+ txsEvicted: []
19
+ };
20
+ }
21
+ try {
22
+ const { timestamp } = context.block.globalVariables;
23
+ const minedNullifiers = new Set(context.newNullifiers);
24
+ const txsToEvict = [];
25
+ const pendingTxs = pool.getPendingTxs();
26
+ for (const meta of pendingTxs){
27
+ // Evict pending txs that share nullifiers with mined txs
28
+ if (meta.nullifiers.some((nullifier)=>minedNullifiers.has(nullifier))) {
29
+ this.log.verbose(`Evicting tx ${meta.txHash} from pool due to a duplicate nullifier with a mined tx`);
30
+ txsToEvict.push(meta.txHash);
31
+ continue;
32
+ }
33
+ // Evict pending txs with an expiration timestamp less than or equal to the mined block timestamp
34
+ if (meta.includeByTimestamp <= timestamp) {
35
+ this.log.verbose(`Evicting tx ${meta.txHash} from pool due to the tx being expired (includeByTimestamp: ${meta.includeByTimestamp}, mined block timestamp: ${timestamp})`);
36
+ txsToEvict.push(meta.txHash);
37
+ continue;
38
+ }
39
+ }
40
+ if (txsToEvict.length > 0) {
41
+ await pool.deleteTxs(txsToEvict);
42
+ }
43
+ this.log.debug(`Evicted ${txsToEvict.length} invalid txs after block mined`);
44
+ return {
45
+ reason: 'block_mined_invalid_txs',
46
+ success: true,
47
+ txsEvicted: txsToEvict
48
+ };
49
+ } catch (err) {
50
+ this.log.error('Failed to evict invalid transactions after mining', {
51
+ err
52
+ });
53
+ return {
54
+ reason: 'block_mined_invalid_txs',
55
+ success: false,
56
+ txsEvicted: [],
57
+ error: new Error('Failed to evict invalid txs after mining', {
58
+ cause: err
59
+ })
60
+ };
61
+ }
62
+ }
63
+ }
@@ -0,0 +1,17 @@
1
+ import type { WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
2
+ import type { EvictionContext, EvictionResult, EvictionRule, PoolOperations } from './interfaces.js';
3
+ /**
4
+ * Eviction rule that removes invalid transactions after a blockchain reorganization.
5
+ * Only triggers on CHAIN_PRUNED events.
6
+ *
7
+ * Eviction criteria includes:
8
+ * - Transactions that reference pruned block hashes (invalid by definition)
9
+ */
10
+ export declare class InvalidTxsAfterReorgRule implements EvictionRule {
11
+ private worldState;
12
+ readonly name = "InvalidTxsAfterReorg";
13
+ private log;
14
+ constructor(worldState: WorldStateSynchronizer);
15
+ evict(context: EvictionContext, pool: PoolOperations): Promise<EvictionResult>;
16
+ }
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW52YWxpZF90eHNfYWZ0ZXJfcmVvcmdfcnVsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2V2aWN0aW9uL2ludmFsaWRfdHhzX2FmdGVyX3Jlb3JnX3J1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUc5RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUdyRzs7Ozs7O0dBTUc7QUFDSCxxQkFBYSx3QkFBeUIsWUFBVyxZQUFZO0lBSy9DLE9BQU8sQ0FBQyxVQUFVO0lBSjlCLFNBQWdCLElBQUksMEJBQTBCO0lBRTlDLE9BQU8sQ0FBQyxHQUFHLENBQStEO0lBRTFFLFlBQW9CLFVBQVUsRUFBRSxzQkFBc0IsRUFBSTtJQUVwRCxLQUFLLENBQUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUsY0FBYyxHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0E2RW5GO0NBQ0YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"invalid_txs_after_reorg_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAG9E,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGrG;;;;;;GAMG;AACH,qBAAa,wBAAyB,YAAW,YAAY;IAK/C,OAAO,CAAC,UAAU;IAJ9B,SAAgB,IAAI,0BAA0B;IAE9C,OAAO,CAAC,GAAG,CAA+D;IAE1E,YAAoB,UAAU,EAAE,sBAAsB,EAAI;IAEpD,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CA6EnF;CACF"}
@@ -0,0 +1,91 @@
1
+ import { Fr } from '@aztec/foundation/curves/bn254';
2
+ import { createLogger } from '@aztec/foundation/log';
3
+ import { MerkleTreeId } from '@aztec/stdlib/trees';
4
+ import { EvictionEvent } from './interfaces.js';
5
+ /**
6
+ * Eviction rule that removes invalid transactions after a blockchain reorganization.
7
+ * Only triggers on CHAIN_PRUNED events.
8
+ *
9
+ * Eviction criteria includes:
10
+ * - Transactions that reference pruned block hashes (invalid by definition)
11
+ */ export class InvalidTxsAfterReorgRule {
12
+ worldState;
13
+ name;
14
+ log;
15
+ constructor(worldState){
16
+ this.worldState = worldState;
17
+ this.name = 'InvalidTxsAfterReorg';
18
+ this.log = createLogger('p2p:tx_pool_v2:invalid_txs_after_reorg_rule');
19
+ }
20
+ async evict(context, pool) {
21
+ if (context.event !== EvictionEvent.CHAIN_PRUNED) {
22
+ return {
23
+ reason: 'reorg_invalid_txs',
24
+ success: true,
25
+ txsEvicted: []
26
+ };
27
+ }
28
+ try {
29
+ const pendingTxs = pool.getPendingTxs();
30
+ // Deduplicate block hashes to reduce redundant DB lookups
31
+ const uniqueBlockHashes = new Map();
32
+ const txsByBlockHash = new Map();
33
+ for (const meta of pendingTxs){
34
+ const blockHashStr = meta.anchorBlockHeaderHash;
35
+ if (!txsByBlockHash.has(blockHashStr)) {
36
+ txsByBlockHash.set(blockHashStr, []);
37
+ uniqueBlockHashes.set(blockHashStr, Fr.fromHexString(blockHashStr));
38
+ }
39
+ txsByBlockHash.get(blockHashStr).push(meta.txHash);
40
+ }
41
+ // Ensure world state is synced to this block before accessing the snapshot
42
+ await this.worldState.syncImmediate(context.blockNumber);
43
+ const db = this.worldState.getSnapshot(context.blockNumber);
44
+ // Check which blocks exist in the archive
45
+ const blockHashArray = Array.from(uniqueBlockHashes.values());
46
+ const blocksFromDb = await db.findLeafIndices(MerkleTreeId.ARCHIVE, blockHashArray);
47
+ // Build set of pruned block hashes
48
+ const prunedBlockHashes = new Set();
49
+ let i = 0;
50
+ for (const [blockHashStr] of uniqueBlockHashes){
51
+ if (blocksFromDb[i] === undefined) {
52
+ prunedBlockHashes.add(blockHashStr);
53
+ }
54
+ i++;
55
+ }
56
+ // Identify txs whose anchor block was pruned
57
+ const txsToEvict = [];
58
+ for (const [blockHashStr, txHashes] of txsByBlockHash){
59
+ if (prunedBlockHashes.has(blockHashStr)) {
60
+ txsToEvict.push(...txHashes);
61
+ }
62
+ }
63
+ if (txsToEvict.length > 0) {
64
+ this.log.verbose(`Evicting ${txsToEvict.length} txs from pool due to referencing pruned blocks`);
65
+ await pool.deleteTxs(txsToEvict);
66
+ }
67
+ const keptCount = pendingTxs.length - txsToEvict.length;
68
+ if (keptCount > 0) {
69
+ this.log.verbose(`Kept ${keptCount} txs that did not reference pruned blocks`);
70
+ }
71
+ this.log.debug(`Evicted ${txsToEvict.length} invalid txs after reorg`);
72
+ return {
73
+ reason: 'reorg_invalid_txs',
74
+ success: true,
75
+ txsEvicted: txsToEvict
76
+ };
77
+ } catch (err) {
78
+ this.log.error('Failed to evict invalid transactions after reorg', {
79
+ err
80
+ });
81
+ return {
82
+ reason: 'reorg_invalid_txs',
83
+ success: false,
84
+ txsEvicted: [],
85
+ error: new Error('Failed to evict invalid txs after reorg', {
86
+ cause: err
87
+ })
88
+ };
89
+ }
90
+ }
91
+ }
@@ -0,0 +1,16 @@
1
+ import type { EvictionConfig, EvictionContext, EvictionResult, EvictionRule, PoolOperations } from './interfaces.js';
2
+ /**
3
+ * Eviction rule that removes low-priority transactions when the pool exceeds configured limits.
4
+ * Only triggers on TXS_ADDED events.
5
+ */
6
+ export declare class LowPriorityEvictionRule implements EvictionRule {
7
+ readonly name = "LowPriorityEviction";
8
+ private log;
9
+ private maxPoolSize;
10
+ constructor(config: {
11
+ maxPoolSize: number;
12
+ });
13
+ evict(context: EvictionContext, pool: PoolOperations): Promise<EvictionResult>;
14
+ updateConfig(config: EvictionConfig): void;
15
+ }
16
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG93X3ByaW9yaXR5X2V2aWN0aW9uX3J1bGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi9ldmljdGlvbi9sb3dfcHJpb3JpdHlfZXZpY3Rpb25fcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxZQUFZLEVBQUUsY0FBYyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHckg7OztHQUdHO0FBQ0gscUJBQWEsdUJBQXdCLFlBQVcsWUFBWTtJQUMxRCxTQUFnQixJQUFJLHlCQUF5QjtJQUU3QyxPQUFPLENBQUMsR0FBRyxDQUE2RDtJQUN4RSxPQUFPLENBQUMsV0FBVyxDQUFTO0lBRTVCLFlBQVksTUFBTSxFQUFFO1FBQUUsV0FBVyxFQUFFLE1BQU0sQ0FBQTtLQUFFLEVBRTFDO0lBRUssS0FBSyxDQUFDLE9BQU8sRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLGNBQWMsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBMkRuRjtJQUVELFlBQVksQ0FBQyxNQUFNLEVBQUUsY0FBYyxHQUFHLElBQUksQ0FJekM7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"low_priority_eviction_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGrH;;;GAGG;AACH,qBAAa,uBAAwB,YAAW,YAAY;IAC1D,SAAgB,IAAI,yBAAyB;IAE7C,OAAO,CAAC,GAAG,CAA6D;IACxE,OAAO,CAAC,WAAW,CAAS;IAE5B,YAAY,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAE1C;IAEK,KAAK,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CA2DnF;IAED,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIzC;CACF"}
@@ -0,0 +1,70 @@
1
+ import { createLogger } from '@aztec/foundation/log';
2
+ import { EvictionEvent } from './interfaces.js';
3
+ /**
4
+ * Eviction rule that removes low-priority transactions when the pool exceeds configured limits.
5
+ * Only triggers on TXS_ADDED events.
6
+ */ export class LowPriorityEvictionRule {
7
+ name = 'LowPriorityEviction';
8
+ log = createLogger('p2p:tx_pool_v2:low_priority_eviction_rule');
9
+ maxPoolSize;
10
+ constructor(config){
11
+ this.maxPoolSize = config.maxPoolSize;
12
+ }
13
+ async evict(context, pool) {
14
+ if (context.event !== EvictionEvent.TXS_ADDED) {
15
+ return {
16
+ reason: 'low_priority',
17
+ success: true,
18
+ txsEvicted: []
19
+ };
20
+ }
21
+ if (this.maxPoolSize === 0) {
22
+ return {
23
+ reason: 'low_priority',
24
+ success: true,
25
+ txsEvicted: []
26
+ };
27
+ }
28
+ try {
29
+ const currentTxCount = pool.getPendingTxCount();
30
+ if (currentTxCount <= this.maxPoolSize) {
31
+ this.log.trace(`Not evicting low priority txs. Pending tx count below limit ${currentTxCount} <= ${this.maxPoolSize}`);
32
+ return {
33
+ reason: 'low_priority',
34
+ success: true,
35
+ txsEvicted: []
36
+ };
37
+ }
38
+ this.log.verbose(`Evicting low priority txs. Pending tx count above limit: ${currentTxCount} > ${this.maxPoolSize}`);
39
+ const numberToEvict = currentTxCount - this.maxPoolSize;
40
+ const txsToEvict = pool.getLowestPriorityPending(numberToEvict);
41
+ if (txsToEvict.length > 0) {
42
+ await pool.deleteTxs(txsToEvict);
43
+ }
44
+ const numNewTxsEvicted = context.newTxHashes.filter((newTxHash)=>txsToEvict.includes(newTxHash)).length;
45
+ this.log.verbose(`Evicted ${txsToEvict.length} low priority txs, including ${numNewTxsEvicted} newly added txs`);
46
+ return {
47
+ reason: 'low_priority',
48
+ success: true,
49
+ txsEvicted: txsToEvict
50
+ };
51
+ } catch (err) {
52
+ this.log.error('Failed to evict low priority transactions', {
53
+ err
54
+ });
55
+ return {
56
+ reason: 'low_priority',
57
+ success: false,
58
+ txsEvicted: [],
59
+ error: new Error('Failed to evict low priority txs', {
60
+ cause: err
61
+ })
62
+ };
63
+ }
64
+ }
65
+ updateConfig(config) {
66
+ if (config.maxPendingTxCount !== undefined) {
67
+ this.maxPoolSize = config.maxPendingTxCount;
68
+ }
69
+ }
70
+ }
@@ -0,0 +1,20 @@
1
+ import type { TxMetaData } from '../tx_metadata.js';
2
+ import type { EvictionConfig, PreAddPoolAccess, PreAddResult, PreAddRule } from './interfaces.js';
3
+ /**
4
+ * Pre-add rule that checks if the pool is at capacity and handles low-priority eviction.
5
+ *
6
+ * When the pool is at capacity:
7
+ * - If incoming tx has higher priority than the lowest priority tx, evict the lowest and accept incoming
8
+ * - If incoming tx has equal or lower priority than the lowest, ignore incoming (it would be evicted anyway)
9
+ */
10
+ export declare class LowPriorityPreAddRule implements PreAddRule {
11
+ readonly name = "LowPriorityPreAdd";
12
+ private log;
13
+ private maxPoolSize;
14
+ constructor(config: {
15
+ maxPoolSize: number;
16
+ });
17
+ check(incomingMeta: TxMetaData, poolAccess: PreAddPoolAccess): Promise<PreAddResult>;
18
+ updateConfig(config: EvictionConfig): void;
19
+ }
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG93X3ByaW9yaXR5X3ByZV9hZGRfcnVsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL21lbV9wb29scy90eF9wb29sX3YyL2V2aWN0aW9uL2xvd19wcmlvcml0eV9wcmVfYWRkX3J1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUVsRzs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxxQkFBc0IsWUFBVyxVQUFVO0lBQ3RELFNBQWdCLElBQUksdUJBQXVCO0lBRTNDLE9BQU8sQ0FBQyxHQUFHLENBQTREO0lBQ3ZFLE9BQU8sQ0FBQyxXQUFXLENBQVM7SUFFNUIsWUFBWSxNQUFNLEVBQUU7UUFBRSxXQUFXLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFFMUM7SUFFRCxLQUFLLENBQUMsWUFBWSxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQTBDbkY7SUFFRCxZQUFZLENBQUMsTUFBTSxFQUFFLGNBQWMsR0FBRyxJQUFJLENBSXpDO0NBQ0YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"low_priority_pre_add_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/low_priority_pre_add_rule.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElG;;;;;;GAMG;AACH,qBAAa,qBAAsB,YAAW,UAAU;IACtD,SAAgB,IAAI,uBAAuB;IAE3C,OAAO,CAAC,GAAG,CAA4D;IACvE,OAAO,CAAC,WAAW,CAAS;IAE5B,YAAY,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,EAE1C;IAED,KAAK,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CA0CnF;IAED,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIzC;CACF"}
@@ -0,0 +1,63 @@
1
+ import { createLogger } from '@aztec/foundation/log';
2
+ /**
3
+ * Pre-add rule that checks if the pool is at capacity and handles low-priority eviction.
4
+ *
5
+ * When the pool is at capacity:
6
+ * - If incoming tx has higher priority than the lowest priority tx, evict the lowest and accept incoming
7
+ * - If incoming tx has equal or lower priority than the lowest, ignore incoming (it would be evicted anyway)
8
+ */ export class LowPriorityPreAddRule {
9
+ name = 'LowPriorityPreAdd';
10
+ log = createLogger('p2p:tx_pool_v2:low_priority_pre_add_rule');
11
+ maxPoolSize;
12
+ constructor(config){
13
+ this.maxPoolSize = config.maxPoolSize;
14
+ }
15
+ check(incomingMeta, poolAccess) {
16
+ // Skip if max pool size is disabled (0 = unlimited)
17
+ if (this.maxPoolSize === 0) {
18
+ return Promise.resolve({
19
+ shouldIgnore: false,
20
+ txHashesToEvict: []
21
+ });
22
+ }
23
+ const currentCount = poolAccess.getPendingTxCount();
24
+ // If pool is not at capacity, accept the tx
25
+ if (currentCount < this.maxPoolSize) {
26
+ return Promise.resolve({
27
+ shouldIgnore: false,
28
+ txHashesToEvict: []
29
+ });
30
+ }
31
+ // Pool is at capacity - need to compare priorities
32
+ const lowestPriorityMeta = poolAccess.getLowestPriorityPendingTx();
33
+ if (!lowestPriorityMeta) {
34
+ // No pending txs (shouldn't happen if count > 0, but handle gracefully)
35
+ return Promise.resolve({
36
+ shouldIgnore: false,
37
+ txHashesToEvict: []
38
+ });
39
+ }
40
+ // If incoming tx has strictly higher priority, evict the lowest priority tx
41
+ if (incomingMeta.priorityFee > lowestPriorityMeta.priorityFee) {
42
+ this.log.debug(`Pool at capacity (${currentCount}/${this.maxPoolSize}), evicting ${lowestPriorityMeta.txHash} ` + `(priority ${lowestPriorityMeta.priorityFee}) for ${incomingMeta.txHash} (priority ${incomingMeta.priorityFee})`);
43
+ return Promise.resolve({
44
+ shouldIgnore: false,
45
+ txHashesToEvict: [
46
+ lowestPriorityMeta.txHash
47
+ ]
48
+ });
49
+ }
50
+ // Incoming tx has equal or lower priority - ignore it (it would be evicted anyway)
51
+ this.log.debug(`Pool at capacity (${currentCount}/${this.maxPoolSize}), ignoring ${incomingMeta.txHash} ` + `(priority ${incomingMeta.priorityFee}) - lower than existing minimum (priority ${lowestPriorityMeta.priorityFee})`);
52
+ return Promise.resolve({
53
+ shouldIgnore: true,
54
+ txHashesToEvict: [],
55
+ reason: `pool at capacity and tx has lower priority than existing transactions`
56
+ });
57
+ }
58
+ updateConfig(config) {
59
+ if (config.maxPendingTxCount !== undefined) {
60
+ this.maxPoolSize = config.maxPendingTxCount;
61
+ }
62
+ }
63
+ }
@@ -0,0 +1,15 @@
1
+ import { type TxMetaData } from '../tx_metadata.js';
2
+ import type { PreAddPoolAccess, PreAddResult, PreAddRule } from './interfaces.js';
3
+ /**
4
+ * Pre-add 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, evict all conflicting txs
8
+ * - If any conflicting tx has equal or higher priority, ignore the incoming tx
9
+ */
10
+ export declare class NullifierConflictRule implements PreAddRule {
11
+ readonly name = "NullifierConflict";
12
+ private log;
13
+ check(incomingMeta: TxMetaData, poolAccess: PreAddPoolAccess): Promise<PreAddResult>;
14
+ }
15
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnVsbGlmaWVyX2NvbmZsaWN0X3J1bGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi9ldmljdGlvbi9udWxsaWZpZXJfY29uZmxpY3RfcnVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQTBCLE1BQU0sbUJBQW1CLENBQUM7QUFDNUUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRWxGOzs7Ozs7R0FNRztBQUNILHFCQUFhLHFCQUFzQixZQUFXLFVBQVU7SUFDdEQsU0FBZ0IsSUFBSSx1QkFBdUI7SUFFM0MsT0FBTyxDQUFDLEdBQUcsQ0FBMEQ7SUFFckUsS0FBSyxDQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FZbkY7Q0FDRiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"nullifier_conflict_rule.d.ts","sourceRoot":"","sources":["../../../../src/mem_pools/tx_pool_v2/eviction/nullifier_conflict_rule.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAA0B,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElF;;;;;;GAMG;AACH,qBAAa,qBAAsB,YAAW,UAAU;IACtD,SAAgB,IAAI,uBAAuB;IAE3C,OAAO,CAAC,GAAG,CAA0D;IAErE,KAAK,CAAC,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,CAAC,CAYnF;CACF"}
@@ -0,0 +1,19 @@
1
+ import { createLogger } from '@aztec/foundation/log';
2
+ import { checkNullifierConflict } from '../tx_metadata.js';
3
+ /**
4
+ * Pre-add 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, evict all conflicting txs
8
+ * - If any conflicting tx has equal or higher priority, ignore the incoming tx
9
+ */ export class NullifierConflictRule {
10
+ name = 'NullifierConflict';
11
+ log = createLogger('p2p:tx_pool_v2:nullifier_conflict_rule');
12
+ check(incomingMeta, poolAccess) {
13
+ const result = checkNullifierConflict(incomingMeta, (nullifier)=>poolAccess.getTxHashByNullifier(nullifier), (txHash)=>poolAccess.getMetadata(txHash));
14
+ if (result.shouldIgnore) {
15
+ this.log.debug(`Ignoring tx ${incomingMeta.txHash}: ${result.reason}`);
16
+ }
17
+ return Promise.resolve(result);
18
+ }
19
+ }
@@ -0,0 +1,5 @@
1
+ export { AztecKVTxPoolV2 } from './tx_pool_v2.js';
2
+ export { type TxPoolV2, type TxPoolV2Config, type TxPoolV2Events, type AddTxsResult, type PoolReadAccess, DEFAULT_TX_POOL_V2_CONFIG, } from './interfaces.js';
3
+ export { type TxMetaData, type TxState, buildTxMetaData, comparePriority } from './tx_metadata.js';
4
+ export { TxArchive } from './archive/index.js';
5
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tZW1fcG9vbHMvdHhfcG9vbF92Mi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDbEQsT0FBTyxFQUNMLEtBQUssUUFBUSxFQUNiLEtBQUssY0FBYyxFQUNuQixLQUFLLGNBQWMsRUFDbkIsS0FBSyxZQUFZLEVBQ2pCLEtBQUssY0FBYyxFQUNuQix5QkFBeUIsR0FDMUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsS0FBSyxVQUFVLEVBQUUsS0FBSyxPQUFPLEVBQUUsZUFBZSxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ25HLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQyJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool_v2/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC"}
@@ -0,0 +1,4 @@
1
+ export { AztecKVTxPoolV2 } from './tx_pool_v2.js';
2
+ export { DEFAULT_TX_POOL_V2_CONFIG } from './interfaces.js';
3
+ export { buildTxMetaData, comparePriority } from './tx_metadata.js';
4
+ export { TxArchive } from './archive/index.js';