diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp index d2ddadd064060b..05039e9097aed1 100644 --- a/src/evo/deterministicmns.cpp +++ b/src/evo/deterministicmns.cpp @@ -188,7 +188,7 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNByInternalId(uint64_t internalId return GetMN(*proTxHash); } -static int CompareByLastPaid_GetHeight(const CDeterministicMN& dmn) +static int CompareByLastPaidGetHeight(const CDeterministicMN& dmn) { int height = dmn.pdmnState->nLastPaidHeight; if (dmn.pdmnState->nPoSeRevivedHeight != -1 && dmn.pdmnState->nPoSeRevivedHeight > height) { @@ -201,8 +201,8 @@ static int CompareByLastPaid_GetHeight(const CDeterministicMN& dmn) static bool CompareByLastPaid(const CDeterministicMN& _a, const CDeterministicMN& _b) { - int ah = CompareByLastPaid_GetHeight(_a); - int bh = CompareByLastPaid_GetHeight(_b); + int ah = CompareByLastPaidGetHeight(_a); + int bh = CompareByLastPaidGetHeight(_b); if (ah == bh) { return _a.proTxHash < _b.proTxHash; } else { diff --git a/src/init.cpp b/src/init.cpp index dd4871514525db..8f7f26a14eda7d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1907,9 +1907,9 @@ bool AppInitMain() if (fDeterministic) { // Check enforcement if (!deterministicMNManager->IsDIP3Enforced()) { - const std::string strError = "Cannot start deterministic masternode before enforcement. Remove -mnoperatorprivatekey to start as legacy masternode"; + const std::string strError = strprintf(_("Cannot start deterministic masternode before enforcement. Remove %s to start as legacy masternode"), "-mnoperatorprivatekey"); LogPrintf("-- ERROR: %s\n", strError); - return UIError(_(strError.c_str())); + return UIError(strError); } // Create and register activeMasternodeManager activeMasternodeManager = new CActiveDeterministicMasternodeManager(); @@ -1921,9 +1921,9 @@ bool AppInitMain() } else { // Check enforcement if (deterministicMNManager->LegacyMNObsolete()) { - const std::string strError = "Legacy masternode system disabled. Use -mnoperatorprivatekey to start as deterministic masternode"; + const std::string strError = strprintf(_("Legacy masternode system disabled. Use %s to start as deterministic masternode"), "-mnoperatorprivatekey"); LogPrintf("-- ERROR: %s\n", strError); - return UIError(_(strError.c_str())); + return UIError(strError); } auto res = initMasternode(gArgs.GetArg("-masternodeprivkey", ""), gArgs.GetArg("-masternodeaddr", ""), true); if (!res) { return UIError(res.getError()); } diff --git a/src/validation.cpp b/src/validation.cpp index 62f922326fa66a..a972332faeeb96 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1937,12 +1937,12 @@ void static UpdateTip(CBlockIndex* pindexNew) } const CBlockIndex* pChainTip = chainActive.Tip(); - LogPrintf("%s: new best=%s height=%d version=%d log2_work=%.16f tx=%lu date=%s progress=%f cache=%.1fMiB(%utxo)\n", + LogPrintf("%s: new best=%s height=%d version=%d log2_work=%.16f tx=%lu date=%s progress=%f cache=%.1fMiB(%utxo) evodb_cache=%.1fMiB\n", __func__, pChainTip->GetBlockHash().GetHex(), pChainTip->nHeight, pChainTip->nVersion, log(pChainTip->nChainWork.getdouble()) / log(2.0), (unsigned long)pChainTip->nChainTx, DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pChainTip->GetBlockTime()), - Checkpoints::GuessVerificationProgress(pChainTip), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize()); - LogPrintf("%s: evodb_cache=%.1fMiB\n", __func__, evoDb->GetMemoryUsage() * (1.0 / (1<<20))); + Checkpoints::GuessVerificationProgress(pChainTip), pcoinsTip->DynamicMemoryUsage() * (1.0 / (1<<20)), pcoinsTip->GetCacheSize(), + evoDb->GetMemoryUsage() * (1.0 / (1<<20))); // Check the version of the last 100 blocks to see if we need to upgrade: static bool fWarned = false;