Send broadcasts earlier in AcceptBlock

Author: SpyCheese

validator/impl/accept-block.cpp

@@ -494,6 +494,17 @@ void AcceptBlockQuery::written_block_signatures() {
 void AcceptBlockQuery::written_block_info() {
   VLOG(VALIDATOR_DEBUG) << "written block info";
   if (data_.not_null()) {
+    block_root_ = data_->root_cell();
+    if (block_root_.is_null()) {
+      fatal_error("block data does not contain a root cell");
+      return;
+    }
+    // generate proof
+    if (!create_new_proof()) {
+      fatal_error("cannot generate proof for block "s + id_.to_str());
+      return;
+    }
+    send_broadcasts();
     if (!apply_) {
       written_state({});
       return;
@@ -563,17 +574,6 @@ void AcceptBlockQuery::written_state(td::Ref<ShardState> upd_state) {
   CHECK(data_.not_null());
   state_ = std::move(upd_state);
 
-  block_root_ = data_->root_cell();
-  if (block_root_.is_null()) {
-    fatal_error("block data does not contain a root cell");
-    return;
-  }
-  // generate proof
-  if (!create_new_proof()) {
-    fatal_error("cannot generate proof for block "s + id_.to_str());
-    return;
-  }
-
   if (apply_ && state_keep_old_hash_ != state_old_hash_) {
     fatal_error(PSTRING() << "invalid previous state hash in newly-created proof: expected "
                           << state_->root_hash().to_hex() << ", found in update " << state_old_hash_.to_hex());
@@ -935,8 +935,11 @@ void AcceptBlockQuery::written_block_info_2() {
 }
 
 void AcceptBlockQuery::applied() {
+  finish_query();
+}
+
+void AcceptBlockQuery::send_broadcasts() {
   if (send_broadcast_mode_ == 0) {
-    finish_query();
     return;
   }
   BlockBroadcast b;
@@ -964,8 +967,6 @@ void AcceptBlockQuery::applied() {
   // td::actor::send_closure(manager_, &ValidatorManager::send_block_candidate_broadcast, id_,
   //                         validator_set_->get_catchain_seqno(), validator_set_->get_validator_set_hash(),
   //                         std::move(b.data), send_broadcast_mode_);
-
-  finish_query();
 }
 
 }  // namespace validator

validator/impl/accept-block.hpp

@@ -89,6 +89,7 @@ class AcceptBlockQuery : public td::actor::Actor {
   void written_block_next();
   void written_block_info_2();
   void applied();
+  void send_broadcasts();
 
  private:
   BlockIdExt id_;