@aztec/p2p 0.72.1 → 0.74.0
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/bootstrap/bootstrap.d.ts +2 -2
- package/dest/bootstrap/bootstrap.d.ts.map +1 -1
- package/dest/bootstrap/bootstrap.js +1 -1
- package/dest/client/factory.d.ts +2 -2
- package/dest/client/factory.d.ts.map +1 -1
- package/dest/client/factory.js +4 -4
- package/dest/client/p2p_client.d.ts +13 -16
- package/dest/client/p2p_client.d.ts.map +1 -1
- package/dest/client/p2p_client.js +50 -62
- 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 +11 -19
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +6 -13
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +74 -80
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +5 -5
- package/dest/mem_pools/attestation_pool/mocks.d.ts +1 -1
- package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -1
- package/dest/mem_pools/attestation_pool/mocks.js +3 -3
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +9 -9
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +59 -53
- package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +7 -7
- package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/memory_tx_pool.js +17 -18
- package/dest/mem_pools/tx_pool/tx_pool.d.ts +7 -7
- package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -1
- package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +48 -47
- package/dest/mocks/index.js +3 -3
- package/dest/msg_validators/attestation_validator/attestation_validator.js +2 -2
- package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +2 -2
- package/dest/msg_validators/tx_validator/block_header_validator.js +3 -3
- package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/data_validator.js +7 -7
- package/dest/msg_validators/tx_validator/double_spend_validator.js +3 -3
- package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -1
- package/dest/msg_validators/tx_validator/metadata_validator.js +9 -9
- package/dest/services/data_store.d.ts +4 -4
- package/dest/services/data_store.d.ts.map +1 -1
- package/dest/services/data_store.js +7 -7
- package/dest/services/libp2p/libp2p_service.d.ts +3 -3
- package/dest/services/libp2p/libp2p_service.d.ts.map +1 -1
- package/dest/services/libp2p/libp2p_service.js +56 -35
- package/dest/services/peer-manager/peer_manager.d.ts +1 -0
- package/dest/services/peer-manager/peer_manager.d.ts.map +1 -1
- package/dest/services/peer-manager/peer_manager.js +6 -3
- package/dest/services/reqresp/protocols/tx.js +4 -4
- package/dest/services/reqresp/reqresp.d.ts.map +1 -1
- package/dest/services/reqresp/reqresp.js +2 -2
- package/dest/util.d.ts +2 -2
- package/dest/util.d.ts.map +1 -1
- package/dest/util.js +2 -2
- package/package.json +7 -7
- package/src/bootstrap/bootstrap.ts +2 -2
- package/src/client/factory.ts +5 -5
- package/src/client/p2p_client.ts +63 -75
- package/src/mem_pools/attestation_pool/attestation_pool_test_suite.ts +14 -22
- package/src/mem_pools/attestation_pool/kv_attestation_pool.ts +100 -94
- package/src/mem_pools/attestation_pool/memory_attestation_pool.ts +4 -4
- package/src/mem_pools/attestation_pool/mocks.ts +3 -3
- package/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts +84 -72
- package/src/mem_pools/tx_pool/memory_tx_pool.ts +26 -23
- package/src/mem_pools/tx_pool/tx_pool.ts +7 -7
- package/src/mem_pools/tx_pool/tx_pool_test_suite.ts +50 -47
- package/src/mocks/index.ts +2 -2
- package/src/msg_validators/attestation_validator/attestation_validator.ts +1 -1
- package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts +1 -1
- package/src/msg_validators/tx_validator/block_header_validator.ts +2 -2
- package/src/msg_validators/tx_validator/data_validator.ts +12 -9
- package/src/msg_validators/tx_validator/double_spend_validator.ts +2 -2
- package/src/msg_validators/tx_validator/metadata_validator.ts +8 -8
- package/src/services/data_store.ts +9 -9
- package/src/services/libp2p/libp2p_service.ts +70 -36
- package/src/services/peer-manager/peer_manager.ts +7 -2
- package/src/services/reqresp/protocols/tx.ts +3 -3
- package/src/services/reqresp/reqresp.ts +7 -1
- package/src/util.ts +7 -4
|
@@ -2,6 +2,7 @@ var _AztecKVTxPool_store, _AztecKVTxPool_txs, _AztecKVTxPool_minedTxHashToBlock,
|
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { Tx, TxHash } from '@aztec/circuit-types';
|
|
4
4
|
import { ClientIvcProof } from '@aztec/circuits.js';
|
|
5
|
+
import { toArray } from '@aztec/foundation/iterable';
|
|
5
6
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
7
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
7
8
|
import { PoolInstrumentation, PoolName } from '../instrumentation.js';
|
|
@@ -52,15 +53,15 @@ export class AztecKVTxPool {
|
|
|
52
53
|
return Promise.resolve();
|
|
53
54
|
}
|
|
54
55
|
let deletedPending = 0;
|
|
55
|
-
return __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").
|
|
56
|
+
return __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").transactionAsync(async () => {
|
|
56
57
|
for (const hash of txHashes) {
|
|
57
58
|
const key = hash.toString();
|
|
58
|
-
|
|
59
|
-
const tx = this.getTxByHash(hash);
|
|
59
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").set(key, blockNumber);
|
|
60
|
+
const tx = await this.getTxByHash(hash);
|
|
60
61
|
if (tx) {
|
|
61
62
|
deletedPending++;
|
|
62
63
|
const fee = getPendingTxPriority(tx);
|
|
63
|
-
|
|
64
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_pendingTxPriorityToHash, "f").deleteValue(fee, key);
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
__classPrivateFieldGet(this, _AztecKVTxPool_metrics, "f").recordAddedObjects(txHashes.length, 'mined');
|
|
@@ -72,13 +73,13 @@ export class AztecKVTxPool {
|
|
|
72
73
|
return Promise.resolve();
|
|
73
74
|
}
|
|
74
75
|
let markedAsPending = 0;
|
|
75
|
-
return __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").
|
|
76
|
+
return __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").transactionAsync(async () => {
|
|
76
77
|
for (const hash of txHashes) {
|
|
77
78
|
const key = hash.toString();
|
|
78
|
-
|
|
79
|
-
const tx = this.getTxByHash(hash);
|
|
79
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").delete(key);
|
|
80
|
+
const tx = await this.getTxByHash(hash);
|
|
80
81
|
if (tx) {
|
|
81
|
-
|
|
82
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_pendingTxPriorityToHash, "f").set(getPendingTxPriority(tx), key);
|
|
82
83
|
markedAsPending++;
|
|
83
84
|
}
|
|
84
85
|
}
|
|
@@ -86,21 +87,21 @@ export class AztecKVTxPool {
|
|
|
86
87
|
__classPrivateFieldGet(this, _AztecKVTxPool_metrics, "f").recordRemovedObjects(markedAsPending, 'mined');
|
|
87
88
|
});
|
|
88
89
|
}
|
|
89
|
-
getPendingTxHashes() {
|
|
90
|
-
|
|
90
|
+
async getPendingTxHashes() {
|
|
91
|
+
const vals = await toArray(__classPrivateFieldGet(this, _AztecKVTxPool_pendingTxPriorityToHash, "f").valuesAsync({ reverse: true }));
|
|
92
|
+
return vals.map(x => TxHash.fromString(x));
|
|
91
93
|
}
|
|
92
|
-
getMinedTxHashes() {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
blockNumber,
|
|
96
|
-
]);
|
|
94
|
+
async getMinedTxHashes() {
|
|
95
|
+
const vals = await toArray(__classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").entriesAsync());
|
|
96
|
+
return vals.map(([txHash, blockNumber]) => [TxHash.fromString(txHash), blockNumber]);
|
|
97
97
|
}
|
|
98
|
-
getTxStatus(txHash) {
|
|
98
|
+
async getTxStatus(txHash) {
|
|
99
99
|
const key = txHash.toString();
|
|
100
|
-
|
|
100
|
+
const [isMined, isKnown] = await Promise.all([__classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").hasAsync(key), __classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").hasAsync(key)]);
|
|
101
|
+
if (isMined) {
|
|
101
102
|
return 'mined';
|
|
102
103
|
}
|
|
103
|
-
else if (
|
|
104
|
+
else if (isKnown) {
|
|
104
105
|
return 'pending';
|
|
105
106
|
}
|
|
106
107
|
else {
|
|
@@ -112,8 +113,8 @@ export class AztecKVTxPool {
|
|
|
112
113
|
* @param txHash - The generated tx hash.
|
|
113
114
|
* @returns The transaction, if found, 'undefined' otherwise.
|
|
114
115
|
*/
|
|
115
|
-
getTxByHash(txHash) {
|
|
116
|
-
const buffer = __classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").
|
|
116
|
+
async getTxByHash(txHash) {
|
|
117
|
+
const buffer = await __classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").getAsync(txHash.toString());
|
|
117
118
|
if (buffer) {
|
|
118
119
|
const tx = Tx.fromBuffer(buffer);
|
|
119
120
|
tx.setTxHash(txHash);
|
|
@@ -126,8 +127,8 @@ export class AztecKVTxPool {
|
|
|
126
127
|
* @param txHash - The tx hash.
|
|
127
128
|
* @returns The transaction metadata, if found, 'undefined' otherwise.
|
|
128
129
|
*/
|
|
129
|
-
getArchivedTxByHash(txHash) {
|
|
130
|
-
const buffer = __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxs, "f").
|
|
130
|
+
async getArchivedTxByHash(txHash) {
|
|
131
|
+
const buffer = await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxs, "f").getAsync(txHash.toString());
|
|
131
132
|
if (buffer) {
|
|
132
133
|
const tx = Tx.fromBuffer(buffer);
|
|
133
134
|
tx.setTxHash(txHash);
|
|
@@ -140,24 +141,25 @@ export class AztecKVTxPool {
|
|
|
140
141
|
* @param txs - An array of txs to be added to the pool.
|
|
141
142
|
* @returns Empty promise.
|
|
142
143
|
*/
|
|
143
|
-
addTxs(txs) {
|
|
144
|
-
|
|
144
|
+
async addTxs(txs) {
|
|
145
|
+
const hashesAndStats = await Promise.all(txs.map(async (tx) => ({ txHash: await tx.getTxHash(), txStats: await tx.getStats() })));
|
|
146
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").transactionAsync(async () => {
|
|
145
147
|
let pendingCount = 0;
|
|
146
|
-
|
|
147
|
-
const txHash =
|
|
148
|
+
await Promise.all(txs.map(async (tx, i) => {
|
|
149
|
+
const { txHash, txStats } = hashesAndStats[i];
|
|
148
150
|
__classPrivateFieldGet(this, _AztecKVTxPool_log, "f").verbose(`Adding tx ${txHash.toString()} to pool`, {
|
|
149
151
|
eventName: 'tx-added-to-pool',
|
|
150
|
-
...
|
|
152
|
+
...txStats,
|
|
151
153
|
});
|
|
152
154
|
const key = txHash.toString();
|
|
153
|
-
|
|
154
|
-
if (!__classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").
|
|
155
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").set(key, tx.toBuffer());
|
|
156
|
+
if (!(await __classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").hasAsync(key))) {
|
|
155
157
|
pendingCount++;
|
|
156
158
|
// REFACTOR: Use an lmdb conditional write to avoid race conditions with this write tx
|
|
157
|
-
|
|
159
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_pendingTxPriorityToHash, "f").set(getPendingTxPriority(tx), key);
|
|
158
160
|
__classPrivateFieldGet(this, _AztecKVTxPool_metrics, "f").recordSize(tx);
|
|
159
161
|
}
|
|
160
|
-
}
|
|
162
|
+
}));
|
|
161
163
|
__classPrivateFieldGet(this, _AztecKVTxPool_metrics, "f").recordAddedObjects(pendingCount, 'pending');
|
|
162
164
|
});
|
|
163
165
|
}
|
|
@@ -170,14 +172,14 @@ export class AztecKVTxPool {
|
|
|
170
172
|
let pendingDeleted = 0;
|
|
171
173
|
let minedDeleted = 0;
|
|
172
174
|
const deletedTxs = [];
|
|
173
|
-
const poolDbTx = __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").
|
|
175
|
+
const poolDbTx = __classPrivateFieldGet(this, _AztecKVTxPool_store, "f").transactionAsync(async () => {
|
|
174
176
|
for (const hash of txHashes) {
|
|
175
177
|
const key = hash.toString();
|
|
176
|
-
const tx = this.getTxByHash(hash);
|
|
178
|
+
const tx = await this.getTxByHash(hash);
|
|
177
179
|
if (tx) {
|
|
178
180
|
const fee = getPendingTxPriority(tx);
|
|
179
|
-
|
|
180
|
-
const isMined = __classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").
|
|
181
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_pendingTxPriorityToHash, "f").deleteValue(fee, key);
|
|
182
|
+
const isMined = await __classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").hasAsync(key);
|
|
181
183
|
if (isMined) {
|
|
182
184
|
minedDeleted++;
|
|
183
185
|
}
|
|
@@ -187,8 +189,8 @@ export class AztecKVTxPool {
|
|
|
187
189
|
if (__classPrivateFieldGet(this, _AztecKVTxPool_archivedTxLimit, "f")) {
|
|
188
190
|
deletedTxs.push(tx);
|
|
189
191
|
}
|
|
190
|
-
|
|
191
|
-
|
|
192
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").delete(key);
|
|
193
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_minedTxHashToBlock, "f").delete(key);
|
|
192
194
|
}
|
|
193
195
|
}
|
|
194
196
|
__classPrivateFieldGet(this, _AztecKVTxPool_metrics, "f").recordRemovedObjects(pendingDeleted, 'pending');
|
|
@@ -200,8 +202,9 @@ export class AztecKVTxPool {
|
|
|
200
202
|
* Gets all the transactions stored in the pool.
|
|
201
203
|
* @returns Array of tx objects in the order they were added to the pool.
|
|
202
204
|
*/
|
|
203
|
-
getAllTxs() {
|
|
204
|
-
|
|
205
|
+
async getAllTxs() {
|
|
206
|
+
const vals = await toArray(__classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").entriesAsync());
|
|
207
|
+
return vals.map(([hash, buffer]) => {
|
|
205
208
|
const tx = Tx.fromBuffer(buffer);
|
|
206
209
|
tx.setTxHash(TxHash.fromString(hash));
|
|
207
210
|
return tx;
|
|
@@ -211,36 +214,39 @@ export class AztecKVTxPool {
|
|
|
211
214
|
* Gets the hashes of all transactions currently in the tx pool.
|
|
212
215
|
* @returns An array of transaction hashes found in the tx pool.
|
|
213
216
|
*/
|
|
214
|
-
getAllTxHashes() {
|
|
215
|
-
|
|
217
|
+
async getAllTxHashes() {
|
|
218
|
+
const vals = await toArray(__classPrivateFieldGet(this, _AztecKVTxPool_txs, "f").keysAsync());
|
|
219
|
+
return vals.map(x => TxHash.fromString(x));
|
|
216
220
|
}
|
|
217
221
|
/**
|
|
218
222
|
* Archives a list of txs for future reference. The number of archived txs is limited by the specified archivedTxLimit.
|
|
219
223
|
* @param txs - The list of transactions to archive.
|
|
220
224
|
* @returns Empty promise.
|
|
221
225
|
*/
|
|
222
|
-
archiveTxs(txs) {
|
|
223
|
-
|
|
226
|
+
async archiveTxs(txs) {
|
|
227
|
+
const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
|
|
228
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_archive, "f").transactionAsync(async () => {
|
|
224
229
|
// calcualte the head and tail indices of the archived txs by insertion order.
|
|
225
|
-
let headIdx = (__classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").
|
|
226
|
-
let tailIdx = __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").
|
|
227
|
-
for (
|
|
230
|
+
let headIdx = ((await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").entriesAsync({ limit: 1, reverse: true }).next()).value?.[0] ?? -1) + 1;
|
|
231
|
+
let tailIdx = (await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").entriesAsync({ limit: 1 }).next()).value?.[0] ?? 0;
|
|
232
|
+
for (let i = 0; i < txs.length; i++) {
|
|
233
|
+
const tx = txs[i];
|
|
228
234
|
while (headIdx - tailIdx >= __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxLimit, "f")) {
|
|
229
|
-
const txHash = __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").
|
|
235
|
+
const txHash = await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").getAsync(tailIdx);
|
|
230
236
|
if (txHash) {
|
|
231
|
-
|
|
232
|
-
|
|
237
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxs, "f").delete(txHash);
|
|
238
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").delete(tailIdx);
|
|
233
239
|
}
|
|
234
240
|
tailIdx++;
|
|
235
241
|
}
|
|
236
242
|
const archivedTx = new Tx(tx.data, ClientIvcProof.empty(), tx.contractClassLogs, tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall);
|
|
237
|
-
const txHash =
|
|
238
|
-
|
|
239
|
-
|
|
243
|
+
const txHash = txHashes[i].toString();
|
|
244
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxs, "f").set(txHash, archivedTx.toBuffer());
|
|
245
|
+
await __classPrivateFieldGet(this, _AztecKVTxPool_archivedTxIndices, "f").set(headIdx, txHash);
|
|
240
246
|
headIdx++;
|
|
241
247
|
}
|
|
242
248
|
});
|
|
243
249
|
}
|
|
244
250
|
}
|
|
245
251
|
_AztecKVTxPool_store = new WeakMap(), _AztecKVTxPool_txs = new WeakMap(), _AztecKVTxPool_minedTxHashToBlock = new WeakMap(), _AztecKVTxPool_pendingTxPriorityToHash = new WeakMap(), _AztecKVTxPool_archive = new WeakMap(), _AztecKVTxPool_archivedTxs = new WeakMap(), _AztecKVTxPool_archivedTxIndices = new WeakMap(), _AztecKVTxPool_archivedTxLimit = new WeakMap(), _AztecKVTxPool_log = new WeakMap(), _AztecKVTxPool_metrics = new WeakMap();
|
|
246
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"aztec_kv_tx_pool.js","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"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"}
|
|
252
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"aztec_kv_tx_pool.js","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/aztec_kv_tx_pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,16 +20,16 @@ export declare class InMemoryTxPool implements TxPool {
|
|
|
20
20
|
constructor(telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
|
|
21
21
|
markAsMined(txHashes: TxHash[], blockNumber: number): Promise<void>;
|
|
22
22
|
markMinedAsPending(txHashes: TxHash[]): Promise<void>;
|
|
23
|
-
getPendingTxHashes(): TxHash[]
|
|
24
|
-
getMinedTxHashes(): [TxHash, number][]
|
|
25
|
-
getTxStatus(txHash: TxHash): 'pending' | 'mined' | undefined
|
|
23
|
+
getPendingTxHashes(): Promise<TxHash[]>;
|
|
24
|
+
getMinedTxHashes(): Promise<[TxHash, number][]>;
|
|
25
|
+
getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
|
|
26
26
|
/**
|
|
27
27
|
* Checks if a transaction exists in the pool and returns it.
|
|
28
28
|
* @param txHash - The generated tx hash.
|
|
29
29
|
* @returns The transaction, if found, 'undefined' otherwise.
|
|
30
30
|
*/
|
|
31
|
-
getTxByHash(txHash: TxHash): Tx | undefined
|
|
32
|
-
getArchivedTxByHash(): Tx | undefined
|
|
31
|
+
getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
|
|
32
|
+
getArchivedTxByHash(): Promise<Tx | undefined>;
|
|
33
33
|
/**
|
|
34
34
|
* Adds a list of transactions to the pool. Duplicates are ignored.
|
|
35
35
|
* @param txs - An array of txs to be added to the pool.
|
|
@@ -46,11 +46,11 @@ export declare class InMemoryTxPool implements TxPool {
|
|
|
46
46
|
* Gets all the transactions stored in the pool.
|
|
47
47
|
* @returns Array of tx objects in the order they were added to the pool.
|
|
48
48
|
*/
|
|
49
|
-
getAllTxs(): Tx[]
|
|
49
|
+
getAllTxs(): Promise<Tx[]>;
|
|
50
50
|
/**
|
|
51
51
|
* Gets the hashes of all transactions currently in the tx pool.
|
|
52
52
|
* @returns An array of transaction hashes found in the tx pool.
|
|
53
53
|
*/
|
|
54
|
-
getAllTxHashes(): TxHash[]
|
|
54
|
+
getAllTxHashes(): Promise<TxHash[]>;
|
|
55
55
|
}
|
|
56
56
|
//# sourceMappingURL=memory_tx_pool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAcoB,OAAO,CAAC,GAAG;IAb1E;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBACS,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAA8B;IAOjG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"memory_tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/memory_tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAInF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAcoB,OAAO,CAAC,GAAG;IAb1E;;OAEG;IACH,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAc;IAEhC,OAAO,CAAC,OAAO,CAA0B;IAEzC;;;OAGG;gBACS,SAAS,GAAE,eAAsC,EAAU,GAAG,yCAA8B;IAOjG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWnE,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0B/C,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ7C,gBAAgB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAM/C,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAW5E;;;;OAIG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAKpD,mBAAmB,IAAI,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIrD;;;;OAIG;IACU,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7C;;;;OAIG;IACI,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD;;;OAGG;IACI,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIjC;;;OAGG;IACI,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}
|
|
@@ -49,24 +49,23 @@ export class InMemoryTxPool {
|
|
|
49
49
|
this.metrics.recordAddedObjects(added, 'pending');
|
|
50
50
|
return Promise.resolve();
|
|
51
51
|
}
|
|
52
|
-
getPendingTxHashes() {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
.filter(txHash => this.pendingTxs.has(txHash.toBigInt()));
|
|
52
|
+
async getPendingTxHashes() {
|
|
53
|
+
const txs = (await this.getAllTxs()).sort((tx1, tx2) => -getPendingTxPriority(tx1).localeCompare(getPendingTxPriority(tx2)));
|
|
54
|
+
const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
|
|
55
|
+
return txHashes.filter(txHash => this.pendingTxs.has(txHash.toBigInt()));
|
|
57
56
|
}
|
|
58
57
|
getMinedTxHashes() {
|
|
59
|
-
return Array.from(this.minedTxs.entries()).map(([txHash, blockNumber]) => [TxHash.fromBigInt(txHash), blockNumber]);
|
|
58
|
+
return Promise.resolve(Array.from(this.minedTxs.entries()).map(([txHash, blockNumber]) => [TxHash.fromBigInt(txHash), blockNumber]));
|
|
60
59
|
}
|
|
61
60
|
getTxStatus(txHash) {
|
|
62
61
|
const key = txHash.toBigInt();
|
|
63
62
|
if (this.pendingTxs.has(key)) {
|
|
64
|
-
return 'pending';
|
|
63
|
+
return Promise.resolve('pending');
|
|
65
64
|
}
|
|
66
65
|
if (this.minedTxs.has(key)) {
|
|
67
|
-
return 'mined';
|
|
66
|
+
return Promise.resolve('mined');
|
|
68
67
|
}
|
|
69
|
-
return undefined;
|
|
68
|
+
return Promise.resolve(undefined);
|
|
70
69
|
}
|
|
71
70
|
/**
|
|
72
71
|
* Checks if a transaction exists in the pool and returns it.
|
|
@@ -75,23 +74,23 @@ export class InMemoryTxPool {
|
|
|
75
74
|
*/
|
|
76
75
|
getTxByHash(txHash) {
|
|
77
76
|
const result = this.txs.get(txHash.toBigInt());
|
|
78
|
-
return result === undefined ? undefined : Tx.clone(result);
|
|
77
|
+
return Promise.resolve(result === undefined ? undefined : Tx.clone(result));
|
|
79
78
|
}
|
|
80
79
|
getArchivedTxByHash() {
|
|
81
|
-
return undefined;
|
|
80
|
+
return Promise.resolve(undefined);
|
|
82
81
|
}
|
|
83
82
|
/**
|
|
84
83
|
* Adds a list of transactions to the pool. Duplicates are ignored.
|
|
85
84
|
* @param txs - An array of txs to be added to the pool.
|
|
86
85
|
* @returns Empty promise.
|
|
87
86
|
*/
|
|
88
|
-
addTxs(txs) {
|
|
87
|
+
async addTxs(txs) {
|
|
89
88
|
let pending = 0;
|
|
90
89
|
for (const tx of txs) {
|
|
91
|
-
const txHash = tx.getTxHash();
|
|
90
|
+
const txHash = await tx.getTxHash();
|
|
92
91
|
this.log.verbose(`Adding tx ${txHash.toString()} to pool`, {
|
|
93
92
|
eventName: 'tx-added-to-pool',
|
|
94
|
-
...tx.getStats(),
|
|
93
|
+
...(await tx.getStats()),
|
|
95
94
|
});
|
|
96
95
|
const key = txHash.toBigInt();
|
|
97
96
|
this.txs.set(key, tx);
|
|
@@ -102,7 +101,7 @@ export class InMemoryTxPool {
|
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
103
|
this.metrics.recordAddedObjects(pending, 'pending');
|
|
105
|
-
return
|
|
104
|
+
return;
|
|
106
105
|
}
|
|
107
106
|
/**
|
|
108
107
|
* Deletes transactions from the pool. Tx hashes that are not present are ignored.
|
|
@@ -127,14 +126,14 @@ export class InMemoryTxPool {
|
|
|
127
126
|
* @returns Array of tx objects in the order they were added to the pool.
|
|
128
127
|
*/
|
|
129
128
|
getAllTxs() {
|
|
130
|
-
return Array.from(this.txs.values()).map(x => Tx.clone(x));
|
|
129
|
+
return Promise.resolve(Array.from(this.txs.values()).map(x => Tx.clone(x)));
|
|
131
130
|
}
|
|
132
131
|
/**
|
|
133
132
|
* Gets the hashes of all transactions currently in the tx pool.
|
|
134
133
|
* @returns An array of transaction hashes found in the tx pool.
|
|
135
134
|
*/
|
|
136
135
|
getAllTxHashes() {
|
|
137
|
-
return Array.from(this.txs.keys()).map(x => TxHash.fromBigInt(x));
|
|
136
|
+
return Promise.resolve(Array.from(this.txs.keys()).map(x => TxHash.fromBigInt(x)));
|
|
138
137
|
}
|
|
139
138
|
}
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtb3J5X3R4X3Bvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbWVtX3Bvb2xzL3R4X3Bvb2wvbWVtb3J5X3R4X3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUVsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUF3QixrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRW5GLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxRQUFRLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHckQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sY0FBYztJQVV6Qjs7O09BR0c7SUFDSCxZQUFZLFlBQTZCLGtCQUFrQixFQUFFLEVBQVUsTUFBTSxZQUFZLENBQUMsYUFBYSxDQUFDO1FBQWpDLFFBQUcsR0FBSCxHQUFHLENBQThCO1FBQ3RHLElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxHQUFHLEVBQWMsQ0FBQztRQUNqQyxJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFDMUIsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLEdBQUcsRUFBRSxDQUFDO1FBQzVCLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3RFLENBQUM7SUFFTSxXQUFXLENBQUMsUUFBa0IsRUFBRSxXQUFtQjtRQUN4RCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDN0MsS0FBSyxNQUFNLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FB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
|
|
@@ -13,13 +13,13 @@ export interface TxPool {
|
|
|
13
13
|
* @param txHash - The hash of the transaction, used as an ID.
|
|
14
14
|
* @returns The transaction, if found, 'undefined' otherwise.
|
|
15
15
|
*/
|
|
16
|
-
getTxByHash(txHash: TxHash): Tx | undefined
|
|
16
|
+
getTxByHash(txHash: TxHash): Promise<Tx | undefined>;
|
|
17
17
|
/**
|
|
18
18
|
* Checks if an archived transaction exists in the pool and returns it.
|
|
19
19
|
* @param txHash - The hash of the transaction, used as an ID.
|
|
20
20
|
* @returns The transaction, if found, 'undefined' otherwise.
|
|
21
21
|
*/
|
|
22
|
-
getArchivedTxByHash(txHash: TxHash): Tx | undefined
|
|
22
|
+
getArchivedTxByHash(txHash: TxHash): Promise<Tx | undefined>;
|
|
23
23
|
/**
|
|
24
24
|
* Marks the set of txs as mined, as opposed to pending.
|
|
25
25
|
* @param txHashes - Hashes of the txs to flag as mined.
|
|
@@ -40,27 +40,27 @@ export interface TxPool {
|
|
|
40
40
|
* Gets all transactions currently in the tx pool.
|
|
41
41
|
* @returns An array of transaction objects found in the tx pool.
|
|
42
42
|
*/
|
|
43
|
-
getAllTxs(): Tx[]
|
|
43
|
+
getAllTxs(): Promise<Tx[]>;
|
|
44
44
|
/**
|
|
45
45
|
* Gets the hashes of all transactions currently in the tx pool.
|
|
46
46
|
* @returns An array of transaction hashes found in the tx pool.
|
|
47
47
|
*/
|
|
48
|
-
getAllTxHashes(): TxHash[]
|
|
48
|
+
getAllTxHashes(): Promise<TxHash[]>;
|
|
49
49
|
/**
|
|
50
50
|
* Gets the hashes of pending transactions currently in the tx pool sorted by priority (see getPendingTxPriority).
|
|
51
51
|
* @returns An array of pending transaction hashes found in the tx pool.
|
|
52
52
|
*/
|
|
53
|
-
getPendingTxHashes(): TxHash[]
|
|
53
|
+
getPendingTxHashes(): Promise<TxHash[]>;
|
|
54
54
|
/**
|
|
55
55
|
* Gets the hashes of mined transactions currently in the tx pool.
|
|
56
56
|
* @returns An array of mined transaction hashes found in the tx pool.
|
|
57
57
|
*/
|
|
58
|
-
getMinedTxHashes(): [tx: TxHash, blockNumber: number][]
|
|
58
|
+
getMinedTxHashes(): Promise<[tx: TxHash, blockNumber: number][]>;
|
|
59
59
|
/**
|
|
60
60
|
* Returns whether the given tx hash is flagged as pending or mined.
|
|
61
61
|
* @param txHash - Hash of the tx to query.
|
|
62
62
|
* @returns Pending or mined depending on its status, or undefined if not found.
|
|
63
63
|
*/
|
|
64
|
-
getTxStatus(txHash: TxHash): 'pending' | 'mined' | undefined
|
|
64
|
+
getTxStatus(txHash: TxHash): Promise<'pending' | 'mined' | undefined>;
|
|
65
65
|
}
|
|
66
66
|
//# sourceMappingURL=tx_pool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjC;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"tx_pool.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;;OAGG;IACH,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjC;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAErD;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAE7D;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpE;;;;OAIG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;OAGG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;OAGG;IACH,SAAS,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE3B;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAEpC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAExC;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAEjE;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAC;CACvE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool_test_suite.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"tx_pool_test_suite.d.ts","sourceRoot":"","sources":["../../../src/mem_pools/tx_pool/tx_pool_test_suite.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,MAAM,QAsHrD"}
|