Merge branch 'master' into ci/public_apt

qdrvm · Nov 22, 2024 · e9274cf · e9274cf
2 parents 667288a + 6fc87df
commit e9274cf
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/parachain/approval/approval_distribution.cpp b/core/parachain/approval/approval_distribution.cpp
@@ -3402,7 +3402,11 @@ namespace kagome::parachain {
           libp2p::SharedFn{[&, promise{std::move(promise)}]() mutable {
             promise.set_value(approvedAncestor(min, max));
           }});
-      return future.get();
+      try {
+        return future.get();
+      } catch (std::future_error &) {
+        return block_tree_->getLastFinalized();
+      }
     }
 
     if (max.number <= min.number) {