Merge 3589b4890d into 11c0f7613b

Co-authored-by: niyid <neeyeed@gmail.com>

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-22.04, macos-13, windows-latest]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -37,7 +37,7 @@ jobs:
           name: cached-localnet
           path: .localnet
       - name: Install dependencies
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt update
           sudo apt install -y rpm
@@ -55,7 +55,7 @@ jobs:
 
       # get version from jar
       - name: Set Version Unix
-        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-13' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-13' }}
         run: |
           export VERSION=$(ls desktop/build/temp-*/binaries/desktop-*.jar.SHA-256 | grep -Eo 'desktop-[0-9]+\.[0-9]+\.[0-9]+' | sed 's/desktop-//')
           echo "VERSION=$VERSION" >> $GITHUB_ENV
@@ -67,10 +67,12 @@ jobs:
         shell: powershell
 
       - name: Move Release Files on Unix
-        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-13' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' || matrix.os == 'macos-13' }}
         run: |
           mkdir ${{ github.workspace }}/release
-          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+          if [ "${{ matrix.os }}" == "ubuntu-22.04" ]; then
+            mkdir ${{ github.workspace }}/release-rpm
+            mkdir ${{ github.workspace }}/release-deb
             mv desktop/build/temp-*/binaries/haveno-*.rpm ${{ github.workspace }}/release-rpm/Haveno-x86_64.rpm
             mv desktop/build/temp-*/binaries/haveno_*.deb ${{ github.workspace }}/release-deb/Haveno-x86_64.deb
           else
@@ -104,13 +106,13 @@ jobs:
       # linux
       - uses: actions/upload-artifact@v3
         name: "Linux - deb artifact"
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         with:
           name: haveno-${{ env.VERSION }}-linux-deb
           path: ${{ github.workspace }}/release-deb
       - uses: actions/upload-artifact@v3
         name: "Linux - rpm artifact"
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         with:
           name: haveno-${{ env.VERSION }}-linux-rpm
           path: ${{ github.workspace }}/release-rpm

README.md

@@ -72,7 +72,7 @@ To bring Haveno to life, we need resources. If you have the possibility, please
 ### Monero
 
 <p>
-  <img src="https://raw.githubusercontent.com/haveno-dex/haveno/master/media/donate_monero.png" alt="Donate Monero" width="150" height="150"><br>
+  <img src="https://raw.githubusercontent.com/haveno-dex/haveno/master/media/donate_monero.png" alt="Donate Monero" width="115" height="115"><br>
   <code>42sjokkT9FmiWPqVzrWPFE5NCJXwt96bkBozHf4vgLR9hXyJDqKHEHKVscAARuD7in5wV1meEcSTJTanCTDzidTe2cFXS1F</code>
 </p>
 
@@ -81,6 +81,6 @@ If you are using a wallet that supports OpenAlias (like the 'official' CLI and G
 ### Bitcoin
 
 <p>
-  <img src="https://raw.githubusercontent.com/haveno-dex/haveno/master/media/donate_bitcoin.png" alt="Donate Bitcoin" width="150" height="150"><br>
+  <img src="https://raw.githubusercontent.com/haveno-dex/haveno/master/media/donate_bitcoin.png" alt="Donate Bitcoin" width="115" height="115"><br>
   <code>1AKq3CE1yBAnxGmHXbNFfNYStcByNDc5gQ</code>
 </p>

apitest/src/main/java/haveno/apitest/ApiTestMain.java

@@ -78,7 +78,7 @@ public class ApiTestMain {
 
         } catch (Throwable ex) {
             err.println("Fault: An unexpected error occurred. " +
-                    "Please file a report at https://haveno.exchange/issues");
+                    "Please file a report at https://github.com/haveno-dex/haveno/issues");
             ex.printStackTrace(err);
             exit(EXIT_FAILURE);
         }

build.gradle

@@ -49,7 +49,7 @@ configure(subprojects) {
         gsonVersion = '2.8.5'
         guavaVersion = '32.1.1-jre'
         guiceVersion = '7.0.0'
-        moneroJavaVersion = '0.8.31'
+        moneroJavaVersion = '0.8.33'
         httpclient5Version = '5.0'
         hamcrestVersion = '2.2'
         httpclientVersion = '4.5.12'
@@ -334,6 +334,7 @@ configure(project(':p2p')) {
         implementation "com.google.protobuf:protobuf-java:$protobufVersion"
         implementation "org.fxmisc.easybind:easybind:$easybindVersion"
         implementation "org.slf4j:slf4j-api:$slf4jVersion"
+        implementation "org.apache.commons:commons-lang3:$langVersion"
         implementation("com.github.haveno-dex.netlayer:tor.external:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }

common/src/main/java/haveno/common/app/Log.java

@@ -21,6 +21,7 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.classic.filter.ThresholdFilter;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
 import ch.qos.logback.core.rolling.RollingFileAppender;
@@ -52,11 +53,12 @@ public class Log {
 
         SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<>();
         triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
+        triggeringPolicy.setContext(loggerContext);
         triggeringPolicy.start();
 
         PatternLayoutEncoder encoder = new PatternLayoutEncoder();
         encoder.setContext(loggerContext);
-        encoder.setPattern("%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg %xEx%n");
+        encoder.setPattern("%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{15}: %msg%n");
         encoder.start();
 
         appender.setEncoder(encoder);
@@ -64,25 +66,43 @@ public class Log {
         appender.setTriggeringPolicy(triggeringPolicy);
         appender.start();
 
-        logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-        logbackLogger.addAppender(appender);
-        logbackLogger.setLevel(Level.INFO);
-
         // log errors in separate file
-        // not working as expected still.... damn logback...
-       /* FileAppender errorAppender = new FileAppender();
-        errorAppender.setEncoder(encoder);
+        PatternLayoutEncoder errorEncoder = new PatternLayoutEncoder();
+        errorEncoder.setContext(loggerContext);
+        errorEncoder.setPattern("%d{MMM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n%ex");
+        errorEncoder.start();
+
+        RollingFileAppender<ILoggingEvent> errorAppender = new RollingFileAppender<>();
+        errorAppender.setEncoder(errorEncoder);
         errorAppender.setName("Error");
         errorAppender.setContext(loggerContext);
         errorAppender.setFile(fileName + "_error.log");
-        LevelFilter levelFilter = new LevelFilter();
-        levelFilter.setLevel(Level.ERROR);
-        levelFilter.setOnMatch(FilterReply.ACCEPT);
-        levelFilter.setOnMismatch(FilterReply.DENY);
-        levelFilter.start();
-        errorAppender.addFilter(levelFilter);
+
+        FixedWindowRollingPolicy errorRollingPolicy = new FixedWindowRollingPolicy();
+        errorRollingPolicy.setContext(loggerContext);
+        errorRollingPolicy.setParent(errorAppender);
+        errorRollingPolicy.setFileNamePattern(fileName + "_error_%i.log");
+        errorRollingPolicy.setMinIndex(1);
+        errorRollingPolicy.setMaxIndex(20);
+        errorRollingPolicy.start();
+
+        SizeBasedTriggeringPolicy<ILoggingEvent> errorTriggeringPolicy = new SizeBasedTriggeringPolicy<>();
+        errorTriggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
+        errorTriggeringPolicy.start();
+
+        ThresholdFilter thresholdFilter = new ThresholdFilter();
+        thresholdFilter.setLevel("WARN");
+        thresholdFilter.start();
+
+        errorAppender.setRollingPolicy(errorRollingPolicy);
+        errorAppender.setTriggeringPolicy(errorTriggeringPolicy);
+        errorAppender.addFilter(thresholdFilter);
         errorAppender.start();
-        logbackLogger.addAppender(errorAppender);*/
+
+        logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+        logbackLogger.addAppender(errorAppender);
+        logbackLogger.addAppender(appender);
+        logbackLogger.setLevel(Level.INFO);
     }
 
     public static void setCustomLogLevel(String pattern, Level logLevel) {

common/src/main/java/haveno/common/file/FileUtil.java

@@ -68,8 +68,7 @@ public class FileUtil {
 
                     pruneBackup(backupFileDir, numMaxBackupFiles);
                 } catch (IOException e) {
-                    log.error("Backup key failed: " + e.getMessage());
-                    e.printStackTrace();
+                    log.error("Backup key failed: {}\n", e.getMessage(), e);
                 }
             }
         }
@@ -97,7 +96,7 @@ public class FileUtil {
         try {
             FileUtils.deleteDirectory(backupFileDir);
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("Delete backup key failed: {}\n", e.getMessage(), e);
         }
     }
 
@@ -173,8 +172,7 @@ public class FileUtil {
                 }
             }
         } catch (Throwable t) {
-            log.error(t.toString());
-            t.printStackTrace();
+            log.error("Could not delete file, error={}\n", t.getMessage(), t);
             throw new IOException(t);
         }
     }

