Bug/1621 tx dropped silently when ctq full

libethcore/Common.h

@@ -127,7 +127,8 @@ enum class ImportResult {
     Malformed,
     SameNonceAlreadyInQueue,
     BadChain,
-    ZeroSignature
+    ZeroSignature,
+    QueueIsFull
 };
 
 struct ImportRequirements {

libethcore/Exceptions.h

@@ -88,6 +88,7 @@ DEV_SIMPLE_EXCEPTION( PreEIP155LegacyTransactionNotAllowed );
 DEV_SIMPLE_EXCEPTION( PreEIP155ReplayProtectionViolation );
 DEV_SIMPLE_EXCEPTION( PendingTransactionAlreadyExists );
 DEV_SIMPLE_EXCEPTION( TransactionAlreadyInChain );
+DEV_SIMPLE_EXCEPTION( TransactionQueueIsFull );
 DEV_SIMPLE_EXCEPTION( BlockNotFound );
 DEV_SIMPLE_EXCEPTION( UnknownParent );
 DEV_SIMPLE_EXCEPTION( AddressAlreadyUsed );

libethereum/Client.cpp

@@ -188,8 +188,7 @@ void Client::stopWorking() {
 
     m_signalled.notify_all();  // to wake up the thread from Client::doWork()
 
-    m_tq.HandleDestruction();  // l_sergiy: destroy transaction queue earlier
-    m_bq.stop();               // l_sergiy: added to stop block queue processing
+    m_bq.stop();  // l_sergiy: added to stop block queue processing
 
     m_bc.close();
     BOOST_LOG( m_loggerInfo ) << "Blockchain is closed";
@@ -724,11 +723,10 @@ void Client::onDeadBlocks( h256s const& _blocks, h256Hash& io_changed ) {
     for ( auto const& h : _blocks ) {
         BOOST_LOG( m_loggerTrace ) << "Dead block: " << h;
         for ( auto const& t : bc().transactions( h ) ) {
-            BOOST_LOG( m_loggerTrace ) << "Resubmitting dead-block transaction "
-                                       << Transaction( t, CheckTransaction::None );
-            BOOST_LOG( m_loggerTrace ) << "Resubmitting dead-block transaction "
-                                       << Transaction( t, CheckTransaction::None );
-            m_tq.import( t, IfDropped::Retry );
+            Transaction tx( t, CheckTransaction::None );
+            BOOST_LOG( m_loggerTrace ) << "Resubmitting dead-block transaction " << tx;
+            m_tq.import( tx, IfDropped::Retry, chainParams().isMultiTransactionModeEnabled(),
+                state().getNonce( tx.sender() ) );
         }
     }
 
@@ -772,7 +770,8 @@ void Client::restartMining() {
             for ( auto const& t : m_postSeal.pending() ) {
                 BOOST_LOG( m_loggerTrace ) << "Resubmitting post-seal transaction " << t;
                 //                      ctrace << "Resubmitting post-seal transaction " << t;
-                auto ir = m_tq.import( t, IfDropped::Retry );
+                auto ir = m_tq.import( t, IfDropped::Retry,
+                    chainParams().isMultiTransactionModeEnabled(), state().getNonce( t.sender() ) );
                 if ( ir != ImportResult::Success )
                     onTransactionQueueReady();
             }
@@ -950,7 +949,7 @@ void Client::sealUnconditionally( bool submitToBlockChain ) {
                  << ":TXRS:" << TransactionReceipt::howMany() << ":BLCKS:" << Block::howMany()
                  << ":ACCS:" << Account::howMany() << ":BQS:" << BlockQueue::howMany()
                  << ":BDS:" << BlockDetails::howMany() << ":TSS:" << TransactionSkeleton::howMany()
-                 << ":UTX:" << TransactionQueue::UnverifiedTransaction::howMany()
+                 << ":UTX:" << 0
                  << ":VTX:" << TransactionQueue::VerifiedTransaction::howMany()
                  << ":CMM:" << bc().getTotalCacheMemory()
                  << ":KDS:" << db::LevelDB::getKeyDeletesStats();
@@ -1224,13 +1223,9 @@ h256 Client::importTransaction( Transaction const& _t, TransactionBroadcast _txO
 #endif  // BITE
 
     ImportResult res;
-    if ( chainParams().isMultiTransactionModeEnabled() &&
-         state.getNonce( _t.sender() ) < _t.nonce() &&
-         m_tq.maxCurrentNonce( _t.sender() ) != _t.nonce() ) {
-        res = m_tq.import( _t, IfDropped::Ignore, true );
-    } else {
-        res = m_tq.import( _t );
-    }
+    auto stateNonce = state.getNonce( _t.sender() );
+    bool const allowFutureQueue = chainParams().isMultiTransactionModeEnabled();
+    res = m_tq.import( _t, IfDropped::Ignore, allowFutureQueue, stateNonce );
 
     switch ( res ) {
     case ImportResult::Success:
@@ -1243,6 +1238,8 @@ h256 Client::importTransaction( Transaction const& _t, TransactionBroadcast _txO
         BOOST_THROW_EXCEPTION( PendingTransactionAlreadyExists() );
     case ImportResult::AlreadyInChain:
         BOOST_THROW_EXCEPTION( TransactionAlreadyInChain() );
+    case ImportResult::QueueIsFull:
+        BOOST_THROW_EXCEPTION( TransactionQueueIsFull() );
     default:
         BOOST_THROW_EXCEPTION( UnknownTransactionValidationError() );
     }