[GUI] New Deterministic Masternodes Graphical User Interface

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

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 \
@@ -366,6 +368,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 \
@@ -592,6 +595,7 @@ libbitcoin_util_a_SOURCES = \
   compat/strnlen.cpp \
   fs.cpp \
   interfaces/handler.cpp \
+  interfaces/tiertwo.cpp \
   logging.cpp \
   random.cpp \
   randomenv.cpp \

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
 

src/chainparams.cpp

@@ -590,8 +590,7 @@ class CRegTestParams : public CChainParams
         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_V6_0].nActivationHeight =
-                Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+        consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight          = 301;
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.

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;

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;
 };

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;

src/evo/deterministicmns.h

@@ -495,7 +495,8 @@ class CDeterministicMNList
 class CDeterministicMNListDiff
 {
 public:
-    int nHeight{-1}; //memory only
+    int nHeight{-1}; // memory only
+    uint256 blockHash; // memory only
 
     std::vector<CDeterministicMNCPtr> addedMNs;
     // keys are all relating to the internalId of MNs

src/evo/specialtx_utils.cpp

@@ -0,0 +1,82 @@
+// Copyright (c) 2022 The PIVX Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or htts://www.opensource.org/licenses/mit-license.php.
+
+#include "evo/specialtx_utils.h"
+
+#include "net.h"
+#include "script/script.h"
+#include "wallet/wallet.h"
+
+#ifdef ENABLE_WALLET
+
+OperationResult FundSpecialTx(CWallet* pwallet, CMutableTransaction& tx)
+{
+    static CTxOut dummyTxOut(0, CScript() << OP_RETURN);
+    std::vector<CRecipient> vecSend;
+    bool dummyTxOutAdded = false;
+
+    if (tx.vout.empty()) {
+        // add dummy txout as CreateTransaction requires at least one recipient
+        tx.vout.emplace_back(dummyTxOut);
+        dummyTxOutAdded = true;
+    }
+
+    CAmount nFee;
+    CFeeRate feeRate = CFeeRate(0);
+    int nChangePos = -1;
+    std::string strFailReason;
+    std::set<int> setSubtractFeeFromOutputs;
+    if (!pwallet->FundTransaction(tx, nFee, false, feeRate, nChangePos, strFailReason, false, false, {})) {
+        return {false, strFailReason};
+    }
+
+    if (dummyTxOutAdded && tx.vout.size() > 1) {
+        // FundTransaction added a change output, so we don't need the dummy txout anymore
+        // Removing it results in slight overpayment of fees, but we ignore this for now (as it's a very low amount)
+        auto it = std::find(tx.vout.begin(), tx.vout.end(), dummyTxOut);
+        assert(it != tx.vout.end());
+        tx.vout.erase(it);
+    }
+
+    return {true};
+}
+
+OperationResult SignAndSendSpecialTx(CWallet* pwallet, CMutableTransaction& tx, std::map<std::string, std::string>* extras)
+{
+    if (!pwallet->SignTransaction(tx)) {
+        return {false, "signature failed"};
+    }
+
+    CWallet::CommitResult res = pwallet->CommitTransaction(MakeTransactionRef(tx), nullptr, g_connman.get(), extras);
+    CValidationState& state = res.state;
+    if (state.IsInvalid()) {
+        std::string debugMsg = state.GetDebugMessage();
+        return {false, debugMsg.empty() ? state.GetRejectReason() :
+                strprintf("%s: %s", state.GetRejectReason(), debugMsg)};
+    }
+
+    return {true};
+}
+
+#endif
+
+Optional<CKeyID> ParsePubKeyIDFromAddress(const std::string& strAddress, std::string& strError)
+{
+    bool isStaking{false}, isShield{false};
+    const CWDestination& cwdest = Standard::DecodeDestination(strAddress, isStaking, isShield);
+    if (isStaking) {
+        strError = "cold staking addresses not supported";
+        return nullopt;
+    }
+    if (isShield) {
+        strError = "shield addresses not supported";
+        return nullopt;
+    }
+    const CKeyID* keyID = boost::get<CKeyID>(Standard::GetTransparentDestination(cwdest));
+    if (!keyID) {
+        strError = strprintf("invalid PIVX address %s", strAddress);
+        return nullopt;
+    }
+    return *keyID;
+}

src/evo/specialtx_utils.h

@@ -0,0 +1,73 @@
+// Copyright (c) 2022 The PIVX Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or htts://www.opensource.org/licenses/mit-license.php.
+
+#ifndef PIVX_SPECIALTX_UTILS_H
+#define PIVX_SPECIALTX_UTILS_H
+
+#include "bls/bls_wrapper.h"
+#include "messagesigner.h"
+#include "operationresult.h"
+#include "primitives/transaction.h"
+
+template<typename SpecialTxPayload>
+OperationResult SignSpecialTxPayloadByHash(const CMutableTransaction& tx, SpecialTxPayload& payload, const CKey& key)
+{
+    payload.vchSig.clear();
+    uint256 hash = ::SerializeHash(payload);
+    return CHashSigner::SignHash(hash, key, payload.vchSig) ? OperationResult{true} :
+            OperationResult{false, "failed to sign special tx payload"};
+}
+
+template<typename SpecialTxPayload>
+OperationResult SignSpecialTxPayloadByHash(const CMutableTransaction& tx, SpecialTxPayload& payload, const CBLSSecretKey& key)
+{
+    payload.sig = key.Sign(::SerializeHash(payload));
+    return payload.sig.IsValid() ? OperationResult{true} : OperationResult{false, "failed to sign special tx payload"};
+}
+
+template<typename SpecialTxPayload>
+OperationResult SignSpecialTxPayloadByString(SpecialTxPayload& payload, const CKey& key)
+{
+    payload.vchSig.clear();
+    std::string m = payload.MakeSignString();
+    return CMessageSigner::SignMessage(m, payload.vchSig, key) ? OperationResult{true} :
+            OperationResult{false, "failed to sign special tx payload"};
+}
+
+template<typename SpecialTxPayload>
+static void UpdateSpecialTxInputsHash(const CMutableTransaction& tx, SpecialTxPayload& payload)
+{
+    payload.inputsHash = CalcTxInputsHash(tx);
+}
+
+#ifdef ENABLE_WALLET
+
+class CWallet;
+struct CMutableTransaction;
+
+OperationResult FundSpecialTx(CWallet* pwallet, CMutableTransaction& tx);
+
+template<typename SpecialTxPayload>
+OperationResult FundSpecialTx(CWallet* pwallet, CMutableTransaction& tx, SpecialTxPayload& payload)
+{
+    SetTxPayload(tx, payload);
+    auto res = FundSpecialTx(pwallet, tx);
+    if (res) UpdateSpecialTxInputsHash(tx, payload);
+    return res;
+}
+
+OperationResult SignAndSendSpecialTx(CWallet* pwallet, CMutableTransaction& tx, std::map<std::string, std::string>* extras = nullptr);
+
+template<typename SpecialTxPayload>
+OperationResult SignAndSendSpecialTx(CWallet* const pwallet, CMutableTransaction& tx, const SpecialTxPayload& pl, std::map<std::string, std::string>* extras = nullptr)
+{
+    SetTxPayload(tx, pl);
+    return SignAndSendSpecialTx(pwallet, tx, extras);
+}
+
+#endif // ENABLE_WALLET
+
+Optional<CKeyID> ParsePubKeyIDFromAddress(const std::string& strAddress, std::string& strError);
+
+#endif //PIVX_SPECIALTX_UTILS_H

src/evo/specialtx_validation.cpp

@@ -21,7 +21,7 @@
 
 /* -- Helper static functions -- */
 
-static bool CheckService(const CService& addr, CValidationState& state)
+bool CheckService(const CService& addr, CValidationState& state)
 {
     if (!addr.IsValid()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-ipaddr");
@@ -641,18 +641,3 @@ bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex)
     return true;
 }
 
-uint256 CalcTxInputsHash(const CTransaction& tx)
-{
-    CHashWriter hw(CLIENT_VERSION, SER_GETHASH);
-    // transparent inputs
-    for (const CTxIn& in: tx.vin) {
-        hw << in.prevout;
-    }
-    // shield inputs
-    if (tx.hasSaplingData()) {
-        for (const SpendDescription& sd: tx.sapData->vShieldedSpend) {
-            hw << sd.nullifier;
-        }
-    }
-    return hw.GetHash();
-}

src/evo/specialtx_validation.h

@@ -20,6 +20,9 @@ class uint256;
 /** The maximum allowed size of the extraPayload (for any TxType) */
 static const unsigned int MAX_SPECIALTX_EXTRAPAYLOAD = 10000;
 
+/** Operator service validity checks */
+bool CheckService(const CService& addr, CValidationState& state);
+
 /** Payload validity checks (including duplicate unique properties against list at pindexPrev)*/
 // Note: for +v2, if the tx is not a special tx, this method returns true.
 // Note2: This function only performs extra payload related checks, it does NOT checks regular inputs and outputs.
@@ -36,6 +39,4 @@ bool UndoSpecialTxsInBlock(const CBlock& block, const CBlockIndex* pindex);
 // Validate given LLMQ final commitment with the list at pindexQuorum
 bool VerifyLLMQCommitment(const llmq::CFinalCommitment& qfc, const CBlockIndex* pindexPrev, CValidationState& state) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
-uint256 CalcTxInputsHash(const CTransaction& tx);
-
 #endif // PIVX_SPECIALTX_H