diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -306,8 +306,8 @@ uint256 hash = ParseHashStr(request.params[0].get_str(), "txid"); Amount nAmount = request.params[2].get_int64() * SATOSHI; - g_mempool.PrioritiseTransaction(hash, request.params[0].get_str(), - request.params[1].get_real(), nAmount); + g_mempool.PrioritiseTransaction(hash, request.params[1].get_real(), + nAmount); return true; } diff --git a/src/txmempool.h b/src/txmempool.h --- a/src/txmempool.h +++ b/src/txmempool.h @@ -625,8 +625,8 @@ bool HasNoInputsOf(const CTransaction &tx) const; /** Affect CreateNewBlock prioritisation of transactions */ - void PrioritiseTransaction(const uint256 hash, const std::string strHash, - double dPriorityDelta, const Amount nFeeDelta); + void PrioritiseTransaction(const uint256 &hash, double dPriorityDelta, + const Amount nFeeDelta); void ApplyDeltas(const uint256 hash, double &dPriorityDelta, Amount &nFeeDelta) const; void ClearPrioritisation(const uint256 hash); diff --git a/src/txmempool.cpp b/src/txmempool.cpp --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -963,8 +963,7 @@ return std::max(GetConfig().GetMinFeePerKB(), GetMinFee(maxMempoolSize)); } -void CTxMemPool::PrioritiseTransaction(const uint256 hash, - const std::string strHash, +void CTxMemPool::PrioritiseTransaction(const uint256 &hash, double dPriorityDelta, const Amount nFeeDelta) { { @@ -996,8 +995,8 @@ } } } - LogPrintf("PrioritiseTransaction: %s priority += %f, fee += %d\n", strHash, - dPriorityDelta, FormatMoney(nFeeDelta)); + LogPrintf("PrioritiseTransaction: %s priority += %f, fee += %d\n", + hash.ToString(), dPriorityDelta, FormatMoney(nFeeDelta)); } void CTxMemPool::ApplyDeltas(const uint256 hash, double &dPriorityDelta, diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -5596,9 +5596,8 @@ Amount amountdelta = nFeeDelta * SATOSHI; if (amountdelta != Amount::zero()) { - g_mempool.PrioritiseTransaction(tx->GetId(), - tx->GetId().ToString(), - prioritydummy, amountdelta); + g_mempool.PrioritiseTransaction(tx->GetId(), prioritydummy, + amountdelta); } CValidationState state; if (nTime + nExpiryTimeout > nNow) { @@ -5622,8 +5621,7 @@ file >> mapDeltas; for (const auto &i : mapDeltas) { - g_mempool.PrioritiseTransaction(i.first, i.first.ToString(), - prioritydummy, i.second); + g_mempool.PrioritiseTransaction(i.first, prioritydummy, i.second); } } catch (const std::exception &e) { LogPrintf("Failed to deserialize mempool data on disk: %s. Continuing "