Merge branch 'develop' into feature/son-for-ethereum

libraries/chain/db_init.cpp

@@ -1167,6 +1167,12 @@ void database::init_genesis(const genesis_state_type& genesis_state)
    });
    assert( ssoethereum.id == son_schedule_id_type(get_son_schedule_id(sidechain_type::ethereum)) );
 
+      _sso.last_scheduling_block = 0;
+
+      _sso.recent_slots_filled = fc::uint128::max_value();
+   });
+   assert( ssobitcoin.id == son_schedule_id_type(get_son_schedule_id(sidechain_type::bitcoin)) );
+
    // Create FBA counters
    create<fba_accumulator_object>([&]( fba_accumulator_object& acc )
    {

libraries/chain/include/graphene/chain/sidechain_defs.hpp

@@ -24,4 +24,4 @@ FC_REFLECT_ENUM(graphene::chain::sidechain_type,
    (ethereum)
    (eos)
    (hive)
-   (peerplays) )
+   (peerplays) )