Merge pull request #7364 from HenrikJannsen/change-MIN_SECURITY_DEPOS…

…IT_CHANGE_ACTIVATION_DATE Change MIN_SECURITY_DEPOSIT_CHANGE_ACTIVATION_DATE to 17.2.2025
bisq-network · Feb 2, 2025 · ba22e9a · ba22e9a
2 parents c6480c3 + 2b25107
commit ba22e9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/bisq/core/btc/wallet/Restrictions.java b/core/src/main/java/bisq/core/btc/wallet/Restrictions.java
@@ -26,7 +26,7 @@
 import java.util.GregorianCalendar;
 
 public class Restrictions {
-    private static final Date MIN_SECURITY_DEPOSIT_CHANGE_ACTIVATION_DATE = Utilities.getUTCDate(2025, GregorianCalendar.MARCH, 1);
+    private static final Date MIN_SECURITY_DEPOSIT_CHANGE_ACTIVATION_DATE = Utilities.getUTCDate(2025, GregorianCalendar.FEBRUARY, 17);
 
     private static Coin MIN_TRADE_AMOUNT;
     private static Coin MIN_BUYER_SECURITY_DEPOSIT;

diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics3.java
@@ -83,9 +83,9 @@ public final class TradeStatistics3 implements ProcessOncePersistableNetworkPayl
         CapabilityRequiringPayload, DateSortedTruncatablePayload, ComparableExt<TradeStatistics3> {
 
     @JsonExclude
-    private transient static final ZoneId ZONE_ID = ZoneId.systemDefault();
+    private static final ZoneId ZONE_ID = ZoneId.systemDefault();
     @JsonExclude
-    private transient static final long STRICT_FILTER_DATE = new GregorianCalendar(2021, Calendar.NOVEMBER, 1).getTime().getTime();
+    private static final long STRICT_FILTER_DATE = new GregorianCalendar(2021, Calendar.NOVEMBER, 1).getTime().getTime();
 
     public static TradeStatistics3 from(Trade trade,
                                         @Nullable String referralId,

diff --git a/core/src/test/java/bisq/core/support/dispute/mediation/FileTransferSessionTest.java b/core/src/test/java/bisq/core/support/dispute/mediation/FileTransferSessionTest.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,6 +38,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+@Disabled
 public class FileTransferSessionTest implements FileTransferSession.FtpCallback {
 
     double notedProgressPct = -1.0;