@aztec/p2p 0.0.1-commit.43c09e3f → 0.0.1-commit.4ad48494d
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.
- package/dest/client/factory.d.ts +5 -5
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +44 -10
- package/dest/client/interface.d.ts +37 -15
- package/dest/client/interface.d.ts.map +1 -1
- package/dest/client/p2p_client.d.ts +35 -36
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +114 -138
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +1 -1
- package/dest/config.d.ts +23 -5
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +16 -1
- package/dest/index.d.ts +2 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -0
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +104 -88
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.js +441 -3
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +2 -2
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +353 -87
- package/dest/mem_pools/attestation_pool/index.d.ts +2 -3
- package/dest/mem_pools/attestation_pool/index.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/index.js +1 -2
- package/dest/mem_pools/index.d.ts +3 -2
- package/dest/mem_pools/index.d.ts.map +1 -1
- package/dest/mem_pools/index.js +1 -1
- package/dest/mem_pools/interface.d.ts +5 -5
- package/dest/mem_pools/interface.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts +102 -0
- package/dest/mem_pools/tx_pool_v2/deleted_pool.d.ts.map +1 -0
- package/dest/mem_pools/tx_pool_v2/deleted_pool.js +242 -0
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.js +3 -0
- package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.js +3 -1
- package/dest/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.js +3 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.js +3 -1
- package/dest/mem_pools/tx_pool_v2/index.d.ts +2 -1
- package/dest/mem_pools/tx_pool_v2/index.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/index.js +1 -0
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts +11 -3
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/interfaces.js +2 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +27 -3
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.js +39 -5
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts +105 -0
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.d.ts.map +1 -0
- package/dest/mem_pools/tx_pool_v2/tx_pool_indices.js +345 -0
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts +4 -2
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2.js +12 -2
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +4 -2
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.js +259 -520
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts +3 -3
- package/dest/msg_validators/attestation_validator/fisherman_attestation_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +3 -3
- package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts +16 -3
- package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/block_header_validator.js +1 -1
- package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +13 -3
- package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/double_spend_validator.js +4 -4
- package/dest/msg_validators/tx_validator/timestamp_validator.d.ts +20 -4
- package/dest/msg_validators/tx_validator/timestamp_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/timestamp_validator.js +2 -2
- package/dest/services/dummy_service.d.ts +10 -2
- package/dest/services/dummy_service.d.ts.map +1 -1
- package/dest/services/dummy_service.js +6 -0
- package/dest/services/encoding.d.ts +2 -2
- package/dest/services/encoding.d.ts.map +1 -1
- package/dest/services/encoding.js +2 -2
- package/dest/services/gossipsub/index.d.ts +3 -0
- package/dest/services/gossipsub/index.d.ts.map +1 -0
- package/dest/services/gossipsub/index.js +2 -0
- package/dest/services/gossipsub/scoring.d.ts +21 -3
- package/dest/services/gossipsub/scoring.d.ts.map +1 -1
- package/dest/services/gossipsub/scoring.js +24 -7
- package/dest/services/gossipsub/topic_score_params.d.ts +161 -0
- package/dest/services/gossipsub/topic_score_params.d.ts.map +1 -0
- package/dest/services/gossipsub/topic_score_params.js +324 -0
- package/dest/services/libp2p/libp2p_service.d.ts +84 -35
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +368 -273
- package/dest/services/peer-manager/peer_scoring.d.ts +1 -1
- package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_scoring.js +25 -2
- package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts +4 -4
- package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.d.ts.map +1 -1
- package/dest/services/reqresp/batch-tx-requester/batch_tx_requester.js +8 -8
- package/dest/services/reqresp/interface.d.ts +10 -1
- package/dest/services/reqresp/interface.d.ts.map +1 -1
- package/dest/services/reqresp/interface.js +15 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts +7 -5
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.js +16 -11
- package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +21 -10
- package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.js +27 -11
- package/dest/services/reqresp/protocols/tx.d.ts +7 -1
- package/dest/services/reqresp/protocols/tx.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/tx.js +20 -0
- package/dest/services/reqresp/reqresp.d.ts +1 -1
- package/dest/services/reqresp/reqresp.d.ts.map +1 -1
- package/dest/services/reqresp/reqresp.js +11 -4
- package/dest/services/service.d.ts +35 -1
- package/dest/services/service.d.ts.map +1 -1
- package/dest/services/tx_collection/config.d.ts +22 -4
- package/dest/services/tx_collection/config.d.ts.map +1 -1
- package/dest/services/tx_collection/config.js +49 -3
- package/dest/services/tx_collection/fast_tx_collection.d.ts +6 -5
- package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/fast_tx_collection.js +27 -17
- package/dest/services/tx_collection/file_store_tx_collection.d.ts +53 -0
- package/dest/services/tx_collection/file_store_tx_collection.d.ts.map +1 -0
- package/dest/services/tx_collection/file_store_tx_collection.js +165 -0
- package/dest/services/tx_collection/file_store_tx_source.d.ts +28 -0
- package/dest/services/tx_collection/file_store_tx_source.d.ts.map +1 -0
- package/dest/services/tx_collection/file_store_tx_source.js +59 -0
- package/dest/services/tx_collection/index.d.ts +3 -2
- package/dest/services/tx_collection/index.d.ts.map +1 -1
- package/dest/services/tx_collection/index.js +1 -0
- package/dest/services/tx_collection/proposal_tx_collector.d.ts +12 -12
- package/dest/services/tx_collection/proposal_tx_collector.d.ts.map +1 -1
- package/dest/services/tx_collection/proposal_tx_collector.js +4 -5
- package/dest/services/tx_collection/slow_tx_collection.d.ts +6 -2
- package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/slow_tx_collection.js +55 -23
- package/dest/services/tx_collection/tx_collection.d.ts +19 -7
- package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/tx_collection.js +75 -3
- package/dest/services/tx_collection/tx_collection_sink.d.ts +15 -6
- package/dest/services/tx_collection/tx_collection_sink.d.ts.map +1 -1
- package/dest/services/tx_collection/tx_collection_sink.js +13 -7
- package/dest/services/tx_file_store/config.d.ts +1 -3
- package/dest/services/tx_file_store/config.d.ts.map +1 -1
- package/dest/services/tx_file_store/config.js +0 -4
- package/dest/services/tx_file_store/tx_file_store.d.ts +4 -3
- package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
- package/dest/services/tx_file_store/tx_file_store.js +8 -5
- package/dest/services/tx_provider.d.ts +3 -3
- package/dest/services/tx_provider.d.ts.map +1 -1
- package/dest/services/tx_provider.js +5 -4
- package/dest/test-helpers/make-test-p2p-clients.d.ts +3 -3
- package/dest/test-helpers/make-test-p2p-clients.d.ts.map +1 -1
- package/dest/test-helpers/mock-pubsub.d.ts +27 -1
- package/dest/test-helpers/mock-pubsub.d.ts.map +1 -1
- package/dest/test-helpers/mock-pubsub.js +97 -2
- package/dest/test-helpers/reqresp-nodes.d.ts +1 -1
- package/dest/test-helpers/reqresp-nodes.d.ts.map +1 -1
- package/dest/test-helpers/reqresp-nodes.js +2 -1
- package/dest/test-helpers/testbench-utils.d.ts +40 -38
- package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
- package/dest/test-helpers/testbench-utils.js +128 -59
- package/dest/testbench/p2p_client_testbench_worker.js +2 -2
- package/package.json +14 -14
- package/src/client/factory.ts +81 -13
- package/src/client/interface.ts +45 -14
- package/src/client/p2p_client.ts +151 -161
- package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +1 -1
- package/src/config.ts +34 -2
- package/src/index.ts +1 -0
- package/src/mem_pools/attestation_pool/attestation_pool.ts +496 -91
- package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +442 -102
- package/src/mem_pools/attestation_pool/index.ts +9 -2
- package/src/mem_pools/index.ts +4 -1
- package/src/mem_pools/interface.ts +4 -4
- package/src/mem_pools/tx_pool_v2/README.md +103 -16
- package/src/mem_pools/tx_pool_v2/deleted_pool.ts +310 -0
- package/src/mem_pools/tx_pool_v2/eviction/fee_payer_balance_eviction_rule.ts +3 -0
- package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_mining_rule.ts +1 -1
- package/src/mem_pools/tx_pool_v2/eviction/invalid_txs_after_reorg_rule.ts +1 -1
- package/src/mem_pools/tx_pool_v2/eviction/low_priority_eviction_rule.ts +3 -1
- package/src/mem_pools/tx_pool_v2/index.ts +1 -0
- package/src/mem_pools/tx_pool_v2/interfaces.ts +10 -2
- package/src/mem_pools/tx_pool_v2/tx_metadata.ts +57 -6
- package/src/mem_pools/tx_pool_v2/tx_pool_indices.ts +433 -0
- package/src/mem_pools/tx_pool_v2/tx_pool_v2.ts +10 -1
- package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +266 -607
- package/src/msg_validators/attestation_validator/fisherman_attestation_validator.ts +2 -2
- package/src/msg_validators/tx_validator/aggregate_tx_validator.ts +2 -2
- package/src/msg_validators/tx_validator/block_header_validator.ts +15 -3
- package/src/msg_validators/tx_validator/double_spend_validator.ts +11 -6
- package/src/msg_validators/tx_validator/timestamp_validator.ts +19 -14
- package/src/services/dummy_service.ts +12 -0
- package/src/services/encoding.ts +2 -2
- package/src/services/gossipsub/README.md +626 -0
- package/src/services/gossipsub/index.ts +2 -0
- package/src/services/gossipsub/scoring.ts +29 -5
- package/src/services/gossipsub/topic_score_params.ts +451 -0
- package/src/services/libp2p/libp2p_service.ts +370 -275
- package/src/services/peer-manager/peer_scoring.ts +25 -0
- package/src/services/reqresp/batch-tx-requester/README.md +7 -7
- package/src/services/reqresp/batch-tx-requester/batch_tx_requester.ts +11 -11
- package/src/services/reqresp/interface.ts +26 -1
- package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +23 -14
- package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +38 -15
- package/src/services/reqresp/protocols/tx.ts +22 -0
- package/src/services/reqresp/reqresp.ts +13 -3
- package/src/services/service.ts +40 -0
- package/src/services/tx_collection/config.ts +74 -6
- package/src/services/tx_collection/fast_tx_collection.ts +28 -26
- package/src/services/tx_collection/file_store_tx_collection.ts +198 -0
- package/src/services/tx_collection/file_store_tx_source.ts +73 -0
- package/src/services/tx_collection/index.ts +2 -1
- package/src/services/tx_collection/proposal_tx_collector.ts +12 -14
- package/src/services/tx_collection/slow_tx_collection.ts +64 -30
- package/src/services/tx_collection/tx_collection.ts +109 -13
- package/src/services/tx_collection/tx_collection_sink.ts +17 -7
- package/src/services/tx_file_store/config.ts +0 -6
- package/src/services/tx_file_store/tx_file_store.ts +9 -7
- package/src/services/tx_provider.ts +8 -7
- package/src/test-helpers/make-test-p2p-clients.ts +3 -3
- package/src/test-helpers/mock-pubsub.ts +133 -3
- package/src/test-helpers/reqresp-nodes.ts +2 -1
- package/src/test-helpers/testbench-utils.ts +127 -71
- package/src/testbench/p2p_client_testbench_worker.ts +2 -2
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +0 -40
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +0 -1
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +0 -218
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +0 -31
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +0 -1
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +0 -180
- package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +0 -320
- package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +0 -264
|
@@ -1,2 +1,9 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
1
|
+
export {
|
|
2
|
+
AttestationPool,
|
|
3
|
+
type AttestationPoolApi,
|
|
4
|
+
type TryAddResult,
|
|
5
|
+
createTestAttestationPool,
|
|
6
|
+
MAX_CHECKPOINT_PROPOSALS_PER_SLOT,
|
|
7
|
+
MAX_BLOCK_PROPOSALS_PER_POSITION,
|
|
8
|
+
MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER,
|
|
9
|
+
} from './attestation_pool.js';
|
package/src/mem_pools/index.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
export { type
|
|
1
|
+
export { AttestationPool, type AttestationPoolApi } from './attestation_pool/attestation_pool.js';
|
|
2
2
|
export { type MemPools } from './interface.js';
|
|
3
|
+
// Old TxPool exports - kept temporarily for external consumers
|
|
3
4
|
export { type TxPool } from './tx_pool/tx_pool.js';
|
|
5
|
+
// New TxPoolV2 exports
|
|
6
|
+
export { type TxPoolV2, type TxPoolV2Config, type TxPoolV2Events, type AddTxsResult } from './tx_pool_v2/index.js';
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type {
|
|
1
|
+
import type { AttestationPoolApi } from './attestation_pool/attestation_pool.js';
|
|
2
|
+
import type { TxPoolV2 } from './tx_pool_v2/interfaces.js';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* A interface the combines all mempools
|
|
6
6
|
*/
|
|
7
7
|
export type MemPools = {
|
|
8
|
-
txPool:
|
|
9
|
-
attestationPool:
|
|
8
|
+
txPool: TxPoolV2;
|
|
9
|
+
attestationPool: AttestationPoolApi;
|
|
10
10
|
};
|
|
@@ -28,13 +28,22 @@ TxPoolV2 manages transactions through a state machine with clear transitions:
|
|
|
28
28
|
│ MINED │───────────────────┘
|
|
29
29
|
│ (included in a block) │ handlePrunedBlocks()
|
|
30
30
|
└─────────────────────────────────────┘ (reorg)
|
|
31
|
-
│
|
|
32
|
-
│ handleFinalizedBlock()
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
│
|
|
37
|
-
|
|
31
|
+
│ │
|
|
32
|
+
│ handleFinalizedBlock() │ eviction after reorg
|
|
33
|
+
│ / eviction / failed exec │ (validation failure)
|
|
34
|
+
▼ ▼
|
|
35
|
+
┌─────────────────────────────────────┐ ┌─────────────────────────────────────┐
|
|
36
|
+
│ SLOT-SOFT-DELETED │ │ PRUNE-SOFT-DELETED │
|
|
37
|
+
│ (kept in DB until next slot) │ │ (kept in DB until finalized) │
|
|
38
|
+
└─────────────────────────────────────┘ └─────────────────────────────────────┘
|
|
39
|
+
│ │
|
|
40
|
+
│ prepareForSlot() │ handleFinalizedBlock()
|
|
41
|
+
│ (slot advanced) │ (mined block finalized)
|
|
42
|
+
▼ ▼
|
|
43
|
+
┌─────────────────────────────────────┐ ┌─────────────────────────────────────┐
|
|
44
|
+
│ HARD-DELETED │ │ HARD-DELETED │
|
|
45
|
+
│ (permanently removed from DB) │ │ (permanently removed from DB) │
|
|
46
|
+
└─────────────────────────────────────┘ └─────────────────────────────────────┘
|
|
38
47
|
```
|
|
39
48
|
|
|
40
49
|
## Key Components
|
|
@@ -52,17 +61,92 @@ Core implementation containing:
|
|
|
52
61
|
- Pre-add rule execution
|
|
53
62
|
- Post-event eviction rule execution
|
|
54
63
|
|
|
64
|
+
### DeletedPool (`deleted_pool.ts`)
|
|
65
|
+
|
|
66
|
+
Manages all transaction deletions in the pool with two soft-deletion mechanisms:
|
|
67
|
+
- **Slot-based**: Non-pruned txs are kept in DB until the next slot, allowing other nodes to fetch them via reqresp
|
|
68
|
+
- **Prune-based**: Txs from pruned blocks are kept in DB until their original mined block is finalized
|
|
69
|
+
|
|
70
|
+
All deletions go through `DeletedPool.deleteTx()`, which routes to the appropriate path based on whether the tx is tracked as being from a pruned block.
|
|
71
|
+
|
|
55
72
|
### TxMetaData (`tx_metadata.ts`)
|
|
56
73
|
|
|
57
74
|
Lightweight metadata stored alongside each transaction:
|
|
58
75
|
- `txHash`: Transaction identifier
|
|
59
|
-
- `
|
|
60
|
-
- `priorityFee`: For priority ordering
|
|
76
|
+
- `anchorBlockHeaderHash`: Hash of the anchor block header
|
|
77
|
+
- `priorityFee`: For priority ordering and challenges
|
|
61
78
|
- `feePayer`: For balance-based eviction
|
|
79
|
+
- `claimAmount`: Fee payer's claim from bridging
|
|
80
|
+
- `feeLimit`: Maximum fee the tx can pay
|
|
62
81
|
- `nullifiers`: For conflict detection
|
|
63
|
-
- `
|
|
64
|
-
- `
|
|
65
|
-
|
|
82
|
+
- `includeByTimestamp`: Expiration timestamp
|
|
83
|
+
- `minedL2BlockId`: Set when mined (undefined otherwise)
|
|
84
|
+
|
|
85
|
+
State is derived by TxPoolIndices:
|
|
86
|
+
- `mined` if `minedL2BlockId` is set
|
|
87
|
+
- `protected` if in protection map
|
|
88
|
+
- `deleted` if soft-deleted (slot-based or prune-based, evicted but kept in DB)
|
|
89
|
+
- `pending` otherwise
|
|
90
|
+
|
|
91
|
+
## Soft Deletion
|
|
92
|
+
|
|
93
|
+
Deleted transactions are kept in the database for a grace period before being permanently removed. There are two soft-deletion mechanisms:
|
|
94
|
+
|
|
95
|
+
### Slot-Based Soft Deletion
|
|
96
|
+
|
|
97
|
+
When a transaction is deleted from the pool (eviction, validation failure, failed execution) and is **not** from a pruned block, it is "slot-soft-deleted":
|
|
98
|
+
|
|
99
|
+
1. **Soft Delete**: The tx is removed from indices but kept in the database, tagged with the current slot number
|
|
100
|
+
2. **Retrieval**: Slot-soft-deleted txs can still be retrieved via `getTxByHash` and return status `'deleted'` from `getTxStatus`
|
|
101
|
+
3. **Hard Delete**: When `prepareForSlot` advances to a new slot, txs deleted in earlier slots are permanently removed
|
|
102
|
+
4. **Re-addition**: If a slot-soft-deleted tx is re-added to the pool, the slot-deleted tracking is cleared
|
|
103
|
+
|
|
104
|
+
This allows other nodes to still fetch recently-deleted transactions via reqresp during the current slot.
|
|
105
|
+
|
|
106
|
+
### Prune-Based Soft Deletion
|
|
107
|
+
|
|
108
|
+
When a chain reorganization occurs, transactions that were mined in pruned blocks are handled with longer retention:
|
|
109
|
+
|
|
110
|
+
1. **Tracking**: When `handlePrunedBlocks` is called, all un-mined transactions are tracked by their original mined block number
|
|
111
|
+
2. **Soft Delete**: If these transactions are later evicted (failed validation, nullifier conflict, etc.), they are "prune-soft-deleted" - removed from indices but kept in the database
|
|
112
|
+
3. **Retrieval**: Prune-soft-deleted txs can still be retrieved via `getTxByHash` and return status `'deleted'` from `getTxStatus`
|
|
113
|
+
4. **Hard Delete**: When `handleFinalizedBlock` is called and the finalized block number reaches or exceeds the transaction's original mined block, the transaction is permanently removed
|
|
114
|
+
5. **Re-addition**: If a prune-soft-deleted tx is re-added, the `softDeleted` flag is reset to `false` but the prune tracking is preserved, so a subsequent deletion still uses the prune path
|
|
115
|
+
|
|
116
|
+
Prune-soft-deleted transactions are **not** affected by slot cleanup - they survive across slot boundaries until finalized.
|
|
117
|
+
|
|
118
|
+
**Prune example:**
|
|
119
|
+
1. Tx mined at block 10
|
|
120
|
+
2. Chain prunes to block 5 (tx becomes un-mined, tracked as minedAtBlock=10)
|
|
121
|
+
3. Tx fails validation and is prune-soft-deleted
|
|
122
|
+
4. Block 9 finalized → tx still in DB (minedAtBlock=10 > finalized=9)
|
|
123
|
+
5. Block 10 finalized → tx hard-deleted (minedAtBlock=10 ≤ finalized=10)
|
|
124
|
+
|
|
125
|
+
If the tx is re-mined at a higher block before being soft-deleted:
|
|
126
|
+
1. Tx mined at block 10, pruned (tracked as minedAtBlock=10)
|
|
127
|
+
2. Tx re-mined at block 15, pruned again (updated to minedAtBlock=15)
|
|
128
|
+
3. Tx soft-deleted
|
|
129
|
+
4. Block 10 finalized → tx still in DB
|
|
130
|
+
5. Block 15 finalized → tx hard-deleted
|
|
131
|
+
|
|
132
|
+
### Hydration
|
|
133
|
+
|
|
134
|
+
On node restart, slot-soft-deleted transactions are immediately hard-deleted (they are stale by definition). Prune-soft-deleted transactions are loaded from the database and tracked normally.
|
|
135
|
+
|
|
136
|
+
## Architecture: Pre-add vs Post-event Rules
|
|
137
|
+
|
|
138
|
+
**Pre-add rules** (run during `addPendingTxs`):
|
|
139
|
+
- Used for external transactions entering the pool
|
|
140
|
+
- Can reject the incoming tx entirely
|
|
141
|
+
- Can evict lower-priority existing txs to make room
|
|
142
|
+
- Rules: NullifierConflictRule, FeePayerBalancePreAddRule, LowPriorityPreAddRule
|
|
143
|
+
|
|
144
|
+
**Post-event rules** (run after state transitions):
|
|
145
|
+
- Used for internal state changes (block mined, reorg, slot change)
|
|
146
|
+
- Only evict txs already in the pool
|
|
147
|
+
- Rules: InvalidTxsAfterMiningRule, InvalidTxsAfterReorgRule, FeePayerBalanceEvictionRule, LowPriorityEvictionRule
|
|
148
|
+
|
|
149
|
+
This design choice means restored txs (from protected/mined states) use post-event rules only, because they were already validated on initial submission.
|
|
66
150
|
|
|
67
151
|
## Eviction Rules
|
|
68
152
|
|
|
@@ -85,8 +169,8 @@ Run after events to clean up the pool:
|
|
|
85
169
|
| Rule | Trigger | Purpose |
|
|
86
170
|
|------|---------|---------|
|
|
87
171
|
| `LowPriorityEvictionRule` | `txs_added` | Evicts lowest priority txs when pool exceeds limit. |
|
|
88
|
-
| `FeePayerBalanceEvictionRule` | `block_mined` | Evicts txs when fee payer balance
|
|
89
|
-
| `InvalidTxsAfterMiningRule` | `block_mined` | Evicts pending txs with nullifiers
|
|
172
|
+
| `FeePayerBalanceEvictionRule` | `txs_added`, `block_mined`, `chain_pruned` | Evicts txs when fee payer has insufficient balance. |
|
|
173
|
+
| `InvalidTxsAfterMiningRule` | `block_mined` | Evicts pending txs with: (1) nullifiers in mined block, (2) expired timestamp. |
|
|
90
174
|
| `InvalidTxsAfterReorgRule` | `chain_pruned` | Evicts txs with invalid anchor blocks after reorg. |
|
|
91
175
|
|
|
92
176
|
## Usage
|
|
@@ -99,7 +183,7 @@ import { AztecKVTxPoolV2 } from './tx_pool_v2.js';
|
|
|
99
183
|
const pool = new AztecKVTxPoolV2(txStore, archiveStore, {
|
|
100
184
|
l2BlockSource: archiver,
|
|
101
185
|
worldStateSynchronizer: worldState,
|
|
102
|
-
|
|
186
|
+
createTxValidator: () => validator,
|
|
103
187
|
});
|
|
104
188
|
|
|
105
189
|
await pool.start();
|
|
@@ -174,9 +258,12 @@ The archive uses FIFO eviction when `archivedTxLimit` is reached.
|
|
|
174
258
|
## Testing
|
|
175
259
|
|
|
176
260
|
```bash
|
|
177
|
-
# Unit tests (
|
|
261
|
+
# Unit tests (177 tests)
|
|
178
262
|
yarn test src/mem_pools/tx_pool_v2/tx_pool_v2.test.ts
|
|
179
263
|
|
|
264
|
+
# Deleted pool tests (17 tests)
|
|
265
|
+
yarn test src/mem_pools/tx_pool_v2/deleted_pool.test.ts
|
|
266
|
+
|
|
180
267
|
# Compatibility tests (25 tests)
|
|
181
268
|
yarn test src/mem_pools/tx_pool_v2/tx_pool_v2.compat.test.ts
|
|
182
269
|
|
|
@@ -0,0 +1,310 @@
|
|
|
1
|
+
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import type { Logger } from '@aztec/foundation/log';
|
|
3
|
+
import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSet } from '@aztec/kv-store';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* State stored for each transaction from a pruned block.
|
|
7
|
+
*/
|
|
8
|
+
type DeletedTxState = {
|
|
9
|
+
/** Block number in which the transaction was originally mined (before being un-mined by a prune) */
|
|
10
|
+
minedAtBlock: BlockNumber;
|
|
11
|
+
/** Whether the transaction has been soft-deleted (removed from indices) */
|
|
12
|
+
softDeleted: boolean;
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Serializes DeletedTxState to a Buffer.
|
|
17
|
+
* Format: 4 bytes for blockNumber (uint32) + 1 byte for softDeleted (0 or 1)
|
|
18
|
+
*/
|
|
19
|
+
function serializeState(state: DeletedTxState): Buffer {
|
|
20
|
+
const buffer = Buffer.alloc(5);
|
|
21
|
+
buffer.writeUInt32BE(Number(state.minedAtBlock), 0);
|
|
22
|
+
buffer.writeUInt8(state.softDeleted ? 1 : 0, 4);
|
|
23
|
+
return buffer;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* Deserializes a Buffer to DeletedTxState.
|
|
28
|
+
*/
|
|
29
|
+
function deserializeState(buffer: Buffer): DeletedTxState {
|
|
30
|
+
return {
|
|
31
|
+
minedAtBlock: BlockNumber(buffer.readUInt32BE(0)),
|
|
32
|
+
softDeleted: buffer.readUInt8(4) === 1,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* Manages all transaction deletions in the pool.
|
|
38
|
+
*
|
|
39
|
+
* When a chain prune (reorg) happens, transactions from pruned blocks are tracked here.
|
|
40
|
+
* This class is responsible for ALL deletion decisions:
|
|
41
|
+
*
|
|
42
|
+
* - Transactions from pruned blocks are "prune-soft-deleted" - removed from indices but kept
|
|
43
|
+
* in the database for later re-execution until their mined block is finalized
|
|
44
|
+
* - Transactions NOT from pruned blocks are "slot-soft-deleted" - kept in the database
|
|
45
|
+
* until the next slot, so other nodes can still fetch them via reqresp
|
|
46
|
+
*
|
|
47
|
+
* When a block is finalized, prune-soft-deleted transactions that were originally mined at or
|
|
48
|
+
* before that block number are permanently (hard) deleted. Slot-soft-deleted transactions
|
|
49
|
+
* are hard-deleted when `prepareForSlot` advances to a new slot.
|
|
50
|
+
*/
|
|
51
|
+
export class DeletedPool {
|
|
52
|
+
/** Persisted map: txHash -> DeletedTxState (serialized) - for prune-based soft deletions */
|
|
53
|
+
#deletedTxsDB: AztecAsyncMap<string, Buffer>;
|
|
54
|
+
|
|
55
|
+
/** Reference to the main txs database for hard deletion */
|
|
56
|
+
#txsDB: AztecAsyncMap<string, Buffer>;
|
|
57
|
+
|
|
58
|
+
/** In-memory state for transactions from pruned blocks */
|
|
59
|
+
#state: Map<string, DeletedTxState> = new Map();
|
|
60
|
+
|
|
61
|
+
/** In-memory tracking: txHash -> slot at which the tx was deleted */
|
|
62
|
+
#slotDeletedTxs: Map<string, SlotNumber> = new Map();
|
|
63
|
+
|
|
64
|
+
/** Persisted set tracking which txs are slot-deleted, for hydration cleanup. */
|
|
65
|
+
#slotDeletedDB: AztecAsyncSet<string>;
|
|
66
|
+
|
|
67
|
+
/** Current slot number, updated by cleanupSlotDeleted */
|
|
68
|
+
#currentSlot: SlotNumber = SlotNumber(0);
|
|
69
|
+
|
|
70
|
+
#log: Logger;
|
|
71
|
+
|
|
72
|
+
constructor(store: AztecAsyncKVStore, txsDB: AztecAsyncMap<string, Buffer>, log: Logger) {
|
|
73
|
+
this.#deletedTxsDB = store.openMap('deleted_txs');
|
|
74
|
+
this.#slotDeletedDB = store.openSet('slot_deleted_txs');
|
|
75
|
+
this.#txsDB = txsDB;
|
|
76
|
+
this.#log = log;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* Loads state from the database on startup.
|
|
81
|
+
* Slot-deleted txs are stale after restart and are immediately hard-deleted.
|
|
82
|
+
*/
|
|
83
|
+
async hydrateFromDatabase(): Promise<void> {
|
|
84
|
+
let prunedCount = 0;
|
|
85
|
+
let softDeletedCount = 0;
|
|
86
|
+
|
|
87
|
+
for await (const [txHash, buffer] of this.#deletedTxsDB.entriesAsync()) {
|
|
88
|
+
const state = deserializeState(buffer);
|
|
89
|
+
this.#state.set(txHash, state);
|
|
90
|
+
prunedCount++;
|
|
91
|
+
if (state.softDeleted) {
|
|
92
|
+
softDeletedCount++;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (prunedCount > 0 || softDeletedCount > 0) {
|
|
97
|
+
this.#log.info(`Loaded ${prunedCount} txs from pruned blocks, ${softDeletedCount} soft-deleted`);
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
// Slot-deleted txs are stale after restart - hard-delete them all
|
|
101
|
+
let slotDeletedCount = 0;
|
|
102
|
+
for await (const txHash of this.#slotDeletedDB.entriesAsync()) {
|
|
103
|
+
await this.#txsDB.delete(txHash);
|
|
104
|
+
await this.#slotDeletedDB.delete(txHash);
|
|
105
|
+
slotDeletedCount++;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
if (slotDeletedCount > 0) {
|
|
109
|
+
this.#log.info(`Hard-deleted ${slotDeletedCount} stale slot-deleted txs on startup`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Marks transactions as being from a pruned block.
|
|
115
|
+
* Called during handlePrunedBlocks for ALL transactions that were un-mined.
|
|
116
|
+
*
|
|
117
|
+
* If a tx was previously tracked (e.g., mined at block 4, pruned, re-mined at block 5,
|
|
118
|
+
* pruned again), updates to the higher block number. This ensures the tx is kept until
|
|
119
|
+
* its most recent mined block is finalized.
|
|
120
|
+
*
|
|
121
|
+
* @param txs - Array of {txHash, minedAtBlock} pairs, where minedAtBlock is the block
|
|
122
|
+
* number in which the tx was mined before being un-mined
|
|
123
|
+
*/
|
|
124
|
+
async markFromPrunedBlock(txs: { txHash: string; minedAtBlock: BlockNumber }[]): Promise<void> {
|
|
125
|
+
if (txs.length === 0) {
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
let count = 0;
|
|
130
|
+
for (const { txHash, minedAtBlock } of txs) {
|
|
131
|
+
const existing = this.#state.get(txHash);
|
|
132
|
+
// Update if not tracked, or if this is a higher mined block (tx was re-mined then pruned again)
|
|
133
|
+
if (existing === undefined || minedAtBlock > existing.minedAtBlock) {
|
|
134
|
+
const state: DeletedTxState = {
|
|
135
|
+
minedAtBlock,
|
|
136
|
+
softDeleted: existing?.softDeleted ?? false,
|
|
137
|
+
};
|
|
138
|
+
this.#state.set(txHash, state);
|
|
139
|
+
await this.#deletedTxsDB.set(txHash, serializeState(state));
|
|
140
|
+
count++;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
if (count > 0) {
|
|
145
|
+
this.#log.info(`Marked ${count} transactions from pruned blocks`);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/**
|
|
150
|
+
* Deletes a transaction. This is the single entry point for ALL deletions.
|
|
151
|
+
* The tx is always soft-deleted (kept in DB):
|
|
152
|
+
*
|
|
153
|
+
* - If the tx is from a pruned block: prune-soft-delete (kept until finalized)
|
|
154
|
+
* - If the tx is NOT from a pruned block: slot-soft-delete (kept until next slot)
|
|
155
|
+
*/
|
|
156
|
+
async deleteTx(txHash: string): Promise<void> {
|
|
157
|
+
const existing = this.#state.get(txHash);
|
|
158
|
+
if (existing !== undefined) {
|
|
159
|
+
// Prune-soft-delete - keep in DB until finalized
|
|
160
|
+
const state: DeletedTxState = {
|
|
161
|
+
minedAtBlock: existing.minedAtBlock,
|
|
162
|
+
softDeleted: true,
|
|
163
|
+
};
|
|
164
|
+
this.#state.set(txHash, state);
|
|
165
|
+
await this.#deletedTxsDB.set(txHash, serializeState(state));
|
|
166
|
+
} else {
|
|
167
|
+
// Slot-soft-delete - keep in DB until next slot
|
|
168
|
+
this.#slotDeletedTxs.set(txHash, this.#currentSlot);
|
|
169
|
+
await this.#slotDeletedDB.add(txHash);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
/**
|
|
174
|
+
* Clears tracking for a transaction if it re-mines at a block number >= the tracked minedAtBlock.
|
|
175
|
+
*
|
|
176
|
+
* When a tx re-mines at a higher (or equal) block, the old high-water mark is no longer needed:
|
|
177
|
+
* any future prune would re-add the tx with an even higher block number. Clearing keeps
|
|
178
|
+
* DeletedPool consistent — only txs that are actually un-mined should be tracked here.
|
|
179
|
+
*
|
|
180
|
+
* When a tx re-mines at a lower block, we must preserve the existing entry to retain
|
|
181
|
+
* the high-water mark for re-execution purposes.
|
|
182
|
+
*/
|
|
183
|
+
async clearIfMinedHigher(txHash: string, minedAtBlock: BlockNumber): Promise<void> {
|
|
184
|
+
const existing = this.#state.get(txHash);
|
|
185
|
+
if (existing !== undefined && minedAtBlock >= existing.minedAtBlock) {
|
|
186
|
+
this.#state.delete(txHash);
|
|
187
|
+
await this.#deletedTxsDB.delete(txHash);
|
|
188
|
+
this.#log.debug(
|
|
189
|
+
`Cleared tracking for tx ${txHash}: re-mined at block ${minedAtBlock} (was ${existing.minedAtBlock})`,
|
|
190
|
+
);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
/**
|
|
195
|
+
* Checks if a transaction is from a pruned block.
|
|
196
|
+
*/
|
|
197
|
+
isFromPrunedBlock(txHash: string): boolean {
|
|
198
|
+
return this.#state.has(txHash);
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
/**
|
|
202
|
+
* Checks if a transaction is soft-deleted (either prune-based or slot-based).
|
|
203
|
+
*/
|
|
204
|
+
isSoftDeleted(txHash: string): boolean {
|
|
205
|
+
return (this.#state.get(txHash)?.softDeleted ?? false) || this.#slotDeletedTxs.has(txHash);
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
/**
|
|
209
|
+
* Gets the block number in which a transaction was originally mined.
|
|
210
|
+
*/
|
|
211
|
+
getMinedAtBlock(txHash: string): BlockNumber | undefined {
|
|
212
|
+
return this.#state.get(txHash)?.minedAtBlock;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/**
|
|
216
|
+
* Finalizes transactions when a block is finalized.
|
|
217
|
+
* Hard-deletes transactions that were originally mined at or before the finalized block.
|
|
218
|
+
*
|
|
219
|
+
* @returns The hashes of transactions that were hard-deleted
|
|
220
|
+
*/
|
|
221
|
+
async finalizeBlock(finalizedBlockNumber: BlockNumber): Promise<string[]> {
|
|
222
|
+
const toHardDelete: string[] = [];
|
|
223
|
+
for (const [txHash, state] of this.#state) {
|
|
224
|
+
if (state.softDeleted && state.minedAtBlock <= finalizedBlockNumber) {
|
|
225
|
+
toHardDelete.push(txHash);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
if (toHardDelete.length === 0) {
|
|
230
|
+
return [];
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
// Hard-delete from all stores
|
|
234
|
+
for (const txHash of toHardDelete) {
|
|
235
|
+
this.#state.delete(txHash);
|
|
236
|
+
await this.#deletedTxsDB.delete(txHash);
|
|
237
|
+
await this.#txsDB.delete(txHash);
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
this.#log.debug(`Finalized ${toHardDelete.length} txs from pruned blocks at block ${finalizedBlockNumber}`, {
|
|
241
|
+
txHashes: toHardDelete,
|
|
242
|
+
});
|
|
243
|
+
return toHardDelete;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
/**
|
|
247
|
+
* Cleans up slot-deleted transactions from previous slots.
|
|
248
|
+
* Called at the start of prepareForSlot. Updates #currentSlot and hard-deletes
|
|
249
|
+
* any txs that were deleted in an earlier slot.
|
|
250
|
+
*/
|
|
251
|
+
async cleanupSlotDeleted(currentSlot: SlotNumber): Promise<void> {
|
|
252
|
+
const previousSlot = this.#currentSlot;
|
|
253
|
+
this.#currentSlot = currentSlot;
|
|
254
|
+
|
|
255
|
+
const toHardDelete: string[] = [];
|
|
256
|
+
for (const [txHash, deletedAtSlot] of this.#slotDeletedTxs) {
|
|
257
|
+
if (deletedAtSlot < currentSlot) {
|
|
258
|
+
toHardDelete.push(txHash);
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
if (toHardDelete.length === 0) {
|
|
263
|
+
return;
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
for (const txHash of toHardDelete) {
|
|
267
|
+
this.#slotDeletedTxs.delete(txHash);
|
|
268
|
+
await this.#slotDeletedDB.delete(txHash);
|
|
269
|
+
await this.#txsDB.delete(txHash);
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
this.#log.debug(
|
|
273
|
+
`Cleaned up ${toHardDelete.length} slot-deleted txs from slot ${previousSlot} (now slot ${currentSlot})`,
|
|
274
|
+
{ txHashes: toHardDelete },
|
|
275
|
+
);
|
|
276
|
+
}
|
|
277
|
+
|
|
278
|
+
/**
|
|
279
|
+
* Clears soft-deletion status for a transaction being re-added to the pool.
|
|
280
|
+
* Removes slot-deleted tracking entirely, and resets the prune-soft-deleted flag
|
|
281
|
+
* while preserving the prune tracking itself (so a subsequent delete still uses
|
|
282
|
+
* the prune path).
|
|
283
|
+
*/
|
|
284
|
+
async clearSoftDeleted(txHash: string): Promise<void> {
|
|
285
|
+
if (this.#slotDeletedTxs.has(txHash)) {
|
|
286
|
+
this.#slotDeletedTxs.delete(txHash);
|
|
287
|
+
await this.#slotDeletedDB.delete(txHash);
|
|
288
|
+
}
|
|
289
|
+
const existing = this.#state.get(txHash);
|
|
290
|
+
if (existing?.softDeleted) {
|
|
291
|
+
const state: DeletedTxState = { minedAtBlock: existing.minedAtBlock, softDeleted: false };
|
|
292
|
+
this.#state.set(txHash, state);
|
|
293
|
+
await this.#deletedTxsDB.set(txHash, serializeState(state));
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
/**
|
|
298
|
+
* Gets the count of transactions from pruned blocks.
|
|
299
|
+
*/
|
|
300
|
+
getCount(): number {
|
|
301
|
+
return this.#state.size;
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/**
|
|
305
|
+
* Gets all transaction hashes from pruned blocks.
|
|
306
|
+
*/
|
|
307
|
+
getPrunedTxHashes(): string[] {
|
|
308
|
+
return Array.from(this.#state.keys());
|
|
309
|
+
}
|
|
310
|
+
}
|
|
@@ -68,6 +68,9 @@ export class FeePayerBalanceEvictionRule implements EvictionRule {
|
|
|
68
68
|
|
|
69
69
|
if (txsToEvict.length > 0) {
|
|
70
70
|
await pool.deleteTxs(txsToEvict);
|
|
71
|
+
this.log.verbose(`Evicted ${txsToEvict.length} txs due to insufficient fee payer balance`, {
|
|
72
|
+
txHashes: txsToEvict,
|
|
73
|
+
});
|
|
71
74
|
}
|
|
72
75
|
|
|
73
76
|
return {
|
|
@@ -54,7 +54,7 @@ export class InvalidTxsAfterMiningRule implements EvictionRule {
|
|
|
54
54
|
await pool.deleteTxs(txsToEvict);
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
this.log.debug(`Evicted ${txsToEvict.length} invalid txs after block mined
|
|
57
|
+
this.log.debug(`Evicted ${txsToEvict.length} invalid txs after block mined`, { txHashes: txsToEvict });
|
|
58
58
|
|
|
59
59
|
return {
|
|
60
60
|
reason: 'block_mined_invalid_txs',
|
|
@@ -81,7 +81,7 @@ export class InvalidTxsAfterReorgRule implements EvictionRule {
|
|
|
81
81
|
this.log.verbose(`Kept ${keptCount} txs that did not reference pruned blocks`);
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
-
this.log.
|
|
84
|
+
this.log.info(`Evicted ${txsToEvict.length} invalid txs after reorg`, { txHashes: txsToEvict });
|
|
85
85
|
|
|
86
86
|
return {
|
|
87
87
|
reason: 'reorg_invalid_txs',
|
|
@@ -60,7 +60,9 @@ export class LowPriorityEvictionRule implements EvictionRule {
|
|
|
60
60
|
|
|
61
61
|
const numNewTxsEvicted = context.newTxHashes.filter(newTxHash => txsToEvict.includes(newTxHash)).length;
|
|
62
62
|
|
|
63
|
-
this.log.verbose(`Evicted ${txsToEvict.length} low priority txs, including ${numNewTxsEvicted} newly added txs
|
|
63
|
+
this.log.verbose(`Evicted ${txsToEvict.length} low priority txs, including ${numNewTxsEvicted} newly added txs`, {
|
|
64
|
+
txHashes: txsToEvict,
|
|
65
|
+
});
|
|
64
66
|
|
|
65
67
|
return {
|
|
66
68
|
reason: 'low_priority',
|
|
@@ -25,6 +25,8 @@ export type AddTxsResult = {
|
|
|
25
25
|
export type TxPoolV2Events = {
|
|
26
26
|
/** Emitted when transactions are successfully added to the pool */
|
|
27
27
|
'txs-added': (args: { txs: Tx[]; source?: string }) => void;
|
|
28
|
+
/** Emitted when transactions are removed from the pool */
|
|
29
|
+
'txs-removed': (args: { txHashes: TxHash[] }) => void;
|
|
28
30
|
};
|
|
29
31
|
|
|
30
32
|
/**
|
|
@@ -35,6 +37,8 @@ export type TxPoolV2Config = {
|
|
|
35
37
|
maxPendingTxCount: number;
|
|
36
38
|
/** Maximum number of archived transactions to retain (0 = disabled) */
|
|
37
39
|
archivedTxLimit: number;
|
|
40
|
+
/** Minimum age (ms) a transaction must have been in the pool before it's eligible for block building */
|
|
41
|
+
minTxPoolAgeMs: number;
|
|
38
42
|
};
|
|
39
43
|
|
|
40
44
|
/**
|
|
@@ -43,6 +47,7 @@ export type TxPoolV2Config = {
|
|
|
43
47
|
export const DEFAULT_TX_POOL_V2_CONFIG: TxPoolV2Config = {
|
|
44
48
|
maxPendingTxCount: 0, // 0 = disabled
|
|
45
49
|
archivedTxLimit: 0, // 0 = disabled
|
|
50
|
+
minTxPoolAgeMs: 2_000,
|
|
46
51
|
};
|
|
47
52
|
|
|
48
53
|
/**
|
|
@@ -53,8 +58,8 @@ export type TxPoolV2Dependencies = {
|
|
|
53
58
|
l2BlockSource: L2BlockSource;
|
|
54
59
|
/** World state synchronizer for validating transactions after chain prunes */
|
|
55
60
|
worldStateSynchronizer: WorldStateSynchronizer;
|
|
56
|
-
/**
|
|
57
|
-
|
|
61
|
+
/** Factory that creates a validator for re-validating pool transactions using metadata */
|
|
62
|
+
createTxValidator: () => Promise<TxValidator<TxMetaData>>;
|
|
58
63
|
};
|
|
59
64
|
|
|
60
65
|
/**
|
|
@@ -185,6 +190,9 @@ export interface TxPoolV2 extends TypedEventEmitter<TxPoolV2Events> {
|
|
|
185
190
|
/** Gets pending transaction hashes sorted by priority (highest first) */
|
|
186
191
|
getPendingTxHashes(): Promise<TxHash[]>;
|
|
187
192
|
|
|
193
|
+
/** Gets pending transaction hashes that have been in the pool long enough per minTxPoolAgeMs, sorted by priority (highest first) */
|
|
194
|
+
getEligiblePendingTxHashes(): Promise<TxHash[]>;
|
|
195
|
+
|
|
188
196
|
/** Gets the count of pending transactions */
|
|
189
197
|
getPendingTxCount(): Promise<number>;
|
|
190
198
|
|