Merge develop to beatrice 2022 06 #710

Merged
serkixenos merged 14 commits from merge-develop-to-beatrice-2022-06 into beatrice 2022-06-15 03:45:26 +00:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit bc7d03cb22 - Show all commits

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)

View file

@ -91,6 +91,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; \