gui: fix create unsigned transaction fee bump

Github-Pull: https://github.com/bitcoin-core/gui/pull/812
Rebased-From: 671b7a3251
This commit is contained in:
furszy 2024-03-29 11:40:38 -03:00 committed by fanquake
parent c7885ecd77
commit d1289a1300
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1

View file

@ -529,12 +529,6 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
return false; return false;
} }
WalletModel::UnlockContext ctx(requestUnlock());
if(!ctx.isValid())
{
return false;
}
// Short-circuit if we are returning a bumped transaction PSBT to clipboard // Short-circuit if we are returning a bumped transaction PSBT to clipboard
if (retval == QMessageBox::Save) { if (retval == QMessageBox::Save) {
// "Create Unsigned" clicked // "Create Unsigned" clicked
@ -549,10 +543,15 @@ bool WalletModel::bumpFee(uint256 hash, uint256& new_hash)
DataStream ssTx{}; DataStream ssTx{};
ssTx << psbtx; ssTx << psbtx;
GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str()); GUIUtil::setClipboard(EncodeBase64(ssTx.str()).c_str());
Q_EMIT message(tr("PSBT copied"), tr("Copied to clipboard", "Fee-bump PSBT saved"), CClientUIInterface::MSG_INFORMATION); Q_EMIT message(tr("PSBT copied"), tr("Fee-bump PSBT copied to clipboard"), CClientUIInterface::MSG_INFORMATION | CClientUIInterface::MODAL);
return true; return true;
} }
WalletModel::UnlockContext ctx(requestUnlock());
if (!ctx.isValid()) {
return false;
}
assert(!m_wallet->privateKeysDisabled() || wallet().hasExternalSigner()); assert(!m_wallet->privateKeysDisabled() || wallet().hasExternalSigner());
// sign bumped transaction // sign bumped transaction