diff --git a/Makefile b/Makefile index 51d55af3..5dba8985 100644 --- a/Makefile +++ b/Makefile @@ -430,7 +430,7 @@ seednode: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=1002 \ - --appName=haveno-XMR_MAINNET_Seed_1002 \ + --appName=haveno-reto-XMR_MAINNET_Seed_1002 \ --xmrNode=http://127.0.0.1:18081 \ seednode2: @@ -439,7 +439,7 @@ seednode2: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=1003 \ - --appName=haveno-XMR_MAINNET_Seed_1003 \ + --appName=haveno-reto-XMR_MAINNET_Seed_1003 \ --xmrNode=http://127.0.0.1:18081 \ arbitrator-daemon-mainnet: @@ -449,7 +449,7 @@ arbitrator-daemon-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_arbitrator \ + --appName=haveno-reto-XMR_MAINNET_arbitrator \ --apiPassword=apitest \ --apiPort=1200 \ --passwordRequired=false \ @@ -462,7 +462,7 @@ arbitrator-desktop-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_arbitrator \ + --appName=haveno-reto-XMR_MAINNET_arbitrator \ --apiPassword=apitest \ --apiPort=1200 \ --xmrNode=http://127.0.0.1:18081 \ @@ -474,7 +474,7 @@ haveno-daemon-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=Haveno \ + --appName=Haveno-reto \ --apiPassword=apitest \ --apiPort=1201 \ --useNativeXmrWallet=false \ @@ -486,7 +486,7 @@ haveno-desktop-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=Haveno \ + --appName=Haveno-reto \ --apiPassword=apitest \ --apiPort=1201 \ --useNativeXmrWallet=false \ @@ -498,7 +498,7 @@ user1-daemon-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_user1 \ + --appName=haveno-reto-XMR_MAINNET_user1 \ --apiPassword=apitest \ --apiPort=1202 \ --passwordRequired=false \ @@ -511,7 +511,7 @@ user1-desktop-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_user1 \ + --appName=haveno-reto-XMR_MAINNET_user1 \ --apiPassword=apitest \ --apiPort=1202 \ --useNativeXmrWallet=false \ @@ -523,7 +523,7 @@ user2-daemon-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_user2 \ + --appName=haveno-reto-XMR_MAINNET_user2 \ --apiPassword=apitest \ --apiPort=1203 \ --passwordRequired=false \ @@ -536,7 +536,7 @@ user2-desktop-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_user2 \ + --appName=haveno-reto-XMR_MAINNET_user2 \ --apiPassword=apitest \ --apiPort=1203 \ --useNativeXmrWallet=false \ @@ -548,7 +548,7 @@ user3-desktop-mainnet: --useLocalhostForP2P=false \ --useDevPrivilegeKeys=false \ --nodePort=9999 \ - --appName=haveno-XMR_MAINNET_user3 \ + --appName=haveno-reto-XMR_MAINNET_user3 \ --apiPassword=apitest \ --apiPort=1204 \ --useNativeXmrWallet=false \ diff --git a/core/src/main/java/haveno/core/alert/AlertManager.java b/core/src/main/java/haveno/core/alert/AlertManager.java index a54f45c4..1e60cf55 100644 --- a/core/src/main/java/haveno/core/alert/AlertManager.java +++ b/core/src/main/java/haveno/core/alert/AlertManager.java @@ -109,7 +109,11 @@ public class AlertManager { "026c581ad773d987e6bd10785ac7f7e0e64864aedeb8bce5af37046de812a37854", "025b058c9f2c60d839669dbfa5578cf5a8117d60e6b70e2f0946f8a691273c6a36"); case XMR_MAINNET: - return List.of(); + return List.of( + "02d8ac0fbe4e25f4a1d68b95936f25fc2e1b218e161cb5ed6661c7ab4c85f1fd4f", + "02e9dc14edddde19cc9f829a0739d0ab0c7310154ad94a15d477b51d85991b5a8a", + "021c798eb224ba23bd91ed7710a85d9b9a6439c29f4f29c1a14b96750a0da36aa7", + "029da09bc04dea33cd11a31bc1c05aa830b9180acb84e5370ee7fde60cae9f3d03"); default: throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork()); } diff --git a/core/src/main/java/haveno/core/alert/PrivateNotificationManager.java b/core/src/main/java/haveno/core/alert/PrivateNotificationManager.java index fd6abac5..9d260016 100644 --- a/core/src/main/java/haveno/core/alert/PrivateNotificationManager.java +++ b/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( + "02d8ac0fbe4e25f4a1d68b95936f25fc2e1b218e161cb5ed6661c7ab4c85f1fd4f", + "02e9dc14edddde19cc9f829a0739d0ab0c7310154ad94a15d477b51d85991b5a8a", + "021c798eb224ba23bd91ed7710a85d9b9a6439c29f4f29c1a14b96750a0da36aa7", + "029da09bc04dea33cd11a31bc1c05aa830b9180acb84e5370ee7fde60cae9f3d03"); default: throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork()); } diff --git a/core/src/main/java/haveno/core/app/HavenoExecutable.java b/core/src/main/java/haveno/core/app/HavenoExecutable.java index 5f2d1462..bc1b2b86 100644 --- a/core/src/main/java/haveno/core/app/HavenoExecutable.java +++ b/core/src/main/java/haveno/core/app/HavenoExecutable.java @@ -82,9 +82,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Slf4j public abstract class HavenoExecutable implements GracefulShutDownHandler, HavenoSetup.HavenoSetupListener, UncaughtExceptionHandler { - // 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 = "Haveno-reto"; public static final int EXIT_SUCCESS = 0; public static final int EXIT_FAILURE = 1; diff --git a/core/src/main/java/haveno/core/filter/FilterManager.java b/core/src/main/java/haveno/core/filter/FilterManager.java index cb7e0e9b..3d74b2c0 100644 --- a/core/src/main/java/haveno/core/filter/FilterManager.java +++ b/core/src/main/java/haveno/core/filter/FilterManager.java @@ -116,9 +116,10 @@ public class FilterManager { publicKeys = useDevPrivilegeKeys ? Collections.singletonList(DevEnv.DEV_PRIVILEGE_PUB_KEY) : - List.of("0358d47858acdc41910325fce266571540681ef83a0d6fedce312bef9810793a27", - "029340c3e7d4bb0f9e651b5f590b434fecb6175aeaa57145c7804ff05d210e534f", - "034dc7530bf66ffd9580aa98031ea9a18ac2d269f7c56c0e71eca06105b9ed69f9"); + List.of("02d8ac0fbe4e25f4a1d68b95936f25fc2e1b218e161cb5ed6661c7ab4c85f1fd4f", + "02e9dc14edddde19cc9f829a0739d0ab0c7310154ad94a15d477b51d85991b5a8a", + "021c798eb224ba23bd91ed7710a85d9b9a6439c29f4f29c1a14b96750a0da36aa7", + "029da09bc04dea33cd11a31bc1c05aa830b9180acb84e5370ee7fde60cae9f3d03"); banFilter.setBannedNodePredicate(this::isNodeAddressBannedFromNetwork); } diff --git a/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java index 30fe0be1..5d4058f9 100644 --- a/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java +++ b/core/src/main/java/haveno/core/support/dispute/arbitration/arbitrator/ArbitratorManager.java @@ -42,6 +42,7 @@ import haveno.core.filter.FilterManager; import haveno.core.support.dispute.agent.DisputeAgentManager; import haveno.core.user.User; import haveno.network.p2p.storage.payload.ProtectedStorageEntry; +//import java.util.ArrayList;TODO import java.util.List; import lombok.extern.slf4j.Slf4j; @@ -78,7 +79,11 @@ public class ArbitratorManager extends DisputeAgentManager { "02a1a458df5acf4ab08fdca748e28f33a955a30854c8c1a831ee733dca7f0d2fcd", "0374dd70f3fa6e47ec5ab97932e1cec6233e98e6ae3129036b17118650c44fd3de"); case XMR_MAINNET: - return List.of(); + return List.of( + "02d8ac0fbe4e25f4a1d68b95936f25fc2e1b218e161cb5ed6661c7ab4c85f1fd4f", + "029da09bc04dea33cd11a31bc1c05aa830b9180acb84e5370ee7fde60cae9f3d03", + "021c798eb224ba23bd91ed7710a85d9b9a6439c29f4f29c1a14b96750a0da36aa7", + "02e9dc14edddde19cc9f829a0739d0ab0c7310154ad94a15d477b51d85991b5a8a"); default: throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork()); } diff --git a/core/src/main/java/haveno/core/trade/HavenoUtils.java b/core/src/main/java/haveno/core/trade/HavenoUtils.java index 06133e16..2360ae60 100644 --- a/core/src/main/java/haveno/core/trade/HavenoUtils.java +++ b/core/src/main/java/haveno/core/trade/HavenoUtils.java @@ -87,8 +87,8 @@ public class HavenoUtils { // configure fees public static final boolean ARBITRATOR_ASSIGNS_TRADE_FEE_ADDRESS = true; - 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 MAKER_FEE_PCT = 0.00; // 0% + public static final double TAKER_FEE_PCT = 0.00; // 0% public static final double PENALTY_FEE_PCT = 0.02; // 2% // other configuration diff --git a/core/src/main/resources/xmr_mainnet.seednodes b/core/src/main/resources/xmr_mainnet.seednodes index 3f81fa04..02da6cc4 100644 --- a/core/src/main/resources/xmr_mainnet.seednodes +++ b/core/src/main/resources/xmr_mainnet.seednodes @@ -1,2 +1,12 @@ # nodeaddress.onion:port [(@owner,@backup)] -placeholder.onion:8000 (@placeholder) \ No newline at end of file +k6wctqd5l2nhmietzs6zg4pric3ukeg7lazzz67ttbl75qwfr2q4yvqd.onion:2002(@anon1) +4gmfgn22tll7ajw3tdp7nru3fvgh5ukt7w53kfv5ymijldivsqtbzdqd.onion:2003(@anon1) +bugc27z7lqjgpwmhbuu3kuwoq2bhailj573r32jm5ydwrcqrwjtblnid.onion:1002(@anon2) +xephvvzd3orepnny7lbia4nkwie5t7wjivlvvz5lhbsck7ubavystead.onion:9992(@anon3 ,@s0) +g4z6oi2wf62nwztwve6qe2hqswj4ezpom6hn7cuy5cxaidey4us76bid.onion:9993(@anon3 ,@s0) +z47tltuwytd5icqq4hni2ammvlugp6pcwqboeu7ngawruualxjjuu3ad.onion:9992(@anon3 ,@s3) +hxb5h34hjgyraycrrxlz5ar2q77mjgondzicwzayqwwvuaepssrn5zyd.onion:9993(@anon3 ,@s3) +u6wwec5ddxswwyrz7rgzuiwowf33llab57y3xzmwwxvsofq2w4m6ihad.onion:1002(@anon4) +oyui76zng5nhml6xlrysfmyqgoutlhwr3h7p35rlzr5fvtg6tzgavvqd.onion:9992(@anon5) +nri52xbvmga4lm7yg7cwszxz2eamt6bb3pgi6bhkzexgk4flb5e5p7qd.onion:9993(@anon5) +im6hcl7hknvsrsns2newv4orfv3kd2ly5yvqtbfkiyzoohscyp5htgqd.onion:2002(@anon6) diff --git a/desktop/package/package.gradle b/desktop/package/package.gradle index 65e09d55..de2c99e7 100644 --- a/desktop/package/package.gradle +++ b/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" + diff --git a/desktop/src/main/resources/images/logo_splash.png b/desktop/src/main/resources/images/logo_splash.png index 110edbb8..26e2a391 100644 Binary files a/desktop/src/main/resources/images/logo_splash.png and b/desktop/src/main/resources/images/logo_splash.png differ diff --git a/desktop/src/main/resources/images/logo_splash@2x.png b/desktop/src/main/resources/images/logo_splash@2x.png index 45067473..cacf5d1d 100644 Binary files a/desktop/src/main/resources/images/logo_splash@2x.png and b/desktop/src/main/resources/images/logo_splash@2x.png differ diff --git a/desktop/src/main/resources/images/logo_splash_testnet.png b/desktop/src/main/resources/images/logo_splash_testnet.png index 00e44cc5..988fd91b 100644 Binary files a/desktop/src/main/resources/images/logo_splash_testnet.png and b/desktop/src/main/resources/images/logo_splash_testnet.png differ diff --git a/desktop/src/main/resources/images/logo_splash_testnet@2x.png b/desktop/src/main/resources/images/logo_splash_testnet@2x.png index 3ead8c7c..5594da8b 100644 Binary files a/desktop/src/main/resources/images/logo_splash_testnet@2x.png and b/desktop/src/main/resources/images/logo_splash_testnet@2x.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon.png b/desktop/src/main/resources/images/system_tray_icon.png index 7b4ce6bd..4052a0d0 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon.png and b/desktop/src/main/resources/images/system_tray_icon.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon@2x.png b/desktop/src/main/resources/images/system_tray_icon@2x.png index 58166215..311af6ba 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon@2x.png and b/desktop/src/main/resources/images/system_tray_icon@2x.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon@2x_white.png b/desktop/src/main/resources/images/system_tray_icon@2x_white.png index 88e2ae7a..b7195046 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon@2x_white.png and b/desktop/src/main/resources/images/system_tray_icon@2x_white.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon_linux.png b/desktop/src/main/resources/images/system_tray_icon_linux.png index e948d8e6..4238dce3 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon_linux.png and b/desktop/src/main/resources/images/system_tray_icon_linux.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon_white.png b/desktop/src/main/resources/images/system_tray_icon_white.png index 15bd2804..ad9a3602 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon_white.png and b/desktop/src/main/resources/images/system_tray_icon_white.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon_windows.png b/desktop/src/main/resources/images/system_tray_icon_windows.png index 96508254..d2f87de4 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon_windows.png and b/desktop/src/main/resources/images/system_tray_icon_windows.png differ diff --git a/desktop/src/main/resources/images/system_tray_icon_windows@2x.png b/desktop/src/main/resources/images/system_tray_icon_windows@2x.png index f3fa80a5..1799efe4 100644 Binary files a/desktop/src/main/resources/images/system_tray_icon_windows@2x.png and b/desktop/src/main/resources/images/system_tray_icon_windows@2x.png differ diff --git a/desktop/src/main/resources/images/task_bar_icon_linux.png b/desktop/src/main/resources/images/task_bar_icon_linux.png index 5ecaa8ae..c7cbc004 100644 Binary files a/desktop/src/main/resources/images/task_bar_icon_linux.png and b/desktop/src/main/resources/images/task_bar_icon_linux.png differ diff --git a/desktop/src/main/resources/images/task_bar_icon_windows.png b/desktop/src/main/resources/images/task_bar_icon_windows.png index 1da81b90..6fd3fcf1 100644 Binary files a/desktop/src/main/resources/images/task_bar_icon_windows.png and b/desktop/src/main/resources/images/task_bar_icon_windows.png differ diff --git a/desktop/src/main/resources/images/window_icon.png b/desktop/src/main/resources/images/window_icon.png index 522087bb..0f7de51d 100644 Binary files a/desktop/src/main/resources/images/window_icon.png and b/desktop/src/main/resources/images/window_icon.png differ diff --git a/desktop/src/main/resources/images/window_icon@2x.png b/desktop/src/main/resources/images/window_icon@2x.png index a832a50c..569ff595 100644 Binary files a/desktop/src/main/resources/images/window_icon@2x.png and b/desktop/src/main/resources/images/window_icon@2x.png differ