common/src/main/java/haveno/common/setup/CommonSetup.java

@@ -69,11 +69,7 @@ public class CommonSetup {
                     "The system tray is not supported on the current platform.".equals(throwable.getMessage())) {
                 log.warn(throwable.getMessage());
             } else {
-                log.error("Uncaught Exception from thread " + Thread.currentThread().getName());
-                log.error("throwableMessage= " + throwable.getMessage());
-                log.error("throwableClass= " + throwable.getClass());
-                log.error("Stack trace:\n" + ExceptionUtils.getStackTrace(throwable));
-                throwable.printStackTrace();
+                log.error("Uncaught Exception from thread {}, error={}\n", Thread.currentThread().getName(), throwable.getMessage(), throwable);
                 UserThread.execute(() -> uncaughtExceptionHandler.handleUncaughtException(throwable, false));
             }
         };
@@ -113,8 +109,7 @@ public class CommonSetup {
             if (!pathOfCodeSource.endsWith("classes"))
                 log.info("Path to Haveno jar file: " + pathOfCodeSource);
         } catch (URISyntaxException e) {
-            log.error(e.toString());
-            e.printStackTrace();
+            log.error(ExceptionUtils.getStackTrace(e));
         }
     }
 }

common/src/main/java/haveno/common/taskrunner/TaskRunner.java

@@ -25,6 +25,8 @@ import java.util.Arrays;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 @Slf4j
 public class TaskRunner<T extends Model> {
     private final Queue<Class<? extends Task<T>>> tasks = new LinkedBlockingQueue<>();
@@ -67,8 +69,8 @@ public class TaskRunner<T extends Model> {
                     log.info("Run task: " + currentTask.getSimpleName());
                     currentTask.getDeclaredConstructor(TaskRunner.class, sharedModelClass).newInstance(this, sharedModel).run();
                 } catch (Throwable throwable) {
-                    throwable.printStackTrace();
-                    handleErrorMessage("Error at taskRunner: " + throwable.getMessage());
+                    log.error(ExceptionUtils.getStackTrace(throwable));
+                    handleErrorMessage("Error at taskRunner, error=" + throwable.getMessage());
                 }
             } else {
                 resultHandler.handleResult();

common/src/main/java/haveno/common/util/Utilities.java

@@ -331,8 +331,7 @@ public class Utilities {
                 clipboard.setContent(clipboardContent);
             }
         } catch (Throwable e) {
-            log.error("copyToClipboard failed " + e.getMessage());
-            e.printStackTrace();
+            log.error("copyToClipboard failed: {}\n", e.getMessage(), e);
         }
     }
 

core/src/main/java/haveno/core/api/CoreDisputesService.java

@@ -52,6 +52,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -204,7 +207,7 @@ public class CoreDisputesService {
                     throw new IllegalStateException(errMessage, err);
                 });
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(ExceptionUtils.getStackTrace(e));
                 throw new IllegalStateException(e.getMessage() == null ? ("Error resolving dispute for trade " + trade.getId()) : e.getMessage());
             }
         }

core/src/main/java/haveno/core/api/CoreTradesService.java

@@ -66,6 +66,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.bitcoinj.core.Coin;
 
 @Singleton
@@ -161,7 +163,7 @@ class CoreTradesService {
                     errorMessageHandler
             );
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(ExceptionUtils.getStackTrace(e));
             errorMessageHandler.handleErrorMessage(e.getMessage());
         }
     }

core/src/main/java/haveno/core/api/XmrConnectionService.java

@@ -41,6 +41,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.ObjectProperty;
@@ -464,7 +467,7 @@ public final class XmrConnectionService {
                     log.info(getClass() + ".onAccountOpened() called");
                     initialize();
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Error initializing connection service after account opened, error={}\n", e.getMessage(), e);
                     throw new RuntimeException(e);
                 }
             }
@@ -622,8 +625,7 @@ public final class XmrConnectionService {
                 log.info("Starting local node");
                 xmrLocalNode.startMoneroNode();
             } catch (Exception e) {
-                log.warn("Unable to start local monero node: " + e.getMessage());
-                e.printStackTrace();
+                log.error("Unable to start local monero node, error={}\n", e.getMessage(), e);
             }
         }
     }
@@ -721,8 +723,8 @@ public final class XmrConnectionService {
 
                     // log error message periodically
                     if (lastLogPollErrorTimestamp == null || System.currentTimeMillis() - lastLogPollErrorTimestamp > HavenoUtils.LOG_POLL_ERROR_PERIOD_MS) {
-                        log.warn("Failed to fetch daemon info, trying to switch to best connection: " + e.getMessage());
-                        if (DevEnv.isDevMode()) e.printStackTrace();
+                        log.warn("Failed to fetch daemon info, trying to switch to best connection, error={}", e.getMessage());
+                        if (DevEnv.isDevMode()) log.error(ExceptionUtils.getStackTrace(e));
                         lastLogPollErrorTimestamp = System.currentTimeMillis();
                     }
 

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

@@ -124,7 +124,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven
             System.exit(EXIT_FAILURE);
         } catch (Throwable ex) {
             System.err.println("fault: An unexpected error occurred. " +
-                    "Please file a report at https://haveno.exchange/issues");
+                    "Please file a report at https://github.com/haveno-dex/haveno/issues");
             ex.printStackTrace(System.err);
             System.exit(EXIT_FAILURE);
         }
@@ -201,8 +201,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven
                     startApplication();
                 }
             } catch (InterruptedException | ExecutionException e) {
-                log.error("An error occurred: {}", e.getMessage());
-                e.printStackTrace();
+                log.error("An error occurred: {}\n", e.getMessage(), e);
             }
         });
     }
@@ -362,7 +361,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven
             try {
                 ThreadUtils.awaitTasks(tasks, tasks.size(), 90000l); // run in parallel with timeout
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Failed to notify all services to prepare for shutdown: {}\n", e.getMessage(), e);
             }
 
             injector.getInstance(TradeManager.class).shutDown();
@@ -397,8 +396,7 @@ public abstract class HavenoExecutable implements GracefulShutDownHandler, Haven
                 });
             });
         } catch (Throwable t) {
-            log.error("App shutdown failed with exception {}", t.toString());
-            t.printStackTrace();
+            log.error("App shutdown failed with exception: {}\n", t.getMessage(), t);
             completeShutdown(resultHandler, EXIT_FAILURE, systemExit);
         }
     }

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

@@ -376,8 +376,7 @@ public class HavenoSetup {
                 moneroWalletRpcFile.setExecutable(true);
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            log.warn("Failed to install Monero binaries: " + e.toString());
+            log.warn("Failed to install Monero binaries: {}\n", e.getMessage(), e);
         }
     }
 

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

@@ -28,6 +28,9 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -48,8 +51,7 @@ public class TorSetup {
             if (resultHandler != null)
                 resultHandler.run();
         } catch (IOException e) {
-            e.printStackTrace();
-            log.error(e.toString());
+            log.error(ExceptionUtils.getStackTrace(e));
             if (errorMessageHandler != null)
                 errorMessageHandler.handleErrorMessage(e.toString());
         }

core/src/main/java/haveno/core/app/misc/ExecutableForAppWithP2p.java

