diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-22 15:51:44 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-22 15:57:31 -0500 |
| commit | 2e17ac83c65b65fe2037b8c8941c25e288905903 (patch) | |
| tree | 143d73d45bae5e0046ac994a3432f4353d9c0382 /src/script.cpp | |
| parent | ce336fdc21c25c055ffef28fbe7c61164df7ca24 (diff) | |
| download | bitcoin-2e17ac83c65b65fe2037b8c8941c25e288905903.tar.xz | |
Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care)
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script.cpp b/src/script.cpp index 467cb2f0df..0a1b3bb309 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1442,7 +1442,7 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey) return false; } -bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBitcoinAddress& addressRet) +bool ExtractAddress(const CScript& scriptPubKey, CBitcoinAddress& addressRet) { vector<valtype> vSolutions; txnouttype whichType; @@ -1468,7 +1468,7 @@ bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* keystore, CBit return false; } -bool ExtractAddresses(const CScript& scriptPubKey, const CKeyStore* keystore, txnouttype& typeRet, vector<CBitcoinAddress>& addressRet, int& nRequiredRet) +bool ExtractAddresses(const CScript& scriptPubKey, txnouttype& typeRet, vector<CBitcoinAddress>& addressRet, int& nRequiredRet) { addressRet.clear(); typeRet = TX_NONSTANDARD; |