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

Add missing fee check to TRANSFER_PRIVS

Browse Source
This commit is contained in:
catbref 2020-05-19 08:25:53 +01:00
parent 72100fe1d8
commit 032c5d0d07
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import java.util.List;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.qortal.account.Account;
import org.qortal.asset.Asset;
import org.qortal.block.BlockChain;
import org.qortal.crypto.Crypto;
import org.qortal.data.account.AccountData;
@ -60,6 +61,10 @@ public class TransferPrivsTransaction extends Transaction {
if (this.repository.getAccountRepository().accountExists(this.transferPrivsTransactionData.getRecipient()))
return ValidationResult.ACCOUNT_ALREADY_EXISTS;
// Check sender has funds for fee
if (getSender().getConfirmedBalance(Asset.QORT) < this.transferPrivsTransactionData.getFee())
return ValidationResult.NO_BALANCE;
return ValidationResult.OK;
}

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

@ -10,6 +10,7 @@ import org.qortal.block.BlockChain;
import org.qortal.block.BlockMinter;
import org.qortal.data.account.AccountData;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.PaymentTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.data.transaction.TransferPrivsTransactionData;
import org.qortal.repository.DataException;
@ -20,6 +21,7 @@ import org.qortal.test.common.BlockUtils;
import org.qortal.test.common.Common;
import org.qortal.test.common.TestAccount;
import org.qortal.test.common.TransactionUtils;
import org.qortal.test.common.transaction.TestTransaction;
import org.qortal.transform.Transformer;
import org.qortal.utils.Amounts;
@ -45,6 +47,31 @@ public class TransferPrivsTests extends Common {
Common.orphanCheck();
}
@Test
public void testNewAccountsTransferPrivs() throws DataException {
Random random = new Random();
try (final Repository repository = RepositoryManager.getRepository()) {
TestAccount alice = Common.getTestAccount(repository, "alice");
PrivateKeyAccount mintingAccount = Common.getTestAccount(repository, "alice-reward-share");
byte[] randomPrivateKey = new byte[Transformer.PRIVATE_KEY_LENGTH];
random.nextBytes(randomPrivateKey);
PrivateKeyAccount randomAccount = new PrivateKeyAccount(repository, randomPrivateKey);
// Alice sends random account an amount less than fee
TransactionData transactionData = new PaymentTransactionData(TestTransaction.generateBase(alice), randomAccount.getAddress(), 1L);
TransactionUtils.signAndMint(repository, transactionData, alice);
byte[] recipientPublicKey = new byte[Transformer.PUBLIC_KEY_LENGTH];
random.nextBytes(recipientPublicKey);
PublicKeyAccount recipientAccount = new PublicKeyAccount(repository, recipientPublicKey);
combineAccounts(repository, randomAccount, recipientAccount, mintingAccount);
}
}
@Test
public void testAliceIntoNewAccountTransferPrivs() throws DataException {
try (final Repository repository = RepositoryManager.getRepository()) {