GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

split off CBase58Data from CBitcoinAddress

Browse source 
Split off features unrelated to addresses from CBitcoinAddress to
CBase58Data, so they can be reused.
This commit is contained in:
Pieter Wuille 2011-07-11 11:09:00 +02:00
parent 2ffba736e9
commit cb61b8dc4c
2 changed files with 67 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/script.cpp
View file

@ -1135,9 +1135,9 @@ bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBit
{
uint160 hash160;
if (item.first == OP_PUBKEY)
addressRet.SetAddress(item.second);
addressRet.SetPubKey(item.second);
else if (item.first == OP_PUBKEYHASH)
addressRet.SetAddress(uint160(item.second));
addressRet.SetHash160((uint160)item.second);
if (keystore == NULL || keystore->HaveKey(addressRet))
return true;
}