From 2e17ac83c65b65fe2037b8c8941c25e288905903 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 22 Dec 2011 15:51:44 -0500 Subject: Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) --- src/script.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/script.h') 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 >& stack, const CScript& bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector >& 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& addressRet, int& nRequiredRet); +bool ExtractAddress(const CScript& scriptPubKey, CBitcoinAddress& addressRet); +bool ExtractAddresses(const CScript& scriptPubKey, txnouttype& typeRet, std::vector& 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); -- cgit v1.2.3