Skip to content

fix(tx_extra): enforce equal vector lengths in tx_extra_master_node_register #197

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

Open
raw391 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(tx_extra): enforce equal vector lengths in tx_extra_master_node_register #197

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
7 changes: 7 additions & 0 deletions src/cryptonote_basic/tx_extra.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,13 @@ namespace cryptonote
FIELD(m_portions)
FIELD(m_expiration_timestamp)
FIELD(m_master_node_signature)
if (Archive::is_deserializer)
{
if (m_public_spend_keys.size() != m_public_view_keys.size())
throw std::invalid_argument{"tx_extra_master_node_register: spend/view key count mismatch"};
if (m_public_spend_keys.size() != m_portions.size())
throw std::invalid_argument{"tx_extra_master_node_register: spend/portions count mismatch"};
}
END_SERIALIZE()
};

Expand Down
3 changes: 3 additions & 0 deletions src/cryptonote_core/master_node_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ namespace master_nodes
if (!cryptonote::get_master_node_pubkey_from_tx_extra(tx.extra, master_node_key))
return false;

if (registration.m_public_spend_keys.size() != registration.m_public_view_keys.size()
|| registration.m_public_spend_keys.size() != registration.m_portions.size())
return false;
contributor_args.addresses.clear();
contributor_args.addresses.reserve(registration.m_public_spend_keys.size());
for (size_t i = 0; i < registration.m_public_spend_keys.size(); i++) {
Expand Down
10 changes: 7 additions & 3 deletions src/rpc/core_rpc_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,9 +710,13 @@ namespace cryptonote::rpc {
void operator()(const tx_extra_security_signature& x) { set("security_sig", tools::type_to_hex(x.m_security_signature)); }
void operator()(const tx_extra_master_node_register& x) {
json reservations{};
for (size_t i = 0; i < x.m_portions.size(); i++)
reservations[get_account_address_as_str(nettype, false, {x.m_public_spend_keys[i], x.m_public_view_keys[i]})]
= microportion(x.m_portions[i]);
if (x.m_public_spend_keys.size() == x.m_public_view_keys.size()
&& x.m_public_spend_keys.size() == x.m_portions.size())
{
for (size_t i = 0; i < x.m_portions.size(); i++)
reservations[get_account_address_as_str(nettype, false, {x.m_public_spend_keys[i], x.m_public_view_keys[i]})]
= microportion(x.m_portions[i]);
}
set("mn_registration", json{
{"fee", microportion(x.m_portions_for_operator)},
{"expiry", x.m_expiration_timestamp},
Expand Down