Handle double-sided for paper wallets

Author: pjkundert

SLIP-39-macOS.spec

@@ -44,9 +44,9 @@ app = BUNDLE(
     exe,
     name='SLIP-39.app',
     icon='images/SLIP-39.icns',
-    version='11.0.2',
+    version='11.1.1',
     info_plist={
-        'CFBundleVersion':'11.0.2',
+        'CFBundleVersion':'11.1.1',
         'CFBundlePackageType':'APPL',
         'LSApplicationCategoryType':'public.app-category.utilities',
         'LSMinimumSystemVersion':'10.15.0',

slip39/layout/pdf.py

@@ -522,12 +522,12 @@ def write_pdfs(
         # Unless no card_format (False) or paper wallet password specified, produce a PDF containing
         # the SLIP-39 mnemonic recovery cards; remember the deduced (<pdf_paper>,<pdf_orient>).  If
         # we're producing paper wallets, always force portrait orientation for the cards, to match.
-        if card_format is not False or wallet_pwd:
+        if card_format is not False or wallet_pwd is not None:
             (pdf_paper,pdf_orient),pdf,_ = produce_pdf(
                 *details,
                 card_format	= card_format or CARD,
                 paper_format	= paper_format or PAPER,
-                orientations	= ('portrait', ) if wallet_pwd else None,
+                orientations	= ('portrait', ) if wallet_pwd is not None else None,
                 cover_text	= cover_text,
                 watermark	= watermark,
                 double_sided	= double_sided,
@@ -546,7 +546,7 @@ def write_pdfs(
         if not pdf_name.lower().endswith( '.pdf' ):
             pdf_name	       += '.pdf'
 
-        if wallet_pwd:
+        if wallet_pwd is not None:
             # Deduce the paper wallet size and create a template.  All layouts are in specified in
             # inches; template dimensions are in mm.
             try:
@@ -580,6 +580,8 @@ def write_pdfs(
                     p,(offsetx,offsety) = page_xy( wall_n )
                     if p != page_n:
                         pdf.add_page( orientation='P', format=wallet_paper )
+                        if double_sided is None or double_sided:
+                            pdf.add_page( orientation='P', format=wallet_paper )
                         page_n	= p
                     try:
                         private_enc		= account.encrypted( wallet_pwd )
@@ -654,7 +656,7 @@ def write_pdfs(
 
                     wall_tpl.render( offsetx=offsetx, offsety=offsety )
 
-        if json_pwd:
+        if json_pwd is not None:
             # If -j|--json supplied, also emit the encrypted JSON wallet.  This may be a *different*
             # password than the SLIP-39 master secret encryption passphrase.  It will be required to
             # decrypt and use the saved JSON wallet file, eg. to load a software Ethereum wallet.
@@ -690,7 +692,8 @@ def write_pdfs(
                 log.warning( f"Wrote JSON {name or 'SLIP39'}'s encrypted ETH wallet {eth.address} derived at {eth.path} to: {json_name}" )
 
                 if pdf:
-                    # Add the encrypted JSON account recovery to the PDF also, if generated.
+                    # Add the encrypted JSON account recovery to the PDF also, if generated.  Last
+                    # page, so no need to handle double_sided for subsequent output.
                     pdf.add_page()
                     margin_mm	= PAGE_MARGIN * MM_IN
                     pdf.set_margin( 1.0 * MM_IN )

slip39/main.py

@@ -77,7 +77,7 @@ def main( argv=None ):
                      help="Save an encrypted JSON wallet for each Ethereum address w/ this password, '-' reads it from stdin (default: None)" )
     ap.add_argument( '-w', '--wallet',
                      default=None,
-                     help="Produce paper wallets in output PDF; each wallet private key is encrypted this password" )
+                     help="Produce paper wallets in output PDF; each wallet private key is encrypted this password (use --wallet=\"\" for empty password)" )
     ap.add_argument( '--wallet-hint',
                      default=None,
                      help="Paper wallets password hint" )
@@ -86,7 +86,7 @@ def main( argv=None ):
                      help=f"Paper wallet size; {', '.join(WALLET_SIZES.keys())} or '(<h>,<w>),<margin>' (default: {WALLET})" )
     ap.add_argument( '-s', '--secret',
                      default=None,
-                     help="Use the supplied 128-, 256- or 512-bit hex value as the secret seed; '-' reads it from stdin (eg. output from slip39.recover)" )
+                     help="Use the supplied BIP-39 Mnemonic or 128-, 256- or 512-bit hex value as the secret seed; '-' reads it from stdin (eg. output from slip39.recover)" )
     ap.add_argument( '--bits',
                      default=None,  # Do not enforce default of 128-bit seeds
                      help=f"Ensure that the seed is of the specified bit length; {', '.join( map( str, BITS ))} supported." )
@@ -196,7 +196,7 @@ def main( argv=None ):
     wallet_format		= args.wallet_format
 
     json_pwd			= args.json
-    if json_pwd:
+    if json_pwd is not None:
         if json_pwd == '-':
             json_pwd		= input_secure( 'Ethereum JSON wallet file password: ', secret=True )
         else:

slip39/version.py

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