oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

use new basis points function in rpc_command_executor

This commit is contained in:
Sean Darcy 2022-08-31 09:44:27 +10:00
parent 3662cb21fb
commit 872210608b
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/service_node_rules.cpp
View File

@ -256,7 +256,7 @@ std::optional<double> parse_fee_percent(std::string_view fee)
return percent;
}
uint64_t percent_to_basis_points(std::string percent_string) {
uint16_t percent_to_basis_points(std::string percent_string) {
const auto percent = parse_fee_percent(percent_string);
if (!percent)
throw invalid_registration{"could not parse fee percent"};

2
src/cryptonote_core/service_node_rules.h
View File

@ -301,6 +301,6 @@ uint64_t get_portions_to_make_amount(uint64_t staking_requirement, uint64_t amou
std::optional<double> parse_fee_percent(std::string_view fee);
uint64_t percent_to_basis_points(std::string percent_string);
uint16_t percent_to_basis_points(std::string percent_string);
}

10
src/daemon/rpc_command_executor.cpp
View File

@ -2209,14 +2209,12 @@ Enter the operator fee as a percentage [0.00-100.00])");
if (check_cancel_back(result))
break;
auto pct = service_nodes::parse_fee_percent(operator_fee_str);
if (pct)
{
state.operator_fee = static_cast<uint16_t>(std::lround(*pct / 100.0 * cryptonote::STAKING_FEE_BASIS));
try {
state.operator_fee = service_nodes::percent_to_basis_points(operator_fee_str);
next_step(register_step::summary_info);
}
else
} catch(const std::exception &e) {
tools::fail_msg_writer() << "Invalid value: " << operator_fee_str << ". Fee must be between 0 and 100%" << std::endl;
}
}
break;
}