Merge dashpay#7159: feat(qt): UI refresh (5/n, add proposal information widget to information, donut chart for proposal allocation)

c8f0c2a feat(qt): add lifecycle and vote-aware sorting in proposal list (Kittywhiskers Van Gogh)
c1f97d6 feat(qt): add budget donut chart to proposal info view (Kittywhiskers Van Gogh)
8936b5a feat(qt): add interactive DonutChart widget (Kittywhiskers Van Gogh)
cb5bcd5 feat(qt): add proposal info button to proposal list (Kittywhiskers Van Gogh)
e7de61d feat(qt): add wallet-specific section to proposal widget (Kittywhiskers Van Gogh)
0005209 feat(qt): report proposal information (Kittywhiskers Van Gogh)
37b16f8 interfaces: add unique voter count reporting (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Depends on dashpay#7146
  * Depends on dashpay#7118

  |     |     |
  | -- | -- |
  | ![](https://github.com/user-attachments/assets/4c32a587-4adf-46a5-b0f6-2c5aa5e730dc) | ![](https://github.com/user-attachments/assets/275c1a58-6b08-46fb-846b-91a415f1d54d) |
  | ![](https://github.com/user-attachments/assets/b550ffc9-2b06-4d62-b115-c47dbf2d2bc6) | ![](https://github.com/user-attachments/assets/6ad4bf7d-aea2-4527-9ece-83c1047b84a0) |

  ## Breaking Changes

  None expected.

  ## Checklist

  - [x] I have performed a self-review of my own code
  - [x] I have commented my code, particularly in hard-to-understand areas
  - [x] I have added or updated relevant unit/integration/functional/e2e tests
  - [x] I have made corresponding changes to the documentation **(note: N/A)**
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    LGTM

light ACK c8f0c2a

Tree-SHA512: db714a9845605e059909efc1102d3f176db293f716d08efcd3f00ab48596aa0820aa5871bea81cb8099a9abca23cf17b0709d5d60e3127bb2eb022a78bf8c2e2

Author: PastaPastaPasta

src/Makefile.qt.include

@@ -34,6 +34,7 @@ QT_FORMS_UI = \
   qt/forms/optionsdialog.ui \
   qt/forms/overviewpage.ui \
   qt/forms/proposalcreate.ui \
+  qt/forms/proposalinfo.ui \
   qt/forms/proposallist.ui \
   qt/forms/proposalresume.ui \
   qt/forms/psbtoperationsdialog.ui \
@@ -62,6 +63,7 @@ QT_MOC_CPP = \
   qt/moc_createwalletdialog.cpp \
   qt/moc_csvmodelwriter.cpp \
   qt/moc_descriptiondialog.cpp \
+  qt/moc_donutchart.cpp \
   qt/moc_editaddressdialog.cpp \
   qt/moc_guiutil.cpp \
   qt/moc_informationwidget.cpp \
@@ -83,6 +85,7 @@ QT_MOC_CPP = \
   qt/moc_peertablemodel.cpp \
   qt/moc_peertablesortproxy.cpp \
   qt/moc_proposalcreate.cpp \
+  qt/moc_proposalinfo.cpp \
   qt/moc_proposallist.cpp \
   qt/moc_proposalmodel.cpp \
   qt/moc_proposalresume.cpp \
@@ -145,6 +148,7 @@ BITCOIN_QT_H = \
   qt/createwalletdialog.h \
   qt/csvmodelwriter.h \
   qt/descriptiondialog.h \
+  qt/donutchart.h \
   qt/editaddressdialog.h \
   qt/guiconstants.h \
   qt/guiutil_font.h \
@@ -170,6 +174,7 @@ BITCOIN_QT_H = \
   qt/peertablemodel.h \
   qt/peertablesortproxy.h \
   qt/proposalcreate.h \
+  qt/proposalinfo.h \
   qt/proposallist.h \
   qt/proposalmodel.h \
   qt/proposalresume.h \
@@ -251,19 +256,19 @@ BITCOIN_QT_BASE_CPP = \
   qt/bantablemodel.cpp \
   qt/bitcoin.cpp \
   qt/bitcoinaddressvalidator.cpp \
-  qt/masternodemodel.cpp \
-  qt/proposalmodel.cpp \
   qt/bitcoinamountfield.cpp \
   qt/bitcoingui.cpp \
   qt/bitcoinunits.cpp \
   qt/clientfeeds.cpp \
   qt/clientmodel.cpp \
   qt/csvmodelwriter.cpp \
+  qt/donutchart.cpp \
   qt/guiutil.cpp \
   qt/guiutil_font.cpp \
   qt/informationwidget.cpp \
   qt/initexecutor.cpp \
   qt/intro.cpp \
+  qt/masternodemodel.cpp \
   qt/modaloverlay.cpp \
   qt/networkstyle.cpp \
   qt/networkwidget.cpp \
@@ -272,6 +277,8 @@ BITCOIN_QT_BASE_CPP = \
   qt/optionsmodel.cpp \
   qt/peertablemodel.cpp \
   qt/peertablesortproxy.cpp \
+  qt/proposalinfo.cpp \
+  qt/proposalmodel.cpp \
   qt/qvalidatedlineedit.cpp \
   qt/qvaluecombobox.cpp \
   qt/rpcconsole.cpp \

src/governance/object.cpp

@@ -592,6 +592,27 @@ int CGovernanceObject::GetAbstainCount(const CDeterministicMNList& tip_mn_list,
     return CountMatchingVotes(tip_mn_list, eVoteSignalIn, VOTE_OUTCOME_ABSTAIN);
 }
 
+CGovernanceObject::UniqueVoterCount CGovernanceObject::GetUniqueVoterCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+{
+    LOCK(cs);
+    UniqueVoterCount result;
+    for (const auto& [outpoint, recVote] : mapCurrentMNVotes) {
+        if (recVote.mapInstances.count(eVoteSignalIn) == 0) {
+            continue;
+        }
+        auto dmn = tip_mn_list.GetMNByCollateral(outpoint);
+        if (!dmn) {
+            continue;
+        }
+        if (dmn->nType == MnType::Evo) {
+            ++result.m_evo;
+        } else {
+            ++result.m_regular;
+        }
+    }
+    return result;
+}
+
 bool CGovernanceObject::GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint, vote_rec_t& voteRecord) const
 {
     LOCK(cs);

src/governance/object.h

@@ -227,6 +227,13 @@ class CGovernanceObject
     int GetAbstainCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
+    struct UniqueVoterCount {
+        uint16_t m_regular{0};
+        uint16_t m_evo{0};
+    };
+    UniqueVoterCount GetUniqueVoterCount(const CDeterministicMNList& tip_mn_list, vote_signal_enum_t eVoteSignalIn) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+
     bool GetCurrentMNVotes(const COutPoint& mnCollateralOutpoint, vote_rec_t& voteRecord) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 

src/interfaces/node.h

@@ -143,6 +143,11 @@ class GOV
         int32_t m_yes{0};
     };
     virtual Votes getObjVotes(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
+    struct UniqueVoters {
+        uint16_t m_regular{0};
+        uint16_t m_evo{0};
+    };
+    virtual UniqueVoters getObjUniqueVoters(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) = 0;
     virtual bool getObjLocalValidity(const CGovernanceObject& obj, std::string& error, bool check_collateral) = 0;
     virtual bool existsObj(const uint256& hash) = 0;
     virtual bool isEnabled() = 0;

src/node/interfaces.cpp

@@ -242,6 +242,20 @@ class GOVImpl : public GOV
         }
         return ret;
     }
+    UniqueVoters getObjUniqueVoters(const CGovernanceObject& obj, vote_signal_enum_t vote_signal) override
+    {
+        if (context().govman != nullptr && context().dmnman != nullptr) {
+            const auto& tip_mn_list{context().dmnman->GetListAtChainTip()};
+            if (auto govobj{context().govman->FindGovernanceObject(obj.GetHash())}) {
+                const auto count = govobj->GetUniqueVoterCount(tip_mn_list, vote_signal);
+                return {.m_regular = count.m_regular, .m_evo = count.m_evo};
+            } else {
+                const auto count = obj.GetUniqueVoterCount(tip_mn_list, vote_signal);
+                return {.m_regular = count.m_regular, .m_evo = count.m_evo};
+            }
+        }
+        return {0, 0};
+    }
     bool existsObj(const uint256& hash) override
     {
         if (context().govman != nullptr) {

src/qt/bitcoingui.cpp

@@ -135,6 +135,10 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const NetworkStyle* networkStyle,
             this->message(title, message, style);
         });
         connect(walletFrame, &WalletFrame::currentWalletSet, [this] { updateWalletStatus(); });
+        connect(walletFrame, &WalletFrame::showProposalInfo, this, [this] {
+            rpcConsole->setInfoView(RPCConsole::InfoView::Governance);
+            showDebugWindow();
+        });
     } else
 #endif // ENABLE_WALLET
     {
@@ -1009,6 +1013,10 @@ void BitcoinGUI::addWallet(WalletModel* walletModel)
     });
     connect(wallet_view, &WalletView::encryptionStatusChanged, this, &BitcoinGUI::updateWalletStatus);
     connect(wallet_view, &WalletView::incomingTransaction, this, &BitcoinGUI::incomingTransaction);
