Merge pull request #8158 from EOSIO/net-plugin-trx-calc

transactions in progress
EOSIO · Nov 5, 2019 · 806c7ee · 806c7ee
2 parents 6569702 + 96f3289
commit 806c7ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp b/libraries/chain/include/eosio/chain/unapplied_transaction_queue.hpp
@@ -129,7 +129,6 @@ class unapplied_transaction_queue {
                                         ("id", itr->id())("e", itr->trx_meta->packed_trx()->expiration())
                                         ("bt", pending_block_time) ) ) ) );
          }
-
          removed( itr );
          persisted_by_expiry.erase( itr );
       }
@@ -146,6 +145,10 @@ class unapplied_transaction_queue {
             if( itr != queue.get<by_trx_id>().end() ) {
                if( itr->trx_type != trx_enum_type::persisted &&
                    itr->trx_type != trx_enum_type::incoming_persisted ) {
+                  if( itr->next ) {
+                     itr->next( std::static_pointer_cast<fc::exception>( std::make_shared<tx_duplicate>(
+                                   FC_LOG_MESSAGE( info, "duplicate transaction ${id}", ("id", itr->trx_meta->id())))));
+                  }
                   removed( itr );
                   idx.erase( itr );
                }
@@ -221,6 +224,7 @@ class unapplied_transaction_queue {
    iterator incoming_begin() { return queue.get<by_type>().lower_bound( trx_enum_type::incoming_persisted ); }
    iterator incoming_end() { return queue.get<by_type>().end(); } // if changed to upper_bound, verify usage performance
 
+   /// caller's responsibilty to call next() if applicable
    iterator erase( iterator itr ) {
       removed( itr );
       return queue.get<by_type>().erase( itr );

diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp
@@ -1595,12 +1595,14 @@ bool producer_plugin_impl::process_unapplied_trxs( const fc::time_point& deadlin
                } else {
                   // this failed our configured maximum transaction time, we don't want to replay it
                   ++num_failed;
+                  if( itr->next ) itr->next( trace );
                   itr = _unapplied_transactions.erase( itr );
                   continue;
                }
             } else {
                ++num_applied;
                if( itr->trx_type != trx_enum_type::persisted ) {
+                  if( itr->next ) itr->next( trace );
                   itr = _unapplied_transactions.erase( itr );
                   continue;
                }