cryptoadvance.specter 2.0.3rc2__tar.gz → 2.0.4__tar.gz

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/.gitlab-ci.yml

@@ -28,6 +28,9 @@ before_script:
   - python -V  # Print out python version for debugging
   - apt update
   - apt install -y libusb-1.0-0-dev libudev-dev # usb-support in hidapi
+  # https://github.com/python-babel/babel/issues/990#issuecomment-1760326334
+  - rm -f /etc/localtime
+  - ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime
 # This doesn't get cached in gitlab but we don't need it anyway for now:
 #  - ./tests/install_noded.sh --debug --elements compile
   - pip3 install --upgrade virtualenv
@@ -111,6 +114,8 @@ release_binary_windows:
   stage: releasing
   only: 
     - tags
+  variables:
+    GIT_DEPTH: 0  # Disable shallow clone to get all Git history
   tags:
     - windows
   before_script:
@@ -161,7 +166,10 @@ release_electron_linux_windows:
     # Only difference to default befor_script: (ToDo fix this)
     - python3 -m virtualenv --python=python3 .env
     - source .env/bin/activate
-    - pip3 install -e ".[test]"
+    # https://github.com/python-babel/babel/issues/990#issuecomment-1760326334
+    - rm -f /etc/localtime
+    - ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime
+    - pip3 install -e ".[test]" # TZ=UTC because https://github.com/nektos/act/issues/1853
   script:
     - echo "Releasing for ${CI_PROJECT_ROOT_NAMESPACE}"
     - export CI_PROJECT_ROOT_NAMESPACE # needed in the build-script to download the right windows-binary

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cryptoadvance.specter
-Version: 2.0.3rc2
+Version: 2.0.4
 Summary: A GUI for Bitcoin Core & Electrum optimised to work with airgapped hardware wallets
 Author: Stepan Snigirev, k9ert
 License: MIT License
@@ -35,6 +35,7 @@ Classifier: Framework :: Flask
 Requires-Python: <4.0,>=3.7
 Description-Content-Type: text/markdown
 Provides-Extra: test
