kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-02-04 03:04:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge #11247: qt: Use IsMine to validate custom change address

Browse Source 
a1ea1cfbd qt: Use IsMine to validate custom change address (Chris Moore)

Pull request description:

  Fixes #11137
  Closes #11184 (which was accidentally opened against 0.15 branch)

Tree-SHA512: a20a59b4f36c1471a9c84bcc7c69048576d1f413104c299a7ed9ba221f28eddf93d727fca2926420ea5d0dd9aba582924f26a5acd44d995039b7202c73eb53bc
This commit is contained in:
MarcoFalke 2017-09-05 15:59:47 -07:00
commit a31e9ad4f0
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/sendcoinsdialog.cpp
View File

@ -789,10 +789,8 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
} }
else // Valid address else // Valid address
{ {
CKeyID keyid; const CTxDestination dest = addr.Get();
addr.GetKeyID(keyid); if (!model->IsSpendable(dest)) {
if (!model->havePrivKey(keyid)) // Unknown change address
{
ui->labelCoinControlChangeLabel->setText(tr("Warning: Unknown change address")); ui->labelCoinControlChangeLabel->setText(tr("Warning: Unknown change address"));
// confirmation dialog // confirmation dialog
@ -800,7 +798,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel); QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
if(btnRetVal == QMessageBox::Yes) if(btnRetVal == QMessageBox::Yes)
CoinControlDialog::coinControl->destChange = addr.Get(); CoinControlDialog::coinControl->destChange = dest;
else else
{ {
ui->lineEditCoinControlChange->setText(""); ui->lineEditCoinControlChange->setText("");
@ -819,7 +817,7 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
else else
ui->labelCoinControlChangeLabel->setText(tr("(no label)")); ui->labelCoinControlChangeLabel->setText(tr("(no label)"));
CoinControlDialog::coinControl->destChange = addr.Get(); CoinControlDialog::coinControl->destChange = dest;
} }
} }
} }

4
src/qt/walletmodel.cpp
View File

@ -561,9 +561,9 @@ bool WalletModel::getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const
return wallet->GetPubKey(address, vchPubKeyOut); return wallet->GetPubKey(address, vchPubKeyOut);
} }
bool WalletModel::havePrivKey(const CKeyID &address) const bool WalletModel::IsSpendable(const CTxDestination& dest) const
{ {
return wallet->HaveKey(address); return IsMine(*wallet, dest) & ISMINE_SPENDABLE;
} }
bool WalletModel::getPrivKey(const CKeyID &address, CKey& vchPrivKeyOut) const bool WalletModel::getPrivKey(const CKeyID &address, CKey& vchPrivKeyOut) const

2
src/qt/walletmodel.h
View File

@ -190,7 +190,7 @@ public:
UnlockContext requestUnlock(); UnlockContext requestUnlock();
bool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const; bool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;
bool havePrivKey(const CKeyID &address) const; bool IsSpendable(const CTxDestination& dest) const;
bool getPrivKey(const CKeyID &address, CKey& vchPrivKeyOut) const; bool getPrivKey(const CKeyID &address, CKey& vchPrivKeyOut) const;
void getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs); void getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs);
bool isSpent(const COutPoint& outpoint) const; bool isSpent(const COutPoint& outpoint) const;