DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge remote branch 'upstream/master'

Browse Source 
Conflicts:
	src/bitcoinrpc.cpp
This commit is contained in:
Wladimir J. van der Laan
2011-07-26 15:38:31 +02:00
parent c0b892fee8 a9ba47101a
commit 491ad6db50
17 changed files with 399 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt/transactionrecord.cpp
View File

@@ -79,10 +79,10 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
{
if(wallet->IsMine(txout))
{
std::vector<unsigned char> vchPubKey;
if (ExtractPubKey(txout.scriptPubKey, wallet, vchPubKey))
CBitcoinAddress address;
if (ExtractAddress(txout.scriptPubKey, wallet, address))
{
sub.address = PubKeyToAddress(vchPubKey);
sub.address = address.ToString();
}
break;
}
@@ -137,9 +137,11 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
{
// Sent to Bitcoin Address
sub.type = TransactionRecord::SendToAddress;
uint160 hash160;
if (ExtractHash160(txout.scriptPubKey, hash160))
sub.address = Hash160ToAddress(hash160);
CBitcoinAddress address;
if (ExtractAddress(txout.scriptPubKey, wallet, address))
{
sub.address = address.ToString();
}
}
int64 nValue = txout.nValue;