@aztec/p2p 0.0.1-commit.6d63667d → 0.0.1-commit.858058eac
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 +40 -9
- package/dest/client/interface.d.ts +33 -15
- package/dest/client/interface.d.ts.map +1 -1
- package/dest/client/p2p_client.d.ts +33 -36
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +104 -139
- package/dest/client/test/tx_proposal_collector/proposal_tx_collector_worker.js +1 -1
- package/dest/config.d.ts +13 -4
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +11 -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 +102 -88
- package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/attestation_pool.js +436 -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 +87 -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 +180 -0
- 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 +3 -3
- package/dest/mem_pools/tx_pool_v2/interfaces.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool_v2/tx_metadata.d.ts +25 -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 +36 -4
- package/dest/mem_pools/tx_pool_v2/tx_pool_v2_impl.d.ts +1 -1
- 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 +77 -74
- 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 +364 -265
- 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/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 +4 -3
- package/dest/services/reqresp/protocols/block_txs/block_txs_handler.d.ts.map +1 -1
- package/dest/services/reqresp/protocols/block_txs/block_txs_reqresp.d.ts +7 -1
- 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 +15 -0
- 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 +7 -1
- package/dest/services/tx_collection/config.d.ts.map +1 -1
- package/dest/services/tx_collection/config.js +16 -0
- package/dest/services/tx_collection/fast_tx_collection.d.ts +3 -1
- package/dest/services/tx_collection/fast_tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/fast_tx_collection.js +17 -3
- package/dest/services/tx_collection/file_store_tx_collection.d.ts +44 -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 +118 -0
- package/dest/services/tx_collection/file_store_tx_source.d.ts +27 -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 +57 -0
- package/dest/services/tx_collection/index.d.ts +2 -1
- 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/slow_tx_collection.d.ts +3 -1
- package/dest/services/tx_collection/slow_tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/slow_tx_collection.js +48 -19
- package/dest/services/tx_collection/tx_collection.d.ts +17 -7
- package/dest/services/tx_collection/tx_collection.d.ts.map +1 -1
- package/dest/services/tx_collection/tx_collection.js +58 -2
- 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 +3 -3
- package/dest/services/tx_file_store/tx_file_store.d.ts.map +1 -1
- 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 +38 -38
- package/dest/test-helpers/testbench-utils.d.ts.map +1 -1
- package/dest/test-helpers/testbench-utils.js +124 -61
- package/dest/testbench/p2p_client_testbench_worker.js +2 -2
- package/package.json +14 -14
- package/src/client/factory.ts +68 -12
- package/src/client/interface.ts +39 -14
- package/src/client/p2p_client.ts +139 -162
- package/src/client/test/tx_proposal_collector/proposal_tx_collector_worker.ts +1 -1
- package/src/config.ts +26 -2
- package/src/index.ts +1 -0
- package/src/mem_pools/attestation_pool/attestation_pool.ts +488 -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 +59 -9
- package/src/mem_pools/tx_pool_v2/deleted_pool.ts +234 -0
- package/src/mem_pools/tx_pool_v2/index.ts +1 -0
- package/src/mem_pools/tx_pool_v2/interfaces.ts +2 -2
- package/src/mem_pools/tx_pool_v2/tx_metadata.ts +51 -5
- package/src/mem_pools/tx_pool_v2/tx_pool_v2_impl.ts +90 -77
- 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 +360 -269
- package/src/services/peer-manager/peer_scoring.ts +25 -0
- package/src/services/reqresp/interface.ts +26 -1
- package/src/services/reqresp/protocols/block_txs/block_txs_handler.ts +4 -3
- package/src/services/reqresp/protocols/block_txs/block_txs_reqresp.ts +17 -0
- 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 +26 -0
- package/src/services/tx_collection/fast_tx_collection.ts +14 -2
- package/src/services/tx_collection/file_store_tx_collection.ts +152 -0
- package/src/services/tx_collection/file_store_tx_source.ts +70 -0
- package/src/services/tx_collection/index.ts +1 -0
- package/src/services/tx_collection/slow_tx_collection.ts +55 -26
- package/src/services/tx_collection/tx_collection.ts +78 -12
- 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 +4 -4
- 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 +122 -74
- 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
|
@@ -51,7 +51,7 @@ export class FastTxCollection {
|
|
|
51
51
|
// This promise is used to await for the collection to finish during the main collectFast method.
|
|
52
52
|
// It gets resolved in `foundTxs` when all txs have been collected, or rejected if the request is aborted or hits the deadline.
|
|
53
53
|
const promise = promiseWithResolvers();
|
|
54
|
-
setTimeout(()=>promise.reject(new TimeoutError(`Timed out while collecting txs`)), timeout);
|
|
54
|
+
const timeoutTimer = setTimeout(()=>promise.reject(new TimeoutError(`Timed out while collecting txs`)), timeout);
|
|
55
55
|
const request = {
|
|
56
56
|
...input,
|
|
57
57
|
blockInfo,
|
|
@@ -63,6 +63,7 @@ export class FastTxCollection {
|
|
|
63
63
|
const [duration] = await elapsed(()=>this.collectFast(request, {
|
|
64
64
|
...opts
|
|
65
65
|
}));
|
|
66
|
+
clearTimeout(timeoutTimer);
|
|
66
67
|
this.log.verbose(`Collected ${request.foundTxs.size} txs out of ${txHashes.length} for ${input.type} at slot ${blockInfo.slotNumber}`, {
|
|
67
68
|
...blockInfo,
|
|
68
69
|
duration,
|
|
@@ -195,7 +196,7 @@ export class FastTxCollection {
|
|
|
195
196
|
node: node.getInfo(),
|
|
196
197
|
method: 'fast-node-rpc',
|
|
197
198
|
...request.blockInfo
|
|
198
|
-
});
|
|
199
|
+
}, this.getAddContext(request));
|
|
199
200
|
// Clear from the active requests the txs we just requested
|
|
200
201
|
for (const requestedTx of batch){
|
|
201
202
|
activeRequestsToThisNode.delete(requestedTx.txHash);
|
|
@@ -244,7 +245,7 @@ export class FastTxCollection {
|
|
|
244
245
|
method: 'fast-req-resp',
|
|
245
246
|
...opts,
|
|
246
247
|
...request.blockInfo
|
|
247
|
-
});
|
|
248
|
+
}, this.getAddContext(request));
|
|
248
249
|
} catch (err) {
|
|
249
250
|
this.log.error(`Error sending fast reqresp request for txs`, err, {
|
|
250
251
|
txs: [
|
|
@@ -254,6 +255,19 @@ export class FastTxCollection {
|
|
|
254
255
|
});
|
|
255
256
|
}
|
|
256
257
|
}
|
|
258
|
+
/** Returns the TxAddContext for the given request, used by the sink to add txs to the pool correctly. */ getAddContext(request) {
|
|
259
|
+
if (request.type === 'proposal') {
|
|
260
|
+
return {
|
|
261
|
+
type: 'proposal',
|
|
262
|
+
blockHeader: request.blockProposal.blockHeader
|
|
263
|
+
};
|
|
264
|
+
} else {
|
|
265
|
+
return {
|
|
266
|
+
type: 'mined',
|
|
267
|
+
block: request.block
|
|
268
|
+
};
|
|
269
|
+
}
|
|
270
|
+
}
|
|
257
271
|
/**
|
|
258
272
|
* Handle txs by marking them as found for the requests that are waiting for them, and resolves the request if all its txs have been found.
|
|
259
273
|
* Called internally and from the main tx collection manager whenever the tx pool emits a tx-added event.
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
2
|
+
import { Tx, TxHash } from '@aztec/stdlib/tx';
|
|
3
|
+
import type { FileStoreTxSource } from './file_store_tx_source.js';
|
|
4
|
+
import type { TxAddContext, TxCollectionSink } from './tx_collection_sink.js';
|
|
5
|
+
/**
|
|
6
|
+
* Collects txs from file stores as a fallback after P2P methods have been tried.
|
|
7
|
+
* Runs in parallel to slow/fast collection. The delay before starting file store
|
|
8
|
+
* collection is managed by the TxCollection orchestrator, not this class.
|
|
9
|
+
*/
|
|
10
|
+
export declare class FileStoreTxCollection {
|
|
11
|
+
private readonly fileStoreSources;
|
|
12
|
+
private readonly txCollectionSink;
|
|
13
|
+
private readonly log;
|
|
14
|
+
/** Map from tx hash to add context for txs queued for download. */
|
|
15
|
+
private pendingTxs;
|
|
16
|
+
/**
|
|
17
|
+
* Tracks tx hashes found elsewhere, even before startCollecting is called.
|
|
18
|
+
* Needed because the orchestrator delays startCollecting via a real sleep, but foundTxs
|
|
19
|
+
* may arrive during that delay — before the hashes are added to pendingTxs.
|
|
20
|
+
*/
|
|
21
|
+
private foundTxHashes;
|
|
22
|
+
/** Queue of tx hashes to be downloaded. */
|
|
23
|
+
private downloadQueue;
|
|
24
|
+
/** Worker promises for concurrent downloads. */
|
|
25
|
+
private workers;
|
|
26
|
+
/** Whether the collection has been started. */
|
|
27
|
+
private started;
|
|
28
|
+
constructor(fileStoreSources: FileStoreTxSource[], txCollectionSink: TxCollectionSink, log?: Logger);
|
|
29
|
+
/** Starts the file store collection workers. */
|
|
30
|
+
start(): void;
|
|
31
|
+
/** Stops all collection activity. */
|
|
32
|
+
stop(): Promise<void>;
|
|
33
|
+
/** Remove the given tx hashes from pending. */
|
|
34
|
+
stopCollecting(txHashes: TxHash[]): void;
|
|
35
|
+
/** Clears all pending state. Items already in the download queue will still be processed but won't be re-queued. */
|
|
36
|
+
clearPending(): void;
|
|
37
|
+
/** Queue the given tx hashes for file store collection. */
|
|
38
|
+
startCollecting(txHashes: TxHash[], context: TxAddContext): void;
|
|
39
|
+
/** Stop tracking txs that were found elsewhere. */
|
|
40
|
+
foundTxs(txs: Tx[]): void;
|
|
41
|
+
private processDownload;
|
|
42
|
+
private downloadTx;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZV9zdG9yZV90eF9jb2xsZWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9maWxlX3N0b3JlX3R4X2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBRWxFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFOUMsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNuRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUs5RTs7OztHQUlHO0FBQ0gscUJBQWEscUJBQXFCO0lBcUI5QixPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQjtJQUNqQyxPQUFPLENBQUMsUUFBUSxDQUFDLGdCQUFnQjtJQUNqQyxPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUF0QnRCLG1FQUFtRTtJQUNuRSxPQUFPLENBQUMsVUFBVSxDQUFtQztJQUVyRDs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLGFBQWEsQ0FBcUI7SUFFMUMsMkNBQTJDO0lBQzNDLE9BQU8sQ0FBQyxhQUFhLENBQWlDO0lBRXRELGdEQUFnRDtJQUNoRCxPQUFPLENBQUMsT0FBTyxDQUF1QjtJQUV0QywrQ0FBK0M7SUFDL0MsT0FBTyxDQUFDLE9BQU8sQ0FBUztJQUV4QixZQUNtQixnQkFBZ0IsRUFBRSxpQkFBaUIsRUFBRSxFQUNyQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsRUFDbEMsR0FBRyxHQUFFLE1BQXFELEVBQ3pFO0lBRUosZ0RBQWdEO0lBQ3pDLEtBQUssU0FrQlg7SUFFRCxxQ0FBcUM7SUFDeEIsSUFBSSxrQkFVaEI7SUFFRCwrQ0FBK0M7SUFDeEMsY0FBYyxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsUUFLdkM7SUFFRCxvSEFBb0g7SUFDN0csWUFBWSxTQUdsQjtJQUVELDJEQUEyRDtJQUNwRCxlQUFlLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFFLE9BQU8sRUFBRSxZQUFZLFFBUS9EO0lBRUQsbURBQW1EO0lBQzVDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsRUFBRSxFQUFFLFFBTXhCO1lBR2EsZUFBZTtZQWNmLFVBQVU7Q0EyQnpCIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file_store_tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/file_store_tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAK9E;;;;GAIG;AACH,qBAAa,qBAAqB;IAqB9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG;IAtBtB,mEAAmE;IACnE,OAAO,CAAC,UAAU,CAAmC;IAErD;;;;OAIG;IACH,OAAO,CAAC,aAAa,CAAqB;IAE1C,2CAA2C;IAC3C,OAAO,CAAC,aAAa,CAAiC;IAEtD,gDAAgD;IAChD,OAAO,CAAC,OAAO,CAAuB;IAEtC,+CAA+C;IAC/C,OAAO,CAAC,OAAO,CAAS;IAExB,YACmB,gBAAgB,EAAE,iBAAiB,EAAE,EACrC,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,GAAE,MAAqD,EACzE;IAEJ,gDAAgD;IACzC,KAAK,SAkBX;IAED,qCAAqC;IACxB,IAAI,kBAUhB;IAED,+CAA+C;IACxC,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAKvC;IAED,oHAAoH;IAC7G,YAAY,SAGlB;IAED,2DAA2D;IACpD,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,QAQ/D;IAED,mDAAmD;IAC5C,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,QAMxB;YAGa,eAAe;YAcf,UAAU;CA2BzB"}
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { FifoMemoryQueue } from '@aztec/foundation/queue';
|
|
3
|
+
// Internal constants (not configurable by node operators)
|
|
4
|
+
const FILE_STORE_DOWNLOAD_CONCURRENCY = 5; // Max concurrent downloads
|
|
5
|
+
/**
|
|
6
|
+
* Collects txs from file stores as a fallback after P2P methods have been tried.
|
|
7
|
+
* Runs in parallel to slow/fast collection. The delay before starting file store
|
|
8
|
+
* collection is managed by the TxCollection orchestrator, not this class.
|
|
9
|
+
*/ export class FileStoreTxCollection {
|
|
10
|
+
fileStoreSources;
|
|
11
|
+
txCollectionSink;
|
|
12
|
+
log;
|
|
13
|
+
/** Map from tx hash to add context for txs queued for download. */ pendingTxs;
|
|
14
|
+
/**
|
|
15
|
+
* Tracks tx hashes found elsewhere, even before startCollecting is called.
|
|
16
|
+
* Needed because the orchestrator delays startCollecting via a real sleep, but foundTxs
|
|
17
|
+
* may arrive during that delay — before the hashes are added to pendingTxs.
|
|
18
|
+
*/ foundTxHashes;
|
|
19
|
+
/** Queue of tx hashes to be downloaded. */ downloadQueue;
|
|
20
|
+
/** Worker promises for concurrent downloads. */ workers;
|
|
21
|
+
/** Whether the collection has been started. */ started;
|
|
22
|
+
constructor(fileStoreSources, txCollectionSink, log = createLogger('p2p:file_store_tx_collection')){
|
|
23
|
+
this.fileStoreSources = fileStoreSources;
|
|
24
|
+
this.txCollectionSink = txCollectionSink;
|
|
25
|
+
this.log = log;
|
|
26
|
+
this.pendingTxs = new Map();
|
|
27
|
+
this.foundTxHashes = new Set();
|
|
28
|
+
this.downloadQueue = new FifoMemoryQueue();
|
|
29
|
+
this.workers = [];
|
|
30
|
+
this.started = false;
|
|
31
|
+
}
|
|
32
|
+
/** Starts the file store collection workers. */ start() {
|
|
33
|
+
if (this.fileStoreSources.length === 0) {
|
|
34
|
+
this.log.debug('No file store sources configured, skipping file store collection');
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
this.started = true;
|
|
38
|
+
this.downloadQueue = new FifoMemoryQueue();
|
|
39
|
+
// Start concurrent download workers
|
|
40
|
+
for(let i = 0; i < FILE_STORE_DOWNLOAD_CONCURRENCY; i++){
|
|
41
|
+
this.workers.push(this.downloadQueue.process((txHash)=>this.processDownload(txHash)));
|
|
42
|
+
}
|
|
43
|
+
this.log.info(`Started file store tx collection with ${this.fileStoreSources.length} sources`, {
|
|
44
|
+
sources: this.fileStoreSources.map((s)=>s.getInfo()),
|
|
45
|
+
concurrency: FILE_STORE_DOWNLOAD_CONCURRENCY
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
/** Stops all collection activity. */ async stop() {
|
|
49
|
+
if (!this.started) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
this.started = false;
|
|
53
|
+
this.downloadQueue.end();
|
|
54
|
+
await Promise.all(this.workers);
|
|
55
|
+
this.workers = [];
|
|
56
|
+
this.pendingTxs.clear();
|
|
57
|
+
this.foundTxHashes.clear();
|
|
58
|
+
}
|
|
59
|
+
/** Remove the given tx hashes from pending. */ stopCollecting(txHashes) {
|
|
60
|
+
for (const txHash of txHashes){
|
|
61
|
+
const hashStr = txHash.toString();
|
|
62
|
+
this.pendingTxs.delete(hashStr);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
/** Clears all pending state. Items already in the download queue will still be processed but won't be re-queued. */ clearPending() {
|
|
66
|
+
this.pendingTxs.clear();
|
|
67
|
+
this.foundTxHashes.clear();
|
|
68
|
+
}
|
|
69
|
+
/** Queue the given tx hashes for file store collection. */ startCollecting(txHashes, context) {
|
|
70
|
+
for (const txHash of txHashes){
|
|
71
|
+
const hashStr = txHash.toString();
|
|
72
|
+
if (!this.pendingTxs.has(hashStr) && !this.foundTxHashes.has(hashStr)) {
|
|
73
|
+
this.pendingTxs.set(hashStr, context);
|
|
74
|
+
this.downloadQueue.put(txHash);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
/** Stop tracking txs that were found elsewhere. */ foundTxs(txs) {
|
|
79
|
+
for (const tx of txs){
|
|
80
|
+
const hashStr = tx.getTxHash().toString();
|
|
81
|
+
this.pendingTxs.delete(hashStr);
|
|
82
|
+
this.foundTxHashes.add(hashStr);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
/** Processes a single tx hash from the download queue. */ async processDownload(txHash) {
|
|
86
|
+
const hashStr = txHash.toString();
|
|
87
|
+
const context = this.pendingTxs.get(hashStr);
|
|
88
|
+
// Skip if already found by another method
|
|
89
|
+
if (!context) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
await this.downloadTx(txHash, context);
|
|
93
|
+
this.pendingTxs.delete(hashStr);
|
|
94
|
+
}
|
|
95
|
+
/** Attempt to download a tx from file stores (round-robin). */ async downloadTx(txHash, context) {
|
|
96
|
+
const startIndex = Math.floor(Math.random() * this.fileStoreSources.length);
|
|
97
|
+
for(let i = startIndex; i < startIndex + this.fileStoreSources.length; i++){
|
|
98
|
+
const source = this.fileStoreSources[i % this.fileStoreSources.length];
|
|
99
|
+
try {
|
|
100
|
+
const result = await this.txCollectionSink.collect((hashes)=>source.getTxsByHash(hashes), [
|
|
101
|
+
txHash
|
|
102
|
+
], {
|
|
103
|
+
description: `file-store ${source.getInfo()}`,
|
|
104
|
+
method: 'file-store',
|
|
105
|
+
fileStore: source.getInfo()
|
|
106
|
+
}, context);
|
|
107
|
+
if (result.txs.length > 0) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
} catch (err) {
|
|
111
|
+
this.log.trace(`Failed to download tx ${txHash} from ${source.getInfo()}`, {
|
|
112
|
+
err
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
this.log.trace(`Tx ${txHash} not found in any file store`);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
2
|
+
import { Tx, type TxHash } from '@aztec/stdlib/tx';
|
|
3
|
+
import type { TxSource } from './tx_source.js';
|
|
4
|
+
/** TxSource implementation that downloads txs from a file store. */
|
|
5
|
+
export declare class FileStoreTxSource implements TxSource {
|
|
6
|
+
private readonly fileStore;
|
|
7
|
+
private readonly baseUrl;
|
|
8
|
+
private readonly log;
|
|
9
|
+
private constructor();
|
|
10
|
+
/**
|
|
11
|
+
* Creates a FileStoreTxSource from a URL.
|
|
12
|
+
* @param url - The file store URL (s3://, gs://, file://, http://, https://).
|
|
13
|
+
* @param log - Optional logger.
|
|
14
|
+
* @returns The FileStoreTxSource instance, or undefined if creation fails.
|
|
15
|
+
*/
|
|
16
|
+
static create(url: string, log?: Logger): Promise<FileStoreTxSource | undefined>;
|
|
17
|
+
getInfo(): string;
|
|
18
|
+
getTxsByHash(txHashes: TxHash[]): Promise<(Tx | undefined)[]>;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Creates FileStoreTxSource instances from URLs.
|
|
22
|
+
* @param urls - Array of file store URLs.
|
|
23
|
+
* @param log - Optional logger.
|
|
24
|
+
* @returns Array of successfully created FileStoreTxSource instances.
|
|
25
|
+
*/
|
|
26
|
+
export declare function createFileStoreTxSources(urls: string[], log?: Logger): Promise<FileStoreTxSource[]>;
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsZV9zdG9yZV90eF9zb3VyY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy90eF9jb2xsZWN0aW9uL2ZpbGVfc3RvcmVfdHhfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLE1BQU0sRUFBZ0IsTUFBTSx1QkFBdUIsQ0FBQztBQUVsRSxPQUFPLEVBQUUsRUFBRSxFQUFFLEtBQUssTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFL0Msb0VBQW9FO0FBQ3BFLHFCQUFhLGlCQUFrQixZQUFXLFFBQVE7SUFFOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxTQUFTO0lBQzFCLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTztJQUN4QixPQUFPLENBQUMsUUFBUSxDQUFDLEdBQUc7SUFIdEIsT0FBTyxlQUlIO0lBRUo7Ozs7O09BS0c7SUFDSCxPQUFvQixNQUFNLENBQ3hCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsR0FBRyxHQUFFLE1BQWlELEdBQ3JELE9BQU8sQ0FBQyxpQkFBaUIsR0FBRyxTQUFTLENBQUMsQ0FZeEM7SUFFTSxPQUFPLElBQUksTUFBTSxDQUV2QjtJQUVNLFlBQVksQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLENBQUMsRUFBRSxHQUFHLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FhbkU7Q0FDRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLHdCQUF3QixDQUM1QyxJQUFJLEVBQUUsTUFBTSxFQUFFLEVBQ2QsR0FBRyxHQUFFLE1BQWlELEdBQ3JELE9BQU8sQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLENBRzlCIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file_store_tx_source.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/file_store_tx_source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,oEAAoE;AACpE,qBAAa,iBAAkB,YAAW,QAAQ;IAE9C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHtB,OAAO,eAIH;IAEJ;;;;;OAKG;IACH,OAAoB,MAAM,CACxB,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,MAAiD,GACrD,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAYxC;IAEM,OAAO,IAAI,MAAM,CAEvB;IAEM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC,CAanE;CACF;AAED;;;;;GAKG;AACH,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,GAAE,MAAiD,GACrD,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAG9B"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { createReadOnlyFileStore } from '@aztec/stdlib/file-store';
|
|
3
|
+
import { Tx } from '@aztec/stdlib/tx';
|
|
4
|
+
/** TxSource implementation that downloads txs from a file store. */ export class FileStoreTxSource {
|
|
5
|
+
fileStore;
|
|
6
|
+
baseUrl;
|
|
7
|
+
log;
|
|
8
|
+
constructor(fileStore, baseUrl, log){
|
|
9
|
+
this.fileStore = fileStore;
|
|
10
|
+
this.baseUrl = baseUrl;
|
|
11
|
+
this.log = log;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Creates a FileStoreTxSource from a URL.
|
|
15
|
+
* @param url - The file store URL (s3://, gs://, file://, http://, https://).
|
|
16
|
+
* @param log - Optional logger.
|
|
17
|
+
* @returns The FileStoreTxSource instance, or undefined if creation fails.
|
|
18
|
+
*/ static async create(url, log = createLogger('p2p:file_store_tx_source')) {
|
|
19
|
+
try {
|
|
20
|
+
const fileStore = await createReadOnlyFileStore(url, log);
|
|
21
|
+
if (!fileStore) {
|
|
22
|
+
log.warn(`Failed to create file store for URL: ${url}`);
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
return new FileStoreTxSource(fileStore, url, log);
|
|
26
|
+
} catch (err) {
|
|
27
|
+
log.warn(`Error creating file store for URL: ${url}`, {
|
|
28
|
+
error: err
|
|
29
|
+
});
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
getInfo() {
|
|
34
|
+
return `file-store:${this.baseUrl}`;
|
|
35
|
+
}
|
|
36
|
+
getTxsByHash(txHashes) {
|
|
37
|
+
return Promise.all(txHashes.map(async (txHash)=>{
|
|
38
|
+
const path = `txs/${txHash.toString()}.bin`;
|
|
39
|
+
try {
|
|
40
|
+
const buffer = await this.fileStore.read(path);
|
|
41
|
+
return Tx.fromBuffer(buffer);
|
|
42
|
+
} catch {
|
|
43
|
+
// Tx not found or error reading - return undefined
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
}));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Creates FileStoreTxSource instances from URLs.
|
|
51
|
+
* @param urls - Array of file store URLs.
|
|
52
|
+
* @param log - Optional logger.
|
|
53
|
+
* @returns Array of successfully created FileStoreTxSource instances.
|
|
54
|
+
*/ export async function createFileStoreTxSources(urls, log = createLogger('p2p:file_store_tx_source')) {
|
|
55
|
+
const sources = await Promise.all(urls.map((url)=>FileStoreTxSource.create(url, log)));
|
|
56
|
+
return sources.filter((s)=>s !== undefined);
|
|
57
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { TxCollection, type FastCollectionRequestInput } from './tx_collection.js';
|
|
2
2
|
export { type TxSource, createNodeRpcTxSources, NodeRpcTxSource } from './tx_source.js';
|
|
3
3
|
export { type MissingTxsCollector, BatchTxRequesterCollector, SendBatchRequestCollector, } from './proposal_tx_collector.js';
|
|
4
|
-
|
|
4
|
+
export { FileStoreTxSource, createFileStoreTxSources } from './file_store_tx_source.js';
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy90eF9jb2xsZWN0aW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSywwQkFBMEIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ25GLE9BQU8sRUFBRSxLQUFLLFFBQVEsRUFBRSxzQkFBc0IsRUFBRSxlQUFlLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxtQkFBbUIsRUFDeEIseUJBQXlCLEVBQ3pCLHlCQUF5QixHQUMxQixNQUFNLDRCQUE0QixDQUFDO0FBQ3BDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,KAAK,QAAQ,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EACL,KAAK,mBAAmB,EACxB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,KAAK,QAAQ,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxF,OAAO,EACL,KAAK,mBAAmB,EACxB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { TxCollection } from './tx_collection.js';
|
|
2
2
|
export { createNodeRpcTxSources, NodeRpcTxSource } from './tx_source.js';
|
|
3
3
|
export { BatchTxRequesterCollector, SendBatchRequestCollector } from './proposal_tx_collector.js';
|
|
4
|
+
export { FileStoreTxSource, createFileStoreTxSources } from './file_store_tx_source.js';
|
|
@@ -47,7 +47,9 @@ export declare class SlowTxCollection {
|
|
|
47
47
|
* To be called when there is a chain prune and previously mined txs are no longer relevant.
|
|
48
48
|
*/
|
|
49
49
|
stopCollectingForBlocksAfter(blockNumber: BlockNumber): void;
|
|
50
|
+
/** Groups missing tx entries by block number. */
|
|
51
|
+
private groupByBlock;
|
|
50
52
|
/** Computes the proof submission deadline for a given slot, a tx mined in this slot is no longer interesting after this deadline */
|
|
51
53
|
private getDeadlineForSlot;
|
|
52
54
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2xvd190eF9jb2xsZWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvdHhfY29sbGVjdGlvbi9zbG93X3R4X2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBMkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUV2RixPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFHbEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLE9BQU8sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QyxNQUFNLDZCQUE2QixDQUFDO0FBQ2hILE9BQU8sRUFBRSxLQUFLLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVuRCxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVwRixPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN0RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFL0MscUJBQWEsZ0JBQWdCO0lBV3pCLE9BQU8sQ0FBQyxPQUFPO0lBQ2YsT0FBTyxDQUFDLEtBQUs7SUFDYixPQUFPLENBQUMsZ0JBQWdCO0lBQ3hCLE9BQU8sQ0FBQyxjQUFjO0lBQ3RCLE9BQU8sQ0FBQyxTQUFTO0lBQ2pCLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFlBQVk7SUFDcEIsT0FBTyxDQUFDLEdBQUc7SUFqQmIsbUVBQW1FO0lBQ25FLE9BQU8sQ0FBQyxVQUFVLENBQXlDO0lBRTNELCtEQUErRDtJQUMvRCxPQUFPLENBQUMsd0JBQXdCLENBQW1CO0lBRW5ELHFFQUFxRTtJQUNyRSxPQUFPLENBQUMseUJBQXlCLENBQWlCO0lBRWxELFlBQ1UsT0FBTyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxrQkFBa0IsQ0FBQyxFQUNuRCxLQUFLLEVBQUUsUUFBUSxFQUFFLEVBQ2pCLGdCQUFnQixFQUFFLGdCQUFnQixFQUNsQyxjQUFjLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLDJCQUEyQixDQUFDLEVBQ25FLFNBQVMsRUFBRSxpQkFBaUIsRUFDNUIsTUFBTSxFQUFFLGtCQUFrQixFQUMxQixZQUFZLEdBQUUsWUFBaUMsRUFDL0MsR0FBRyxHQUFFLE1BQWtELEVBZ0JoRTtJQUVNLGtCQUFrQixhQUV4QjtJQUVNLEtBQUssU0FHWDtJQUVZLElBQUksa0JBS2hCO0lBRVksT0FBTyxrQkFLbkI7SUFFRCxtRkFBbUY7SUFDNUUsZUFBZSxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxRQXFCeEQ7WUFHYSx5QkFBeUI7WUF5Q3pCLDJCQUEyQjtJQTJDekMsK0hBQStIO0lBQy9ILE9BQU8sQ0FBQyw4QkFBOEI7SUFxQnRDLDhHQUE4RztJQUN2RyxRQUFRLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSxHQUFHLElBQUksQ0FJL0I7SUFFRDs7O09BR0c7SUFDSSwyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLElBQUksQ0FNakU7SUFFRDs7O09BR0c7SUFDSSw0QkFBNEIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLElBQUksQ0FNbEU7SUFFRCxpREFBaUQ7SUFDakQsT0FBTyxDQUFDLFlBQVk7SUFjcEIsb0lBQW9JO0lBQ3BJLE9BQU8sQ0FBQyxrQkFBa0I7Q0FNM0IifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slow_tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/slow_tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,iCAAiC,CAAC;AAEvF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,KAAK,iBAAiB,EAA6C,MAAM,6BAA6B,CAAC;AAChH,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,KAAK,gBAAgB,EAAsB,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,gBAAgB;IAWzB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,GAAG;IAjBb,mEAAmE;IACnE,OAAO,CAAC,UAAU,CAAyC;IAE3D,+DAA+D;IAC/D,OAAO,CAAC,wBAAwB,CAAmB;IAEnD,qEAAqE;IACrE,OAAO,CAAC,yBAAyB,CAAiB;IAElD,YACU,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,EACnD,KAAK,EAAE,QAAQ,EAAE,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,IAAI,CAAC,gBAAgB,EAAE,2BAA2B,CAAC,EACnE,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,YAAY,GAAE,YAAiC,EAC/C,GAAG,GAAE,MAAkD,EAgBhE;IAEM,kBAAkB,aAExB;IAEM,KAAK,SAGX;IAEY,IAAI,kBAKhB;IAEY,OAAO,kBAKnB;IAED,mFAAmF;IAC5E,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"slow_tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/slow_tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA2B,MAAM,iCAAiC,CAAC;AAEvF,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,KAAK,iBAAiB,EAA6C,MAAM,6BAA6B,CAAC;AAChH,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,KAAK,gBAAgB,EAAsB,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,qBAAa,gBAAgB;IAWzB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,GAAG;IAjBb,mEAAmE;IACnE,OAAO,CAAC,UAAU,CAAyC;IAE3D,+DAA+D;IAC/D,OAAO,CAAC,wBAAwB,CAAmB;IAEnD,qEAAqE;IACrE,OAAO,CAAC,yBAAyB,CAAiB;IAElD,YACU,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,EACnD,KAAK,EAAE,QAAQ,EAAE,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,IAAI,CAAC,gBAAgB,EAAE,2BAA2B,CAAC,EACnE,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,kBAAkB,EAC1B,YAAY,GAAE,YAAiC,EAC/C,GAAG,GAAE,MAAkD,EAgBhE;IAEM,kBAAkB,aAExB;IAEM,KAAK,SAGX;IAEY,IAAI,kBAKhB;IAEY,OAAO,kBAKnB;IAED,mFAAmF;IAC5E,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAqBxD;YAGa,yBAAyB;YAyCzB,2BAA2B;IA2CzC,+HAA+H;IAC/H,OAAO,CAAC,8BAA8B;IAqBtC,8GAA8G;IACvG,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,IAAI,CAI/B;IAED;;;OAGG;IACI,2BAA2B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAMjE;IAED;;;OAGG;IACI,4BAA4B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAMlE;IAED,iDAAiD;IACjD,OAAO,CAAC,YAAY;IAcpB,oIAAoI;IACpI,OAAO,CAAC,kBAAkB;CAM3B"}
|
|
@@ -66,6 +66,7 @@ export class SlowTxCollection {
|
|
|
66
66
|
}
|
|
67
67
|
for (const txHash of txHashes){
|
|
68
68
|
this.missingTxs.set(txHash.toString(), {
|
|
69
|
+
block,
|
|
69
70
|
blockNumber: block.number,
|
|
70
71
|
deadline: this.getDeadlineForSlot(block.header.getSlot()),
|
|
71
72
|
readyForReqResp: this.nodes.length === 0
|
|
@@ -81,17 +82,23 @@ export class SlowTxCollection {
|
|
|
81
82
|
}
|
|
82
83
|
// Gather all missing txs that are not in fast collection and request them from the node
|
|
83
84
|
const missingTxs = this.getMissingTxsForSlowCollection();
|
|
84
|
-
|
|
85
|
-
if (missingTxHashes.length === 0) {
|
|
85
|
+
if (missingTxs.length === 0) {
|
|
86
86
|
return;
|
|
87
87
|
}
|
|
88
|
-
//
|
|
89
|
-
for (const
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
88
|
+
// Group by block so we pass the correct mined context to the sink
|
|
89
|
+
for (const entries of this.groupByBlock(missingTxs)){
|
|
90
|
+
const block = entries[0][1].block;
|
|
91
|
+
const txHashes = entries.map(([txHash])=>TxHash.fromString(txHash));
|
|
92
|
+
for (const batch of chunk(txHashes, this.config.txCollectionNodeRpcMaxBatchSize)){
|
|
93
|
+
await this.txCollectionSink.collect((hashes)=>node.getTxsByHash(hashes), batch, {
|
|
94
|
+
description: `node ${node.getInfo()}`,
|
|
95
|
+
node: node.getInfo(),
|
|
96
|
+
method: 'slow-node-rpc'
|
|
97
|
+
}, {
|
|
98
|
+
type: 'mined',
|
|
99
|
+
block
|
|
100
|
+
});
|
|
101
|
+
}
|
|
95
102
|
}
|
|
96
103
|
// Mark every tx that is still missing as ready for reqresp.
|
|
97
104
|
// Note that we can just mark all requested txs as ready for reqresp, without filtering out the ones
|
|
@@ -117,17 +124,24 @@ export class SlowTxCollection {
|
|
|
117
124
|
}
|
|
118
125
|
const pinnedPeer = undefined;
|
|
119
126
|
const timeoutMs = this.config.txCollectionSlowReqRespTimeoutMs;
|
|
120
|
-
const maxPeers = boundInclusive(Math.ceil(missingTxs.length / 3), 4, 16);
|
|
121
127
|
const maxRetryAttempts = 3;
|
|
122
|
-
//
|
|
123
|
-
|
|
124
|
-
const
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
128
|
+
// Group by block so we pass the correct mined context to the sink
|
|
129
|
+
for (const entries of this.groupByBlock(missingTxs)){
|
|
130
|
+
const block = entries[0][1].block;
|
|
131
|
+
const txHashes = entries.map(([txHash])=>TxHash.fromString(txHash));
|
|
132
|
+
const maxPeers = boundInclusive(Math.ceil(txHashes.length / 3), 4, 16);
|
|
133
|
+
await this.txCollectionSink.collect(async (hashes)=>{
|
|
134
|
+
const txs = await this.reqResp.sendBatchRequest(ReqRespSubProtocol.TX, chunkTxHashesRequest(hashes), pinnedPeer, timeoutMs, maxPeers, maxRetryAttempts);
|
|
135
|
+
return txs.flat();
|
|
136
|
+
}, txHashes, {
|
|
137
|
+
description: 'slow reqresp',
|
|
138
|
+
timeoutMs,
|
|
139
|
+
method: 'slow-req-resp'
|
|
140
|
+
}, {
|
|
141
|
+
type: 'mined',
|
|
142
|
+
block
|
|
143
|
+
});
|
|
144
|
+
}
|
|
131
145
|
}
|
|
132
146
|
/** Retrieves all missing txs for the slow collection process. This is, all missing txs that are not part of a fast request. */ getMissingTxsForSlowCollection(opts = {}) {
|
|
133
147
|
// Remove expired txs from missingTxs
|
|
@@ -168,6 +182,21 @@ export class SlowTxCollection {
|
|
|
168
182
|
}
|
|
169
183
|
}
|
|
170
184
|
}
|
|
185
|
+
/** Groups missing tx entries by block number. */ groupByBlock(entries) {
|
|
186
|
+
const groups = new Map();
|
|
187
|
+
for (const entry of entries){
|
|
188
|
+
const bn = +entry[1].blockNumber;
|
|
189
|
+
let group = groups.get(bn);
|
|
190
|
+
if (!group) {
|
|
191
|
+
group = [];
|
|
192
|
+
groups.set(bn, group);
|
|
193
|
+
}
|
|
194
|
+
group.push(entry);
|
|
195
|
+
}
|
|
196
|
+
return [
|
|
197
|
+
...groups.values()
|
|
198
|
+
];
|
|
199
|
+
}
|
|
171
200
|
/** Computes the proof submission deadline for a given slot, a tx mined in this slot is no longer interesting after this deadline */ getDeadlineForSlot(slotNumber) {
|
|
172
201
|
const epoch = getEpochAtSlot(slotNumber, this.constants);
|
|
173
202
|
const submissionEndEpoch = EpochNumber(epoch + this.constants.proofSubmissionEpochs);
|
|
@@ -8,15 +8,17 @@ import type { BlockProposal } from '@aztec/stdlib/p2p';
|
|
|
8
8
|
import { Tx, TxHash } from '@aztec/stdlib/tx';
|
|
9
9
|
import { type TelemetryClient } from '@aztec/telemetry-client';
|
|
10
10
|
import type { PeerId } from '@libp2p/interface';
|
|
11
|
-
import type {
|
|
12
|
-
import type { TxPoolEvents } from '../../mem_pools/tx_pool/tx_pool.js';
|
|
11
|
+
import type { TxPoolV2, TxPoolV2Events } from '../../mem_pools/tx_pool_v2/interfaces.js';
|
|
13
12
|
import type { BatchTxRequesterLibP2PService } from '../reqresp/batch-tx-requester/interface.js';
|
|
14
13
|
import type { TxCollectionConfig } from './config.js';
|
|
15
14
|
import { FastTxCollection } from './fast_tx_collection.js';
|
|
15
|
+
import { FileStoreTxCollection } from './file_store_tx_collection.js';
|
|
16
|
+
import type { FileStoreTxSource } from './file_store_tx_source.js';
|
|
16
17
|
import { SlowTxCollection } from './slow_tx_collection.js';
|
|
17
18
|
import type { TxSource } from './tx_source.js';
|
|
18
|
-
export type CollectionMethod = 'fast-req-resp' | 'fast-node-rpc' | 'slow-req-resp' | 'slow-node-rpc';
|
|
19
|
+
export type CollectionMethod = 'fast-req-resp' | 'fast-node-rpc' | 'slow-req-resp' | 'slow-node-rpc' | 'file-store';
|
|
19
20
|
export type MissingTxInfo = {
|
|
21
|
+
block: L2Block;
|
|
20
22
|
blockNumber: BlockNumber;
|
|
21
23
|
deadline: Date;
|
|
22
24
|
readyForReqResp: boolean;
|
|
@@ -59,15 +61,21 @@ export declare class TxCollection {
|
|
|
59
61
|
protected readonly slowCollection: SlowTxCollection;
|
|
60
62
|
/** Fast collection methods */
|
|
61
63
|
protected readonly fastCollection: FastTxCollection;
|
|
64
|
+
/** File store collection */
|
|
65
|
+
protected readonly fileStoreCollection: FileStoreTxCollection;
|
|
62
66
|
/** Loop for periodically reconciling found transactions from the tx pool in case we missed some */
|
|
63
67
|
private readonly reconcileFoundTxsLoop;
|
|
64
68
|
/** Handles txs found by the slow and fast collection loops */
|
|
65
69
|
private readonly txCollectionSink;
|
|
66
70
|
/** Handler for the txs-added event from the tx pool */
|
|
67
|
-
protected readonly handleTxsAddedToPool:
|
|
71
|
+
protected readonly handleTxsAddedToPool: TxPoolV2Events['txs-added'];
|
|
68
72
|
/** Handler for the txs-added event from the tx collection sink */
|
|
69
|
-
protected readonly handleTxsFound:
|
|
70
|
-
|
|
73
|
+
protected readonly handleTxsFound: TxPoolV2Events['txs-added'];
|
|
74
|
+
/** Whether the service has been started. */
|
|
75
|
+
private started;
|
|
76
|
+
/** Whether file store sources are configured. */
|
|
77
|
+
private readonly hasFileStoreSources;
|
|
78
|
+
constructor(p2pService: BatchTxRequesterLibP2PService, nodes: TxSource[], constants: L1RollupConstants, txPool: TxPoolV2, config: TxCollectionConfig, fileStoreSources?: FileStoreTxSource[], dateProvider?: DateProvider, telemetryClient?: TelemetryClient, log?: Logger);
|
|
71
79
|
/** Starts all collection loops. */
|
|
72
80
|
start(): Promise<void>;
|
|
73
81
|
/** Stops all activity. */
|
|
@@ -93,6 +101,8 @@ export declare class TxCollection {
|
|
|
93
101
|
deadline: Date;
|
|
94
102
|
pinnedPeer?: PeerId;
|
|
95
103
|
}): Promise<Tx[]>;
|
|
104
|
+
/** Returns the TxAddContext for the given fast collection request input */
|
|
105
|
+
private getAddContextForInput;
|
|
96
106
|
/** Mark the given txs as found. Stops collecting them. */
|
|
97
107
|
private foundTxs;
|
|
98
108
|
/**
|
|
@@ -107,4 +117,4 @@ export declare class TxCollection {
|
|
|
107
117
|
stopCollectingForBlocksAfter(blockNumber: BlockNumber): void;
|
|
108
118
|
private reconcileFoundTxsWithPool;
|
|
109
119
|
}
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfY29sbGVjdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3R4X2NvbGxlY3Rpb24vdHhfY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxLQUFLLG9CQUFvQixFQUFrQixNQUFNLDJCQUEyQixDQUFDO0FBRXRGLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVuRixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRCxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsY0FBYyxFQUFFLE1BQU0sMENBQTBDLENBQUM7QUFDekYsT0FBTyxLQUFLLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQUNoRyxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN0RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMzRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUN0RSxPQUFPLEtBQUss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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,KAAK,oBAAoB,EAAkB,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"tx_collection.d.ts","sourceRoot":"","sources":["../../../src/services/tx_collection/tx_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,KAAK,oBAAoB,EAAkB,MAAM,2BAA2B,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAEnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AACzF,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,GAAG,YAAY,CAAC;AAEpH,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,IAAI,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAAC;AAEnH,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,aAAa,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC;AAEjF,MAAM,MAAM,qBAAqB,GAAG,0BAA0B,GAAG;IAC/D,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,QAAQ,EAAE,IAAI,CAAC;IACf,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACpC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;CAC3B,CAAC;AAEF;;;;;;;;;;GAUG;AACH,qBAAa,YAAY;IA6BrB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,GAAG;IApCtB,uCAAuC;IACvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC;IAEpD,8BAA8B;IAC9B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,gBAAgB,CAAC;IAEpD,4BAA4B;IAC5B,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,qBAAqB,CAAC;IAE9D,mGAAmG;IACnG,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IAEvD,8DAA8D;IAC9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IAEpD,uDAAuD;IACvD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IAErE,kEAAkE;IAClE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC;IAE/D,4CAA4C;IAC5C,OAAO,CAAC,OAAO,CAAS;IAExB,iDAAiD;IACjD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IAE9C,YACmB,UAAU,EAAE,6BAA6B,EACzC,KAAK,EAAE,QAAQ,EAAE,EACjB,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,QAAQ,EAChB,MAAM,EAAE,kBAAkB,EAC3C,gBAAgB,GAAE,iBAAiB,EAAO,EACzB,YAAY,GAAE,YAAiC,EAChE,eAAe,GAAE,eAAsC,EACtC,GAAG,GAAE,MAAkD,EA6CzE;IAED,mCAAmC;IAC5B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ5B;IAED,0BAA0B;IACb,IAAI,kBAWhB;IAED,iEAAiE;IACpD,OAAO,kBAEnB;IAED,mCAAmC;IAC5B,YAAY,IAAI,iBAAiB,CAEvC;IAED,mFAAmF;IAC5E,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,QAmBxD;IAED,+EAA+E;IACxE,sBAAsB,CAC3B,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAG9C;IAED,4EAA4E;IACrE,mBAAmB,CACxB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAG9C;IAED,kFAAkF;IAC3E,cAAc,CACnB,KAAK,EAAE,0BAA0B,EACjC,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,EAC7B,IAAI,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,iBAiB9C;IAED,2EAA2E;IAC3E,OAAO,CAAC,qBAAqB;IAQ7B,0DAA0D;IAC1D,OAAO,CAAC,QAAQ;IAMhB;;;OAGG;IACI,2BAA2B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAIjE;IAED;;;OAGG;IACI,4BAA4B,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAIlE;YAGa,yBAAyB;CAUxC"}
|