Adapt GUI to the latest CTransactionRef migration changes.

PIVX-Project · Feb 14, 2021 · a952430 · a952430
1 parent bff581f
commit a952430
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 25 deletions.
diff --git a/src/qt/pivx/masternodewizarddialog.cpp b/src/qt/pivx/masternodewizarddialog.cpp
@@ -257,11 +257,11 @@ bool MasterNodeWizardDialog::createMN()
         }
 
         // look for the tx index of the collateral
-        CWalletTx* walletTx = currentTransaction.getTransaction();
+        CTransactionRef walletTx = currentTransaction.getTransaction();
         std::string txID = walletTx->GetHash().GetHex();
         int indexOut = -1;
-        for (int i=0; i < (int)walletTx->tx->vout.size(); i++) {
-            const CTxOut& out = walletTx->tx->vout[i];
+        for (int i=0; i < (int)walletTx->vout.size(); i++) {
+            const CTxOut& out = walletTx->vout[i];
             if (out.nValue == 10000 * COIN) {
                 indexOut = i;
                 break;

diff --git a/src/qt/pivx/send.cpp b/src/qt/pivx/send.cpp
@@ -499,7 +499,7 @@ OperationResult SendWidget::prepareTransparent(WalletModelTransaction* currentTr
 bool SendWidget::sendFinalStep()
 {
     showHideOp(true);
-    const bool fStakeDelegationVoided = ptrModelTx->getTransaction()->fStakeDelegationVoided;
+    const bool fStakeDelegationVoided = ptrModelTx->fIsStakeDelegationVoided;
     QString warningStr = QString();
     if (fStakeDelegationVoided)
         warningStr = tr("WARNING:\nTransaction spends a cold-stake delegation, voiding it.\n"

diff --git a/src/qt/pivx/sendconfirmdialog.cpp b/src/qt/pivx/sendconfirmdialog.cpp
@@ -81,9 +81,9 @@ TxDetailDialog::TxDetailDialog(QWidget *parent, bool _isConfirmDialog, const QSt
     connect(ui->pushOutputs, &QPushButton::clicked, this, &TxDetailDialog::onOutputsClicked);
 }
 
-void TxDetailDialog::setInputsType(const CWalletTx* _tx)
+void TxDetailDialog::setInputsType(CTransactionRef tx)
 {
-    if (_tx->tx->sapData && _tx->tx->sapData->vShieldedSpend.empty()) {
+    if (tx->sapData && tx->sapData->vShieldedSpend.empty()) {
         ui->labelTitlePrevTx->setText(tr("Previous Transaction"));
         ui->labelOutputIndex->setText(tr("Output Index"));
     } else {
@@ -126,7 +126,7 @@ void TxDetailDialog::setData(WalletModel *_model, const QModelIndex &index)
             shieldedInputsExtraMsg = " shielded";
         }
 
-        setInputsType(_tx);
+        setInputsType(_tx->tx);
         int inputsSize = (_tx->tx->sapData && !_tx->tx->sapData->vShieldedSpend.empty()) ? _tx->tx->sapData->vShieldedSpend.size() : _tx->tx->vin.size();
         ui->textInputs->setText(QString::number(inputsSize) + shieldedInputsExtraMsg);
         ui->textConfirmations->setText(QString::number(rec->status.depth));
@@ -186,7 +186,7 @@ void TxDetailDialog::setData(WalletModel *_model, WalletModelTransaction* _tx)
     CAmount totalAmount = tx->getTotalTransactionAmount() + txFee;
 
     // inputs label
-    CWalletTx* walletTx = tx->getTransaction();
+    CTransactionRef walletTx = tx->getTransaction();
     setInputsType(walletTx);
 
     ui->textAmount->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, totalAmount, false, BitcoinUnits::separatorAlways) + " (Fee included)");
@@ -226,7 +226,7 @@ void TxDetailDialog::setData(WalletModel *_model, WalletModelTransaction* _tx)
         ui->labelDividerMemo->setVisible(false);
     }
 
-    int inputsSize = (walletTx->tx->sapData && !walletTx->tx->sapData->vShieldedSpend.empty()) ? walletTx->tx->sapData->vShieldedSpend.size() : walletTx->tx->vin.size();
+    int inputsSize = (walletTx->sapData && !walletTx->sapData->vShieldedSpend.empty()) ? walletTx->sapData->vShieldedSpend.size() : walletTx->vin.size();
     ui->textInputs->setText(QString::number(inputsSize));
     ui->textFee->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, txFee, false, BitcoinUnits::separatorAlways));
 }
@@ -260,24 +260,24 @@ void TxDetailDialog::onInputsClicked()
         if (!inputsLoaded) {
             inputsLoaded = true;
             if (showGrid) {
-                const CWalletTx* walletTx = (this->tx) ? this->tx->getTransaction() : model->getTx(this->txHash);
+                CTransactionRef walletTx = (this->tx) ? this->tx->getTransaction() : model->getTx(this->txHash)->tx;
                 if (walletTx) {
-                    if (walletTx->tx->sapData && walletTx->tx->sapData->vShieldedSpend.empty()) {
+                    if (walletTx->sapData && walletTx->sapData->vShieldedSpend.empty()) {
                         // transparent inputs
-                        ui->gridInputs->setMinimumHeight(50 + (50 * walletTx->tx->vin.size()));
+                        ui->gridInputs->setMinimumHeight(50 + (50 * walletTx->vin.size()));
                         int i = 1;
-                        for (const CTxIn& in : walletTx->tx->vin) {
+                        for (const CTxIn& in : walletTx->vin) {
                             QString hash = QString::fromStdString(in.prevout.hash.GetHex());
                             loadInputs(hash.left(18) + "..." + hash.right(18),
                                        QString::number(in.prevout.n),
                                        ui->gridLayoutInput, i);
                             i++;
                         }
                     } else {
-                        ui->gridInputs->setMinimumHeight(50 + (50 * walletTx->tx->sapData->vShieldedSpend.size()));
+                        ui->gridInputs->setMinimumHeight(50 + (50 * walletTx->sapData->vShieldedSpend.size()));
                         bool fInfoAvailable = false;
-                        for (int i = 0; i < (int) walletTx->tx->sapData->vShieldedSpend.size(); ++i) {
-                            Optional<QString> opAddr = model->getShieldedAddressFromSpendDesc(walletTx, i);
+                        for (int i = 0; i < (int) walletTx->sapData->vShieldedSpend.size(); ++i) {
+                            Optional<QString> opAddr = model->getShieldedAddressFromSpendDesc(walletTx->GetHash(), i);
                             if (opAddr) {
                                 QString addr = *opAddr;
                                 loadInputs(addr.left(18) + "..." + addr.right(18),

diff --git a/src/qt/pivx/sendconfirmdialog.h b/src/qt/pivx/sendconfirmdialog.h
@@ -57,7 +57,7 @@ public Q_SLOTS:
     bool inputsLoaded = false;
     bool outputsLoaded = false;
 
-    void setInputsType(const CWalletTx* _tx);
+    void setInputsType(CTransactionRef _tx);
 };
 
 #endif // SENDCONFIRMDIALOG_H
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -533,7 +533,7 @@ void TransactionRecord::loadHotOrColdStakeOrContract(
     }
 
     bool isSpendable = (wallet->IsMine(p2csUtxo) & ISMINE_SPENDABLE_DELEGATED);
-    bool isFromMe = wallet->IsFromMe(wtx);
+    bool isFromMe = wallet->IsFromMe(wtx.tx);
 
     if (isContract) {
         if (isSpendable && isFromMe) {
@@ -611,7 +611,7 @@ void TransactionRecord::updateStatus(const CWalletTx& wtx)
     status.cur_num_blocks = chainHeight;
     status.depth = depth;
 
-    if (!IsFinalTx(wtx, chainHeight + 1)) {
+    if (!IsFinalTx(wtx.tx, chainHeight + 1)) {
         if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD) {
             status.status = TransactionStatus::OpenUntilBlock;
             status.open_for = wtx.tx->nLockTime - chainHeight;

diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -438,7 +438,8 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
                                                   ALL_COINS,
                                                   true,
                                                   0,
-                                                  fIncludeDelegations);
+                                                  fIncludeDelegations,
+                                                  &transaction->fIsStakeDelegationVoided);
         transaction->setTransactionFee(nFeeRequired);
 
         if (!fCreated) {
@@ -1081,8 +1082,8 @@ bool WalletModel::isUsed(CTxDestination address)
     return wallet->IsUsed(address);
 }
 
-Optional<QString> WalletModel::getShieldedAddressFromSpendDesc(const CWalletTx* wtx, int index)
+Optional<QString> WalletModel::getShieldedAddressFromSpendDesc(const uint256& txHash, int index)
 {
-    Optional<libzcash::SaplingPaymentAddress> opAddr = wallet->GetSaplingScriptPubKeyMan()->GetAddressFromInputIfPossible(wtx, index);
+    Optional<libzcash::SaplingPaymentAddress> opAddr = wallet->GetSaplingScriptPubKeyMan()->GetAddressFromInputIfPossible(txHash, index);
     return opAddr ? Optional<QString>(QString::fromStdString(KeyIO::EncodePaymentAddress(*opAddr))) : nullopt;
 }
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -189,7 +189,7 @@ class WalletModel : public QObject
     bool validateAddress(const QString& address, bool fStaking, bool& isShielded);
 
     // Return the address from where the shielded spend is taking the funds from (if possible)
-    Optional<QString> getShieldedAddressFromSpendDesc(const CWalletTx* wtx, int index);
+    Optional<QString> getShieldedAddressFromSpendDesc(const uint256& txHash, int index);
 
     // Return status record for SendCoins, contains error id + information
     struct SendCoinsReturn {

diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h
@@ -38,6 +38,7 @@ class WalletModelTransaction
 
     // Whether should create a +v2 tx or go simple and create a v1.
     bool useV2{false};
+    bool fIsStakeDelegationVoided{false};
 
 private:
     const QList<SendCoinsRecipient> recipients;

diff --git a/src/sapling/saplingscriptpubkeyman.cpp b/src/sapling/saplingscriptpubkeyman.cpp
@@ -532,6 +532,14 @@ void SaplingScriptPubKeyMan::GetFilteredNotes(
     }
 }
 
+Optional<libzcash::SaplingPaymentAddress>
+SaplingScriptPubKeyMan::GetAddressFromInputIfPossible(const uint256& txHash, int index) const
+{
+    const CWalletTx* wtx = wallet->GetWalletTx(txHash);
+    if (!wtx) return nullopt;
+    return GetAddressFromInputIfPossible(wtx, index);
+}
+
 Optional<libzcash::SaplingPaymentAddress>
         SaplingScriptPubKeyMan::GetAddressFromInputIfPossible(const CWalletTx* wtx, int index) const
 {

diff --git a/src/sapling/saplingscriptpubkeyman.h b/src/sapling/saplingscriptpubkeyman.h
@@ -300,6 +300,7 @@ class SaplingScriptPubKeyMan {
 
     //! Return the address from where the shielded spend is taking the funds from (if possible)
     Optional<libzcash::SaplingPaymentAddress> GetAddressFromInputIfPossible(const CWalletTx* wtx, int index) const;
+    Optional<libzcash::SaplingPaymentAddress> GetAddressFromInputIfPossible(const uint256& txHash, int index) const;
 
     //! Whether the nullifier is from this wallet
     bool IsSaplingNullifierFromMe(const uint256& nullifier) const;

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2725,7 +2725,8 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend,
     AvailableCoinsType coin_type,
     bool sign,
     CAmount nFeePay,
-    bool fIncludeDelegated)
+    bool fIncludeDelegated,
+    bool* fStakeDelegationVoided)
 {
     CAmount nValue = 0;
     int nChangePosRequest = nChangePosInOut;
@@ -2856,6 +2857,9 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend,
 
                 // Fill vin
                 for (const std::pair<const CWalletTx*, unsigned int>& coin : setCoins) {
+                    if(coin.first->tx->vout[coin.second].scriptPubKey.IsPayToColdStaking()) {
+                        *fStakeDelegationVoided = true;
+                    }
                     txNew.vin.emplace_back(coin.first->GetHash(), coin.second);
                 }
 

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -885,7 +885,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         AvailableCoinsType coin_type = ALL_COINS,
         bool sign = true,
         CAmount nFeePay = 0,
-        bool fIncludeDelegated = false);
+        bool fIncludeDelegated = false,
+        bool* fStakeDelegationVoided = nullptr);
     bool CreateTransaction(CScript scriptPubKey, const CAmount& nValue, CTransactionRef& tx, CReserveKey& reservekey, CAmount& nFeeRet, std::string& strFailReason, const CCoinControl* coinControl = NULL, AvailableCoinsType coin_type = ALL_COINS, CAmount nFeePay = 0, bool fIncludeDelegated = false);
 
     // enumeration for CommitResult (return status of CommitTransaction)