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

Revert "Treat a REGISTER_NAME transaction as an UPDATE_NAME if the creator matches."

Browse Source 
This reverts commit b800fb5846.
This commit is contained in:
CalDescent 2021-09-16 19:27:17 +01:00
parent cc65a7cd11
commit 33ac1fed2a
2 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/qortal/transaction/RegisterNameTransaction.java
View File

@ -2,13 +2,11 @@ package org.qortal.transaction;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import org.qortal.account.Account;
import org.qortal.asset.Asset;
import org.qortal.block.BlockChain;
import org.qortal.crypto.Crypto;
import org.qortal.data.naming.NameData;
import org.qortal.data.transaction.RegisterNameTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.naming.Name;
@ -79,32 +77,14 @@ public class RegisterNameTransaction extends Transaction {
@Override
public ValidationResult isProcessable() throws DataException {
// Check the name isn't already taken
if (this.repository.getNameRepository().reducedNameExists(this.registerNameTransactionData.getReducedName())) {
// Name exists, but we'll allow the transaction if it has the same creator
// This is necessary to workaround an issue due to inconsistent data in the Names table on some nodes.
// Without this, the chain can get stuck for a subset of nodes when the name is registered
// for the second time. It's simplest to just treat REGISTER_NAME as UPDATE_NAME if the creator
// matches that of the original registration.
NameData nameData = this.repository.getNameRepository().fromReducedName(this.registerNameTransactionData.getReducedName());
if (Objects.equals(this.getCreator().getAddress(), nameData.getOwner())) {
// Transaction creator already owns the name, so it's safe to update it
// Treat this as valid, which also requires skipping the "one name per account" check below.
// Given that the name matches one already registered, we know that it won't exceed the limit.
return ValidationResult.OK;
}
// Name is already registered to someone else
if (this.repository.getNameRepository().reducedNameExists(this.registerNameTransactionData.getReducedName()))
return ValidationResult.NAME_ALREADY_REGISTERED;
}
// If accounts are only allowed one registered name then check for this
if (BlockChain.getInstance().oneNamePerAccount()
&& !this.repository.getNameRepository().getNamesByOwner(getRegistrant().getAddress()).isEmpty())
return ValidationResult.MULTIPLE_NAMES_FORBIDDEN;
// FUTURE: when adding more validation, make sure to check the `return ValidationResult.OK` above
return ValidationResult.OK;
}

30
src/test/java/org/qortal/test/naming/MiscTests.java
View File

@ -45,9 +45,9 @@ public class MiscTests extends Common {
}
}
// test trying to register same name twice (with same creator)
// test trying to register same name twice
@Test
public void testDuplicateRegisterNameWithSameCreator() throws DataException {
public void testDuplicateRegisterName() throws DataException {
try (final Repository repository = RepositoryManager.getRepository()) {
// Register-name
PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
@ -64,31 +64,7 @@ public class MiscTests extends Common {
transaction.sign(alice);
ValidationResult result = transaction.importAsUnconfirmed();
assertTrue("Transaction should be valid because it has the same creator", ValidationResult.OK == result);
}
}
// test trying to register same name twice (with different creator)
@Test
public void testDuplicateRegisterNameWithDifferentCreator() throws DataException {
try (final Repository repository = RepositoryManager.getRepository()) {
// Register-name
PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
String name = "test-name";
String data = "{}";
RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
TransactionUtils.signAndMint(repository, transactionData, alice);
// duplicate (this time registered by Bob)
PrivateKeyAccount bob = Common.getTestAccount(repository, "bob");
String duplicateName = "TEST-nÁme";
transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(bob), duplicateName, data);
Transaction transaction = Transaction.fromData(repository, transactionData);
transaction.sign(alice);
ValidationResult result = transaction.importAsUnconfirmed();
assertTrue("Transaction should be invalid because it has a different creator", ValidationResult.OK != result);
assertTrue("Transaction should be invalid", ValidationResult.OK != result);
}
}