Merge pull request #7949 from EOSIO/unknown-block-exception-1.8

net_plugin correctly handle unknown_block_exception - 1.8
michaeljyeates · Sep 18, 2019 · 6d8f9b7 · 6d8f9b7
2 parents c4db4a5 + 58fee31
commit 6d8f9b7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -1502,7 +1502,11 @@ namespace eosio {
             c->enqueue( note );
          }
          c->syncing = true;
-         if( cc.get_block_id_for_num( msg.head_num ) != msg.head_id ) {
+         bool on_fork = true;
+         try {
+            on_fork = cc.get_block_id_for_num( msg.head_num ) != msg.head_id;
+         } catch( ... ) {}
+         if( on_fork ) {
             request_message req;
             req.req_blocks.mode = catch_up;
             req.req_trx.mode = none;