Merge pull request #6702 from HenrikJannsen/cleanup_date_check

Remove date check
bisq-network · May 23, 2023 · ad2908b · ad2908b
2 parents 91e10d4 + 3cd1645
commit ad2908b
Showing 1 changed file with 0 additions and 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
@@ -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<Boolean> 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);