From cbdf6ba4a94bca6b0c6bf3d03f01a7557a83ff4e Mon Sep 17 00:00:00 2001
From: Xiao Shengguang <shengguangxiao@gmail.com>
Date: Thu, 30 Sep 2021 18:09:43 +0800
Subject: [PATCH] Including tx fee into block rewards (#764)

* Including tx fee into block rewards
* Fix lint error
* Use defined number instead of magaic number result
* Addfork height check for including fees
---
 src/miner.cpp                           |  6 +++-
 test/functional/feature_block_reward.py | 43 +++++++++++++++++++++++++
 test/functional/test_runner.py          |  1 +
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/feature_block_reward.py

diff --git a/src/miner.cpp b/src/miner.cpp
index 044b2c8df7e..db20e92f9ba 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -239,7 +239,11 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
         coinbaseTx.vout.resize(2);
 
         // Explicitly set miner reward
-        coinbaseTx.vout[0].nValue = CalculateCoinbaseReward(blockReward, consensus.dist.masternode);
+        if (nHeight >= consensus.FortCanningHeight) {
+            coinbaseTx.vout[0].nValue = nFees + CalculateCoinbaseReward(blockReward, consensus.dist.masternode);
+        } else {
+            coinbaseTx.vout[0].nValue = CalculateCoinbaseReward(blockReward, consensus.dist.masternode);
+        }
 
         // Community payment always expected
         coinbaseTx.vout[1].scriptPubKey = consensus.foundationShareScript;
diff --git a/test/functional/feature_block_reward.py b/test/functional/feature_block_reward.py
new file mode 100644
index 00000000000..8f0865061fe
--- /dev/null
+++ b/test/functional/feature_block_reward.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+# Copyright (c) 2014-2019 The Bitcoin Core developers
+# Copyright (c) DeFi Blockchain Developers
+# Distributed under the MIT software license, see the accompanying
+# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+"""Test account mining behaviour"""
+
+from test_framework.test_framework import DefiTestFramework
+from test_framework.util import (
+    assert_greater_than,
+    assert_equal
+)
+
+class BlockRewardTest(DefiTestFramework):
+    def set_test_params(self):
+        self.num_nodes = 1
+        self.setup_clean_chain = True
+        self.extra_args = [['-txnotokens=0', '-amkheight=50', '-eunosheight=100', '-eunosheight=100', '-fortcanningheight=110', '-subsidytest=1']]
+
+    def run_test(self):
+        node = self.nodes[0]
+        node.generate(120)
+
+        newBaseBlockSubsidy = 405.0400
+        masternodePortion = 0.3333 # 33.33%
+        mingBaseReward = newBaseBlockSubsidy * masternodePortion
+
+        result = node.listaccounthistory("mine", {"depth":0})
+        assert_equal(result[0]["amounts"][0], f'{mingBaseReward:.8f}@DFI')
+
+        account = node.getnewaddress()
+        node.utxostoaccount({account: "1.1@0"})
+        node.utxostoaccount({account: "1.2@0"})
+        node.utxostoaccount({account: "1.3@0"})
+        node.generate(1)
+
+        result = node.listaccounthistory("mine", {"depth":0})
+        for subResult in result:
+            if subResult["type"] == "blockReward":
+                assert_greater_than(subResult["amounts"][0], f'{mingBaseReward:.8f}@DFI')
+
+if __name__ == '__main__':
+    BlockRewardTest().main ()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index e4acbe2ea03..77dd6a83cbd 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -258,6 +258,7 @@
     'feature_burn_address.py',
     'feature_eunos_balances.py',
     'feature_sendutxosfrom.py',
+    'feature_block_reward.py',
     # Don't append tests at the end to avoid merge conflicts
     # Put them in a random line within the section that fits their approximate run-time
 ]