diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-09-08 17:33:10 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2013-01-08 01:49:14 +0100 |
| commit | f1136200a67fc1df894d45fba51b40f748e0b889 (patch) | |
| tree | 1c867524f6e9864f17024b817b68cbe8be78adf4 /src/script.h | |
| parent | 429915bd0dfcdb03b13d9a3c2fb82d5401ef70ce (diff) | |
| download | bitcoin-f1136200a67fc1df894d45fba51b40f748e0b889.tar.xz | |
Move VerifySignature to main
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script.h b/src/script.h index 7b0643f70a..f7cf7e8e9e 100644 --- a/src/script.h +++ b/src/script.h @@ -673,9 +673,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet); bool SignSignature(const CKeyStore& keystore, const CScript& fromPubKey, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); -bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, - unsigned int flags, int nHashType); -bool VerifySignature(const CCoins& txFrom, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); +bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); // Given two sets of signatures for scriptPubKey, possibly with OP_0 placeholders, // combine them intelligently and return the result. |