Merge remote-tracking branch 'upstream/master' into upstream

This commit is contained in:
wowario
2018-12-12 14:58:54 +03:00
61 changed files with 1559 additions and 182 deletions
+6
View File
@@ -281,6 +281,12 @@ t_command_server::t_command_server(
, std::bind(&t_command_parser_executor::sync_info, &m_parser, p::_1)
, "Print information about the blockchain sync state."
);
m_command_lookup.set_handler(
"pop_blocks"
, std::bind(&t_command_parser_executor::pop_blocks, &m_parser, p::_1)
, "pop_blocks <nblocks>"
, "Remove blocks from end of blockchain"
);
m_command_lookup.set_handler(
"version"
, std::bind(&t_command_parser_executor::version, &m_parser, p::_1)