File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -379,7 +379,7 @@ void TransactionView::contextualMenu(const QPoint &point)
379
379
uint256 hash;
380
380
hash.SetHex (selection.at (0 ).data (TransactionTableModel::TxHashRole).toString ().toStdString ());
381
381
abandonAction->setEnabled (model->transactionCanBeAbandoned (hash));
382
- bumpFeeAction->setEnabled (model->transactionSignalsRBF (hash));
382
+ bumpFeeAction->setEnabled (model->transactionCanBeBumped (hash));
383
383
384
384
if (index.isValid ())
385
385
{
Original file line number Diff line number Diff line change @@ -656,11 +656,11 @@ bool WalletModel::abandonTransaction(uint256 hash) const
656
656
return wallet->AbandonTransaction (hash);
657
657
}
658
658
659
- bool WalletModel::transactionSignalsRBF (uint256 hash) const
659
+ bool WalletModel::transactionCanBeBumped (uint256 hash) const
660
660
{
661
661
LOCK2 (cs_main, wallet->cs_wallet );
662
662
const CWalletTx *wtx = wallet->GetWalletTx (hash);
663
- return wtx && SignalsOptInRBF (*wtx);
663
+ return wtx && SignalsOptInRBF (*wtx) && !wtx-> mapValue . count ( " replaced_by_txid " ) ;
664
664
}
665
665
666
666
bool WalletModel::bumpFee (uint256 hash)
Original file line number Diff line number Diff line change @@ -207,7 +207,7 @@ class WalletModel : public QObject
207
207
bool transactionCanBeAbandoned (uint256 hash) const ;
208
208
bool abandonTransaction (uint256 hash) const ;
209
209
210
- bool transactionSignalsRBF (uint256 hash) const ;
210
+ bool transactionCanBeBumped (uint256 hash) const ;
211
211
bool bumpFee (uint256 hash);
212
212
213
213
static bool isWalletEnabled ();
You can’t perform that action at this time.
0 commit comments