AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Changed error response from RewardShareTransaction.isValid() for existing self-shares.

Browse Source 
Before:
0-fee self-share REWARD_SHARE when there is an existing self-share would result in
INSUFFICIENT_FEE from isFeeValid()

After:
isFeeValid() returns OK for above, but isValid() returns SELF_SHARE_EXISTS.

In addition, a transaction that tries to modify existing self-share, even with fee,
also returns SELF_SHARE_EXISTS.

Improved tests to double check.
This commit is contained in:
catbref 2020-02-18 13:23:42 +00:00
parent a4e127c84a
commit 282f6e6e2a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/qortal/transaction/RewardShareTransaction.java
View File

@ -102,9 +102,10 @@ public class RewardShareTransaction extends Transaction {
return ValidationResult.INVALID_PUBLIC_KEY;
final boolean isRecipientAlsoMinter = getCreator().getAddress().equals(this.rewardShareTransactionData.getRecipient());
final boolean isCancellingSharePercent = this.rewardShareTransactionData.getSharePercent().compareTo(BigDecimal.ZERO) < 0;
// Fee can be zero if setting up new self-share
if (isRecipientAlsoMinter && existingRewardShareData == null && this.transactionData.getFee().compareTo(BigDecimal.ZERO) >= 0)
// Fee can be zero if self-share, and not cancelling
if (isRecipientAlsoMinter && !isCancellingSharePercent && this.transactionData.getFee().compareTo(BigDecimal.ZERO) >= 0)
return ValidationResult.OK;
return super.isFeeValid();
@ -161,7 +162,7 @@ public class RewardShareTransaction extends Transaction {
// Modifying an existing self-share is pointless and forbidden (due to 0 fee). Deleting self-share is OK though.
if (isRecipientAlsoMinter && !isCancellingSharePercent)
return ValidationResult.INVALID_REWARD_SHARE_PERCENT;
return ValidationResult.SELF_SHARE_EXISTS;
}
// Fee checking needed if not setting up new self-share

1
src/main/java/org/qortal/transaction/Transaction.java
View File

@ -240,6 +240,7 @@ public abstract class Transaction {
CLOCK_NOT_SYNCED(88),
ASSET_NOT_SPENDABLE(89),
ACCOUNT_CANNOT_REWARD_SHARE(90),
SELF_SHARE_EXISTS(91),
NOT_YET_RELEASED(1000);
public final int value;

9
src/test/java/org/qortal/test/minting/RewardShareTests.java
View File

@ -168,9 +168,14 @@ public class RewardShareTests extends Common {
newTransactionData = AccountUtils.createRewardShare(repository, testAccountName, testAccountName, CANCEL_SHARE_PERCENT);
newTransaction = Transaction.fromData(repository, newTransactionData);
// Confirm terminating reward-share is valid
// Confirm terminating reward-share with fee is valid
validationResult = newTransaction.isValidUnconfirmed();
assertEquals("Subsequent zero-fee self-share should be invalid", ValidationResult.OK, validationResult);
assertEquals("Subsequent self-share cancel should be valid", ValidationResult.OK, validationResult);
// Confirm terminating reward-share with zero fee is invalid
newTransactionData.setFee(BigDecimal.ZERO);
validationResult = newTransaction.isValidUnconfirmed();
assertNotSame("Subsequent zero-fee self-share cancel should be invalid", ValidationResult.OK, validationResult);
}
}