aboutsummaryrefslogtreecommitdiff
path: root/src/script.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2011-07-11 11:09:00 +0200
committerPieter Wuille <pieter.wuille@gmail.com>2011-07-17 12:09:17 +0200
commitcb61b8dc4ce2f24332fdfe9b47e5f87905a9da71 (patch)
tree8cfd84e0d55adf7590a8273e11c12c60b0dcfc4c /src/script.cpp
parent2ffba736e9102d016b96c2e5de2ce7757e612667 (diff)
split off CBase58Data from CBitcoinAddress
Split off features unrelated to addresses from CBitcoinAddress to CBase58Data, so they can be reused.
Diffstat (limited to 'src/script.cpp')
-rw-r--r--src/script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script.cpp b/src/script.cpp
index f917600848..652240f686 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -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;
}