highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-08 19:53:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care)

Browse Source
This commit is contained in:
Gavin Andresen
2011-12-22 15:51:44 -05:00
parent ce336fdc21
commit 2e17ac83c6
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/transactiondesc.cpp
View File

@@ -99,7 +99,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
if (wallet->IsMine(txout))
{
CBitcoinAddress address;
if (ExtractAddress(txout.scriptPubKey, wallet, address))
if (ExtractAddress(txout.scriptPubKey, address) && wallet->HaveKey(address))
{
if (wallet->mapAddressBook.count(address))
{
@@ -184,7 +184,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
{
// Offline transaction
CBitcoinAddress address;
if (ExtractAddress(txout.scriptPubKey, 0, address))
if (ExtractAddress(txout.scriptPubKey, address))
{
strHTML += tr("<b>To:</b> ");
if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].empty())
@@ -271,7 +271,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
strHTML += "<li>";
const CTxOut &vout = prev.vout[prevout.n];
CBitcoinAddress address;
if (ExtractAddress(vout.scriptPubKey, 0, address))
if (ExtractAddress(vout.scriptPubKey, address))
{
if (wallet->mapAddressBook.count(address) && !wallet->mapAddressBook[address].empty())
strHTML += HtmlEscape(wallet->mapAddressBook[address]) + " ";