completing merge

.gitignore

@@ -39,3 +39,4 @@ deploy
 */.factorypath
 .flatpak-builder
 exchange.haveno.Haveno.yaml
+hs_ed25519_secret_key

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

@@ -476,9 +476,9 @@ public class HavenoUtils {
         case XMR_STAGENET:
             return "5B11hTJdG2XDNwjdKGLRxwSLwDhkbGg7C7UEAZBxjE6FbCeRMjudrpNACmDNtWPiSnNfjDQf39QRjdtdgoL69txv81qc2Mc";
         case XMR_MAINNET:
-            throw new RuntimeException("Mainnet fee address not implemented");
+            return "8BTqDom6yukimzKTaLX7d4EgxznKUqTLjebpvUySkWGcg9irMqUwiHKccCTZ8dMu7CG3Ac89H7kqifpCwjCeWd2GUhhxy1F";
         default:
-            throw new RuntimeException("Unhandled base currency network: " + Config.baseCurrencyNetwork());
+            return "8BTqDom6yukimzKTaLX7d4EgxznKUqTLjebpvUySkWGcg9irMqUwiHKccCTZ8dMu7CG3Ac89H7kqifpCwjCeWd2GUhhxy1F";
         }
     }
 

core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java

@@ -111,7 +111,7 @@ public class XmrWalletService extends XmrWalletBase {
     public static final String MONERO_WALLET_RPC_NAME = Utilities.isWindows() ? "monero-wallet-rpc.exe" : "monero-wallet-rpc";
     public static final String MONERO_WALLET_RPC_PATH = MONERO_BINS_DIR + File.separator + MONERO_WALLET_RPC_NAME;
     public static final MoneroTxPriority PROTOCOL_FEE_PRIORITY = MoneroTxPriority.DEFAULT;
-    public static final int MONERO_LOG_LEVEL = -1; // monero library log level, -1 to disable
+    public static final int MONERO_LOG_LEVEL = 1; // monero library log level, -1 to disable
     private static final MoneroNetworkType MONERO_NETWORK_TYPE = getMoneroNetworkType();
     private static final MoneroWalletRpcManager MONERO_WALLET_RPC_MANAGER = new MoneroWalletRpcManager();
     private static final String MONERO_WALLET_RPC_USERNAME = "haveno_user";
@@ -120,8 +120,8 @@ public class XmrWalletService extends XmrWalletBase {
     private static final String KEYS_FILE_POSTFIX = ".keys";
     private static final String ADDRESS_FILE_POSTFIX = ".address.txt";
     private static final int NUM_MAX_WALLET_BACKUPS = 2;
-    private static final int MAX_SYNC_ATTEMPTS = 3;
+    private static final int MAX_SYNC_ATTEMPTS = 5;
-    private static final boolean PRINT_RPC_STACK_TRACE = false;
+    private static final boolean PRINT_RPC_STACK_TRACE = true;
     private static final String THREAD_ID = XmrWalletService.class.getSimpleName();
     private static final long SHUTDOWN_TIMEOUT_MS = 60000;
     private static final long NUM_BLOCKS_BEHIND_TOLERANCE = 5;

core/src/main/resources/haveno.policy

@@ -93,7 +93,7 @@ grant {
 
   /* user data dir for Mac, Linux, Windows */
   permission "java.io.FilePermission" "${user.home}${/}Library${/}Application Support${/}-", "read,write,delete";
-  permission "java.io.FilePermission" "${user.home}${/}.local${/}share${/}haveno-", "read,write,delete";
+  permission "java.io.FilePermission" "${user.home}${/}.local${/}share${/}-", "read,write,delete";
   permission "java.io.FilePermission" "${appdata}${/}haveno-", "read,write,delete";
 
   /* temp dir Mac, Linux, Windows TODO */

docker/config/nodes/haveno_seednode_3/hostname

@@ -0,0 +1 @@
+ajbqx4clnjlr7lmzoftuvpvmqafdiilidsgocvokx6bqj3okk56ccfqd.onion