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.h | |
| 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.h')
| -rw-r--r-- | src/script.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script.h b/src/script.h index b671e15963..0080f5b726 100644 --- a/src/script.h +++ b/src/script.h @@ -572,8 +572,8 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet); bool IsStandard(const CScript& scriptPubKey); bool IsMine(const CKeyStore& keystore, const CScript& scriptPubKey); -bool ExtractAddress(const CScript& scriptPubKey, const CKeyStore* pkeystore, CBitcoinAddress& addressRet); -bool ExtractAddresses(const CScript& scriptPubKey, const CKeyStore* pkeystore, txnouttype& typeRet, std::vector<CBitcoinAddress>& addressRet, int& nRequiredRet); +bool ExtractAddress(const CScript& scriptPubKey, CBitcoinAddress& addressRet); +bool ExtractAddresses(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CBitcoinAddress>& addressRet, int& nRequiredRet); bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL, CScript scriptPrereq=CScript()); bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsigned int nIn, int& nSigOpCountRet, int nHashType=0, bool fStrictOpEval=true); |