From 70f4ff4fb36c5136061b7ce5f731ba37463f7309 Mon Sep 17 00:00:00 2001 From: kennycud Date: Sat, 11 Jan 2025 18:20:28 -0800 Subject: [PATCH] ignore level for reward share feature hard fork --- src/main/java/org/qortal/account/Account.java | 14 +++++++++++++- src/main/java/org/qortal/block/BlockChain.java | 7 ++++++- src/main/resources/blockchain.json | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/qortal/account/Account.java b/src/main/java/org/qortal/account/Account.java index 99fa5217..856b79ef 100644 --- a/src/main/java/org/qortal/account/Account.java +++ b/src/main/java/org/qortal/account/Account.java @@ -216,7 +216,16 @@ public class Account { String myAddress = accountData.getAddress(); int blockchainHeight = this.repository.getBlockRepository().getBlockchainHeight(); - int levelToMint = BlockChain.getInstance().getMinAccountLevelToMint(); + + int levelToMint; + + if( blockchainHeight >= BlockChain.getInstance().getIgnoreLevelForRewardShareHeight() ) { + levelToMint = 0; + } + else { + levelToMint = BlockChain.getInstance().getMinAccountLevelToMint(); + } + int level = accountData.getLevel(); int groupIdToMint = BlockChain.getInstance().getMintingGroupId(); int nameCheckHeight = BlockChain.getInstance().getOnlyMintWithNameHeight(); @@ -306,6 +315,9 @@ public class Account { if (Account.isFounder(accountData.getFlags()) && accountData.getBlocksMintedPenalty() == 0) return true; + if( this.repository.getBlockRepository().getBlockchainHeight() >= BlockChain.getInstance().getIgnoreLevelForRewardShareHeight() ) + return true; + return false; } diff --git a/src/main/java/org/qortal/block/BlockChain.java b/src/main/java/org/qortal/block/BlockChain.java index 42da0b3a..358874c5 100644 --- a/src/main/java/org/qortal/block/BlockChain.java +++ b/src/main/java/org/qortal/block/BlockChain.java @@ -91,7 +91,8 @@ public class BlockChain { fixBatchRewardHeight, adminsReplaceFoundersHeight, onlineValidationFailSafeHeight, - nullGroupMembershipHeight + nullGroupMembershipHeight, + ignoreLevelForRewardShareHeight } // Custom transaction fees @@ -677,6 +678,10 @@ public class BlockChain { return this.featureTriggers.get(FeatureTrigger.nullGroupMembershipHeight.name()).intValue(); } + public int getIgnoreLevelForRewardShareHeight() { + return this.featureTriggers.get(FeatureTrigger.ignoreLevelForRewardShareHeight.name()).intValue(); + } + // More complex getters for aspects that change by height or timestamp public long getRewardAtHeight(int ourHeight) { diff --git a/src/main/resources/blockchain.json b/src/main/resources/blockchain.json index ec27efd4..2cbacd97 100644 --- a/src/main/resources/blockchain.json +++ b/src/main/resources/blockchain.json @@ -116,7 +116,8 @@ "fixBatchRewardHeight": 1945900, "adminsReplaceFoundersHeight": 9999999, "onlineValidationFailSafeHeight": 9999999, - "nullGroupMembershipHeight": 9999999 + "nullGroupMembershipHeight": 9999999, + "ignoreLevelForRewardShareHeight": 9999999 }, "checkpoints": [ { "height": 1136300, "signature": "3BbwawEF2uN8Ni5ofpJXkukoU8ctAPxYoFB7whq9pKfBnjfZcpfEJT4R95NvBDoTP8WDyWvsUvbfHbcr9qSZuYpSKZjUQTvdFf6eqznHGEwhZApWfvXu6zjGCxYCp65F4jsVYYJjkzbjmkCg5WAwN5voudngA23kMK6PpTNygapCzXt" }