Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix interest rate string on logs, minor refactor #1325

Merged
merged 1 commit into from
Jun 3, 2022
Merged

Fix interest rate string on logs, minor refactor #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/masternodes/loan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ CAmount CLoanView::GetLoanLiquidationPenalty()
return 5 * COIN / 100;
}

boost::optional<std::string> GetInterestPerBlockHighPrecisionString(const base_uint<128>& value) {
boost::optional<std::string> TryGetInterestPerBlockHighPrecisionString(const base_uint<128>& value) {
struct HighPrecisionInterestValue {
typedef boost::multiprecision::int128_t int128;
typedef int64_t int64;
Expand Down Expand Up @@ -519,3 +519,12 @@ boost::optional<std::string> GetInterestPerBlockHighPrecisionString(const base_u
};
return HighPrecisionInterestValue(value).GetInterestPerBlockString();
}

std::string GetInterestPerBlockHighPrecisionString(const base_uint<128>& value) {
auto res = TryGetInterestPerBlockHighPrecisionString(value);
if (!res) {
LogPrintf("WARNING: High precision interest string conversion failure. Falling back to hex.\n");
return value.ToString();
}
return *res;
}
4 changes: 3 additions & 1 deletion src/masternodes/loan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ CAmount TotalInterest(const CInterestRateV2& rate, uint32_t height);
CAmount InterestPerBlock(const CInterestRateV2& rate, uint32_t height);
base_uint<128> TotalInterestCalculation(const CInterestRateV2& rate, uint32_t height);
CAmount CeilInterest(const base_uint<128>& value, uint32_t height);
boost::optional<std::string> GetInterestPerBlockHighPrecisionString(const base_uint<128>& value);

std::string GetInterestPerBlockHighPrecisionString(const base_uint<128>& value);
boost::optional<std::string> TryGetInterestPerBlockHighPrecisionString(const base_uint<128>& value);

base_uint<128> InterestPerBlockCalculationV2(CAmount amount, CAmount tokenInterest, CAmount schemeInterest);

Expand Down
8 changes: 1 addition & 7 deletions src/masternodes/rpc_loan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,13 +1462,7 @@ UniValue getinterest(const JSONRPCRequest& request) {
obj.pushKV("interestPerBlock", ValueFromAmount(CeilInterest(interestPerBlock, height)));
if (height >= Params().GetConsensus().FortCanningHillHeight)
{
auto realizedInterestStr = GetInterestPerBlockHighPrecisionString(interestPerBlock);
// Ideally would be better to have a universal graceful shutdown methodology to force the node to
// stop for these unexpected state errors that violate operating params but still not enough
// memory inconsistency to crash risking wallet and data corruption.
if (!realizedInterestStr)
throw JSONRPCError(RPC_MISC_ERROR, "Invalid GetInterestPerBlockHighPrecisionString.");
obj.pushKV("realizedInterestPerBlock", UniValue(UniValue::VNUM, *realizedInterestStr));
obj.pushKV("realizedInterestPerBlock", UniValue(UniValue::VNUM, GetInterestPerBlockHighPrecisionString(interestPerBlock)));
}
ret.push_back(obj);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/loan_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE(high_precision_interest_rate_to_string_tests)
else if (typeKind == 1) input = base_uint<128>(boost::get<std::string>(key));
else BOOST_TEST_FAIL("unknown type");

auto res = GetInterestPerBlockHighPrecisionString(input);
auto res = TryGetInterestPerBlockHighPrecisionString(input);
if (!res) BOOST_TEST_FAIL("negatives detected");
BOOST_CHECK_EQUAL(*res, expectedResult);
}
Expand All @@ -256,7 +256,7 @@ BOOST_AUTO_TEST_CASE(high_precision_interest_rate_to_string_tests)
// for (auto n = 0; n < 128; n++) {
// nums.push_back(i);
// std::cout << " { \"" << i.GetHex() << "\", \"";
// std::cout << GetInterestPerBlockHighPrecisionString(i);
// std::cout << TryGetInterestPerBlockHighPrecisionString(i);
// std::cout << "\" }," << std::endl;
// i = i >> 1;
// }
Expand Down
20 changes: 5 additions & 15 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4294,22 +4294,12 @@ static Res VaultSplits(CCustomCSView& view, ATTRIBUTES& attributes, const DCT_ID
}

if (LogAcceptCategory(BCLog::TOKEN_SPLIT)) {
auto s1 = GetInterestPerBlockHighPrecisionString(oldInterestPerBlock);
auto s2 = GetInterestPerBlockHighPrecisionString(newInterestRatePerBlock);
std::string s1Str;
std::string s2Str;
if (s1 && s2) {
s1Str = *s1;
s2Str = *s2;
}
else {
s1Str = oldInterestPerBlock.ToString();
s2Str = newInterestRatePerBlock.ToString();
LogPrint(BCLog::TOKEN_SPLIT, "WARNING: TokenSplit GetInterestPerBlockHighPrecisionString failed\n");
}
LogPrint(BCLog::TOKEN_SPLIT, "TokenSplit: V Interest (%s: %s => %s, %s => %s)\n",
vaultId.ToString(), oldRateToHeight.ToString(), newRateToHeight.ToString(),
s1Str, s2Str);
vaultId.ToString(),
GetInterestPerBlockHighPrecisionString(oldRateToHeight),
GetInterestPerBlockHighPrecisionString(newRateToHeight),
GetInterestPerBlockHighPrecisionString(oldInterestPerBlock),
GetInterestPerBlockHighPrecisionString(newInterestRatePerBlock));
}

view.WriteInterestRate(std::make_pair(vaultId, newTokenId), rate, rate.height);
Expand Down