Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-22 20:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Names: fixes to allow name change and tests to cover

Browse Source
This commit is contained in:
catbref
2020-05-13 15:07:36 +01:00
parent d9f784ed2b
commit cea0cee9a8
3 changed files with 194 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/qortal/naming/Name.java
View File

@@ -70,11 +70,15 @@ public class Name {
if (previousTransactionData == null)
throw new DataException("Unable to revert name transaction as referenced transaction not found in repository");
String previousName = this.nameData.getName();
switch (previousTransactionData.getType()) {
case REGISTER_NAME: {
RegisterNameTransactionData previousRegisterNameTransactionData = (RegisterNameTransactionData) previousTransactionData;
this.nameData.setName(previousRegisterNameTransactionData.getName());
this.nameData.setData(previousRegisterNameTransactionData.getData());
break;
}
@@ -92,14 +96,22 @@ public class Name {
case BUY_NAME: {
BuyNameTransactionData previousBuyNameTransactionData = (BuyNameTransactionData) previousTransactionData;
Account buyer = new PublicKeyAccount(this.repository, previousBuyNameTransactionData.getBuyerPublicKey());
this.nameData.setOwner(buyer.getAddress());
break;
}
default:
throw new IllegalStateException("Unable to revert name transaction due to unsupported referenced transaction");
}
this.repository.getNameRepository().save(this.nameData);
if (!this.nameData.getName().equals(previousName))
// Name has changed, delete old entry
this.repository.getNameRepository().delete(previousName);
}
public void update(UpdateNameTransactionData updateNameTransactionData) throws DataException {
@@ -110,8 +122,12 @@ public class Name {
this.nameData.setReference(updateNameTransactionData.getSignature());
// Update name and data where appropriate
if (!updateNameTransactionData.getNewName().isEmpty())
this.nameData.setOwner(updateNameTransactionData.getNewName());
if (!updateNameTransactionData.getNewName().isEmpty()) {
// If we're changing the name, we need to delete old entry
this.repository.getNameRepository().delete(nameData.getName());
this.nameData.setName(updateNameTransactionData.getNewName());
}
if (!updateNameTransactionData.getNewData().isEmpty())
this.nameData.setData(updateNameTransactionData.getNewData());
@@ -127,9 +143,6 @@ public class Name {
// Previous Name's owner and/or data taken from referenced transaction
this.revert();
// Save reverted name data
this.repository.getNameRepository().save(this.nameData);
// Remove reference to previous name-changing transaction
updateNameTransactionData.setNameReference(null);
}
@@ -213,9 +226,6 @@ public class Name {
// Revert seller's balance
Account seller = new Account(this.repository, this.nameData.getOwner());
seller.modifyAssetBalance(Asset.QORT, - buyNameTransactionData.getAmount());
// Save reverted name data
this.repository.getNameRepository().save(this.nameData);
}
}

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

@@ -130,7 +130,12 @@ public class UpdateNameTransaction extends Transaction {
@Override
public void orphan() throws DataException {
// Revert name
Name name = new Name(this.repository, this.updateNameTransactionData.getName());
String nameToRevert = this.updateNameTransactionData.getNewName();
if (nameToRevert.isEmpty())
nameToRevert = this.updateNameTransactionData.getName();
Name name = new Name(this.repository, nameToRevert);
name.revert(this.updateNameTransactionData);
// Save this transaction, with previous "name reference"