Merge pull request #4944 from PastaPastaPasta/18/rc12

[18.x] backport: rc12 backport and bump
dashpay · Jul 29, 2022 · c1a7a59 · c1a7a59
2 parents b504b97 + ec4f9fd
commit c1a7a59
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 18)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_RC, 11)
+define(_CLIENT_VERSION_RC, 12)
 define(_CLIENT_VERSION_IS_RELEASE, false)
 define(_COPYRIGHT_YEAR, 2022)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

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