Merge branch 'fix-actions'; v10.0.1

pjkundert · pjkundert · commit c5acee438264 · 2022-11-08T10:47:48.000-08:00
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+#omit = hdwallet/libs/*
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         # Requires Python3 w/ Type Annotations
-        python-version: [3.9, 3.x]
+        python-version: ['3.9', '3.10', '3.11', '3.x']
 
     steps:
     - uses: actions/checkout@v2
@@ -30,6 +30,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
+        python3 -m pip install --upgrade pip
         python3 -m pip install -r requirements.txt
         python3 -m pip install -r requirements-serial.txt
         python3 -m pip install -r requirements-gui.txt
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ dist/
 .eggs
 private_keys
 images/SLIP-39.iconset
+.coverage
diff --git a/GNUmakefile b/GNUmakefile
@@ -74,8 +74,7 @@ help:
 	@echo "  print-PLATFORM		  prints the detected PLATFORM"
 
 test:
-	cd slip39 && $(PY3TEST)
-
+	$(PY3TEST)
 
 analyze:
 	flake8 -j 1 --max-line-length=200 \
@@ -166,12 +165,12 @@ dist/slip39-$(VERSION)-py3-none-any.whl: build-check FORCE
 	$(PY3) -m build
 	@ls -last dist
 
-# Install from wheel, including all optional extra dependencies
+# Install from wheel, including all optional extra dependencies (except dev)
 install-dev:
 	$(PY3) -m pip install --upgrade -r requirements-dev.txt
 
 install:		dist/slip39-$(VERSION)-py3-none-any.whl FORCE
-	$(PY3) -m pip install --force-reinstall $<[gui,dev,serial,wallet]
+	$(PY3) -m pip install --force-reinstall $<[gui,serial,wallet]
 
 
 # Building / Signing / Notarizing and Uploading the macOS or win32 App
@@ -657,10 +656,10 @@ clean:
 
 # Run only tests with a prefix containing the target string, eg test-blah
 test-%:
