From 361decbbf81bbe1cf0e42f115fe1a9d048329d62 Mon Sep 17 00:00:00 2001 From: globaltoken Date: Fri, 21 Sep 2018 04:40:41 +0200 Subject: [PATCH] [3.0.1] final improvement - Fixed compiler issues & bugs --- src/chainparams.cpp | 2 +- src/consensus/tx_verify.cpp | 1 + src/validation.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index eb04bc6d39ed1..e0034287428ed 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1434,7 +1434,7 @@ std::string CChainParams::GetFoundersRewardAddressAtIndex(int i) const { CAmount CChainParams::GetTreasuryAmount(CAmount coinAmount) const { - return ((coinAmount / 100) * consensus.nTreasuryAmount); + return ((coinAmount / 100.0) * consensus.nTreasuryAmount); } unsigned int CChainParams::EquihashSolutionWidth(uint8_t nAlgo) const diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index f6ab6f8293894..336df7afdbf70 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -13,6 +13,7 @@ #include #include #include +#include bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime) { diff --git a/src/validation.cpp b/src/validation.cpp index f8161779a4dc3..4264fa4680825 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1220,7 +1220,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) CAmount nSubsidy; - if((nHeight >= 350000 && nHeight <= 366448) && Params().NetworkIDString() == CBaseChainParams::MAIN) + if((nHeight >= 400000 && nHeight <= 416448) && Params().NetworkIDString() == CBaseChainParams::MAIN) nSubsidy = 200 * COIN; else nSubsidy = 100 * COIN; @@ -1232,7 +1232,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) CAmount GetMasternodePayment(int nHeight, CAmount blockValue) { - return ((blockValue / 100) * Params().GetConsensus().nMasternodePayeeReward); + return ((blockValue / 100.0) * Params().GetConsensus().nMasternodePayeeReward); } bool IsInitialBlockDownload()