diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-01-17 16:58:58 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-01-17 16:58:58 -0800 |
| commit | 0e31ae9818528d52bbd802a8917b7015f8e38ae7 (patch) | |
| tree | 75259fd38459f852cc5b2a97fc91e93399e114c5 /src/script.h | |
| parent | 91f70a75daa7ffb89bbec23ca54e5f2c3fa1a83e (diff) | |
| parent | ef0f422519de4a3ce47d923e5f8f90cd12349f3e (diff) | |
| download | bitcoin-0e31ae9818528d52bbd802a8917b7015f8e38ae7.tar.xz | |
Merge pull request #2060 from sipa/parallel
Parallel script verification
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script.h b/src/script.h index 2d861d2c92..0b481eb605 100644 --- a/src/script.h +++ b/src/script.h @@ -32,6 +32,7 @@ enum SCRIPT_VERIFY_NONE = 0, SCRIPT_VERIFY_P2SH = (1U << 0), SCRIPT_VERIFY_STRICTENC = (1U << 1), + SCRIPT_VERIFY_NOCACHE = (1U << 2), }; enum txnouttype @@ -673,9 +674,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. |