Fix flake8 issues, improve cli

Author: pjkundert

requirements-invoice.txt

@@ -3,10 +3,6 @@ py-solc-x		>=1.1.1,<1.2
 pycryptodome		>=3.16,	<4 
 requests		>=2.20,	<3
 
-# Update to 0.9.1 w/ type deduction w/ missing/empty support
-#tabulate		>=0.9.1,<1
-tabulate @ git+https://github.com/pjkundert/python-tabulate.git@python-slip39#egg=tabulate
-
 dkimpy[ed25519]		>=1.0.5,<2
 
 # These versions are very brittle; must be upgraded in lock-step (see web3.py/setup.py)

requirements.txt

@@ -6,6 +6,7 @@ cx_Freeze		>=6.12		; sys_platform == "win32"
 fpdf2			>=2.7.6,<3
 #hdwallet		>=2.3.0,<3
 hdwallet @ git+https://github.com/pjkundert/python-hdwallet.git@python-slip39#egg=hdwallet
+tabulate @ git+https://github.com/pjkundert/python-tabulate.git@python-slip39#egg=tabulate
 mnemonic		>=0.2,	<1
 qrcode			>=7.3
-shamir-mnemonic		>=0.2.2,<1
+shamir-mnemonic		>=0.3.0,<0.4

setup.py

@@ -14,7 +14,7 @@
         'gui',		# slip39[gui]:		Support PySimpleGUI/tkinter Graphical UI App
         'serial',	# slip39[serial]:	Support serial I/O of generated wallet data
         'wallet',	# slip39[wallet]:	Paper Wallet and BIP-38/Ethereum wallet encryption
