Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

added block info by hash and fixed bug with seed initialization

Browse source
This commit is contained in:
crypro.zoidberg 2019-01-25 19:20:12 +03:00
parent 44d02cb664
commit 1109e568c5
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/currency_core/blockchain_storage.cpp
View file

@ -99,7 +99,8 @@ blockchain_storage::blockchain_storage(tx_memory_pool& tx_pool) :m_db(std::share
m_current_fee_median(0),
m_current_fee_median_effective_index(0),
m_is_reorganize_in_process(false),
m_deinit_is_done(false)
m_deinit_is_done(false),
m_current_scratchpad_seed(currency::null_hash)
{
@ -289,6 +290,8 @@ bool blockchain_storage::init(const std::string& config_folder, const boost::pro
initialize_db_solo_options_values();
get_seed_for_scratchpad(m_db_blocks.size(), m_current_scratchpad_seed);
m_services_mgr.init(config_folder, vm);

30
src/daemon/daemon_commands_handler.h
View file

@ -408,6 +408,32 @@ private:
return true;
}
//--------------------------------------------------------------------------------
bool print_block_info_by_hash(const std::string& arg)
{
crypto::hash block_hash;
if (!parse_hash256(arg, block_hash))
{
return false;
}
currency::block_extended_info bei = AUTO_VAL_INIT(bei);
bool r = m_srv.get_payload_object().get_core().get_blockchain_storage().get_block_extended_info_by_hash(block_hash, bei);
if (r)
{
// currency::block& block = bei.bl;
LOG_PRINT_GREEN("------------------ block_id: " << get_block_hash(bei.bl) << " ------------------" << ENDL << epee::serialization::store_t_to_json(bei) , LOG_LEVEL_0);
m_srv.get_payload_object().get_core().get_blockchain_storage().calc_tx_cummulative_blob(bei.bl);
}
else
{
LOG_PRINT_GREEN("block wasn't found: " << arg, LOG_LEVEL_0);
return false;
}
return true;
}
//--------------------------------------------------------------------------------
bool print_block_by_hash(const std::string& arg)
{
crypto::hash block_hash;
@ -473,11 +499,11 @@ private:
try
{
uint64_t height = boost::lexical_cast<uint64_t>(arg);
print_block_by_height(height);
print_block_info_by_height(height);
}
catch (boost::bad_lexical_cast&)
{
print_block_by_hash(arg);
print_block_info_by_hash(arg);
}
return true;