PIVX-Project · Liquid369 · Jan 25, 2022 · Jan 18, 2022 · Jan 19, 2022 · Jan 21, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -234,6 +234,7 @@ set(SERVER_SOURCES
         ./src/tiertwo/init.cpp
         ./src/interfaces/handler.cpp
         ./src/interfaces/wallet.cpp
+        ./src/interfaces/tiertwo.cpp
         ./src/dbwrapper.cpp
         ./src/legacy/validation_zerocoin_legacy.cpp
         ./src/mapport.cpp
@@ -417,6 +418,7 @@ set(COMMON_SOURCES
         ./src/evo/evodb.cpp
         ./src/evo/providertx.cpp
         ./src/evo/specialtx_validation.cpp
+        ./src/evo/specialtx_utils.cpp
         ./src/llmq/quorums_blockprocessor.cpp
         ./src/llmq/quorums_commitment.cpp
         ./src/llmq/quorums_connections.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -190,6 +190,7 @@ BITCOIN_CORE_H = \
   evo/evonotificationinterface.h \
   evo/providertx.h \
   evo/specialtx_validation.h \
+  evo/specialtx_utils.h \
   flatdb.h \
   llmq/quorums_blockprocessor.h \
   llmq/quorums_commitment.h \
@@ -213,6 +214,7 @@ BITCOIN_CORE_H = \
   init.h \
   tiertwo/init.h \
   interfaces/handler.h \
+  interfaces/tiertwo.h \
   interfaces/wallet.h \
   invalid.h \
   invalid_outpoints.json.h \
@@ -367,6 +369,7 @@ libbitcoin_server_a_SOURCES = \
   evo/mnauth.cpp \
   evo/providertx.cpp \
   evo/specialtx_validation.cpp \
+  evo/specialtx_utils.cpp \
   llmq/quorums_blockprocessor.cpp \
   llmq/quorums_commitment.cpp \
   llmq/quorums_connections.cpp \
@@ -594,6 +597,7 @@ libbitcoin_util_a_SOURCES = \
   compat/strnlen.cpp \
   fs.cpp \
   interfaces/handler.cpp \
+  interfaces/tiertwo.cpp \
   logging.cpp \
   random.cpp \
   randomenv.cpp \

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -111,6 +111,7 @@ QT_MOC_CPP = \
   qt/pivx/moc_furabstractlistitemdelegate.cpp \
   qt/pivx/moc_receivedialog.cpp \
   qt/pivx/moc_pfborderimage.cpp \
+  qt/pivx/moc_clickablelabel.cpp \
   qt/pivx/moc_topbar.cpp \
   qt/pivx/moc_txrow.cpp \
   qt/pivx/moc_dashboardwidget.cpp \
@@ -275,7 +276,8 @@ BITCOIN_QT_H = \
   qt/pivx/settings/settingswalletrepairwidget.h \
   qt/pivx/settings/settingswidget.h \
   qt/pivx/welcomecontentwidget.h \
-  qt/pivx/splash.h
+  qt/pivx/splash.h \
+  qt/pivx/clickablelabel.h
 
 RES_ICONS = \
   qt/res/icons/bitcoin.ico \
@@ -511,6 +513,8 @@ RES_ICONS = \
   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/ic-dmn.svg \
+  qt/pivx/res/img/ic-lmn.svg \
   qt/pivx/res/img/img-empty-governance.svg \
   qt/pivx/res/img/img-empty-dark-governance.svg
 

diff --git a/src/budget/budgetmanager.cpp b/src/budget/budgetmanager.cpp
@@ -5,6 +5,7 @@
 
 #include "budget/budgetmanager.h"
 
+#include "budget/budgetutil.h"
 #include "consensus/validation.h"
 #include "evo/deterministicmns.h"
 #include "masternodeman.h"
@@ -113,7 +114,7 @@ uint256 CBudgetManager::SubmitFinalBudget()
      // Submit final budget during the last 2 days (2880 blocks) before payment for Mainnet, about 9 minutes (9 blocks) for Testnet
     int finalizationWindow = ((nBlocksPerCycle / 30) * 2);
 
-    if (Params().IsTestnet()) {
+    if (Params().IsTestnet() || Params().IsRegTestNet()) {
         // NOTE: 9 blocks for testnet is way to short to have any masternode submit an automatic vote on the finalized(!) budget,
         //       because those votes are only submitted/relayed once every 56 blocks in CFinalizedBudget::AutoCheck()
 
@@ -510,6 +511,30 @@ bool CBudgetManager::GetExpectedPayeeAmount(int chainHeight, CAmount& nAmountRet
     return GetPayeeAndAmount(chainHeight, payeeRet, nAmountRet);
 }
 
+const CFinalizedBudget* CBudgetManager::GetBestFinalizedBudget(int chainHeight) const
+{
+    if (!IsSuperBlock(chainHeight)) {
+        return nullptr;
+    }
+    int nFivePercent = mnodeman.CountEnabled() / 20;
+
+    const auto highest = GetBudgetWithHighestVoteCount(chainHeight);
+    if (highest.m_budget_fin == nullptr || highest.m_vote_count <= nFivePercent) {
+        // No finalization or not enough votes.
+        return nullptr;
+    }
+    return highest.m_budget_fin;
+}
+
+CAmount CBudgetManager::GetFinalizedBudgetTotalPayout(int chainHeight) const
+{
+    const CFinalizedBudget* pfb = GetBestFinalizedBudget(chainHeight);
+    if (pfb == nullptr) {
+        return 0;
+    }
+    return pfb->GetTotalPayout();
+}
+
 bool CBudgetManager::FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTransaction& txCoinstake, const int nHeight, bool fProofOfStake) const
 {
     if (nHeight <= 0) return false;
@@ -553,6 +578,14 @@ bool CBudgetManager::FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTra
     return true;
 }
 
+void CBudgetManager::FillBlockPayees(CMutableTransaction& tx, int height) const
+{
+    const CFinalizedBudget* pfb = GetBestFinalizedBudget(height);
+    if (pfb != nullptr) {
+        pfb->PayAllBudgets(tx);
+    }
+}
+
 void CBudgetManager::VoteOnFinalizedBudgets()
 {
     // function called only from initialized masternodes
@@ -742,6 +775,18 @@ TrxValidationStatus CBudgetManager::IsTransactionValid(const CTransaction& txNew
     return fThreshold ? TrxValidationStatus::InValid : TrxValidationStatus::VoteThreshold;
 }
 
+bool CBudgetManager::IsValidSuperBlockTx(const CTransaction& txNew, int nBlockHeight) const
+{
+    assert(IsSuperBlock(nBlockHeight));
+
+    const CFinalizedBudget* pfb = GetBestFinalizedBudget(nBlockHeight);
+    if (pfb == nullptr) {
+        // No finalization or not enough votes. Nothing to check.
+        return true;
+    }
+    return pfb->AllBudgetsPaid(txNew);
+}
+
 std::vector<CBudgetProposal*> CBudgetManager::GetAllProposalsOrdered()
 {
     LOCK(cs_proposals);

diff --git a/src/budget/budgetmanager.h b/src/budget/budgetmanager.h
@@ -136,18 +136,23 @@ class CBudgetManager : public CValidationInterface
     std::vector<CBudgetProposal*> GetAllProposalsOrdered();
     std::vector<CFinalizedBudget*> GetFinalizedBudgets();
     bool GetExpectedPayeeAmount(int chainHeight, CAmount& nAmountRet) const;
-    bool IsBudgetPaymentBlock(int nBlockHeight) const;
-    bool IsBudgetPaymentBlock(int nBlockHeight, int& nCountThreshold) const;
+    CAmount GetFinalizedBudgetTotalPayout(int chainHeight) const;
+    bool IsBudgetPaymentBlock(int nBlockHeight) const;  // legacy (multiple SB)
+    bool IsBudgetPaymentBlock(int nBlockHeight, int& nCountThreshold) const; // legacy (multiple SB)
     bool AddProposal(CBudgetProposal& budgetProposal);
     bool AddFinalizedBudget(CFinalizedBudget& finalizedBudget, CNode* pfrom = nullptr);
     void ForceAddFinalizedBudget(const uint256& nHash, const uint256& feeTxId, const CFinalizedBudget& finalizedBudget);
     uint256 SubmitFinalBudget();
 
     bool UpdateProposal(const CBudgetVote& vote, CNode* pfrom, std::string& strError);
     bool UpdateFinalizedBudget(const CFinalizedBudgetVote& vote, CNode* pfrom, std::string& strError);
-    TrxValidationStatus IsTransactionValid(const CTransaction& txNew, const uint256& nBlockHash, int nBlockHeight) const;
+    TrxValidationStatus IsTransactionValid(const CTransaction& txNew, const uint256& nBlockHash, int nBlockHeight) const; // legacy (multiple SB)
+    bool IsValidSuperBlockTx(const CTransaction& txNew, int nBlockHeight) const; // v6.0: single SB
+
     std::string GetRequiredPaymentsString(int nBlockHeight);
-    bool FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTransaction& txCoinstake, const int nHeight, bool fProofOfStake) const;
+    const CFinalizedBudget* GetBestFinalizedBudget(int chainHeight) const;
+    bool FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTransaction& txCoinstake, const int nHeight, bool fProofOfStake) const; // legacy (multiple SB)
+    void FillBlockPayees(CMutableTransaction& tx, int height) const; // v6.0: single SB
 
     // Only initialized masternodes: sign and submit votes on valid finalized budgets
     void VoteOnFinalizedBudgets();

diff --git a/src/budget/budgetproposal.cpp b/src/budget/budgetproposal.cpp
@@ -4,6 +4,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "budget/budgetproposal.h"
+
+#include "budget/budgetutil.h"
 #include "chainparams.h"
 #include "script/standard.h"
 #include "utilstrencodings.h"
@@ -86,8 +88,7 @@ bool CBudgetProposal::IsHeavilyDownvoted(int mnCount)
 bool CBudgetProposal::CheckStartEnd()
 {
     // block start must be a superblock
-    if (nBlockStart < 0 ||
-            nBlockStart % Params().GetConsensus().nBudgetCycleBlocks != 0) {
+    if (nBlockStart < 0 || !IsSuperBlock(nBlockStart)) {
         strInvalid = "Invalid nBlockStart";
         return false;
     }

diff --git a/src/budget/budgetutil.cpp b/src/budget/budgetutil.cpp
@@ -4,6 +4,7 @@
 
 #include "budget/budgetutil.h"
 
+#include "chainparams.h"
 #include "budget/budgetmanager.h"
 #include "masternodeman.h"
 #include "masternodeconfig.h"
@@ -269,4 +270,9 @@ UniValue mnLocalBudgetVoteInner(bool fLegacyMN, const uint256& budgetHash, bool
 
     return (fFinal ? voteFinalBudget(budgetHash, mnKeys, resultsObj, 0)
                    : voteProposal(budgetHash, nVote, mnKeys, resultsObj, 0));
-}
+}
+
+bool IsSuperBlock(int height)
+{
+    return height % Params().GetConsensus().nBudgetCycleBlocks == 0;
+}
diff --git a/src/budget/budgetutil.h b/src/budget/budgetutil.h
@@ -24,4 +24,7 @@ UniValue mnLocalBudgetVoteInner(bool fLegacyMN, const uint256& budgetHash, bool
 UniValue mnBudgetVoteInner(CWallet* const pwallet, bool fLegacyMN, const uint256& budgetHash, bool fFinal,
                                   const CBudgetVote::VoteDirection& nVote, const Optional<std::string>& mnAliasFilter);
 
+// One every Consensus::Params:nBudgetCycleBlocks blocks
+bool IsSuperBlock(int height);
+
 #endif //PIVX_BUDGETUTIL_H
diff --git a/src/budget/finalizedbudget.cpp b/src/budget/finalizedbudget.cpp
@@ -5,7 +5,9 @@
 
 #include "budget/finalizedbudget.h"
 
+#include "budget/budgetutil.h"
 #include "masternodeman.h"
+#include "utilmoneystr.h"
 #include "validation.h"
 
 CFinalizedBudget::CFinalizedBudget() :
@@ -187,7 +189,7 @@ bool CFinalizedBudget::CheckStartEnd()
     }
 
     // Must be the correct block for payment to happen (once a month)
-    if (nBlockStart % Params().GetConsensus().nBudgetCycleBlocks != 0) {
+    if (!IsSuperBlock(nBlockStart)) {
         strInvalid = "Invalid BlockStart";
         return false;
     }
@@ -389,6 +391,45 @@ bool CFinalizedBudget::GetPayeeAndAmount(int64_t nBlockHeight, CScript& payee, C
     return true;
 }
 
+bool CFinalizedBudget::AllBudgetsPaid(const CTransaction& tx) const
+{
+    // make a map for faster lookup and deal with duplicate payees
+    struct cmp {
+        bool operator()(const CTxOut& a, const CTxOut& b) const {
+            return a.scriptPubKey < b.scriptPubKey ||
+                   (a.scriptPubKey == b.scriptPubKey && a.nValue < b.nValue);
+        }
+    };
+    std::map<CTxOut, int, cmp> txouts;
+    for (const CTxOut& o: tx.vout) {
+        txouts[o]++;
+    }
+
+    for (const CTxBudgetPayment& payment : vecBudgetPayments) {
+        const auto it = txouts.find(CTxOut(payment.nAmount, payment.payee));
+        if (it == txouts.end() || it->second == 0) {
+            // Payment not found
+            CTxDestination addr;
+            const std::string& payee = ExtractDestination(payment.payee, addr) ? EncodeDestination(addr)
+                                                                               : HexStr(payment.payee);
+            LogPrint(BCLog::MNBUDGET, "Missing payment of %s for %s (proposal hash: %s)\n",
+                    FormatMoney(payment.nAmount), payee, payment.nProposalHash.ToString());
+            return false;
+        }
+        it->second--;
+    }
+
+    // all budgets are paid by tx
+    return true;
+}
+
+void CFinalizedBudget::PayAllBudgets(CMutableTransaction& tx) const
+{
+    for (const CTxBudgetPayment& payment : vecBudgetPayments) {
+        tx.vout.emplace_back(payment.nAmount, payment.payee);
+    }
+}
+
 // return broadcast serialization
 CDataStream CFinalizedBudget::GetBroadcast() const
 {

diff --git a/src/budget/finalizedbudget.h b/src/budget/finalizedbudget.h
@@ -93,6 +93,12 @@ class CFinalizedBudget
     bool GetBudgetPaymentByBlock(int64_t nBlockHeight, CTxBudgetPayment& payment) const;
     bool GetPayeeAndAmount(int64_t nBlockHeight, CScript& payee, CAmount& nAmount) const;
 
+    // Check if ALL the budgets are paid by transaction tx
+    bool AllBudgetsPaid(const CTransaction& tx) const;
+
+    // Add payments for ALL budgets to tx outs
+    void PayAllBudgets(CMutableTransaction& tx) const;
+
     // Check finalized budget proposals. Masternodes only (when voting on finalized budgets)
     bool CheckProposals(const std::map<uint256, CBudgetProposal>& mapWinningProposals) const;
     // Total amount paid out by this budget

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -456,10 +456,10 @@ class CTestNetParams : public CChainParams
          * The characters are rarely used upper ASCII, not valid as UTF-8, and produce
          * a large 4-byte int at any alignment.
          */
-        pchMessageStart[0] = 0xf5;
-        pchMessageStart[1] = 0xe6;
-        pchMessageStart[2] = 0xd5;
-        pchMessageStart[3] = 0xca;
+        pchMessageStart[0] = 0xe5;
+        pchMessageStart[1] = 0xd1;
+        pchMessageStart[2] = 0xd4;
+        pchMessageStart[3] = 0xea;
         nDefaultPort = 51474;
 
         // nodes with support for servicebits filtering should be at the top
@@ -582,22 +582,21 @@ class CRegTestParams : public CChainParams
                 Consensus::NetworkUpgrade::ALWAYS_ACTIVE;
         consensus.vUpgrades[Consensus::UPGRADE_TESTDUMMY].nActivationHeight =
                 Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
-        consensus.vUpgrades[Consensus::UPGRADE_POS].nActivationHeight           = 251;
-        consensus.vUpgrades[Consensus::UPGRADE_POS_V2].nActivationHeight        = 251;
+        consensus.vUpgrades[Consensus::UPGRADE_POS].nActivationHeight           = 298;
+        consensus.vUpgrades[Consensus::UPGRADE_POS_V2].nActivationHeight        = 298;
         consensus.vUpgrades[Consensus::UPGRADE_ZC].nActivationHeight            = 300;
         consensus.vUpgrades[Consensus::UPGRADE_ZC_V2].nActivationHeight         = 300;
         consensus.vUpgrades[Consensus::UPGRADE_BIP65].nActivationHeight         =
                 Consensus::NetworkUpgrade::ALWAYS_ACTIVE;
         consensus.vUpgrades[Consensus::UPGRADE_ZC_PUBLIC].nActivationHeight     = 400;
-        consensus.vUpgrades[Consensus::UPGRADE_V3_4].nActivationHeight          = 251;
+        consensus.vUpgrades[Consensus::UPGRADE_V3_4].nActivationHeight          = 298;
         consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight          =
                 Consensus::NetworkUpgrade::ALWAYS_ACTIVE;
         consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight          = 300;
         consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight          = 300;
-        consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight          = 251;
-        consensus.vUpgrades[Consensus::UPGRADE_V5_5].nActivationHeight          = 576;
-        consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
-                Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+        consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight          = 298;
+        consensus.vUpgrades[Consensus::UPGRADE_V5_5].nActivationHeight          = 301;
+        consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight          = 301;
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.

diff --git a/src/destination_io.cpp b/src/destination_io.cpp
@@ -74,7 +74,7 @@ Destination& Destination::operator=(const Destination& from)
 }
 
 // Returns the key ID if Destination is a transparent "regular" destination
-const CKeyID* Destination::getKeyID()
+const CKeyID* Destination::getKeyID() const
 {
     const CTxDestination* regDest = Standard::GetTransparentDestination(dest);
     return (regDest) ? boost::get<CKeyID>(regDest) : nullptr;

diff --git a/src/destination_io.h b/src/destination_io.h
@@ -41,7 +41,7 @@ class Destination {
 
     Destination& operator=(const Destination& from);
     // Returns the key ID if Destination is a transparent "regular" destination
-    const CKeyID* getKeyID();
+    const CKeyID* getKeyID() const;
     // Returns the encoded string address
     std::string ToString() const;
 };

diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
@@ -7,7 +7,6 @@
 
 #include "bls/key_io.h"
 #include "chain.h"
-#include "coins.h"
 #include "chainparams.h"
 #include "consensus/upgrades.h"
 #include "consensus/validation.h"
@@ -505,6 +504,7 @@ bool CDeterministicMNManager::ProcessBlock(const CBlock& block, const CBlockInde
         }
 
         diff.nHeight = pindex->nHeight;
+        diff.blockHash = pindex->GetBlockHash();
         mnListDiffsCache.emplace(pindex->GetBlockHash(), diff);
     } catch (const std::exception& e) {
         LogPrintf("CDeterministicMNManager::%s -- internal error: %s\n", __func__, e.what());
@@ -888,6 +888,7 @@ CDeterministicMNList CDeterministicMNManager::GetListForBlock(const CBlockIndex*
         }
 
         diff.nHeight = pindex->nHeight;
+        diff.blockHash = pindex->GetBlockHash();
         mnListDiffsCache.emplace(pindex->GetBlockHash(), std::move(diff));
         listDiffIndexes.emplace_front(pindex);
         pindex = pindex->pprev;