Rebroadcast the mem pool every 3-6 blocks steemit#1661

smartree · Oct 16, 2017 · b5117f9 · b5117f9
1 parent 12d90a0
commit b5117f9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp
@@ -83,6 +83,8 @@ namespace detail {
    class application_impl : public graphene::net::node_delegate
    {
    public:
+      uint32_t _next_rebroadcast = -1;
+      boost::signals2::connection _rebroadcast_con;
       fc::optional<fc::temp_file> _lock_file;
       bool _is_block_producer = false;
       bool _force_validate = false;
@@ -234,6 +236,18 @@ namespace detail {
          c->set_session_data( session );
       }
 
+      void rebroadcast_pending_tx()
+      {
+         if( _chain_db->head_block_num() >= _next_rebroadcast )
+         {
+            _next_rebroadcast += 3 + ( rand() % 4 ); // Every 3-6 blocks, rebroadcast. Do this randomly to prevent simultaneous p2p spam.
+            for( const auto& trx : _chain_db->_pending_tx )
+            {
+                  _p2p_network->broadcast( graphene::net::trx_message( trx ) );
+            }
+         }
+      }
+
       application_impl(application* self)
          : _self(self),
            //_pending_trx_db(std::make_shared<graphene::db::object_database>()),
@@ -351,6 +365,9 @@ namespace detail {
          }
          _chain_db->show_free_memory( true );
 
+         _next_rebroadcast = _chain_db->head_block_num() + 3 + rand() % 4;
+         _rebroadcast_con = _chain_db->applied_block.connect( [&]( const signed_block& b ){ rebroadcast_pending_tx(); } );
+
          if( _options->count("api-user") )
          {
             for( const std::string& api_access_str : _options->at("api-user").as< std::vector<std::string> >() )

diff --git a/libraries/chain/include/steemit/chain/database.hpp b/libraries/chain/include/steemit/chain/database.hpp
@@ -375,7 +375,7 @@ namespace steemit { namespace chain {
          /** when popping a block, the transactions that were removed get cached here so they
           * can be reapplied at the proper time */
          std::deque< signed_transaction >       _popped_tx;
-
+         vector< signed_transaction >           _pending_tx;
 
          bool apply_order( const limit_order_object& new_order_object );
          bool fill_order( const limit_order_object& order, const asset& pays, const asset& receives );
@@ -450,7 +450,6 @@ namespace steemit { namespace chain {
 
          std::unique_ptr< database_impl > _my;
 
-         vector< signed_transaction >  _pending_tx;
          fork_database                 _fork_db;
          fc::time_point_sec            _hardfork_times[ STEEMIT_NUM_HARDFORKS + 1 ];
          protocol::hardfork_version    _hardfork_versions[ STEEMIT_NUM_HARDFORKS + 1 ];