feat(governance): implement SignGovernanceVote method in CWallet for vote signing

Author: PastaPastaPasta

src/governance/vote.cpp

@@ -267,33 +267,3 @@ 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

@@ -131,6 +131,5 @@ 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

@@ -558,8 +558,8 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
         // Create vote
         CGovernanceVote vote(dmn->collateralOutpoint, proposalHash, VOTE_SIGNAL_FUNDING, outcome);
 
-        // Sign vote using shared helper function
-        if (!SignGovernanceVote(*walletModel->wallet().wallet(), votingKeyID, vote)) {
+        // Sign vote using CWallet member function
+        if (!walletModel->wallet().wallet()->SignGovernanceVote(votingKeyID, vote)) {
             nFailed++;
             failedMessages.append(
                 tr("Failed to sign vote for masternode %1").arg(QString::fromStdString(proTxHash.ToString())));

src/rpc/governance.cpp

@@ -411,33 +411,6 @@ static RPCHelpMan gobject_submit()
 }
 
 #ifdef ENABLE_WALLET
-static bool SignVote(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("SignVote -- 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("SignVote 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;
-}
-
 static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet& wallet,
                              const std::map<uint256, CKeyID>& votingKeys,
                              const uint256& hash, vote_signal_enum_t eVoteSignal,
@@ -477,7 +450,7 @@ static UniValue VoteWithMasternodes(const JSONRPCRequest& request, const CWallet
 
         CGovernanceVote vote(dmn->collateralOutpoint, hash, eVoteSignal, eVoteOutcome);
 
-        if (!SignVote(wallet, keyID, vote) || !vote.CheckSignature(keyID)) {
+        if (!wallet.SignGovernanceVote(keyID, vote) || !vote.CheckSignature(keyID)) {
             nFailed++;
             statusObj.pushKV("result", "failed");
             statusObj.pushKV("errorMessage", "Failure to sign.");

src/wallet/wallet.cpp

@@ -2040,6 +2040,33 @@ bool CWallet::SignSpecialTxPayload(const uint256& hash, const CKeyID& keyid, std
     return false;
 }
 
+bool CWallet::SignGovernanceVote(const CKeyID& keyID, CGovernanceVote& vote) const
+{
+    // 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 (!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 = 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;
+}
+
 void CWallet::CommitTransaction(CTransactionRef tx, mapValue_t mapValue, std::vector<std::pair<std::string, std::string>> orderForm)
 {
     LOCK(cs_wallet);

src/wallet/wallet.h

@@ -658,6 +658,14 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
       * but it should work for any its type, we pass there directly a hash of payload.
       */
     bool SignSpecialTxPayload(const uint256& hash, const CKeyID& keyid, std::vector<unsigned char>& vchSig) const;
+    /**
+     * Sign a governance vote using wallet signing methods.
+     * 
+     * @param[in] keyID The key ID to use for signing
+     * @param[in,out] vote The governance vote to sign (signature is set on success)
+     * @return true if signing succeeded, false otherwise
+     */
+    bool SignGovernanceVote(const CKeyID& keyID, CGovernanceVote& vote) const;
 
     /**
      * Fills out a PSBT with information from the wallet. Fills in UTXOs if we have