feat(governance): refactor vote signing logic into a helper function

Author: PastaPastaPasta

src/governance/vote.cpp

@@ -266,3 +266,34 @@ bool operator<(const CGovernanceVote& vote1, const CGovernanceVote& vote2)
 
     return fResult;
 }
+
+#include <wallet/wallet.h>
+#include <util/strencodings.h>
+#include <util/message.h>
+
+bool SignGovernanceVote(const CWallet& wallet, const CKeyID& keyID, CGovernanceVote& vote)
+{
+    // Special implementation for testnet (Harden Spork6 that has not been deployed to other networks)
+    if (Params().NetworkIDString() == CBaseChainParams::TESTNET) {
+        std::vector<unsigned char> signature;
+        if (!wallet.SignSpecialTxPayload(vote.GetSignatureHash(), keyID, signature)) {
+            LogPrintf("SignGovernanceVote -- SignHash() failed\n");
+            return false;
+        }
+        vote.SetSignature(signature);
+        return true;
+    } // end of testnet implementation
+
+    std::string strMessage{vote.GetSignatureString()};
+    std::string signature;
+    SigningResult err = wallet.SignMessage(strMessage, PKHash{keyID}, signature);
+    if (err != SigningResult::OK) {
+        LogPrintf("SignGovernanceVote failed due to: %s\n", SigningResultString(err));
+        return false;
+    }
+    const auto opt_decoded = DecodeBase64(signature);
+    CHECK_NONFATAL(opt_decoded.has_value()); // DecodeBase64 should not fail
+
+    vote.SetSignature(std::vector<unsigned char>(opt_decoded->data(), opt_decoded->data() + opt_decoded->size()));
+    return true;
+}

src/governance/vote.h

@@ -15,6 +15,7 @@ class CGovernanceVote;
 class CMasternodeSync;
 class CKey;
 class CKeyID;
+class CWallet;
 class PeerManager;
 
 // INTENTION OF MASTERNODES REGARDING ITEM
@@ -126,4 +127,10 @@ class CGovernanceVote
     }
 };
 
+/**
+ * Sign a governance vote using wallet signing methods
+ * Handles different signing approaches for different networks
+ */
+bool SignGovernanceVote(const CWallet& wallet, const CKeyID& keyID, CGovernanceVote& vote);
+
 #endif // BITCOIN_GOVERNANCE_VOTE_H

src/qt/governancelist.cpp

@@ -23,6 +23,7 @@
 #include <script/standard.h>
 #include <util/message.h>
 #include <util/strencodings.h>
+#include <wallet/wallet.h>
 
 #include <univalue.h>
 
@@ -557,32 +558,8 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
         // Create vote
         CGovernanceVote vote(dmn->collateralOutpoint, proposalHash, VOTE_SIGNAL_FUNDING, outcome);
 
-        // Sign vote
-        bool signSuccess = false;
-
-        // Special implementation for testnet (same as RPC SignVote)
-        if (Params().NetworkIDString() == CBaseChainParams::TESTNET) {
-            // Testnet uses SignSpecialTxPayload
-            std::vector<unsigned char> vchSig;
-            if (walletModel->wallet().signSpecialTxPayload(vote.GetSignatureHash(), votingKeyID, vchSig)) {
-                vote.SetSignature(vchSig);
-                signSuccess = true;
-            }
-        } else {
-            // Other networks use SignMessage
-            std::string strMessage = vote.GetSignatureString();
-            std::string signature;
-            SigningResult result = walletModel->wallet().signMessage(strMessage, PKHash(votingKeyID), signature);
-            if (result == SigningResult::OK) {
-                const auto decoded = DecodeBase64(signature);
-                if (decoded) {
-                    vote.SetSignature(std::vector<unsigned char>(decoded->begin(), decoded->end()));
-                    signSuccess = true;
-                }
-            }
-        }
-
-        if (!signSuccess) {
+        // Sign vote using shared helper function
+        if (!SignGovernanceVote(*walletModel->wallet().wallet(), votingKeyID, vote)) {
             nFailed++;
             failedMessages.append(
                 tr("Failed to sign vote for masternode %1").arg(QString::fromStdString(proTxHash.ToString())));