remove stack trace, request switch on poll until fully initialized

Author: woodser

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

@@ -2814,6 +2814,7 @@ private void doPollWallet() {
         }
 
         // poll wallet
+        MoneroRpcConnection sourceConnection = xmrConnectionService.getConnection();
         try {
 
             // skip if shut down started
@@ -2906,7 +2907,6 @@ private void doPollWallet() {
 
                 // rescan spent outputs to detect unconfirmed payout tx
                 if (isPayoutExpected && wallet.getBalance().compareTo(BigInteger.ZERO) > 0) {
-                    MoneroRpcConnection sourceConnection = xmrConnectionService.getConnection();
                     try {
                         rescanSpent(true);
                     } catch (Exception e) {
@@ -2956,7 +2956,10 @@ private void doPollWallet() {
                 }
             }
         } catch (Exception e) {
-            if (HavenoUtils.isUnresponsive(e)) {
+            if (!(e instanceof IllegalStateException) && !isShutDownStarted && !wasWalletPolled.get()) { // request connection switch if failure on first poll
+                ThreadUtils.execute(() -> requestSwitchToNextBestConnection(sourceConnection), getId());
+            }
+            if (HavenoUtils.isUnresponsive(e)) { // wallet can be stuck a while
                 if (isShutDownStarted) forceCloseWallet();
                 else forceRestartTradeWallet();
             } else {

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

@@ -113,7 +113,6 @@ public void onSyncProgress(long height, long startHeight, long endHeight, double
                 } catch (Exception e) {
                     if (wallet != null && !isShutDownStarted) {
                         log.warn("Error getting wallet height while syncing with progress: " + e.getMessage());
-                        log.warn(ExceptionUtils.getStackTrace(e));
                     }
                     return;
                 }
@@ -133,12 +132,12 @@ public void onSyncProgress(long height, long startHeight, long endHeight, double
             // stop polling
             syncProgressLooper.stop();
             syncProgressTimeout.stop();
+            isSyncingWithProgress = false;
             if (wallet != null) { // can become null if interrupted by force close
                 if (syncProgressError == null || !HavenoUtils.isUnresponsive(syncProgressError)) { // TODO: skipping stop sync if unresponsive because wallet will hang. if unresponsive, wallet is assumed to be force restarted by caller, but that should be done internally here instead of externally?
                     wallet.stopSyncing();
                 }
             }
-            isSyncingWithProgress = false;
             if (syncProgressError != null) throw new RuntimeException(syncProgressError);
         }
     }
@@ -164,7 +163,7 @@ public void saveWalletWithDelay() {
     // --------------------------------- ABSTRACT -----------------------------
 
     public static boolean isSyncWithProgressTimeout(Throwable e) {
-        return e.getMessage().equals(SYNC_PROGRESS_TIMEOUT_MSG);
+        return e.getMessage().contains(SYNC_PROGRESS_TIMEOUT_MSG);
     }
 
     public abstract void saveWallet();