@aztec/p2p 0.0.1-commit.03f7ef2 → 0.0.1-commit.1142ef1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (191) hide show
  1. package/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 +450 -119
  7. package/dest/config.d.ts +4 -7
  8. package/dest/config.d.ts.map +1 -1
  9. package/dest/config.js +6 -9
  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 +225 -262
  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 +7 -6
  22. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
  23. package/dest/mem_pools/attestation_pool/mocks.js +9 -8
  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 +28 -24
  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 +260 -325
  30. package/dest/mem_pools/tx_pool/eviction/eviction_manager.d.ts +18 -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 +56 -0
  33. package/dest/mem_pools/tx_pool/eviction/eviction_strategy.d.ts +83 -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 +5 -0
  36. package/dest/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.d.ts +15 -0
  37. package/dest/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.d.ts.map +1 -0
  38. package/dest/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.js +88 -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 +76 -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/index.d.ts +1 -2
  49. package/dest/mem_pools/tx_pool/index.d.ts.map +1 -1
  50. package/dest/mem_pools/tx_pool/index.js +0 -1
  51. package/dest/mem_pools/tx_pool/priority.d.ts +5 -1
  52. package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -1
  53. package/dest/mem_pools/tx_pool/priority.js +6 -1
  54. package/dest/mem_pools/tx_pool/tx_pool.d.ts +8 -4
  55. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
  56. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +7 -7
  57. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +4 -4
  58. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -1
  59. package/dest/msg_validators/attestation_validator/attestation_validator.js +12 -10
  60. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +5 -5
  61. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
  62. package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.js +7 -10
  63. package/dest/msg_validators/index.d.ts +2 -2
  64. package/dest/msg_validators/index.d.ts.map +1 -1
  65. package/dest/msg_validators/index.js +1 -1
  66. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts +9 -0
  67. package/dest/msg_validators/proposal_validator/block_proposal_validator.d.ts.map +1 -0
  68. package/dest/msg_validators/proposal_validator/block_proposal_validator.js +6 -0
  69. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts +9 -0
  70. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.d.ts.map +1 -0
  71. package/dest/msg_validators/proposal_validator/checkpoint_proposal_validator.js +6 -0
  72. package/dest/msg_validators/proposal_validator/index.d.ts +4 -0
  73. package/dest/msg_validators/proposal_validator/index.d.ts.map +1 -0
  74. package/dest/msg_validators/proposal_validator/index.js +3 -0
  75. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts +13 -0
  76. package/dest/msg_validators/proposal_validator/proposal_validator.d.ts.map +1 -0
  77. package/dest/msg_validators/{block_proposal_validator/block_proposal_validator.js → proposal_validator/proposal_validator.js} +19 -21
  78. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts +23 -0
  79. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.d.ts.map +1 -0
  80. package/dest/msg_validators/proposal_validator/proposal_validator_test_suite.js +183 -0
  81. package/dest/msg_validators/tx_validator/data_validator.d.ts +1 -1
  82. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
  83. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +1 -1
  84. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
  85. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +1 -1
  86. package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
  87. package/dest/services/dummy_service.d.ts +6 -2
  88. package/dest/services/dummy_service.d.ts.map +1 -1
  89. package/dest/services/dummy_service.js +3 -0
  90. package/dest/services/encoding.d.ts +1 -1
  91. package/dest/services/encoding.d.ts.map +1 -1
  92. package/dest/services/encoding.js +4 -2
  93. package/dest/services/libp2p/instrumentation.d.ts +1 -1
  94. package/dest/services/libp2p/instrumentation.d.ts.map +1 -1
  95. package/dest/services/libp2p/instrumentation.js +15 -68
  96. package/dest/services/libp2p/libp2p_service.d.ts +27 -10
  97. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
  98. package/dest/services/libp2p/libp2p_service.js +696 -137
  99. package/dest/services/peer-manager/metrics.d.ts +6 -1
  100. package/dest/services/peer-manager/metrics.d.ts.map +1 -1
  101. package/dest/services/peer-manager/metrics.js +18 -21
  102. package/dest/services/peer-manager/peer_manager.d.ts +2 -2
  103. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
  104. package/dest/services/peer-manager/peer_manager.js +2 -10
  105. package/dest/services/peer-manager/peer_scoring.d.ts +1 -1
  106. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
  107. package/dest/services/peer-manager/peer_scoring.js +2 -5
  108. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +1 -1
  109. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -1
  110. package/dest/services/reqresp/metrics.d.ts +1 -1
  111. package/dest/services/reqresp/metrics.d.ts.map +1 -1
  112. package/dest/services/reqresp/metrics.js +5 -21
  113. package/dest/services/reqresp/protocols/status.d.ts +1 -1
  114. package/dest/services/reqresp/protocols/status.d.ts.map +1 -1
  115. package/dest/services/reqresp/protocols/status.js +2 -0
  116. package/dest/services/reqresp/reqresp.js +402 -24
  117. package/dest/services/service.d.ts +16 -3
  118. package/dest/services/service.d.ts.map +1 -1
  119. package/dest/services/tx_collection/instrumentation.d.ts +1 -1
  120. package/dest/services/tx_collection/instrumentation.d.ts.map +1 -1
  121. package/dest/services/tx_collection/instrumentation.js +4 -14
  122. package/dest/services/tx_provider.d.ts +1 -1
  123. package/dest/services/tx_provider.d.ts.map +1 -1
  124. package/dest/services/tx_provider.js +3 -1
  125. package/dest/services/tx_provider_instrumentation.d.ts +1 -1
  126. package/dest/services/tx_provider_instrumentation.d.ts.map +1 -1
  127. package/dest/services/tx_provider_instrumentation.js +6 -19
  128. package/dest/testbench/p2p_client_testbench_worker.js +26 -11
  129. package/dest/testbench/worker_client_manager.d.ts +1 -1
  130. package/dest/testbench/worker_client_manager.d.ts.map +1 -1
  131. package/dest/testbench/worker_client_manager.js +6 -1
  132. package/package.json +14 -14
  133. package/src/client/factory.ts +1 -1
  134. package/src/client/interface.ts +19 -4
  135. package/src/client/p2p_client.ts +79 -129
  136. package/src/config.ts +8 -14
  137. package/src/mem_pools/attestation_pool/attestation_pool.ts +68 -41
  138. package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +231 -287
  139. package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +162 -140
  140. package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +141 -164
  141. package/src/mem_pools/attestation_pool/mocks.ts +13 -9
  142. package/src/mem_pools/instrumentation.ts +18 -25
  143. package/src/mem_pools/tx_pool/README.md +255 -0
  144. package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +307 -370
  145. package/src/mem_pools/tx_pool/eviction/eviction_manager.ts +71 -0
  146. package/src/mem_pools/tx_pool/eviction/eviction_strategy.ts +93 -0
  147. package/src/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.ts +108 -0
  148. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_mining_rule.ts +104 -0
  149. package/src/mem_pools/tx_pool/eviction/invalid_txs_after_reorg_rule.ts +91 -0
  150. package/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts +106 -0
  151. package/src/mem_pools/tx_pool/index.ts +0 -1
  152. package/src/mem_pools/tx_pool/priority.ts +8 -1
  153. package/src/mem_pools/tx_pool/tx_pool.ts +8 -3
  154. package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +7 -7
  155. package/src/msg_validators/attestation_validator/attestation_validator.ts +16 -13
  156. package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +9 -12
  157. package/src/msg_validators/index.ts +1 -1
  158. package/src/msg_validators/proposal_validator/block_proposal_validator.ts +10 -0
  159. package/src/msg_validators/proposal_validator/checkpoint_proposal_validator.ts +13 -0
  160. package/src/msg_validators/proposal_validator/index.ts +3 -0
  161. package/src/msg_validators/{block_proposal_validator/block_proposal_validator.ts → proposal_validator/proposal_validator.ts} +23 -28
  162. package/src/msg_validators/proposal_validator/proposal_validator_test_suite.ts +206 -0
  163. package/src/msg_validators/tx_validator/data_validator.ts +12 -4
  164. package/src/msg_validators/tx_validator/metadata_validator.ts +12 -4
  165. package/src/msg_validators/tx_validator/timestamp_validator.ts +3 -1
  166. package/src/services/dummy_service.ts +6 -0
  167. package/src/services/encoding.ts +3 -1
  168. package/src/services/libp2p/instrumentation.ts +14 -68
  169. package/src/services/libp2p/libp2p_service.ts +324 -100
  170. package/src/services/peer-manager/metrics.ts +22 -21
  171. package/src/services/peer-manager/peer_manager.ts +3 -2
  172. package/src/services/peer-manager/peer_scoring.ts +1 -5
  173. package/src/services/reqresp/connection-sampler/connection_sampler.ts +3 -1
  174. package/src/services/reqresp/metrics.ts +7 -23
  175. package/src/services/reqresp/protocols/status.ts +2 -1
  176. package/src/services/service.ts +19 -4
  177. package/src/services/tx_collection/instrumentation.ts +4 -21
  178. package/src/services/tx_provider.ts +4 -1
  179. package/src/services/tx_provider_instrumentation.ts +11 -24
  180. package/src/testbench/p2p_client_testbench_worker.ts +35 -11
  181. package/src/testbench/worker_client_manager.ts +6 -1
  182. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +0 -81
  183. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +0 -1
  184. package/dest/mem_pools/tx_pool/memory_tx_pool.js +0 -242
  185. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +0 -12
  186. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +0 -1
  187. package/dest/msg_validators/block_proposal_validator/index.d.ts +0 -2
  188. package/dest/msg_validators/block_proposal_validator/index.d.ts.map +0 -1
  189. package/dest/msg_validators/block_proposal_validator/index.js +0 -1
  190. package/src/mem_pools/tx_pool/memory_tx_pool.ts +0 -288
  191. package/src/msg_validators/block_proposal_validator/index.ts +0 -1
