Add segwit support to the BTC wallet

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

@@ -389,6 +389,8 @@ private void initWallet() {
             if (requestWalletPasswordHandler != null) {
                 requestWalletPasswordHandler.accept(aesKey -> {
                     walletsManager.setAesKey(aesKey);
+                    walletsSetup.getWalletConfig().maybeAddSegwitKeychain(walletsSetup.getWalletConfig().btcWallet(),
+                                                                          aesKey);
                     if (preferences.isResyncSpvRequested()) {
                         if (showFirstPopupIfResyncSPVRequestedHandler != null)
                             showFirstPopupIfResyncSPVRequestedHandler.run();

core/src/main/java/bisq/core/btc/setup/WalletConfig.java

@@ -27,6 +27,7 @@
 import com.google.common.util.concurrent.*;
 import org.bitcoinj.core.listeners.*;
 import org.bitcoinj.core.*;
+import org.bitcoinj.crypto.KeyCrypter;
 import org.bitcoinj.net.BlockingClientManager;
 import org.bitcoinj.net.discovery.*;
 import org.bitcoinj.script.Script;
@@ -35,6 +36,11 @@
 
 import com.runjva.sourceforge.jsocks.protocol.Socks5Proxy;
 
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
+import org.bouncycastle.crypto.params.KeyParameter;
+
 import org.slf4j.*;
 
 import javax.annotation.*;
@@ -103,6 +109,8 @@ public class WalletConfig extends AbstractIdleService {
     @Getter
     @Setter
     private int minBroadcastConnections;
+    @Getter
+    private BooleanProperty migratedWalletToSegwit = new SimpleBooleanProperty(false);
 
     /**
      * Creates a new WalletConfig, with a newly created {@link Context}. Files will be stored in the given directory.
@@ -293,25 +301,34 @@ protected void startUp() throws Exception {
             vPeerGroup.addWallet(vBsqWallet);
             onSetupCompleted();
 
-            Futures.addCallback((ListenableFuture<?>) vPeerGroup.startAsync(), new FutureCallback<Object>() {
-                @Override
-                public void onSuccess(@Nullable Object result) {
-                    //completeExtensionInitiations(vPeerGroup);
-                    DownloadProgressTracker tracker = downloadListener == null ? new DownloadProgressTracker() : downloadListener;
-                    vPeerGroup.startBlockChainDownload(tracker);
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    throw new RuntimeException(t);
+            if (migratedWalletToSegwit.get()) {
+                startPeerGroup();
+            } else {
+                migratedWalletToSegwit.addListener((observable, oldValue, newValue) -> startPeerGroup());
+            }
 
-                }
-            }, MoreExecutors.directExecutor());
         } catch (BlockStoreException e) {
             throw new IOException(e);
         }
     }
 
+    private void startPeerGroup() {
+        Futures.addCallback((ListenableFuture<?>) vPeerGroup.startAsync(), new FutureCallback<Object>() {
+            @Override
+            public void onSuccess(@Nullable Object result) {
+                //completeExtensionInitiations(vPeerGroup);
+                DownloadProgressTracker tracker = downloadListener == null ? new DownloadProgressTracker() : downloadListener;
+                vPeerGroup.startBlockChainDownload(tracker);
+            }
+
+            @Override
+            public void onFailure(Throwable t) {
+                throw new RuntimeException(t);
+
+            }
+        }, MoreExecutors.directExecutor());
+    }
+
     private Wallet createOrLoadWallet(boolean shouldReplayWallet, File walletFile, boolean isBsqWallet) throws Exception {
         Wallet wallet;
 
@@ -351,13 +368,8 @@ private Wallet loadWallet(boolean shouldReplayWallet, File walletFile, boolean i
             wallet = serializer.readWallet(params, extArray, proto);
             if (shouldReplayWallet)
                 wallet.reset();
-            if (!isBsqWallet && BisqKeyChainGroupStructure.BIP44_BTC_NON_SEGWIT_ACCOUNT_PATH.equals(wallet.getActiveKeyChain().getAccountPath())) {
-                // Btc wallet does not have a native segwit keychain, we should add one.
-                DeterministicSeed seed = wallet.getKeyChainSeed();
-                DeterministicKeyChain nativeSegwitKeyChain = DeterministicKeyChain.builder().seed(seed)
-                        .outputScriptType(Script.ScriptType.P2WPKH)
-                        .accountPath(new BisqKeyChainGroupStructure(isBsqWallet).accountPathFor(Script.ScriptType.P2WPKH)).build();
-                wallet.addAndActivateHDChain(nativeSegwitKeyChain);
+            if (!isBsqWallet) {
+                maybeAddSegwitKeychain(wallet, null);
             }
         }
         return wallet;
@@ -491,4 +503,30 @@ public PeerGroup peerGroup() {
     public File directory() {
         return directory;
     }
+
+    public void maybeAddSegwitKeychain(Wallet wallet, KeyParameter aesKey) {
+        if (BisqKeyChainGroupStructure.BIP44_BTC_NON_SEGWIT_ACCOUNT_PATH.equals(wallet.getActiveKeyChain().getAccountPath())) {
+            if (wallet.isEncrypted() && aesKey == null) {
+                // wait for the aesKey to be set and this method to be invoked again.
+                return;
+            }
+            // Btc wallet does not have a native segwit keychain, we should add one.
+            DeterministicSeed seed = wallet.getKeyChainSeed();
+            if (aesKey != null) {
+                // If wallet is encrypted, decrypt the seed.
+                KeyCrypter keyCrypter = wallet.getKeyCrypter();
+                seed = seed.decrypt(keyCrypter, DeterministicKeyChain.DEFAULT_PASSPHRASE_FOR_MNEMONIC, aesKey);
+            }
+            DeterministicKeyChain nativeSegwitKeyChain = DeterministicKeyChain.builder().seed(seed)
+                    .outputScriptType(Script.ScriptType.P2WPKH)
+                    .accountPath(new BisqKeyChainGroupStructure(false).accountPathFor(Script.ScriptType.P2WPKH)).build();
+            if (aesKey != null) {
+                // If wallet is encrypted, encrypt the new keychain.
+                KeyCrypter keyCrypter = wallet.getKeyCrypter();
+                nativeSegwitKeyChain = nativeSegwitKeyChain.toEncrypted(keyCrypter, aesKey);
+            }
+            wallet.addAndActivateHDChain(nativeSegwitKeyChain);
+        }
+        migratedWalletToSegwit.set(true);
+    }
 }