Merge branch 'master' into dependabot/npm_and_yarn/pyinstaller/electron/json-schema-and-jsprim-0.4.0

Author: moneymanolis

.github/workflows/zblack.yml

@@ -8,4 +8,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: psf/black@stable # https://black.readthedocs.io/en/stable/integrations/github_actions.html
+      # This version should match what you can find in .pre-commit-config.yaml
+      - uses: psf/[email protected] # https://black.readthedocs.io/en/stable/integrations/github_actions.html
+        with:
+            options: "--check --verbose"
+            src: "./src"
+            version: "22.3.0"

.gitlab-ci.yml

@@ -59,9 +59,7 @@ check:
    - pip3 install -e .
    - pip3 install -r test_requirements.txt
    - python3 setup.py install # compiles babel stuff as well (might make pip install obsolete)
-   # pytest --docker not working? Uncomment this for better debugging:
-   # - python3 tests/conftest.py 
-   - py.test --cov-report term --cov cryptoadvance --docker
+   - py.test --cov-report term --cov cryptoadvance
 
 .test-cypress:
   image: registry.gitlab.com/cryptoadvance/specter-desktop/cypress-python-jammy:v9.7.0
@@ -122,12 +120,24 @@ release_binary_windows:
   tags:
     - windows
   before_script:
+    - whoami
     - python -V
-    - pip3 install virtualenv
+    - pip3 --version
+    - pip install virtualenv
     - virtualenv --python=python3 .env
     - .\.env\Scripts\activate
-    - pip3 install -r test_requirements.txt
-    - whoami
+    - pip install -r test_requirements.txt || echo "why the heck does this fail with:"
+    # Collecting distlib<1,>=0.3.6
+    #  Downloading distlib-0.3.6-py2.py3-none-any.whl (468 kB)
+    #  ------------------------------------- 468.5/468.5 kB 30.6 MB/s eta 0:00:00
+    # ERROR: To modify pip, please run the following command:
+    # C:\gitlab-runner\builds\xPkLDUk2\0\k9ert\specter-desktop\.env\Scripts\python.exe -m pip install -r test_requirements.txt
+    # Uploading artifacts for failed job
+
+    # That error message above doesn't even help a bit
+    # However it seems that if you do that yet another time, it doesn't fail!
+    - pip install -r test_requirements.txt -vv
+    
   script:
     # This script won't execute if the script before that fails
     # No need to check the version-scheme again

.pre-commit-config.yaml

@@ -3,4 +3,4 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
-      language_version: python3.9
+      language_version: python3.10

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://code.visualstudio.com/docs/editor/debugging#_launch-configurations
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Flask",
+            "type": "python",
+            "request": "launch",
+            "module": "flask",
+            "env": {
+                "FLASK_APP": "cryptoadvance.specter.server:create_and_init()",
+                "FLASK_ENV": "development",
+                "SPECTER_DATA_FOLDER": "~/.specter_empty",
+                "SPECTER_CONFIG": "DevelopmentConfig",
+                "FLASK_DEBUG": "1",
+                "PATH": "./.env/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+            },
+            "args": [
+                "run",
+                "--no-debugger",
+                "--no-reload",
+                "--port=25441"
+            ],
+            "jinja": true
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

Dockerfile

@@ -14,7 +14,7 @@ FROM python:3.9-slim-bullseye AS builder
 ARG VERSION
 ARG REPO
 
-RUN apt update && apt install -y git build-essential libusb-1.0-0-dev libudev-dev libffi-dev libssl-dev rustc cargo
+RUN apt update && apt install -y git build-essential libusb-1.0-0-dev libudev-dev libffi-dev libssl-dev rustc cargo libpq-dev
 
 WORKDIR /
 

README.md

@@ -1,10 +1,19 @@
+![](https://img.shields.io/badge/Bitcoin-000000?style=flat&logo=bitcoin&logoColor=white)
+[![docs -  netlify](https://img.shields.io/badge/docs-_netlify-2ea44f)](https://docs.specter.solutions/desktop/)
+![Cirrus CI - Specific Task Build Status](https://img.shields.io/cirrus/github/cryptoadvance/specter-desktop?label=pytest&task=test)
+![Cirrus CI - Specific Task Build Status](https://img.shields.io/cirrus/github/cryptoadvance/specter-desktop?label=cypress&task=cypress_test)
+![GitHub Release Date](https://img.shields.io/github/release-date/cryptoadvance/specter-desktop)
+[![PyPI version](https://img.shields.io/pypi/v/cryptoadvance.specter)](https://pypi.org/project/cryptoadvance.specter/)
+![Docker Image Version (latest by date)](https://img.shields.io/docker/v/lncm/specter-desktop?label=docker)
+![GitHub all releases](https://img.shields.io/github/downloads/cryptoadvance/specter-desktop/total)
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**
 
 - [Specter Desktop](#specter-desktop)
   - [DISCLAIMER](#disclaimer)
-  - [Video Walkthrough](#video-walkthrough)
+  - [Documentation and Video Walkthrough](#documentation-and-video-walkthrough)
   - [Why?](#why)
   - [Help wanted: Do you like Specter?](#help-wanted-do-you-like-specter)
   - [How to run](#how-to-run)
@@ -26,17 +35,16 @@
     "A specter is haunting the modern world, the specter of crypto anarchy."
     The Crypto Anarchist Manifesto - Timothy C. May - Sun, 22 Nov 92 12:11:24 PST
 
-[![Build Status](https://api.cirrus-ci.com/github/cryptoadvance/specter-desktop.svg)](https://cirrus-ci.com/github/cryptoadvance/specter-desktop)
-[![Support the project](https://img.shields.io/badge/btcpay-support%20project-orange.svg)](https://donate.specter.solutions/apps/3k77BAT6zshCGNd3i7gw9WKwXQy1/pos)
-
 ## DISCLAIMER
 
 This software might be ready to be used but at your own risk.
 
 If something doesn't work open an issue here or ask a question in our [Telegram group](https://t.me/spectersupport).
 
-## Video Walkthrough
-![video](https://www.youtube.com/embed/v3SEp0SkOWs) [Watch here](https://www.youtube.com/watch?v=v3SEp0SkOWs)
+## Documentation and Video Walkthrough
+
+* ![video](https://www.youtube.com/embed/v3SEp0SkOWs) [Watch here](https://www.youtube.com/watch?v=v3SEp0SkOWs)
+* [documentation](https://docs.specter.solutions/desktop/)
 
 ## Why?
 
@@ -72,7 +80,7 @@ The easiest way to run Specter Desktop is by installing the Specter Desktop app,
 With this method, all you need to do is just download the right file for your operating system and install it like a normal desktop app (Debian buster is only [partially supported](https://github.com/cryptoadvance/specter-desktop/issues/769))
 
 ### Installing Specter from Pip
-* Specter requires Python version 3.7 to 3.9.
+* Specter requires Python version 3.9 to 3.10.
 * Bitcoin Core node should be at least v0.19+, better if it's the latest one from [bitcoincore.org](https://bitcoincore.org/en/download/).
 * HWI support requires `libusb` 
   * Ubuntu/Debian: `sudo apt install libusb-1.0-0-dev libudev-dev python3-dev`

cypress.json

@@ -9,6 +9,7 @@
       "spec_fees.js",
       "spec_rescan.js",
       "spec_qr_signing.js",
+      "spec_labeling.js",
       "spec_balances_amounts.js",
       "spec_wallet_send.js",
       "spec_wallet_utxo.js",

cypress/integration/spec_balances_amounts.js

@@ -75,6 +75,7 @@ describe('Test the rendering of balances and amounts', () => {
         cy.get('#satoshis_hot_keys_hot_sign_btn').click()
         cy.get('#hot_enter_passphrase__submit').click()
         cy.get('#broadcast_local_btn').click()
+        cy.visit("/")
         cy.selectWallet('Ghost wallet')
         // Once again because only once doesn't work for some stupid unknown reason
         cy.selectWallet('Ghost wallet')

cypress/integration/spec_configures_nodes.js

@@ -5,13 +5,15 @@ describe('Configuring nodes', () => {
       cy.viewport(1200,660)
       cy.visit('/')
       cy.get('#node-switch-icon').click()
-      cy.get('[href="/nodes/node/default/"]').first().click()
+      cy.get('[data-cy="connect-new-node-btn"]').click()
+      cy.get(':nth-child(6) > [href="/nodes/new_node/"]').click()
       cy.get('#datadir-container').then(($datadir) => {
         cy.log($datadir)
         if (!Cypress.dom.isVisible($datadir)) {
           cy.get('.slider').click()
         }
       })
+      cy.get('#name').type('Bitcoin Core')
       cy.get('.slider').click()
       cy.get('#username').clear()
       cy.get('#username').type("bitcoin")
@@ -46,7 +48,7 @@ describe('Configuring nodes', () => {
       cy.viewport(1200,660)
       cy.visit('/')
       cy.get('#node-switch-icon').click()
-      cy.get('#btn_new_node').click()
+      cy.get('[data-cy="connect-new-node-btn"]').click()
       cy.get('[href="/nodes/new_node/"]').click()
       cy.get('#name').clear()
       cy.get('#name').type("Elements Node")
@@ -83,7 +85,7 @@ describe('Configuring nodes', () => {
         cy.viewport(1200,660)
         cy.visit('/')
         cy.get('#node-switch-icon').click()
-        cy.get('#default-select-node-form > .item > div').click()
+        cy.contains('Bitcoin Core').click()
     })   
 
   })