machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve rbf cache merge conflicts

Browse Source
This commit is contained in:
Mononaut 2023-11-12 06:19:46 +00:00
parent 031e14f302
commit 9d60c39aeb
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backend/src/api/rbf-cache.ts
View File

@ -382,10 +382,11 @@ class RbfCache {
this.expiring.set(expiringEntry.key, new Date(expiringEntry.value).getTime()); this.expiring.set(expiringEntry.key, new Date(expiringEntry.value).getTime());
} }
}); });
logger.debug(`loaded ${txs.length} txs, ${trees.length} trees into rbf cache, ${expiring.length} due to expire, ${this.staleCount} were stale`);
this.staleCount = 0; this.staleCount = 0;
await this.checkTrees(); await this.checkTrees();
logger.debug(`loaded ${txs.length} txs, ${trees.length} trees into rbf cache, ${expiring.length} due to expire, ${this.staleCount} were stale`);
this.cleanup(); this.cleanup();
} catch (e) { } catch (e) {
logger.err('failed to restore RBF cache: ' + (e instanceof Error ? e.message : e)); logger.err('failed to restore RBF cache: ' + (e instanceof Error ? e.message : e));
} }
@ -423,31 +424,6 @@ class RbfCache {
return; return;
} }
// check if any transactions in this tree have already been confirmed
mined = mined || treeInfo.mined;
let exists = mined;
if (!mined) {
try {
const apiTx = await bitcoinApi.$getRawTransaction(txid);
if (apiTx) {
exists = true;
}
if (apiTx?.status?.confirmed) {
mined = true;
treeInfo.txMined = true;
this.evict(txid, true);
}
} catch (e) {
// most transactions only exist in our cache
}
}
// if the root tx is not in the mempool or the blockchain
// evict this tree as soon as possible
if (root === txid && !exists) {
this.evict(txid, true);
}
// recursively reconstruct child trees // recursively reconstruct child trees
for (const childId of treeInfo.replaces) { for (const childId of treeInfo.replaces) {
const replaced = await this.importTree(root, childId, deflated, txs, mined); const replaced = await this.importTree(root, childId, deflated, txs, mined);
@ -505,13 +481,10 @@ class RbfCache {
if (config.MEMPOOL.BACKEND === 'esplora') { if (config.MEMPOOL.BACKEND === 'esplora') {
const sliceLength = 10000; const sliceLength = 10000;
let count = 0;
for (let i = 0; i < Math.ceil(txids.length / sliceLength); i++) { for (let i = 0; i < Math.ceil(txids.length / sliceLength); i++) {
const slice = txids.slice(i * sliceLength, (i + 1) * sliceLength); const slice = txids.slice(i * sliceLength, (i + 1) * sliceLength);
try { try {
const txs = await bitcoinApi.$getRawTransactions(slice); const txs = await bitcoinApi.$getRawTransactions(slice);
count += txs.length;
logger.info(`Fetched ${count} of ${txids.length} unknown-status RBF transactions from esplora`);
processTxs(txs); processTxs(txs);
} catch (err) { } catch (err) {
logger.err('failed to fetch some cached rbf transactions'); logger.err('failed to fetch some cached rbf transactions');