+    connect(wallet_view, &WalletView::showProposalInfo, this, [this] {
+        rpcConsole->setInfoView(RPCConsole::InfoView::Governance);
+        showDebugWindow();
+    });
     connect(this, &BitcoinGUI::setPrivacy, wallet_view, &WalletView::setPrivacy);
     wallet_view->setPrivacy(isPrivacyModeActivated());
     const QString display_name = walletModel->getDisplayName();
@@ -1817,26 +1825,35 @@ void BitcoinGUI::updateGovernanceCycleIcon()
     const auto remaining_blocks{std::max<int>(0, gov_info.nextsuperblock - current_height)};
     const auto remaining_str{GUIUtil::formatBlockDuration(remaining_blocks, gov_info.targetSpacing)};
     const bool awaiting_superblock{current_height % gov_info.superblockcycle >= gov_info.superblockcycle - gov_info.superblockmaturitywindow};
+    // Voting closes superblockmaturitywindow blocks before the superblock
+    const auto voting_remaining{std::max<int>(0, remaining_blocks - gov_info.superblockmaturitywindow)};
+    const auto voting_str{GUIUtil::formatBlockDuration(voting_remaining, gov_info.targetSpacing)};
 
-    QString tooltip1{};
     if (awaiting_superblock) {
         labelGovernanceCycleIcon->setPixmap(m_gov_cycle_pixmaps.at({ToUnderlying(GUIUtil::ThemedColor::BLUE), 0}));
-        tooltip1 = tr("~%1 (%2 blocks) left for superblock").arg(remaining_str).arg(remaining_blocks);
     } else {
         const auto cycle_blocks{gov_info.superblockcycle - gov_info.superblockmaturitywindow};
         const auto blocks_elapsed{gov_info.superblockcycle - remaining_blocks - gov_info.superblockmaturitywindow};
         const auto progress{static_cast<double>(std::max(0, blocks_elapsed)) / static_cast<double>(std::max(1, cycle_blocks))};
         const auto frame{std::clamp<int>(static_cast<int>(progress * (GOV_CYCLE_FRAME_COUNT - 1)), 0, GOV_CYCLE_FRAME_COUNT - 2) + 1};
         labelGovernanceCycleIcon->setPixmap(m_gov_cycle_pixmaps.at({ToUnderlying(GUIUtil::ThemedColor::GREEN), frame}));
-        tooltip1 = tr("~%1 (%2 blocks) left for voting").arg(remaining_str).arg(remaining_blocks);
     }
 
