Merge branch 'master' into 'keys'

README.md

@@ -1,7 +0,0 @@
-Patched Branch for App
-Any changes must be made to the patched_changes (this) branch only if something is less of a patch, and more of a core functionality you can request this from the haveno core team.
-
-Explaination of changes
-
-Changed protocol serialization from 'A' to 'X' to indicate a clear significant change in structure
-Changes the daemon to be a shadowJar instead

core/src/main/java/haveno/core/alert/AlertManager.java

@@ -109,7 +109,9 @@ public class AlertManager {
                     "026c581ad773d987e6bd10785ac7f7e0e64864aedeb8bce5af37046de812a37854",
                     "025b058c9f2c60d839669dbfa5578cf5a8117d60e6b70e2f0946f8a691273c6a36");
         case XMR_MAINNET:
-            return List.of();
+            return List.of("02d247b0ac0910ef0d578a490628fb13f38cb78b4fa52905f911b58fc726576bae",
+            "0385ffe2f04a8e25bbae8c0bfb56d231c95f242cc33e310fe0fdec174c60421a7c",
+            "033ac7c5320129b88febeaec86eb1492f036104afe6d0e660730a534a2e5594b3b");
         default:
             throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork());
         }

core/src/main/java/haveno/core/alert/PrivateNotificationManager.java

@@ -108,7 +108,11 @@ public class PrivateNotificationManager implements MessageListener {
                     "026c581ad773d987e6bd10785ac7f7e0e64864aedeb8bce5af37046de812a37854",
                     "025b058c9f2c60d839669dbfa5578cf5a8117d60e6b70e2f0946f8a691273c6a36");
         case XMR_MAINNET:
-            return List.of();
+            return List.of(
+                "03f072d10171eca09aa95de0102c1cf95026acc39653e5444f1e34894d63e19ea1",
+                "022647b30ce9dc8250e7f12b8c42a5648b7dbaaf5af5b9655ebe17a29bf76b3114",
+                "02b13bd04ec109f777e26a5608df924cb5afaaaf7ea87c414481b7a8d47893f98e",
+                "03b1cba37e2c63ac836539cb758473e537bc0bca0e5e4a2fc97a958fbf0bcd8e07");
         default:
             throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork());
         }

core/src/main/java/haveno/core/app/HavenoExecutable.java

@@ -84,7 +84,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven
 
     // TODO: regular expression is used to parse application name for the flatpak manifest, a more stable approach would be nice
     // Don't edit the next line unless you're only editing in between the quotes.
-    public static final String DEFAULT_APP_NAME = "Haveno";
+    public static final String DEFAULT_APP_NAME = "HavenoX";
 
     public static final int EXIT_SUCCESS = 0;
     public static final int EXIT_FAILURE = 1;

core/src/main/java/haveno/core/filter/FilterManager.java

@@ -116,9 +116,16 @@ public class FilterManager {
 
         publicKeys = useDevPrivilegeKeys ?
                 Collections.singletonList(DevEnv.DEV_PRIVILEGE_PUB_KEY) :
-                List.of("0358d47858acdc41910325fce266571540681ef83a0d6fedce312bef9810793a27",
+                List.of("02d247b0ac0910ef0d578a490628fb13f38cb78b4fa52905f911b58fc726576bae",
-                        "029340c3e7d4bb0f9e651b5f590b434fecb6175aeaa57145c7804ff05d210e534f",
+                        "0385ffe2f04a8e25bbae8c0bfb56d231c95f242cc33e310fe0fdec174c60421a7c",
-                        "034dc7530bf66ffd9580aa98031ea9a18ac2d269f7c56c0e71eca06105b9ed69f9");
+                        "033ac7c5320129b88febeaec86eb1492f036104afe6d0e660730a534a2e5594b3b",
+                        "03e0236f761955386e1dbcf60dc5956f808051e5ca6fae4b257a8f3acca8af7512",
+                        "021a33309670fb00d11cb5e2bab97b2068f200feb5fdce1fb6eb0d0730ff730c53",
+                        "03f072d10171eca09aa95de0102c1cf95026acc39653e5444f1e34894d63e19ea1",
+                        "022647b30ce9dc8250e7f12b8c42a5648b7dbaaf5af5b9655ebe17a29bf76b3114",
+                        "02b13bd04ec109f777e26a5608df924cb5afaaaf7ea87c414481b7a8d47893f98e",
+                        "03b1cba37e2c63ac836539cb758473e537bc0bca0e5e4a2fc97a958fbf0bcd8e07"
+                    );
 
         banFilter.setBannedNodePredicate(this::isNodeAddressBannedFromNetwork);
     }

core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java

