From d741580ccfbb3e4fb1c4c76696cd217f29bc332f Mon Sep 17 00:00:00 2001 From: catbref Date: Tue, 26 Mar 2019 14:36:06 +0000 Subject: [PATCH] Restore missing minimum fee checks & ValidationResult --- src/main/java/org/qora/transaction/Transaction.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/qora/transaction/Transaction.java b/src/main/java/org/qora/transaction/Transaction.java index 8910ccb4..43d52159 100644 --- a/src/main/java/org/qora/transaction/Transaction.java +++ b/src/main/java/org/qora/transaction/Transaction.java @@ -159,7 +159,7 @@ public abstract class Transaction { INVALID_TAGS_LENGTH(37), INVALID_AT_TYPE_LENGTH(38), INVALID_AT_TRANSACTION(39), - AT_IS_FINISHED(40), + INSUFFICIENT_FEE(40), ASSET_DOES_NOT_MATCH_AT(41), ASSET_ALREADY_EXISTS(43), MISSING_CREATOR(44), @@ -189,6 +189,7 @@ public abstract class Transaction { TX_GROUP_ID_MISMATCH(68), MULTIPLE_NAMES_FORBIDDEN(69), INVALID_ASSET_OWNER(70), + AT_IS_FINISHED(71), NOT_YET_RELEASED(1000); public final int value; @@ -477,6 +478,10 @@ public abstract class Transaction { if (this.transactionData.getTimestamp() > maxTimestamp) return ValidationResult.TIMESTAMP_TOO_NEW; + // Check fee is sufficient + if (!hasMinimumFee() || !hasMinimumFeePerByte()) + return ValidationResult.INSUFFICIENT_FEE; + repository.setSavepoint(); try { PublicKeyAccount creator = this.getCreator();