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

Apply the address blacklist to chat transactions.

Browse Source 
This is based on code originally written by @DrewMPeacock
This commit is contained in:
CalDescent 2021-08-07 10:31:56 +01:00
parent 24f1fb566d
commit b29ae67501
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import org.qortal.crypto.MemoryPoW;
import org.qortal.data.transaction.ChatTransactionData; import org.qortal.data.transaction.ChatTransactionData;
import org.qortal.data.transaction.TransactionData; import org.qortal.data.transaction.TransactionData;
import org.qortal.group.Group; import org.qortal.group.Group;
import org.qortal.list.ResourceListManager;
import org.qortal.repository.DataException; import org.qortal.repository.DataException;
import org.qortal.repository.GroupRepository; import org.qortal.repository.GroupRepository;
import org.qortal.repository.Repository; import org.qortal.repository.Repository;
@ -138,6 +139,12 @@ public class ChatTransaction extends Transaction {
public ValidationResult isValid() throws DataException { public ValidationResult isValid() throws DataException {
// Nonce checking is done via isSignatureValid() as that method is only called once per import // Nonce checking is done via isSignatureValid() as that method is only called once per import
// Check for blacklisted author by address
ResourceListManager listManager = ResourceListManager.getInstance();
if (listManager.isAddressInBlacklist(this.chatTransactionData.getSender())) {
return ValidationResult.ADDRESS_IN_BLACKLIST;
}
// If we exist in the repository then we've been imported as unconfirmed, // If we exist in the repository then we've been imported as unconfirmed,
// but we don't want to make it into a block, so return fake non-OK result. // but we don't want to make it into a block, so return fake non-OK result.
if (this.repository.getTransactionRepository().exists(this.chatTransactionData.getSignature())) if (this.repository.getTransactionRepository().exists(this.chatTransactionData.getSignature()))

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

@ -247,6 +247,7 @@ public abstract class Transaction {
INVALID_GROUP_BLOCK_DELAY(93), INVALID_GROUP_BLOCK_DELAY(93),
INCORRECT_NONCE(94), INCORRECT_NONCE(94),
INVALID_TIMESTAMP_SIGNATURE(95), INVALID_TIMESTAMP_SIGNATURE(95),
ADDRESS_IN_BLACKLIST(96),
INVALID_BUT_OK(999), INVALID_BUT_OK(999),
NOT_YET_RELEASED(1000); NOT_YET_RELEASED(1000);