GH-239 Only reject blocks from the future on BP nodes

AntelopeIO · Nov 15, 2024 · 913e094 · 913e094
1 parent be54b82
commit 913e094
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libraries/chain/include/eosio/chain/controller.hpp b/libraries/chain/include/eosio/chain/controller.hpp
@@ -476,7 +476,7 @@ namespace eosio::chain {
       void replace_account_keys( name account, name permission, const public_key_type& key );
 
       void set_producer_node(bool is_producer_node);
-      bool is_producer_node()const;
+      bool is_producer_node()const; // thread safe, set at program initialization
 
       void set_db_read_only_mode();
       void unset_db_read_only_mode();

diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -3716,8 +3716,10 @@ namespace eosio {
          bool unlinkable = false;
          sync_manager::closing_mode close_mode = sync_manager::closing_mode::immediately;
          try {
-            EOS_ASSERT(ptr->timestamp < (fc::time_point::now() + fc::seconds(7)), block_from_the_future,
-                       "received a block from the future, rejecting it: ${id}", ("id", id));
+            if (cc.is_producer_node()) {
+               EOS_ASSERT(ptr->timestamp < (fc::time_point::now() + fc::seconds(7)), block_from_the_future,
+                          "received a block from the future, rejecting it: ${id}", ("id", id));
+            }
             // this will return empty optional<block_handle> if block is not linkable
             controller::accepted_block_result abh = cc.accept_block( id, ptr );
             best_head = abh.is_new_best_head;