From 8e93e4be0b9f4a31c22a4a1ccec15cdf2c4fad75 Mon Sep 17 00:00:00 2001 From: Oscar Guindzberg Date: Sun, 11 Oct 2020 20:42:53 -0300 Subject: [PATCH] Use aesKey in Wallet.toString() --- core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java | 2 +- core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java index 39eda3be0a..7fd1229cfa 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java @@ -208,7 +208,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener @Override String getWalletAsString(boolean includePrivKeys) { - return wallet.toString(true, includePrivKeys, null, true, true, walletsSetup.getChain()) + "\n\n" + + return wallet.toString(true, includePrivKeys, this.aesKey, true, true, walletsSetup.getChain()) + "\n\n" + "All pubKeys as hex:\n" + wallet.printAllPubKeysAsHex(); } diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java index e21ce45b99..50f0f31364 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java @@ -138,10 +138,11 @@ public class BtcWalletService extends WalletService { String getWalletAsString(boolean includePrivKeys) { StringBuilder sb = new StringBuilder(); getAddressEntryListAsImmutableList().forEach(e -> sb.append(e.toString()).append("\n")); + //boolean reallyIncludePrivKeys = includePrivKeys && !wallet.isEncrypted(); return "Address entry list:\n" + sb.toString() + "\n\n" + - wallet.toString(true, includePrivKeys, null, true, true, walletsSetup.getChain()) + "\n\n" + + wallet.toString(true, includePrivKeys, this.aesKey, true, true, walletsSetup.getChain()) + "\n\n" + "All pubKeys as hex:\n" + wallet.printAllPubKeysAsHex(); }