diff --git a/src/evo/chainhelper.cpp b/src/evo/chainhelper.cpp index 16f4782aa717..f059d78a7427 100644 --- a/src/evo/chainhelper.cpp +++ b/src/evo/chainhelper.cpp @@ -27,7 +27,7 @@ CChainstateHelper::CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmn m_chainlocks{chainlocks}, ehf_manager{std::make_unique(evodb, chainman, qman)}, superblocks{std::make_unique()}, - mn_payments{std::make_unique(dmnman, *superblocks, chainman, consensus_params)}, + mn_payments{std::make_unique(dmnman, *superblocks, consensus_params)}, special_tx{std::make_unique(*credit_pool_manager, dmnman, *ehf_manager, qblockman, qsnapman, chainman, consensus_params, chainlocks, qman)} {} diff --git a/src/evo/creditpool.cpp b/src/evo/creditpool.cpp index 6faa197d9e59..980891fd7c95 100644 --- a/src/evo/creditpool.cpp +++ b/src/evo/creditpool.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -24,9 +25,6 @@ using node::ReadBlockFromDisk; -// Forward declaration to prevent a new circular dependencies through masternode/payments.h -CAmount PlatformShare(const CAmount masternodeReward); - static const std::string DB_CREDITPOOL_SNAPSHOT = "cpm_S"; static bool GetDataFromUnlockTx(const CTransaction& tx, CAmount& toUnlock, uint64_t& index, TxValidationState& state) @@ -253,7 +251,7 @@ CCreditPoolDiff::CCreditPoolDiff(CCreditPool starter, const CBlockIndex* pindexP if (DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_MN_RR)) { // If credit pool exists, it means v20 is activated - platformReward = PlatformShare(GetMasternodePayment(pindexPrev->nHeight + 1, blockSubsidy, /*fV20Active=*/ true)); + platformReward = PlatformShare(GetMasternodePayment(pindexPrev->nHeight + 1, blockSubsidy, consensusParams, MnRewardEra::EvoReward)); } } diff --git a/src/masternode/payments.cpp b/src/masternode/payments.cpp index be5635d15a27..ffce0de4cb98 100644 --- a/src/masternode/payments.cpp +++ b/src/masternode/payments.cpp @@ -16,7 +16,6 @@ #include #include