[GUI] CoinControl: fix fee calculation for P2CS scripts

random-zebra · random-zebra · commit 0f23f4000d71 · 2020-06-09T15:19:05.000+02:00
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -43,9 +43,10 @@ bool CCoinControlWidgetItem::operator<(const QTreeWidgetItem &other) const {
 }
 
 
-CoinControlDialog::CoinControlDialog(QWidget* parent) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
+CoinControlDialog::CoinControlDialog(QWidget* parent, bool _forDelegation) : QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
                                                         ui(new Ui::CoinControlDialog),
-                                                        model(0)
+                                                        model(0),
+                                                        forDelegation(_forDelegation)
 {
     ui->setupUi(this);
 
@@ -568,7 +569,6 @@ void CoinControlDialog::updateLabels()
     bool fDust = false;
     Q_FOREACH (const CAmount& amount, payAmounts) {
         nPayAmount += amount;
-
         if (amount > 0) {
             CTxOut txout(amount, (CScript)std::vector<unsigned char>(24, 0));
             if (txout.IsDust(::minRelayTxFee))
@@ -626,12 +626,22 @@ void CoinControlDialog::updateLabels()
                 nBytesInputs += 148; // in all error cases, simply assume 148 here
         } else
             nBytesInputs += 148;
+
+        // Additional byte for P2CS
+        if (out.tx->vout[out.i].scriptPubKey.IsPayToColdStaking())
+            nBytesInputs++;
     }
 
     // calculation
+    const int P2PKH_OUT_SIZE = 34;
+    const int P2CS_OUT_SIZE = 61;
     if (nQuantity > 0) {
-        // Bytes
-        nBytes = nBytesInputs + ((payAmounts.size() > 0 ? CoinControlDialog::payAmounts.size() + 1 : 2) * 34) + 10; // always assume +1 output for change here
+        // Bytes: nBytesInputs + (num_of_outputs * bytes_per_output)
+        nBytes = nBytesInputs + std::max(1, payAmounts.size()) * (forDelegation ? P2CS_OUT_SIZE : P2PKH_OUT_SIZE);
+        // always assume +1 (p2pkh) output for change here
+        nBytes += P2PKH_OUT_SIZE;
+        // nVersion, nLockTime and vin/vout len sizes
+        nBytes += 10;
 
         // Priority
         double mempoolEstimatePriority = mempool.estimatePriority(nTxConfirmTarget);
@@ -666,7 +676,7 @@ void CoinControlDialog::updateLabels()
             }
 
             if (nChange == 0)
-                nBytes -= 34;
+                nBytes -= P2PKH_OUT_SIZE;
         }
 
         // after fee
diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h
@@ -44,7 +44,7 @@ class CoinControlDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit CoinControlDialog(QWidget* parent = nullptr);
+    explicit CoinControlDialog(QWidget* parent = nullptr, bool _forDelegation = false);
     ~CoinControlDialog();
 
     void setModel(WalletModel* model);
@@ -65,6 +65,7 @@ class CoinControlDialog : public QDialog
     WalletModel* model;
     int sortColumn;
     Qt::SortOrder sortOrder;
+    bool forDelegation;
     bool fSelectAllToggled{true};     // false when pushButtonSelectAll text is "Unselect All"
     QList<CAmount> payAmounts{};
 
diff --git a/src/qt/pivx/coldstakingwidget.cpp b/src/qt/pivx/coldstakingwidget.cpp
@@ -531,7 +531,7 @@ void ColdStakingWidget::onCoinControlClicked()
     if (isInDelegation) {
         if (walletModel->getBalance() > 0) {
             if (!coinControlDialog) {
-                coinControlDialog = new CoinControlDialog();
+                coinControlDialog = new CoinControlDialog(nullptr, true);
                 coinControlDialog->setModel(walletModel);
             } else {
                 coinControlDialog->refreshDialog();
