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

Merge pull request #4944 from PastaPastaPasta/18/rc12

Browse Source 
[18.x] backport: rc12 backport and bump
This commit is contained in:
UdjinM6 2022-07-29 19:52:37 +03:00 committed by GitHub
commit c1a7a591c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 18) define(_CLIENT_VERSION_MAJOR, 18)
define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 11) define(_CLIENT_VERSION_RC, 12)
define(_CLIENT_VERSION_IS_RELEASE, false) define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2022) define(_COPYRIGHT_YEAR, 2022)
define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS,[The %s developers])

28
src/llmq/utils.cpp
View File

@ -161,21 +161,23 @@ std::vector<std::vector<CDeterministicMNCPtr>> CLLMQUtils::ComputeQuorumMembersB
LogPrint(BCLog::LLMQ, "QuarterComposition h[%d] i[%d]:%s\n", pCycleQuorumBaseBlockIndex->nHeight, i, LogPrint(BCLog::LLMQ, "QuarterComposition h[%d] i[%d]:%s\n", pCycleQuorumBaseBlockIndex->nHeight, i,
ss.str()); ss.str());
} }
}
for (auto i = 0; i < nQuorums; ++i) { for (auto i = 0; i < nQuorums; ++i) {
for (auto &m: previousQuarters.quarterHMinus3C[i]) { for (auto &m: previousQuarters.quarterHMinus3C[i]) {
quorumMembers[i].push_back(std::move(m)); quorumMembers[i].push_back(std::move(m));
} }
for (auto &m: previousQuarters.quarterHMinus2C[i]) { for (auto &m: previousQuarters.quarterHMinus2C[i]) {
quorumMembers[i].push_back(std::move(m)); quorumMembers[i].push_back(std::move(m));
} }
for (auto &m: previousQuarters.quarterHMinusC[i]) { for (auto &m: previousQuarters.quarterHMinusC[i]) {
quorumMembers[i].push_back(std::move(m)); quorumMembers[i].push_back(std::move(m));
} }
for (auto &m: newQuarterMembers[i]) { for (auto &m: newQuarterMembers[i]) {
quorumMembers[i].push_back(std::move(m)); quorumMembers[i].push_back(std::move(m));
} }
if (LogAcceptCategory(BCLog::LLMQ)) {
std::stringstream ss; std::stringstream ss;
ss << " ["; ss << " [";
for (auto &m: quorumMembers[i]) { for (auto &m: quorumMembers[i]) {