diff --git a/src/main/java/org/qortal/block/BlockChain.java b/src/main/java/org/qortal/block/BlockChain.java index 6182bd1d..a2fa8804 100644 --- a/src/main/java/org/qortal/block/BlockChain.java +++ b/src/main/java/org/qortal/block/BlockChain.java @@ -76,7 +76,8 @@ public class BlockChain { disableReferenceTimestamp, increaseOnlineAccountsDifficultyTimestamp, onlineAccountMinterLevelValidationHeight, - selfSponsorshipAlgoV1Height; + selfSponsorshipAlgoV1Height, + feeValidationFixTimestamp; } // Custom transaction fees @@ -501,6 +502,10 @@ public class BlockChain { return this.featureTriggers.get(FeatureTrigger.onlineAccountMinterLevelValidationHeight.name()).intValue(); } + public long getFeeValidationFixTimestamp() { + return this.featureTriggers.get(FeatureTrigger.feeValidationFixTimestamp.name()).longValue(); + } + // More complex getters for aspects that change by height or timestamp diff --git a/src/main/java/org/qortal/transaction/RewardShareTransaction.java b/src/main/java/org/qortal/transaction/RewardShareTransaction.java index 3b9a251e..d4d2434c 100644 --- a/src/main/java/org/qortal/transaction/RewardShareTransaction.java +++ b/src/main/java/org/qortal/transaction/RewardShareTransaction.java @@ -164,8 +164,13 @@ public class RewardShareTransaction extends Transaction { } // Check creator has enough funds - if (creator.getConfirmedBalance(Asset.QORT) < this.rewardShareTransactionData.getFee()) - return ValidationResult.NO_BALANCE; + if (this.rewardShareTransactionData.getTimestamp() >= BlockChain.getInstance().getFeeValidationFixTimestamp()) + if (creator.getConfirmedBalance(Asset.QORT) < this.rewardShareTransactionData.getFee()) + return ValidationResult.NO_BALANCE; + + else if (!(isRecipientAlsoMinter && existingRewardShareData == null)) + if (creator.getConfirmedBalance(Asset.QORT) < this.rewardShareTransactionData.getFee()) + return ValidationResult.NO_BALANCE; return ValidationResult.OK; } diff --git a/src/main/resources/blockchain.json b/src/main/resources/blockchain.json index 7e4497fe..3969e944 100644 --- a/src/main/resources/blockchain.json +++ b/src/main/resources/blockchain.json @@ -83,7 +83,8 @@ "disableReferenceTimestamp": 1655222400000, "increaseOnlineAccountsDifficultyTimestamp": 9999999999999, "onlineAccountMinterLevelValidationHeight": 1092000, - "selfSponsorshipAlgoV1Height": 1092400 + "selfSponsorshipAlgoV1Height": 1092400, + "feeValidationFixTimestamp": 1671918000000 }, "genesisInfo": { "version": 4,