@@ -1,242 +0,0 @@
1
- import { createLogger } from '@aztec/foundation/log';
2
- import { Tx, TxHash } from '@aztec/stdlib/tx';
3
- import { getTelemetryClient } from '@aztec/telemetry-client';
4
- import EventEmitter from 'node:events';
5
- import { PoolInstrumentation, PoolName } from '../instrumentation.js';
6
- import { getPendingTxPriority } from './priority.js';
7
- /**
8
- * In-memory implementation of the Transaction Pool.
9
- */ export class InMemoryTxPool extends EventEmitter {
10
- log;
11
- /**
12
- * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
13
- */ txs;
14
- minedTxs;
15
- pendingTxs;
16
- deletedMinedTxHashes;
17
- // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
18
- blockToDeletedMinedTxHash;
19
- metrics;
20
- /**
21
- * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
22
- * @param log - A logger.
23
- */ constructor(telemetry = getTelemetryClient(), log = createLogger('p2p:tx_pool')){
24
- super(), this.log = log, this.countTx = ()=>{
25
- return Promise.resolve({
26
- itemCount: {
27
- mined: this.minedTxs.size,
28
- pending: this.pendingTxs.size
29
- }
30
- });
31
- };
32
- this.txs = new Map();
33
- this.minedTxs = new Map();
34
- this.pendingTxs = new Set();
35
- this.deletedMinedTxHashes = new Map();
36
- this.blockToDeletedMinedTxHash = new Map();
37
- this.metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL, this.countTx);
38
- }
39
- countTx;
40
- isEmpty() {
41
- return Promise.resolve(this.txs.size === 0);
42
- }
43
- markAsMined(txHashes, blockHeader) {
44
- const keys = txHashes.map((x)=>x.toBigInt());
45
- for (const key of keys){
46
- // If this tx was previously soft-deleted, remove it from the deleted sets
47
- if (this.deletedMinedTxHashes.has(key)) {
48
- const originalBlock = this.deletedMinedTxHashes.get(key);
49
- this.deletedMinedTxHashes.delete(key);
50
- // Remove from block-to-hash mapping
51
- const txHashesForBlock = this.blockToDeletedMinedTxHash.get(originalBlock);
52
- if (txHashesForBlock) {
53
- txHashesForBlock.delete(key);
54
- if (txHashesForBlock.size === 0) {
55
- this.blockToDeletedMinedTxHash.delete(originalBlock);
56
- }
57
- }
58
- }
59
- this.minedTxs.set(key, blockHeader.globalVariables.blockNumber);
60
- this.pendingTxs.delete(key);
61
- }
62
- this.metrics.transactionsRemoved(txHashes);
63
- return Promise.resolve();
64
- }
65
- markMinedAsPending(txHashes) {
66
- if (txHashes.length === 0) {
67
- return Promise.resolve();
68
- }
69
- const keys = txHashes.map((x)=>x.toBigInt());
70
- for (const key of keys){
71
- this.minedTxs.delete(key);
72
- // only add back to the pending set if we have the tx object
73
- if (this.txs.has(key)) {
74
- this.pendingTxs.add(key);
75
- }
76
- }
77
- return Promise.resolve();
78
- }
79
- async getPendingTxHashes() {
80
- const txs = (await this.getAllTxs()).sort((tx1, tx2)=>-getPendingTxPriority(tx1).localeCompare(getPendingTxPriority(tx2)));
81
- const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
82
- // No need to check deleted since pending txs are never soft-deleted
83
- return txHashes.filter((txHash)=>{
84
- const key = txHash.toBigInt();
85
- return this.pendingTxs.has(key);
86
- });
87
- }
88
- getMinedTxHashes() {
89
- return Promise.resolve(Array.from(this.minedTxs.entries()).map(([txHash, blockNumber])=>[
90
- TxHash.fromBigInt(txHash),
91
- blockNumber
92
- ]));
93
- }
94
- getPendingTxCount() {
95
- // Soft-deleted transactions are always mined, never pending
96
- return Promise.resolve(this.pendingTxs.size);
97
- }
98
- getTxStatus(txHash) {
99
- const key = txHash.toBigInt();
100
- if (this.deletedMinedTxHashes.has(key)) {
101
- return Promise.resolve('deleted');
102
- }
103
- if (this.minedTxs.has(key)) {
104
- return Promise.resolve('mined');
105
- }
106
- if (this.pendingTxs.has(key)) {
107
- return Promise.resolve('pending');
108
- }
109
- return Promise.resolve(undefined);
110
- }
111
- /**
112
- * Checks if a transaction exists in the pool and returns it.
113
- * @param txHash - The generated tx hash.
114
- * @returns The transaction, if found, 'undefined' otherwise.
115
- */ getTxByHash(txHash) {
116
- const result = this.txs.get(txHash.toBigInt());
117
- return Promise.resolve(result === undefined ? undefined : Tx.clone(result));
118
- }
119
- getTxsByHash(txHashes) {
120
- return Promise.all(txHashes.map((txHash)=>this.getTxByHash(txHash)));
121
- }
122
- hasTxs(txHashes) {
123
- return Promise.resolve(txHashes.map((txHash)=>this.txs.has(txHash.toBigInt())));
124
- }
125
- async hasTx(txHash) {
126
- const result = await this.hasTxs([
127
- txHash
128
- ]);
129
- return result[0];
130
- }
131
- getArchivedTxByHash() {
132
- return Promise.resolve(undefined);
133
- }
134
- /**
135
- * Adds a list of transactions to the pool. Duplicates are ignored.
136
- * @param txs - An array of txs to be added to the pool.
137
- * @returns Empty promise.
138
- */ addTxs(txs, opts = {}) {
139
- const added = [];
140
- for (const tx of txs){
141
- const txHash = tx.getTxHash();
142
- this.log.verbose(`Adding tx ${txHash.toString()} to pool`, {
143
- eventName: 'tx-added-to-pool',
144
- ...tx.getStats()
145
- });
146
- const key = txHash.toBigInt();
147
- if (!this.txs.has(key)) {
148
- added.push(tx);
149
- this.txs.set(key, tx);
150
- }
151
- if (!this.minedTxs.has(key)) {
152
- this.metrics.recordSize(tx);
153
- this.pendingTxs.add(key);
154
- }
155
- }
156
- if (added.length > 0) {
157
- this.emit('txs-added', {
158
- ...opts,
159
- txs: added
160
- });
161
- }
162
- this.metrics.transactionsAdded(added);
163
- return Promise.resolve(added.length);
164
- }
165
- /**
166
- * Deletes transactions from the pool. Tx hashes that are not present are ignored.
167
- * Mined transactions are soft-deleted with a timestamp, pending transactions are permanently deleted.
168
- * @param txHashes - An array of tx hashes to be deleted from the tx pool.
169
- * @returns Empty promise.
170
- */ deleteTxs(txHashes, opts) {
171
- for (const txHash of txHashes){
172
- const key = txHash.toBigInt();
173
- if (this.txs.has(key)) {
174
- if (this.minedTxs.has(key)) {
175
- const blockNumber = this.minedTxs.get(key);
176
- this.minedTxs.delete(key);
177
- // Soft-delete mined transactions: remove from mined set but keep in storage
178
- if (opts?.permanently) {
179
- // Permanently delete mined transactions if specified
180
- this.txs.delete(key);
181
- } else {
182
- this.deletedMinedTxHashes.set(key, blockNumber);
183
- if (!this.blockToDeletedMinedTxHash.has(blockNumber)) {
184
- this.blockToDeletedMinedTxHash.set(blockNumber, new Set());
185
- }
186
- this.blockToDeletedMinedTxHash.get(blockNumber).add(key);
187
- }
188
- } else {
189
- // Permanently delete pending transactions
190
- this.txs.delete(key);
191
- this.pendingTxs.delete(key);
192
- }
193
- }
194
- }
195
- this.metrics.transactionsRemoved(txHashes);
196
- return Promise.resolve();
197
- }
198
- /**
199
- * Gets all the transactions stored in the pool.
200
- * @returns Array of tx objects in the order they were added to the pool.
201
- */ getAllTxs() {
202
- return Promise.resolve(Array.from(this.txs.values()).map((x)=>Tx.clone(x)));
203
- }
204
- /**
205
- * Gets the hashes of all transactions currently in the tx pool.
206
- * @returns An array of transaction hashes found in the tx pool.
207
- */ getAllTxHashes() {
208
- return Promise.resolve(Array.from(this.txs.keys()).map((x)=>TxHash.fromBigInt(x)));
209
- }
210
- updateConfig(_config) {}
211
- markTxsAsNonEvictable(_) {
212
- return Promise.resolve();
213
- }
214
- /**
215
- * Permanently deletes deleted mined transactions from blocks up to and including the specified block number.
216
- * @param blockNumber - Block number threshold. Deleted mined txs from this block or earlier will be permanently deleted.
217
- * @returns The number of transactions permanently deleted.
218
- */ cleanupDeletedMinedTxs(blockNumber) {
219
- let deletedCount = 0;
220
- const blocksToDelete = [];
221
- // Find all blocks up to the specified block number
222
- for (const [block, txHashes] of this.blockToDeletedMinedTxHash.entries()){
223
- if (block <= blockNumber) {
224
- // Permanently delete all transactions from this block
225
- for (const txHash of txHashes){
226
- this.txs.delete(txHash);
227
- this.deletedMinedTxHashes.delete(txHash);
228
- deletedCount++;
229
- }
230
- blocksToDelete.push(block);
231
- }
232
- }
233
- // Clean up block-to-hash mapping
234
- for (const block of blocksToDelete){
235
- this.blockToDeletedMinedTxHash.delete(block);
236
- }
237
- if (deletedCount > 0) {
238
- this.log.debug(`Permanently deleted ${deletedCount} deleted mined txs from blocks up to ${blockNumber}`);
239
- }
240
- return Promise.resolve(deletedCount);
241
- }
242
- }
@@ -1,12 +0,0 @@
1
- import type { EpochCacheInterface } from '@aztec/epoch-cache';
2
- import { type BlockProposal, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
3
- export declare class BlockProposalValidator implements P2PValidator<BlockProposal> {
4
- private epochCache;
5
- private logger;
6
- private txsPermitted;
7
- constructor(epochCache: EpochCacheInterface, opts: {
8
- txsPermitted: boolean;
9
- });
10
- validate(block: BlockProposal): Promise<PeerErrorSeverity | undefined>;
11
- }
12
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbXNnX3ZhbGlkYXRvcnMvYmxvY2tfcHJvcG9zYWxfdmFsaWRhdG9yL2Jsb2NrX3Byb3Bvc2FsX3ZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRzlELE9BQU8sRUFBRSxLQUFLLGFBQWEsRUFBRSxLQUFLLFlBQVksRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTdGLHFCQUFhLHNCQUF1QixZQUFXLFlBQVksQ0FBQyxhQUFhLENBQUM7SUFDeEUsT0FBTyxDQUFDLFVBQVUsQ0FBc0I7SUFDeEMsT0FBTyxDQUFDLE1BQU0sQ0FBUztJQUN2QixPQUFPLENBQUMsWUFBWSxDQUFVO0lBRTlCLFlBQVksVUFBVSxFQUFFLG1CQUFtQixFQUFFLElBQUksRUFBRTtRQUFFLFlBQVksRUFBRSxPQUFPLENBQUE7S0FBRSxFQUkzRTtJQUVLLFFBQVEsQ0FBQyxLQUFLLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsQ0ErRTNFO0NBQ0YifQ==
@@ -1 +0,0 @@
1
- {"version":3,"file":"block_proposal_validator.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/block_proposal_validator/block_proposal_validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAG9D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE7F,qBAAa,sBAAuB,YAAW,YAAY,CAAC,aAAa,CAAC;IACxE,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAU;IAE9B,YAAY,UAAU,EAAE,mBAAmB,EAAE,IAAI,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,EAI3E;IAEK,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CA+E3E;CACF"}
@@ -1,2 +0,0 @@
1
- export * from './block_proposal_validator.js';
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tc2dfdmFsaWRhdG9ycy9ibG9ja19wcm9wb3NhbF92YWxpZGF0b3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYywrQkFBK0IsQ0FBQyJ9
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/msg_validators/block_proposal_validator/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC"}
@@ -1 +0,0 @@
1
- export * from './block_proposal_validator.js';
@@ -1,288 +0,0 @@
1
- import { BlockNumber } from '@aztec/foundation/branded-types';
2
- import { createLogger } from '@aztec/foundation/log';
3
- import type { TypedEventEmitter } from '@aztec/foundation/types';
4
- import type { TxAddedToPoolStats } from '@aztec/stdlib/stats';
5
- import { BlockHeader, Tx, TxHash } from '@aztec/stdlib/tx';
6
- import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
7
-
8
- import EventEmitter from 'node:events';
9
-
10
- import { PoolInstrumentation, PoolName, type PoolStatsCallback } from '../instrumentation.js';
11
- import { getPendingTxPriority } from './priority.js';
12
- import type { TxPool, TxPoolEvents, TxPoolOptions } from './tx_pool.js';
13
-
14
- /**
15
- * In-memory implementation of the Transaction Pool.
16
- */
17
- export class InMemoryTxPool extends (EventEmitter as new () => TypedEventEmitter<TxPoolEvents>) implements TxPool {
18
- /**
19
- * Our tx pool, stored as a Map in-memory, with K: tx hash and V: the transaction.
20
- */
21
- private txs: Map<bigint, Tx>;
22
- private minedTxs: Map<bigint, BlockNumber>;
23
- private pendingTxs: Set<bigint>;
24
- private deletedMinedTxHashes: Map<bigint, BlockNumber>;
25
- // eslint-disable-next-line aztec-custom/no-non-primitive-in-collections
26
- private blockToDeletedMinedTxHash: Map<BlockNumber, Set<bigint>>;
27
-
28
- private metrics: PoolInstrumentation<Tx>;
29
-
30
- /**
31
- * Class constructor for in-memory TxPool. Initiates our transaction pool as a JS Map.
32
- * @param log - A logger.
33
- */
34
- constructor(
35
- telemetry: TelemetryClient = getTelemetryClient(),
36
- private log = createLogger('p2p:tx_pool'),
37
- ) {
38
- super();
39
- this.txs = new Map<bigint, Tx>();
40
- this.minedTxs = new Map();
41
- this.pendingTxs = new Set();
42
- this.deletedMinedTxHashes = new Map();
43
- this.blockToDeletedMinedTxHash = new Map();
44
- this.metrics = new PoolInstrumentation(telemetry, PoolName.TX_POOL, this.countTx);
45
- }
46
-
47
- private countTx: PoolStatsCallback = () => {
48
- return Promise.resolve({
49
- itemCount: {
50
- mined: this.minedTxs.size,
51
- pending: this.pendingTxs.size,
52
- },
53
- });
54
- };
55
-
56
- public isEmpty(): Promise<boolean> {
57
- return Promise.resolve(this.txs.size === 0);
58
- }
59
-
60
- public markAsMined(txHashes: TxHash[], blockHeader: BlockHeader): Promise<void> {
61
- const keys = txHashes.map(x => x.toBigInt());
62
- for (const key of keys) {
63
- // If this tx was previously soft-deleted, remove it from the deleted sets
64
- if (this.deletedMinedTxHashes.has(key)) {
65
- const originalBlock = this.deletedMinedTxHashes.get(key)!;
66
- this.deletedMinedTxHashes.delete(key);
67
- // Remove from block-to-hash mapping
68
- const txHashesForBlock = this.blockToDeletedMinedTxHash.get(originalBlock);
69
- if (txHashesForBlock) {
70
- txHashesForBlock.delete(key);
71
- if (txHashesForBlock.size === 0) {
72
- this.blockToDeletedMinedTxHash.delete(originalBlock);
73
- }
74
- }
75
- }
76
- this.minedTxs.set(key, blockHeader.globalVariables.blockNumber);
77
- this.pendingTxs.delete(key);
78
- }
79
- this.metrics.transactionsRemoved(txHashes);
80
- return Promise.resolve();
81
- }
82
-
83
- public markMinedAsPending(txHashes: TxHash[]): Promise<void> {
84
- if (txHashes.length === 0) {
85
- return Promise.resolve();
86
- }
87
-
88
- const keys = txHashes.map(x => x.toBigInt());
89
- for (const key of keys) {
90
- this.minedTxs.delete(key);
91
-
92
- // only add back to the pending set if we have the tx object
93
- if (this.txs.has(key)) {
94
- this.pendingTxs.add(key);
95
- }
96
- }
97
-
98
- return Promise.resolve();
99
- }
100
-
101
- public async getPendingTxHashes(): Promise<TxHash[]> {
102
- const txs = (await this.getAllTxs()).sort(
103
- (tx1, tx2) => -getPendingTxPriority(tx1).localeCompare(getPendingTxPriority(tx2)),
104
- );
105
- const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
106
-
107
- // No need to check deleted since pending txs are never soft-deleted
108
- return txHashes.filter(txHash => {
109
- const key = txHash.toBigInt();
110
- return this.pendingTxs.has(key);
111
- });
112
- }
113
-
114
- public getMinedTxHashes(): Promise<[TxHash, BlockNumber][]> {
115
- return Promise.resolve(
116
- Array.from(this.minedTxs.entries()).map(([txHash, blockNumber]) => [TxHash.fromBigInt(txHash), blockNumber]),
117
- );
118
- }
119
-
120
- public getPendingTxCount(): Promise<number> {
121
- // Soft-deleted transactions are always mined, never pending
122
- return Promise.resolve(this.pendingTxs.size);
123
- }
124
-
125
- public getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | 'deleted' | undefined> {
126
- const key = txHash.toBigInt();
127
-
128
- if (this.deletedMinedTxHashes.has(key)) {
129
- return Promise.resolve('deleted');
130
- }
131
- if (this.minedTxs.has(key)) {
132
- return Promise.resolve('mined');
133
- }
134
- if (this.pendingTxs.has(key)) {
135
- return Promise.resolve('pending');
136
- }
137
- return Promise.resolve(undefined);
138
- }
139
-
140
- /**
141
- * Checks if a transaction exists in the pool and returns it.
142
- * @param txHash - The generated tx hash.
143
- * @returns The transaction, if found, 'undefined' otherwise.
144
- */
145
- public getTxByHash(txHash: TxHash): Promise<Tx | undefined> {
146
- const result = this.txs.get(txHash.toBigInt());
147
- return Promise.resolve(result === undefined ? undefined : Tx.clone(result));
148
- }
149
-
150
- getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]> {
151
- return Promise.all(txHashes.map(txHash => this.getTxByHash(txHash)));
152
- }
153
- hasTxs(txHashes: TxHash[]): Promise<boolean[]> {
154
- return Promise.resolve(txHashes.map(txHash => this.txs.has(txHash.toBigInt())));
155
- }
156
-
157
- async hasTx(txHash: TxHash): Promise<boolean> {
158
- const result = await this.hasTxs([txHash]);
159
- return result[0];
160
- }
161
-
162
- public getArchivedTxByHash(): Promise<Tx | undefined> {
163
- return Promise.resolve(undefined);
164
- }
165
-
166
- /**
167
- * Adds a list of transactions to the pool. Duplicates are ignored.
168
- * @param txs - An array of txs to be added to the pool.
169
- * @returns Empty promise.
170
- */
171
- public addTxs(txs: Tx[], opts: { source?: string } = {}): Promise<number> {
172
- const added: Tx[] = [];
173
- for (const tx of txs) {
174
- const txHash = tx.getTxHash();
175
- this.log.verbose(`Adding tx ${txHash.toString()} to pool`, {
176
- eventName: 'tx-added-to-pool',
177
- ...tx.getStats(),
178
- } satisfies TxAddedToPoolStats);
179
-
180
- const key = txHash.toBigInt();
181
- if (!this.txs.has(key)) {
182
- added.push(tx as Tx);
183
- this.txs.set(key, tx);
184
- }
185
-
186
- if (!this.minedTxs.has(key)) {
187
- this.metrics.recordSize(tx);
188
- this.pendingTxs.add(key);
189
- }
190
- }
191
- if (added.length > 0) {
192
- this.emit('txs-added', { ...opts, txs: added });
193
- }
194
- this.metrics.transactionsAdded(added);
195
- return Promise.resolve(added.length);
196
- }
197
-
198
- /**
199
- * Deletes transactions from the pool. Tx hashes that are not present are ignored.
200
- * Mined transactions are soft-deleted with a timestamp, pending transactions are permanently deleted.
201
- * @param txHashes - An array of tx hashes to be deleted from the tx pool.
202
- * @returns Empty promise.
203
- */
204
- public deleteTxs(txHashes: TxHash[], opts?: { permanently?: boolean }): Promise<void> {
205
- for (const txHash of txHashes) {
206
- const key = txHash.toBigInt();
207
- if (this.txs.has(key)) {
208
- if (this.minedTxs.has(key)) {
209
- const blockNumber = this.minedTxs.get(key)!;
210
- this.minedTxs.delete(key);
211
- // Soft-delete mined transactions: remove from mined set but keep in storage
212
- if (opts?.permanently) {
213
- // Permanently delete mined transactions if specified
214
- this.txs.delete(key);
215
- } else {
216
- this.deletedMinedTxHashes.set(key, blockNumber);
217
- if (!this.blockToDeletedMinedTxHash.has(blockNumber)) {
218
- this.blockToDeletedMinedTxHash.set(blockNumber, new Set());
219
- }
220
- this.blockToDeletedMinedTxHash.get(blockNumber)!.add(key);
221
- }
222
- } else {
223
- // Permanently delete pending transactions
224
- this.txs.delete(key);
225
- this.pendingTxs.delete(key);
226
- }
227
- }
228
- }
229
- this.metrics.transactionsRemoved(txHashes);
230
-
231
- return Promise.resolve();
232
- }
233
-
234
- /**
235
- * Gets all the transactions stored in the pool.
236
- * @returns Array of tx objects in the order they were added to the pool.
237
- */
238
- public getAllTxs(): Promise<Tx[]> {
239
- return Promise.resolve(Array.from(this.txs.values()).map(x => Tx.clone(x)));
240
- }
241
-
242
- /**
243
- * Gets the hashes of all transactions currently in the tx pool.
244
- * @returns An array of transaction hashes found in the tx pool.
245
- */
246
- public getAllTxHashes(): Promise<TxHash[]> {
247
- return Promise.resolve(Array.from(this.txs.keys()).map(x => TxHash.fromBigInt(x)));
248
- }
249
-
250
- updateConfig(_config: TxPoolOptions): void {}
251
-
252
- markTxsAsNonEvictable(_: TxHash[]): Promise<void> {
253
- return Promise.resolve();
254
- }
255
-
256
- /**
257
- * Permanently deletes deleted mined transactions from blocks up to and including the specified block number.
258
- * @param blockNumber - Block number threshold. Deleted mined txs from this block or earlier will be permanently deleted.
259
- * @returns The number of transactions permanently deleted.
260
- */
261
- public cleanupDeletedMinedTxs(blockNumber: BlockNumber): Promise<number> {
262
- let deletedCount = 0;
263
- const blocksToDelete: BlockNumber[] = [];
264
-
265
- // Find all blocks up to the specified block number
266
- for (const [block, txHashes] of this.blockToDeletedMinedTxHash.entries()) {
267
- if (block <= blockNumber) {
268
- // Permanently delete all transactions from this block
269
- for (const txHash of txHashes) {
270
- this.txs.delete(txHash);
271
- this.deletedMinedTxHashes.delete(txHash);
272
- deletedCount++;
273
- }
274
- blocksToDelete.push(block);
275
- }
276
- }
277
-
278
- // Clean up block-to-hash mapping
279
- for (const block of blocksToDelete) {
280
- this.blockToDeletedMinedTxHash.delete(block);
281
- }
282
-
283
- if (deletedCount > 0) {
284
- this.log.debug(`Permanently deleted ${deletedCount} deleted mined txs from blocks up to ${blockNumber}`);
285
- }
286
- return Promise.resolve(deletedCount);
287
- }
288
- }
@@ -1 +0,0 @@
1
- export * from './block_proposal_validator.js';