sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor nonLockedTxsByInputs (#3178)

Browse Source
This commit is contained in:
UdjinM6 2019-10-29 21:37:54 +03:00 committed by GitHub
parent 64a913d6f9
commit bbd9b10d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/llmq/quorums_instantsend.cpp
View File

@ -1052,7 +1052,7 @@ void CInstantSendManager::AddNonLockedTx(const CTransactionRef& tx, const CBlock
if (res.second) { if (res.second) {
for (auto& in : tx->vin) { for (auto& in : tx->vin) {
nonLockedTxsByInputs.emplace(in.prevout.hash, std::make_pair(in.prevout.n, tx->GetHash())); nonLockedTxsByOutpoints.emplace(in.prevout, tx->GetHash());
} }
} }
@ -1088,16 +1088,7 @@ void CInstantSendManager::RemoveNonLockedTx(const uint256& txid, bool retryChild
nonLockedTxs.erase(jt); nonLockedTxs.erase(jt);
} }
} }
nonLockedTxsByOutpoints.erase(in.prevout);
auto its = nonLockedTxsByInputs.equal_range(in.prevout.hash);
for (auto kt = its.first; kt != its.second; ) {
if (kt->second.first != in.prevout.n) {
++kt;
continue;
} else {
kt = nonLockedTxsByInputs.erase(kt);
}
}
} }
} }
@ -1237,12 +1228,9 @@ void CInstantSendManager::ResolveBlockConflicts(const uint256& islockHash, const
{ {
LOCK(cs); LOCK(cs);
for (auto& in : islock.inputs) { for (auto& in : islock.inputs) {
auto its = nonLockedTxsByInputs.equal_range(in.hash); auto it = nonLockedTxsByOutpoints.find(in);
for (auto it = its.first; it != its.second; ++it) { if (it != nonLockedTxsByOutpoints.end()) {
if (it->second.first != in.n) { auto& conflictTxid = it->second;
continue;
}
auto& conflictTxid = it->second.second;
if (conflictTxid == islock.txid) { if (conflictTxid == islock.txid) {
continue; continue;
} }

2
src/llmq/quorums_instantsend.h
View File

@ -107,7 +107,7 @@ private:
std::unordered_set<uint256, StaticSaltedHasher> children; std::unordered_set<uint256, StaticSaltedHasher> children;
}; };
std::unordered_map<uint256, NonLockedTxInfo, StaticSaltedHasher> nonLockedTxs; std::unordered_map<uint256, NonLockedTxInfo, StaticSaltedHasher> nonLockedTxs;
std::unordered_multimap<uint256, std::pair<uint32_t, uint256>> nonLockedTxsByInputs; std::unordered_map<COutPoint, uint256, SaltedOutpointHasher> nonLockedTxsByOutpoints;
std::unordered_set<uint256, StaticSaltedHasher> pendingRetryTxs; std::unordered_set<uint256, StaticSaltedHasher> pendingRetryTxs;