From 16b59e0b422c486238f4b6a09261dfd310b0c481 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Sun, 3 Jan 2016 22:10:56 -0500 Subject: [PATCH] adding seed node --- libraries/app/application.cpp | 3 ++- libraries/chain/db_block.cpp | 2 +- libraries/chain/db_management.cpp | 5 +++-- libraries/fc | 2 +- libraries/plugins/witness/witness.cpp | 5 +++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 7ed32d52..f120ea54 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -151,6 +151,7 @@ namespace detail { vector seeds = { "faucet.bitshares.org:1776", "bitshares.openledger.info:1776", + "114.92.254.159:62015", "seed.blocktrades.us:1776", "seed04.bitsharesnodes.com:1776", // thom "seed05.bitsharesnodes.com:1776", // thom @@ -813,7 +814,7 @@ namespace detail { } while (low_block_num <= high_block_num); - idump((synopsis)); + //idump((synopsis)); return synopsis; } FC_CAPTURE_AND_RETHROW() } diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 6e8afd4a..4167c0a5 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -106,7 +106,7 @@ std::vector database::get_block_ids_on_fork(block_id_type head_of */ bool database::push_block(const signed_block& new_block, uint32_t skip) { - //idump((new_block.block_num())(new_block.id())(new_block.timestamp)(new_block.previous)); + idump((new_block.block_num())(new_block.id())(new_block.timestamp)(new_block.previous)); bool result; detail::with_skip_flags( *this, skip, [&]() { diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp index 4cac9941..6d60b7dc 100644 --- a/libraries/chain/db_management.cpp +++ b/libraries/chain/db_management.cpp @@ -123,12 +123,13 @@ void database::open( { _fork_db.start_block( *last_block ); idump((last_block->id())(last_block->block_num())); + idump((head_block_id())(head_block_num())); if( last_block->id() != head_block_id() ) { - FC_ASSERT( head_block_num() == 0, "last block ID does not match current chain state" ); + FC_ASSERT( head_block_num() == 0, "last block ID does not match current chain state", + ("last_block->id", last_block->id())("head_block_num",head_block_num()) ); } } - //idump((head_block_id())(head_block_num())); } FC_CAPTURE_LOG_AND_RETHROW( (data_dir) ) } diff --git a/libraries/fc b/libraries/fc index ad7ecbf0..64950043 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit ad7ecbf061ae74c944c81da993a020c05d53c7b6 +Subproject commit 6495004302239ae0c775f05a0e78780c3b189502 diff --git a/libraries/plugins/witness/witness.cpp b/libraries/plugins/witness/witness.cpp index acdad202..d9848121 100644 --- a/libraries/plugins/witness/witness.cpp +++ b/libraries/plugins/witness/witness.cpp @@ -188,10 +188,10 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc ilog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)"); break; case block_production_condition::not_my_turn: - //ilog("Not producing block because it isn't my turn"); + ilog("Not producing block because it isn't my turn"); break; case block_production_condition::not_time_yet: - // ilog("Not producing block because slot has not yet arrived"); + ilog("Not producing block because slot has not yet arrived"); break; case block_production_condition::no_private_key: ilog("Not producing block because I don't have the private key for ${scheduled_key}", (capture) ); @@ -206,6 +206,7 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc elog("Not producing block because the last block was generated by the same witness.\nThis node is probably disconnected from the network so block production has been disabled.\nDisable this check with --allow-consecutive option."); break; case block_production_condition::exception_producing_block: + elog( "exception prodcing block" ); break; }