From 5cbf75324d1509a1262b65c5073314a4da3f6d77 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Tue, 19 Oct 2010 17:16:51 +0000
Subject: 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
---
 script.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'script.cpp')

diff --git a/script.cpp b/script.cpp
index 730c4986d..a09031bad 100644
--- a/script.cpp
+++ b/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)
-- 
cgit v1.2.3