Factor out shared segwit keychain setup to WalletsManager

Move consecutive maybeAddSegwitKeychain(..) calls for the BTC & BSQ
wallets from BisqSetup to WalletsManager, as the latter class is used
for operations which should be applied to both wallets and this moves
the logic closer to the wallet domain.

Also migrate a BSQ address validator in one of the test mock classes
from Base58AddressValidator to BitcoinAddressValidator (missed earlier).

core/src/main/java/bisq/core/api/CoreWalletsService.java

@@ -31,7 +31,6 @@
 import bisq.core.btc.exceptions.WalletException;
 import bisq.core.btc.model.AddressEntry;
 import bisq.core.btc.model.BsqTransferModel;
-import bisq.core.btc.setup.WalletsSetup;
 import bisq.core.btc.wallet.BsqTransferService;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
@@ -97,7 +96,6 @@ class CoreWalletsService {
     private final CoreContext coreContext;
     private final Balances balances;
     private final WalletsManager walletsManager;
-    private final WalletsSetup walletsSetup;
     private final BsqWalletService bsqWalletService;
     private final BsqTransferService bsqTransferService;
     private final BsqFormatter bsqFormatter;
@@ -119,7 +117,6 @@ public CoreWalletsService(AppStartupState appStartupState,
                               CoreContext coreContext,
                               Balances balances,
                               WalletsManager walletsManager,
-                              WalletsSetup walletsSetup,
                               BsqWalletService bsqWalletService,
                               BsqTransferService bsqTransferService,
                               BsqFormatter bsqFormatter,
@@ -131,7 +128,6 @@ public CoreWalletsService(AppStartupState appStartupState,
         this.coreContext = coreContext;
         this.balances = balances;
         this.walletsManager = walletsManager;
-        this.walletsSetup = walletsSetup;
         this.bsqWalletService = bsqWalletService;
         this.bsqTransferService = bsqTransferService;
         this.bsqFormatter = bsqFormatter;
@@ -581,8 +577,7 @@ private void maybeSetWalletsManagerKey() {
         if (btcWalletService.getAesKey() == null || bsqWalletService.getAesKey() == null) {
             KeyParameter aesKey = new KeyParameter(tempAesKey.getKey());
             walletsManager.setAesKey(aesKey);
-            walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().btcWallet(), aesKey, false);
-            walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().bsqWallet(), aesKey, true);
+            walletsManager.maybeAddSegwitKeychains(aesKey);
         }
     }
 

core/src/main/java/bisq/core/app/BisqSetup.java

@@ -423,10 +423,7 @@ private void initWallet() {
             if (requestWalletPasswordHandler != null) {
                 requestWalletPasswordHandler.accept(aesKey -> {
                     walletsManager.setAesKey(aesKey);
-                    walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().btcWallet(),
-                            aesKey, false);
-                    walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().bsqWallet(),
-                            aesKey, true);
+                    walletsManager.maybeAddSegwitKeychains(aesKey);
                     if (getResyncSpvSemaphore()) {
                         if (showFirstPopupIfResyncSPVRequestedHandler != null)
                             showFirstPopupIfResyncSPVRequestedHandler.run();

core/src/main/java/bisq/core/btc/wallet/WalletsManager.java

@@ -91,7 +91,9 @@ public String getWalletsAsString(boolean includePrivKeys) {
         return baseCurrencyWalletDetails + bsqWalletDetails;
     }
 
-    public void restoreSeedWords(@Nullable DeterministicSeed seed, ResultHandler resultHandler, ExceptionHandler exceptionHandler) {
+    public void restoreSeedWords(@Nullable DeterministicSeed seed,
+                                 ResultHandler resultHandler,
+                                 ExceptionHandler exceptionHandler) {
         walletsSetup.restoreSeedWords(seed, resultHandler, exceptionHandler);
     }
 
@@ -140,7 +142,15 @@ public void setAesKey(KeyParameter aesKey) {
         tradeWalletService.setAesKey(aesKey);
     }
 
-    public DeterministicSeed getDecryptedSeed(KeyParameter aesKey, DeterministicSeed keyChainSeed, KeyCrypter keyCrypter) {
+    public void maybeAddSegwitKeychains(KeyParameter aesKey) {
+        var walletConfig = walletsSetup.getWalletConfig();
+        walletConfig.maybeAddSegwitKeychain(walletConfig.btcWallet(), aesKey, false);
+        walletConfig.maybeAddSegwitKeychain(walletConfig.bsqWallet(), aesKey, true);
+    }
+
+    public DeterministicSeed getDecryptedSeed(KeyParameter aesKey,
+                                              DeterministicSeed keyChainSeed,
+                                              KeyCrypter keyCrypter) {
         if (keyCrypter != null) {
             return keyChainSeed.decrypt(keyCrypter, "", aesKey);
         } else {

core/src/test/java/bisq/core/locale/MockTestnetCoin.java

@@ -17,17 +17,15 @@
 
 package bisq.core.locale;
 
+import bisq.asset.AddressValidationResult;
+import bisq.asset.BitcoinAddressValidator;
+import bisq.asset.Coin;
+
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;
 import org.bitcoinj.params.RegTestParams;
 import org.bitcoinj.params.TestNet3Params;
 
-
-
-import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58AddressValidator;
-import bisq.asset.Coin;
-
 public class MockTestnetCoin extends Coin {
 
     public MockTestnetCoin(Network network, NetworkParameters networkParameters) {
@@ -55,7 +53,7 @@ public Regtest() {
         }
     }
 
-    public static class BSQAddressValidator extends Base58AddressValidator {
+    public static class BSQAddressValidator extends BitcoinAddressValidator {
 
         public BSQAddressValidator(NetworkParameters networkParameters) {
             super(networkParameters);