Merge pull request #2420 from Taraxa-project/missing_tip_fix

fix: dag missing tip
Taraxa-project · Mar 28, 2023 · f30d4f1 · f30d4f1
2 parents 5777eab + ace58d2
commit f30d4f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/libraries/core_libs/consensus/include/dag/dag_manager.hpp b/libraries/core_libs/consensus/include/dag/dag_manager.hpp
@@ -40,7 +40,8 @@ class DagManager : public std::enable_shared_from_this<DagManager> {
     ExpiredBlock,
     IncorrectTransactionsEstimation,
     BlockTooBig,
-    FailedTipsVerification
+    FailedTipsVerification,
+    MissingTip
   };
 
   explicit DagManager(const DagBlock &dag_genesis_block, addr_t node_addr, const SortitionConfig &sortition_config,

diff --git a/libraries/core_libs/consensus/src/dag/dag_manager.cpp b/libraries/core_libs/consensus/src/dag/dag_manager.cpp
@@ -675,7 +675,8 @@ DagManager::VerifyBlockReturnType DagManager::verifyBlock(const DagBlock &blk) {
     if ((blk.getTips().size() + 1) > kPbftGasLimit / getDagConfig().gas_limit) {
       for (const auto &t : blk.getTips()) {
         const auto tip_blk = getDagBlock(t);
-        assert(tip_blk);
+        LOG(log_er_) << "DAG Block " << block_hash << " tip " << t << " not present";
+        if (tip_blk == nullptr) return VerifyBlockReturnType::MissingTip;
         block_gas_estimation += tip_blk->getGasEstimation();
       }
       if (block_gas_estimation > kPbftGasLimit) {

diff --git a/libraries/core_libs/network/src/tarcap/packets_handlers/dag_block_packet_handler.cpp b/libraries/core_libs/network/src/tarcap/packets_handlers/dag_block_packet_handler.cpp
@@ -133,6 +133,16 @@ void DagBlockPacketHandler::onNewBlockReceived(DagBlock &&block, const std::shar
           }
         }
         break;
+      case DagManager::VerifyBlockReturnType::MissingTip:
+        if (peer->peer_dag_synced_) {
+          std::ostringstream err_msg;
+          err_msg << "DagBlock has missing tip";
+          throw MaliciousPeerException(err_msg.str());
+        } else {
+          // peer_dag_synced_ flag ensures that this can only be performed once for a peer
+          requestPendingDagBlocks(peer);
+        }
+        break;
       case DagManager::VerifyBlockReturnType::AheadBlock:
       case DagManager::VerifyBlockReturnType::FutureBlock:
         if (peer->peer_dag_synced_) {