Merge remote-tracking branch 'zcash/master' into dPoW

2016-10-28 13:50:21 -03:00
parent 78dece340d 1feaefac51
commit 30853e4ab9
137 changed files with 5475 additions and 1453 deletions
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -252,7 +252,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
    vector<bool> vfExec;
    vector<valtype> altstack;
    set_error(serror, SCRIPT_ERR_UNKNOWN_ERROR);
-    if (script.size() > 10000)
+    if (script.size() > MAX_SCRIPT_SIZE)
        return set_error(serror, SCRIPT_ERR_SCRIPT_SIZE);
    int nOpCount = 0;
    bool fRequireMinimal = (flags & SCRIPT_VERIFY_MINIMALDATA) != 0;