Fix Paper Wallet handling

Author: pjkundert

Makefile

@@ -13,7 +13,8 @@ SHELL		= /bin/bash
 
 # Change to your own Apple Developer ID, if you want to code-sign the resultant .app
 
-ALL		= gui,serial,wallet,invoice
+MIN		= gui,wallet
+ALL		= gui,wallet,serial,invoice
 
 APPLEID		?= perry@kundert.ca
 TEAMID		?= ZD8TVTCXDS
@@ -90,7 +91,7 @@ VENV_OPTS	= --system-site-packages --copies # make available references some sys
 all:		help
 
 help:
-	@echo "GNUmakefile for cpppo.  Targets:"
+	@echo "GNUmakefile for python-slip39.  Targets:"
 	@echo "  help			This help"
 	@echo "  test			Run unit tests under Python3"
 	@echo "  clean			Remove build artifacts"
@@ -99,7 +100,17 @@ help:
 	@echo "  upload			Upload new version to pypi (package maintainer only)"
 	@echo "  app			Build the macOS SLIP-39.app"
 	@echo "  installer		Build the .dmg, .msi, as appropriate for PLATFORM"
-	@echo "  print-PLATFORM		  prints the detected PLATFORM"
+	@echo
+	@echo "  nix-venv               Create and/or start Nix-supplied Python virtual env"
+	@echo "  nix-venv-test          Run the 'make test' target within the Nix Python venv"
+	@echo "  TARGET=py313 make nix-venv...     Use a Python 3.13 Nix environment for the remaining targets"
+	@echo "  PATH=/usr/local/bin:$PATH make venv...   Use an installed Python environment for the remaining targets"
+
+
+# Installs ALL optional Python requirements for testing
+.PHONY: deps-test
+deps-test:	install-all \
+		slip39/payments_test/slip-39-app.crypto-license
 
 test:		deps-test
 	$(PYTEST) $(PYTEST_OPTS)
@@ -143,7 +154,11 @@ clean:
 
 nix-%:
 	@if [ -r flake.nix ]; then \
-	    nix develop $(NIX_OPTS) --command make $*; \
+	    if [ -n "$(TARGET)" ]; then \
+		nix develop .#$(TARGET) $(NIX_OPTS) --command make $*; \
+	    else \
+		nix develop $(NIX_OPTS) --command make $*; \
+	    fi; \
         else \
 	    nix-shell $(NIX_OPTS) --run "make $*"; \
 	fi
@@ -158,7 +173,6 @@ print-%:
 	@echo $*\'s origin is $(origin $*)
 
 
-
 # 
 # org-mode products.
 #
