diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h index 412cbb613e..0b74c21976 100644 --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -117,7 +117,6 @@ public: //! Look up address in wallet, return whether exists. virtual bool getAddress(const CTxDestination& dest, std::string* name, - wallet::isminetype* is_mine, wallet::AddressPurpose* purpose) = 0; //! Get wallet address list. diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index efdc3966d1..190fd5aea5 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -270,7 +270,7 @@ bool AddressTableModel::setData(const QModelIndex &index, const QVariant &value, // Check for duplicate addresses to prevent accidental deletion of addresses, if you try // to paste an existing address over another address (with a different label) if (walletModel->wallet().getAddress( - newAddress, /* name= */ nullptr, /* is_mine= */ nullptr, /* purpose= */ nullptr)) + newAddress, /*name=*/nullptr, /*purpose=*/ nullptr)) { editStatus = DUPLICATE_ADDRESS; return false; @@ -356,7 +356,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con // Check for duplicate addresses { if (walletModel->wallet().getAddress( - DecodeDestination(strAddress), /* name= */ nullptr, /* is_mine= */ nullptr, /* purpose= */ nullptr)) + DecodeDestination(strAddress), /*name=*/nullptr, /*purpose=*/nullptr)) { editStatus = DUPLICATE_ADDRESS; return QString(); @@ -429,7 +429,7 @@ bool AddressTableModel::getAddressData(const QString &address, std::string* name, wallet::AddressPurpose* purpose) const { CTxDestination destination = DecodeDestination(address.toStdString()); - return walletModel->wallet().getAddress(destination, name, /* is_mine= */ nullptr, purpose); + return walletModel->wallet().getAddress(destination, name, purpose); } int AddressTableModel::lookupAddress(const QString &address) const diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index db3c7f7417..af301a498f 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -143,8 +143,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall CTxDestination address = DecodeDestination(rec->address); if (IsValidDestination(address)) { std::string name; - isminetype ismine; - if (wallet.getAddress(address, &name, &ismine, /* purpose= */ nullptr)) + if (wallet.getAddress(address, &name, /*purpose=*/nullptr)) { strHTML += "" + tr("From") + ": " + tr("unknown") + "
"; strHTML += "" + tr("To") + ": "; @@ -171,7 +170,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall CTxDestination dest = DecodeDestination(strAddress); std::string name; if (wallet.getAddress( - dest, &name, /* is_mine= */ nullptr, /* purpose= */ nullptr) && !name.empty()) + dest, &name, /*purpose=*/nullptr) && !name.empty()) strHTML += GUIUtil::HtmlEscape(name) + " "; strHTML += GUIUtil::HtmlEscape(strAddress) + "
"; } @@ -236,7 +235,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall strHTML += "" + tr("To") + ": "; std::string name; if (wallet.getAddress( - address, &name, /* is_mine= */ nullptr, /* purpose= */ nullptr) && !name.empty()) + address, &name, /*purpose=*/nullptr) && !name.empty()) strHTML += GUIUtil::HtmlEscape(name) + " "; strHTML += GUIUtil::HtmlEscape(EncodeDestination(address)); if(toSelf == ISMINE_SPENDABLE) @@ -357,7 +356,7 @@ QString TransactionDesc::toHTML(interfaces::Node& node, interfaces::Wallet& wall if (ExtractDestination(vout.scriptPubKey, address)) { std::string name; - if (wallet.getAddress(address, &name, /* is_mine= */ nullptr, /* purpose= */ nullptr) && !name.empty()) + if (wallet.getAddress(address, &name, /*purpose=*/nullptr) && !name.empty()) strHTML += GUIUtil::HtmlEscape(name) + " "; strHTML += QString::fromStdString(EncodeDestination(address)); } diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 9597726ecb..694fb535b5 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -268,7 +268,7 @@ void WalletModel::sendCoins(WalletModelTransaction& transaction) // Check if we have a new address or an updated label std::string name; if (!m_wallet->getAddress( - dest, &name, /* is_mine= */ nullptr, /* purpose= */ nullptr)) + dest, &name, /*purpose=*/nullptr)) { m_wallet->setAddressBook(dest, strLabel, wallet::AddressPurpose::SEND); } diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp index 36f8fd9a77..42ccfae6ef 100644 --- a/src/wallet/interfaces.cpp +++ b/src/wallet/interfaces.cpp @@ -185,7 +185,6 @@ public: } bool getAddress(const CTxDestination& dest, std::string* name, - isminetype* is_mine, AddressPurpose* purpose) override { LOCK(m_wallet->cs_wallet); @@ -194,16 +193,9 @@ public: if (name) { *name = entry->GetLabel(); } - std::optional dest_is_mine; - if (is_mine || purpose) { - dest_is_mine = m_wallet->IsMine(dest); - } - if (is_mine) { - *is_mine = *dest_is_mine; - } if (purpose) { // In very old wallets, address purpose may not be recorded so we derive it from IsMine - *purpose = entry->purpose.value_or(*dest_is_mine ? AddressPurpose::RECEIVE : AddressPurpose::SEND); + *purpose = entry->purpose.value_or(m_wallet->IsMine(dest) ? AddressPurpose::RECEIVE : AddressPurpose::SEND); } return true; }