Throttling of expired transactions

Author: otsybizov

src/catapult/chain/ChainResults.h

@@ -43,6 +43,9 @@ namespace catapult { namespace chain {
 	/// Validation failed because the unconfirmed cache is too full.
 	DEFINE_CHAIN_RESULT(Unconfirmed_Cache_Too_Full, 201);
 
+	/// Validation failed because the transaction is expired.
+	DEFINE_CHAIN_RESULT(Transaction_Expired, 202);
+
 #ifndef CUSTOM_RESULT_DEFINITION
 }}
 #endif

src/catapult/chain/UtUpdater.cpp

@@ -171,6 +171,12 @@ namespace catapult { namespace chain {
 				const auto& entity = *utInfo.pEntity;
 				const auto& entityHash = utInfo.EntityHash;
 
+				if (entity.Deadline <= currentTime) {
+					CATAPULT_LOG(warning) << "dropping transaction " << entityHash << " " << entity.Type << " due to expiration";
+					applyState.FailureTransactions.emplace_back(FailureInfo{ entity, entityHash, effectiveHeight, Failure_Chain_Transaction_Expired });
+					continue;
+				}
+
 				if (!filter(utInfo))
 					continue;
 
@@ -184,15 +190,15 @@ namespace catapult { namespace chain {
 					// don't log reverted transactions that could have been included by harvester with lower min fee multiplier
 					if (TransactionSource::New == transactionSource) {
 						CATAPULT_LOG(debug)
-								<< "dropping transaction " << entityHash << " with max fee " << entity.MaxFee
+								<< "dropping transaction " << entityHash << " " << entity.Type << " with max fee " << entity.MaxFee
 								<< " because min fee is " << minTransactionFee;
 					}
 
 					continue;
 				}
 
 				if (throttle(utInfo, transactionSource, applyState, readOnlyCache)) {
-					CATAPULT_LOG(warning) << "dropping transaction " << entityHash << " due to throttle";
+					CATAPULT_LOG(warning) << "dropping transaction " << entityHash << " " << entity.Type << " due to throttle";
 					applyState.FailureTransactions.emplace_back(FailureInfo{ entity, entityHash, effectiveHeight, Failure_Chain_Unconfirmed_Cache_Too_Full });
 					continue;
 				}

tests/catapult/chain/UtUpdaterTests.cpp

@@ -365,10 +365,11 @@ namespace catapult { namespace chain {
 				ASSERT_EQ(failedIndexes.size(), m_failedTransactionStatuses.size());
 				for (auto i = 0u; i < failedIndexes.size(); ++i) {
 					auto failedIndex = failedIndexes[i].first;
+					auto timeOffset = Default_Time.unwrap() + 1;
 					auto message = "failed index " + std::to_string(failedIndex);
 					EXPECT_EQ(entityInfos[failedIndex].hash(), m_failedTransactionStatuses[i].Hash) << message;
 					EXPECT_EQ(failedIndexes[i].second, validators::ValidationResult(m_failedTransactionStatuses[i].Status)) << message;
-					EXPECT_EQ(Timestamp(failedIndex * failedIndex), m_failedTransactionStatuses[i].Deadline) << message;
+					EXPECT_EQ(Timestamp((timeOffset + failedIndex) * (timeOffset + failedIndex)), m_failedTransactionStatuses[i].Deadline) << message;
 				}
 			}
 
@@ -469,7 +470,8 @@ namespace catapult { namespace chain {
 
 		TransactionData CreateTransactionData(size_t count, size_t start = 0) {
 			TransactionData data;
-			data.UtInfos = test::CreateTransactionInfos(count, [start](auto i) { return Timestamp((i + start) * (i + start)); });
+			auto timeOffset = Default_Time.unwrap() + 1;
+			data.UtInfos = test::CreateTransactionInfos(count, [timeOffset, start](auto i) { return Timestamp((timeOffset + i + start) * (timeOffset + i + start)); });
 			data.Entities = test::ExtractEntities(data.UtInfos);
 			data.Hashes = test::ExtractHashes(data.UtInfos);
 			for (auto i = 0u; i < count; ++i)