aboutsummaryrefslogtreecommitdiff
path: root/src/script.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/script.cpp')
-rw-r--r--src/script.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/script.cpp b/src/script.cpp
index b92f7b08b6..f917600848 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1123,7 +1123,7 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
}
-bool ExtractHash160(const CScript& scriptPubKey, const CKeyStore* keystore, uint160& hash160Ret)
+bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet)
{
vector<pair<opcodetype, valtype> > vSolution;
if (!Solver(scriptPubKey, vSolution))
@@ -1135,18 +1135,11 @@ bool ExtractHash160(const CScript& scriptPubKey, const CKeyStore* keystore, uint
{
uint160 hash160;
if (item.first == OP_PUBKEY)
- {
- hash160 = Hash160(item.second);
- }
+ addressRet.SetAddress(item.second);
else if (item.first == OP_PUBKEYHASH)
- {
- hash160 = uint160(item.second);
- }
- if (keystore == NULL || keystore->HaveKey(hash160))
- {
- hash160Ret = hash160;
+ addressRet.SetAddress(uint160(item.second));
+ if (keystore == NULL || keystore->HaveKey(addressRet))
return true;
- }
}
}
return false;