-      # 'invoice',	# slip39[invoice]:	Generation of invoices, and associated Smart Contracts
+        'invoice',	# slip39[invoice]:	Generation of invoices, and associated Smart Contracts
 ]
 extras_require			= {
     option: list(

slip39/api.py

@@ -24,7 +24,6 @@
 import logging
 import math
 import re
-import secrets
 import string
 import warnings
 
@@ -41,7 +40,7 @@
 from .defaults		import (
     BITS_DEFAULT, BITS, MNEM_ROWS_COLS, GROUPS, GROUP_REQUIRED_RATIO, GROUP_THRESHOLD_RATIO, CRYPTO_PATHS
 )
-from .util		import ordinal, commas, is_listlike, is_mapping
+from .util		import ordinal, commas, is_mapping
 from .recovery		import produce_bip39, recover_bip39, recover as recover_slip39
 
 __author__                      = "Perry Kundert"
@@ -61,7 +60,7 @@
     AES				= None
     scrypt			= None
     message			= f"Unable to support Paper Wallet output: {exc}"
-    warnings.warn( message, ImportWarning )
+    warnings.warning( message, ImportWarning )
     if log.isEnabledFor( logging.DEBUG ):
         log.exception( message )
     paper_wallet_issues.append( message )
@@ -71,7 +70,7 @@
 except ImportError as exc:
     eth_account			= None
     message			= f"Unable to support Paper Wallet output: {exc}"
-    warnings.warn( message, ImportWarning )
+    warnings.warning( message, ImportWarning )
     if log.isEnabledFor( logging.DEBUG ):
         log.exception( message )
     paper_wallet_issues.append( message )
@@ -156,68 +155,6 @@ class BinanceMainnet( cryptocurrencies.Cryptocurrency ):
     WIF_SECRET_KEY = 0x80
 
 
-class RippleMainnet( cryptocurrencies.Cryptocurrency ):
-    """The standard HDWallet.p2pkh_address (Pay to Public Key Hash) encoding is used, w/ a prefix of
-    00.  However, the XRP-specific base-58 encoding is used, resulting in a fixed 'r' prefix.
-
-    See: https://xrpl.org/accounts.html#address-encoding.
-
-    """
-    NAME = "Ripple"
-    SYMBOL = "XRP"
-    NETWORK = "mainnet"
-    SOURCE_CODE = "https://github.com/ripple/rippled"
-    COIN_TYPE = cryptocurrencies.CoinType({
-        "INDEX": 144,
-        "HARDENED": True
-    })
-
-    PUBLIC_KEY_ADDRESS = 0x00  # Results in the prefix r..., when used w/ the Ripple base-58 alphabet
-    SEGWIT_ADDRESS = cryptocurrencies.SegwitAddress({
-        "HRP": None,
-        "VERSION": 0x00
-    })
-
-    EXTENDED_PRIVATE_KEY = cryptocurrencies.ExtendedPrivateKey({
-        "P2PKH": None,
-        "P2SH": None,
-        "P2WPKH": None,
-        "P2WPKH_IN_P2SH": None,
-        "P2WSH": None,
-        "P2WSH_IN_P2SH": None,
-    })
-    EXTENDED_PUBLIC_KEY = cryptocurrencies.ExtendedPublicKey({
-        "P2PKH": None,
-        "P2SH": None,
-        "P2WPKH": None,
-        "P2WPKH_IN_P2SH": None,
-        "P2WSH": None,
-        "P2WSH_IN_P2SH": None,
-    })
-
-    MESSAGE_PREFIX = None
-    DEFAULT_PATH = f"m/44'/{str(COIN_TYPE)}/0'/0/0"
-    WIF_SECRET_KEY = 0x80
-
-
-class XRPHDWallet( hdwallet.HDWallet ):
-    """The XRP address format uses the standard p2pkh_address formulation, from
-    https://xrpl.org/accounts.html#creating-accounts:
-
-    The ripemd160 hash of sha256 hash of public key, then base58-encoded w/ 4-byte checksum.  The
-    base-58 dictionary used is the standard Ripple (not Bitcoin!) alphabet:
-
-        rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz
-
-    NOTE: Only secp256k1 keypairs are supported; these are the default for the Ripple ledger.
-
-    """
-    def p2pkh_address( self ):
-        p2pkh_btc	= super( XRPHDWallet, self ).p2pkh_address()
-        p2pkh		= base58.b58decode_check( p2pkh_btc )
-        return base58.b58encode_check( p2pkh, base58.RIPPLE_ALPHABET ).decode( 'UTF-8' )
-
-
 class Account:
     """A Cryptocurrency "Account" / Wallet, based on a variety of underlying Python crypto-asset
     support modules.  Presently, only meherett/python-hdwallet is used.
@@ -315,11 +252,9 @@ class Account:
     # Any locally-defined python-hdwallet classes, cryptocurrency definitions, and any that may
     # require some adjustments when calling python-hdwallet address and other functions.
     CRYPTO_WALLET_CLS		= dict(
-        XRP		= XRPHDWallet,
     )
     CRYPTO_LOCAL		= dict(
         BSC		= BinanceMainnet,
-        XRP		= RippleMainnet,
     )
     CRYPTO_LOCAL_SYMBOL		= dict(
         BSC		= "ETH"
@@ -930,6 +865,47 @@ def random_secret(
     return RANDOM_BYTES( seed_length )
 
 
+def stretch_seed_entropy( entropy, n, bits, encoding=None ):
+    """To support the generation of a number of Seeds, each subsequent seed *must* be independent of
+    the prior seed.  The Seed Data supplied (ie. recovered from BIP/SLIP-39 Mnemonics, or from fixed/random
+    data) is of course unchanging for the subsequent seeds to be produced; only the "extra" Seed Entropy
+    is useful for producing multiple sequential Seeds.  Returns the designated number of bits
+    (rounded up to bytes).
+
+    If non-binary hex data is supplied, encoding should be 'hex_codec' (0-filled/truncated on the
+    right up to the required number of bits); otherwise probably 'UTF-8' (and we'll always stretch
+    other encoded Entropy, even for the first (ie. 0th) seed).
+
+    If binary data is supplied, it must be sufficient to provide the required number of bits for the
+    first and subsequent Seeds (SHA-512 is used to stretch, so any encoded and stretched entropy
+    data will be sufficient)
+
+    """
+    assert n == 0 or ( entropy and n >= 0 ), \
+        f"Some Extra Seed Entropy is required to produce the {ordinal(n+1)}+ Seed(s)"
+    assert ( type(entropy) is bytes ) == ( not encoding ), \
+        "If non-binary Seed Entropy is supplied, an appropriate encoding must be specified"
+    if encoding:
+        if encoding == 'hex_codec':
+            # Hexadecimal Entropy was provided; Use the raw encoded Hex data for the first round!
+            entropy		= f"{entropy:<0{bits // 4}.{bits // 4}}"
+            entropy		= codecs.decode( entropy, encoding )  # '012abc' --> b'\x01\x2a\xbc'
+        else:
+            # Other encoding was provided, eg 'UTF-8', 'ASCII', ...; stretch for the 0th Seed, too.
+            n		       += 1
+            entropy		= codecs.encode( entropy, encoding )    # '012abc' --> b'012abc'
+    octets			= ( bits + 7 ) // 8
+    if entropy:
+        for _ in range( n ):
+            entropy		= hashlib.sha512( entropy ).digest()
+    else:
+        # If no entropy provided, result is all 0
+        entropy			= b'\0' * octets
+    assert len( entropy ) >= octets, \
+        "Insufficient extra Seed Entropy provided for {ordinal(n+1)} {bits}-bit Seed"
+    return entropy[:octets]
+
+
 Details = namedtuple( 'Details', ('name', 'group_threshold', 'groups', 'accounts', 'using_bip39') )
 
 
@@ -1046,7 +1022,7 @@ def create(
     if isinstance( master_secret, str ) and all( c in '0123456789abcdef' for c in master_secret.lower() ):
         master_secret		= codecs.decode( master_secret, 'hex_codec' )
     if using_bip39 is None and isinstance( master_secret, str ):
-	# Assume it must be a BIP-39 Mnemonic
+        # Assume it must be a BIP-39 Mnemonic
         using_bip39		= True
     else:
         # Assume caller knows; default False (use SLIP-39 directly)
@@ -1059,7 +1035,7 @@ def create(
         # using the BIP-39 Seed generated from entropy + passphrase.  This should be the "typical"
         # use-case, where someone already has a BIP-39 Mnemonic and/or wants to use a "standard"
         # BIP-39 compatible hardware wallet.
-        log.warning( f"Assuming BIP-39 seed entropy: Ensure you recover and use via a BIP-39 Mnemonic" )
+        log.warning( "Assuming BIP-39 seed entropy: Ensure you recover and use via a BIP-39 Mnemonic" )
         if isinstance( master_secret, str ):
             master_secret	= recover_bip39( mnemonic=master_secret, as_entropy=True )
         bip39_mnem		= produce_bip39( entropy=master_secret )
@@ -1165,6 +1141,7 @@ def mnemonics(
         groups		= groups,
         master_secret	= master_secret,
         passphrase	= passphrase or b"",  # python-shamir-mnemonic requires bytes
+        extendable	= False,
         iteration_exponent = iteration_exponent,
     )
 
@@ -1263,7 +1240,7 @@ def accountgroups(
     master_secret: Union[str,bytes],
     cryptopaths: Optional[Sequence[Union[str,Tuple[str,str],Tuple[str,str,str]]]] = None,  # default: ETH, BTC at default path, format
     allow_unbounded: bool	= True,
-    passphrase: Optional[Union[bytes,str]] = None,	# If mnemonic(s) provided, then passphrase/using_bip39 optional
+    passphrase: Optional[Union[bytes,str]] = None,      # If mnemonic(s) provided, then passphrase/using_bip39 optional
     using_bip39: bool		= False,
     format: Optional[str]	= None,			# If the default format for every cryptopath isn't desired
     edit: Optional[str]		= None,

slip39/api_passphrase_test.py

@@ -1,5 +1,4 @@
 import codecs
-import json
 import math
 
 import pytest

slip39/api_test.py

@@ -18,11 +18,12 @@
 from .			import account, create, addresses, addressgroups, accountgroups, Account
 from .recovery		import recover
 
-from .dependency_test	import substitute, nonrandom_bytes, SEED_XMAS, SEED_ONES, SEED_ZERO
+from .dependency_test	import substitute, nonrandom_bytes, SEED_XMAS, SEED_ONES
 
 BIP39_ABANDON			= "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"
 BIP39_ZOO			= 'zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo zoo wrong'
 
+
 def test_account_smoke():
     acct			= account( SEED_XMAS )
     assert acct.address == '0x336cBeAB83aCCdb2541e43D514B62DC6C53675f4'
@@ -117,7 +118,6 @@ def test_account_format():
     means to restrict the path to hardened_defaults).
 
     """
-    
     # Legacy Bitcoin
     acct			= account(
         master_secret	= BIP39_ABANDON,
@@ -160,7 +160,6 @@ def test_account_format():
     assert acct.xprvkey == "xprv9xpXFhFpqdQK3TmytPBqXtGSwS3DLjojFhTGht8gwAAii8py5X6pxeBnQ6ehJiyJ6nDjWGJfZ95WxByFXVkDxHXrqu53WCRGypk2ttuqncb"
     assert acct.xpubkey == "xpub6BosfCnifzxcFwrSzQiqu2DBVTshkCXacvNsWGYJVVhhawA7d4R5WSWGFNbi8Aw6ZRc1brxMyWMzG3DSSSSoekkudhUd9yLb6qx39T9nMdj"
 
-
     # SegWit
     acct			= account(
         master_secret	= BIP39_ABANDON,
@@ -191,7 +190,6 @@ def test_account_format():
     assert acct.path == "m/49'/0'/0'/0/0"
     assert acct.address == "37VucYSaXLCAsxYyAPfbSi9eh4iEcbShgf"
 
-
     # Bech32
     (acct,),			= accountgroups(
         BIP39_ABANDON, cryptopaths=['Bitcoin'], format='bech32', hardened_defaults=True,
@@ -561,12 +559,12 @@ def test_addressgroups():
     )))
     # print( repr( addrgrps ))
     assert addrgrps == [								# Verified
-        (0,(('ETH', "m/44'/60'/0'/0/0", '0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E'),	# Ledger
-            ('BTC', "m/84'/0'/0'/0/0", 'bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2'),	# Ledger
-            ('LTC', "m/84'/2'/0'/0/0", 'ltc1qnreu4d88p5tvh33anptujvcvn3xmfhh43yg0am'),	# Ledger
-            ('DOGE', "m/44'/3'/0'/0/0", 'DTMaJd8wqye1fymnjxZ5Cc5QkN1w4pMgXT'),		# Ledger
-            ('BSC', "m/44'/60'/0'/0/0", '0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E'),	# Ledger
-            ('XRP', "m/44'/144'/0'/0/0", 'rUPzi4ZwoYxi7peKCqUkzqEuSrzSRyLguV'))),	# Ledger 
+        (0,(('ETH', "m/44'/60'/0'/0/0", '0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E'),  # Ledger
+            ('BTC', "m/84'/0'/0'/0/0", 'bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2'),   # Ledger
+            ('LTC', "m/84'/2'/0'/0/0", 'ltc1qnreu4d88p5tvh33anptujvcvn3xmfhh43yg0am'),  # Ledger
+            ('DOGE', "m/44'/3'/0'/0/0", 'DTMaJd8wqye1fymnjxZ5Cc5QkN1w4pMgXT'),	        # Ledger
+            ('BSC', "m/44'/60'/0'/0/0", '0xfc2077CA7F403cBECA41B1B0F62D91B5EA631B5E'),  # Ledger
+            ('XRP', "m/44'/144'/0'/0/0", 'rUPzi4ZwoYxi7peKCqUkzqEuSrzSRyLguV'))),       # Ledger
         (1, (('ETH', "m/44'/60'/0'/0/1", '0xd1a7451beB6FE0326b4B78e3909310880B781d66'),
              ('BTC', "m/84'/0'/0'/0/1", 'bc1qkd33yck74lg0kaq4tdcmu3hk4yruhjayxpe9ug'),
              ('LTC', "m/84'/2'/0'/0/1", 'ltc1qm4yc8vgxyv0xeu8p4vtq2wls245y2ueqpfrp4d'),

slip39/communications_test.py

@@ -18,8 +18,8 @@
 log				= logging.getLogger( __package__ )
 
 # Disable printing of details unless something goes wrong...
-print_NOOP			= lambda *args, **kwds: None
-print				= print_NOOP
+print_NOOP			= lambda *args, **kwds: None    # noqa: E731
+print				= print_NOOP			# noqa: E273
 
 # If we find a DKIM key, lets use it.  Otherwise, we'll just use the pre-defined pre-signed email.Message
 dkim_keys			= list( Path( __file__ ).resolve().parent.parent.glob( 'licensing.dominionrnd.com.*.key' ))

slip39/dependency_test.py

@@ -55,6 +55,8 @@ def test_share_1_of_3_5():
         groups		= [(3, 5)],
         master_secret	= SEED_TREZOR,
         passphrase	= PASS_TREZOR,
+        extendable	= False,
+        iteration_exponent = 1,
     )
 
     #print( json.dumps( mnemonics, indent=4 ))
@@ -71,6 +73,8 @@ def test_share_2_of_groups():
         groups		= [(1, 1), (1, 1), (2, 5), (3, 6)],
         master_secret	= SEED_KNOWN,
         passphrase	= PASS_KNOWN,
+        extendable	= False,
+        iteration_exponent = 1,
     )
 
     #print( json.dumps( mnemonics, indent=4 ))
@@ -121,6 +125,8 @@ def test_bip39( entropy, expected_BIP39, expected_seed, expected_SLIP39 ):
         groups		= [(1, 1), (1, 1), (2, 5), (3, 6)],
         master_secret	= seed,
         passphrase	= b"",
+        extendable	= False,
+        iteration_exponent = 1,
     )
 
     # print( json.dumps( mnemonics, indent=4 ))

slip39/generator/main.py

@@ -217,7 +217,7 @@ def file_opener():  # noqa: F811
                 )
                 return ser
 
-            def healthy_reset( file ):  # noaq: F811
+            def healthy_reset( file ):  # noqa: F811
                 file.dtr		= False
                 # Wait for a server to de-assert DTR, discarding input.  After the Server has de-asserted, we still need to drain
                 # the Server's output / Client's input buffers, so keep flushing 'til input buffer empty...