From 3cd164588c3bd15f66f36c589c4a70b4a0f3be06 Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Wed, 17 May 2023 13:42:08 +0700 Subject: [PATCH] Remove USE_FEE_FROM_FILTER_ACTIVATION_DATE and new Date().before(USE_FEE_FROM_FILTER_ACTIVATION_DATE) as it would always be false Signed-off-by: HenrikJannsen --- .../main/java/bisq/core/provider/mempool/TxValidator.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/core/src/main/java/bisq/core/provider/mempool/TxValidator.java b/core/src/main/java/bisq/core/provider/mempool/TxValidator.java index fb8d926ce29..9c95c2e14f3 100644 --- a/core/src/main/java/bisq/core/provider/mempool/TxValidator.java +++ b/core/src/main/java/bisq/core/provider/mempool/TxValidator.java @@ -23,7 +23,6 @@ import bisq.core.filter.FilterManager; import bisq.common.util.Tuple2; -import bisq.common.util.Utilities; import org.bitcoinj.core.Coin; @@ -34,8 +33,6 @@ import com.google.gson.JsonSyntaxException; import java.util.ArrayList; -import java.util.Date; -import java.util.GregorianCalendar; import java.util.List; import java.util.Optional; @@ -51,7 +48,6 @@ @Slf4j @Getter public class TxValidator { - private static final Date USE_FEE_FROM_FILTER_ACTIVATION_DATE = Utilities.getUTCDate(2022, GregorianCalendar.JANUARY, 1); private final static double FEE_TOLERANCE = 0.5; // we expect fees to be at least 50% of target private final static long BLOCK_TOLERANCE = 599999; // allow really old offers with weird fee addresses @@ -420,9 +416,6 @@ private Optional maybeCheckAgainstFeeFromFilter(Coin tradeAmount, Param minFeeParam, boolean isBtcFee, String description) { - if (new Date().before(USE_FEE_FROM_FILTER_ACTIVATION_DATE)) { - return Optional.empty(); - } return getFeeFromFilter(isMaker, isBtcFee) .map(feeFromFilter -> { boolean isValid = testWithFeeFromFilter(tradeAmount, feeValueAsCoin, feeFromFilter, minFeeParam);