diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-07 01:22:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-07 01:22:24 +0200 |
| commit | 089b742a210bf2d62f0e473faa70b30c1b06b657 (patch) | |
| tree | 7617b513bcf1bccc965b003050ee1620685535c4 /src | |
| parent | bcc8a620eae9cd8fe95f0a02f17183c4a132e5a2 (diff) | |
| parent | 86e6dd4b630299eaa778ca241797b24758b6f8a4 (diff) | |
| download | bitcoin-089b742a210bf2d62f0e473faa70b30c1b06b657.tar.xz | |
Merge #11259: Remove duplicate destination decoding
86e6dd4b6 Remove duplicate destination decoding (João Barbosa)
8d0041e60 Remove unused GetKeyID and IsScript methods from CBitcoinAddress (João Barbosa)
Pull request description:
Follow up of #11117, this patch removes an extra unnecessary destination decoding that was identified while reviewing #11117. It is also the only case where `IsValidDestinationString` is called before `DecodeDestination`.
For reference see [comment](https://github.com/bitcoin/bitcoin/pull/11117#discussion_r137145517).
Tree-SHA512: f5ff5cb28a576ccd819a058f102188bde55654f30618520cc680c91d2f6e536fe038fc7220dd2d2dd64c6175fcb23f89b94b48444521e11ddec0b2f8ef2c05dd
Diffstat (limited to 'src')
| -rw-r--r-- | src/base58.cpp | 17 | ||||
| -rw-r--r-- | src/qt/transactiondesc.cpp | 4 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/base58.cpp b/src/base58.cpp index e093608aa3..3b907c20d6 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -232,8 +232,6 @@ public: CBitcoinAddress(const char* pszAddress) { SetString(pszAddress); } CTxDestination Get() const; - bool GetKeyID(CKeyID &keyID) const; - bool IsScript() const; }; class CBitcoinAddressVisitor : public boost::static_visitor<bool> @@ -295,21 +293,6 @@ CTxDestination CBitcoinAddress::Get() const return CNoDestination(); } -bool CBitcoinAddress::GetKeyID(CKeyID& keyID) const -{ - if (!IsValid() || vchVersion != Params().Base58Prefix(CChainParams::PUBKEY_ADDRESS)) - return false; - uint160 id; - memcpy(&id, vchData.data(), 20); - keyID = CKeyID(id); - return true; -} - -bool CBitcoinAddress::IsScript() const -{ - return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS); -} - void CBitcoinSecret::SetKey(const CKey& vchSecret) { assert(vchSecret.IsValid()); diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index f3fe4096a2..74f5c774a0 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -91,8 +91,8 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco if (nNet > 0) { // Credit - if (IsValidDestinationString(rec->address)) { - CTxDestination address = DecodeDestination(rec->address); + CTxDestination address = DecodeDestination(rec->address); + if (IsValidDestination(address)) { if (wallet->mapAddressBook.count(address)) { strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>"; |