Merge branch 'develop' into feature/son-for-ethereum
This commit is contained in:
commit
35943b4f9c
2 changed files with 7 additions and 1 deletions
|
|
@ -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)) );
|
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 counters
|
||||||
create<fba_accumulator_object>([&]( fba_accumulator_object& acc )
|
create<fba_accumulator_object>([&]( fba_accumulator_object& acc )
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue