mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Gavin's TEST network as -testnet switch, misc fixes
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@168 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
parent
2fad3d34b7
commit
5cbf75324d
14 changed files with 155 additions and 82 deletions
13
script.cpp
13
script.cpp
|
|
@ -776,16 +776,11 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co
|
|||
return false;
|
||||
|
||||
int nKeysCount = CastToBigNum(stacktop(-i)).getint();
|
||||
if (nKeysCount < 0)
|
||||
if (nKeysCount < 0 || nKeysCount > 20)
|
||||
return false;
|
||||
nOpCount += nKeysCount;
|
||||
if (nOpCount > 201)
|
||||
return false;
|
||||
if (nBestHeight > 84000)
|
||||
{
|
||||
if (nKeysCount > 20)
|
||||
return false;
|
||||
nOpCount += nKeysCount;
|
||||
if (nOpCount > 201)
|
||||
return false;
|
||||
}
|
||||
int ikey = ++i;
|
||||
i += nKeysCount;
|
||||
if (stack.size() < i)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue