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

Tweak error message wording for HF19 regs

This commit is contained in:
Jason Rhinelander 2022-05-27 14:50:19 -03:00
parent a1814661d5
commit cc0b90e455
No known key found for this signature in database
GPG Key ID: C4992CE7A88D4262
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cryptonote_core/service_node_list.cpp
View File

@ -353,17 +353,19 @@ namespace service_nodes
if (reg.uses_portions)
{
if (hf_version >= hf::hf19_reward_batching)
throw invalid_registration{"Portion-based registrations are not permitted after HF19"};
throw invalid_registration{"Portion-based registrations are not permitted in HF19+"};
}
else
{
// If not using portions then the hf value must be >= 19 and equal to the current blockchain hf:
if (hf_version < hf::hf19_reward_batching || reg.hf != static_cast<uint8_t>(hf_version))
throw invalid_registration{"Wrong registration hardfork " +
std::to_string(reg.hf) + ", != current " + std::to_string(static_cast<uint8_t>(hf_version))};
throw invalid_registration{fmt::format(
"Wrong registration hardfork {}; you likely need to regenerate "
"the registration for compatibility with hardfork {}",
reg.hf, static_cast<uint8_t>(hf_version))};
}
const size_t max_contributors = (hf_version >= hf::hf19_reward_batching && !reg.uses_portions)
const size_t max_contributors = hf_version >= hf::hf19_reward_batching
? oxen::MAX_CONTRIBUTORS_HF19
: oxen::MAX_CONTRIBUTORS_V1;