From 3ca5f25a382e3d8f495f0545653a7dfb20c8778f Mon Sep 17 00:00:00 2001
From: Odysseas Gabrielides <odysseas.gabrielides@gmail.com>
Date: Thu, 28 Jul 2022 13:43:02 +0300
Subject: [PATCH 1/2] Merge pull request #4942 from UdjinM6/fix_cqmbqr

fix(llmq): Calculate quorum members while not debugging llmq
---
 src/llmq/utils.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/llmq/utils.cpp b/src/llmq/utils.cpp
index a484898f14..8d0dd79e75 100644
--- 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]) {

From ec4f9fd9b60b760d3bf7ae224de3ed47daee59c4 Mon Sep 17 00:00:00 2001
From: pasta <pasta@dashboost.org>
Date: Fri, 29 Jul 2022 11:06:21 -0500
Subject: [PATCH 2/2] chore: bump to rc12

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 6d379ebb8b..173f0737a6 100644
--- 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])