neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some stuff in TransactionDesc

Browse Source
This commit is contained in:
JaSK 2014-06-19 01:42:39 +02:00
parent 80dda36a07
commit 23b0506c91
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qt/transactiondesc.cpp
View File

@ -15,6 +15,7 @@
#include "timedata.h" #include "timedata.h"
#include "ui_interface.h" #include "ui_interface.h"
#include "wallet.h" #include "wallet.h"
#include "script.h"
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
@ -89,27 +90,20 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
if (nNet > 0) if (nNet > 0)
{ {
// Credit // Credit
BOOST_FOREACH(const CTxOut& txout, wtx.vout) if (CBitcoinAddress(rec->address).IsValid())
{ {
if (wallet->IsMine(txout)) CTxDestination address = CBitcoinAddress(rec->address).Get();
if (wallet->mapAddressBook.count(address))
{ {
if (CBitcoinAddress(rec->address).IsValid()) strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>";
{ strHTML += "<b>" + tr("To") + ":</b> ";
CTxDestination address = CBitcoinAddress(rec->address).Get(); strHTML += GUIUtil::HtmlEscape(rec->address);
if (wallet->mapAddressBook.count(address)) QString addressOwned = (::IsMine(*wallet, address) == MINE_SPENDABLE) ? tr("own address") : tr("watch-only");
{ if (!wallet->mapAddressBook[address].name.empty())
strHTML += "<b>" + tr("From") + ":</b> " + tr("unknown") + "<br>"; strHTML += " (" + addressOwned + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")";
strHTML += "<b>" + tr("To") + ":</b> "; else
strHTML += GUIUtil::HtmlEscape(rec->address); strHTML += " (" + addressOwned + ")";
QString addressOwned = wallet->IsMine(txout) == MINE_SPENDABLE ? tr("own address") : tr("watch-only"); strHTML += "<br>";
if (!wallet->mapAddressBook[address].name.empty())
strHTML += " (" + addressOwned + ", " + tr("label") + ": " + GUIUtil::HtmlEscape(wallet->mapAddressBook[address].name) + ")";
else
strHTML += " (" + addressOwned + ")";
strHTML += "<br>";
}
}
break;
} }
} }
} }

6
src/qt/transactionrecord.cpp
View File

@ -52,6 +52,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
CTxDestination address; CTxDestination address;
sub.idx = parts.size(); // sequence number sub.idx = parts.size(); // sequence number
sub.credit = txout.nValue; sub.credit = txout.nValue;
sub.involvesWatchAddress = mine == MINE_WATCH_ONLY;
if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address)) if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*wallet, address))
{ {
// Received by Bitcoin Address // Received by Bitcoin Address
@ -70,7 +71,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
sub.type = TransactionRecord::Generated; sub.type = TransactionRecord::Generated;
} }
sub.involvesWatchAddress = mine == MINE_WATCH_ONLY;
parts.append(sub); parts.append(sub);
} }
} }
@ -101,7 +101,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
parts.append(TransactionRecord(hash, nTime, TransactionRecord::SendToSelf, "", parts.append(TransactionRecord(hash, nTime, TransactionRecord::SendToSelf, "",
-(nDebit - nChange), nCredit - nChange)); -(nDebit - nChange), nCredit - nChange));
parts.last().involvesWatchAddress = involvesWatchAddress; parts.last().involvesWatchAddress = involvesWatchAddress; // maybe pass to TransactionRecord as constructor argument
} }
else if (fAllFromMe) else if (fAllFromMe)
{ {
@ -115,6 +115,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
const CTxOut& txout = wtx.vout[nOut]; const CTxOut& txout = wtx.vout[nOut];
TransactionRecord sub(hash, nTime); TransactionRecord sub(hash, nTime);
sub.idx = parts.size(); sub.idx = parts.size();
sub.involvesWatchAddress = involvesWatchAddress;
if(wallet->IsMine(txout)) if(wallet->IsMine(txout))
{ {
@ -146,7 +147,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
} }
sub.debit = -nValue; sub.debit = -nValue;
sub.involvesWatchAddress = involvesWatchAddress;
parts.append(sub); parts.append(sub);
} }
} }