Rework signal handling

plugins/chain_api_plugin/chain_api_plugin.cpp

@@ -57,6 +57,7 @@ namespace {
       try {
          auto v = fc::json::from_string( body ).as<chain_apis::read_only::get_transaction_status_params>();
          if( v.id == transaction_id_type() ) throw false;
+         return v;
       } catch( ... ) {
          EOS_THROW(chain::invalid_http_request, "Invalid transaction id");
       }

plugins/chain_interface/include/eosio/chain/signals_processor.hpp

@@ -11,66 +11,60 @@ namespace eosio::chain {
 class signals_processor {
 public:
    using trx_deque = eosio::chain::deque< std::tuple< chain::transaction_trace_ptr, packed_transaction_ptr > >;
-   using applied_transaction_func = std::function< void ( const trx_deque&, const chain::block_state_ptr& ) >;
-   using irreversible_block_func = std::function< void ( const chain::block_state_ptr& ) >;
-   using block_start_func = std::function< void ( uint32_t block_num ) >;
+   using irreversible_block_func     = std::function< void ( const chain::block_state_ptr& ) >;
+   using block_start_func            = std::function< void ( uint32_t block_num ) >;
+   using accepted_block_func         = std::function< void ( const chain::block_state_ptr& ) >;
+   using applied_transaction_func    = std::function< void ( const chain::transaction_trace_ptr&, const packed_transaction_ptr& ) >;
 
    /**
     * Class for tracking transactions and which block they belong to.
     */
    signals_processor() {
    }
 
-   void register_callbacks(applied_transaction_func at, irreversible_block_func ib, block_start_func bs) {
-      _callbacks.emplace_back(at, ib, bs);
+   void register_callbacks(irreversible_block_func ib, block_start_func bs, accepted_block_func ab, applied_transaction_func at) {
+      _callbacks.emplace_back(ib, bs, ab, at);
    }
 
    /// connect to chain controller applied_transaction signal
    void signal_applied_transaction( const chain::transaction_trace_ptr& trace, const chain::packed_transaction_ptr& ptrx ) {
-      _trxs.emplace_back(trace, ptrx);
+         for(auto& callback : _callbacks) {
+            try {
+               std::get<applied_transaction_func>(callback)(trace, ptrx);
+            } FC_LOG_AND_DROP(("Failed to pass applied transaction to callback"));
+         }
    }
 
    /// connect to chain controller accepted_block signal
    void signal_accepted_block( const chain::block_state_ptr& bsp ) {
-      push_transactions(bsp);
-      _block_started = false;
+         for(auto& callback : _callbacks) {
+            try {
+               std::get<2>(callback)(bsp);
+            } FC_LOG_AND_DROP(("Failed to pass accepted block to callback"));
+         }
    }
 
    /// connect to chain controller irreversible_block signal
    void signal_irreversible_block( const chain::block_state_ptr& bsp ) {
       for(auto& callback : _callbacks) {
          try {
-            std::get<1>(callback)(bsp);
+            std::get<0>(callback)(bsp);
          } FC_LOG_AND_DROP(("Failed to pass irreversible block to callback"));
       }
    }
 
 
    /// connect to chain controller block_start signal
    void signal_block_start( uint32_t block_num ) {
-      if (_block_started) {
-         push_transactions(chain::block_state_ptr{});
-      }
-      _block_started = true;
       for(auto& callback : _callbacks) {
          try {
-            std::get<2>(callback)(block_num);
+            std::get<block_start_func>(callback)(block_num);
          } FC_LOG_AND_DROP(("Failed to pass block start to callback"));
       }
    }
 
 private:
-   void push_transactions( const chain::block_state_ptr& bsp ) {
-      for(auto& callback : _callbacks) {
-         try {
-            std::get<0>(callback)(_trxs, bsp);
-         } FC_LOG_AND_DROP(("Failed to pass all transactions and block state to callback"));
-      }
-      _trxs.clear();
-   }
-   trx_deque _trxs;
-   eosio::chain::vector< std::tuple< applied_transaction_func, irreversible_block_func, block_start_func > > _callbacks;
-   bool _block_started = false;
+   eosio::chain::vector< std::tuple< irreversible_block_func, block_start_func, accepted_block_func, applied_transaction_func > > _callbacks;
 };
 
 } // eosio::chain

plugins/chain_plugin/chain_plugin.cpp

@@ -791,14 +791,17 @@ void chain_plugin::plugin_initialize(const variables_map& options) {
          my->_trx_signals_processor.emplace();
          if (my->_trx_finality_status_processing) {
             my->_trx_signals_processor->register_callbacks(
-               [this]( const chain::signals_processor::trx_deque& trxs, const chain::block_state_ptr& blk ) {
-                  my->_trx_finality_status_processing->signal_applied_transactions(trxs, blk);
-               },
                [this]( const chain::block_state_ptr& blk ) {
                   my->_trx_finality_status_processing->signal_irreversible_block(blk);
                },
                [this]( uint32_t block_num ) {
                   my->_trx_finality_status_processing->signal_block_start(block_num);
+               },
+               [this]( const chain::block_state_ptr& blk ) {
+                  my->_trx_finality_status_processing->signal_accepted_block(blk);
+               },
+               [this]( const chain::transaction_trace_ptr& trace, const chain::packed_transaction_ptr& ptrx ) {
+                  my->_trx_finality_status_processing->signal_applied_transaction(trace, ptrx);
                }
             );
          }
@@ -1445,13 +1448,15 @@ read_only::get_transaction_status_results read_only::get_transaction_status(cons
 
    trx_finality_status_processing::chain_state ch_state = trx_finality_status_proc->get_chain_state();
 
-   auto trx_st = trx_finality_status_proc->get_trx_state(param.id);
+   const auto trx_st = trx_finality_status_proc->get_trx_state(param.id);
+   // check if block_id is set to a valid value, since trx_finality_status_proc does not use optionals for the block data
+   const auto trx_block_valid = trx_st && trx_st->block_id != chain::block_id_type{};
 
    return {
       trx_st ? trx_st->status : "UNKNOWN",
-      trx_st ? std::optional<uint32_t>(chain::block_header::num_from_id(trx_st->block_id)) : std::optional<uint32_t>{},
-      trx_st ? std::optional<chain::block_id_type>(trx_st->block_id) : std::optional<chain::block_id_type>{},
-      trx_st ? std::optional<fc::time_point>(trx_st->block_timestamp) : std::optional<fc::time_point>{},
+      trx_block_valid ? std::optional<uint32_t>(chain::block_header::num_from_id(trx_st->block_id)) : std::optional<uint32_t>{},
+      trx_block_valid ? std::optional<chain::block_id_type>(trx_st->block_id) : std::optional<chain::block_id_type>{},
+      trx_block_valid ? std::optional<fc::time_point>(trx_st->block_timestamp) : std::optional<fc::time_point>{},
       trx_st ? std::optional<fc::time_point_sec>(trx_st->expiration) : std::optional<fc::time_point_sec>{},
       chain::block_header::num_from_id(ch_state.head_id),
       ch_state.head_id,

plugins/chain_plugin/include/eosio/chain_plugin/trx_finality_status_processing.hpp

@@ -41,7 +41,9 @@ namespace eosio::chain_apis {
 
       ~trx_finality_status_processing();
 
-      void signal_applied_transactions( const chain::signals_processor::trx_deque& trxs, const chain::block_state_ptr& bsp );
+      void signal_applied_transaction( const chain::transaction_trace_ptr& trace, const chain::packed_transaction_ptr& ptrx );
+
+      void signal_accepted_block( const chain::block_state_ptr& bsp );
 
       void signal_irreversible_block( const chain::block_state_ptr& bsp );
 

plugins/chain_plugin/test/CMakeLists.txt

@@ -4,12 +4,6 @@ target_link_libraries( test_account_query_db chain_plugin eosio_testing)
 
 add_test(NAME test_account_query_db COMMAND plugins/chain_plugin/test/test_account_query_db WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
-add_executable( test_signals_processor test_signals_processor.cpp )
-
-target_link_libraries( test_signals_processor chain_plugin eosio_testing)
-
-add_test(NAME test_signals_processor COMMAND plugins/chain_plugin/test/test_signals_processor WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-
 add_executable( test_trx_retry_db test_trx_retry_db.cpp )
 
 target_link_libraries( test_trx_retry_db chain_plugin eosio_testing)