Merge branch 'master' into enable-import-multi-desc-alternate-approach

pyinstaller/electron/.prettierrc

@@ -2,4 +2,4 @@
   "singleQuote": true,
   "semi": false,
   "printWidth": 125
-}
+}

pyinstaller/electron/build/entitlements.mac.plist

@@ -6,5 +6,16 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
+    <key>CFBundleURLTypes</key>
+      <array>
+        <dict>
+          <key>CFBundleURLName</key>
+          <string>solutions.specter</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <string>specter</string>
+          </array>
+        </dict>
+      </array>
   </dict>
 </plist>

pyinstaller/electron/main.js

@@ -3,6 +3,7 @@ const { app, nativeTheme, nativeImage, BrowserWindow, Menu, Tray, screen, shell,
 
 const path = require('path')
 const fs = require('fs')
+const { URL } = require('node:url')
 const request = require('request')
 const https = require('https')
 const extract = require('extract-zip')
@@ -59,6 +60,15 @@ if (isDev) {
   logger.info('Running the Electron app in dev mode.')
 }
 
+// Register "specter" protocol. This feature is for Mac only as of now.
+// This will launch the app for URLs like this: specter://?action=importWallet&data=someData
+if (isMac) {
+  const isDefaultProtocolClient = app.isDefaultProtocolClient('specter')
+  if (!isDefaultProtocolClient) {
+    app.setAsDefaultProtocolClient('specter')
+  }
+}
+
 // Set the dock icon (MacOS and for development only)
 if (isMac && isDev) {
   const dockIcon = nativeImage.createFromPath(app.getAppPath() + '/assets-dev/dock_icon_macos.png')
@@ -190,6 +200,7 @@ const download = (uri, filename, callback) => {
 }
 
 let specterdProcess
+let automaticWalletImport = false
 let mainWindow
 let prefWindow
 let tray
@@ -259,7 +270,6 @@ function createWindow(specterURL) {
   if (appSettings.tor) {
     mainWindow.webContents.session.setProxy({ proxyRules: appSettings.proxyURL })
   }
-
   mainWindow.loadURL(specterURL + '?mode=remote')
 }
 
@@ -497,6 +507,7 @@ function checkSpecterd(logs, specterdStarted) {
   }
 }
 
+let specterIsRunning = false
 function startSpecterd(specterdPath) {
   if (platformName == 'win64') {
     specterdPath += '.exe'
@@ -529,7 +540,6 @@ function startSpecterd(specterdPath) {
   const specterdStarted = Date.now()
 
   // We are checking for both, stdout and stderr, to be on the save side.
-  let specterIsRunning = false
   specterdProcess.stdout.on('data', (data) => {
     logger.info('stdout-' + data.toString())
     let serverdStatus = checkSpecterd(data, specterdStarted)
@@ -540,8 +550,16 @@ function startSpecterd(specterdPath) {
         updateSpecterdStatus('Specter is running')
         specterIsRunning = true
         if (mainWindow) {
-          logger.info('... creating Electron window for it.')
-          createWindow(appSettings.specterURL)
+          if (automaticWalletImport === true) {
+            logger.info('Performing automatic wallet import ...')
+            updatingLoaderMsg('Launching wallet importer. This will only work with a node connection.', (showSpinner = true))
+            setTimeout(() => {
+              importWallet(walletDataFromUrl)
+            }, 3000)
+          } else {
+            logger.info('Normal startup of Specter.')
+            createWindow(appSettings.specterURL)
+          }
         }
       } else if (serverdStatus === 'timeout') {
         showError('Specter does not seem to start. Check the logs in the menu for more details.')
@@ -599,6 +617,54 @@ function startSpecterd(specterdPath) {
   })
 }
 
+let walletDataFromUrl
+// Checking whether the app was opened via a Specter URL and determine whether to perform a specific startup action
+app.on('open-url', (_, url) => {
+  logger.info('The app was opened via URL, checking the URL to decide whether to do any automatic actions ...')
+  // Parse the URL to extract the query parameters
+  const specterUrl = new URL(url)
+  const searchParams = specterUrl.searchParams
+  // Get the query parameter values
+  const action = searchParams.get('action')
+  const data = searchParams.get('data')
+  if (action === 'importWallet' && data !== '') {
+    logger.info('Automatic wallet import identified in the URL, setting automaticWalletImport to true.')
+    automaticWalletImport = true
+    walletDataFromUrl = data
+    // Directly import if the app and specterd is already running
+    if (specterIsRunning) {
+      logger.info('Performing automatic wallet import ...')
+      mainWindow.loadURL(`file://${__dirname}/splash.html`)
+      updatingLoaderMsg('Launching wallet importer. This will only work with a node connection.', (showSpinner = true))
+      setTimeout(() => {
+        importWallet(walletDataFromUrl)
+      }, 3000)
+    }
+  }
+})
+
+// Automatically import the wallet json string, bring user to the final import wallet screen.
+// Only proceed with the import if the importFromWalletSoftwareBtn can be found. 
+// If it is not, users are redirected by specterd to the configure connection screen.
+function importWallet(walletData) {
+  mainWindow.loadURL(appSettings.specterURL + '/wallets/new_wallet/')
+  if (mainWindow) {
+    let code = `
+      const importFromWalletSoftwareBtn = document.getElementById('import-from-wallet-software-btn')
+      if (importFromWalletSoftwareBtn) {
+        importFromWalletSoftwareBtn.click()
+        const walletDataTextArea = document.getElementById('txt')
+        if (walletDataTextArea) {
+          walletDataTextArea.value =  \`${walletData}\`
+        }
+        const continueBtn = document.getElementById('continue-with-wallet-import-btn');
+        continueBtn.click()
+      }
+    `
+    mainWindow.webContents.executeJavaScript(code)
+  }
+}
+
 app.on('window-all-closed', function () {
   if (platformName == 'win64') {
     quitSpecterd()

src/cryptoadvance/specter/server_endpoints/wallets/wallets.py

@@ -133,7 +133,7 @@ def new_wallet_type():
     err = None
     if not app.specter.node.is_running:
         flash(_("You need a node connection to create wallets."), "error")
-        return redirect(url_for("nodes_endpoint.node_settings_new_node_get"))
+        return redirect(url_for("welcome_endpoint.about"))
     try:
         # Make sure wallet is enabled on Bitcoin Core
         app.specter.rpc.listwallets()

src/cryptoadvance/specter/templates/wallet/new_wallet/components/import_wallet_account_map.jinja

@@ -28,7 +28,7 @@
             </label>
         </div>
 
-        <button class="w-full mt-2 mb-0 mr-0 button bg-accent text-white" type="submit" name="action" value="importwallet">{{ _("Continue") }}</button>
+        <button id="continue-with-wallet-import-btn" class="w-full mt-2 mb-0 mr-0 button bg-accent text-white" type="submit" name="action" value="importwallet">{{ _("Continue") }}</button>
     </form>
 </div>
 

src/cryptoadvance/specter/templates/wallet/new_wallet/new_wallet_type.jinja

@@ -22,7 +22,7 @@
 	</nav>
 
 	<div>
-		<button class="selection-button" onclick="showPageOverlay('account_map_import')" type="button">
+		<button id="import-from-wallet-software-btn" class="selection-button" onclick="showPageOverlay('account_map_import')" type="button">
 			{{ _("Import from wallet software") }}
 		</button>