Fix upstream integration fallout in sync and notifications

src/cryptonote_core/blockchain.cpp

@@ -5811,9 +5811,6 @@ leave:
   }
 
   const crypto::hash seedhash = get_block_id_by_height(crypto::rx_seedheight(new_height));
-  // Make sure that txpool notifications happen BEFORE block and miner data notifications
-  notify_txpool_event(std::move(txpool_events));
-
   // send miner notifications to switch as soon as possible
   send_miner_notifications(new_height, seedhash, id, already_generated_coins);
 

src/cryptonote_protocol/cryptonote_protocol_handler.inl

@@ -815,8 +815,7 @@ namespace cryptonote
           context.m_needed_objects.clear();
           context.m_state = cryptonote_connection_context::state_synchronizing;
           NOTIFY_REQUEST_CHAIN::request r = {};
-          context.m_expect_height = m_core.get_current_blockchain_height();
-          m_core.get_short_chain_history(r.block_ids);
+          m_core.get_short_chain_history(r.block_ids, context.m_expect_height);
           handler_request_blocks_history( r.block_ids ); // change the limit(?), sleep(?)
           r.prune = m_sync_pruned_blocks;
           context.m_last_request_time = boost::posix_time::microsec_clock::universal_time();