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

Merge branch 'feature/enable_sync_with_main_net' into 'develop'

Browse source 
Fix for scheduler wrong state

See merge request PBSA/peerplays!122
This commit is contained in:
serkixenos 2022-06-02 16:18:16 +00:00
commit 1846b1709e
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/include/graphene/chain/global_property_object.hpp
View file

@ -131,6 +131,7 @@ namespace graphene { namespace chain {
}}
FC_REFLECT_DERIVED( graphene::chain::dynamic_global_property_object, (graphene::db::object),
(random)
(head_block_number)
(head_block_id)
(time)

5
libraries/net/node.cpp
View file

@ -92,6 +92,7 @@
#define DEFAULT_LOGGER "p2p"
#define P2P_IN_DEDICATED_THREAD 1
#define DISABLE_WITNESS_HF_CHECK 1
#define INVOCATION_COUNTER(name) \
static unsigned total_ ## name ## _counter = 0; \
@ -1905,8 +1906,10 @@ namespace graphene { namespace net { namespace detail {
// last hardfork time. We are setting to 0 which will disconnect the node
// on hello message
originating_peer->last_known_hardfork_time = fc::time_point_sec(0);
if(DISABLE_WITNESS_HF_CHECK) {
originating_peer->last_known_hardfork_time = _delegate->get_last_known_hardfork_time();
}
}
}
void node_impl::on_hello_message( peer_connection* originating_peer, const hello_message& hello_message_received )