crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Restrict TRANSFER_PRIVS recipients to new (non-existent) accounts.

Browse Source
This commit is contained in:
catbref 2020-03-04 15:41:47 +00:00
parent 450ff7318f
commit a3c44428d3
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
src/main/java/org/qortal/transaction/TransferPrivsTransaction.java
View File

@ -83,6 +83,10 @@ public class TransferPrivsTransaction extends Transaction {
if (!Crypto.isValidAddress(this.transferPrivsTransactionData.getRecipient())) if (!Crypto.isValidAddress(this.transferPrivsTransactionData.getRecipient()))
return ValidationResult.INVALID_ADDRESS; return ValidationResult.INVALID_ADDRESS;
// Check recipient is new account
if (this.repository.getAccountRepository().accountExists(this.transferPrivsTransactionData.getRecipient()))
return ValidationResult.ACCOUNT_ALREADY_EXISTS;
return ValidationResult.OK; return ValidationResult.OK;
} }
@ -183,8 +187,11 @@ public class TransferPrivsTransaction extends Transaction {
accountRepository.setFlags(senderData); accountRepository.setFlags(senderData);
// Restore recipient's flags // Restore recipient's flags
recipientData.setFlags(this.transferPrivsTransactionData.getPreviousRecipientFlags()); Integer previousRecipientFlags = this.transferPrivsTransactionData.getPreviousRecipientFlags();
accountRepository.setFlags(recipientData); if (previousRecipientFlags != null) {
recipientData.setFlags(previousRecipientFlags);
accountRepository.setFlags(recipientData);
}
// Clean values in transaction data // Clean values in transaction data
this.transferPrivsTransactionData.setPreviousSenderFlags(null); this.transferPrivsTransactionData.setPreviousSenderFlags(null);

24
src/test/java/org/qortal/test/TransferPrivsTests.java
View File

@ -5,6 +5,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.qortal.account.Account; import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount; import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.block.BlockChain; import org.qortal.block.BlockChain;
import org.qortal.block.BlockMinter; import org.qortal.block.BlockMinter;
import org.qortal.data.account.AccountData; import org.qortal.data.account.AccountData;
@ -19,11 +20,13 @@ import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common; import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount; import org.qortal.test.common.TestAccount;
import org.qortal.test.common.TransactionUtils; import org.qortal.test.common.TransactionUtils;
import org.qortal.transform.Transformer;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Random;
public class TransferPrivsTests extends Common { public class TransferPrivsTests extends Common {
@ -42,6 +45,27 @@ public class TransferPrivsTests extends Common {
Common.orphanCheck(); Common.orphanCheck();
} }
@Test
public void testAliceIntoNewAccountTransferPrivs() throws DataException {
try (final Repository repository = RepositoryManager.getRepository()) {
TestAccount alice = Common.getTestAccount(repository, "alice");
assertTrue(alice.canMint());
PrivateKeyAccount aliceMintingAccount = Common.getTestAccount(repository, "alice-reward-share");
byte[] randomPublicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
Random random = new Random();
random.nextBytes(randomPublicKey);
Account randomAccount = new PublicKeyAccount(repository, randomPublicKey);
combineAccounts(repository, alice, randomAccount, aliceMintingAccount);
assertFalse(alice.canMint());
assertTrue(randomAccount.canMint());
}
}
@Test @Test
public void testAliceIntoDilbertTransferPrivs() throws DataException { public void testAliceIntoDilbertTransferPrivs() throws DataException {
try (final Repository repository = RepositoryManager.getRepository()) { try (final Repository repository = RepositoryManager.getRepository()) {