Added possibility to POSE-UNBAN fom GUI

Author: Liquid369

src/qt/pivx/masternodeswidget.cpp

@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "qt/pivx/masternodeswidget.h"
+#include "bls/bls_wrapper.h"
 #include "qt/pivx/forms/ui_masternodeswidget.h"
 
 #include "qt/pivx/defaultdialog.h"
@@ -17,6 +18,7 @@
 #include "qt/pivx/mnmodel.h"
 #include "qt/pivx/optionbutton.h"
 #include "qt/walletmodel.h"
+#include "uint256.h"
 
 #define DECORATION_SIZE 65
 #define NUM_ITEMS 3
@@ -166,7 +168,7 @@ void MasterNodesWidget::onMNClicked(const QModelIndex& _index)
     if (!menu) {
         menu = new TooltipMenu(window, this);
         connect(menu, &TooltipMenu::message, this, &AddressesWidget::message);
-        menu->addBtn(0, tr("Start"), [this](){onEditMNClicked();});
+        menu->addBtn(0, tr("Start"), [this](){onEditMNClicked();}); //TODO: change to UNBAN once 6.0 is out
         menu->addBtn(1, tr("Delete"), [this](){onDeleteMNClicked();});
         menu->addBtn(2, tr("Info"), [this](){onInfoMNClicked();});
         menu->adjustSize();
@@ -223,6 +225,32 @@ void MasterNodesWidget::onEditMNClicked()
             bool isEnabled = index.sibling(index.row(), MNModel::IS_POSE_ENABLED).data(Qt::DisplayRole).toBool();
             if (isEnabled) {
                 inform(tr("Cannot start an already started Masternode"));
+            }else{
+                uint256 proTxHash =uint256S(index.sibling(index.row(), MNModel::PRO_TX_HASH).data(Qt::DisplayRole).toString().toStdString());
+                Optional<DMNData> opDMN = interfaces::g_tiertwo->getDMNData(proTxHash,
+                                                  clientModel->getLastBlockIndexProcessed());
+                if(!opDMN){
+                    inform(tr("Masternode not found"));
+                }else{
+                    std::string operatorKeyS = opDMN->operatorSk;
+                    if(operatorKeyS.empty()){
+                        inform("Operator secret key not found");
+                    }else{
+                        Optional<CBLSSecretKey> operator_key = bls::DecodeSecret(Params(),operatorKeyS);
+                        if(operator_key){
+                            std::string error_str = "";
+                            if(!mnModel->unbanDMN(*operator_key,proTxHash,error_str)){
+                                inform(QString::fromStdString(error_str));
+                            }else{
+                                inform("Masternode successfully unbanned! Wait for the next minted block and it will update");
+                            }
+                        }else{
+                            inform("Could not decode operator secret key");
+                        }
+                    }
+
+                }
+                
             }
         }
     }

src/qt/pivx/mnmodel.cpp

@@ -6,6 +6,7 @@
 
 #include "bls/key_io.h"
 #include "coincontrol.h"
+#include "evo/deterministicmns.h"
 #include "interfaces/tiertwo.h"
 #include "evo/specialtx_utils.h"
 #include "masternode.h"
@@ -417,7 +418,6 @@ CallResult<uint256> MNModel::createDMN(const std::string& alias,
     // 2. external.
     // 3. fund.
 
-    //Either one of them must be non null
     auto p_wallet = vpwallets[0]; // TODO: Move to walletModel
     const auto& chainparams = Params();
 
@@ -476,7 +476,45 @@ CallResult<uint256> MNModel::createDMN(const std::string& alias,
     // All good
     return res;
 }
+//unban a Pose-banned DMN
+bool MNModel::unbanDMN(CBLSSecretKey& operatorKey,uint256 proTxHash, std::string& strError){
+    ProUpServPL pl;
+    pl.nVersion = ProUpServPL::CURRENT_VERSION;
+    pl.proTxHash = proTxHash;
+    auto dmn = deterministicMNManager->GetListAtChainTip().GetMN(pl.proTxHash); //make sure that the wallet is synced first?
+    if (!dmn) {
+        strError = "Masternode not found";
+        return false;
+    }
+    if(!dmn->IsPoSeBanned()){
+        strError = "Masternode is not Pose-banned";
+        return false;
+    }
+    pl.addr = dmn->pdmnState->addr;
+    pl.scriptOperatorPayout = dmn->pdmnState->scriptOperatorPayout;
 
+    CMutableTransaction tx;
+    tx.nVersion = CTransaction::TxVersion::SAPLING;
+    tx.nType = CTransaction::TxType::PROUPSERV;
+    
+    auto wallet = vpwallets[0]; // TODO: Move to walletModel
+    auto res = FundSpecialTx(wallet, tx, pl);
+    if(!res){
+        strError = res.getError();
+        return false;
+    }
+    res = SignSpecialTxPayloadByHash(tx, pl, operatorKey);
+    if(!res){
+        strError = res.getError();
+        return false;
+    }
+    res = SignAndSendSpecialTx(wallet, tx, pl);
+    if(!res){
+        strError = res.getError();
+        return false;
+    }
+    return true;
+}
 OperationResult MNModel::killDMN(const uint256& collateralHash, unsigned int outIndex)
 {
     auto p_wallet = vpwallets[0]; // TODO: Move to walletModel

src/qt/pivx/mnmodel.h

@@ -11,6 +11,7 @@
 #include "operationresult.h"
 #include "primitives/transaction.h"
 #include "bls/key_io.h"
+#include "uint256.h"
 #include "wallet/wallet.h" // TODO: Move to walletModel
 
 class CMasternode;
@@ -128,6 +129,8 @@ class MNModel : public QAbstractTableModel
     OperationResult killDMN(const uint256& collateralHash, unsigned int outIndex);
 
 
+    //Unban a Pose-banned DMN
+    bool unbanDMN(CBLSSecretKey& operatorKey,uint256 proTxHash, std::string& strError);
     // Generates the collateral transaction
     bool createDMNExternalCollateral(const QString& alias, const QString& addr, COutPoint& ret_outpoint, QString& ret_error);
     bool createDMNInternalCollateral(const QString& alias, const QString& addr, CTransactionRef& ret_tx,COutPoint& ret_outpoint, QString& ret_error,int nExtraSize=0);