highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-28 10:05:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

rest/getutxos: Don't construct empty mempool

Browse Source 
...just don't try to consult it at all when fCheckMemPool is false
This commit is contained in:
Carl Dong
2022-05-23 16:19:44 -04:00
parent 03574b956a
commit 319f0ceeeb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rest.cpp
View File

@@ -799,10 +799,10 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
if (!maybe_chainman) return false; if (!maybe_chainman) return false;
ChainstateManager& chainman = *maybe_chainman; ChainstateManager& chainman = *maybe_chainman;
{ {
auto process_utxos = [&vOutPoints, &outs, &hits](const CCoinsView& view, const CTxMemPool& mempool) { auto process_utxos = [&vOutPoints, &outs, &hits](const CCoinsView& view, const CTxMemPool* mempool) {
for (const COutPoint& vOutPoint : vOutPoints) { for (const COutPoint& vOutPoint : vOutPoints) {
Coin coin; Coin coin;
bool hit = !mempool.isSpent(vOutPoint) && view.GetCoin(vOutPoint, coin); bool hit = (!mempool || !mempool->isSpent(vOutPoint)) && view.GetCoin(vOutPoint, coin);
hits.push_back(hit); hits.push_back(hit);
if (hit) outs.emplace_back(std::move(coin)); if (hit) outs.emplace_back(std::move(coin));
} }
@@ -815,10 +815,10 @@ static bool rest_getutxos(const std::any& context, HTTPRequest* req, const std::
LOCK2(cs_main, mempool->cs); LOCK2(cs_main, mempool->cs);
CCoinsViewCache& viewChain = chainman.ActiveChainstate().CoinsTip(); CCoinsViewCache& viewChain = chainman.ActiveChainstate().CoinsTip();
CCoinsViewMemPool viewMempool(&viewChain, *mempool); CCoinsViewMemPool viewMempool(&viewChain, *mempool);
process_utxos(viewMempool, *mempool); process_utxos(viewMempool, mempool);
} else { } else {
LOCK(cs_main); // no need to lock mempool! LOCK(cs_main);
process_utxos(chainman.ActiveChainstate().CoinsTip(), CTxMemPool()); process_utxos(chainman.ActiveChainstate().CoinsTip(), nullptr);
} }
for (size_t i = 0; i < hits.size(); ++i) { for (size_t i = 0; i < hits.size(); ++i) {