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

fix gbt mempool size mismatch bug

Browse Source
This commit is contained in:
Mononaut 2023-07-24 17:22:38 +09:00
parent a6edfcc272
commit 2d463326e0
No known key found for this signature in database
GPG Key ID: A3F058E41374C04E
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/api/mempool.ts
View File

@ -104,10 +104,11 @@ class Mempool {
this.addToSpendMap(Object.values(this.mempoolCache)); this.addToSpendMap(Object.values(this.mempoolCache));
} }
public async $reloadMempool(expectedCount: number): Promise<void> { public async $reloadMempool(expectedCount: number): Promise<MempoolTransactionExtended[]> {
let count = 0; let count = 0;
let done = false; let done = false;
let last_txid; let last_txid;
const newTransactions: MempoolTransactionExtended[] = [];
loadingIndicators.setProgress('mempool', count / expectedCount * 100); loadingIndicators.setProgress('mempool', count / expectedCount * 100);
while (!done) { while (!done) {
try { try {
@ -115,7 +116,10 @@ class Mempool {
if (result) { if (result) {
for (const tx of result) { for (const tx of result) {
const extendedTransaction = transactionUtils.extendMempoolTransaction(tx); const extendedTransaction = transactionUtils.extendMempoolTransaction(tx);
this.mempoolCache[extendedTransaction.txid] = extendedTransaction; if (!this.mempoolCache[extendedTransaction.txid]) {
newTransactions.push(extendedTransaction);
this.mempoolCache[extendedTransaction.txid] = extendedTransaction;
}
count++; count++;
} }
logger.info(`Fetched ${count} of ${expectedCount} mempool transactions from esplora`); logger.info(`Fetched ${count} of ${expectedCount} mempool transactions from esplora`);
@ -134,6 +138,7 @@ class Mempool {
logger.err('failed to fetch bulk mempool transactions from esplora'); logger.err('failed to fetch bulk mempool transactions from esplora');
} }
} }
return newTransactions;
logger.info(`Done inserting loaded mempool transactions into local cache`); logger.info(`Done inserting loaded mempool transactions into local cache`);
} }
@ -177,7 +182,7 @@ class Mempool {
const currentMempoolSize = Object.keys(this.mempoolCache).length; const currentMempoolSize = Object.keys(this.mempoolCache).length;
this.updateTimerProgress(timer, 'got raw mempool'); this.updateTimerProgress(timer, 'got raw mempool');
const diff = transactions.length - currentMempoolSize; const diff = transactions.length - currentMempoolSize;
const newTransactions: MempoolTransactionExtended[] = []; let newTransactions: MempoolTransactionExtended[] = [];
this.mempoolCacheDelta = Math.abs(diff); this.mempoolCacheDelta = Math.abs(diff);
@ -202,7 +207,7 @@ class Mempool {
this.inSync = false; this.inSync = false;
logger.info(`Missing ${transactions.length - currentMempoolSize} mempool transactions, attempting to reload in bulk from esplora`); logger.info(`Missing ${transactions.length - currentMempoolSize} mempool transactions, attempting to reload in bulk from esplora`);
try { try {
await this.$reloadMempool(transactions.length); newTransactions = await this.$reloadMempool(transactions.length);
loaded = true; loaded = true;
} catch (e) { } catch (e) {
logger.err('failed to load mempool in bulk from esplora, falling back to fetching individual transactions'); logger.err('failed to load mempool in bulk from esplora, falling back to fetching individual transactions');

4
backend/src/api/websocket-handler.ts
View File

@ -604,7 +604,7 @@ class WebsocketHandler {
} }
} }
if (client['track-mempool-block'] >= 0) { if (client['track-mempool-block'] >= 0 && memPool.isInSync()) {
const index = client['track-mempool-block']; const index = client['track-mempool-block'];
if (mBlockDeltas[index]) { if (mBlockDeltas[index]) {
response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, { response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {
@ -858,7 +858,7 @@ class WebsocketHandler {
} }
} }
if (client['track-mempool-block'] >= 0) { if (client['track-mempool-block'] >= 0 && memPool.isInSync()) {
const index = client['track-mempool-block']; const index = client['track-mempool-block'];
if (mBlockDeltas && mBlockDeltas[index]) { if (mBlockDeltas && mBlockDeltas[index]) {
response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, { response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {