v1.2.0

README.md

@@ -28,7 +28,7 @@ If you prefer to run Sparrow directly from source, it can be launched with
 
 `./sparrow`
 
-Java 14 must be installed.
+Java 14 or higher must be installed.
 
 ## Configuration
 
@@ -45,10 +45,10 @@ Usage: sparrow [options]
       Show usage
     --network, -n
       Network to use
-      Possible Values: [mainnet, testnet, regtest]
+      Possible Values: [mainnet, testnet, regtest, signet]
 ```
 
-As a fallback, the network (mainnet, testnet or regtest) can also be set using an environment variable `SPARROW_NETWORK`. For example:
+As a fallback, the network (mainnet, testnet, regtest or signet) can also be set using an environment variable `SPARROW_NETWORK`. For example:
 
 `export SPARROW_NETWORK=testnet`
 
@@ -64,7 +64,7 @@ OSX      | ~/.sparrow
 Linux    | ~/.sparrow
 Windows  | %APPDATA%/Sparrow
 
-Testnet and regtest configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
+Testnet, regtest and signet configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
 
 ## Reporting Issues
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.beryx.jlink' version '2.22.0'
 }
 
-def sparrowVersion = '1.0.0'
+def sparrowVersion = '1.2.0'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -70,6 +70,7 @@ dependencies {
         exclude group: 'org.openjfx', module: 'javafx-media'
     }
     implementation('dev.bwt:bwt-jni:0.1.7')
+    implementation('net.sourceforge.javacsv:javacsv:2.0')
     testImplementation('junit:junit:4.12')
 }
 

src/main/deploy/package/osx/Info.plist

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
+  <string>1.2.0</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->

src/main/java/com/sparrowwallet/sparrow/AppController.java

@@ -33,6 +33,7 @@ import com.sparrowwallet.sparrow.wallet.WalletForm;
 import de.codecentric.centerdevice.MenuToolkit;
 import javafx.animation.*;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -99,6 +100,9 @@ public class AppController implements Initializable {
     @FXML
     private CheckMenuItem showTxHex;
 
+    @FXML
+    private MenuItem refreshWallet;
+
     @FXML
     private StackPane rootStack;
 
@@ -223,9 +227,11 @@ public class AppController implements Initializable {
         hideEmptyUsedAddresses.setSelected(Config.get().isHideEmptyUsedAddresses());
         showTxHex.setSelected(Config.get().isShowTransactionHex());
         exportWallet.setDisable(true);
+        refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
 
         setServerType(Config.get().getServerType());
         serverToggle.setSelected(isConnected());
+        serverToggle.setDisable(Config.get().getServerType() == null);
         onlineProperty().bindBidirectional(serverToggle.selectedProperty());
         onlineProperty().addListener((observable, oldValue, newValue) ->  {
             Platform.runLater(() -> setServerToggleTooltip(getCurrentBlockHeight()));
@@ -442,6 +448,10 @@ public class AppController implements Initializable {
 
             File file = fileChooser.showSaveDialog(window);
             if(file != null) {
+                if(!saveTx && !file.getName().toLowerCase().endsWith(".psbt")) {
+                    file = new File(file.getAbsolutePath() + ".psbt");
+                }
+
                 try {
                     try(PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8)) {
                         if(saveTx) {
@@ -537,7 +547,18 @@ public class AppController implements Initializable {
     }
 
     private void setServerToggleTooltip(Integer currentBlockHeight) {
-        serverToggle.setTooltip(new Tooltip(AppServices.isConnected() ? "Connected to " + Config.get().getServerAddress() + (currentBlockHeight != null ? " at height " + currentBlockHeight : "") : "Disconnected"));
+        Tooltip tooltip = new Tooltip(getServerToggleTooltipText(currentBlockHeight));
+        tooltip.setShowDuration(Duration.seconds(15));
+        serverToggle.setTooltip(tooltip);
+    }
+
+    private String getServerToggleTooltipText(Integer currentBlockHeight) {
+        if(AppServices.isConnected()) {
+            return "Connected to " + Config.get().getServerAddress() + (currentBlockHeight != null ? " at height " + currentBlockHeight : "") +
+                    (Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER ? "\nWarning! You are connected to a public server and sharing your transaction data with it.\nFor better privacy, consider using your own Bitcoin Core node or private Electrum server." : "");
+        }
+
+        return "Disconnected";
     }
 
     public void newWallet(ActionEvent event) {
@@ -828,6 +849,18 @@ public class AppController implements Initializable {
         messageSignDialog.showAndWait();
     }
 
+    public void refreshWallet(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        TabData tabData = (TabData)selectedTab.getUserData();
+        if(tabData.getType() == TabData.TabType.WALLET) {
+            WalletTabData walletTabData = (WalletTabData) tabData;
+            Wallet wallet = walletTabData.getWallet();
+            Wallet pastWallet = wallet.copy();
+            wallet.clearHistory();
+            EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, walletTabData.getStorage().getWalletFile()));
+        }
+    }
+
     public void addWalletTabOrWindow(Storage storage, Wallet wallet, boolean forceSameWindow) {
         Window existingWalletWindow = AppServices.get().getWindowForWallet(storage);
         if(existingWalletWindow instanceof Stage) {
@@ -1052,11 +1085,19 @@ public class AppController implements Initializable {
     }
 
     public void setServerType(ServerType serverType) {
+        if(serverType == ServerType.PUBLIC_ELECTRUM_SERVER && !serverToggle.getStyleClass().contains("public-server")) {
+            serverToggle.getStyleClass().add("public-server");
+        } else {
+            serverToggle.getStyleClass().remove("public-server");
+        }
+
         if(serverType == ServerType.BITCOIN_CORE && !serverToggle.getStyleClass().contains("core-server")) {
             serverToggle.getStyleClass().add("core-server");
         } else {
             serverToggle.getStyleClass().remove("core-server");
         }
+
+        serverToggle.setDisable(false);
     }
 
     public void setTheme(ActionEvent event) {
@@ -1273,12 +1314,43 @@ public class AppController implements Initializable {
         }
     }
 
+    @Subscribe
+    public void connectionStart(ConnectionStartEvent event) {
+        statusUpdated(new StatusEvent(event.getStatus(), 120));
+    }
+
+    @Subscribe
+    public void connectionFailed(ConnectionFailedEvent event) {
+        String reason = event.getException().getCause() != null ? event.getException().getCause().getMessage() : event.getException().getMessage();
+        String status = "Connection failed: " + reason;
+        statusUpdated(new StatusEvent(status));
+    }
+
+    @Subscribe
+    public void connection(ConnectionEvent event) {
+        String status = "Connected to " + Config.get().getServerAddress() + " at height " + event.getBlockHeight();
+        statusUpdated(new StatusEvent(status));
+    }
+
+    @Subscribe
+    public void disconnection(DisconnectionEvent event) {
+        serverToggle.setDisable(false);
+        if(!AppServices.isConnecting() && !AppServices.isConnected() && !statusBar.getText().startsWith("Connection error")) {
+            statusUpdated(new StatusEvent("Disconnected"));
+        }
+        if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
+            statusBar.setProgress(0);
+        }
+    }
+
     @Subscribe
     public void bwtBootStatus(BwtBootStatusEvent event) {
         serverToggle.setDisable(true);
-        statusUpdated(new StatusEvent(event.getStatus(), 60));
-        if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
-            statusBar.setProgress(0.01);
+        if(AppServices.isConnecting()) {
+            statusUpdated(new StatusEvent(event.getStatus(), 60));
+            if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
+                statusBar.setProgress(0.01);
+            }
         }
     }
 
@@ -1313,14 +1385,21 @@ public class AppController implements Initializable {
     }
 
     @Subscribe
-    public void disconnection(DisconnectionEvent event) {
+    public void torBootStatus(TorBootStatusEvent event) {
+        serverToggle.setDisable(true);
+        statusUpdated(new StatusEvent(event.getStatus(), 120));
+    }
+
+    @Subscribe
+    public void torFailedStatus(TorFailedStatusEvent event) {
         serverToggle.setDisable(false);
-        if(!AppServices.isConnecting() && !AppServices.isConnected() && !statusBar.getText().startsWith("Connection error")) {
-            statusUpdated(new StatusEvent("Disconnected"));
-        }
-        if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
-            statusBar.setProgress(0);
-        }
+        statusUpdated(new StatusEvent(event.getStatus()));
+    }
+
+    @Subscribe
+    public void torReadyStatus(TorReadyStatusEvent event) {
+        serverToggle.setDisable(false);
+        statusUpdated(new StatusEvent(event.getStatus()));
     }
 
     @Subscribe

src/main/java/com/sparrowwallet/sparrow/AppServices.java

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow;
 
 import com.google.common.eventbus.Subscribe;
+import com.google.common.net.HostAndPort;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
@@ -31,11 +32,14 @@ import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.util.Duration;
+import org.berndpruenster.netlayer.tor.Tor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
@@ -45,9 +49,10 @@ import java.util.stream.Collectors;
 public class AppServices {
     private static final Logger log = LoggerFactory.getLogger(AppServices.class);
 
-    private static final int SERVER_PING_PERIOD = 1 * 60 * 1000;
-    private static final int ENUMERATE_HW_PERIOD = 30 * 1000;
-    private static final int RATES_PERIOD = 5 * 60 * 1000;
+    private static final int SERVER_PING_PERIOD_SECS = 60;
+    private static final int PUBLIC_SERVER_RETRY_PERIOD_SECS = 3;
+    private static final int ENUMERATE_HW_PERIOD_SECS = 30;
+    private static final int RATES_PERIOD_SECS = 5 * 60;
     private static final int VERSION_CHECK_PERIOD_HOURS = 24;
     private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
     private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
@@ -68,6 +73,8 @@ public class AppServices {
 
     private VersionCheckService versionCheckService;
 
+    private TorService torService;
+
     private static Integer currentBlockHeight;
 
     private static Map<Integer, Double> targetBlockFeeRates;
@@ -86,14 +93,10 @@ public class AppServices {
         @Override
         public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean online) {
             if(online) {
-                restartService(connectionService);
-
-                if(ratesService.getExchangeSource() != ExchangeSource.NONE) {
-                    restartService(ratesService);
-                }
-
-                if(Config.get().isCheckNewVersions()) {
-                    restartService(versionCheckService);
+                if(Config.get().requiresTor() && !isTorRunning()) {
+                    torService.start();
+                } else {
+                    restartServices();
                 }
             } else {
                 connectionService.cancel();
@@ -103,6 +106,44 @@ public class AppServices {
         }
     };
 
+    public AppServices(MainApp application) {
+        this.application = application;
+        EventManager.get().register(this);
+    }
+
+    public void start() {
+        Config config = Config.get();
+        connectionService = createConnectionService();
+        ratesService = createRatesService(config.getExchangeSource(), config.getFiatCurrency());
+        versionCheckService = createVersionCheckService();
+        torService = createTorService();
+
+        onlineProperty.addListener(onlineServicesListener);
+
+        if(config.getMode() == Mode.ONLINE) {
+            if(config.requiresTor()) {
+                torService.start();
+            } else {
+                restartServices();
+            }
+        }
+    }
+
+    private void restartServices() {
+        Config config = Config.get();
+        if(config.hasServerAddress()) {
+            restartService(connectionService);
+        }
+
+        if(config.isFetchRates()) {
+            restartService(ratesService);
+        }
+
+        if(config.isCheckNewVersions()) {
+            restartService(versionCheckService);
+        }
+    }
+
     private void restartService(ScheduledService<?> service) {
         if(service.isRunning()) {
             service.cancel();
@@ -117,33 +158,6 @@ public class AppServices {
         }
     }
 
-    public AppServices(MainApp application) {
-        this.application = application;
-        EventManager.get().register(this);
-    }
-
-    public void start() {
-        Config config = Config.get();
-        connectionService = createConnectionService();
-        if(config.getMode() == Mode.ONLINE && config.getServerAddress() != null && !config.getServerAddress().isEmpty()) {
-            connectionService.start();
-        }
-
-        ExchangeSource source = config.getExchangeSource() != null ? config.getExchangeSource() : DEFAULT_EXCHANGE_SOURCE;
-        Currency currency = config.getFiatCurrency() != null ? config.getFiatCurrency() : DEFAULT_FIAT_CURRENCY;
-        ratesService = createRatesService(source, currency);
-        if(config.getMode() == Mode.ONLINE && source != ExchangeSource.NONE) {
-            ratesService.start();
-        }
-
-        versionCheckService = createVersionCheckService();
-        if(config.getMode() == Mode.ONLINE && config.isCheckNewVersions()) {
-            versionCheckService.start();
-        }
-
-        onlineProperty.addListener(onlineServicesListener);
-    }
-
     public void stop() {
         if(connectionService != null) {
             connectionService.cancel();
@@ -156,21 +170,25 @@ public class AppServices {
         if(versionCheckService != null) {
             versionCheckService.cancel();
         }
+
+        if(Tor.getDefault() != null) {
+            Tor.getDefault().shutdown();
+        }
     }
 
     private ElectrumServer.ConnectionService createConnectionService() {
         ElectrumServer.ConnectionService connectionService = new ElectrumServer.ConnectionService();
-        connectionService.setPeriod(new Duration(SERVER_PING_PERIOD));
+        connectionService.setPeriod(Duration.seconds(SERVER_PING_PERIOD_SECS));
         connectionService.setRestartOnFailure(true);
-
         EventManager.get().register(connectionService);
-        connectionService.statusProperty().addListener((observable, oldValue, newValue) -> {
-            if(connectionService.isRunning()) {
-                EventManager.get().post(new StatusEvent(newValue));
+
+        connectionService.setOnRunning(workerStateEvent -> {
+            if(!ElectrumServer.isConnected()) {
+                EventManager.get().post(new ConnectionStartEvent(Config.get().getServerAddress()));
             }
         });
-
         connectionService.setOnSucceeded(successEvent -> {
+            connectionService.setPeriod(Duration.seconds(SERVER_PING_PERIOD_SECS));
             connectionService.setRestartOnFailure(true);
 
             onlineProperty.removeListener(onlineServicesListener);
@@ -193,6 +211,12 @@ public class AppServices {
             onlineProperty.setValue(false);
             onlineProperty.addListener(onlineServicesListener);
 
+            if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER) {
+                List<String> otherServers = Arrays.stream(PublicElectrumServer.values()).map(PublicElectrumServer::getUrl).filter(url -> !url.equals(Config.get().getPublicElectrumServer())).collect(Collectors.toList());
+                Config.get().setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+                connectionService.setPeriod(Duration.seconds(PUBLIC_SERVER_RETRY_PERIOD_SECS));
+            }
+
             log.debug("Connection failed", failEvent.getSource().getException());
             EventManager.get().post(new ConnectionFailedEvent(failEvent.getSource().getException()));
         });
@@ -201,8 +225,10 @@ public class AppServices {
     }
 
     private ExchangeSource.RatesService createRatesService(ExchangeSource exchangeSource, Currency currency) {
-        ExchangeSource.RatesService ratesService = new ExchangeSource.RatesService(exchangeSource, currency);
-        ratesService.setPeriod(new Duration(RATES_PERIOD));
+        ExchangeSource.RatesService ratesService = new ExchangeSource.RatesService(
+                exchangeSource == null ? DEFAULT_EXCHANGE_SOURCE : exchangeSource,
+                currency == null ? DEFAULT_FIAT_CURRENCY : currency);
+        ratesService.setPeriod(Duration.seconds(RATES_PERIOD_SECS));
         ratesService.setRestartOnFailure(true);
 
         ratesService.setOnSucceeded(successEvent -> {
@@ -230,7 +256,7 @@ public class AppServices {
 
     private Hwi.ScheduledEnumerateService createDeviceEnumerateService() {
         Hwi.ScheduledEnumerateService enumerateService = new Hwi.ScheduledEnumerateService(null);
-        enumerateService.setPeriod(new Duration(ENUMERATE_HW_PERIOD));
+        enumerateService.setPeriod(Duration.seconds(ENUMERATE_HW_PERIOD_SECS));
         enumerateService.setOnSucceeded(workerStateEvent -> {
             List<Device> devices = enumerateService.getValue();
 
@@ -247,6 +273,45 @@ public class AppServices {
         return enumerateService;
     }
 
+    private TorService createTorService() {
+        TorService torService = new TorService();
+        torService.setPeriod(Duration.hours(1000));
+        torService.setRestartOnFailure(true);
+
+        torService.setOnRunning(workerStateEvent -> {
+            EventManager.get().post(new TorBootStatusEvent());
+        });
+        torService.setOnSucceeded(workerStateEvent -> {
+            Tor.setDefault(torService.getValue());
+            torService.cancel();
+            restartServices();
+            EventManager.get().post(new TorReadyStatusEvent());
+        });
+        torService.setOnFailed(workerStateEvent -> {
+            EventManager.get().post(new TorFailedStatusEvent(workerStateEvent.getSource().getException()));
+        });
+
+        return torService;
+    }
+
+    public static boolean isTorRunning() {
+        return Tor.getDefault() != null;
+    }
+
+    public static Proxy getProxy() {
+        Config config = Config.get();
+        if(config.isUseProxy()) {
+            HostAndPort proxy = HostAndPort.fromString(config.getProxyServer());
+            InetSocketAddress proxyAddress = new InetSocketAddress(proxy.getHost(), proxy.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
+            return new Proxy(Proxy.Type.SOCKS, proxyAddress);
+        } else if(AppServices.isTorRunning()) {
+            InetSocketAddress proxyAddress = new InetSocketAddress("localhost", TorService.PROXY_PORT);
+            return new Proxy(Proxy.Type.SOCKS, proxyAddress);
+        }
+
+        return null;
+    }
+
     static void initialize(MainApp application) {
         INSTANCE = new AppServices(application);
     }
@@ -404,16 +469,6 @@ public class AppServices {
         targetBlockFeeRates = event.getTargetBlockFeeRates();
         addMempoolRateSizes(event.getMempoolRateSizes());
         minimumRelayFeeRate = event.getMinimumRelayFeeRate();
-        String banner = event.getServerBanner();
-        String status = "Connected to " + Config.get().getServerAddress() + " at height " + event.getBlockHeight();
-        EventManager.get().post(new StatusEvent(status));
-    }
-
-    @Subscribe
-    public void connectionFailed(ConnectionFailedEvent event) {
-        String reason = event.getException().getCause() != null ? event.getException().getCause().getMessage() : event.getException().getMessage();
-        String status = "Connection error: " + reason;
-        EventManager.get().post(new StatusEvent(status));
     }
 
     @Subscribe

src/main/java/com/sparrowwallet/sparrow/MainApp.java

@@ -2,7 +2,7 @@ package com.sparrowwallet.sparrow;
 
 import com.beust.jcommander.JCommander;
 import com.sparrowwallet.drongo.Network;
-import com.sparrowwallet.sparrow.control.WelcomeDialog;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
@@ -10,6 +10,7 @@ import com.sparrowwallet.sparrow.io.FileType;
 import com.sparrowwallet.sparrow.io.IOUtils;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.Bwt;
+import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
@@ -26,7 +27,7 @@ import java.util.stream.Collectors;
 
 public class MainApp extends Application {
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.0.0";
+    public static final String APP_VERSION = "1.2.0";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";
 
@@ -51,7 +52,7 @@ public class MainApp extends Application {
         boolean createNewWallet = false;
         Mode mode = Config.get().getMode();
         if(mode == null) {
-            WelcomeDialog welcomeDialog = new WelcomeDialog(getHostServices());
+            WelcomeDialog welcomeDialog = new WelcomeDialog();
             Optional<Mode> optionalMode = welcomeDialog.showAndWait();
             if(optionalMode.isPresent()) {
                 mode = optionalMode.get();
@@ -62,6 +63,9 @@ public class MainApp extends Application {
                     PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER, true);
                     Optional<Boolean> optNewWallet = preferencesDialog.showAndWait();
                     createNewWallet = optNewWallet.isPresent() && optNewWallet.get();
+                } else if(Network.get() == Network.MAINNET) {
+                    Config.get().setServerType(ServerType.PUBLIC_ELECTRUM_SERVER);
+                    Config.get().setPublicElectrumServer(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)].getUrl());
                 }
             }
         }
@@ -73,6 +77,8 @@ public class MainApp extends Application {
             Config.get().setCoreWallet("");
         }
 
+        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
+
         AppController appController = AppServices.newAppWindow(stage);
 
         if(createNewWallet) {
@@ -136,6 +142,11 @@ public class MainApp extends Application {
             Network.set(Network.TESTNET);
         }
 
+        File signetFlag = new File(Storage.getSparrowHome(), "network-" + Network.SIGNET.getName());
+        if(signetFlag.exists()) {
+            Network.set(Network.SIGNET);
+        }
+
         if(Network.get() != Network.MAINNET) {
             getLogger().info("Using " + Network.get() + " configuration");
         }

src/main/java/com/sparrowwallet/sparrow/WelcomeController.java

@@ -0,0 +1,130 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
+import javafx.animation.PauseTransition;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+import org.controlsfx.control.StatusBar;
+
+public class WelcomeController {
+    @FXML
+    private VBox welcomeBox;
+
+    @FXML
+    private VBox step1;
+
+    @FXML
+    private VBox step2;
+
+    @FXML
+    private VBox step3;
+
+    @FXML
+    private VBox step4;
+
+    @FXML
+    private StatusBar serverStatus;
+
+    @FXML
+    private UnlabeledToggleSwitch serverToggle;
+
+    public void initializeView() {
+        step1.managedProperty().bind(step1.visibleProperty());
+        step2.managedProperty().bind(step2.visibleProperty());
+        step3.managedProperty().bind(step3.visibleProperty());
+        step4.managedProperty().bind(step4.visibleProperty());
+
+        step2.setVisible(false);
+        step3.setVisible(false);
+        step4.setVisible(false);
+
+        welcomeBox.getStyleClass().add("offline");
+        serverStatus.setText("Offline");
+        serverToggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            serverStatus.setText(newValue ? "Connected" : "Offline");
+        });
+    }
+
+    public boolean next() {
+        if(step1.isVisible()) {
+            step1.setVisible(false);
+            step2.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("public-electrum");
+            PauseTransition wait = new PauseTransition(Duration.millis(200));
+            wait.setOnFinished((e) -> {
+                serverToggle.setSelected(true);
+                serverStatus.setText("Connected to a Public Server");
+            });
+            wait.play();
+            return true;
+        }
+
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step3.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("bitcoin-core");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to Bitcoin Core");
+            return true;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step4.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("private-electrum");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to a Private Electrum Server");
+        }
+
+        return false;
+    }
+
+    public boolean back() {
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step1.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("offline");
+            PauseTransition wait = new PauseTransition(Duration.millis(200));
+            wait.setOnFinished((e) -> {
+                serverToggle.setSelected(false);
+                serverStatus.setText("Offline");
+            });
+            wait.play();
+            return false;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step2.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("public-electrum");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to a Public Server");
+            return true;
+        }
+
+        if(step4.isVisible()) {
+            step4.setVisible(false);
+            step3.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("bitcoin-core");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to Bitcoin Core");
+            return true;
+        }
+
+        return false;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java

@@ -0,0 +1,69 @@
+package com.sparrowwallet.sparrow;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+import java.io.IOException;
+
+public class WelcomeDialog extends Dialog<Mode> {
+    public WelcomeDialog() {
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        try {
+            FXMLLoader welcomeLoader = new FXMLLoader(AppServices.class.getResource("welcome.fxml"));
+            dialogPane.setContent(welcomeLoader.load());
+            WelcomeController welcomeController = welcomeLoader.getController();
+            welcomeController.initializeView();
+
+            dialogPane.setPrefWidth(600);
+            dialogPane.setPrefHeight(520);
+
+            dialogPane.getStylesheets().add(AppServices.class.getResource("welcome.css").toExternalForm());
+
+            final ButtonType nextButtonType = new javafx.scene.control.ButtonType("Next", ButtonBar.ButtonData.OK_DONE);
+            final ButtonType backButtonType = new javafx.scene.control.ButtonType("Back", ButtonBar.ButtonData.LEFT);
+            final ButtonType onlineButtonType = new javafx.scene.control.ButtonType("Configure Server", ButtonBar.ButtonData.APPLY);
+            final ButtonType offlineButtonType = new javafx.scene.control.ButtonType("Later or Offline Mode", ButtonBar.ButtonData.CANCEL_CLOSE);
+            dialogPane.getButtonTypes().addAll(nextButtonType, backButtonType, onlineButtonType, offlineButtonType);
+
+            Button nextButton = (Button)dialogPane.lookupButton(nextButtonType);
+            Button backButton = (Button)dialogPane.lookupButton(backButtonType);
+            Button onlineButton = (Button)dialogPane.lookupButton(onlineButtonType);
+            Button offlineButton = (Button)dialogPane.lookupButton(offlineButtonType);
+
+            nextButton.managedProperty().bind(nextButton.visibleProperty());
+            backButton.managedProperty().bind(backButton.visibleProperty());
+            onlineButton.managedProperty().bind(onlineButton.visibleProperty());
+            offlineButton.managedProperty().bind(offlineButton.visibleProperty());
+
+            backButton.setDisable(true);
+            onlineButton.visibleProperty().bind(nextButton.visibleProperty().not());
+            offlineButton.visibleProperty().bind(nextButton.visibleProperty().not());
+
+            nextButton.addEventFilter(ActionEvent.ACTION, event -> {
+                if(!welcomeController.next()) {
+                    nextButton.setVisible(false);
+                    onlineButton.setDefaultButton(true);
+                }
+                backButton.setDisable(false);
+                event.consume();
+            });
+
+            backButton.addEventFilter(ActionEvent.ACTION, event -> {
+                nextButton.setVisible(true);
+                if(!welcomeController.back()) {
+                    backButton.setDisable(true);
+                }
+                event.consume();
+            });
+
+            setResultConverter(dialogButton -> dialogButton == onlineButtonType ? Mode.ONLINE : Mode.OFFLINE);
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java

@@ -84,6 +84,7 @@ public class CoinTreeTable extends TreeTableView<Entry> {
                 WalletBirthDateDialog dlg = new WalletBirthDateDialog(wallet.getBirthDate());
                 Optional<Date> optDate = dlg.showAndWait();
                 if(optDate.isPresent()) {
+                    Wallet pastWallet = wallet.copy();
                     wallet.setBirthDate(optDate.get());
                     Storage storage = AppServices.get().getOpenWallets().get(wallet);
                     if(storage != null) {
@@ -91,7 +92,7 @@ public class CoinTreeTable extends TreeTableView<Entry> {
                         EventManager.get().post(new WalletDataChangedEvent(wallet));
                         //Trigger full wallet rescan
                         wallet.clearHistory();
-                        EventManager.get().post(new WalletSettingsChangedEvent(wallet, storage.getWalletFile()));
+                        EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, storage.getWalletFile()));
                     }
                 }
             });

src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java

@@ -302,7 +302,7 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private Node getPassphraseEntry() {
-        CustomTextField passphraseField = (CustomTextField)TextFields.createClearableTextField();
+        CustomPasswordField passphraseField = (CustomPasswordField)TextFields.createClearablePasswordField();
         passphrase.bind(passphraseField.textProperty());
         HBox.setHgrow(passphraseField, Priority.ALWAYS);
 

src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -24,8 +25,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-class EntryCell extends TreeTableCell<Entry, Entry> {
-    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+public class EntryCell extends TreeTableCell<Entry, Entry> {
+    public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
     public EntryCell() {
         super();
@@ -173,6 +174,13 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                 .collect(Collectors.toList());
 
+        List<TransactionOutput> consolidationOutputs = transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.getKeyPurpose() == KeyPurpose.RECEIVE)
+                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
+                .collect(Collectors.toList());
+
         long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
         Transaction tx = blockTransaction.getTransaction();
         int vSize = tx.getVirtualSize();
@@ -189,6 +197,7 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
 
         List<TransactionOutput> externalOutputs = new ArrayList<>(blockTransaction.getTransaction().getOutputs());
         externalOutputs.removeAll(ourOutputs);
+        externalOutputs.addAll(consolidationOutputs);
         List<Payment> payments = externalOutputs.stream().map(txOutput -> {
             try {
                 return new Payment(txOutput.getScript().getToAddresses()[0], transactionEntry.getLabel(), txOutput.getValue(), false);

src/main/java/com/sparrowwallet/sparrow/control/FileWalletExportPane.java

@@ -2,44 +2,81 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.hummingbird.registry.RegistryType;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.StorageEvent;
 import com.sparrowwallet.sparrow.event.TimedEvent;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.CoboVaultMultisig;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.io.WalletExport;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Control;
+import javafx.scene.control.ToggleButton;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
+import org.controlsfx.control.SegmentedButton;
+import org.controlsfx.glyphfont.Glyph;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 
 public class FileWalletExportPane extends TitledDescriptionPane {
     private final Wallet wallet;
     private final WalletExport exporter;
+    private final boolean scannable;
 
     public FileWalletExportPane(Wallet wallet, WalletExport exporter) {
         super(exporter.getName(), "Wallet file export", exporter.getWalletExportDescription(), "image/" + exporter.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.exporter = exporter;
+        this.scannable = exporter.isWalletExportScannable();
+
+        buttonBox.getChildren().clear();
+        buttonBox.getChildren().add(createButton());
     }
 
     @Override
     protected Control createButton() {
-        Button exportButton = new Button("Export Wallet...");
-        exportButton.setAlignment(Pos.CENTER_RIGHT);
-        exportButton.setOnAction(event -> {
-            exportWallet();
-        });
-        return exportButton;
+        if(scannable) {
+            ToggleButton showButton = new ToggleButton("Show...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            showButton.setGraphic(cameraGlyph);
+            showButton.setOnAction(event -> {
+                showButton.setSelected(false);
+                exportQR();
+            });
+
+            ToggleButton fileButton = new ToggleButton("Export File...");
+            fileButton.setAlignment(Pos.CENTER_RIGHT);
+            fileButton.setOnAction(event -> {
+                fileButton.setSelected(false);
+                exportFile();
+            });
+
+            SegmentedButton segmentedButton = new SegmentedButton();
+            segmentedButton.getButtons().addAll(showButton, fileButton);
+            return segmentedButton;
+        } else {
+            Button exportButton = new Button("Export File...");
+            exportButton.setAlignment(Pos.CENTER_RIGHT);
+            exportButton.setOnAction(event -> {
+                exportFile();
+            });
+            return exportButton;
+        }
     }
 
-    private void exportWallet() {
+    private void exportQR() {
+        exportWallet(null);
+    }
+
+    private void exportFile() {
         Stage window = new Stage();
 
         FileChooser fileChooser = new FileChooser();
@@ -59,17 +96,18 @@ public class FileWalletExportPane extends TitledDescriptionPane {
             WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
             Optional<SecureString> password = dlg.showAndWait();
             if(password.isPresent()) {
+                final File walletFile = AppServices.get().getOpenWallets().get(wallet).getWalletFile();
                 Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(copy, password.get());
                 decryptWalletService.setOnSucceeded(workerStateEvent -> {
-                    EventManager.get().post(new StorageEvent(file, TimedEvent.Action.END, "Done"));
+                    EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.END, "Done"));
                     Wallet decryptedWallet = decryptWalletService.getValue();
                     exportWallet(file, decryptedWallet);
                 });
                 decryptWalletService.setOnFailed(workerStateEvent -> {
-                    EventManager.get().post(new StorageEvent(file, TimedEvent.Action.END, "Failed"));
+                    EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.END, "Failed"));
                     setError("Export Error", decryptWalletService.getException().getMessage());
                 });
-                EventManager.get().post(new StorageEvent(file, TimedEvent.Action.START, "Decrypting wallet..."));
+                EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.START, "Decrypting wallet..."));
                 decryptWalletService.start();
             }
         } else {
@@ -79,9 +117,21 @@ public class FileWalletExportPane extends TitledDescriptionPane {
 
     private void exportWallet(File file, Wallet decryptedWallet) {
         try {
-            OutputStream outputStream = new FileOutputStream(file);
-            exporter.exportWallet(decryptedWallet, outputStream);
-            EventManager.get().post(new WalletExportEvent(decryptedWallet));
+            if(file != null) {
+                OutputStream outputStream = new FileOutputStream(file);
+                exporter.exportWallet(decryptedWallet, outputStream);
+                EventManager.get().post(new WalletExportEvent(decryptedWallet));
+            } else {
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                exporter.exportWallet(decryptedWallet, outputStream);
+                QRDisplayDialog qrDisplayDialog;
+                if(exporter instanceof CoboVaultMultisig) {
+                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
+                } else {
+                    qrDisplayDialog = new QRDisplayDialog(outputStream.toString(StandardCharsets.UTF_8));
+                }
+                qrDisplayDialog.showAndWait();
+            }
         } catch(Exception e) {
             String errorMessage = e.getMessage();
             if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {

src/main/java/com/sparrowwallet/sparrow/control/FileWalletKeystoreImportPane.java

@@ -72,6 +72,9 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
         ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE)));
         scriptTypeComboBox.setValue(ScriptType.P2WPKH);
 
+        HelpLabel helpLabel = new HelpLabel();
+        helpLabel.setHelpText("P2WPKH is a Native Segwit type and is usually the best choice for new wallets.\nP2SH-P2WPKH is a Wrapped Segwit type and is a reasonable choice for the widest compatibility.\nP2PKH is a Legacy type and should be avoided for new wallets.\nFor existing wallets, be sure to choose the type that matches the wallet you are importing.");
+
         Region region = new Region();
         HBox.setHgrow(region, Priority.SOMETIMES);
 
@@ -97,7 +100,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
         HBox contentBox = new HBox();
         contentBox.setAlignment(Pos.CENTER_RIGHT);
         contentBox.setSpacing(20);
-        contentBox.getChildren().addAll(label, scriptTypeComboBox, region, importFileButton);
+        contentBox.getChildren().addAll(label, scriptTypeComboBox, helpLabel, region, importFileButton);
         contentBox.setPadding(new Insets(10, 30, 10, 30));
         contentBox.setPrefHeight(60);
 

src/main/java/com/sparrowwallet/sparrow/control/HelpLabel.java

@@ -1,10 +1,15 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.event.EventHandler;
+import javafx.geometry.Bounds;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
+import javafx.scene.input.MouseEvent;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 
 public class HelpLabel extends Label {
@@ -14,8 +19,10 @@ public class HelpLabel extends Label {
         super("", getHelpGlyph());
         tooltip = new Tooltip();
         tooltip.textProperty().bind(helpTextProperty());
-        setTooltip(tooltip);
+        tooltip.setShowDuration(Duration.seconds(15));
         getStyleClass().add("help-label");
+
+        Platform.runLater(() -> setTooltip(tooltip));
     }
 
     private static Glyph getHelpGlyph() {

src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java

@@ -43,7 +43,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
             exporters = List.of(new Electrum(), new SpecterDesktop());
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
-            exporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop());
+            exporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop(), new BlueWalletMultisig());
         } else {
             throw new UnsupportedOperationException("Cannot export wallet with policy type " + wallet.getPolicyType());
         }

src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java

@@ -45,7 +45,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
             importAccordion.getPanes().add(importPane);
         }
 
-        List<WalletImport> walletImporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop());
+        List<WalletImport> walletImporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop(), new BlueWalletMultisig());
         for(WalletImport importer : walletImporters) {
             FileWalletImportPane importPane = new FileWalletImportPane(importer);
             importAccordion.getPanes().add(importPane);

src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java

@@ -1,100 +0,0 @@
-package com.sparrowwallet.sparrow.control;
-
-import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.Mode;
-import com.sparrowwallet.sparrow.net.ServerType;
-import javafx.application.HostServices;
-import javafx.geometry.Insets;
-import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.VBox;
-import org.controlsfx.control.HyperlinkLabel;
-import org.controlsfx.control.StatusBar;
-import org.controlsfx.control.ToggleSwitch;
-
-public class WelcomeDialog extends Dialog<Mode> {
-    private final HostServices hostServices;
-
-    private ServerType serverType = ServerType.ELECTRUM_SERVER;
-
-    public WelcomeDialog(HostServices services) {
-        this.hostServices = services;
-
-        final DialogPane dialogPane = getDialogPane();
-
-        setTitle("Welcome to Sparrow");
-        dialogPane.setHeaderText("Welcome to Sparrow!");
-        dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
-        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
-        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setPrefWidth(600);
-        dialogPane.setPrefHeight(520);
-
-        Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
-        if (!image.isError()) {
-            ImageView imageView = new ImageView();
-            imageView.setSmooth(false);
-            imageView.setImage(image);
-            dialogPane.setGraphic(imageView);
-        }
-
-        final ButtonType onlineButtonType = new javafx.scene.control.ButtonType("Configure Server", ButtonBar.ButtonData.OK_DONE);
-        final ButtonType offlineButtonType = new javafx.scene.control.ButtonType("Later or Offline Mode", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().addAll(onlineButtonType, offlineButtonType);
-
-        final VBox content = new VBox(20);
-        content.setPadding(new Insets(20, 20, 20, 20));
-        content.getChildren().add(createParagraph("Sparrow can operate in both an online and offline mode. In the online mode it connects to your Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator."));
-        content.getChildren().add(createParagraph("Connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your own Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. Examples of Electrum servers include ElectrumX and electrs."));
-        content.getChildren().add(createParagraph("It's also possible to connect Sparrow to a public Electrum server (such as blockstream.info:700) but this is not recommended as you will share your public key information with that server."));
-        content.getChildren().add(createParagraph("You can change your mode at any time using the toggle in the status bar. A blue toggle indicates you are connected to an Electrum server, while a green toggle indicates you are connected to a Bitcoin Code node."));
-        content.getChildren().add(createStatusBar(onlineButtonType, offlineButtonType));
-
-        dialogPane.setContent(content);
-
-        setResultConverter(dialogButton -> dialogButton == onlineButtonType ? Mode.ONLINE : Mode.OFFLINE);
-    }
-
-    private Label createParagraph(String text) {
-        Label label = new Label(text);
-        label.setWrapText(true);
-
-        return label;
-    }
-
-    private StatusBar createStatusBar(ButtonType onlineButtonType, ButtonType offlineButtonType) {
-        StatusBar statusBar = new StatusBar();
-        statusBar.setText("Online Mode");
-        statusBar.getRightItems().add(createToggle(statusBar, onlineButtonType, offlineButtonType));
-
-        return statusBar;
-    }
-
-    private ToggleSwitch createToggle(StatusBar statusBar, ButtonType onlineButtonType, ButtonType offlineButtonType) {
-        ToggleSwitch toggleSwitch = new UnlabeledToggleSwitch();
-        toggleSwitch.setStyle("-fx-padding: 1px 0 0 0");
-
-        toggleSwitch.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            Button onlineButton = (Button) getDialogPane().lookupButton(onlineButtonType);
-            onlineButton.setDefaultButton(newValue);
-            Button offlineButton = (Button) getDialogPane().lookupButton(offlineButtonType);
-            offlineButton.setDefaultButton(!newValue);
-
-            if(!newValue) {
-                serverType = (serverType == ServerType.BITCOIN_CORE ? ServerType.ELECTRUM_SERVER : ServerType.BITCOIN_CORE);
-
-                if(serverType == ServerType.BITCOIN_CORE && !toggleSwitch.getStyleClass().contains("core-server")) {
-                    toggleSwitch.getStyleClass().add("core-server");
-                } else {
-                    toggleSwitch.getStyleClass().remove("core-server");
-                }
-            }
-
-            statusBar.setText(newValue ? "Online Mode: " + serverType.getName() : "Offline Mode");
-        });
-
-        toggleSwitch.setSelected(true);
-        return toggleSwitch;
-    }
-}

src/main/java/com/sparrowwallet/sparrow/event/ConnectionStartEvent.java

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.sparrow.AppServices;
+
+public class ConnectionStartEvent {
+    private final String status;
+
+    public ConnectionStartEvent(String serverAddress) {
+        this.status = AppServices.isTorRunning() ? "Tor running, connecting to " + serverAddress + "..." : "Connecting to " + serverAddress + "...";
+    }
+
+    public String getStatus() {
+        return status;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/event/TorBootStatusEvent.java

@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.event;
+
+public class TorBootStatusEvent extends TorStatusEvent {
+    public TorBootStatusEvent() {
+        super("Starting Tor...");
+    }
+}

src/main/java/com/sparrowwallet/sparrow/event/TorFailedStatusEvent.java

@@ -0,0 +1,16 @@
+package com.sparrowwallet.sparrow.event;
+
+public class TorFailedStatusEvent extends TorStatusEvent {
+    private final Throwable exception;
+
+    public TorFailedStatusEvent(Throwable exception) {
+        super("Tor failed to start: " + (exception.getCause() != null ?
+                (exception.getCause().getMessage().contains("Failed to bind") ? exception.getCause().getMessage() + " Is a Tor proxy already running?" : exception.getCause().getMessage() ) :
+                exception.getMessage()));
+        this.exception = exception;
+    }
+
+    public Throwable getException() {
+        return exception;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/event/TorReadyStatusEvent.java

@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.event;
+
+public class TorReadyStatusEvent extends TorStatusEvent {
+    public TorReadyStatusEvent() {
+        super("Tor started");
+    }
+}

src/main/java/com/sparrowwallet/sparrow/event/WalletSettingsChangedEvent.java

@@ -12,13 +12,19 @@ import java.io.File;
  * Note that all wallet detail controllers that share a WalletForm, and that class posts WalletNodesChangedEvent once it has cleared it's entry caches.
  */
 public class WalletSettingsChangedEvent extends WalletChangedEvent {
+    private final Wallet pastWallet;
     private final File walletFile;
 
-    public WalletSettingsChangedEvent(Wallet wallet, File walletFile) {
+    public WalletSettingsChangedEvent(Wallet wallet, Wallet pastWallet, File walletFile) {
         super(wallet);
+        this.pastWallet = pastWallet;
         this.walletFile = walletFile;
     }
 
+    public Wallet getPastWallet() {
+        return pastWallet;
+    }
+
     public File getWalletFile() {
         return walletFile;
     }

src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java

@@ -15,6 +15,7 @@ public class FontAwesome5 extends GlyphFont {
      * The individual glyphs offered by the FontAwesome5 font.
      */
     public static enum Glyph implements INamedCharacter {
+        ARROW_CIRCLE_DOWN('\uf0ab'),
         ANGLE_DOUBLE_RIGHT('\uf101'),
         ARROW_DOWN('\uf063'),
         ARROW_UP('\uf062'),
@@ -29,6 +30,7 @@ public class FontAwesome5 extends GlyphFont {
         EXTERNAL_LINK_ALT('\uf35d'),
         ELLIPSIS_H('\uf141'),
         EYE('\uf06e'),
+        FILE_CSV('\uf6dd'),
         HAND_HOLDING('\uf4bd'),
         HAND_HOLDING_MEDICAL('\ue05c'),
         HISTORY('\uf1da'),

src/main/java/com/sparrowwallet/sparrow/io/BlueWalletMultisig.java

@@ -0,0 +1,50 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.io.InputStream;
+
+public class BlueWalletMultisig extends ColdcardMultisig {
+    @Override
+    public String getName() {
+        return "Blue Wallet Vault Multisig";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.BLUE_WALLET;
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        Wallet wallet = super.importWallet(inputStream, password);
+        for(Keystore keystore : wallet.getKeystores()) {
+            keystore.setLabel(keystore.getLabel().replace("Coldcard", "Blue Wallet"));
+            keystore.setWalletModel(WalletModel.BLUE_WALLET);
+        }
+
+        return wallet;
+    }
+
+    @Override
+    public String getWalletImportDescription() {
+        return "Import file or QR created by using the Wallet > Export Coordination Setup feature on your Blue Wallet Vault wallet.";
+    }
+
+    @Override
+    public String getWalletExportDescription() {
+        return "Export file that can be read by Blue Wallet using the Add Wallet > Vault > Import wallet feature.";
+    }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isWalletExportScannable() {
+        return true;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/io/CoboVaultMultisig.java

@@ -29,7 +29,7 @@ public class CoboVaultMultisig extends ColdcardMultisig {
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import file or QR created by using the Multisig Wallet > Show/Export XPUB feature on your Cobo Vault.";
+        return "Import file or QR created by using the Multisig Wallet > ... > Show/Export XPUB feature on your Cobo Vault.";
     }
 
     @Override
@@ -45,12 +45,12 @@ public class CoboVaultMultisig extends ColdcardMultisig {
 
     @Override
     public String getWalletImportDescription() {
-        return "Import file or QR created by using the Multisig Wallet > Create Multisig Wallet feature on your Cobo Vault.";
+        return "Import file or QR created by using the Multisig Wallet > ... > Create Multisig Wallet feature on your Cobo Vault.";
     }
 
     @Override
     public String getWalletExportDescription() {
-        return "Export file that can be read by your Cobo Vault using the Multisig Wallet > Import Multisig Wallet feature.";
+        return "Export file or QR that can be read by your Cobo Vault using the Multisig Wallet > ... > Import Multisig Wallet feature.";
     }
 
     @Override
@@ -62,4 +62,9 @@ public class CoboVaultMultisig extends ColdcardMultisig {
     public boolean isKeystoreImportScannable() {
         return true;
     }
+
+    @Override
+    public boolean isWalletExportScannable() {
+        return true;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/io/CoboVaultSinglesig.java

@@ -21,7 +21,7 @@ public class CoboVaultSinglesig implements KeystoreFileImport, WalletImport {
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import file or QR created by using the Settings > Watch-Only Wallet > Generic Wallet > Export Wallet feature on your Cobo Vault.";
+        return "Import file or QR created by using the My Cobo Vault > ... > Export Wallet feature on your Cobo Vault.";
     }
 
     @Override

src/main/java/com/sparrowwallet/sparrow/io/ColdcardMultisig.java

@@ -222,4 +222,9 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
     public boolean isKeystoreImportScannable() {
         return false;
     }
+
+    @Override
+    public boolean isWalletExportScannable() {
+        return false;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/io/Config.java

@@ -4,10 +4,7 @@ import com.google.gson.*;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.sparrow.Mode;
 import com.sparrowwallet.sparrow.Theme;
-import com.sparrowwallet.sparrow.net.CoreAuthType;
-import com.sparrowwallet.sparrow.net.ExchangeSource;
-import com.sparrowwallet.sparrow.net.FeeRatesSource;
-import com.sparrowwallet.sparrow.net.ServerType;
+import com.sparrowwallet.sparrow.net.*;
 import com.sparrowwallet.sparrow.wallet.FeeRatesSelection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +25,7 @@ public class Config {
     private FeeRatesSelection feeRatesSelection;
     private Currency fiatCurrency;
     private ExchangeSource exchangeSource;
+    private boolean validateDerivationPaths = true;
     private boolean groupByAddress = true;
     private boolean includeMempoolChange = true;
     private boolean notifyNewTransactions = true;
@@ -41,6 +39,7 @@ public class Config {
     private File hwi;
     private boolean hdCapture;
     private ServerType serverType;
+    private String publicElectrumServer;
     private String coreServer;
     private CoreAuthType coreAuthType;
     private File coreDataDir;
@@ -143,6 +142,10 @@ public class Config {
         flush();
     }
 
+    public boolean isFetchRates() {
+        return getExchangeSource() != ExchangeSource.NONE;
+    }
+
     public ExchangeSource getExchangeSource() {
         return exchangeSource;
     }
@@ -152,6 +155,15 @@ public class Config {
         flush();
     }
 
+    public boolean isValidateDerivationPaths() {
+        return validateDerivationPaths;
+    }
+
+    public void setValidateDerivationPaths(boolean validateDerivationPaths) {
+        this.validateDerivationPaths = validateDerivationPaths;
+        flush();
+    }
+
     public boolean isGroupByAddress() {
         return groupByAddress;
     }
@@ -269,8 +281,34 @@ public class Config {
         flush();
     }
 
+    public boolean hasServerAddress() {
+        return getServerAddress() != null && !getServerAddress().isEmpty();
+    }
+
     public String getServerAddress() {
-        return getServerType() == ServerType.BITCOIN_CORE ? getCoreServer() : getElectrumServer();
+        return getServerType() == ServerType.BITCOIN_CORE ? getCoreServer() : (getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER ? getPublicElectrumServer() : getElectrumServer());
+    }
+
+    public boolean requiresTor() {
+        if(isUseProxy() || !hasServerAddress()) {
+            return false;
+        }
+
+        Protocol protocol = Protocol.getProtocol(getServerAddress());
+        if(protocol == null) {
+            return false;
+        }
+
+        return protocol.isOnionAddress(protocol.getServerHostAndPort(getServerAddress()));
+    }
+
+    public String getPublicElectrumServer() {
+        return publicElectrumServer;
+    }
+
+    public void setPublicElectrumServer(String publicElectrumServer) {
+        this.publicElectrumServer = publicElectrumServer;
+        flush();
     }
 
     public String getCoreServer() {

src/main/java/com/sparrowwallet/sparrow/io/Electrum.java

@@ -161,8 +161,18 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                         }
 
                         keystore.setSeed(new DeterministicSeed(mnemonic, passphrase, 0, DeterministicSeed.Type.ELECTRUM));
-                        if(derivationPath.equals("m/0")) {
-                            derivationPath = "m/0'";
+
+                        //Ensure the derivation path from the seed matches the provided xpub
+                        String[] possibleDerivations = {"m", "m/0", "m/0'"};
+                        for(String possibleDerivation : possibleDerivations) {
+                            List<ChildNumber> derivation = KeyDerivation.parsePath(possibleDerivation);
+                            DeterministicKey derivedKey = keystore.getExtendedMasterPrivateKey().getKey(derivation);
+                            DeterministicKey derivedKeyPublicOnly = derivedKey.dropPrivateBytes().dropParent();
+                            ExtendedKey xpub = new ExtendedKey(derivedKeyPublicOnly, derivedKey.getParentFingerprint(), derivation.isEmpty() ? ChildNumber.ZERO : derivation.get(derivation.size() - 1));
+                            if(xpub.equals(xPub)) {
+                                derivationPath = possibleDerivation;
+                                break;
+                            }
                         }
                     } else {
                         keystore.setSource(KeystoreSource.SW_WATCH);
@@ -359,6 +369,11 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
         return false;
     }
 
+    @Override
+    public boolean isWalletExportScannable() {
+        return false;
+    }
+
     @Override
     public String getWalletExportDescription() {
         return "Export this wallet as an Electrum wallet file.";

src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.io;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
 import com.sparrowwallet.drongo.wallet.InvalidWalletException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
@@ -19,7 +20,7 @@ public class SpecterDesktop implements WalletImport, WalletExport {
         try {
             SpecterWallet specterWallet = new SpecterWallet();
             specterWallet.label = wallet.getName();
-            specterWallet.blockheight = wallet.getStoredBlockHeight();
+            specterWallet.blockheight = wallet.getTransactions().values().stream().mapToInt(BlockTransactionHash::getHeight).min().orElse(wallet.getStoredBlockHeight());
             specterWallet.descriptor = OutputDescriptor.getOutputDescriptor(wallet).toString(true);
 
             Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
@@ -83,6 +84,11 @@ public class SpecterDesktop implements WalletImport, WalletExport {
         return true;
     }
 
+    @Override
+    public boolean isWalletExportScannable() {
+        return true;
+    }
+
     @Override
     public String getName() {
         return "Specter Desktop";

src/main/java/com/sparrowwallet/sparrow/io/WalletExport.java

@@ -8,4 +8,5 @@ public interface WalletExport extends Export {
     void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException;
     String getWalletExportDescription();
     String getExportFileExtension();
+    boolean isWalletExportScannable();
 }

src/main/java/com/sparrowwallet/sparrow/net/Bwt.java

@@ -143,7 +143,6 @@ public class Bwt {
         this.terminating = false;
         this.ready = false;
         this.shutdownPtr = null;
-        Platform.runLater(() -> EventManager.get().post(new BwtShutdownEvent()));
     }
 
     public boolean isRunning() {

src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java

@@ -53,7 +53,10 @@ public class ElectrumServer {
                 File electrumServerCert = null;
                 String proxyServer = null;
 
-                if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
+                if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER) {
+                    electrumServer = Config.get().getPublicElectrumServer();
+                    proxyServer = Config.get().getProxyServer();
+                } else if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
                     if(bwtElectrumServer == null) {
                         throw new ServerConfigException("Could not connect to Bitcoin Core RPC");
                     }
@@ -629,6 +632,9 @@ public class ElectrumServer {
             Map<Integer, Double> targetBlocksFeeRatesSats = new TreeMap<>();
             for(Integer target : targetBlocksFeeRatesBtcKb.keySet()) {
                 long minFeeRateSatsKb = (long)(targetBlocksFeeRatesBtcKb.get(target) * Transaction.SATOSHIS_PER_BITCOIN);
+                if(minFeeRateSatsKb < 0) {
+                    minFeeRateSatsKb = 1000;
+                }
                 targetBlocksFeeRatesSats.put(target, minFeeRateSatsKb / 1000d);
             }
 
@@ -780,7 +786,6 @@ public class ElectrumServer {
         private final ReentrantLock bwtStartLock = new ReentrantLock();
         private final Condition bwtStartCondition = bwtStartLock.newCondition();
         private Throwable bwtStartException;
-        private final StringProperty statusProperty = new SimpleStringProperty();
 
         public ConnectionService() {
             this(true);
@@ -930,13 +935,16 @@ public class ElectrumServer {
                 Bwt.DisconnectionService disconnectionService = bwt.getDisconnectionService();
                 disconnectionService.setOnSucceeded(workerStateEvent -> {
                     ElectrumServer.bwtElectrumServer = null;
+                    if(subscribe) {
+                        EventManager.get().post(new BwtShutdownEvent());
+                    }
                 });
                 disconnectionService.setOnFailed(workerStateEvent -> {
                     log.error("Failed to stop BWT", workerStateEvent.getSource().getException());
                 });
-                Platform.runLater(disconnectionService::start);
-            } else {
-                Platform.runLater(() -> EventManager.get().post(new DisconnectionEvent()));
+                disconnectionService.start();
+            } else if(subscribe) {
+                EventManager.get().post(new DisconnectionEvent());
             }
         }
 
@@ -951,11 +959,6 @@ public class ElectrumServer {
             log.error("Uncaught error in ConnectionService", e);
         }
 
-        @Subscribe
-        public void torStatus(TorStatusEvent event) {
-            statusProperty.set(event.getStatus());
-        }
-
         @Subscribe
         public void bwtElectrumReadyStatus(BwtElectrumReadyStatusEvent event) {
             if(this.isRunning()) {
@@ -984,10 +987,6 @@ public class ElectrumServer {
                 bwtStartLock.unlock();
             }
         }
-
-        public StringProperty statusProperty() {
-            return statusProperty;
-        }
     }
 
     public static class ReadRunnable implements Runnable {

src/main/java/com/sparrowwallet/sparrow/net/ExchangeSource.java

@@ -1,9 +1,8 @@
 package com.sparrowwallet.sparrow.net;
 
-import com.google.common.net.HostAndPort;
 import com.google.gson.Gson;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.event.ExchangeRatesUpdatedEvent;
-import com.sparrowwallet.sparrow.io.Config;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
@@ -13,7 +12,6 @@ import org.slf4j.LoggerFactory;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -52,7 +50,7 @@ public enum ExchangeSource {
 
         private CoinbaseRates getRates() {
             String url = "https://api.coinbase.com/v2/exchange-rates?currency=BTC";
-            Proxy proxy = getProxy();
+            Proxy proxy = AppServices.getProxy();
 
             try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                 Gson gson = new Gson();
@@ -83,7 +81,7 @@ public enum ExchangeSource {
 
         private CoinGeckoRates getRates() {
             String url = "https://api.coingecko.com/api/v3/exchange_rates";
-            Proxy proxy = getProxy();
+            Proxy proxy = AppServices.getProxy();
 
             try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                 Gson gson = new Gson();
@@ -116,17 +114,6 @@ public enum ExchangeSource {
         }
     }
 
-    private static Proxy getProxy() {
-        Config config = Config.get();
-        if(config.isUseProxy()) {
-            HostAndPort proxy = HostAndPort.fromString(config.getProxyServer());
-            InetSocketAddress proxyAddress = new InetSocketAddress(proxy.getHost(), proxy.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
-            return new Proxy(Proxy.Type.SOCKS, proxyAddress);
-        }
-
-        return null;
-    }
-
     @Override
     public String toString() {
         return name;

src/main/java/com/sparrowwallet/sparrow/net/Protocol.java

@@ -28,12 +28,13 @@ public enum Protocol {
 
         @Override
         public Transport getTransport(HostAndPort server, HostAndPort proxy) {
-            throw new UnsupportedOperationException("TCP protocol does not support proxying");
+            //Avoid using a TorSocket if a proxy is specified, even if a .onion address
+            return new TcpTransport(server, proxy);
         }
 
         @Override
         public Transport getTransport(HostAndPort server, File serverCert, HostAndPort proxy) {
-            throw new UnsupportedOperationException("TCP protocol does not support proxying");
+            return getTransport(server, proxy);
         }
     },
     SSL {
@@ -116,7 +117,7 @@ public enum Protocol {
     }
 
     public boolean isOnionAddress(HostAndPort server) {
-        return server.getHost().toLowerCase().endsWith(".onion");
+        return server.getHost().toLowerCase().endsWith(TorService.TOR_ADDRESS_SUFFIX);
     }
 
     public static Protocol getProtocol(String url) {

src/main/java/com/sparrowwallet/sparrow/net/ProxySocketFactory.java

@@ -0,0 +1,67 @@
+package com.sparrowwallet.sparrow.net;
+
+import com.google.common.net.HostAndPort;
+
+import javax.net.SocketFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Socket;
+
+import static com.sparrowwallet.sparrow.net.ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT;
+
+public class ProxySocketFactory extends SocketFactory {
+    private final Proxy proxy;
+
+    public ProxySocketFactory() {
+        this(Proxy.NO_PROXY);
+    }
+
+    public ProxySocketFactory(HostAndPort proxyHostAndPort) {
+        this(getSocksProxy(proxyHostAndPort.getHost(), proxyHostAndPort.getPortOrDefault(DEFAULT_PROXY_PORT)));
+    }
+
+    public ProxySocketFactory(Proxy proxy) {
+        this.proxy = proxy;
+    }
+
+    @Override
+    public Socket createSocket() {
+        return new Socket(proxy);
+    }
+
+    @Override
+    public Socket createSocket(String address, int port) throws IOException {
+        return createSocket(new InetSocketAddress(address, port), null);
+    }
+
+    @Override
+    public Socket createSocket(String address, int port, InetAddress localAddress, int localPort) throws IOException {
+        return createSocket(new InetSocketAddress(address, port), new InetSocketAddress(localAddress, localPort));
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port) throws IOException {
+        return createSocket(new InetSocketAddress(address, port), null);
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+        return createSocket(new InetSocketAddress(address, port), new InetSocketAddress(localAddress, localPort));
+    }
+
+    private Socket createSocket(InetSocketAddress address, InetSocketAddress bindAddress) throws IOException {
+        Socket socket = new Socket(proxy);
+        if(bindAddress != null) {
+            socket.bind(bindAddress);
+        }
+
+        socket.connect(address);
+        return socket;
+    }
+
+    private static Proxy getSocksProxy(String proxyAddress, int proxyPort) {
+        return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(proxyAddress, proxyPort));
+    }
+}

src/main/java/com/sparrowwallet/sparrow/net/PublicElectrumServer.java

@@ -0,0 +1,40 @@
+package com.sparrowwallet.sparrow.net;
+
+public enum PublicElectrumServer {
+    BLOCKSTREAM_INFO("blockstream.info", "ssl://blockstream.info:700"),
+    ELECTRUM_BLOCKSTREAM_INFO("electrum.blockstream.info", "ssl://electrum.blockstream.info:50002"),
+    LUKECHILDS_CO("bitcoin.lukechilds.co", "ssl://bitcoin.lukechilds.co:50002"),
+    EMZY_DE("electrum.emzy.de", "ssl://electrum.emzy.de:50002"),
+    BITAROO_NET("electrum.bitaroo.net", "ssl://electrum.bitaroo.net:50002");
+
+    PublicElectrumServer(String name, String url) {
+        this.name = name;
+        this.url = url;
+    }
+
+    private final String name;
+    private final String url;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public static PublicElectrumServer fromUrl(String url) {
+        for(PublicElectrumServer server : values()) {
+            if(server.url.equals(url)) {
+                return server;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/net/ServerType.java

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.net;
 
 public enum ServerType {
-    BITCOIN_CORE("Bitcoin Core"), ELECTRUM_SERVER("Electrum Server");
+    BITCOIN_CORE("Bitcoin Core"), ELECTRUM_SERVER("Private Electrum"), PUBLIC_ELECTRUM_SERVER("Public Electrum");
 
     private final String name;
 

src/main/java/com/sparrowwallet/sparrow/net/TcpTransport.java

@@ -47,8 +47,12 @@ public class TcpTransport implements Transport, Closeable {
     private final Gson gson = new Gson();
 
     public TcpTransport(HostAndPort server) {
+        this(server, null);
+    }
+
+    public TcpTransport(HostAndPort server, HostAndPort proxy) {
         this.server = server;
-        this.socketFactory = SocketFactory.getDefault();
+        this.socketFactory = (proxy == null ? SocketFactory.getDefault() : new ProxySocketFactory(proxy));
     }
 
     @Override

src/main/java/com/sparrowwallet/sparrow/net/TorService.java

@@ -0,0 +1,61 @@
+package com.sparrowwallet.sparrow.net;
+
+import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Task;
+import net.freehaven.tor.control.TorControlError;
+import org.berndpruenster.netlayer.tor.NativeTor;
+import org.berndpruenster.netlayer.tor.Tor;
+import org.berndpruenster.netlayer.tor.TorCtlException;
+import org.berndpruenster.netlayer.tor.Torrc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+
+/**
+ * Service to start internal Tor (including a Tor proxy running on localhost:9050)
+ *
+ * This is a ScheduledService to take advantage of the retry on failure behaviour
+ */
+public class TorService extends ScheduledService<NativeTor> {
+    private static final Logger log = LoggerFactory.getLogger(TorService.class);
+
+    public static final int PROXY_PORT = 9050;
+    public static final String TOR_DIR_PREFIX = "tor";
+    public static final String TOR_ADDRESS_SUFFIX = ".onion";
+
+    @Override
+    protected Task<NativeTor> createTask() {
+        return new Task<>() {
+            protected NativeTor call() throws IOException {
+                if(Tor.getDefault() == null) {
+                    Path path = Files.createTempDirectory(TOR_DIR_PREFIX);
+                    File torInstallDir = path.toFile();
+                    torInstallDir.deleteOnExit();
+                    try {
+                        LinkedHashMap<String, String> torrcOptionsMap = new LinkedHashMap<>();
+                        torrcOptionsMap.put("SocksPort", Integer.toString(PROXY_PORT));
+                        torrcOptionsMap.put("DisableNetwork", "0");
+                        Torrc override = new Torrc(torrcOptionsMap);
+
+                        return new NativeTor(torInstallDir, Collections.emptyList(), override);
+                    } catch(TorCtlException e) {
+                        log.error("Failed to start Tor", e);
+                        if(e.getCause() instanceof TorControlError) {
+                            throw new IOException("Failed to start Tor", e.getCause());
+                        } else {
+                            throw new IOException("Failed to start Tor", e);
+                        }
+                    }
+                }
+
+                return null;
+            }
+        };
+    }
+}

src/main/java/com/sparrowwallet/sparrow/net/TorTcpTransport.java

@@ -1,18 +1,11 @@
 package com.sparrowwallet.sparrow.net;
 
 import com.google.common.net.HostAndPort;
-import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.event.StatusEvent;
-import com.sparrowwallet.sparrow.event.TorStatusEvent;
-import javafx.application.Platform;
+import com.sparrowwallet.sparrow.AppServices;
 import org.berndpruenster.netlayer.tor.*;
 
 import java.io.*;
 import java.net.Socket;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Collections;
-import java.util.LinkedHashMap;
 
 public class TorTcpTransport extends TcpTransport {
     public static final String TOR_DIR_PREFIX = "tor";
@@ -21,35 +14,16 @@ public class TorTcpTransport extends TcpTransport {
         super(server);
     }
 
+    public TorTcpTransport(HostAndPort server, HostAndPort proxy) {
+        super(server, proxy);
+    }
+
     @Override
     protected Socket createSocket() throws IOException {
-        if(Tor.getDefault() == null) {
-            Platform.runLater(() -> {
-                String status = "Starting Tor...";
-                EventManager.get().post(new TorStatusEvent(status));
-            });
-
-            Path path = Files.createTempDirectory(TOR_DIR_PREFIX);
-            File torInstallDir = path.toFile();
-            torInstallDir.deleteOnExit();
-            try {
-                LinkedHashMap<String, String> torrcOptionsMap = new LinkedHashMap<>();
-                torrcOptionsMap.put("DisableNetwork", "0");
-                Torrc override = new Torrc(torrcOptionsMap);
-
-                NativeTor nativeTor = new NativeTor(torInstallDir, Collections.emptyList(), override);
-                Tor.setDefault(nativeTor);
-            } catch(TorCtlException e) {
-                e.printStackTrace();
-                throw new IOException(e);
-            }
+        if(!AppServices.isTorRunning()) {
+            throw new IllegalStateException("Can't create Tor socket, Tor is not running");
         }
 
-        Platform.runLater(() -> {
-            String status = "Tor running, connecting to " + server.toString() + "...";
-            EventManager.get().post(new TorStatusEvent(status));
-        });
-
         return new TorSocket(server.getHost(), server.getPort(), "sparrow");
     }
 }

src/main/java/com/sparrowwallet/sparrow/net/VersionCheckService.java

@@ -5,6 +5,7 @@ import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.MainApp;
 import com.sparrowwallet.sparrow.event.VersionUpdatedEvent;
 import javafx.concurrent.ScheduledService;
@@ -15,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.Proxy;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.security.SignatureException;
@@ -44,7 +46,8 @@ public class VersionCheckService extends ScheduledService<VersionUpdatedEvent> {
 
     private VersionCheck getVersionCheck() throws IOException {
         URL url = new URL(VERSION_CHECK_URL);
-        HttpsURLConnection conn = (HttpsURLConnection)url.openConnection();
+        Proxy proxy = AppServices.getProxy();
+        HttpsURLConnection conn = (HttpsURLConnection)(proxy == null ? url.openConnection() : url.openConnection(proxy));
 
         try(InputStreamReader reader = new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)) {
             Gson gson = new Gson();

src/main/java/com/sparrowwallet/sparrow/preferences/GeneralPreferencesController.java

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.preferences;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
 import com.sparrowwallet.sparrow.event.*;
@@ -32,6 +33,9 @@ public class GeneralPreferencesController extends PreferencesDetailController {
     @FXML
     private ComboBox<ExchangeSource> exchangeSource;
 
+    @FXML
+    private UnlabeledToggleSwitch validateDerivationPaths;
+
     @FXML
     private UnlabeledToggleSwitch groupByAddress;
 
@@ -93,6 +97,12 @@ public class GeneralPreferencesController extends PreferencesDetailController {
 
         updateCurrencies(exchangeSource.getSelectionModel().getSelectedItem());
 
+        validateDerivationPaths.setSelected(config.isValidateDerivationPaths());
+        validateDerivationPaths.selectedProperty().addListener((observableValue, oldValue, newValue) -> {
+            config.setValidateDerivationPaths(newValue);
+            System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!newValue));
+        });
+
         groupByAddress.setSelected(config.isGroupByAddress());
         includeMempoolChange.setSelected(config.isIncludeMempoolChange());
         groupByAddress.selectedProperty().addListener((observableValue, oldValue, newValue) -> {

src/main/java/com/sparrowwallet/sparrow/preferences/PreferencesDialog.java

@@ -46,7 +46,7 @@ public class PreferencesDialog extends Dialog<Boolean> {
                 dialogPane.getButtonTypes().addAll(newWalletButtonType);
             }
 
-            dialogPane.setPrefWidth(650);
+            dialogPane.setPrefWidth(750);
             dialogPane.setPrefHeight(600);
 
             preferencesController.reconnectOnClosingProperty().set(AppServices.isConnecting() || AppServices.isConnected());

src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java

@@ -14,7 +14,6 @@ import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.net.*;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
-import javafx.concurrent.WorkerStateEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.text.Font;
@@ -22,6 +21,9 @@ import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import net.freehaven.tor.control.TorControlError;
+import org.berndpruenster.netlayer.tor.Tor;
+import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -40,6 +42,7 @@ import java.security.cert.CertificateFactory;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Random;
 
 public class ServerPreferencesController extends PreferencesDetailController {
     private static final Logger log = LoggerFactory.getLogger(ServerPreferencesController.class);
@@ -47,6 +50,27 @@ public class ServerPreferencesController extends PreferencesDetailController {
     @FXML
     private ToggleGroup serverTypeToggleGroup;
 
+    @FXML
+    private SegmentedButton serverTypeSegmentedButton;
+
+    @FXML
+    private ToggleButton publicElectrumToggle;
+
+    @FXML
+    private Form publicElectrumForm;
+
+    @FXML
+    private ComboBox<PublicElectrumServer> publicElectrumServer;
+
+    @FXML
+    private UnlabeledToggleSwitch publicUseProxy;
+
+    @FXML
+    private TextField publicProxyHost;
+
+    @FXML
+    private TextField publicProxyPort;
+
     @FXML
     private Form coreForm;
 
@@ -121,6 +145,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
 
     private final ValidationSupport validationSupport = new ValidationSupport();
 
+    private TorService torService;
+
     private ElectrumServer.ConnectionService connectionService;
 
     @Override
@@ -132,13 +158,15 @@ public class ServerPreferencesController extends PreferencesDetailController {
 
         Platform.runLater(this::setupValidation);
 
+        publicElectrumForm.managedProperty().bind(publicElectrumForm.visibleProperty());
         coreForm.managedProperty().bind(coreForm.visibleProperty());
         electrumForm.managedProperty().bind(electrumForm.visibleProperty());
-        coreForm.visibleProperty().bind(electrumForm.visibleProperty().not());
         serverTypeToggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
             if(serverTypeToggleGroup.getSelectedToggle() != null) {
                 ServerType existingType = config.getServerType();
                 ServerType serverType = (ServerType)newValue.getUserData();
+                publicElectrumForm.setVisible(serverType == ServerType.PUBLIC_ELECTRUM_SERVER);
+                coreForm.setVisible(serverType == ServerType.BITCOIN_CORE);
                 electrumForm.setVisible(serverType == ServerType.ELECTRUM_SERVER);
                 config.setServerType(serverType);
                 testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.QUESTION_CIRCLE, ""));
@@ -150,12 +178,26 @@ public class ServerPreferencesController extends PreferencesDetailController {
                 oldValue.setSelected(true);
             }
         });
-        ServerType serverType = config.getServerType() != null ? config.getServerType() : (config.getCoreServer() == null && config.getElectrumServer() != null ? ServerType.ELECTRUM_SERVER : ServerType.BITCOIN_CORE);
+        ServerType serverType = config.getServerType() != null ?
+                (config.getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER && Network.get() != Network.MAINNET ? ServerType.BITCOIN_CORE : config.getServerType()) :
+                    (config.getCoreServer() == null && config.getElectrumServer() != null ? ServerType.ELECTRUM_SERVER :
+                        (config.getCoreServer() != null || Network.get() != Network.MAINNET ? ServerType.BITCOIN_CORE : ServerType.PUBLIC_ELECTRUM_SERVER));
+        if(Network.get() != Network.MAINNET) {
+            serverTypeSegmentedButton.getButtons().remove(publicElectrumToggle);
+            serverTypeToggleGroup.getToggles().remove(publicElectrumToggle);
+        }
         serverTypeToggleGroup.selectToggle(serverTypeToggleGroup.getToggles().stream().filter(toggle -> toggle.getUserData() == serverType).findFirst().orElse(null));
 
+        publicElectrumServer.getSelectionModel().selectedItemProperty().addListener(getPublicElectrumServerListener(config));
+
+        publicUseProxy.selectedProperty().bindBidirectional(useProxy.selectedProperty());
+        publicProxyHost.textProperty().bindBidirectional(proxyHost.textProperty());
+        publicProxyPort.textProperty().bindBidirectional(proxyPort.textProperty());
+
         corePort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
         electrumPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
         proxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
+        publicProxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
 
         coreHost.textProperty().addListener(getBitcoinCoreListener(config));
         corePort.textProperty().addListener(getBitcoinCoreListener(config));
@@ -242,13 +284,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
             proxyHost.setText(proxyHost.getText().trim());
             proxyHost.setDisable(!newValue);
             proxyPort.setDisable(!newValue);
-
-            if(newValue) {
-                electrumUseSsl.setSelected(true);
-                electrumUseSsl.setDisable(true);
-            } else {
-                electrumUseSsl.setDisable(false);
-            }
+            publicProxyHost.setDisable(!newValue);
+            publicProxyPort.setDisable(!newValue);
         });
 
         boolean isConnected = AppServices.isConnecting() || AppServices.isConnected();
@@ -263,7 +300,12 @@ public class ServerPreferencesController extends PreferencesDetailController {
         testConnection.setOnAction(event -> {
             testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.ELLIPSIS_H, null));
             testResults.setText("Connecting to " + config.getServerAddress() + "...");
-            startElectrumConnection();
+
+            if(Config.get().requiresTor() && Tor.getDefault() == null) {
+                startTor();
+            } else {
+                startElectrumConnection();
+            }
         });
 
         editConnection.managedProperty().bind(editConnection.visibleProperty());
@@ -276,6 +318,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
             testConnection.setVisible(true);
         });
 
+        PublicElectrumServer configPublicElectrumServer = PublicElectrumServer.fromUrl(config.getPublicElectrumServer());
+        if(configPublicElectrumServer == null) {
+            publicElectrumServer.setValue(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)]);
+        } else {
+            publicElectrumServer.setValue(configPublicElectrumServer);
+        }
+
         String coreServer = config.getCoreServer();
         if(coreServer != null) {
             Protocol protocol = Protocol.getProtocol(coreServer);
@@ -339,11 +388,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
         useProxy.setSelected(config.isUseProxy());
         proxyHost.setDisable(!config.isUseProxy());
         proxyPort.setDisable(!config.isUseProxy());
-
-        if(config.isUseProxy()) {
-            electrumUseSsl.setSelected(true);
-            electrumUseSsl.setDisable(true);
-        }
+        publicProxyHost.setDisable(!config.isUseProxy());
+        publicProxyPort.setDisable(!config.isUseProxy());
 
         String proxyServer = config.getProxyServer();
         if(proxyServer != null) {
@@ -357,6 +403,32 @@ public class ServerPreferencesController extends PreferencesDetailController {
         setFieldsEditable(!isConnected);
     }
 
+    private void startTor() {
+        if(torService != null && torService.isRunning()) {
+            return;
+        }
+
+        torService = new TorService();
+        torService.setPeriod(Duration.hours(1000));
+        torService.setRestartOnFailure(false);
+
+        torService.setOnRunning(workerStateEvent -> {
+            testResults.setText(testResults.getText() + "\nStarting Tor...");
+        });
+        torService.setOnSucceeded(workerStateEvent -> {
+            Tor.setDefault(torService.getValue());
+            torService.cancel();
+            testResults.setText(testResults.getText() + "\nTor started");
+            startElectrumConnection();
+        });
+        torService.setOnFailed(workerStateEvent -> {
+            testResults.setText(testResults.getText() + "\nTor failed to start");
+            showConnectionFailure(workerStateEvent.getSource().getException());
+        });
+
+        torService.start();
+    }
+
     private void startElectrumConnection() {
         if(connectionService != null && connectionService.isRunning()) {
             connectionService.cancel();
@@ -364,10 +436,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
 
         connectionService = new ElectrumServer.ConnectionService(false);
         connectionService.setPeriod(Duration.hours(1));
+        connectionService.setRestartOnFailure(false);
         EventManager.get().register(connectionService);
-        connectionService.statusProperty().addListener((observable, oldValue, newValue) -> {
-            testResults.setText(testResults.getText() + "\n" + newValue);
-        });
 
         connectionService.setOnSucceeded(successEvent -> {
             EventManager.get().unregister(connectionService);
@@ -379,8 +449,7 @@ public class ServerPreferencesController extends PreferencesDetailController {
         });
         connectionService.setOnFailed(workerStateEvent -> {
             EventManager.get().unregister(connectionService);
-            showConnectionFailure(workerStateEvent);
-            connectionService.cancel();
+            showConnectionFailure(workerStateEvent.getSource().getException());
         });
         connectionService.start();
     }
@@ -388,6 +457,11 @@ public class ServerPreferencesController extends PreferencesDetailController {
     private void setFieldsEditable(boolean editable) {
         serverTypeToggleGroup.getToggles().forEach(toggle -> ((ToggleButton)toggle).setDisable(!editable));
 
+        publicElectrumServer.setDisable(!editable);
+        publicUseProxy.setDisable(!editable);
+        publicProxyHost.setDisable(!editable);
+        publicProxyPort.setDisable(!editable);
+
         coreHost.setDisable(!editable);
         corePort.setDisable(!editable);
         coreAuthToggleGroup.getToggles().forEach(toggle -> ((ToggleButton)toggle).setDisable(!editable));
@@ -421,19 +495,30 @@ public class ServerPreferencesController extends PreferencesDetailController {
         }
     }
 
-    private void showConnectionFailure(WorkerStateEvent failEvent) {
-        Throwable e = failEvent.getSource().getException();
-        log.error("Connection error", e);
-        String reason = e.getCause() != null ? e.getCause().getMessage() : e.getMessage();
-        if(e.getCause() != null && e.getCause() instanceof SSLHandshakeException) {
+    private void showConnectionFailure(Throwable exception) {
+        log.error("Connection error", exception);
+        String reason = exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage();
+        if(exception.getCause() != null && exception.getCause() instanceof SSLHandshakeException) {
             reason = "SSL Handshake Error\n" + reason;
         }
+        if(exception.getCause() != null && exception.getCause() instanceof TorControlError && exception.getCause().getMessage().contains("Failed to bind")) {
+            reason += "\nIs a Tor proxy already running on port " + TorService.PROXY_PORT + "?";
+        }
 
         testResults.setText("Could not connect:\n\n" + reason);
         testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.EXCLAMATION_CIRCLE, "failure"));
     }
 
     private void setupValidation() {
+        validationSupport.registerValidator(publicProxyHost, Validator.combine(
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Proxy host required", publicUseProxy.isSelected() && newValue.isEmpty()),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid host name", getHost(newValue) == null)
+        ));
+
+        validationSupport.registerValidator(publicProxyPort, Validator.combine(
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid proxy port", !newValue.isEmpty() && !isValidPort(Integer.parseInt(newValue)))
+        ));
+
         validationSupport.registerValidator(coreHost, Validator.combine(
                 (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid Core host", getHost(newValue) == null)
         ));
@@ -478,6 +563,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
         validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
     }
 
+    @NotNull
+    private ChangeListener<PublicElectrumServer> getPublicElectrumServerListener(Config config) {
+        return (observable, oldValue, newValue) -> {
+            config.setPublicElectrumServer(newValue.getUrl());
+        };
+    }
+
     @NotNull
     private ChangeListener<String> getBitcoinCoreListener(Config config) {
         return (observable, oldValue, newValue) -> {

src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java

@@ -633,7 +633,7 @@ public class HeadersController extends TransactionFormController implements Init
         toggleButton.setSelected(false);
 
         //TODO: Remove once Cobo Vault has upgraded to UR2.0
-        boolean addLegacyEncodingOption = headersForm.getSigningWallet().getKeystores().stream().anyMatch(keystore -> keystore.getWalletModel().equals(WalletModel.COBO_VAULT));
+        boolean addLegacyEncodingOption = headersForm.getSigningWallet().getKeystores().stream().anyMatch(keystore -> keystore.getWalletModel().equals(WalletModel.COBO_VAULT) || keystore.getWalletModel().equals(WalletModel.SPARROW));
 
         try {
             QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(RegistryType.CRYPTO_PSBT.toString(), headersForm.getPsbt().serialize(), addLegacyEncodingOption);
@@ -665,6 +665,10 @@ public class HeadersController extends TransactionFormController implements Init
 
         File file = fileChooser.showSaveDialog(window);
         if(file != null) {
+            if(!file.getName().toLowerCase().endsWith(".psbt")) {
+                file = new File(file.getAbsolutePath() + ".psbt");
+            }
+
             try {
                 try(PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8)) {
                     writer.print(headersForm.getPsbt().toBase64String());

src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java

@@ -24,6 +24,7 @@ import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
 import javafx.scene.layout.StackPane;
+import javafx.util.StringConverter;
 import org.controlsfx.control.RangeSlider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,6 +106,18 @@ public class SettingsController extends WalletFormController implements Initiali
             }
         });
 
+        scriptType.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return Arrays.stream(ScriptType.values()).filter(type -> type.getDescription().equals(string)).findFirst().orElse(null);
+            }
+        });
+
         scriptType.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, scriptType) -> {
             if(scriptType != null) {
                 walletForm.getWallet().setScriptType(scriptType);
@@ -317,7 +330,10 @@ public class SettingsController extends WalletFormController implements Initiali
                 wallet.setDefaultPolicy(Policy.getPolicy(wallet.getPolicyType(), wallet.getScriptType(), wallet.getKeystores(), (int)multisigControl.getLowValue()));
             }
 
-            descriptor.setWallet(wallet);
+            if(ScriptType.getAddressableScriptTypes(wallet.getPolicyType()).contains(wallet.getScriptType())) {
+                descriptor.setWallet(wallet);
+            }
+
             revert.setDisable(false);
             apply.setDisable(!wallet.isValid());
         }

src/main/java/com/sparrowwallet/sparrow/wallet/SettingsWalletForm.java

@@ -38,6 +38,8 @@ public class SettingsWalletForm extends WalletForm {
 
     @Override
     public void saveAndRefresh() throws IOException {
+        Wallet pastWallet = wallet.copy();
+
         boolean refreshAll = isRefreshNecessary(wallet, walletCopy);
         if(refreshAll) {
             walletCopy.clearNodes();
@@ -47,7 +49,7 @@ public class SettingsWalletForm extends WalletForm {
         save();
 
         if(refreshAll) {
-            EventManager.get().post(new WalletSettingsChangedEvent(wallet, getWalletFile()));
+            EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, getWalletFile()));
         }
     }
 

src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java

@@ -1,6 +1,9 @@
 package com.sparrowwallet.sparrow.wallet;
 
+import com.csvreader.CsvWriter;
 import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.EventManager;
@@ -8,14 +11,26 @@ import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.net.ExchangeSource;
 import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
 import javafx.scene.control.TreeItem;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 import java.util.ResourceBundle;
 
 public class TransactionsController extends WalletFormController implements Initializable {
+    private static final Logger log = LoggerFactory.getLogger(TransactionsController.class);
 
     @FXML
     private CoinLabel balance;
@@ -38,6 +53,9 @@ public class TransactionsController extends WalletFormController implements Init
     @FXML
     private BalanceChart balanceChart;
 
+    @FXML
+    private Button exportCsv;
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
@@ -81,6 +99,41 @@ public class TransactionsController extends WalletFormController implements Init
         transactionCount.setText(walletTransactionsEntry.getChildren() != null ? Integer.toString(walletTransactionsEntry.getChildren().size()) : "0");
     }
 
+    public void exportCSV(ActionEvent event) {
+        WalletTransactionsEntry walletTransactionsEntry = getWalletForm().getWalletTransactionsEntry();
+
+        Stage window = new Stage();
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Export Transactions as CSV");
+        fileChooser.setInitialFileName(getWalletForm().getWallet().getName() + ".csv");
+
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                CsvWriter writer = new CsvWriter(outputStream, ',', StandardCharsets.UTF_8);
+                writer.writeRecord(new String[] {"Date", "Label", "Value", "Balance"});
+                for(Entry entry : walletTransactionsEntry.getChildren()) {
+                    TransactionEntry txEntry = (TransactionEntry)entry;
+                    writer.write(EntryCell.DATE_FORMAT.format(txEntry.getBlockTransaction().getDate()));
+                    writer.write(txEntry.getLabel());
+                    writer.write(getCoinValue(txEntry.getValue()));
+                    writer.write(getCoinValue(txEntry.getBalance()));
+                    writer.endRecord();
+                }
+                writer.close();
+            } catch(IOException e) {
+                log.error("Error exporting transactions as CSV", e);
+                AppServices.showErrorDialog("Error exporting transactions as CSV", e.getMessage());
+            }
+        }
+    }
+
+    private String getCoinValue(Long value) {
+        return BitcoinUnit.BTC.equals(transactionsTable.getBitcoinUnit()) ?
+                CoinLabel.getBTCFormat().format(value.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN) :
+                String.format(Locale.ENGLISH, "%d", value);
+    }
+
     @Subscribe
     public void walletNodesChanged(WalletNodesChangedEvent event) {
         if(event.getWallet().equals(walletForm.getWallet())) {
@@ -162,6 +215,11 @@ public class TransactionsController extends WalletFormController implements Init
         walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
     }
 
+    @Subscribe
+    private void connectionFailed(ConnectionFailedEvent event) {
+        walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
+    }
+
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
         if(event.getWallet().equals(getWalletForm().getWallet())) {

src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java

@@ -149,6 +149,11 @@ public class UtxosController extends WalletFormController implements Initializab
         walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
     }
 
+    @Subscribe
+    private void connectionFailed(ConnectionFailedEvent event) {
+        walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
+    }
+
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
         if(event.getWallet().equals(getWalletForm().getWallet())) {

src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java

@@ -2,14 +2,18 @@ package com.sparrowwallet.sparrow.wallet;
 
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.WalletTabData;
 import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.net.ServerType;
 import javafx.application.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,6 +27,7 @@ public class WalletForm {
 
     private final Storage storage;
     protected Wallet wallet;
+    private Wallet savedPastWallet;
 
     private WalletTransactionsEntry walletTransactionsEntry;
     private WalletUtxosEntry walletUtxosEntry;
@@ -32,7 +37,7 @@ public class WalletForm {
     public WalletForm(Storage storage, Wallet currentWallet) {
         this.storage = storage;
         this.wallet = currentWallet;
-        refreshHistory(AppServices.getCurrentBlockHeight());
+        refreshHistory(AppServices.getCurrentBlockHeight(), null);
     }
 
     public Wallet getWallet() {
@@ -60,27 +65,28 @@ public class WalletForm {
     }
 
     public void saveAndRefresh() throws IOException {
+        Wallet pastWallet = wallet.copy();
         wallet.clearHistory();
         save();
-        refreshHistory(AppServices.getCurrentBlockHeight());
+        refreshHistory(AppServices.getCurrentBlockHeight(), pastWallet);
     }
 
     public void saveBackup() throws IOException {
         storage.backupWallet();
     }
 
-    public void refreshHistory(Integer blockHeight) {
-        refreshHistory(blockHeight, null);
+    public void refreshHistory(Integer blockHeight, Wallet pastWallet) {
+        refreshHistory(blockHeight, pastWallet, null);
     }
 
-    public void refreshHistory(Integer blockHeight, WalletNode node) {
+    public void refreshHistory(Integer blockHeight, Wallet pastWallet, WalletNode node) {
         Wallet previousWallet = wallet.copy();
         if(wallet.isValid() && AppServices.isConnected()) {
             log.debug(node == null ? wallet.getName() + " refreshing full wallet history" : wallet.getName() + " requesting node wallet history for " + node.getDerivationPath());
             ElectrumServer.TransactionHistoryService historyService = new ElectrumServer.TransactionHistoryService(wallet, getWalletTransactionNodes(node));
             historyService.setOnSucceeded(workerStateEvent -> {
                 EventManager.get().post(new WalletHistoryStatusEvent(wallet, false));
-                updateWallet(previousWallet, blockHeight);
+                updateWallet(blockHeight, pastWallet, previousWallet);
             });
             historyService.setOnFailed(workerStateEvent -> {
                 log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());
@@ -91,15 +97,31 @@ public class WalletForm {
         }
     }
 
-    private void updateWallet(Wallet previousWallet, Integer blockHeight) {
+    private void updateWallet(Integer blockHeight, Wallet pastWallet, Wallet previousWallet) {
         if(blockHeight != null) {
             wallet.setStoredBlockHeight(blockHeight);
         }
 
-        notifyIfChanged(previousWallet, blockHeight);
+        if(pastWallet != null) {
+            copyLabels(pastWallet);
+        }
+
+        notifyIfChanged(blockHeight, previousWallet);
     }
 
-    private void notifyIfChanged(Wallet previousWallet, Integer blockHeight) {
+    private void copyLabels(Wallet pastWallet) {
+        wallet.getNode(KeyPurpose.RECEIVE).copyLabels(pastWallet.getNode(KeyPurpose.RECEIVE));
+        wallet.getNode(KeyPurpose.CHANGE).copyLabels(pastWallet.getNode(KeyPurpose.CHANGE));
+
+        for(Map.Entry<Sha256Hash, BlockTransaction> txEntry : wallet.getTransactions().entrySet()) {
+            BlockTransaction pastBlockTransaction = pastWallet.getTransactions().get(txEntry.getKey());
+            if(pastBlockTransaction != null && txEntry.getValue() != null && txEntry.getValue().getLabel() == null && pastBlockTransaction.getLabel() != null) {
+                txEntry.getValue().setLabel(pastBlockTransaction.getLabel());
+            }
+        }
+    }
+
+    private void notifyIfChanged(Integer blockHeight, Wallet previousWallet) {
         List<WalletNode> historyChangedNodes = new ArrayList<>();
         historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.RECEIVE).getChildren(), wallet.getNode(KeyPurpose.RECEIVE).getChildren()));
         historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.CHANGE).getChildren(), wallet.getNode(KeyPurpose.CHANGE).getChildren()));
@@ -226,7 +248,14 @@ public class WalletForm {
             walletUtxosEntry = null;
             accountEntries.clear();
             EventManager.get().post(new WalletNodesChangedEvent(wallet));
-            refreshHistory(AppServices.getCurrentBlockHeight());
+
+            //It is necessary to save the past wallet because the actual copying of the past labels only occurs on a later ConnectionEvent with bwt
+            //The savedPastWallet variable can be removed once bwt supports dynamic loading of wallets without needing to disconnect/reconnect
+            if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
+                savedPastWallet = event.getPastWallet();
+            }
+
+            refreshHistory(AppServices.getCurrentBlockHeight(), event.getPastWallet());
         }
     }
 
@@ -234,13 +263,14 @@ public class WalletForm {
     public void newBlock(NewBlockEvent event) {
         //Check if wallet is valid to avoid saving wallets in initial setup
         if(wallet.isValid()) {
-            updateWallet(wallet.copy(), event.getHeight());
+            updateWallet(event.getHeight(), null, wallet.copy());
         }
     }
 
     @Subscribe
     public void connected(ConnectionEvent event) {
-        refreshHistory(event.getBlockHeight());
+        refreshHistory(event.getBlockHeight(), savedPastWallet);
+        savedPastWallet = null;
     }
 
     @Subscribe
@@ -249,7 +279,7 @@ public class WalletForm {
             WalletNode walletNode = event.getWalletNode(wallet);
             if(walletNode != null) {
                 log.debug(wallet.getName() + " history event for node " + walletNode + " (" + event.getScriptHash() + ")");
-                refreshHistory(AppServices.getCurrentBlockHeight(), walletNode);
+                refreshHistory(AppServices.getCurrentBlockHeight(), null, walletNode);
             }
         }
     }

src/main/java/module-info.java

@@ -26,4 +26,6 @@ open module com.sparrowwallet.sparrow {
     requires jcommander;
     requires slf4j.api;
     requires bwt.jni;
+    requires jtorctl;
+    requires javacsv;
 }

src/main/resources/com/sparrowwallet/sparrow/about.fxml

@@ -21,8 +21,8 @@
         </HBox>
         <VBox spacing="10" styleClass="content-area">
             <Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact will a full understanding of your money." wrapText="true" />
-            <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to your Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
-            <Label text="Connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your own Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. " wrapText="true" />
+            <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to a Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
+            <Label text="While it's possible to connect to a public Electrum server, connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your private Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. " wrapText="true" />
             <HBox><Label text="If you find Sparrow useful, consider donating at "/><Hyperlink text="https://sparrowwallet.com/donate" onAction="#openDonate"/></HBox>
         </VBox>
         <HBox styleClass="button-area" alignment="BOTTOM_RIGHT" VBox.vgrow="SOMETIMES">

src/main/resources/com/sparrowwallet/sparrow/app.css

@@ -34,3 +34,8 @@
     -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
     -fx-background-insets: 0, 1;
 }
+
+.public-server.toggle-switch:selected .thumb-area {
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(gold, 30%), gold);
+    -fx-background-insets: 0, 1;
+}

src/main/resources/com/sparrowwallet/sparrow/app.fxml

@@ -9,7 +9,7 @@
 <?import com.sparrowwallet.drongo.BitcoinUnit?>
 <?import com.sparrowwallet.sparrow.Theme?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="200" minWidth="350" prefHeight="770.0" prefWidth="1000.0" fx:controller="com.sparrowwallet.sparrow.AppController" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="200" minWidth="350" prefHeight="770.0" prefWidth="1020.0" fx:controller="com.sparrowwallet.sparrow.AppController" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <MenuBar useSystemMenuBar="true">
             <menus>
@@ -22,7 +22,7 @@
                                 <MenuItem text="File..." onAction="#openTransactionFromFile" accelerator="Shortcut+F"/>
                                 <MenuItem fx:id="openTransactionIdItem" text="From ID..." onAction="#openTransactionFromId" accelerator="Shortcut+I"/>
                                 <MenuItem text="From Text..." onAction="#openTransactionFromText" accelerator="Shortcut+T"/>
-                                <MenuItem text="From QR..." onAction="#openTransactionFromQR" accelerator="Shortcut+R"/>
+                                <MenuItem text="From QR..." onAction="#openTransactionFromQR" accelerator="Shortcut+U"/>
                                 <!-- <MenuItem text="Examples" onAction="#openExamples"/> -->
                             </items>
                         </Menu>
@@ -82,6 +82,8 @@
                         <CheckMenuItem fx:id="openWalletsInNewWindows" mnemonicParsing="false" text="Open Wallets in New Windows" onAction="#openWalletsInNewWindows"/>
                         <CheckMenuItem fx:id="hideEmptyUsedAddresses" mnemonicParsing="false" text="Hide Empty Used Addresses" onAction="#hideEmptyUsedAddresses"/>
                         <CheckMenuItem fx:id="showTxHex" mnemonicParsing="false" text="Show Transaction Hex" onAction="#showTxHex"/>
+                        <SeparatorMenuItem />
+                        <MenuItem fx:id="refreshWallet" mnemonicParsing="false" text="Refresh Wallet" accelerator="Shortcut+R" onAction="#refreshWallet"/>
                     </items>
                 </Menu>
                 <Menu fx:id="toolsMenu" mnemonicParsing="false" text="Tools">

src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml

@@ -71,6 +71,12 @@
                 </ComboBox>
             </Field>
         </Fieldset>
+        <Fieldset inputGrow="SOMETIMES" text="Wallet" styleClass="wideLabelFieldSet">
+            <Field text="Validate derivations:">
+                <UnlabeledToggleSwitch fx:id="validateDerivationPaths" />
+                <HelpLabel helpText="Disallow keystores to have derivation paths that match the defaults for other script types."/>
+            </Field>
+        </Fieldset>
         <Fieldset inputGrow="SOMETIMES" text="Coin Selection" styleClass="wideLabelFieldSet">
             <Field text="Group by address:">
                 <UnlabeledToggleSwitch fx:id="groupByAddress" />

src/main/resources/com/sparrowwallet/sparrow/preferences/preferences.css

@@ -31,4 +31,21 @@
 
 .scroll-pane {
     -fx-background-color: transparent;
-}
+}
+
+.public-warning {
+    -fx-text-fill: rgb(238, 210, 2);
+}
+
+.public-electrum {
+    -fx-text-fill: linear-gradient(to bottom, derive(rgb(238, 210, 2), 30%), rgb(238, 210, 2));
+}
+
+.bitcoin-core {
+    -fx-text-fill: linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
+}
+
+.private-electrum {
+    -fx-text-fill: linear-gradient(to bottom, derive(#0b99c9, 30%), #0b99c9);
+}
+

src/main/resources/com/sparrowwallet/sparrow/preferences/server.fxml

@@ -16,6 +16,9 @@
 <?import com.sparrowwallet.sparrow.net.ServerType?>
 <?import com.sparrowwallet.sparrow.net.CoreAuthType?>
 <?import com.sparrowwallet.sparrow.control.HelpLabel?>
+<?import javafx.collections.FXCollections?>
+<?import com.sparrowwallet.sparrow.net.PublicElectrumServer?>
+<?import com.sparrowwallet.sparrow.control.CopyableLabel?>
 <GridPane hgap="10.0" vgap="10.0" stylesheets="@preferences.css, @../general.css" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.preferences.ServerPreferencesController">
     <padding>
         <Insets left="25.0" right="25.0" top="25.0" />
@@ -30,17 +33,31 @@
     <Form GridPane.columnIndex="0" GridPane.rowIndex="0">
         <Fieldset inputGrow="SOMETIMES" text="Server">
             <Field text="Type:">
-                <SegmentedButton>
+                <SegmentedButton fx:id="serverTypeSegmentedButton">
                     <toggleGroup>
                         <ToggleGroup fx:id="serverTypeToggleGroup" />
                     </toggleGroup>
                     <buttons>
+                        <ToggleButton fx:id="publicElectrumToggle" text="Public Server" toggleGroup="$serverTypeToggleGroup">
+                            <graphic>
+                                <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="TOGGLE_ON" styleClass="public-electrum" />
+                            </graphic>
+                            <userData>
+                                <ServerType fx:constant="PUBLIC_ELECTRUM_SERVER"/>
+                            </userData>
+                        </ToggleButton>
                         <ToggleButton text="Bitcoin Core" toggleGroup="$serverTypeToggleGroup">
+                            <graphic>
+                                <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="TOGGLE_ON" styleClass="bitcoin-core" />
+                            </graphic>
                             <userData>
                                 <ServerType fx:constant="BITCOIN_CORE"/>
                             </userData>
                         </ToggleButton>
-                        <ToggleButton text="Electrum Server" toggleGroup="$serverTypeToggleGroup">
+                        <ToggleButton text="Private Electrum" toggleGroup="$serverTypeToggleGroup">
+                            <graphic>
+                                <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="TOGGLE_ON" styleClass="private-electrum" />
+                            </graphic>
                             <userData>
                                 <ServerType fx:constant="ELECTRUM_SERVER"/>
                             </userData>
@@ -51,6 +68,45 @@
         </Fieldset>
     </Form>
 
+    <Form fx:id="publicElectrumForm" GridPane.columnIndex="0" GridPane.rowIndex="1">
+        <Fieldset inputGrow="SOMETIMES" text="Public Server">
+            <Field text="">
+                <Label alignment="CENTER" translateY="-1">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="EXCLAMATION_TRIANGLE" styleClass="public-warning" />
+                    </graphic>
+                    <padding>
+                        <Insets right="5" />
+                    </padding>
+                </Label>
+                <CopyableLabel text="Warning!" />
+            </Field>
+            <Field text="">
+                <CopyableLabel text="Using a public server means it can see your transactions."/>
+            </Field>
+            <Field text="URL:">
+                <ComboBox fx:id="publicElectrumServer">
+                    <items>
+                        <FXCollections fx:factory="observableArrayList">
+                            <PublicElectrumServer fx:constant="BLOCKSTREAM_INFO" />
+                            <PublicElectrumServer fx:constant="ELECTRUM_BLOCKSTREAM_INFO" />
+                            <PublicElectrumServer fx:constant="LUKECHILDS_CO" />
+                            <PublicElectrumServer fx:constant="EMZY_DE" />
+                            <PublicElectrumServer fx:constant="BITAROO_NET" />
+                        </FXCollections>
+                    </items>
+                </ComboBox>
+            </Field>
+            <Field text="Use Proxy:">
+                <UnlabeledToggleSwitch fx:id="publicUseProxy"/>
+            </Field>
+            <Field text="Proxy URL:">
+                <TextField fx:id="publicProxyHost" />
+                <TextField fx:id="publicProxyPort" prefWidth="80" />
+            </Field>
+        </Fieldset>
+    </Form>
+
     <Form fx:id="coreForm" GridPane.columnIndex="0" GridPane.rowIndex="1">
         <Fieldset inputGrow="SOMETIMES" text="Bitcoin Core RPC">
             <Field text="URL:">
@@ -98,7 +154,7 @@
     </Form>
 
     <Form fx:id="electrumForm" GridPane.columnIndex="0" GridPane.rowIndex="1">
-        <Fieldset inputGrow="SOMETIMES" text="Electrum Server">
+        <Fieldset inputGrow="SOMETIMES" text="Private Electrum Server">
             <Field text="URL:">
                 <TextField fx:id="electrumHost" promptText="e.g. 127.0.0.1"/>
                 <TextField fx:id="electrumPort" promptText="e.g. 50002" prefWidth="80" />

src/main/resources/com/sparrowwallet/sparrow/wallet/settings.fxml

@@ -13,6 +13,7 @@
 <?import org.fxmisc.flowless.VirtualizedScrollPane?>
 <?import org.controlsfx.glyphfont.Glyph?>
 
+<?import com.sparrowwallet.sparrow.control.HelpLabel?>
 <BorderPane stylesheets="@settings.css, @wallet.css, @../script.css, @../descriptor.css, @../general.css" styleClass="wallet-pane" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.wallet.SettingsController">
     <center>
         <GridPane hgap="10.0" vgap="10.0">
@@ -40,6 +41,7 @@
                                 </FXCollections>
                             </items>
                         </ComboBox>
+                        <HelpLabel helpText="Single signature wallets use a single keystore (hardware wallet or seed).\nMultisignature wallets require multiple keystores (N), of which a certain number (M) need to sign." />
                     </Field>
                     <Field text="Script Type:">
                         <ComboBox fx:id="scriptType">
@@ -55,6 +57,7 @@
                                 </FXCollections>
                             </items>
                         </ComboBox>
+                        <HelpLabel helpText="Native Segwit types are the default and are usually the best choice.\nNested Segwit types are a good choice for the widest compatibility with older wallets.\nLegacy types should be avoided, unless configuring an old wallet." />
                     </Field>
                 </Fieldset>
             </Form>

src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.css

@@ -22,4 +22,16 @@
 
 .chart-line-symbol.selected {
     -fx-background-color: rgba(30, 136, 207, 0.6);
+}
+
+#exportCsv {
+    -fx-border-style: none;
+    -fx-border-width: 0;
+    -fx-border-insets: 0;
+    -fx-background-color: transparent;
+    -fx-opacity: 0.7;
+}
+
+#exportCsv:hover {
+    -fx-opacity: 1.0;
 }

src/main/resources/com/sparrowwallet/sparrow/wallet/transactions.fxml

@@ -15,6 +15,7 @@
 <?import com.sparrowwallet.sparrow.control.CoinLabel?>
 <?import com.sparrowwallet.sparrow.control.FiatLabel?>
 <?import com.sparrowwallet.sparrow.control.CopyableLabel?>
+<?import org.controlsfx.glyphfont.Glyph?>
 
 <BorderPane stylesheets="@transactions.css, @wallet.css, @../general.css" styleClass="wallet-pane" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.wallet.TransactionsController">
     <center>
@@ -40,6 +41,14 @@
                         </Field>
                         <Field text="Transactions:">
                             <CopyableLabel fx:id="transactionCount" />
+                            <Button fx:id="exportCsv" maxHeight="25" onAction="#exportCSV" translateY="-1">
+                                <graphic>
+                                    <Glyph fontFamily="Font Awesome 5 Free Solid" icon="ARROW_CIRCLE_DOWN" fontSize="12" />
+                                </graphic>
+                                <tooltip>
+                                    <Tooltip text="Export transactions as CSV" />
+                                </tooltip>
+                            </Button>
                         </Field>
                     </Fieldset>
                 </Form>

src/main/resources/com/sparrowwallet/sparrow/welcome.css

@@ -0,0 +1,64 @@
+.welcome-pane {
+    -fx-padding: 0;
+}
+
+.title-area {
+    -fx-background-color: -fx-control-inner-background;
+    -fx-padding: 10 25 10 25;
+    -fx-border-width: 0px 0px 1px 0px;
+    -fx-border-color: #e5e5e6;
+}
+
+#welcomeBox, .button-bar {
+    -fx-padding: 10 25 25 25;
+}
+
+.button-bar .container {
+    -fx-padding: 0 0 15px 0;
+}
+
+.title-label {
+    -fx-font-size: 24px;
+}
+
+.title-text {
+    -fx-font-size: 20px;
+    -fx-padding: 0 0 15px 0;
+    -fx-graphic-text-gap: 10px;
+}
+
+.content-text {
+    -fx-font-size: 16px;
+    -fx-text-fill: derive(-fx-text-base-color, 15%);
+}
+
+.offline .title-icon {
+    -fx-text-fill: linear-gradient(to bottom, derive(-fx-text-base-color, 30%), -fx-text-base-color);
+}
+
+.public-electrum .title-icon {
+    -fx-text-fill: linear-gradient(to bottom, derive(rgb(238, 210, 2), 30%), rgb(238, 210, 2));
+}
+
+.bitcoin-core .title-icon {
+    -fx-text-fill: linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
+}
+
+.private-electrum .title-icon {
+    -fx-text-fill: linear-gradient(to bottom, derive(#0b99c9, 30%), #0b99c9);
+}
+
+.public-electrum .toggle-switch:selected .thumb-area, .offline .toggle-switch:selected .thumb-area {
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(gold, 30%), gold);
+    -fx-background-insets: 0, 1;
+}
+
+.bitcoin-core .toggle-switch:selected .thumb-area {
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
+    -fx-background-insets: 0, 1;
+}
+
+.private-electrum .toggle-switch:selected .thumb-area {
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#0b99c9, 30%), #0b99c9);
+    -fx-background-insets: 0, 1;
+}

src/main/resources/com/sparrowwallet/sparrow/welcome.fxml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<?import org.controlsfx.control.StatusBar?>
+<?import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch?>
+<?import org.controlsfx.glyphfont.Glyph?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+<StackPane prefHeight="460.0" prefWidth="600.0" stylesheets="@welcome.css, @general.css" styleClass="welcome-pane" fx:controller="com.sparrowwallet.sparrow.WelcomeController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
+    <VBox spacing="20">
+        <HBox styleClass="title-area">
+            <HBox alignment="CENTER_LEFT">
+                <Label fx:id="title" text="Welcome to Sparrow" styleClass="title-label" />
+            </HBox>
+            <Region HBox.hgrow="ALWAYS"/>
+            <ImageView AnchorPane.rightAnchor="0">
+                <Image url="/image/sparrow-small.png" requestedWidth="50" requestedHeight="50" smooth="false" />
+            </ImageView>
+        </HBox>
+        <VBox fx:id="welcomeBox" styleClass="content-area" spacing="20" prefHeight="370">
+            <VBox fx:id="step1" spacing="15">
+                <Label text="Introduction" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="TOGGLE_OFF" styleClass="title-icon" />
+                    </graphic>
+                </Label>
+                <Label text="Sparrow is a Bitcoin wallet with a focus on security and usability." wrapText="true" styleClass="content-text" />
+                <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to a server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" styleClass="content-text" />
+                <Label text="The status bar at the bottom displays the connection status, as demonstrated below:" wrapText="true" styleClass="content-text" />
+            </VBox>
+            <VBox fx:id="step2" spacing="15">
+                <Label text="Connecting to a Public Server" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="TOGGLE_ON" styleClass="title-icon" />
+                    </graphic>
+                </Label>
+                <Label text="If you are beginning your journey in self custody, or just storing a small amount, the easiest way to connect Sparrow to the Bitcoin blockchain is via one of the preconfigured public Electrum servers. " wrapText="true" styleClass="content-text" />
+                <Label text="However, although Sparrow only connects to servers that have a record of respecting privacy, it is still not ideal as you are sharing your transaction history and balance with them." wrapText="true" styleClass="content-text" />
+                <Label text="A yellow toggle means you are connected to a public server." wrapText="true" styleClass="content-text" />
+            </VBox>
+            <VBox fx:id="step3" spacing="15">
+                <Label text="Connecting to a Bitcoin Core node" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="TOGGLE_ON" styleClass="title-icon" />
+                    </graphic>
+                </Label>
+                <Label text="If you are running your own Bitcoin Core node, you can configure Sparrow to connect to it directly. " wrapText="true" styleClass="content-text" />
+                <Label text="This means you are not sharing your transaction data, but be aware Bitcoin Core stores your balance, transactions and public keys unencrypted on that node, which is not ideal for true cold storage." wrapText="true" styleClass="content-text" />
+                <Label text="A green toggle means you are connected to a Bitcoin Core node." wrapText="true" styleClass="content-text" />
+            </VBox>
+            <VBox fx:id="step4" spacing="15">
+                <Label text="Connecting to a Private Electrum Server" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="TOGGLE_ON" styleClass="title-icon" />
+                    </graphic>
+                </Label>
+                <Label text="The most private way to connect is to your own Electrum server, which in turn connects to your Bitcoin Core node." wrapText="true" styleClass="content-text" />
+                <Label text="Because these servers index all Bitcoin transactions equally, your wallet transactions are never stored on the server in an identifiable way, and your server forgets your requests immediately after serving them." wrapText="true" styleClass="content-text" />
+                <Label text="A blue toggle means you are connected to a private Electrum server. You're now ready to configure a server and start using Sparrow!" wrapText="true" styleClass="content-text" />
+            </VBox>
+            <Region VBox.vgrow="ALWAYS" />
+            <StatusBar fx:id="serverStatus">
+                <rightItems>
+                    <UnlabeledToggleSwitch fx:id="serverToggle" />
+                </rightItems>
+            </StatusBar>
+        </VBox>
+    </VBox>
+</StackPane>

src/test/java/com/sparrowwallet/sparrow/io/ElectrumTest.java

@@ -59,7 +59,7 @@ public class ElectrumTest extends IoTest {
         Assert.assertEquals(PolicyType.MULTI, wallet.getPolicyType());
         Assert.assertEquals(ScriptType.P2SH_P2WSH, wallet.getScriptType());
         Assert.assertEquals(2, wallet.getDefaultPolicy().getNumSignaturesRequired());
-        Assert.assertEquals("sh(wsh(sortedmulti(2,coldcard6ba6cfd0,coldcard747b698e,coldcard7bb026be,coldcard0f056943)))", wallet.getDefaultPolicy().getMiniscript().getScript());
+        Assert.assertEquals("sh(wsh(sortedmulti(2,coldcard6ba6cfd,coldcard747b698,coldcard7bb026b,coldcard0f05694)))", wallet.getDefaultPolicy().getMiniscript().getScript());
         Assert.assertEquals("6ba6cfd0", wallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint());
         Assert.assertEquals("m/48'/1'/0'/1'", wallet.getKeystores().get(0).getKeyDerivation().getDerivationPath());
         Assert.assertEquals("tpubDFcrvj5n7gyatVbr8dHCUfHT4CGvL8hREBjtxc4ge7HZgqNuPhFimPRtVg6fRRwfXiQthV9EBjNbwbpgV2VoQeL1ZNXoAWXxP2L9vMtRjax", wallet.getKeystores().get(0).getExtendedPublicKey().toString());
@@ -82,7 +82,7 @@ public class ElectrumTest extends IoTest {
         Assert.assertEquals(PolicyType.MULTI, wallet.getPolicyType());
         Assert.assertEquals(ScriptType.P2SH_P2WSH, wallet.getScriptType());
         Assert.assertEquals(2, wallet.getDefaultPolicy().getNumSignaturesRequired());
-        Assert.assertEquals("sh(wsh(sortedmulti(2,coldcard6ba6cfd0,coldcard747b698e,coldcard7bb026be,coldcard0f056943)))", wallet.getDefaultPolicy().getMiniscript().getScript());
+        Assert.assertEquals("sh(wsh(sortedmulti(2,coldcard6ba6cfd,coldcard747b698,coldcard7bb026b,coldcard0f05694)))", wallet.getDefaultPolicy().getMiniscript().getScript());
         Assert.assertEquals("6ba6cfd0", wallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint());
         Assert.assertEquals("m/48'/1'/0'/1'", wallet.getKeystores().get(0).getKeyDerivation().getDerivationPath());
         Assert.assertEquals("tpubDFcrvj5n7gyatVbr8dHCUfHT4CGvL8hREBjtxc4ge7HZgqNuPhFimPRtVg6fRRwfXiQthV9EBjNbwbpgV2VoQeL1ZNXoAWXxP2L9vMtRjax", wallet.getKeystores().get(0).getExtendedPublicKey().toString());