Add check to the snapshot

Signed-off-by: Stanislav Frolov <stanislav@thirdhash.com>
dtr-org · Apr 2, 2019 · c65c646 · c65c646
1 parent 7d21e75
commit c65c646
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/p2p/finalizer_commits_handler_impl.cpp b/src/p2p/finalizer_commits_handler_impl.cpp
@@ -387,7 +387,7 @@ bool FinalizerCommitsHandlerImpl::OnCommits(
 
   const uint32_t index_epoch = index_state->GetLastFinalizedEpoch();
   const uint32_t tip_epoch = tip_state->GetLastFinalizedEpoch();
-  const bool snapshot_enabled = snapshot::IsISDEnabled();
+  const bool snapshot_enabled = snapshot::IsISDEnabled() && snapshot::IsInitialSnapshotDownload();
 
   if (!snapshot_enabled && index_epoch > tip_epoch) {
     download_until = index_state->GetEpochCheckpointHeight(index_epoch + 1);

diff --git a/src/snapshot/p2p_processing.cpp b/src/snapshot/p2p_processing.cpp
@@ -5,6 +5,7 @@
 #include <snapshot/p2p_processing.h>
 
 #include <esperanza/finalizationstate.h>
+#include <injector.h>
 #include <snapshot/iterator.h>
 #include <snapshot/snapshot_index.h>
 #include <snapshot/state.h>
@@ -15,14 +16,20 @@
 
 namespace snapshot {
 
-inline CBlockIndex *LookupFinalizedBlockIndex(const uint256 &hash) {
-  CBlockIndex *bi = LookupBlockIndex(hash);
+inline const CBlockIndex *LookupFinalizedBlockIndex(const uint256 &hash) {
+  const CBlockIndex *bi = LookupBlockIndex(hash);
   if (!bi) {
+    LogPrint(BCLog::SNAPSHOT, "%s: block=%s not found\n", __func__, hash.GetHex());
+    return nullptr;
+  }
+
+  auto fin_repo = GetComponent<finalization::StateRepository>();
+  const finalization::FinalizationState *fin_state = fin_repo->GetTipState();
+  if (bi->nHeight <= fin_state->GetEpochCheckpointHeight(fin_state->GetLastFinalizedEpoch())) {
+    LogPrint(BCLog::SNAPSHOT, "%s: block=%s height=%d is not finalized\n", hash.GetHex(), bi->nHeight);
     return nullptr;
   }
 
-  // todo: check that header is finalized
-  // once ADR-21 is implemented
   return bi;
 }