BlockChain.java additions for onlineAccountMinterLevelValidationHeight, which were missing from commit 68a0923

2022-11-26 11:55:27 +00:00 · 2022-11-26 11:55:27 +00:00 · 9c3a4d6e37
commit 9c3a4d6e37
parent 1c8a6ce204
14 changed files with 32 additions and 14 deletions
--- a/src/main/java/org/qortal/block/BlockChain.java
+++ b/src/main/java/org/qortal/block/BlockChain.java
@ -74,7 +74,8 @@ public class BlockChain {
 		transactionV5Timestamp,
 		transactionV6Timestamp,
 		disableReferenceTimestamp,
-		increaseOnlineAccountsDifficultyTimestamp;
+		increaseOnlineAccountsDifficultyTimestamp,
+		onlineAccountMinterLevelValidationHeight,
 	}

 	// Custom transaction fees
@ -483,6 +484,10 @@ public class BlockChain {
 		return this.featureTriggers.get(FeatureTrigger.increaseOnlineAccountsDifficultyTimestamp.name()).longValue();
 	}

+	public long getOnlineAccountMinterLevelValidationHeight() {
+		return this.featureTriggers.get(FeatureTrigger.onlineAccountMinterLevelValidationHeight.name()).intValue();
+	}
+

 	// More complex getters for aspects that change by height or timestamp

--- a/src/main/resources/blockchain.json
+++ b/src/main/resources/blockchain.json
@ -80,7 +80,8 @@
 		"transactionV5Timestamp": 1642176000000,
 		"transactionV6Timestamp": 9999999999999,
 		"disableReferenceTimestamp": 1655222400000,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-block-timestamps.json
+++ b/src/test/resources/test-chain-v2-block-timestamps.json
@ -70,7 +70,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 9999999999999,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-disable-reference.json
+++ b/src/test/resources/test-chain-v2-disable-reference.json
@ -73,7 +73,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 0,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-founder-rewards.json
+++ b/src/test/resources/test-chain-v2-founder-rewards.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-leftover-reward.json
+++ b/src/test/resources/test-chain-v2-leftover-reward.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-minting.json
+++ b/src/test/resources/test-chain-v2-minting.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder-extremes.json
+++ b/src/test/resources/test-chain-v2-qora-holder-extremes.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder-reduction.json
+++ b/src/test/resources/test-chain-v2-qora-holder-reduction.json
@ -75,7 +75,8 @@
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
 		"aggregateSignatureTimestamp": 0,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-qora-holder.json
+++ b/src/test/resources/test-chain-v2-qora-holder.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-levels.json
+++ b/src/test/resources/test-chain-v2-reward-levels.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-scaling.json
+++ b/src/test/resources/test-chain-v2-reward-scaling.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2-reward-shares.json
+++ b/src/test/resources/test-chain-v2-reward-shares.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,
--- a/src/test/resources/test-chain-v2.json
+++ b/src/test/resources/test-chain-v2.json
@ -74,7 +74,8 @@
 		"transactionV5Timestamp": 0,
 		"transactionV6Timestamp": 0,
 		"disableReferenceTimestamp": 9999999999999,
-		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999
+		"increaseOnlineAccountsDifficultyTimestamp": 9999999999999,
+		"onlineAccountMinterLevelValidationHeight": 0,
 	},
 	"genesisInfo": {
 		"version": 4,