diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-07 09:04:56 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-07 09:04:56 -0500 |
| commit | 0b452dff5e9f1401343b6c52ef739014d81fa8c6 (patch) | |
| tree | e707c5982ee5f2a0a99b7e563c69d58414222eb7 /src/script.h | |
| parent | 7bf8b7c25c944110dbe85ef9e4eebd858da34158 (diff) | |
| parent | 39f0d9686095bce469dbfa52333331a5d15c6545 (diff) | |
| download | bitcoin-0b452dff5e9f1401343b6c52ef739014d81fa8c6.tar.xz | |
Merge branch 'standardScriptSigs' of github.com:gavinandresen/bitcoin-git
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script.h b/src/script.h index 63f9f9353a..4760b99a9b 100644 --- a/src/script.h +++ b/src/script.h @@ -560,6 +560,7 @@ public: bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, int nHashType); bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet); +int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions); bool IsStandard(const CScript& scriptPubKey); bool IsMine(const CKeyStore& keystore, const CScript& scriptPubKey); bool ExtractAddress(const CScript& scriptPubKey, CBitcoinAddress& addressRet); |