@@ -200,7 +200,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
     @Override
     protected String getDisputeInfo(Dispute dispute) {
         String role = Res.get("shared.arbitrator").toLowerCase();
-        String link = "https://docs.haveno.exchange/trading-rules.html#legacy-arbitration";
+        String link = "https://haveno.com/trading-rules";
         return Res.get("support.initialInfo", role, role, link);
     }
 

core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java

@@ -78,7 +78,16 @@ public class ArbitratorManager extends DisputeAgentManager<Arbitrator> {
                     "02a1a458df5acf4ab08fdca748e28f33a955a30854c8c1a831ee733dca7f0d2fcd",
                     "0374dd70f3fa6e47ec5ab97932e1cec6233e98e6ae3129036b17118650c44fd3de");
         case XMR_MAINNET:
-            return List.of();
+            return List.of(
+                "0259eb939d7ddd49fb5575e8c2b7dcff3ac9eee432b95d7a8ed05211c31c8f0260",
+                "0250bd83f4ef502b3cf44497f8553a9021c43278d869d06310aa843260c4733b8c",
+                "02acb5a62241f6eb2428aab090322bdc074ffe77bf656e8221f42f9ea1db34c8e6",
+                "02d96f8239f44f5b45846585eb062453f0af514d4e94324ffe783e8bdc89705b6e",
+                "03b1f75164b569227a38aa30d6711ffe702039c81a14d0fc8b87c08d2d1cd927ee",
+                "0294d8ac9e16f5c6b918e24ac8fe2c903d758290ba080b6cfef35fe60852c7940f",
+                "038e971d724bd4cfbba7e9d18d52d0cc377b30ac5aabe12298a62f85425dfcd5c6",
+                "026e457342a0af072bb87eba22a89a5cd9a6af3abdfcfe11aeeb3718c4a1a34407"
+            );
         default:
             throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork());
         }

core/src/main/java/haveno/core/trade/HavenoUtils.java

@@ -80,15 +80,15 @@ import org.bitcoinj.core.Coin;
 public class HavenoUtils {
 
     // configure release date
-    private static final String RELEASE_DATE = "25-05-2024 00:00:00"; // optionally set to release date of the network in format dd-mm-yyyy to impose temporary limits, etc. e.g. "25-05-2024 00:00:00"
+    private static final String RELEASE_DATE = "25-11-2024 00:00:00"; // optionally set to release date of the network in format dd-mm-yyyy to impose temporary limits, etc. e.g. "25-05-2024 00:00:00"
     public static final int RELEASE_LIMIT_DAYS = 60; // number of days to limit sell offers to max buy limit for new accounts
     public static final int WARN_ON_OFFER_EXCEEDS_UNSIGNED_BUY_LIMIT_DAYS = 182; // number of days to warn if sell offer exceeds unsigned buy limit
     public static final int ARBITRATOR_ACK_TIMEOUT_SECONDS = 60;
 
     // configure fees
-    public static final boolean ARBITRATOR_ASSIGNS_TRADE_FEE_ADDRESS = true;
+    public static final boolean ARBITRATOR_ASSIGNS_TRADE_FEE_ADDRESS = false;
     public static final double MAKER_FEE_PCT = 0.0015; // 0.15%
-    public static final double TAKER_FEE_PCT = 0.0075; // 0.75%
+    public static final double TAKER_FEE_PCT = 0.0015; // 0.15%
     public static final double PENALTY_FEE_PCT = 0.02; // 2%
 
     // other configuration
@@ -422,7 +422,7 @@ public class HavenoUtils {
         case XMR_STAGENET:
             return "5B11hTJdG2XDNwjdKGLRxwSLwDhkbGg7C7UEAZBxjE6FbCeRMjudrpNACmDNtWPiSnNfjDQf39QRjdtdgoL69txv81qc2Mc";
         case XMR_MAINNET:
-            throw new RuntimeException("Mainnet fee address not implemented");
+            return "84R8DfswAtT5eZ97ioKFjJYvd6HKuSdZTKyZYYJr77oVWcAiJDJgTAc3piVm2prKmeAgf92iSr7jkcjmmHNFLWGEDGUDafc";
         default:
             throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork());
         }

desktop/package/package.gradle

@@ -278,7 +278,7 @@ task packageInstallers {
                         " --java-options --add-opens=java.base/java.lang.reflect=ALL-UNNAMED" +
                         " --java-options --add-opens=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED" +
                         " --java-options -Djava.net.preferIPv4Stack=true" +
-                        " --arguments --baseCurrencyNetwork=XMR_STAGENET"
+                        " --arguments --baseCurrencyNetwork=XMR_MAINNET"
                 // Warning: this will cause guice reflection exceptions and lead to issues with the guice internal cache
                 // resulting in the UI not loading
 //              " --java-options -Djdk.module.illegalAccess=deny" +