From 2b4b729c34e9cab4813419fcd1c133bffadadaa7 Mon Sep 17 00:00:00 2001
From: janko33bd <janko33bd@gmail.com>
Date: Wed, 10 Jan 2018 21:06:02 +0100
Subject: [PATCH] removing useless tip

---
 src/qt/forms/askpassphrasedialog.ui | 3 ---
 src/script/interpreter.cpp          | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/qt/forms/askpassphrasedialog.ui b/src/qt/forms/askpassphrasedialog.ui
index 5b7223e4f..dce4b8883 100644
--- a/src/qt/forms/askpassphrasedialog.ui
+++ b/src/qt/forms/askpassphrasedialog.ui
@@ -117,9 +117,6 @@
      </item>
      <item row="4" column="0">
       <widget class="QCheckBox" name="stakingCheckBox">
-       <property name="toolTip">
-        <string>Serves to disable the trivial sendmoney when OS account compromised. Provides no real security.</string>
-       </property>
        <property name="text">
         <string>* Tick for staking only</string>
        </property>
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index a6f8fd0e1..5296dca99 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -429,6 +429,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)
 						return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION);