From c73cdefe6f5023814697de53b46c70d5539e15d9 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sun, 30 Jan 2022 13:47:20 +0000
Subject: [PATCH] transactionV5Timestamp moved to blockchain.json

---
 src/main/java/org/qortal/block/BlockChain.java        | 7 ++++++-
 src/main/java/org/qortal/transaction/Transaction.java | 2 +-
 src/main/resources/blockchain.json                    | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/qortal/block/BlockChain.java b/src/main/java/org/qortal/block/BlockChain.java
index 1ba65930..defa9120 100644
--- a/src/main/java/org/qortal/block/BlockChain.java
+++ b/src/main/java/org/qortal/block/BlockChain.java
@@ -68,7 +68,8 @@ public class BlockChain {
 		atFindNextTransactionFix,
 		newBlockSigHeight,
 		shareBinFix,
-		calcChainWeightTimestamp;
+		calcChainWeightTimestamp,
+		transactionV5Timestamp;
 	}
 
 	/** Map of which blockchain features are enabled when (height/timestamp) */
@@ -391,6 +392,10 @@ public class BlockChain {
 		return this.featureTriggers.get(FeatureTrigger.calcChainWeightTimestamp.name()).longValue();
 	}
 
+	public long getTransactionV5Timestamp() {
+		return this.featureTriggers.get(FeatureTrigger.transactionV5Timestamp.name()).longValue();
+	}
+
 	// More complex getters for aspects that change by height or timestamp
 
 	public long getRewardAtHeight(int ourHeight) {
diff --git a/src/main/java/org/qortal/transaction/Transaction.java b/src/main/java/org/qortal/transaction/Transaction.java
index 74619013..79a6478b 100644
--- a/src/main/java/org/qortal/transaction/Transaction.java
+++ b/src/main/java/org/qortal/transaction/Transaction.java
@@ -393,7 +393,7 @@ public abstract class Transaction {
 	 * @return transaction version number
 	 */
 	public static int getVersionByTimestamp(long timestamp) {
-		if (timestamp >= 1642176000000L) {
+		if (timestamp >= BlockChain.getInstance().getTransactionV5Timestamp()) {
 			return 5;
 		}
 		return 4;
diff --git a/src/main/resources/blockchain.json b/src/main/resources/blockchain.json
index 742dd2f9..4df3f09a 100644
--- a/src/main/resources/blockchain.json
+++ b/src/main/resources/blockchain.json
@@ -53,7 +53,8 @@
 		"atFindNextTransactionFix": 275000,
 		"newBlockSigHeight": 320000,
 		"shareBinFix": 399000,
-		"calcChainWeightTimestamp": 1620579600000
+		"calcChainWeightTimestamp": 1620579600000,
+		"transactionV5Timestamp": 1642176000000
 	},
 	"genesisInfo": {
 		"version": 4,