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

Reference fixes for MESSAGE transactions & tests to cover

Browse Source
This commit is contained in:
catbref
2020-06-24 17:15:17 +01:00
parent e2e4555009
commit faa6405d5f
2 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/qortal/transaction/MessageTransaction.java
View File

@@ -2,13 +2,16 @@ package org.qortal.transaction;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import org.qortal.account.Account;
import org.qortal.account.PrivateKeyAccount;
import org.qortal.account.PublicKeyAccount;
import org.qortal.asset.Asset;
import org.qortal.crypto.Crypto;
import org.qortal.crypto.MemoryPoW;
import org.qortal.data.PaymentData;
import org.qortal.data.transaction.BaseTransactionData;
import org.qortal.data.transaction.MessageTransactionData;
import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group;
@@ -20,6 +23,7 @@ import org.qortal.transform.TransformationException;
import org.qortal.transform.transaction.ChatTransactionTransformer;
import org.qortal.transform.transaction.MessageTransactionTransformer;
import org.qortal.transform.transaction.TransactionTransformer;
import org.qortal.utils.NTP;
public class MessageTransaction extends Transaction {
@@ -45,6 +49,22 @@ public class MessageTransaction extends Transaction {
this.messageTransactionData = (MessageTransactionData) this.transactionData;
}
/** Constructs non-payment MessageTransaction. Caller will need to compute nonce/set fee and then sign. */
public static MessageTransaction build(Repository repository, PrivateKeyAccount sender, int txGroupId, String recipient, byte[] data, boolean isText, boolean isEncrypted) throws DataException {
long timestamp = NTP.getTime();
byte[] reference = sender.getLastReference();
if (reference == null) {
reference = new byte[64];
new Random().nextBytes(reference);
}
long fee = 0L;
BaseTransactionData baseTransactionData = new BaseTransactionData(timestamp, txGroupId, reference, sender.getPublicKey(), fee, null);
int version = 4;
MessageTransactionData messageTransactionData = new MessageTransactionData(baseTransactionData, version, 0, recipient, 0, null, data, isText, isEncrypted);
return new MessageTransaction(repository, messageTransactionData);
}
// More information
@Override
@@ -140,6 +160,19 @@ public class MessageTransaction extends Transaction {
return ValidationResult.OK;
}
@Override
public boolean hasValidReference() throws DataException {
// We shouldn't really get this far, but just in case:
if (this.messageTransactionData.getReference() == null)
return false;
// If zero fee, then we rely on nonce and reference isn't important
if (this.messageTransactionData.getFee() == 0)
return true;
return super.hasValidReference();
}
@Override
public ValidationResult isValid() throws DataException {
// Nonce checking is done via isSignatureValid() as that method is only called once per import