@@ -365,9 +379,6 @@ $(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..."
@@ -415,6 +426,7 @@ venv:			$(VENV)
 	@echo; echo "*** Activating $< VirtualEnv for Interactive $(SHELL)"
 	@bash --init-file $</bin/activate -i
 
+# Installs the MIN optional Python requirements to support GUI, paper wallets
 $(VENV):
 	@[[ "$(PYTHON_V)" =~ "^venv" ]] && ( echo -e "\n\n!!! $@ Cannot start a venv within a venv"; false ) || true
 	@echo; echo "*** Building $@ VirtualEnv..."
@@ -431,6 +443,9 @@ $(WHEEL):		install-dev FORCE
 
 # Install from wheel, including all optional extra dependencies (except dev).  Always use the venv (or global)
 install:		$(WHEEL) FORCE
+	$(PYTHON) -m pip install --no-user --force-reinstall $<[$(MIN)]
+
+install-all:
 	$(PYTHON) -m pip install --no-user --force-reinstall $<[$(ALL)]
 
 install-%:  # ...-dev, -tests, -gui, -serial, -wallet, -invoice
@@ -909,6 +924,7 @@ app-assess: dist/SLIP-39.app
 #
 #
 # The --onefile approach is incompatible with macOS Apps; use --onedir
+# Ensures various Python packages using shared libraries are made available
 SLIP-39-macOS.spec: SLIP-39.py
 	@echo -e "\n\n!!! Rebuilding $@; Must be manually edited..."
 	pyinstaller --noconfirm --windowed --onedir \
@@ -917,6 +933,13 @@ SLIP-39-macOS.spec: SLIP-39.py
 	    --collect-data shamir_mnemonic \
 	    --collect-all tzdata \
 	    --collect-all zoneinfo \
+	    --collect-all pycryptodome \
+	    --collect-all eth_account \
+	    --hidden-import Crypto \
+	    --hidden-import Crypto.Cipher \
+	    --hidden-import Crypto.Protocol \
+	    --hidden-import Crypto.Protocol.KDF \
+	    --hidden-import Crypto.Hash \
 	    --hidden-import slip39 \
 	    --collect-data slip39 \
 	    --osx-entitlements-file SLIP-39.metadata/entitlements.plist \

SLIP-39-macOS.spec

@@ -4,13 +4,19 @@ from PyInstaller.utils.hooks import collect_all
 
 datas = []
 binaries = []
-hiddenimports = ['slip39', 'tzdata']
+hiddenimports = ['Crypto', 'Crypto.Cipher', 'Crypto.Protocol', 'Crypto.Protocol.KDF', 'Crypto.Hash', 'slip39']
 datas += collect_data_files('shamir_mnemonic')
 datas += collect_data_files('slip39')
 tmp_ret = collect_all('tzdata')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('zoneinfo')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('Crypto')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('eth_account')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('py_ecc')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 
 
 a = Analysis(
@@ -59,15 +65,14 @@ app = BUNDLE(
     coll,
     name='SLIP-39.app',
     icon='images/SLIP-39.icns',
-    version='14.0.2',
     info_plist={
         'NSPrincipalClass': 'NSApplication',
         'NSAppleScriptEnabled': False,
         'LSBackgroundOnly': False,
         'NSRequiresAquaSystemAppearance': 'No',
         'CFBundleSupportedPlatforms': ['MacOSX'],
         'CFBundleIdentifier': 'ca.kundert.perry.SLIP39',
-        'CFBundleVersion': '14.0.2',
+        'CFBundleVersion': '14.1.0',
         'CFBundlePackageType':'APPL',
         'LSApplicationCategoryType':'public.app-category.utilities',
         'LSMinimumSystemVersion':'10.15',

flake.nix

@@ -13,60 +13,100 @@
 
         # Create Python environments with required packages
         mkPythonEnv = pythonPkg: pythonPkg.withPackages (ps: with ps; [
-          tkinter
           pytest
-          #coincurve scikit-learn scikit-build cmake
-          #pycryptodome
-          #pynacl
+          pip
+          tkinter
+          coincurve scikit-learn scikit-build cmake
+          pycryptodome
+          pynacl
         ]);
 
+        python39Env  = mkPythonEnv pkgs.python39;
         python310Env = mkPythonEnv pkgs.python310;
         python311Env = mkPythonEnv pkgs.python311;
         python312Env = mkPythonEnv pkgs.python312;
         python313Env = mkPythonEnv pkgs.python313;
         python314Env = mkPythonEnv pkgs.python314;
-        python3Env = mkPythonEnv pkgs.python3;
+        python3Env   = mkPythonEnv pkgs.python3;
+        pypy310Env   = mkPythonEnv pkgs.pypy310;
+        pypy3Env     = mkPythonEnv pkgs.pypy3;
+
+        # Common build inputs for all dev shells
+        commonInputs = with pkgs; [
+          # Common tools
+          cacert
+          git
+          gnumake
+          openssh
+          bash
+          bash-completion
+          which
+
+          # coincurve + skikit-learn requires this to build:
+          cmake clang ninja pkg-config
 
+          # Utilities for creating MacOS .dmg
+          nodejs_20     # Not a bleeding-edge version
+        ];
+
+        commonShellHook = ''
+          echo "Welcome to the Crypto Licensing multi-Python development environment!"
+          echo "Available Python interpreters:"
+          echo ""
+          for cmd in python python3.9 python3.10 python3.11 python3.12 python3.13 python3.14 pypy3 pypy3.10; do
+            printf "%-12s: %-20.19s: %s\n" "$cmd" "$($cmd --version 2>/dev/null || echo "(unavailable)")" "$(which $cmd 2>/dev/null)"
+          done
+          echo ""
+          echo "All versions have pytest, pip, tkinter, coincurve, pycryptodome, and pynacl installed."
+          echo "Use 'make test' to run tests with the default Python version."
+        '';
+
+        # Create a dev shell with specific Python environment(s) and optional extras
+        mkDevShell = { pythonEnvs, extraInputs ? [], shellHook ? commonShellHook}: pkgs.mkShell {
+          buildInputs = commonInputs ++ pythonEnvs ++ extraInputs;
+          inherit shellHook;
+        };
       in {
         # Single development shell with all Python versions
-        devShells.default = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            # Common tools
-            cacert
-            git
-            gnumake
-            openssh
-            bash
-            bash-completion
-
-            # coincurve + skikit-learn requires this to build:
-            #cmake clang ninja pkg-config
-
-            # All Python versions with packages
-            #python310Env
-            #python311Env
-            #python312Env
-            python313Env
-            #python314Env
-            #python3Env
-
-            # Utilities for creating MacOS .dmg
-            nodejs_20     # Not a bleeding-edge version
-          ];
-
-          shellHook = ''
-            echo "Welcome to the multi-Python development environment!"
-            echo "Available Python interpreters:"
-            echo "  python (default): $(python --version 2>/dev/null || echo 'not available')"
-            echo "  python3: $(python3 --version 2>/dev/null || echo 'not available')"
-            echo "  python3.10: $(python3.10 --version 2>/dev/null || echo 'not available')"
-            echo "  python3.11: $(python3.11 --version 2>/dev/null || echo 'not available')"
-            echo "  python3.12: $(python3.12 --version 2>/dev/null || echo 'not available')"
-            echo "  python3.13: $(python3.13 --version 2>/dev/null || echo 'not available')"
-            echo "  python3.14: $(python3.14 --version 2>/dev/null || echo 'not available')"
-            echo ""
-            echo "All versions have pytest, coincurve, pycryptodome, and pynacl installed."
-          '';
+        devShells.default = mkDevShell {
+          pythonEnvs = [ python3Env ];
+        };
+
+        # Individual development shells for specific Python versions
+        devShells.py39 = mkDevShell {
+          pythonEnvs = [ python39Env ];
+        };
+
+        devShells.py310 = mkDevShell {
+          pythonEnvs = [ python310Env ];
+        };
+
+        devShells.py311 = mkDevShell {
+          pythonEnvs = [ python311Env ];
+        };
+
+        devShells.py312 = mkDevShell {
+          pythonEnvs = [ python312Env ];
+        };
+
+        devShells.py313 = mkDevShell {
+          pythonEnvs = [ python313Env ];
+        };
+
+        devShells.py314 = mkDevShell {
+          pythonEnvs = [ python314Env ];
+        };
+
+        devShells.py3 = mkDevShell {
+          pythonEnvs = [ python3Env ];
+        };
+
+        devShells.pypy310 = mkDevShell {
+          pythonEnvs = [ pypy310Env ];
+        };
+
+        devShells.pypy3 = mkDevShell {
+          pythonEnvs = [ pypy3Env ];
         };
       });
 }

slip39/api.py

@@ -68,7 +68,7 @@
 except ImportError as exc:
     AES				= None
     scrypt			= None
-    message			= f"Unable to support Paper Wallet output: {exc}"
+    message			= f"Unable to support Paper Wallet output (pycryptodome): {exc}"
     warnings.warn( message, ImportWarning )
     if log.isEnabledFor( logging.DEBUG ):
         log.exception( message )
@@ -78,7 +78,7 @@
     import eth_account
 except ImportError as exc:
     eth_account			= None
-    message			= f"Unable to support Paper Wallet output: {exc}"
+    message			= f"Unable to support Paper Wallet output (eth_account): {exc}"
     warnings.warn( message, ImportWarning )
     if log.isEnabledFor( logging.DEBUG ):
         log.exception( message )

slip39/gui/SLIP-39-WALLET.org

@@ -2,18 +2,23 @@
 #+OPTIONS: toc:nil title:nil author:nil
 
 #+BEGIN_ABSTRACT
-Supply a password to produce an encrypted Ethereum JSON wallet or Bitcoin, ... BIP-38 Paper Wallet.
+Supply a password (or a hint) to produce an encrypted Ethereum JSON wallet or Bitcoin, ... BIP-38
+Paper Wallet.
 
-If you import these SLIP-39 Mnemonics directly into your Trezor hardware wallet -- you do
-/not/ need Paper Wallets: you have access to /all/ of the wallets, in every cryptocurrency supported
-by the Trezor.
+If you import these SLIP-39 (or BIP-39) Mnemonics directly into your Trezor hardware wallet -- you
+do /not/ need Paper Wallets: you have access to /all/ of the wallets, in every cryptocurrency
+supported by the Trezor.
 
 These are intended to support the importing of /individual/, single wallets into standard software
 wallets (eg. Brave browser, Metamask plugins, other software wallets on PCs or mobile devices).  If
 you need some cryptocurrency "walking around" money, use them to create recoverable "Safe Portable
 Crypto Accounts" (below).
 #+END_ABSTRACT
 
+NOTE: you likely want to change the Custom Derivation Path in "# to Derive:" to something other than
+your main wallet at .../0'/0/0: probably a path like =99'/0/0-3=, to create 4 Paper Wallets at a
+different "account" (99').
+
 * Password
 
   If you lose or forget this Paper Wallet password -- you cannot import these wallets into

slip39/gui/SLIP-39-WALLET.txt

@@ -1,16 +1,22 @@
-Supply a password to produce an encrypted Ethereum JSON wallet or
-Bitcoin, … BIP-38 Paper Wallet.
+Supply a password (or a hint) to produce an encrypted Ethereum JSON
+wallet or Bitcoin, … BIP-38 Paper Wallet.
 
-If you import these SLIP-39 Mnemonics directly into your Trezor hardware
-wallet – you do /not/ need Paper Wallets: you have access to /all/ of
-the wallets, in every cryptocurrency supported by the Trezor.
+If you import these SLIP-39 (or BIP-39) Mnemonics directly into your
+Trezor hardware wallet – you do /not/ need Paper Wallets: you have
+access to /all/ of the wallets, in every cryptocurrency supported by the
+Trezor.
 
 These are intended to support the importing of /individual/, single
 wallets into standard software wallets (eg. Brave browser, Metamask
 plugins, other software wallets on PCs or mobile devices).  If you need
 some cryptocurrency "walking around" money, use them to create
 recoverable "Safe Portable Crypto Accounts" (below).
 
+NOTE: you likely want to change the Custom Derivation Path in "# to
+Derive:" to something other than your main wallet at …/0'/0/0: probably
+a path like `99'/0/0-3', to create 4 Paper Wallets at a different
+"account" (99').
+
 
 1 Password
 ══════════