Merge remote-tracking branch 'janko33bd/Blackcoin-Lore' into build-fixes-0.13

2018-01-12 22:22:52 +03:00
parent 2ac25f14ea 982ea00de5
commit ef33662381
26 changed files with 465 additions and 133 deletions
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -428,6 +428,10 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un

 				case OP_COUNT_ACKS:
 				{
+					if (SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS) {
+                                           return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS);
+                                       }
+

 					// (secondary_chain_id ack_period liveness_period -- )
 					if (stack.size() < 3)