{
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;
}
{
// 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;