message: Rebase onto master branch
diff: @@ -18,9 +18,11 @@ namespace eosiosystem {
  checksum256 action_mroot;
  checksum256 block_mroot;
  account_name producer;
  - eosio::optional<eosio::producer_schedule> new_producers;
  + uint32_t schedule_version;
  + eosio::optional<producer_schedule> new_producers;
  - EOSLIB_SERIALIZE(block_header, (previous)(timestamp)(transaction_mroot)(action_mroot)(block_mroot)(producer)(new_producers))
  + EOSLIB_SERIALIZE(block_header, (previous)(timestamp)(transaction_mroot)(action_mroot)(block_mroot)
  + (producer)(schedule_version)(new_producers))
  };
  template<account_name SystemAccount>
  