sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 21:42:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Qt] hide bump context menu action if tx already has been bumped

Browse Source
This commit is contained in:
Jonas Schnelli 2017-05-24 17:08:19 +02:00
parent 4314544d46
commit 32325a3f58
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/transactionview.cpp
View File

@ -379,7 +379,7 @@ void TransactionView::contextualMenu(const QPoint &point)
uint256 hash; uint256 hash;
hash.SetHex(selection.at(0).data(TransactionTableModel::TxHashRole).toString().toStdString()); hash.SetHex(selection.at(0).data(TransactionTableModel::TxHashRole).toString().toStdString());
abandonAction->setEnabled(model->transactionCanBeAbandoned(hash)); abandonAction->setEnabled(model->transactionCanBeAbandoned(hash));
bumpFeeAction->setEnabled(model->transactionSignalsRBF(hash)); bumpFeeAction->setEnabled(model->transactionCanBeBumped(hash));
if(index.isValid()) if(index.isValid())
{ {

4
src/qt/walletmodel.cpp
View File

@ -656,11 +656,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const
return wallet->AbandonTransaction(hash); return wallet->AbandonTransaction(hash);
} }
bool WalletModel::transactionSignalsRBF(uint256 hash) const bool WalletModel::transactionCanBeBumped(uint256 hash) const
{ {
LOCK2(cs_main, wallet->cs_wallet); LOCK2(cs_main, wallet->cs_wallet);
const CWalletTx *wtx = wallet->GetWalletTx(hash); const CWalletTx *wtx = wallet->GetWalletTx(hash);
return wtx && SignalsOptInRBF(*wtx); return wtx && SignalsOptInRBF(*wtx) && !wtx->mapValue.count("replaced_by_txid");
} }
bool WalletModel::bumpFee(uint256 hash) bool WalletModel::bumpFee(uint256 hash)

2
src/qt/walletmodel.h
View File

@ -207,7 +207,7 @@ public:
bool transactionCanBeAbandoned(uint256 hash) const; bool transactionCanBeAbandoned(uint256 hash) const;
bool abandonTransaction(uint256 hash) const; bool abandonTransaction(uint256 hash) const;
bool transactionSignalsRBF(uint256 hash) const; bool transactionCanBeBumped(uint256 hash) const;
bool bumpFee(uint256 hash); bool bumpFee(uint256 hash);
static bool isWalletEnabled(); static bool isWalletEnabled();