-    const auto allocated_budget{m_node.gov().getFundableProposalHashes().allocated};
-    const auto budget_pct{gov_info.governancebudget > 0
-        ? static_cast<int>(static_cast<double>(allocated_budget) / static_cast<double>(gov_info.governancebudget) * 100.0)
-        : 0};
-    const auto unit{options_model.getDisplayUnit()};
-    const auto tooltip2{tr("~%1% of budget committed (%2 %3).").arg(budget_pct).arg(allocated_budget / BitcoinUnits::factor(unit)).arg(BitcoinUnits::name(unit))};
+    const auto tooltip1{remaining_blocks == 0
+        ? (awaiting_superblock ? tr("Superblock imminent") : tr("Voting period ended"))
+        : (awaiting_superblock
+            ? tr("~%1 (%2 blocks) left for superblock").arg(remaining_str).arg(remaining_blocks)
+            : tr("~%1 (%2 blocks) left for voting").arg(voting_str).arg(voting_remaining))};
+    const auto tooltip2{[&]() {
+        const auto allocated_budget{m_node.gov().getFundableProposalHashes().allocated};
+        const auto budget_pct{gov_info.governancebudget > 0
+            ? static_cast<int>(static_cast<double>(allocated_budget) / static_cast<double>(gov_info.governancebudget) * 100.0)
+            : 0};
+        const auto unit{options_model.getDisplayUnit()};
+        return tr("~%1% of budget committed (%2 / %3)").arg(budget_pct)
+            .arg(GUIUtil::formatAmount(unit, allocated_budget, /*is_signed=*/false, /*truncate=*/2))
+            .arg(GUIUtil::formatAmount(unit, gov_info.governancebudget, /*is_signed=*/false, /*truncate=*/2));
+    }()};
     labelGovernanceCycleIcon->setToolTip(QString("<nobr>%1<br>%2</nobr>").arg(tooltip1).arg(tooltip2));
     labelGovernanceCycleIcon->show();
 }

src/qt/clientfeeds.cpp

@@ -231,10 +231,14 @@ void ProposalFeed::fetch()
         }
         ret->m_proposals.emplace_back(std::make_shared<Proposal>(m_client_model, govObj, ret->m_gov_info, ret->m_gov_info.requiredConfs,
                                                                  /*is_broadcast=*/true));
+        const auto voters = m_client_model.node().gov().getObjUniqueVoters(govObj, VOTE_SIGNAL_FUNDING);
+        ret->m_max_regular_voters = std::max(ret->m_max_regular_voters, voters.m_regular);
+        ret->m_max_evo_voters = std::max(ret->m_max_evo_voters, voters.m_evo);
     }
 
     auto fundable{m_client_model.node().gov().getFundableProposalHashes()};
     ret->m_fundable_hashes = std::move(fundable.hashes);
+    ret->m_allocated = fundable.allocated;
 
     setData(std::move(ret));
 }

src/qt/clientfeeds.h

@@ -190,9 +190,12 @@ class QuorumFeed : public Feed<QuorumData> {
 using Proposals = std::vector<std::shared_ptr<Proposal>>;
 
 struct ProposalData {
+    CAmount m_allocated{0};
     int m_abs_vote_req{0};
     interfaces::GOV::GovernanceInfo m_gov_info;
     Proposals m_proposals;
+    uint16_t m_max_evo_voters{0};
+    uint16_t m_max_regular_voters{0};
     Uint256HashSet m_fundable_hashes;
 };