Fix fixed stake reward check (#369)

* Fix fixed stake reward check

The stake reward, even if fixed, includes the fees of the transactions included in the block.

The removed check does not take the fees making the network reject all the blocks which include a transaction. At this point, the total amount of fees is still unknown.

This is safely removed as the check is properly done in line 3322.

* test tx sends after soft fork

* file permission fix

* adding blockcount param

* corrected object calling rpc command

* remove print

Author: alex v

qa/pull-tester/rpc-tests.py

@@ -164,6 +164,7 @@
     'coldstaking_staking.py',
     'coldstaking_spending.py',
     'staticr-staking-amount.py',
+    'staticr-tx-send.py',
 ]
 #if ENABLE_ZMQ:
 #    testScripts.append('zmq_test.py')

qa/rpc-tests/staticr-tx-send.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+# Copyright (c) 2018 The Navcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import NavCoinTestFramework
+from test_framework.staticr_util import *
+
+import time
+
+class StaticRTxSend(NavCoinTestFramework):
+    """Tests the tx sending after softfork activation."""
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+
+    def setup_network(self, split=False):
+        self.nodes = self.setup_nodes()
+        self.is_network_split = split
+
+    def run_test(self):
+
+        #check that a transaction can be sent after the reward changes to static
+
+        activate_staticr(self.nodes[0])
+
+        blockcount = self.nodes[0].getblockcount()
+        address = self.nodes[0].getnewaddress()
+        txid = self.nodes[0].sendtoaddress(address, 100)
+
+        # wait for a new block to be mined
+        while self.nodes[0].getblockcount() == blockcount:
+            print("waiting for a new block...")
+            time.sleep(5)
+
+        transaction = self.nodes[0].gettransaction(txid)
+
+        # check the transaction confirmed
+        assert(transaction["confirmations"] > 0)
+
+if __name__ == '__main__':
+    StaticRTxSend().main()

src/main.cpp

@@ -3054,11 +3054,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
 
               }
 
-              if(IsStaticRewardEnabled(pindex->pprev, Params().GetConsensus()) && nStakeReward != Params().GetConsensus().nStaticReward)
-                return state.DoS(100, error("ConnectBlock(): block has incorrect block reward (actual=%d vs consensus=%d)",
-                nStakeReward, Params().GetConsensus().nStaticReward),
-                REJECT_INVALID, "bad-static-stake-amount");
-
             }
 
             std::vector<CScriptCheck> vChecks;