@@ -123,7 +123,7 @@ public abstract class ExecutableForAppWithP2p extends HavenoExecutable {
                 try {
                     ThreadUtils.awaitTasks(tasks, tasks.size(), 120000l); // run in parallel with timeout
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error("Error awaiting tasks to complete: {}\n", e.getMessage(), e);
                 }
 
                 JsonFileManager.shutDownAllInstances();
@@ -177,8 +177,7 @@ public abstract class ExecutableForAppWithP2p extends HavenoExecutable {
                 }, 1);
             }
         } catch (Throwable t) {
-            log.debug("App shutdown failed with exception");
-            t.printStackTrace();
+            log.info("App shutdown failed with exception: {}\n", t.getMessage(), t);
             PersistenceManager.flushAllDataToDiskAtShutdown(() -> {
                 resultHandler.handleResult();
                 log.info("Graceful shutdown resulted in an error. Exiting now.");

core/src/main/java/haveno/core/offer/OpenOfferManager.java

@@ -977,7 +977,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
                 // handle result
                 resultHandler.handleResult(null);
             } catch (Exception e) {
-                if (!openOffer.isCanceled()) e.printStackTrace();
+                if (!openOffer.isCanceled()) log.error("Error processing pending offer: {}\n", e.getMessage(), e);
                 errorMessageHandler.handleErrorMessage(e.getMessage());
             }
         }).start();
@@ -1365,9 +1365,8 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
                     });
             result = true;
         } catch (Exception e) {
-            e.printStackTrace();
             errorMessage = "Exception at handleSignOfferRequest " + e.getMessage();
-            log.error(errorMessage);
+            log.error(errorMessage + "\n", e);
         } finally {
             sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), result, errorMessage);
         }
@@ -1519,8 +1518,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
             result = true;
         } catch (Throwable t) {
             errorMessage = "Exception at handleRequestIsOfferAvailableMessage " + t.getMessage();
-            log.error(errorMessage);
-            t.printStackTrace();
+            log.error(errorMessage + "\n", t);
         } finally {
             sendAckMessage(request.getClass(), peer, request.getPubKeyRing(), request.getOfferId(), request.getUid(), result, errorMessage);
         }

core/src/main/java/haveno/core/provider/fee/FeeProvider.java

@@ -59,8 +59,7 @@ public class FeeProvider extends HttpClientProvider {
             map.put(Config.BTC_TX_FEE, btcTxFee);
             map.put(Config.BTC_MIN_TX_FEE, btcMinTxFee);
         } catch (Throwable t) {
-            log.error(t.toString());
-            t.printStackTrace();
+            log.error("Error getting fees: {}\n", t.getMessage(), t);
         }
         return new Tuple2<>(tsMap, map);
     }

core/src/main/java/haveno/core/provider/price/PriceProvider.java

@@ -68,8 +68,7 @@ public class PriceProvider extends HttpClientProvider {
                 long timestampSec = MathUtils.doubleToLong((Double) treeMap.get("timestampSec"));
                 marketPriceMap.put(currencyCode, new MarketPrice(currencyCode, price, timestampSec, true));
             } catch (Throwable t) {
-                log.error(t.toString());
-                t.printStackTrace();
+                log.error("Error getting all prices: {}\n", t.getMessage(), t);
             }
 
         });

core/src/main/java/haveno/core/support/dispute/DisputeManager.java

@@ -83,6 +83,9 @@ import monero.wallet.model.MoneroTxConfig;
 import monero.wallet.model.MoneroTxWallet;
 
 import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.time.Instant;
@@ -523,7 +526,7 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
                         DisputeValidation.validateSenderNodeAddress(dispute, message.getSenderNodeAddress(), config);
                         //DisputeValidation.testIfDisputeTriesReplay(dispute, disputeList.getList());
                     } catch (DisputeValidation.ValidationException e) {
-                        e.printStackTrace();
+                        log.error(ExceptionUtils.getStackTrace(e));
                         validationExceptions.add(e);
                         throw e;
                     }
@@ -532,9 +535,9 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
                     try {
                         DisputeValidation.validatePaymentAccountPayload(dispute); // TODO: add field to dispute details: valid, invalid, missing
                     } catch (Exception e) {
-                        e.printStackTrace();
-                        log.warn(e.getMessage());
+                        log.error(ExceptionUtils.getStackTrace(e));
                         trade.prependErrorMessage(e.getMessage());
+                        throw e;
                     }
 
                     // get sender
@@ -606,9 +609,8 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
                         }
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.error(ExceptionUtils.getStackTrace(e));
                     errorMessage = e.getMessage();
-                    log.warn(errorMessage);
                     if (trade != null) trade.setErrorMessage(errorMessage);
                 }
 

core/src/main/java/haveno/core/support/dispute/DisputeSummaryVerification.java

@@ -71,7 +71,7 @@ public class DisputeSummaryVerification {
             disputeAgent = arbitratorManager.getDisputeAgentByNodeAddress(nodeAddress).orElse(null);
             checkNotNull(disputeAgent, "Dispute agent is null");
         } catch (Throwable e) {
-            e.printStackTrace();
+            log.error("Error verifying signature: {}\n", e.getMessage(), e);
             throw new IllegalArgumentException(Res.get("support.sigCheck.popup.invalidFormat"));
         }
 
@@ -93,7 +93,7 @@ public class DisputeSummaryVerification {
                 throw new IllegalArgumentException(Res.get("support.sigCheck.popup.failed"));
             }
         } catch (Throwable e) {
-            e.printStackTrace();
+            log.error("Error verifying signature with agent pub key ring: {}\n", e.getMessage(), e);
             throw new IllegalArgumentException(Res.get("support.sigCheck.popup.invalidFormat"));
         }
     }

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

@@ -94,6 +94,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 @Slf4j
@@ -355,7 +357,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
                     requestPersistence(trade);
                 } catch (Exception e) {
                     log.warn("Error processing dispute closed message: {}", e.getMessage());
-                    e.printStackTrace();
+                    log.warn(ExceptionUtils.getStackTrace(e));
                     requestPersistence(trade);
 
                     // nack bad message and do not reprocess
@@ -489,8 +491,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
             try {
                 feeEstimateTx = createDisputePayoutTx(trade, dispute.getContract(), disputeResult, false);
             } catch (Exception e) {
-                e.printStackTrace();
-                log.warn("Could not recreate dispute payout tx to verify fee: " + e.getMessage());
+                log.warn("Could not recreate dispute payout tx to verify fee: {}\n", e.getMessage(), e);
             }
             if (feeEstimateTx != null) {
                 BigInteger feeEstimate = feeEstimateTx.getFee();

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

@@ -999,8 +999,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     xmrWalletService.deleteWallet(getWalletName());
                     xmrWalletService.deleteWalletBackups(getWalletName());
                 } catch (Exception e) {
-                    log.warn(e.getMessage());
-                    e.printStackTrace();
+                    log.warn("Error deleting wallet for {} {}: {}\n", getClass().getSimpleName(), getId(), e.getMessage(), e);
                     setErrorMessage(e.getMessage());
                     processModel.getTradeManager().getNotificationService().sendErrorNotification("Error", e.getMessage());
                 }
@@ -1051,7 +1050,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
             synchronized (HavenoUtils.getWalletFunctionLock()) {
                 MoneroTxWallet tx = wallet.createTx(txConfig);
                 exportMultisigHex();
-                requestSaveWallet();
+                saveWallet();
                 return tx;
             }
         }
@@ -1152,7 +1151,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     throw e;
                 }
             }
-            requestSaveWallet();
+            saveWallet();
         }
         log.info("Done importing multisig hexes for {} {} in {} ms, count={}", getClass().getSimpleName(), getShortId(), System.currentTimeMillis() - startTime, multisigHexes.size());
     }
@@ -1365,6 +1364,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
             // verify fee is within tolerance by recreating payout tx
             // TODO (monero-project): creating tx will require exchanging updated multisig hex if message needs reprocessed. provide weight with describe_transfer so fee can be estimated?
             log.info("Creating fee estimate tx for {} {}", getClass().getSimpleName(), getId());
+            saveWallet(); // save wallet before creating fee estimate tx
             MoneroTxWallet feeEstimateTx = createPayoutTx();
             BigInteger feeEstimate = feeEstimateTx.getFee();
             double feeDiff = payoutTx.getFee().subtract(feeEstimate).abs().doubleValue() / feeEstimate.doubleValue(); // TODO: use BigDecimal?
@@ -1373,6 +1373,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         }
 
         // save trade state
+        saveWallet();
         requestPersistence();
 
         // submit payout tx
@@ -1536,8 +1537,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         try {
             ThreadUtils.awaitTask(shutDownTask, SHUTDOWN_TIMEOUT_MS);
         } catch (Exception e) {
-            log.warn("Error shutting down {} {}: {}", getClass().getSimpleName(), getId(), e.getMessage());
-            e.printStackTrace();
+            log.warn("Error shutting down {} {}: {}\n", getClass().getSimpleName(), getId(), e.getMessage(), e);
 
             // force close wallet
             forceCloseWallet();
@@ -2817,8 +2817,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     processing = false;
                     if (!isInitialized || isShutDownStarted) return;
                     if (isWalletConnectedToDaemon()) {
-                        e.printStackTrace();
-                        log.warn("Error polling idle trade for {} {}: {}. Monerod={}", getClass().getSimpleName(), getId(), e.getMessage(), getXmrWalletService().getXmrConnectionService().getConnection());
+                        log.warn("Error polling idle trade for {} {}: {}. Monerod={}\n", getClass().getSimpleName(), getId(), e.getMessage(), getXmrWalletService().getXmrConnectionService().getConnection(), e);
                     };
                 }
             }, getId());

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

@@ -366,8 +366,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                 trade.onShutDownStarted();
             } catch (Exception e) {
                 if (e.getMessage() != null && e.getMessage().contains("Connection reset")) return; // expected if shut down with ctrl+c
-                log.warn("Error notifying {} {} that shut down started {}", trade.getClass().getSimpleName(), trade.getId());
-                e.printStackTrace();
+                log.warn("Error notifying {} {} that shut down started: {}\n", trade.getClass().getSimpleName(), trade.getId(), e.getMessage(), e);
             }
         });
         try {
@@ -396,15 +395,13 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                 trade.shutDown();
             } catch (Exception e) {
                 if (e.getMessage() != null && (e.getMessage().contains("Connection reset") || e.getMessage().contains("Connection refused"))) return; // expected if shut down with ctrl+c
-                log.warn("Error closing {} {}", trade.getClass().getSimpleName(), trade.getId());
-                e.printStackTrace();
+                log.warn("Error closing {} {}: {}", trade.getClass().getSimpleName(), trade.getId(), e.getMessage(), e);
             }
         });
         try {
             ThreadUtils.awaitTasks(tasks);
         } catch (Exception e) {
-            log.warn("Error shutting down trades: {}", e.getMessage());
-            e.printStackTrace();
+            log.warn("Error shutting down trades: {}\n", e.getMessage(), e);
         }
     }
 
@@ -462,8 +459,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                         }
                     } catch (Exception e) {
                         if (!isShutDownStarted) {
-                            e.printStackTrace();
-                            log.warn("Error initializing {} {}: {}", trade.getClass().getSimpleName(), trade.getId(), e.getMessage());
+                            log.warn("Error initializing {} {}: {}\n", trade.getClass().getSimpleName(), trade.getId(), e.getMessage(), e);
                             trade.setInitError(e);
                         }
                     }

core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessDepositRequest.java

@@ -68,7 +68,7 @@ public class ArbitratorProcessDepositRequest extends TradeTask {
             complete();
         } catch (Throwable t) {
             this.error = t;
-            t.printStackTrace();
+            log.error("Error processing deposit request for trade {}: {}\n", trade.getId(), t.getMessage(), t);
             trade.setStateIfValidTransitionTo(Trade.State.PUBLISH_DEPOSIT_TX_REQUEST_FAILED);
             failed(t);
         }
@@ -155,15 +155,14 @@ public class ArbitratorProcessDepositRequest extends TradeTask {
                 log.info("Arbitrator published deposit txs for trade " + trade.getId());
                 trade.setStateIfValidTransitionTo(Trade.State.ARBITRATOR_PUBLISHED_DEPOSIT_TXS);
             } catch (Exception e) {
-                log.warn("Arbitrator error publishing deposit txs for trade {} {}: {}", trade.getClass().getSimpleName(), trade.getShortId(), e.getMessage());
-                e.printStackTrace();
+                log.warn("Arbitrator error publishing deposit txs for trade {} {}: {}\n", trade.getClass().getSimpleName(), trade.getShortId(), e.getMessage(), e);
                 if (!depositTxsRelayed) {
 
                     // flush txs from pool
                     try {
                         daemon.flushTxPool(processModel.getMaker().getDepositTxHash(), processModel.getTaker().getDepositTxHash());
                     } catch (Exception e2) {
-                        e2.printStackTrace();
+                        log.warn("Error flushing deposit txs from pool for trade {}: {}\n", trade.getId(), e2.getMessage(), e2);
                     }
                 }
                 throw e;

core/src/main/java/haveno/core/trade/protocol/tasks/ArbitratorProcessReserveTx.java

@@ -29,6 +29,8 @@ import monero.daemon.model.MoneroTx;
 
 import java.math.BigInteger;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 /**
  * Arbitrator verifies reserve tx from maker or taker.
  *
@@ -73,7 +75,7 @@ public class ArbitratorProcessReserveTx extends TradeTask {
                     request.getReserveTxKey(),
                     null);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error(ExceptionUtils.getStackTrace(e));
                 throw new RuntimeException("Error processing reserve tx from " + (isFromMaker ? "maker " : "taker ") + processModel.getTempTradePeerNodeAddress() + ", offerId=" + offer.getId() + ": " + e.getMessage());
             }
 

core/src/main/java/haveno/core/trade/protocol/tasks/MaybeResendDisputeClosedMessageWithPayout.java

@@ -62,7 +62,7 @@ public class MaybeResendDisputeClosedMessageWithPayout extends TradeTask {
                         HavenoUtils.arbitrationManager.closeDisputeTicket(dispute.getDisputeResultProperty().get(), dispute, dispute.getDisputeResultProperty().get().summaryNotesProperty().get(), () -> {
                             completeAux();
                         }, (errMessage, err) -> {
-                            err.printStackTrace();
+                            log.error("Failed to close dispute ticket for trade {}: {}\n", trade.getId(), errMessage, err);
                             failed(err);
                         });
                         ticketClosed = true;

core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositsConfirmedMessage.java

@@ -70,7 +70,7 @@ public class ProcessDepositsConfirmedMessage extends TradeTask {
                         try {
                             trade.importMultisigHex();
                         } catch (Exception e) {
-                            e.printStackTrace();
+                            log.warn("Error importing multisig hex on deposits confirmed for trade " + trade.getId() + ": " + e.getMessage() + "\n", e);
                         }
                     });
                 }

core/src/main/java/haveno/core/trade/protocol/tasks/ProcessInitMultisigRequest.java

@@ -32,6 +32,7 @@ import haveno.network.p2p.NodeAddress;
 import haveno.network.p2p.SendDirectMessageListener;
 import lombok.extern.slf4j.Slf4j;
 import monero.wallet.MoneroWallet;
+import monero.wallet.model.MoneroMultisigInfo;
 import monero.wallet.model.MoneroMultisigInitResult;
 
 import java.util.Arrays;
@@ -118,8 +119,17 @@ public class ProcessInitMultisigRequest extends TradeTask {
           if (processModel.getMultisigAddress() == null && peers[0].getExchangedMultisigHex() != null && peers[1].getExchangedMultisigHex() != null) {
             log.info("Importing exchanged multisig hex for trade {}", trade.getId());
             MoneroMultisigInitResult result = multisigWallet.exchangeMultisigKeys(Arrays.asList(peers[0].getExchangedMultisigHex(), peers[1].getExchangedMultisigHex()), xmrWalletService.getWalletPassword());
+
+            // check multisig state
+            MoneroMultisigInfo multisigInfo = multisigWallet.getMultisigInfo();
+            if (!multisigInfo.isMultisig()) throw new RuntimeException("Multisig wallet is not multisig on completion");
+            if (!multisigInfo.isReady()) throw new RuntimeException("Multisig wallet is not ready on completion");
+            if (multisigInfo.getThreshold() != 2) throw new RuntimeException("Multisig wallet has unexpected threshold: " + multisigInfo.getThreshold());
+            if (multisigInfo.getNumParticipants() != 3) throw new RuntimeException("Multisig wallet has unexpected number of participants: " + multisigInfo.getNumParticipants());
+
+            // set final address and save
             processModel.setMultisigAddress(result.getAddress());
-            new Thread(() -> trade.saveWallet()).start(); // save multisig wallet off thread on completion
+            trade.saveWallet();
             trade.setStateIfValidTransitionTo(Trade.State.MULTISIG_COMPLETED);
           }
 

core/src/main/java/haveno/core/trade/protocol/tasks/TradeTask.java

@@ -61,7 +61,7 @@ public abstract class TradeTask extends Task<Trade> {
 
     @Override
     protected void failed(Throwable t) {
-        t.printStackTrace();
+        log.error("Trade task failed, error={}\n", t.getMessage(), t);
         appendExceptionToErrorMessage(t);
         trade.setErrorMessage(errorMessage);
         processModel.getTradeManager().requestPersistence();

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

@@ -6,6 +6,8 @@ import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import haveno.common.Timer;
 import haveno.common.UserThread;
 import haveno.core.api.XmrConnectionService;
@@ -106,7 +108,7 @@ public class XmrWalletBase {
                     height = wallet.getHeight(); // can get read timeout while syncing
                 } catch (Exception e) {
                     log.warn("Error getting wallet height while syncing with progress: " + e.getMessage());
-                    if (wallet != null && !isShutDownStarted) e.printStackTrace();
+                    if (wallet != null && !isShutDownStarted) log.warn(ExceptionUtils.getStackTrace(e));
 
                     // stop polling and release latch
                     syncProgressError = e;

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

@@ -818,7 +818,7 @@ public class XmrWalletService extends XmrWalletBase {
         MoneroFeeEstimate feeEstimates = getDaemon().getFeeEstimate();
         BigInteger baseFeeEstimate = feeEstimates.getFees().get(2); // get elevated fee per kB
         BigInteger qmask = feeEstimates.getQuantizationMask();
-        log.info("Monero base fee estimate={}, qmask={}: " + baseFeeEstimate, qmask);
+        log.info("Monero base fee estimate={}, qmask={}", baseFeeEstimate, qmask);
 
         // get tx base fee
         BigInteger baseFee = baseFeeEstimate.multiply(BigInteger.valueOf(txWeight));
@@ -922,8 +922,7 @@ public class XmrWalletService extends XmrWalletBase {
         try {
             ThreadUtils.awaitTask(shutDownTask, SHUTDOWN_TIMEOUT_MS);
         } catch (Exception e) {
-            log.warn("Error shutting down {}: {}", getClass().getSimpleName(), e.getMessage());
-            e.printStackTrace();
+            log.warn("Error shutting down {}: {}\n", getClass().getSimpleName(), e.getMessage(), e);
 
             // force close wallet
             forceCloseMainWallet();
@@ -945,8 +944,7 @@ public class XmrWalletService extends XmrWalletBase {
             List<XmrAddressEntry> unusedAddressEntries = getUnusedAddressEntries();
             if (!unusedAddressEntries.isEmpty()) return xmrAddressEntryList.swapAvailableToAddressEntryWithOfferId(unusedAddressEntries.get(0), context, offerId);
         } catch (Exception e) {
-            log.warn("Error getting new address entry based on incoming transactions");
-            e.printStackTrace();
+            log.warn("Error getting new address entry based on incoming transactions: {}\n", e.getMessage(), e);
         }
 
         // create new entry
@@ -1172,8 +1170,7 @@ public class XmrWalletService extends XmrWalletBase {
                 try {
                     balanceListener.onBalanceChanged(balance);
                 } catch (Exception e) {
-                    log.warn("Failed to notify balance listener of change");
-                    e.printStackTrace();
+                    log.warn("Failed to notify balance listener of change: {}\n", e.getMessage(), e);
                 }
             });
         }
@@ -1309,8 +1306,7 @@ public class XmrWalletService extends XmrWalletBase {
             try {
                 doMaybeInitMainWallet(sync, MAX_SYNC_ATTEMPTS);
             } catch (Exception e) {
-                log.warn("Error initializing main wallet: " + e.getMessage());
-                e.printStackTrace();
+                log.warn("Error initializing main wallet: {}\n", e.getMessage(), e);
                 HavenoUtils.setTopError(e.getMessage());
                 throw e;
             }
@@ -1459,9 +1455,10 @@ public class XmrWalletService extends XmrWalletBase {
             log.info("Done creating full wallet " + config.getPath() + " in " + (System.currentTimeMillis() - time) + " ms");
             return walletFull;
         } catch (Exception e) {
-            e.printStackTrace();
+            String errorMsg = "Could not create wallet '" + config.getPath() + "': " + e.getMessage();
+            log.warn(errorMsg + "\n", e);
             if (walletFull != null) forceCloseWallet(walletFull, config.getPath());
-            throw new IllegalStateException("Could not create wallet '" + config.getPath() + "'");
+            throw new IllegalStateException(errorMsg);
         }
     }
 
@@ -1503,15 +1500,15 @@ public class XmrWalletService extends XmrWalletBase {
                     }
 
                     // handle success or failure
+                    File originalCacheBackup = new File(cachePath + ".backup");
                     if (retrySuccessful) {
-                        originalCacheFile.delete(); // delete original wallet cache backup
+                        if (originalCacheBackup.exists()) originalCacheBackup.delete(); // delete original wallet cache backup
                     } else {
 
                         // restore original wallet cache
                         log.warn("Failed to open full wallet using backup cache, restoring original cache");
                         File cacheFile = new File(cachePath);
                         if (cacheFile.exists()) cacheFile.delete();
-                        File originalCacheBackup = new File(cachePath + ".backup");
                         if (originalCacheBackup.exists()) originalCacheBackup.renameTo(new File(cachePath));
 
                         // throw exception
@@ -1525,9 +1522,10 @@ public class XmrWalletService extends XmrWalletBase {
             log.info("Done opening full wallet " + config.getPath());
             return walletFull;
         } catch (Exception e) {
-            e.printStackTrace();
+            String errorMsg = "Could not open full wallet '" + config.getPath() + "': " + e.getMessage();
+            log.warn(errorMsg + "\n", e);
             if (walletFull != null) forceCloseWallet(walletFull, config.getPath());
-            throw new IllegalStateException("Could not open full wallet '" + config.getPath() + "'");
+            throw new IllegalStateException(errorMsg);
         }
     }
 
@@ -1557,7 +1555,7 @@ public class XmrWalletService extends XmrWalletBase {
             log.info("Done creating RPC wallet " + config.getPath() + " in " + (System.currentTimeMillis() - time) + " ms");
             return walletRpc;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.warn("Could not create wallet '" + config.getPath() + "': " + e.getMessage() + "\n", e);
             if (walletRpc != null) forceCloseWallet(walletRpc, config.getPath());
             throw new IllegalStateException("Could not create wallet '" + config.getPath() + "'. Please close Haveno, stop all monero-wallet-rpc processes in your task manager, and restart Haveno.");
         }
@@ -1607,15 +1605,15 @@ public class XmrWalletService extends XmrWalletBase {
                     }
 
                     // handle success or failure
+                    File originalCacheBackup = new File(cachePath + ".backup");
                     if (retrySuccessful) {
-                        originalCacheFile.delete(); // delete original wallet cache backup
+                        if (originalCacheBackup.exists()) originalCacheBackup.delete(); // delete original wallet cache backup
                     } else {
 
                         // restore original wallet cache
                         log.warn("Failed to open RPC wallet using backup cache, restoring original cache");
                         File cacheFile = new File(cachePath);
                         if (cacheFile.exists()) cacheFile.delete();
-                        File originalCacheBackup = new File(cachePath + ".backup");
                         if (originalCacheBackup.exists()) originalCacheBackup.renameTo(new File(cachePath));
 
                         // throw exception
@@ -1629,7 +1627,7 @@ public class XmrWalletService extends XmrWalletBase {
             log.info("Done opening RPC wallet " + config.getPath());
             return walletRpc;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.warn("Could not open wallet '" + config.getPath() + "': " + e.getMessage() + "\n", e);
             if (walletRpc != null) forceCloseWallet(walletRpc, config.getPath());
             throw new IllegalStateException("Could not open wallet '" + config.getPath() + "'. Please close Haveno, stop all monero-wallet-rpc processes in your task manager, and restart Haveno.\n\nError message: " + e.getMessage());
         }
@@ -1733,7 +1731,7 @@ public class XmrWalletService extends XmrWalletBase {
                 wallet.changePassword(oldPassword, newPassword);
                 saveMainWallet();
             } catch (Exception e) {
-                e.printStackTrace();
+                log.warn("Error changing main wallet password: " + e.getMessage() + "\n", e);
                 throw e;
             }
         });
@@ -1916,7 +1914,7 @@ public class XmrWalletService extends XmrWalletBase {
                         cacheWalletInfo();
                         requestSaveMainWallet();
                     } catch (Exception e) {
-                        e.printStackTrace();
+                        log.warn("Error caching wallet info: " + e.getMessage() + "\n", e);
                     }
                 }
             }

desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsListItem.java

@@ -54,6 +54,7 @@ class TransactionsListItem {
     private boolean received;
     private boolean detailsAvailable;
     private BigInteger amount = BigInteger.ZERO;
+    private BigInteger txFee = BigInteger.ZERO;
     private String memo = "";
     private long confirmations = 0;
     @Getter
@@ -107,6 +108,7 @@ class TransactionsListItem {
             amount = valueSentFromMe.multiply(BigInteger.valueOf(-1));
             received = false;
             direction = Res.get("funds.tx.direction.sentTo");
+            txFee = tx.getFee().multiply(BigInteger.valueOf(-1));
         }
 
         if (optionalTradable.isPresent()) {
@@ -201,6 +203,14 @@ class TransactionsListItem {
         return amount;
     }
 
+    public BigInteger getTxFee() {
+        return txFee;
+    }
+
+    public String getTxFeeStr() {
+        return txFee.equals(BigInteger.ZERO) ? "" : HavenoUtils.formatXmr(txFee);
+    }
+
     public String getAddressString() {
         return addressString;
     }

desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.fxml

@@ -36,7 +36,8 @@
             <TableColumn fx:id="detailsColumn" minWidth="220" maxWidth="220"/>
             <TableColumn fx:id="addressColumn" minWidth="260"/>
             <TableColumn fx:id="transactionColumn" minWidth="180"/>
-            <TableColumn fx:id="amountColumn" minWidth="130" maxWidth="130"/>
+            <TableColumn fx:id="amountColumn" minWidth="110" maxWidth="110"/>
+            <TableColumn fx:id="txFeeColumn" minWidth="110" maxWidth="110"/>
             <TableColumn fx:id="memoColumn" minWidth="40"/>
             <TableColumn fx:id="confidenceColumn" minWidth="120" maxWidth="130"/>
             <TableColumn fx:id="revertTxColumn" sortable="false" minWidth="110" maxWidth="110" visible="false"/>

desktop/src/main/java/haveno/desktop/main/funds/transactions/TransactionsView.java

@@ -70,7 +70,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
     @FXML
     TableView<TransactionsListItem> tableView;
     @FXML
-    TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, detailsColumn, addressColumn, transactionColumn, amountColumn, memoColumn, confidenceColumn, revertTxColumn;
+    TableColumn<TransactionsListItem, TransactionsListItem> dateColumn, detailsColumn, addressColumn, transactionColumn, amountColumn, txFeeColumn, memoColumn, confidenceColumn, revertTxColumn;
     @FXML
     Label numItems;
     @FXML
@@ -89,7 +89,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
     private EventHandler<KeyEvent> keyEventEventHandler;
     private Scene scene;
 
-    private TransactionsUpdater transactionsUpdater = new TransactionsUpdater();
+    private final TransactionsUpdater transactionsUpdater = new TransactionsUpdater();
 
     private class TransactionsUpdater extends MoneroWalletListener {
         @Override
@@ -129,11 +129,12 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
         addressColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.address")));
         transactionColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.txId", Res.getBaseCurrencyCode())));
         amountColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amountWithCur", Res.getBaseCurrencyCode())));
+        txFeeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.txFee", Res.getBaseCurrencyCode())));
         memoColumn.setGraphic(new AutoTooltipLabel(Res.get("funds.tx.memo")));
         confidenceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.confirmations", Res.getBaseCurrencyCode())));
         revertTxColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.revert", Res.getBaseCurrencyCode())));
 
-        tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
+        tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
         tableView.setPlaceholder(new AutoTooltipLabel(Res.get("funds.tx.noTxAvailable")));
 
         setDateColumnCellFactory();
@@ -141,6 +142,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
         setAddressColumnCellFactory();
         setTransactionColumnCellFactory();
         setAmountColumnCellFactory();
+        setTxFeeColumnCellFactory();
         setMemoColumnCellFactory();
         setConfidenceColumnCellFactory();
         setRevertTxColumnCellFactory();
@@ -156,7 +158,7 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
         addressColumn.setComparator(Comparator.comparing(item -> item.getDirection() + item.getAddressString()));
         transactionColumn.setComparator(Comparator.comparing(TransactionsListItem::getTxId));
         amountColumn.setComparator(Comparator.comparing(TransactionsListItem::getAmount));
-        confidenceColumn.setComparator(Comparator.comparingLong(item -> item.getNumConfirmations()));
+        confidenceColumn.setComparator(Comparator.comparingLong(TransactionsListItem::getNumConfirmations));
         memoColumn.setComparator(Comparator.comparing(TransactionsListItem::getMemo));
 
         dateColumn.setSortType(TableColumn.SortType.DESCENDING);
@@ -216,8 +218,9 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
                 columns[2] = item.getDirection() + " " + item.getAddressString();
                 columns[3] = item.getTxId();
                 columns[4] = item.getAmountStr();
-                columns[5] = item.getMemo() == null ? "" : item.getMemo();
-                columns[6] = String.valueOf(item.getNumConfirmations());
+                columns[5] = item.getTxFeeStr();
+                columns[6] = item.getMemo() == null ? "" : item.getMemo();
+                columns[7] = String.valueOf(item.getNumConfirmations());
                 return columns;
             };
 
@@ -414,6 +417,33 @@ public class TransactionsView extends ActivatableView<VBox, Void> {
                 });
     }
 
+
+    private void setTxFeeColumnCellFactory() {
+        txFeeColumn.setCellValueFactory((addressListItem) ->
+                new ReadOnlyObjectWrapper<>(addressListItem.getValue()));
+        txFeeColumn.setCellFactory(
+                new Callback<>() {
+
+                    @Override
+                    public TableCell<TransactionsListItem, TransactionsListItem> call(TableColumn<TransactionsListItem,
+                            TransactionsListItem> column) {
+                        return new TableCell<>() {
+
+                            @Override
+                            public void updateItem(final TransactionsListItem item, boolean empty) {
+                                super.updateItem(item, empty);
+
+                                if (item != null && !empty) {
+                                    setGraphic(new AutoTooltipLabel(item.getTxFeeStr()));
+                                } else {
+                                    setGraphic(null);
+                                }
+                            }
+                        };
+                    }
+                });
+    }
+
     private void setMemoColumnCellFactory() {
         memoColumn.setCellValueFactory((addressListItem) ->
                 new ReadOnlyObjectWrapper<>(addressListItem.getValue()));

desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java

@@ -678,7 +678,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
             closeTicketButton.disableProperty().unbind();
             hide();
         }, (errMessage, err) -> {
-            log.error(errMessage);
+            log.error("Error closing dispute ticket: " + errMessage + "\n", err);
             new Popup().error(err.toString()).show();
         });
     }

desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/TradeSubView.java

@@ -153,8 +153,7 @@ public abstract class TradeSubView extends HBox {
             tradeStepView.setChatCallback(chatCallback);
             tradeStepView.activate();
         } catch (Exception e) {
-            log.error("Creating viewClass {} caused an error {}", viewClass, e.getMessage());
-            e.printStackTrace();
+            log.error("Creating viewClass {} caused an error {}\n", viewClass, e.getMessage(), e);
         }
     }
 

desktop/src/main/java/haveno/desktop/main/shared/ChatView.java

@@ -65,6 +65,7 @@ import javafx.scene.text.TextAlignment;
 
 import javafx.geometry.Insets;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 
@@ -565,12 +566,10 @@ public class ChatView extends AnchorPane {
                             inputTextArea.setText(inputTextArea.getText() + "\n[" + Res.get("support.attachment") + " " + result.getName() + "]");
                         }
                     } catch (java.io.IOException e) {
-                        e.printStackTrace();
-                        log.error(e.getMessage());
+                        log.error(ExceptionUtils.getStackTrace(e));
                     }
                 } catch (MalformedURLException e2) {
-                    e2.printStackTrace();
-                    log.error(e2.getMessage());
+                    log.error(ExceptionUtils.getStackTrace(e2));
                 }
             }
         } else {
@@ -593,8 +592,7 @@ public class ChatView extends AnchorPane {
                 inputTextArea.setText(inputTextArea.getText() + "\n[" + Res.get("support.attachment") + " " + name + "]");
             }
         } catch (Exception e) {
-            log.error(e.toString());
-            e.printStackTrace();
+            log.error(ExceptionUtils.getStackTrace(e));
         }
     }
 
@@ -629,8 +627,7 @@ public class ChatView extends AnchorPane {
             try (FileOutputStream fileOutputStream = new FileOutputStream(file.getAbsolutePath())) {
                 fileOutputStream.write(attachment.getBytes());
             } catch (IOException e) {
-                e.printStackTrace();
-                System.out.println(e.getMessage());
+                log.error("Error opening attachment: {}\n", e.getMessage(), e);
             }
         }
     }

gradle/verification-metadata.xml

@@ -878,9 +878,9 @@
             <sha256 value="c92e2ca40a3f2474d61e56831aeb379cf8ae3dddeea61b4a828cee2d99f71f38" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.github.woodser" name="monero-java" version="0.8.31">
-         <artifact name="monero-java-0.8.31.jar">
-            <sha256 value="46b81b98bc76f60a965bc7de429ff72cf6c443858987cbd51b9cacd2f8a8d28b" origin="Generated by Gradle"/>
+      <component group="io.github.woodser" name="monero-java" version="0.8.33">
+         <artifact name="monero-java-0.8.33.jar">
+            <sha256 value="f9a02386ec0870b13a512bf5f72da464c9507e1a1ed6982716bff87641f94e81" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.grpc" name="grpc-api" version="1.42.1">

p2p/src/main/java/haveno/network/Socks5ProxyProvider.java

@@ -24,6 +24,7 @@ import haveno.common.config.Config;
 import haveno.network.p2p.network.NetworkNode;
 import java.net.UnknownHostException;
 import javax.annotation.Nullable;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -96,8 +97,7 @@ public class Socks5ProxyProvider {
                 try {
                     return new Socks5Proxy(tokens[0], Integer.valueOf(tokens[1]));
                 } catch (UnknownHostException e) {
-                    log.error(e.getMessage());
-                    e.printStackTrace();
+                    log.error(ExceptionUtils.getStackTrace(e));
                 }
             } else {
                 log.error("Incorrect format for socks5ProxyAddress. Should be: host:port.\n" +

p2p/src/main/java/haveno/network/p2p/P2PService.java

@@ -57,6 +57,8 @@ import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import lombok.Getter;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 import org.fxmisc.easybind.monadic.MonadicBinding;
@@ -433,15 +435,12 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
 
                 @Override
                 public void onFailure(@NotNull Throwable throwable) {
-                    log.error(throwable.toString());
-                    throwable.printStackTrace();
+                    log.error(ExceptionUtils.getStackTrace(throwable));
                     sendDirectMessageListener.onFault(throwable.toString());
                 }
             }, MoreExecutors.directExecutor());
         } catch (CryptoException e) {
-            e.printStackTrace();
-            log.error(message.toString());
-            log.error(e.toString());
+            log.error("Error sending encrypted direct message, message={}, error={}\n", message.toString(), e.getMessage(), e);
             sendDirectMessageListener.onFault(e.toString());
         }
     }

p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageList.java

@@ -63,8 +63,7 @@ public class MailboxMessageList extends PersistableList<MailboxItem> {
                     try {
                         return MailboxItem.fromProto(e, networkProtoResolver);
                     } catch (ProtobufferException protobufferException) {
-                        protobufferException.printStackTrace();
-                        log.error("Error at MailboxItem.fromProto: {}", protobufferException.toString());
+                        log.error("Error at MailboxItem.fromProto: {}", protobufferException.toString(), protobufferException);
                         return null;
                     }
                 })

p2p/src/main/java/haveno/network/p2p/mailbox/MailboxMessageService.java

@@ -335,8 +335,7 @@ public class MailboxMessageService implements HashMapChangedListener, PersistedD
                 }
             }, MoreExecutors.directExecutor());
         } catch (CryptoException e) {
-            log.error("sendEncryptedMessage failed");
-            e.printStackTrace();
+            log.error("sendEncryptedMessage failed: {}\n", e.getMessage(), e);
             sendMailboxMessageListener.onFault("sendEncryptedMailboxMessage failed " + e);
         }
     }
@@ -644,8 +643,7 @@ public class MailboxMessageService implements HashMapChangedListener, PersistedD
                 log.info("The mailboxEntry was already removed earlier.");
             }
         } catch (CryptoException e) {
-            e.printStackTrace();
-            log.error("Could not remove ProtectedMailboxStorageEntry from network. Error: {}", e.toString());
+            log.error("Could not remove ProtectedMailboxStorageEntry from network. Error: {}\n", e.toString(), e);
         }
     }
 

p2p/src/main/java/haveno/network/p2p/network/Connection.java

@@ -91,6 +91,8 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -511,8 +513,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
 
                         Uninterruptibles.sleepUninterruptibly(200, TimeUnit.MILLISECONDS);
                     } catch (Throwable t) {
-                        log.error(t.getMessage());
-                        t.printStackTrace();
+                        log.error(ExceptionUtils.getStackTrace(t));
                     } finally {
                         stopped = true;
                         ThreadUtils.execute(() -> doShutDown(closeConnectionReason, shutDownCompleteHandler), THREAD_ID);
@@ -537,16 +538,14 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
         } catch (SocketException e) {
             log.trace("SocketException at shutdown might be expected {}", e.getMessage());
         } catch (IOException e) {
-            log.error("Exception at shutdown. " + e.getMessage());
-            e.printStackTrace();
+            log.error("Exception at shutdown. {}\n", e.getMessage(), e);
         } finally {
             capabilitiesListeners.clear();
 
             try {
                 protoInputStream.close();
             } catch (IOException e) {
-                log.error(e.getMessage());
-                e.printStackTrace();
+                log.error(ExceptionUtils.getStackTrace(e));
             }
 
             Utilities.shutdownAndAwaitTermination(executorService, SHUTDOWN_TIMEOUT, TimeUnit.MILLISECONDS);

p2p/src/main/java/haveno/network/p2p/network/LocalhostNetworkNode.java

@@ -76,8 +76,7 @@ public class LocalhostNetworkNode extends NetworkNode {
                 try {
                     startServer(new ServerSocket(servicePort));
                 } catch (IOException e) {
-                    e.printStackTrace();
-                    log.error("Exception at startServer: " + e.getMessage());
+                    log.error("Exception at startServer: {}\n", e.getMessage(), e);
                 }
                 setupListeners.stream().forEach(SetupListener::onHiddenServicePublished);
             }, simulateTorDelayTorNode, TimeUnit.MILLISECONDS);

p2p/src/main/java/haveno/network/p2p/network/Server.java

@@ -97,11 +97,10 @@ class Server implements Runnable {
                 }
             } catch (IOException e) {
                 if (isServerActive())
-                    e.printStackTrace();
+                    log.error("Error executing server loop: {}\n", e.getMessage(), e);
             }
         } catch (Throwable t) {
-            log.error("Executing task failed. " + t.getMessage());
-            t.printStackTrace();
+            log.error("Executing task failed: {}\n", t.getMessage(), t);
         }
     }
 

p2p/src/main/java/haveno/network/p2p/storage/P2PDataStorage.java

@@ -974,8 +974,7 @@ public class P2PDataStorage implements MessageListener, ConnectionListener, Pers
                 broadcaster.broadcast(refreshTTLMessage, sender);
 
             } catch (IllegalArgumentException e) {
-                log.error("refreshTTL failed, missing data: {}", e.toString());
-                e.printStackTrace();
+                log.error("refreshTTL failed, missing data: {}\n", e.toString(), e);
                 return false;
             }
             return true;

p2p/src/main/java/haveno/network/p2p/storage/persistence/StoreService.java

@@ -116,8 +116,7 @@ public abstract class StoreService<T extends PersistableEnvelope> {
                 log.debug("Could not find resourceFile " + resourceFileName + ". That is expected if none is provided yet.");
             } catch (Throwable e) {
                 log.error("Could not copy resourceFile " + resourceFileName + " to " +
-                        destinationFile.getAbsolutePath() + ".\n" + e.getMessage());
-                e.printStackTrace();
+                        destinationFile.getAbsolutePath() + ".\n", e);
             }
         } else {
             log.debug("No resource file was copied. {} exists already.", fileName);

scripts/install_tails/README.md

@@ -2,8 +2,13 @@
 
 Install Haveno on Tails by following these steps:
 
-1. Enable persistent storage dotfiles and admin password before starting tails.
-2. Download [haveno-install.sh](haveno-install.sh).
+1. Enable persistent storage dotfiles and admin password before starting Tails.
+2. Download [haveno-install.sh](haveno-install.sh):
+    
+    ```
+    curl -fsSLO https://github.com/haveno-dex/haveno/raw/master/scripts/install_tails/haveno-install.sh
+    ```
+    
 3. Execute installation script:
     
     ```
@@ -17,3 +22,9 @@ Install Haveno on Tails by following these steps:
     ```
     
 4. Upon successful execution of the script (no errors), the Haveno release will be installed to persistent storage and can be launched via the desktop shortcut in the 'Other' section of the start menu.
+
+> [!note]
+> If you have already installed Haveno on Tails, we recommend moving your data directory (/home/amnesia/Persistent/Haveno-example) to the new default location (/home/amnesia/Persistent/haveno/Data/Haveno-example), to retain your history and for future support.
+
+> [!note]
+> Modern versions of Tails will invoke `curl` over Tor, but if your installation does not, then you can add `--socks5-hostname 127.0.0.1:9050` when invoking the install script.

scripts/install_tails/deprecated/README.md

@@ -0,0 +1,11 @@
+# Steps to use (This has serious security concerns to tails threat model only run when you need to access haveno)
+
+## 1. Enable persistent storage and admin password before starting tails
+
+## 2. Get your haveno deb file in persistent storage (amd64 version for tails)
+
+## 3. Edit the path to the haveno deb file if necessary then run ```sudo ./haveno-install.sh```
+## 4. As amnesia run ```source ~/.bashrc``` 
+## 5. Start haveno using ```haveno-tails```
+
+## You will need to run this script after each reset, but your data will be saved persistently in /home/amnesia/Persistence/Haveno

scripts/install_tails/deprecated/haveno-install.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+#############################################################################
+# Written by BrandyJson, with heavy inspiration from bisq.wiki tails script #
+#############################################################################
+echo "Installing dpkg from persistent, (1.07-1, if this is out of date change the deb path in the script or manually install after running"
+dpkg -i "/home/amnesia/Persistent/haveno_1.0.7-1_amd64.deb"
+echo -e "Allowing amnesia to read tor control port cookie, only run this script when you actually want to use haveno\n\n!!! not secure !!!\n"
+chmod o+r /var/run/tor/control.authcookie
+echo "Updating apparmor-profile"
+echo "---
+- apparmor-profiles:
+    - '/opt/haveno/bin/Haveno'
+  users:
+    - 'amnesia'
+  commands:
+    AUTHCHALLENGE:
+      - 'SAFECOOKIE .*'
+    SETEVENTS:
+      - 'CIRC ORCONN INFO NOTICE WARN ERR HS_DESC HS_DESC_CONTENT'
+    GETINFO:
+      - pattern: 'status/bootstrap-phase'
+        response:
+          - pattern: '250-status/bootstrap-phase=*'
+            replacement: '250-status/bootstrap-phase=NOTICE BOOTSTRAP PROGRESS=100 TAG=done SUMMARY="Done"'
+      - 'net/listeners/socks'
+    ADD_ONION:
+      - pattern:     'NEW:(\S+) Port=9999,(\S+)'
+        replacement: 'NEW:{} Port=9999,{client-address}:{}'
+      - pattern:     '(\S+):(\S+) Port=9999,(\S+)'
+        replacement: '{}:{} Port=9999,{client-address}:{}'
+    DEL_ONION:
+      - '.+'
+    HSFETCH:
+      - '.+'
+  events:
+    CIRC:
+      suppress: true
+    ORCONN:
+      suppress: true
+    INFO:
+      suppress: true
+    NOTICE:
+      suppress: true
+    WARN:
+      suppress: true
+    ERR:
+      suppress: true
+    HS_DESC:
+      response:
+        - pattern:     '650 HS_DESC CREATED (\S+) (\S+) (\S+) \S+ (.+)'
+          replacement: '650 HS_DESC CREATED {} {} {} redacted {}'
+        - pattern:     '650 HS_DESC UPLOAD (\S+) (\S+) .*'
+          replacement: '650 HS_DESC UPLOAD {} {} redacted redacted'
+        - pattern:     '650 HS_DESC UPLOADED (\S+) (\S+) .+'
+          replacement: '650 HS_DESC UPLOADED {} {} redacted'
+        - pattern:     '650 HS_DESC REQUESTED (\S+) NO_AUTH'
+          replacement: '650 HS_DESC REQUESTED {} NO_AUTH'
+        - pattern:     '650 HS_DESC REQUESTED (\S+) NO_AUTH \S+ \S+'
+          replacement: '650 HS_DESC REQUESTED {} NO_AUTH redacted redacted'
+        - pattern:     '650 HS_DESC RECEIVED (\S+) NO_AUTH \S+ \S+'
+          replacement: '650 HS_DESC RECEIVED {} NO_AUTH redacted redacted'
+        - pattern:     '.*'
+          replacement: ''
+    HS_DESC_CONTENT:
+      suppress: true" > /etc/onion-grater.d/haveno.yml
+echo "Adding rule to iptables to allow for monero-wallet-rpc to work"
+iptables -I OUTPUT 2 -p tcp -d 127.0.0.1 -m tcp --dport 18081 -m owner --uid-owner 1855 -j ACCEPT
+echo "Updating torsocks to allow for inbound connection"
+sed -i 's/#AllowInbound/AllowInbound/g' /etc/tor/torsocks.conf 
+
+echo "Restarting onion-grater service"
+
+systemctl restart onion-grater.service
+
+echo "alias haveno-tails='torsocks /opt/haveno/bin/Haveno --torControlPort 951 --torControlCookieFile=/var/run/tor/control.authcookie --torControlUseSafeCookieAuth --useTorForXmr=ON --userDataDir=/home/amnesia/Persistent/'" >> /home/amnesia/.bashrc
+echo -e "Everything is set up just run\n\nsource ~/.bashrc\n\nThen you can start haveno using haveno-tails"

seednode/src/main/java/haveno/seednode/SeedNodeMain.java

@@ -75,7 +75,7 @@ public class SeedNodeMain extends ExecutableForAppWithP2p {
                 seedNode = new SeedNode();
                 UserThread.execute(this::onApplicationLaunched);
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("Error launching seed node: {}\n", e.toString(), e);
             }
         });
     }