Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge

Browse source
This commit is contained in:
Roman Olearski 2017-07-20 12:20:11 +02:00
commit c13ba46b2b
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libraries/app/application.cpp
View file

@ -162,24 +162,7 @@ namespace detail {
{
// https://bitsharestalk.org/index.php/topic,23715.0.html
vector<string> seeds = {
"104.236.144.84:1777", // puppies (USA)
"128.199.143.47:2015", // Harvey (Singapore)
"23.92.53.182:1776", // sahkan (USA)
"192.121.166.162:1776", // sahkan (UK)
"51.15.61.160:1776", // lafona (France)
"bts-seed1.abit-more.com:62015", // abit (China)
"node.blckchnd.com:4243", // blckchnd (Germany)
"seed.bitsharesdex.com:50696", // iHashFury (Europe)
"seed.bitsharesnodes.com:1776", // wackou (Netherlands)
"seed.blocktrades.us:1776", // BlockTrades (USA)
"seed.cubeconnex.com:1777", // cube (USA)
"seed.roelandp.nl:1776", // roelandp (Canada)
"seed04.bts-nodes.net:1776", // Thom (Australia)
"seed05.bts-nodes.net:1776", // Thom (USA)
"seed06.bts-nodes.net:1776", // Thom (USA)
"seed07.bts-nodes.net:1776", // Thom (Singapore)
"seeds.bitshares.eu:1776", // pc (http://seeds.quisquis.de/bitshares.html)
"peerplays.blocktrades.info:2776"
"peerplays-dev.blocktrades.info:2776"
};
for( const string& endpoint_string : seeds )
{

9
libraries/plugins/witness/witness.cpp
View file

@ -188,7 +188,8 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc
switch( result )
{
case block_production_condition::produced:
ilog("Generated block #${n} with timestamp ${t} at time ${c}", (capture));
ilog("Generated block #${n} with timestamp ${t} at time ${c}",
("n", capture["n"])("t", capture["t"])("c", capture["c"]));
break;
case block_production_condition::not_synced:
ilog("Not producing block because production is disabled until we receive a recent block (see: --enable-stale-production)");
@ -201,10 +202,12 @@ block_production_condition::block_production_condition_enum witness_plugin::bloc
dlog("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) );
ilog("Not producing block because I don't have the private key for ${scheduled_key}",
("n", capture["n"])("t", capture["t"])("c", capture["c"]));
break;
case block_production_condition::low_participation:
elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation", (capture) );
elog("Not producing block because node appears to be on a minority fork with only ${pct}% witness participation",
("n", capture["n"])("t", capture["t"])("c", capture["c"]));
break;
case block_production_condition::lag:
elog("Not producing block because node didn't wake up within 500ms of the slot time.");