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

When clearing confirmation heights set the genesis account to be 1 #1875

Merged
merged 2 commits into from
Apr 5, 2019
+27 −5
Merged

When clearing confirmation heights set the genesis account to be 1 #1875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
665d5f4
When clearing confirmation heights set the genesis account to have 1
wezrule Mar 29, 2019
f01f49b
Formatting
wezrule Mar 29, 2019
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
32 changes: 27 additions & 5 deletions nano/node/cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
#include <nano/node/daemonconfig.hpp>
#include <nano/node/node.hpp>

namespace
{
void reset_confirmation_heights (nano::block_store & store);
}

std::string nano::error_cli_messages::message (int ev) const
{
switch (static_cast<nano::error_cli> (ev))
Expand Down Expand Up @@ -251,8 +256,7 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
}
if (vm.count ("confirmation_height_clear"))
{
auto transaction (node.node->store.tx_begin_write ());
node.node->store.confirmation_height_clear (transaction);
reset_confirmation_heights (node.node->store);
}

success = node.node->copy_with_compaction (snapshot_path);
Expand Down Expand Up @@ -348,9 +352,8 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
}
else
{
auto transaction (node.node->store.tx_begin_write ());
node.node->store.confirmation_height_clear (transaction);
std::cout << "Confirmation heights of all accounts are set to 0" << std::endl;
reset_confirmation_heights (node.node->store);
std::cout << "Confirmation heights of all accounts (except genesis) are set to 0" << std::endl;
}
}
else if (vm.count ("diagnostics"))
Expand Down Expand Up @@ -957,3 +960,22 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map

return ec;
}

namespace
{
void reset_confirmation_heights (nano::block_store & store)
{
// First do a clean sweep
auto transaction (store.tx_begin_write ());
store.confirmation_height_clear (transaction);

// Then make sure the confirmation height of the genesis account open block is 1
nano::network_params network_params;
auto const & genesis_account = network_params.ledger.genesis_account;
nano::account_info account_info;
auto error = store.account_get (transaction, genesis_account, account_info);
release_assert (!error);
account_info.confirmation_height = 1;
store.account_put (transaction, genesis_account, account_info);
}
}