Browse Source

Merge branch 'decomposetransfix' of https://github.com/laanwj/bitcoin

0.8
Gavin Andresen 13 years ago
parent
commit
30999ec6f9
  1. 40
      src/qt/transactionrecord.cpp

40
src/qt/transactionrecord.cpp

@ -47,50 +47,36 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
// //
// Credit // Credit
// //
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
if(wallet->IsMine(txout))
{
TransactionRecord sub(hash, nTime); TransactionRecord sub(hash, nTime);
CBitcoinAddress address;
sub.credit = nNet; sub.idx = parts.size(); // sequence number
sub.credit = txout.nValue;
if (wtx.IsCoinBase()) if (wtx.IsCoinBase())
{ {
// Generated // Generated
sub.type = TransactionRecord::Generated; sub.type = TransactionRecord::Generated;
if (nCredit == 0)
{
int64 nUnmatured = 0;
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
nUnmatured += wallet->GetCredit(txout);
sub.credit = nUnmatured;
}
} }
else else if (ExtractAddress(txout.scriptPubKey, address) && wallet->HaveKey(address))
{ {
bool foundAddress = false;
// Received by Bitcoin Address // Received by Bitcoin Address
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
{
if(wallet->IsMine(txout))
{
CBitcoinAddress address;
if (ExtractAddress(txout.scriptPubKey, address) && wallet->HaveKey(address))
{
sub.type = TransactionRecord::RecvWithAddress; sub.type = TransactionRecord::RecvWithAddress;
sub.address = address.ToString(); sub.address = address.ToString();
foundAddress = true;
break;
}
} }
} else
if(!foundAddress)
{ {
// Received by IP connection, or other non-address transaction like OP_EVAL // Received by IP connection (deprecated features), or a multisignature or other non-simple transaction
sub.type = TransactionRecord::RecvFromOther; sub.type = TransactionRecord::RecvFromOther;
sub.address = mapValue["from"]; sub.address = mapValue["from"];
} }
}
parts.append(sub); parts.append(sub);
} }
}
}
else else
{ {
bool fAllFromMe = true; bool fAllFromMe = true;

Loading…
Cancel
Save