From cfacddcb36577f41d22a290088b5e1d1f3556d6d Mon Sep 17 00:00:00 2001
From: catbref <misc-github@talk2dom.com>
Date: Fri, 27 Nov 2020 18:05:03 +0000
Subject: [PATCH] Change Controller.deleteExpiredTransactions to use
 Transaction-subclass .getDeadline() instance method call instead of static
 Transaction.getDeadline(transactionData) which allows Transaction subclasses
 to override with custom deadlines/expiry periods

---
 src/main/java/org/qortal/controller/Controller.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java
index 77f20caf..d9486392 100644
--- a/src/main/java/org/qortal/controller/Controller.java
+++ b/src/main/java/org/qortal/controller/Controller.java
@@ -799,11 +799,14 @@ public class Controller extends Thread {
 
 			List<TransactionData> transactions = repository.getTransactionRepository().getUnconfirmedTransactions();
 
-			for (TransactionData transactionData : transactions)
-				if (now >= Transaction.getDeadline(transactionData)) {
-					LOGGER.info(String.format("Deleting expired, unconfirmed transaction %s", Base58.encode(transactionData.getSignature())));
+			for (TransactionData transactionData : transactions) {
+				Transaction transaction = Transaction.fromData(repository, transactionData);
+
+				if (now >= transaction.getDeadline()) {
+					LOGGER.info(() -> String.format("Deleting expired, unconfirmed transaction %s", Base58.encode(transactionData.getSignature())));
 					repository.getTransactionRepository().delete(transactionData);
 				}
+			}
 
 			repository.saveChanges();
 		} catch (DataException e) {