PIVX-Project · furszy · Nov 4, 2021 · May 12, 2021 · May 15, 2021 · May 20, 2021
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -50,6 +50,12 @@ QT_FORMS_UI = \
   qt/pivx/forms/addresseswidget.ui \
   qt/pivx/forms/defaultdialog.ui \
   qt/pivx/forms/coldstakingwidget.ui \
+  qt/pivx/forms/proposalcard.ui \
+  qt/pivx/forms/mnselectiondialog.ui \
+  qt/pivx/forms/votedialog.ui \
+  qt/pivx/forms/createproposaldialog.ui \
+  qt/pivx/forms/proposalinfodialog.ui \
+  qt/pivx/forms/governancewidget.ui \
   qt/pivx/settings/forms/settingsbackupwallet.ui \
   qt/pivx/settings/forms/settingsexportcsv.ui \
   qt/pivx/settings/forms/settingsbittoolwidget.ui \
@@ -136,6 +142,12 @@ QT_MOC_CPP = \
   qt/pivx/moc_addresseswidget.cpp \
   qt/pivx/moc_defaultdialog.cpp \
   qt/pivx/moc_coldstakingwidget.cpp \
+  qt/pivx/moc_proposalcard.cpp \
+  qt/pivx/moc_mnselectiondialog.cpp \
+  qt/pivx/moc_votedialog.cpp \
+  qt/pivx/moc_createproposaldialog.cpp \
+  qt/pivx/moc_proposalinfodialog.cpp \
+  qt/pivx/moc_governancewidget.cpp \
   qt/pivx/settings/moc_settingsbackupwallet.cpp \
   qt/pivx/settings/moc_settingsexportcsv.cpp \
   qt/pivx/settings/moc_settingsbittoolwidget.cpp \
@@ -249,6 +261,13 @@ BITCOIN_QT_H = \
   qt/pivx/addresseswidget.h \
   qt/pivx/defaultdialog.h \
   qt/pivx/coldstakingwidget.h \
+  qt/pivx/governancemodel.h \
+  qt/pivx/proposalcard.h \
+  qt/pivx/mnselectiondialog.h \
+  qt/pivx/votedialog.h \
+  qt/pivx/createproposaldialog.h \
+  qt/pivx/proposalinfodialog.h \
+  qt/pivx/governancewidget.h \
   qt/pivx/settings/settingsbackupwallet.h \
   qt/pivx/settings/settingsexportcsv.h \
   qt/pivx/settings/settingsbittoolwidget.h \
@@ -485,7 +504,21 @@ RES_ICONS = \
   qt/pivx/res/img/ic-information.svg \
   qt/pivx/res/img/ic-information-hover.svg \
   qt/pivx/res/img/ani-loading-dark.gif \
-  qt/pivx/res/img/ani-loading.gif
+  qt/pivx/res/img/ani-loading.gif \
+  qt/pivx/res/img/ic-check-vote.svg \
+  qt/pivx/res/img/ic-check-vote-active.svg \
+  qt/pivx/res/img/ic-check-vote-dark.svg \
+  qt/pivx/res/img/ic-check-vote-active-dark.svg \
+  qt/pivx/res/img/ic-check-block.svg \
+  qt/pivx/res/img/ic-filter.svg \
+  qt/pivx/res/img/ic-link.svg \
+  qt/pivx/res/img/ic-nav-governance.svg \
+  qt/pivx/res/img/ic-nav-governance-active.svg \
+  qt/pivx/res/img/ic-nav-governance-hover.svg \
+  qt/pivx/res/img/ic-time.svg \
+  qt/pivx/res/img/ic-link-hover.svg \
+  qt/pivx/res/img/img-empty-governance.svg \
+  qt/pivx/res/img/img-empty-dark-governance.svg
 
 BITCOIN_QT_BASE_CPP = \
   qt/bantablemodel.cpp \
@@ -569,6 +602,13 @@ BITCOIN_QT_WALLET_CPP = \
   qt/pivx/addresseswidget.cpp \
   qt/pivx/defaultdialog.cpp \
   qt/pivx/coldstakingwidget.cpp \
+  qt/pivx/governancemodel.cpp \
+  qt/pivx/proposalcard.cpp \
+  qt/pivx/mnselectiondialog.cpp \
+  qt/pivx/votedialog.cpp \
+  qt/pivx/createproposaldialog.cpp \
+  qt/pivx/proposalinfodialog.cpp \
+  qt/pivx/governancewidget.cpp \
   qt/pivx/settings/settingsbackupwallet.cpp \
   qt/pivx/settings/settingsexportcsv.cpp \
   qt/pivx/settings/settingsbittoolwidget.cpp \

diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -316,7 +316,7 @@ void CActiveMasternode::ManageStatus()
 
     if (status == ACTIVE_MASTERNODE_SYNC_IN_PROCESS) status = ACTIVE_MASTERNODE_INITIAL;
 
-    if (status == ACTIVE_MASTERNODE_INITIAL) {
+    if (status == ACTIVE_MASTERNODE_INITIAL || (pmn && status == ACTIVE_MASTERNODE_NOT_CAPABLE)) {
         if (pmn) {
             if (pmn->protocolVersion != PROTOCOL_VERSION) {
                 LogPrintf("%s: ERROR Trying to start a masternode running an old protocol version, "

diff --git a/src/budget/budgetmanager.h b/src/budget/budgetmanager.h
@@ -119,6 +119,9 @@ class CBudgetManager : public CValidationInterface
     // finds the proposal with the given name, with highest net yes count.
     const CBudgetProposal* FindProposalByName(const std::string& strProposalName) const;
 
+    // Returns true if there is at least one proposal stored.
+    bool HasAnyProposal() const { return WITH_LOCK(cs_proposals, return !mapProposals.empty()); }
+
     static CAmount GetTotalBudget(int nHeight);
     std::vector<CBudgetProposal> GetBudget();
     // Get all the budget proposals sorted by votes (highest to lowest)

diff --git a/src/budget/budgetproposal.cpp b/src/budget/budgetproposal.cpp
@@ -317,7 +317,7 @@ int CBudgetProposal::GetTotalPaymentCount() const
 
 int CBudgetProposal::GetRemainingPaymentCount(int nCurrentHeight) const
 {
-    // If this budget starts in the future, this value will be wrong
+    // If the proposal is already finished (passed the end block cycle), the payments value will be negative
     int nPayments = (GetBlockEndCycle() - GetBlockCycle(nCurrentHeight)) / Params().GetConsensus().nBudgetCycleBlocks - 1;
     // Take the lowest value
     return std::min(nPayments, GetTotalPaymentCount());

diff --git a/src/budget/budgetproposal.h b/src/budget/budgetproposal.h
@@ -92,10 +92,11 @@ class CBudgetProposal
     std::map<COutPoint, CBudgetVote> GetVotes() const { return mapVotes; }
     int GetYeas() const { return GetVoteCount(CBudgetVote::VOTE_YES); }
     int GetNays() const { return GetVoteCount(CBudgetVote::VOTE_NO); }
-    int GetAbstains() const { return GetVoteCount(CBudgetVote::VOTE_ABSTAIN); };
+    int GetAbstains() const { return GetVoteCount(CBudgetVote::VOTE_ABSTAIN); }
     CAmount GetAmount() const { return nAmount; }
     void SetAllotted(CAmount nAllottedIn) { nAllotted = nAllottedIn; }
     CAmount GetAllotted() const { return nAllotted; }
+    void SetFeeTxHash(const uint256& txid) { nFeeTXHash = txid; }
 
     uint256 GetHash() const
     {
@@ -128,6 +129,11 @@ class CBudgetProposal
     CDataStream GetBroadcast() const;
     void Relay();
 
+    inline bool operator==(const CBudgetProposal& other) const
+    {
+        return GetHash() == other.GetHash();
+    }
+
     // compare proposals by proposal hash
     inline bool operator>(const CBudgetProposal& other) const
     {

diff --git a/src/operationresult.h b/src/operationresult.h
@@ -19,6 +19,7 @@ class OperationResult
     OperationResult(bool _res) : m_res(_res) { }
 
     std::string getError() const { return (m_error ? *m_error : ""); }
+    bool getRes() const { return m_res; }
     explicit operator bool() const { return m_res; }
 };
 

diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -145,6 +145,12 @@ SET(QT_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/addresseswidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/defaultdialog.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/coldstakingwidget.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/mnselectiondialog.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/proposalcard.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/votedialog.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/createproposaldialog.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/proposalinfodialog.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/governancewidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbackupwallet.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbittoolwidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsconsolewidget.cpp
@@ -159,6 +165,7 @@ SET(QT_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/welcomecontentwidget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/pivx/splash.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/pivx/governancemodel.cpp
         )
 
 execute_process(

diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui
@@ -206,7 +206,7 @@ padding-right:4px;</string>
            <item>
             <widget class="QLabel" name="labelCoinControlQuantity">
              <property name="text">
-              <string>0</string>
+              <string notr="true">0</string>
              </property>
             </widget>
            </item>
@@ -591,7 +591,7 @@ padding-right:4px;</string>
            <item>
             <widget class="QLabel" name="labelCoinControlBytes">
              <property name="text">
-              <string>0</string>
+              <string notr="true">0</string>
              </property>
             </widget>
            </item>
@@ -683,7 +683,7 @@ padding-right:4px;</string>
            <item>
             <widget class="QLabel" name="labelCoinControlChange">
              <property name="text">
-              <string>0</string>
+              <string notr="true">0</string>
              </property>
             </widget>
            </item>

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -94,7 +94,7 @@ QFont bitcoinAddressFont()
  * return validity.
  * @note Must return 0 if !valid.
  */
-CAmount parseValue(const QString& text, int displayUnit, bool* valid_out)
+static CAmount parseValue(const QString& text, int displayUnit, bool* valid_out)
 {
     CAmount val = 0;
     bool valid = BitcoinUnits::parse(displayUnit, text, &val);
@@ -107,6 +107,16 @@ CAmount parseValue(const QString& text, int displayUnit, bool* valid_out)
     return valid ? val : 0;
 }
 
+/**
+ * Returns 0 if the value is invalid
+ */
+CAmount parseValue(const QString& amount, int displayUnit)
+{
+    bool isValid = false;
+    CAmount value = GUIUtil::parseValue(amount, displayUnit, &isValid);
+    return isValid ? value : 0;
+}
+
 QString formatBalance(CAmount amount, int nDisplayUnit, bool isZpiv)
 {
     return (amount == 0) ? ("0.00 " + BitcoinUnits::name(nDisplayUnit, isZpiv)) : BitcoinUnits::floorHtmlWithUnit(nDisplayUnit, amount, false, BitcoinUnits::separatorAlways, true, isZpiv);

diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -54,8 +54,9 @@ QString dateTimeStr(qint64 nTime);
 // Render PIVX addresses in monospace font
 QFont bitcoinAddressFont();
 
-// Parse string into a CAmount value
-CAmount parseValue(const QString& text, int displayUnit, bool* valid_out = 0);
+// Parse string into a CAmount value.
+// Return 0 if the value is invalid
+CAmount parseValue(const QString& amount, int displayUnit = 0);
 
 // Format an amount
 QString formatBalance(CAmount amount, int nDisplayUnit = 0, bool isZpiv = false);

diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp
@@ -23,6 +23,8 @@
 #include "winshutdownmonitor.h"
 
 #ifdef ENABLE_WALLET
+#include "qt/pivx/governancemodel.h"
+#include "qt/pivx/mnmodel.h"
 #include "paymentserver.h"
 #include "walletmodel.h"
 #include "interfaces/wallet.h"
@@ -41,8 +43,6 @@
 #include "wallet/wallet.h"
 #endif
 
-#include <stdint.h>
-
 #include <QApplication>
 #include <QDebug>
 #include <QLibraryInfo>
@@ -236,6 +236,8 @@ public Q_SLOTS:
 #ifdef ENABLE_WALLET
     PaymentServer* paymentServer{nullptr};
     WalletModel* walletModel{nullptr};
+    GovernanceModel* govModel{nullptr};
+    MNModel* mnModel{nullptr};
 #endif
     int returnValue{0};
     QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator;
@@ -453,6 +455,7 @@ void BitcoinApplication::requestShutdown()
     qDebug() << __func__ << ": Requesting shutdown";
     startThread();
     window->hide();
+    if (govModel) govModel->stop();
     if (walletModel) walletModel->stop();
     window->setClientModel(nullptr);
     pollShutdownTimer->stop();
@@ -488,13 +491,21 @@ void BitcoinApplication::initializeResult(int retval)
         window->setClientModel(clientModel);
 
 #ifdef ENABLE_WALLET
+        mnModel = new MNModel(this);
+        govModel = new GovernanceModel(clientModel, mnModel);
         // TODO: Expose secondary wallets
         if (!vpwallets.empty()) {
             walletModel = new WalletModel(vpwallets[0], optionsModel);
             walletModel->setClientModel(clientModel);
+            mnModel->setWalletModel(walletModel);
+            govModel->setWalletModel(walletModel);
+            walletModel->init();
+            mnModel->init();
 
+            window->setGovModel(govModel);
             window->addWallet(PIVXGUI::DEFAULT_WALLET, walletModel);
             window->setCurrentWallet(PIVXGUI::DEFAULT_WALLET);
+            window->setMNModel(mnModel);
         }
 #endif
 

diff --git a/src/qt/pivx.qrc b/src/qt/pivx.qrc
@@ -223,5 +223,19 @@
         <file alias="ic-check-cold-staking-enabled">pivx/res/img/ic-check-cold-staking-enabled.svg</file>
         <file alias="ic-information">pivx/res/img/ic-information.svg</file>
         <file alias="ic-information-hover">pivx/res/img/ic-information-hover.svg</file>
+        <file alias="ic-check-vote">pivx/res/img/ic-check-vote.svg</file>
+        <file alias="ic-check-vote-active">pivx/res/img/ic-check-vote-active.svg</file>
+        <file alias="ic-check-vote-dark">pivx/res/img/ic-check-vote-dark.svg</file>
+        <file alias="ic-check-vote-active-dark">pivx/res/img/ic-check-vote-active-dark.svg</file>
+        <file alias="ic-filter">pivx/res/img/ic-filter.svg</file>
+        <file alias="ic-link">pivx/res/img/ic-link.svg</file>
+        <file alias="ic-link-hover">pivx/res/img/ic-link-hover.svg</file>
+        <file alias="ic-nav-governance">pivx/res/img/ic-nav-governance.svg</file>
+        <file alias="ic-nav-governance-active">pivx/res/img/ic-nav-governance-active.svg</file>
+        <file alias="ic-nav-governance-hover">pivx/res/img/ic-nav-governance-hover.svg</file>
+        <file alias="ic-time">pivx/res/img/ic-time.svg</file>
+        <file alias="img-empty-governance">pivx/res/img/img-empty-governance.svg</file>
+        <file alias="img-empty-dark-governance">pivx/res/img/img-empty-dark-governance.svg</file>
+        <file alias="ic-check-block">pivx/res/img/ic-check-block.svg</file>
     </qresource>
 </RCC>
diff --git a/src/qt/pivx/contactsdropdown.cpp b/src/qt/pivx/contactsdropdown.cpp
@@ -14,7 +14,7 @@
 #include "addresstablemodel.h"
 
 #define DECORATION_SIZE 70
-#define NUM_ITEMS 3
+#define NUM_ITEMS 2
 
 class ContViewHolder : public FurListRow<QWidget*>
 {
@@ -48,12 +48,20 @@ class ContViewHolder : public FurListRow<QWidget*>
     ContactDropdownRow* row = nullptr;
 };
 
-ContactsDropdown::ContactsDropdown(int minWidth, int minHeight, PWidget *parent) :
-   PWidget(parent)
+ContactsDropdown::ContactsDropdown(int minWidth, int minHeight, PIVXGUI* _window, QWidget* _parent) : PWidget(_window, _parent)
 {
+    this->setStyleSheet(_window->styleSheet());
+    init(minWidth, minHeight);
+}
 
+ContactsDropdown::ContactsDropdown(int minWidth, int minHeight, PWidget* parent) : PWidget(parent)
+{
     this->setStyleSheet(parent->styleSheet());
+    init(minWidth, minHeight);
+}
 
+void ContactsDropdown::init(int minWidth, int minHeight)
+{
     delegate = new FurAbstractListItemDelegate(
                 DECORATION_SIZE,
                 new ContViewHolder(isLightTheme()),

diff --git a/src/qt/pivx/contactsdropdown.h b/src/qt/pivx/contactsdropdown.h
@@ -28,7 +28,9 @@ class ContactsDropdown : public PWidget
 {
     Q_OBJECT
 public:
-    explicit ContactsDropdown(int minWidth, int minHeight, PWidget *parent = nullptr);
+    explicit ContactsDropdown(int minWidth, int minHeight, PWidget* parent = nullptr);
+    ContactsDropdown(int minWidth, int minHeight, PIVXGUI* _window = nullptr,
+                     QWidget* parent = nullptr);
 
     void resizeList(int minWidth, int mintHeight);
     void setWalletModel(WalletModel* _model, const QStringList& type);
@@ -42,6 +44,7 @@ class ContactsDropdown : public PWidget
     AddressFilterProxyModel *filter = nullptr;
     QListView *list;
     QFrame *frameList;
+    void init(int minWidth, int minHeight);
 private Q_SLOTS:
     void handleClick(const QModelIndex &index);
 };