diff options
| author | Gavin Andresen <[email protected]> | 2010-12-08 20:06:44 -0500 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2010-12-08 20:06:44 -0500 |
| commit | d12e53ea090ba49a82ff4f79782af809d21cf280 (patch) | |
| tree | 8fb80d4335255d62eb65e9f7b2def7ca799b55c4 /script.cpp | |
| parent | Merge remote branch 'refs/remotes/svn/trunk' into svn (diff) | |
| parent | -- version 0.3.18 release (diff) | |
| download | discoin-d12e53ea090ba49a82ff4f79782af809d21cf280.tar.xz discoin-d12e53ea090ba49a82ff4f79782af809d21cf280.zip | |
Merge remote branch 'refs/remotes/svn/trunk' into svn
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/script.cpp b/script.cpp index a09031bad..a85c3710a 100644 --- a/script.cpp +++ b/script.cpp @@ -997,7 +997,7 @@ bool Solver(const CScript& scriptPubKey, vector<pair<opcodetype, valtype> >& vSo break; if (opcode2 == OP_PUBKEY) { - if (vch1.size() < 33) + if (vch1.size() < 33 || vch1.size() > 120) break; vSolutionRet.push_back(make_pair(opcode2, vch1)); } @@ -1076,6 +1076,13 @@ bool Solver(const CScript& scriptPubKey, uint256 hash, int nHashType, CScript& s } +bool IsStandard(const CScript& scriptPubKey) +{ + vector<pair<opcodetype, valtype> > vSolution; + return Solver(scriptPubKey, vSolution); +} + + bool IsMine(const CScript& scriptPubKey) { CScript scriptSig; |