Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove date check #6702

Merged
merged 1 commit into from
May 23, 2023
Merged

Remove date check #6702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions core/src/main/java/bisq/core/provider/mempool/TxValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import bisq.core.filter.FilterManager;

import bisq.common.util.Tuple2;
import bisq.common.util.Utilities;

import org.bitcoinj.core.Coin;

Expand All @@ -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;

Expand All @@ -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

Expand Down Expand Up @@ -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);
Expand Down