GH-789 Do not allow sync ahead until blocks are in the forkdb to eval…

…uate correctly.
AntelopeIO · Sep 23, 2024 · 41df1c5 · 41df1c5
1 parent 52f5026
commit 41df1c5
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -2192,13 +2192,15 @@ namespace eosio {
          controller& cc = my_impl->chain_plug->chain();
          if (cc.get_read_mode() == db_read_mode::IRREVERSIBLE) {
             auto forkdb_head = cc.fork_db_head();
-            auto calculated_lib = forkdb_head.irreversible_blocknum();
-            auto num_blocks_that_can_be_applied = calculated_lib > head_num ? calculated_lib - head_num : 0;
-            if (num_blocks_that_can_be_applied < sync_fetch_span) {
-               if (head_num )
-               fc_ilog(logger, "sync ahead allowed past sync-fetch-span ${sp}, block ${bn} for paused LIB ${l}, chain_lib ${cl}, forkdb size ${s}",
-                       ("bn", blk_num)("sp", sync_fetch_span)("l", calculated_lib)("cl", head_num)("s", cc.fork_db_size()));
-               return true;
+            if (forkdb_head.block_num() >= blk_num) {
+               auto calculated_lib = forkdb_head.irreversible_blocknum();
+               auto num_blocks_that_can_be_applied = calculated_lib > head_num ? calculated_lib - head_num : 0;
+               if (num_blocks_that_can_be_applied < sync_fetch_span) {
+                  if (head_num )
+                     fc_ilog(logger, "sync ahead allowed past sync-fetch-span ${sp}, block ${bn} for paused LIB ${l}, chain_lib ${cl}, forkdb size ${s}",
+                             ("bn", blk_num)("sp", sync_fetch_span)("l", calculated_lib)("cl", head_num)("s", cc.fork_db_size()));
+                  return true;
+               }
             }
          }