-	cd slip39 && $(PY3TEST) *$*_test.py
+	slip39/*$*_test.py
 
 unit-%:
-	cd slip39 && $(PY3TEST) -k $*
+	$(PY3TEST) -k $*
 
 
 #
diff --git a/README.org b/README.org
@@ -36,12 +36,13 @@ Trezor supports these, and they can only be created "manually".  Writing down 5
 words is difficult, error-prone and time consuming.
 
 The [[https://github.com/pjkundert/python-slip39.git][python-slip39]] project (and the [[https://slip39.com/app][SLIP-39 macOS/win32 App]]) exists to assist in the safe creation
-and documentation of [[https://wolovim.medium.com/ethereum-201-hd-wallets-11d0c93c87][Ethereum HD Wallet]] seeds and derived accounts, with various SLIP-39 sharing
-parameters.  It generates the new random wallet seed, and generates the expected standard Ethereum
-account(s) (at [[https://medium.com/myetherwallet/hd-wallets-and-derivation-paths-explained-865a643c7bf2][derivation path]] =m/44'/60'/0'/0/0= by default) and Bitcoin accounts (at Bech32
-derivation path =m/84'/0'/0'/0/0= by default), with wallet address and QR code (compatible with
-Trezor derivations).  It produces the required SLIP-39 phrases, and outputs a single PDF containing
-all the required printable cards to document the seed (and the specified derived accounts).
+and documentation of [[https://wolovim.medium.com/ethereum-201-hd-wallets-11d0c93c87][Hierarchical Deterministic (HD) Wallet]] seeds and derived accounts, with
+various SLIP-39 sharing parameters.  It generates the new random wallet seed, and generates the
+expected standard Ethereum account(s) (at [[https://medium.com/myetherwallet/hd-wallets-and-derivation-paths-explained-865a643c7bf2][derivation path]] =m/44'/60'/0'/0/0= by default) and Bitcoin
+accounts (at Bech32 derivation path =m/84'/0'/0'/0/0= by default), with wallet address and QR code
+(compatible with Trezor derivations).  It produces the required SLIP-39 phrases, and outputs a
+single PDF containing all the required printable cards to document the seed (and the specified
+derived accounts).
 
 Output of BIP-38 or JSON encrypted Paper Wallets is supported, for import into standard software
 cryptocurrency wallets.
diff --git a/README.pdf b/README.pdf
diff --git a/README.txt b/README.txt
diff --git a/fonts_list.py b/fonts_list.py
@@ -0,0 +1,19 @@
+from tkinter import Tk, font
+import  PySimpleGUI as sg
+root = Tk()
+font_tuple = font.families()
+#Creates a Empty list to hold font names
+FontList=[]
+fonts = [font.Font(family=f) for f in font.families()]
+monospace = (f for f in fonts if f.metrics("fixed"))
+# for font in font_tuple:
+#     FontList.append(font)
+for font in monospace:
+    FontList.append(font.actual('family'))
+root.destroy()
+print( '\n'.join( FontList ))
+
+#size 28, 28 is optimized for my Android phone please tweak as per your screen
+#Scrolled popup to accommodate big list
+sg.popup_scrolled(FontList, title='All fonts installed using PySimpleGUI', size=(28,28), grab_anywhere=True)
+
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+testpaths = slip39
+addopts = -vv --doctest-modules --cov=slip39 --cov-config=.coveragerc
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,9 +1,10 @@
 build
+cx_Freeze	>= 6.12
 flake8
 pip
-pytest
-setuptools
-wheel
 pyinstaller	>= 5.5
-cx_Freeze	>= 6.12
+pytest		>=7.2.0,<8
+pytest-cov	>=4.0.0,<5
+setuptools
 tabulate
+wheel
diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -1,2 +1,3 @@
 flake8
-pytest
+pytest		>=7.2.0,<8
+pytest-cov	>=4.0.0,<5
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,9 @@
-click
+click		>=8.1.3,<9
 base58		>=2.0.1,<3
 chacha20poly1305>=0.0.3
 fpdf2		>=2.5.7,<3
-hdwallet	>=2.1,	<3
+# hdwallet	>=2.1.2,<3
+hdwallet @ git+https://github.com/pjkundert/python-hdwallet.git@fix-keccak#egg=hdwallet
 mnemonic	>=0.2,	<1
 qrcode		>=7.3
 shamir-mnemonic	>=0.2,	<1
diff --git a/setup.py b/setup.py
@@ -189,16 +189,16 @@
 these, and they can only be created "manually".  Writing down 5 or more
 sets of 20 words is difficult, error-prone and time consuming.
 
-The [python-slip39] project (and the SLIP-39-app macOS/win32 App) exists
-to assist in the safe creation and documentation of Ethereum HD Wallet
-seeds and derived accounts, with various SLIP-39 sharing parameters.  It
-generates the new random wallet seed, and generates the expected
-standard Ethereum account(s) (at derivation path `m/44'/60'/0'/0/0' by
-default) and Bitcoin accounts (at Bech32 derivation path
-`m/84'/0'/0'/0/0' by default), with wallet address and QR code
-(compatible with Trezor derivations).  It produces the required SLIP-39
-phrases, and outputs a single PDF containing all the required printable
-cards to document the seed (and the specified derived accounts).
+The [python-slip39] project (and the SLIP-39-app macOS/win32 App) exists to
+assist in the safe creation and documentation of Hierarchical Deterministic (HD)
+Wallet seeds and derived accounts, with various SLIP-39 sharing parameters.  It
+generates the new random wallet seed, and generates the expected standard
+Ethereum account(s) (at derivation path `m/44'/60'/0'/0/0' by default) and
+Bitcoin accounts (at Bech32 derivation path `m/84'/0'/0'/0/0' by default), with
+wallet address and QR code (compatible with Trezor derivations).  It produces
+the required SLIP-39 phrases, and outputs a single PDF containing all the
+required printable cards to document the seed (and the specified derived
+accounts).
 
 Output of BIP-38 or JSON encrypted Paper Wallets is supported, for
 import into standard software cryptocurrency wallets.
diff --git a/slip39/cli/__init__.py b/slip39/cli/__init__.py
@@ -18,16 +18,19 @@
 import click
 import json
 import logging
+import string
 
 from ..			import addresses as slip39_addresses
-from ..util		import log_cfg, log_level
+from ..util		import log_cfg, log_level, input_secure
 
 """
 Provide basic CLI access to the slip39 API.
 
 Output generally defaults to JSON.  Use -v for more details, and --no-json to emit standard text output instead.
 """
 
+log				= logging.getLogger( __package__ )
+
 
 @click.group()
 @click.option('-v', '--verbose', count=True)
@@ -47,10 +50,17 @@ def cli( verbose, quiet, json ):
 @click.command()
 @click.option( "--crypto", help="The cryptocurrency address to generate (default: BTC)" )
 @click.option( "--paths", help="The HD wallet derivation path (default: the standard path for the cryptocurrency; if xpub, omits leading hardened segments by default)" )
-@click.option( "--secret", help="A seed or '{x,y,z}{pub,prv}...' x-public/private key to derive HD wallet addresses from" )
+@click.option( "--secret", help="A hex seed or '{x,y,z}{pub,prv}...' x-public/private key to derive HD wallet addresses from; '-' reads it from stdin" )
 @click.option( "--format", help="legacy, segwit, bech32 (default: standard for cryptocurrency or '{x,y,z}{pub/prv}...' key)" )
 @click.option( '--unbounded/--no-unbounded', default=False, help="Allow unbounded sequences of addresses")
 def addresses( crypto, paths, secret, format, unbounded ):
+    if secret == '-':
+        secret			= input_secure( 'Master secret hex: ', secret=True )
+    elif secret and ( secret.lower().startswith( '0x' )
+                      or all( c in string.hexdigits for c in secret )):
+        log.warning( "It is recommended to not use '-s|--secret <hex>'; specify '-' to read from input" )
+    if secret and secret.lower().startswith('0x'):
+        secret			= secret[2:]
     if cli.json:
         click.echo( "[" )
     for i,(cry,pth,adr) in enumerate( slip39_addresses(
diff --git a/slip39/layout/pdf.py b/slip39/layout/pdf.py
@@ -32,7 +32,7 @@
 import fpdf		# FPDF, FlexTemplate, FPDF_FONT_DIR
 
 from ..api		import Account, cryptopaths_parser, create, enumerate_mnemonic, group_parser
-from ..util		import chunker, commas
+from ..util		import chunker
 from ..recovery		import recover, produce_bip39
 from ..defaults		import (
     FONTS, CARD, CARD_SIZES, PAPER, PAGE_MARGIN, MM_IN, PT_IN,
diff --git a/slip39/version.py b/slip39/version.py
@@ -1,2 +1,2 @@
-__version_info__		= ( 10, 0, 0 )
+__version_info__		= ( 10, 0, 1 )
 __version__			= '.'.join( map( str, __version_info__ ))

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[pytest]`
	`2`	`+testpaths = slip39`
	`3`	`+addopts = -vv --doctest-modules --cov=slip39 --cov-config=.coveragerc`