|
|
@ -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) |
|
|
|