Merge pull request #53 from deertacos/internal_node_error

Fix internal node error
jprjr · Feb 11, 2018 · f448b0d · f448b0d
2 parents c1919b4 + 1af3f4e
commit f448b0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/CryptoNoteCore/BlockchainCache.cpp b/src/CryptoNoteCore/BlockchainCache.cpp
@@ -541,8 +541,12 @@ uint32_t BlockchainCache::getTimestampLowerBoundBlockIndex(uint64_t timestamp) c
     return 0;
   }
 
-  uint32_t blockIndex = parent->getTimestampLowerBoundBlockIndex(timestamp);
-  return blockIndex == INVALID_BLOCK_INDEX ? blockIndex : startIndex;
+  try {
+    return parent->getTimestampLowerBoundBlockIndex(timestamp);
+  } catch (std::runtime_error&) {
+    // parent didn't have the block, so index.front() must be the block we're looking for
+    return startIndex;
+  }
 }
 
 bool BlockchainCache::getTransactionGlobalIndexes(const Crypto::Hash& transactionHash,

diff --git a/src/CryptoNoteCore/Core.cpp b/src/CryptoNoteCore/Core.cpp
@@ -450,8 +450,8 @@ bool Core::queryBlocksLite(const std::vector<Crypto::Hash>& knownBlockHashes, ui
     fillQueryBlockShortInfo(fullOffset, currentIndex, BLOCKS_SYNCHRONIZING_DEFAULT_COUNT, entries);
 
     return true;
-  } catch (std::exception&) {
-    // TODO log
+  } catch (std::exception& e) {
+	logger(Logging::ERROR) << "Failed to query blocks: " << e.what();
     return false;
   }
 }