From 44f2217a6801d343988902212c5fd2a41274564b Mon Sep 17 00:00:00 2001 From: Mononaut Date: Mon, 24 Jul 2023 10:45:27 +0900 Subject: [PATCH] Fix typo which skips sigop calculation --- backend/src/api/mempool.ts | 2 +- backend/src/api/transaction-utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/api/mempool.ts b/backend/src/api/mempool.ts index bc3f33806..d988ea47a 100644 --- a/backend/src/api/mempool.ts +++ b/backend/src/api/mempool.ts @@ -86,7 +86,7 @@ class Mempool { this.mempoolCache = mempoolData; let count = 0; for (const txid of Object.keys(this.mempoolCache)) { - if (this.mempoolCache[txid].sigops == null || this.mempoolCache[txid].effectiveFeePerVsize == null) { + if (!this.mempoolCache[txid].sigops || this.mempoolCache[txid].effectiveFeePerVsize == null) { this.mempoolCache[txid] = transactionUtils.extendMempoolTransaction(this.mempoolCache[txid]); } if (this.mempoolCache[txid].order == null) { diff --git a/backend/src/api/transaction-utils.ts b/backend/src/api/transaction-utils.ts index 849aff8f3..a48c9f259 100644 --- a/backend/src/api/transaction-utils.ts +++ b/backend/src/api/transaction-utils.ts @@ -74,7 +74,7 @@ class TransactionUtils { public extendMempoolTransaction(transaction: IEsploraApi.Transaction): MempoolTransactionExtended { const vsize = Math.ceil(transaction.weight / 4); const fractionalVsize = (transaction.weight / 4); - const sigops = Common.isLiquid() ? this.countSigops(transaction) : 0; + const sigops = !Common.isLiquid() ? this.countSigops(transaction) : 0; // https://github.com/bitcoin/bitcoin/blob/e9262ea32a6e1d364fb7974844fadc36f931f8c6/src/policy/policy.cpp#L295-L298 const adjustedVsize = Math.max(fractionalVsize, sigops * 5); // adjusted vsize = Max(weight, sigops * bytes_per_sigop) / witness_scale_factor const feePerVbytes = (transaction.fee || 0) / fractionalVsize;