+Provides-Extra: gendownloadpage
 License-File: LICENSE
 
 ![](https://img.shields.io/badge/Bitcoin-000000?style=flat&logo=bitcoin&logoColor=white)

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/docs/api/README.md

@@ -10,11 +10,13 @@ In order to make reasonable assumptions about how stable a specific endpoint is,
 
 The Specter API is using JWT tokens for Authentication. In order to use the API, you need to obtain such a token. Currently, obtaining a token is not possible via the UI but only via a special endpoint, which accepts BasicAuth (as the only endpoint).
 
+NB: The default user and password key-value pair for Specter Desktop is `admin:admin`.
+
 ## Curl:
 
 Create the token like this:
 ```bash
-curl -u admin:password --location --request POST 'http://127.0.0.1:25441/api/v1alpha/token' \
+curl -u user:password --location --request POST 'http://127.0.0.1:25441/api/v1alpha/token' \
 --header 'Content-Type: application/json' \
 -d '{
     "jwt_token_description": "A free description here to know for what the token is used",
@@ -35,7 +37,7 @@ As a result, you get a json like this:
 The token will only be shown once. However, apart from the token itself, you can still get the details of a specific token like this:
 
 ```bash
-curl -s -u admin:secret --location --request GET 'http://127.0.0.1:25441/api/v1alpha/token/4969e9fb-2097-41e7-af53-5e2082a3e4d3' | jq .
+curl -s -u user:password --location --request GET 'http://127.0.0.1:25441/api/v1alpha/token/4969e9fb-2097-41e7-af53-5e2082a3e4d3' | jq .
 ```
 
 ```json
@@ -81,7 +83,7 @@ Here is an example of using the API with python. We don't assume that you use Ba
 
 ```python
 import requests
-response = requests.get('http://127.0.0.1:25441/api/v1alpha/token/<token_id>', auth=('admin', 'secret'))
+response = requests.get('http://127.0.0.1:25441/api/v1alpha/token/<token_id>', auth=('user', 'password'))
 json.loads(response.text)
 ```
 

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/docs/development.md

@@ -137,9 +137,18 @@ _note: you may need to add `$HOME/.cargo/bin` to your path in `.env/bin/activate
 ## How to run the tests
 _TODO: Need more thorough tests!_
 
-In order to run the tests, you need bitcoind and elementsd binaries available. For Linux/Mac, there is some support for installing/compiling them. So you can:
+In order to run the tests, you need bitcoind and elementsd binaries available. For Linux/Mac, there is some support for installing/compiling them. 
+
+For bitcoind you can do:
+
 * `./tests/install_noded.sh --bitcoin binary` will install bitcoind in tests/bitcoin
+
+or:
+
 * `./tests/install_noded.sh --bitcoin compile` will compile bitcoind in tests/bitcoin
+
+For elementsd:
+
 * `./tests/install_noded.sh --elements compile` will compile elements in tests/elements
 
 If you're not interested in elements, you can skip the liquid specific tests as described below.

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/docs/release-guide.md

@@ -1,41 +1,55 @@
 # Release Guide
 
 ## Creating release notes
+
 ### Pre-requisites
+
 - You need the correct upstream master. You should see
-```bash 
-git remote -v | grep upstream                                                                  
+
+```bash
+git remote -v | grep upstream
 upstream        git@github.com:cryptoadvance/specter-desktop.git (fetch)
 upstream        git@github.com:cryptoadvance/specter-desktop.git (push)
 ```
+
 - You need a GitHub token:
-If you don't have one, get one here https://github.com/settings/tokens and make sure to tick the boxes for repo and workflow as below:
+  If you don't have one, get one here https://github.com/settings/tokens and make sure to tick the boxes for repo and workflow as below:
 
 ![](./images/release-guide/github-token.png)
 
 Using the new token, run
- ```bash
- export GH_TOKEN=YOURTOKEN
- ```
+
+```bash
+export GH_TOKEN=YOURTOKEN
+```
+
 - You need Docker running
 - Checkout the master branch and ensure a clean workspace.
 
 Now, you can run
+
 ```bash
 ./utils/release.sh --release-notes
 ```
+
 Or, if you want to directly set the new version:
+
 ```bash
 ./utils/release.sh --new-version v1.13.1 --release-notes
 ```
+
 ## Creating a new tag
+
 Update your master branch after the release notes PR ([example](https://github.com/cryptoadvance/specter-desktop/commit/65ff6959d7fd85cba745e4d454b30031839f857f/)) has been merged and then run:
+
 ```bash
 git tag v1.13.1 && git push upstream v1.13.1
 ```
+
 ## GitLab - releasing stage
-Creating a tag triggers the release process of the GitLab runners. 
-There exists a mirror  of the GitHub repo on GitLab, but only when a tag is created on GitHub will the release part of the runners execute. You can check the status here: 
+
+Creating a tag triggers the release process of the GitLab runners.
+There exists a mirror of the GitHub repo on GitLab, but only when a tag is created on GitHub will the release part of the runners execute. You can check the status here:
 https://gitlab.com/cryptoadvance/specter-desktop/-/pipelines
 
 There are three stages:
@@ -50,14 +64,17 @@ The first relevant stage is "releasing". Here, the Windows, Linux and pip releas
 - specter_desktop-v1.13.1-x86_64-linux-gnu.tar.gz
 
 The three jobs in more detail:
+
 - release_binary_windows: is creating a binary for specterd and for Windows (Windows runner)
 - release_electron_linux_windows: Creates a specterd for Linux, an AppImage for Linux and an executable for Windows (Linux runner).
-- release_pip: Is releasing a pypi package on [pypi](https://pypi.org/project/cryptoadvance.specter/) and creates a tarball of the pip package for the GitHub release page (Linux runner). 
+- release_pip: Is releasing a pypi package on [pypi](https://pypi.org/project/cryptoadvance.specter/) and creates a tarball of the pip package for the GitHub release page (Linux runner).
 
 For details look at `.gitlab-ci.yml`
 
 ## MacOS
+
 Ideally, directly after the tag is created, start with the MacOS release. This has to be done manually, for now. There is a script for this:
+
 ```bash
 ./utils/build-osx.sh  --version v1.13.1 --appleid "Satoshi Nakamoto (appleid)" --mail "satoshi@gmx.com" make-hash specterd electron sign upload
 ```
@@ -70,9 +87,11 @@ This script also runs `github.py upload `, so two more binares and the hash and
 - SHA256SUMS-macos.asc
 
 ## GitLab - post releasing
-Back to GitLab, the final stage is "post releasing". 
+
+Back to GitLab, the final stage is "post releasing".
 
 In this stage, the invididual SHA256-hashes and signatures are combined into two final files:
+
 - SHA256SUMS
 - SHA256SUMS.asc
 
@@ -80,44 +99,25 @@ Everything, apart from the MacOS files, are pulled from the GitLab environment,
 Don't forget to delete the two MacOS files (`SHA256SUMS-macos` and `SHA256SUMS-macos.asc`) on the GitHub release page in the end.
 
 ## Trouble shooting
+
 If the MacOS signatures are missing, it can happen that the following Exception will be raised:
+
 ```bash
   File "/builds/cryptoadvance/specter-desktop/utils/github.py", line 295, in download_artifact
   raise Exception(
   Exception: Status-cod04 for url ... )
 ```
+
 In any case, if the macOS binaries arrive on GitHub too late, you have to manually delete the already created `SHA256SUMS` and `SHA256SUMS.asc`, otherwise the upload to GitHub will fail if you rerun the release signatures job on GitLab - for details see ([this PR](https://github.com/cryptoadvance/specter-desktop/pull/689)). The green arrow in the screenshot is where you rerun the release signatures job on GitLab:
 
 ![](./images/release-guide/rerun-release-signatures.png)
 
-## Editing the text on the GitHub release page
-We are running a script here to create a markdown file that can be used for copy and paste. The script uses the latest release on GitHub to create links to the artifacts in the release, so it only makes sense to run it once the previous step has been completed. 
-- Checkout this repo: `git@github.com:cryptoadvance/corp-notes.git`
-- `cd download-page`
-- Run `./build.sh`
-
-The result `gh_page.md` can be found in the build directory.
-Edit the release on GitHub and paste the md-file there along with the release notes from `release-notes.md`.
-
-## Website 
-The above script also produces html files for the website (in the same directory). The second item needs to have the release notes on GitHub, otherwise the content for the details button is missing. So, you need to re-run `./build.sh` after the release notes on GitHub are done.
-- `download-page_current.html`
-- `download-page_releases.html`
-
-Login into: https://specter.solutions/wp-login.php
-
-- Go to "Pages"
-- Hover over "Specter Desktop - Elementor" and choose `Edit with Elementor`
-- Click somewhere on area 1 (see screenshot), then somewhere on area 2, select all, delete, and paste: `download-page_current.html`
-
-![](./images/release-guide/website-1.png)\
-- Then click `update`
-Note: If you see jinja tags, you probably pasted some templates.
-
-Do the same for the "Specter Releases" part, just, in this case, replace with:\
-`download-page_releases.html`
-
-![](./images/release-guide/website-2.png)\
+## GitHub release page and download page
 
-You can then just exit the editing with Elementor.
+This is handled by the script `./utils/generate_downloadpage.sh`. As a prerequisite, you need to clone the `specter-static` repo which contains the specter website. Clone it on the same level than specter-desktop.
+Running that script will:
 
+- install the prerequisites (basically markdown, see pyproject.toml)
+- generate the GH-page and the download-page based on the `utils/templates`.
+- Asks whether it should replace/update/initialize the Github Release page for the latest version
+- copies over the new download-pages and asks whether it should commit/push those

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/docs/release-notes.md

@@ -1,5 +1,29 @@
 # Release Notes
 
+## v2.0.4 May 23, 2024
+- Bugfix: Build fixes for windows #2443 (k9ert)
+- Bugfix: Electron Bug Fixes (save settings, proper shutdown) #2441 (k9ert)
+- Chore: Electron App Dependencies #2444 (k9ert)
+
+
+## v2.0.3 May 17, 2024
+- Add support for more languages for mnemonics #2424 (Wim van der Ham)
+- Allow bumpfee on transactions with a single output #2433 (Leon Costa)
+- Docs: fix small typos and grammatical errors #2406 (JumbledUp)
+- Enforce hwi init #2386 (k9ert)
+- Fix Jade signing issues with Swan Vault #2421 (Manolis Mandrapilias)
+- Fix install_noded.sh #2422 (Wim van der Ham)
+- Fix node2 RPC port & add missing elm mark #2438 (roshii)
+- Fix testnet path when deleting wallet on node #2395 (Manolis Mandrapilias)
+- Kn/macos signing #2432 (k9ert)
+- New documentations #1885 #2409 (j0sh21)
+- Patched Fix Improperly Controlled Modification of Prototype Pollution in specter-desktop #2385 (Sergev ₱)
+- Update README.md #2435 (KYC)
+- adding release_notes for v2.0.2 #2384 (k9ert)
+- chore: upgrade dependencies #2399 (k9ert)
+- fix bad error-messaging #2437 (k9ert)
+- updating dependencies #2434 (k9ert)
+
 ## v2.0.2 September 21, 2023
 - Bugfix: Add missing signet key #2368 (Manolis Mandrapilias)
 - Bugfix: Jade displaying wrong multisig addresses for descriptors using multi() #2366 (Manolis Mandrapilias)

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/docs/self-signed-certificates.md

@@ -1,22 +1,23 @@
 # SSL Certificate
+
 ## Why a certificate is important
 
 Browsers require secure communication with the server to use camera API. Without it we can't use QR code scanning.
 
-If you are running a VPS it's easy - you just [issue a new certificate](./reverse-proxy#adding-https) with Letsencrypt.
+If you are running a VPS it's easy - you just [issue a new certificate](./reverse-proxy.md#adding-https) with Letsencrypt.
 
 If you are only using the node at home and want to use it from your local network and via camera, you need to run it via SSL.
 
 ## Easy solution
 
 The easiest solution is to simply add `--ssl` to the serve-command and the certificate will get created automatically in the specter-home-folder.
+
 ```
 python3 -m cryptoadance.specter server --ssl
 ```
 
 ## Manual creation
 
-
 A second way, which provides more customization, is to run the [`gen-certificate.sh`](gen-certificate.sh) script in this folder with your node's IP address as an argument:
 
 ```sh
@@ -33,7 +34,7 @@ Provide these files to Specter as arguments:
 python -m cryptoadvance.specter server --cert=./cert.pem --key=./key.pem
 ```
 
-*Note:* Adding `--tor=your-tor-password` will create a tor hidden service with https.
+_Note:_ Adding `--tor=your-tor-password` will create a tor hidden service with https.
 
 ### Specter with Nginx
 
@@ -53,7 +54,7 @@ The config should look like this:
 server{
   listen 80 default_server;
   listen 443 ssl http2;
-  
+
   server_name your_domain_or_ip;
 
   ssl_certificate /etc/ssl/certs/cert.pem;

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/pyinstaller/build-win-ci.bat

@@ -14,10 +14,6 @@ call .\.buildenv\Scripts\activate
 echo "    --> Installing test-requirement"
 pip3 install -e ".[test]"
 
-echo "    --> Setting version in setup.py"
-python .\utils\release-helper.py set_setup_py_version  %1%
-
-
 echo "    --> Building pypi package"
 pip3 install build==0.10.0
 python -m build
@@ -25,7 +21,6 @@ python -m build
 echo "    --> Installing pypi package"
 python .\utils\release-helper.py install_wheel %1%
 
-pip3 install -r pyinstaller/test_requirements.txt
 cd pyinstaller
 
 Rem This file gets further packaged up with the pyinstaller and will help specter to figure out which version it's running on

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/pyinstaller/electron/basic_auth.html

@@ -33,8 +33,9 @@
             const fs = require('fs')
             const { ipcRenderer } = require('electron')
             const helpers = require('./helpers')
-            const getAppSettings = helpers.getAppSettings
-            const appSettingsPath = helpers.appSettingsPath
+            const config = require('./config')
+            const getAppSettings = config.getAppSettings
+            const appSettingsPath = config.appSettingsPath
 
             function cancel() {
                 window.close();

{cryptoadvance.specter-2.0.3rc2 → cryptoadvance.specter-2.0.4}/pyinstaller/electron/main.js

@@ -1,17 +1,17 @@
 // Modules to control application life and create native browser window
 const fs = require('fs')
 const { spawn, exec } = require('child_process')
-const { app, nativeTheme, nativeImage, BrowserWindow, Menu, Tray, screen, shell, dialog, ipcMain } = require('electron')
+const { app, nativeImage, BrowserWindow, Menu, screen, shell, dialog, ipcMain } = require('electron')
 const defaultMenu = require('electron-default-menu')
 const contextMenu = require('electron-context-menu')
 
 const { appSettingsPath, specterdDirPath, appSettings, platformName, appNameLower } = require('./src/config.js')
 const { logger } = require('./src/logging.js')
 const downloadloc = require('./downloadloc')
-const { downloadSpecterd } = require('./src/download.js')
-const getDownloadLocation = downloadloc.getDownloadLocation
+const { downloadSpecterd, destroyProgressbar } = require('./src/download.js')
 const { startSpecterd, quitSpecterd } = require('./src/specterd.js')
-const { getFileHash, getAppSettings, versionData, isDev, devFolder, isMac } = require('./src/helpers.js')
+const { getFileHash, versionData, isDev, devFolder, isMac } = require('./src/helpers.js')
+const { getAppSettings } = require('./src/config.js')
 const { showError, updatingLoaderMsg, initMainWindow, loadUrl, initTray } = require('./src/uiHelpers.js')
 
 // Quit again if there is no version-data in dev
@@ -191,13 +191,7 @@ app.on('before-quit', (event) => {
     quitted = true
     quitSpecterd()
     if (mainWindow && !mainWindow.isDestroyed()) {
-      if (progressBar) {
-        // You can only destroy the progress bar if it hadn't been closed before
-        if (progressBar.browserWindow) {
-          progressBar.destroy()
-        }
-        progressBar = null
-      }
+      destroyProgressbar()
       mainWindow.destroy()
       mainWindow = null
       prefWindow = null