work in progress toward hdwallet3

Author: pjkundert

App.org

@@ -230,8 +230,8 @@ cryptocurrency accounts related to the Seed.
 
 ** Netcoins.app
 
-   In Canada, one of the more highly regulatory-compliant cryptocurrency exchanges is [[https://netcoins.app/r?ac=5YO1MZ][Netcoins.app
-   (referral code: 5YO1MZ)]]; sign up with this referral link, and we both get some benefits.
+   In Canada, one of the more highly regulatory-compliant cryptocurrency exchanges is [[https://netcoins.app/invite/K4K97DY][Netcoins.app]]
+   sign up with this referral link, and we both get some benefits.
 
    They have higher than typical Interac e-transfer limits, which is very nice.  However, they don't
    support a wide range of cryptocurrencies; presently, only BTC, ETH, XRP, LTC, BCH, USDC, and a

GNUmakefile

@@ -49,12 +49,13 @@ SIGNTOOL	?= "c:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtoo
 
 NIX_OPTS	?= # --pure
 
-# PY[3] is the target Python interpreter; require 3.11+.  Detect if it is named python3 or python.
-PY3		?= $(shell python3 --version >/dev/null 2>&1 && echo python3 || echo python )
-PY3_V		= $(shell $(PY3) -c "import sys; print('-'.join((next(iter(filter(None,sys.executable.split('/')))),sys.platform,sys.implementation.cache_tag)))" 2>/dev/null )
-VERSION		= $(shell $(PY3) -c 'exec(open("slip39/version.py").read()); print( __version__ )')
+# PY[3] is the target Python interpreter; require 3.11+.  Detect if it is named python3 or python, and if system, nix or venv-supplied.
+PYTHON		?= $(shell python3 --version >/dev/null 2>&1 && echo python3 || echo python )
+PYTHON_P	= $(shell which $(PYTHON))
+PYTHON_V	= $(shell $(PYTHON) -c "import sys; print('-'.join((('venv' if sys.prefix != sys.base_prefix else next(iter(filter(None,sys.base_prefix.split('/'))))),sys.platform,sys.implementation.cache_tag)))" 2>/dev/null )
+VERSION		= $(shell $(PYTHON) -c 'exec(open("slip39/version.py").read()); print( __version__ )')
 WHEEL		= dist/slip39-$(VERSION)-py3-none-any.whl
-PLATFORM	?= $(shell $(PY3) -c "import sys; print( sys.platform )" )
+PLATFORM	?= $(shell $(PYTHON) -c "import sys; print( sys.platform )" )
 ifeq ($(PLATFORM),darwin)
 	INSTALLER	:= pkg
 else ifeq ($(PLATFORM),win32)
@@ -64,24 +65,24 @@ else
 endif
 
 # To see all pytest output, uncomment --capture=no, ...
-PYTESTOPTS	= -v --log-cli-level=WARNING  # --capture=no  # --doctest-modules 
+PYTEST_OPTS	?= -v --log-cli-level=WARNING  # --capture=no  # --doctest-modules 
 
-PY3TEST		= $(PY3) -m pytest $(PYTESTOPTS)
+PYTEST		= $(PYTHON) -m pytest $(PYTEST_OPTS)
 
 # VirtualEnv: Build them in eg. ~/src/python-slip39-1.2.3/
 # o Will use the *current* git branch when creating a venv and populating it
 
 GHUB_NAME	= python-slip39
 
 VENV_DIR	= $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/.. )
-VENV_NAME	= $(GHUB_NAME)-$(VERSION)-$(PY3_V)
+VENV_NAME	= $(GHUB_NAME)-$(VERSION)-$(PYTHON_V)
 VENV		= $(VENV_DIR)/$(VENV_NAME)
 VENV_OPTS	= # --copies # Doesn't help; still references some system libs.
 
 
 .PHONY: all help test doctest analyze pylint build install upload clean FORCE
 
-all:			help
+all:		help
 
 help:
 	@echo "GNUmakefile for cpppo.  Targets:"
@@ -95,11 +96,19 @@ help:
 	@echo "  installer		Build the .dmg, .msi, as appropriate for PLATFORM"
 	@echo "  print-PLATFORM		  prints the detected PLATFORM"
 
-test:
-	$(PY3TEST)
+test:		deps-test
+	$(PYTEST) $(PYTEST_OPTS)
+
+# Run only tests with a prefix containing the target string, eg test-api
+test-%:		deps-test
+	$(PYTEST) $(PYTEST_OPTS) $(shell find slip39 -name '*$**_test.py')
+
+# Run all tests with names matching the target string
+unit-%:		deps-test
+	$(PYTEST) $(PYTEST_OPTS) -k $*
 
 analyze:
-	$(PY3) -m flake8 --color never -j 1 --max-line-length=250 \
+	$(PYTHON) -m flake8 --color never -j 1 --max-line-length=250 \
 	  --exclude slip39/tabulate \
 	  --ignore=W503,E201,E202,E203,E127,E221,E223,E226,E231,E241,E242,E251,E265,E272,E274 \
 	  slip39
@@ -113,6 +122,24 @@ signing-check:
 
 build:			clean wheel
 
+nix-%:
+	@if [ -r flake.nix ]; then \
+	    nix develop $(NIX_OPTS) --command make $*; \
+        else \
+	    nix-shell $(NIX_OPTS) --run "make $*"; \
+	fi
+
+#
+# Target to allow the printing of 'make' variables, eg:
+#
+#     make print-CXXFLAGS
+#
+print-%:
+	@echo $* = $($*)
+	@echo $*\'s origin is $(origin $*)
+
+
+
 # 
 # org-mode products.
 #
@@ -319,14 +346,22 @@ $(PAY-TEST-LIC):	GRANTS="{\"crypto-licensing-server\": {\
 }}"
 
 
+.PHONY: deps-test
+deps-test:	slip39/payments_test/slip-39-app.crypto-license
+
+# Try to copy the generated slip-39-app.crypto-license, if it exists, but no worries if it doesn't
+slip39/payments_test/slip-39-app.crypto-license: FORCE
+	cp $(SLIP-39-LIC) $@ 2>/dev/null || echo "Missing $(SLIP-39-LIC); ignoring..."
+
+
 
 # Preserve all "secondary" intermediate files (eg. the .crypto-keypair generated)
 .SECONDARY:
 
 # Create .crypto-keypair from seed; note: if the make rule fails, intermediate files are deleted.
 # We expect any password to be transmitted in CRYPTO_LIC_PASSWORD env. var.
 %.crypto-keypair: %.crypto-seed
-	$(PY3) -m crypto_licensing $(GLOBAL_OPTIONS)		\
+	$(PYTHON) -m crypto_licensing $(GLOBAL_OPTIONS)		\
 	    --name $(KEYNAME)					\
 	    --extra $(dir $(basename $@ )) --reverse-save	\
 	    registered						\
@@ -335,7 +370,7 @@ $(PAY-TEST-LIC):	GRANTS="{\"crypto-licensing-server\": {\
 
 # Create .crypto-license, signed by .crypto-keypair
 %.crypto-license : %.crypto-keypair
-	$(PY3) -m crypto_licensing $(GLOBAL_OPTIONS)		\
+	$(PYTHON) -m crypto_licensing $(GLOBAL_OPTIONS)		\
 	    --name $(KEYNAME)					\
 	    --extra $(dir $(basename $@ )) --reverse-save	\
 	    license						\
@@ -348,31 +383,41 @@ $(PAY-TEST-LIC):	GRANTS="{\"crypto-licensing-server\": {\
 # 
 # VirtualEnv build, install and activate
 #
+#     Create, start and run commands in "interactive" shell with a python venv's activate init-file.
+# Doesn't allow recursive creation of a venv with a venv-supplied python.  Alters the bin/activate
+# to include the user's .bashrc (eg. Git prompts, aliases, ...)
+#
+
+venv-%:			$(VENV)
+	@echo; echo "*** Running in $< VirtualEnv: make $*"
+	@bash --init-file $</bin/activate -ic "make $*"
 
 venv:			$(VENV)
 	@echo; echo "*** Activating $< VirtualEnv for Interactive $(SHELL)"
 	@bash --init-file $</bin/activate -i
 
 $(VENV):
+	@[[ "$(PYTHON_V)" =~ "^venv" ]] && ( echo -e "\n\n!!! $@ Cannot start a venv within a venv"; false ) || true
 	@echo; echo "*** Building $@ VirtualEnv..."
-	@rm -rf $@ && $(PY3) -m venv $(VENV_OPTS) $@ \
+	@rm -rf $@ && $(PYTHON) -m venv $(VENV_OPTS) $@ && sed -i -e '1s:^:. $$HOME/.bashrc\n:' $@/bin/activate \
 	    && source $@/bin/activate \
-	    && make install install-tests
+	    && make install-tests install
 
 
 wheel:			deps $(WHEEL)
 
 $(WHEEL):		FORCE
-	$(PY3) -m pip install -r requirements-tests.txt
-	$(PY3) -m build
+	$(PYTHON) -m pip install -r requirements-tests.txt
+	$(PYTHON) -m build
 	@ls -last dist
 
 # Install from wheel, including all optional extra dependencies (except dev)
 install:		$(WHEEL) FORCE
-	$(PY3) -m pip install --force-reinstall $<[all]
+	$(PYTHON) -m pip install --force-reinstall $<[all]
 
 install-%:  # ...-dev, -tests
-	$(PY3) -m pip install --upgrade -r requirements-$*.txt
+	$(PYTHON) -m pip install --upgrade -r requirements-$*.txt
+
 
 # Building / Signing / Notarizing and Uploading the macOS or win32 App
 # o TODO: no signed and notarized package yet accepted for upload by macOS App Store
@@ -412,7 +457,7 @@ app-pkg-upload:		dist/SLIP-39-$(VERSION).pkg.upload-package
 # 
 build/exe.$(CXFREEZE_EXT)/SLIP-39.exe:
 	@echo -e "\n\n*** Building $@"
-	@$(PY3) setup.py build_exe > cx_Freeze.build_exe.log \
+	@$(PYTHON) setup.py build_exe > cx_Freeze.build_exe.log \
 	     && echo -e "\n\n*** $@ Build successfully:" \
 	     || ( echo -e "\n\n!!! $@ Build failed:"; tail -20 cx_Freeze.build_exe.log; false )
 
@@ -423,7 +468,7 @@ dist/slip39-$(VERSION)-win64.msi: build/exe.$(CXFREEZE_EXT)/SLIP-39.exe # signin
 	#    /n "$(DEVID)" \
 	#	$<
 	@echo -e "\n\n*** Package $@"
-	@$(PY3) setup.py bdist_msi > $cx_Freeze.bdist_msi.log \
+	@$(PYTHON) setup.py bdist_msi > $cx_Freeze.bdist_msi.log \
 	     && echo -e "\n\n*** $@ Build successfully:" \
 	     || ( echo -e "\n\n!!! $@ Build failed:"; tail -20 cx_Freeze.bdist_msi.log; false )
 
@@ -865,47 +910,3 @@ images/SLIP-39.iconset: images/SLIP-39.png
 	sips -z  512  512 $< --out $@/[email protected]
 	sips -z  512  512 $< --out $@/icon_512x512.png
 	sips -z 1024 1024 $< --out $@/[email protected]
-
-
-#
-# Pypi pip packaging
-# 
-# Support uploading a new version of slip39 to pypi.  Must:
-#   o advance __version__ number in slip39/version.py
-#   o log in to your pypi account (ie. for package maintainer only)
-#
-upload-check:
-	@$(PY3) -m twine --version \
-	    || ( echo -e "\n\n*** Missing Python modules; run:\n\n        $(PY3) -m pip install --upgrade twine\n" \
-	        && false )
-upload: 	upload-check wheel
-	$(PY3) -m twine upload --repository pypi dist/slip39-$(VERSION)*
-
-clean:
-	@rm -rf MANIFEST *.png build dist auto *.egg-info $(shell find . -name '__pycache__' )
-
-.PHONY: deps-test
-deps-test:	slip39/payments_test/slip-39-app.crypto-license
-
-slip39/payments_test/slip-39-app.crypto-license: $(SLIP-39-LIC)
-	cp $< $@
-
-# Run only tests with a prefix containing the target string, eg test-api
-test-%:		deps-test
-	$(PY3TEST) $(shell find slip39 -name '*$**_test.py')
-
-# Run all tests with names matching the target string
-unit-%:		deps-test
-	$(PY3TEST) -k $*
-
-nix-%:
-	nix-shell $(NIX_OPTS) --run "make $*"
-
-#
-# Target to allow the printing of 'make' variables, eg:
-#
-#     make print-CXXFLAGS
-#
-print-%:
-	@echo $* = $($*)
-	@echo $*\'s origin is $(origin $*)

nixpkgs.nix

@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/23.11.tar.gz";
-  sha256 = "1ndiv385w1qyb3b18vw13991fzb9wg4cl21wglk89grsfsnra41k";
+  url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/25.05.tar.gz";
+  sha256 = "1915r28xc4znrh2vf4rrjnxldw2imysz819gzhk9qlrkqanmfsxd";
 })

pytest.ini

@@ -1,3 +1,4 @@
 [pytest]
 testpaths = slip39
-addopts = -v --ignore-glob=**/__main__.py --ignore-glob=**/main.py --ignore-glob=**/ethereum.py --cov=slip39 --cov-config=.coveragerc
+addopts = -v --ignore-glob=**/__main__.py --ignore-glob=**/main.py --ignore-glob=**/ethereum.py
+#addopts = -v --ignore-glob=**/__main__.py --ignore-glob=**/main.py --ignore-glob=**/ethereum.py # --cov=slip39 --cov-config=.coveragerc

requirements.txt

@@ -4,11 +4,12 @@ click			>=8.1.3,<9
 crypto-licensing	>=5.1.4,<6
 cx_Freeze		>=6.12		; sys_platform == "win32"
 fpdf2			>=2.7.6,<3
-#hdwallet		>=2.3.0,<3
-hdwallet-slip39		>=2.3.0,<3
+# Forces 'import shamir_mnemonic' to be satisfied by this, instead of allowing hdwallet to import its older version.
+shamir-mnemonic-slip39	>=0.4.0,<0.5
+#shamir-mnemonic	>=0.3.0,<0.4
+#hdwallet		>=3.7.0,<4
+hdwallet                @ git+https://github.com/pjkundert/python-hdwallet.git@feature/seeds#egg=hdwallet
 #tabulate		>=0.10.0
 tabulate-slip39		>=0.10.0
 mnemonic		>=0.21,	<1
 qrcode			>=7.3
-#shamir-mnemonic	>=0.3.0,<0.4
-shamir-mnemonic-slip39	>=0.4.0,<0.5