Corrected use of produce_pdf paper handling, tested BIP-38 Paper Wallet

Author: pjkundert

SLIP-39-macOS.spec

@@ -50,9 +50,9 @@ coll = COLLECT(exe,
 app = BUNDLE(coll,
              name='SLIP-39.app',
              icon='images/SLIP-39.icns',
-             version='8.0.0',
+             version='8.0.1',
              info_plist={
-                 'CFBundleVersion':'8.0.0',
+                 'CFBundleVersion':'8.0.1',
                  'CFBundlePackageType':'APPL',
                  'LSApplicationCategoryType':'public.app-category.finance',
                  'LSMinimumSystemVersion':'10.15.0',

slip39/api_test.py

@@ -128,6 +128,13 @@ def test_account_encrypt():
         'Satoshi'
     ).key.upper() == '09C2686880095B1A4C249EE3AC4EEA8A014F11E6F986D0B5025AC1F39AFBD9AE'
 
+    # Test some addresses encrypted by our Paper Wallet PDF output procedure, using
+    # the "zoo zoo ... zoo wrong" BIP-39 test Mnemonic.
+    assert Account( crypto='BTC' ).from_encrypted(
+        '6PYSUhj4mPTNdSvm2dxLRszieSBmzPqPQX699ECUrd69sWteFAUqmW1FLq',
+        'something'
+    ).address == 'bc1qk0a9hr7wjfxeenz9nwenw9flhq0tmsf6vsgnn2'
+    
 
 @substitute( shamir_mnemonic.shamir, 'RANDOM_BYTES', nonrandom_bytes )
 def test_create():

slip39/layout/__init__.py

@@ -692,7 +692,7 @@ def write_pdfs(
     # Generate each desired SLIP-39 Mnemonic file.  Supports --card (the default).  Remember any
     # deduced orientation and paper_format for below.
     results			= {}
-    (orientation,paper_format),pdf = (None,None),None
+    (pdf_paper,pdf_orient),pdf	= (None,None),None
     for name, details in names.items():
         # Get the first group of the accountgroups in details.accounts.
         accounts		= details.accounts
@@ -709,9 +709,9 @@ def write_pdfs(
                     print( f"{name}{name and ': ' or ''}{mnem}" )
 
         # Unless no card_format (False) or paper wallet password specified, produce a PDF containing
-        # the SLIP-39 mnemonic recovery cards; remember the deduced (<orientation>,<paper>)
+        # the SLIP-39 mnemonic recovery cards; remember the deduced (<pdf_paper>,<pdf_orient>)
         if card_format is not False or wallet_pwd:
-            (orientation,paper_format),pdf,_ = produce_pdf(
+            (pdf_paper,pdf_orient),pdf,_ = produce_pdf(
                 *details,
                 card_format	= card_format or CARD,
                 paper_format	= paper_format or PAPER
@@ -904,8 +904,8 @@ def write_pdfs(
                 printer_output(
                     pdf.output(),
                     printer		= printer,
-                    orientation		= orientation,
-                    paper_format	= paper_format,
+                    orientation		= pdf_orient,
+                    paper_format	= pdf_paper,
                 )
 
         results[pdf_name]	= details

slip39/version.py

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