v7.0.1; use pycryptodome's scrypt, for working pyinstaller macOS app

o Remove dependency on scrypt
o Detect Paper Wallet capability, en/disable controls in GUI

Author: pjkundert

SLIP39.spec

@@ -49,9 +49,9 @@ coll = COLLECT(exe,
 app = BUNDLE(coll,
              name='SLIP39.app',
              icon='images/SLIP39.icns',
-             version='7.0.0',
+             version='7.0.1',
              info_plist={
-                 'CFBundleVersion':'7.0.0',
+                 'CFBundleVersion':'7.0.1',
                  'CFBundlePackageType':'APPL',
                  'LSApplicationCategoryType':'public.app-category.finance',
                  'LSMinimumSystemVersion':'10.15.0',

requirements-dev.txt

@@ -4,3 +4,4 @@ pip
 pytest
 setuptools
 wheel
+pyinstaller	>= 4.9

requirements-wallet.txt

@@ -1,3 +1,2 @@
 eth-account		>=0.6.0, <1
-scrypt			>=0.8.17
 pycryptodome		>=3.10.1

slip39/api.py

@@ -18,11 +18,9 @@
 # Support for private key encryption via BIP-38 and Ethereum JSON wallet is optional; pip install slip39[wallet]
 try:
     from Crypto.Cipher	import AES
+    from Crypto.Protocol.KDF import scrypt
 except ImportError:
     AES				= None
-try:
-    import scrypt
-except ImportError:
     scrypt			= None
 try:
     import eth_account
@@ -38,6 +36,11 @@
 log				= logging.getLogger( __package__ )
 
 
+def paper_wallet_available():
+    """Determine if encrypted BIP-38 and Ethereum JSON Paper Wallets are available."""
+    return AES and scrypt and eth_account
+
+
 def path_edit(
     path: str,
     edit: str,
@@ -256,17 +259,17 @@ def bip38( self, passphrase, flagbyte=b'\xe0' ):
             raise NotImplementedError( f"{self.crypto} does not support BIP-38 private key encryption" )
         private_hex		= self.key
         addr			= self.legacy_address().encode( 'UTF-8' )  # Eg. b"184xW5g..."
-        addrhash		= hashlib.sha256( hashlib.sha256( addr ).digest() ).digest()[0:4]
+        ahash			= hashlib.sha256( hashlib.sha256( addr ).digest() ).digest()[0:4]
         if isinstance( passphrase, str ):
             passphrase		= passphrase.encode( 'UTF-8' )
-        key			= scrypt.hash( passphrase, addrhash, 16384, 8, 8, 64 )
+        key			= scrypt( passphrase, salt=ahash, key_len=64, N=16384, r=8, p=8 )
         derivedhalf1		= key[0:32]
         derivedhalf2		= key[32:64]
         aes			= AES.new( derivedhalf2, AES.MODE_ECB )
         enchalf1		= aes.encrypt( ( int( private_hex[ 0:32], 16 ) ^ int.from_bytes( derivedhalf1[ 0:16], 'big' )).to_bytes( 16, 'big' ))
         enchalf2		= aes.encrypt( ( int( private_hex[32:64], 16 ) ^ int.from_bytes( derivedhalf1[16:32], 'big' )).to_bytes( 16, 'big' ))
         prefix			= b'\x01\x42'
-        encrypted_privkey	= prefix + flagbyte + addrhash + enchalf1 + enchalf2
+        encrypted_privkey	= prefix + flagbyte + ahash + enchalf1 + enchalf2
         # Encode the encrypted private key to base58, adding the 4-byte base58 check suffix
         return base58.b58encode_check( encrypted_privkey ).decode( 'UTF-8' )
 
@@ -287,7 +290,7 @@ def from_bip38( self, encrypted_privkey, passphrase, strict=True ):
             f"Unrecognized BIP-38 flagbyte: {flag!r}"
         if isinstance( passphrase, str ):
             passphrase		= passphrase.encode( 'UTF-8' )
-        key			= scrypt.hash( passphrase, ahash, 16384, 8, 8, 64 )
+        key			= scrypt( passphrase, salt=ahash, key_len=64, N=16384, r=8, p=8 )
         derivedhalf1		= key[0:32]
         derivedhalf2		= key[32:64]
         aes			= AES.new( derivedhalf2, AES.MODE_ECB )

slip39/api_test.py

@@ -7,8 +7,10 @@
 except ImportError:
     eth_account			= None
 try:
-    import scrypt
+    from Crypto.Cipher	import AES
+    from Crypto.Protocol.KDF import scrypt
 except ImportError:
+    AES				= None
     scrypt			= None
 
 import shamir_mnemonic

slip39/gui/main.py

@@ -9,7 +9,7 @@
 
 import PySimpleGUI as sg
 
-from ..			import Account, create, group_parser, random_secret, cryptopaths_parser
+from ..api		import Account, create, group_parser, random_secret, cryptopaths_parser, paper_wallet_available
 from ..recovery		import recover, recover_bip39
 from ..util		import log_level, log_cfg, ordinal, chunker
 from ..layout		import write_pdfs
@@ -48,6 +48,7 @@ def groups_layout(
     groups,
     passphrase		= None,
     cryptocurrency	= None,
+    paper_wallet	= True,  # Should we include Paper Wallet config in layout?
 ):
     """Return a layout for the specified number of SLIP-39 groups.
 
@@ -80,6 +81,9 @@ def groups_layout(
         ),
     ]
 
+    if not paper_wallet:
+        log.warning( "Disabling Paper Wallets capability: API unavailable" )
+
     layout                      = [
         [
             sg.Frame( '1. Location for output PDF File(s) (Preferably removable media, such as a USB drive)', [
@@ -229,7 +233,7 @@ def groups_layout(
                         ],
                     ],                                                                          **F_kwds ),
                 ],
-            ],                                          key='-WALLET-F-',       visible=True,   **F_kwds ),
+            ],                                          key='-WALLET-F-', visible=paper_wallet, **F_kwds ),  # noqa: E126
         ],
     ] + [
         [
@@ -535,13 +539,16 @@ def app(
 
     sg.user_settings_set_entry( '-target folder-', os.getcwd() )
 
+    paper_wallet		= paper_wallet_available()
+
     # Compute initial App window layout, from the supplied groups.
     layout			= groups_layout(
         names		= names,
         group_threshold	= group_threshold,
         groups		= groups,
         passphrase	= passphrase,
         cryptocurrency	= cryptocurrency,
+        paper_wallet	= paper_wallet,
     )
 
     window			= None
@@ -563,7 +570,8 @@ def app(
             window['-SE-SEED-F-'].expand( expand_x=True )
             window['-SEED-F-'].expand( expand_x=True )
             window['-OUTPUT-F-'].expand( expand_x=True )
-            window['-WALLET-F-'].expand( expand_x=True )
+            if paper_wallet:
+                window['-WALLET-F-'].expand( expand_x=True )
             window['-SUMMARY-F-'].expand( expand_x=True )
             window['-STATUS-F-'].expand( expand_x=True )
             window['-RECOVERED-F-'].expand( expand_x=True )
@@ -756,6 +764,7 @@ def app(
         # time we recompute -- even without any changes -- the SLIP-39 Mnemonics will change, due to the use
         # of entropy in the SLIP-39 process.
         if slip39_update or not details:
+            log.info( f"SLIP39 details for {names}..." )
             try:
                 details		= {}
                 for n,name in enumerate( names ):
@@ -779,8 +788,15 @@ def app(
                 continue
 
         # Display the computed SLIP-39 Mnemonics for the first name.
-        if status := update_seed_recovered( window, values, details[names[0]], passphrase=passphrase ):
-            groups_recovered	= {}
+        try:
+            if status := update_seed_recovered( window, values, details[names[0]], passphrase=passphrase ):
+                groups_recovered	= {}
+                continue
+        except Exception as exc:
+            status		= f"Error recovering: {exc}"
+            logging.exception( f"{status}" )
+            update_seed_recovered( window, values, None )
+            groups_recovered = {}
             continue
 
         # If all has gone well -- display the resultant <name>/<filename>, and some derived account details
@@ -795,10 +811,10 @@ def app(
         # details is now { "<filename>": <details> })
         if event == '-SAVE-':
             try:
-                card		= next( c for c in CARD_SIZES if values[f"-CS-{c}"] )
+                card_format	= next( c for c in CARD_SIZES if values[f"-CS-{c}"] )
                 details		= write_pdfs(
                     names		= details,
-                    card		= card,
+                    card_format		= card_format,
                     cryptocurrency	= cryptocurrency,
                     edit		= edit,
                     wallet_pwd		= values['-WALLET-PASS-'],  # Produces Paper Wallet(s) iff set

slip39/layout/__init__.py

@@ -733,7 +733,7 @@ def write_pdfs(
                     wall_tpl['wallet-bg']	= os.path.join( images, 'paper-wallet-background.png' )
                     wall_tpl[f"crypto-f{c_n}"]	= account.crypto
                     wall_tpl[f"crypto-b{c_n}"]	= account.crypto
-                    
+
                     wall_tpl['center']		= os.path.join( images, account.crypto + '.png' )
 
                     wall_tpl['name-label']	= "Wallet name:"

slip39/version.py

@@ -1,2 +1,2 @@
-__version_info__		= ( 7, 0, 0 )
+__version_info__		= ( 7, 0, 1 )
 __version__			= '.'.join( map( str, __version_info__ ))