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

fix(consensus)!: avoid using the same mn twice in one indexed quorum (#5086)

Browse Source
This commit is contained in:
UdjinM6 2022-12-01 19:34:11 +03:00 committed by pasta
parent 4e69bc4bc5
commit 3019ad78f9
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/llmq/utils.cpp
View File

@ -341,10 +341,21 @@ std::vector<std::vector<CDeterministicMNCPtr>> BuildNewQuorumQuarterMembers(cons
auto idx = 0; auto idx = 0;
for (auto i = 0; i < nQuorums; ++i) { for (auto i = 0; i < nQuorums; ++i) {
auto usedMNsCount = MnsUsedAtHIndexed[i].GetAllMNsCount(); auto usedMNsCount = MnsUsedAtHIndexed[i].GetAllMNsCount();
auto updated{false};
auto initial_loop_idx = idx;
while (quarterQuorumMembers[i].size() < quarterSize && (usedMNsCount + quarterQuorumMembers[i].size() < sortedCombinedMnsList.size())) { while (quarterQuorumMembers[i].size() < quarterSize && (usedMNsCount + quarterQuorumMembers[i].size() < sortedCombinedMnsList.size())) {
bool skip{true};
if (!MnsUsedAtHIndexed[i].HasMN(sortedCombinedMnsList[idx]->proTxHash)) { if (!MnsUsedAtHIndexed[i].HasMN(sortedCombinedMnsList[idx]->proTxHash)) {
quarterQuorumMembers[i].push_back(sortedCombinedMnsList[idx]); try {
} else { // NOTE: AddMN is the one that can throw exceptions, must be exicuted first
MnsUsedAtHIndexed[i].AddMN(sortedCombinedMnsList[idx]);
quarterQuorumMembers[i].push_back(sortedCombinedMnsList[idx]);
updated = true;
skip = false;
} catch (const std::runtime_error& e) {
}
}
if (skip) {
if (firstSkippedIndex == 0) { if (firstSkippedIndex == 0) {
firstSkippedIndex = idx; firstSkippedIndex = idx;
skipList.push_back(idx); skipList.push_back(idx);
@ -355,6 +366,15 @@ std::vector<std::vector<CDeterministicMNCPtr>> BuildNewQuorumQuarterMembers(cons
if (++idx == sortedCombinedMnsList.size()) { if (++idx == sortedCombinedMnsList.size()) {
idx = 0; idx = 0;
} }
if (idx == initial_loop_idx) {
// we made full "while" loop
if (!updated) {
// there are not enough MNs, there is nothing we can do here
return std::vector<std::vector<CDeterministicMNCPtr>>(nQuorums);
}
// reset and try again
updated = false;
}
} }
} }