Skip to content

Commit 8b2d7e2

Browse files
pjkundertpjkundert
committed
Correct Paper Wallet password handling, direct printer output on macOS
o Move input_secure of Paper and JSON Wallets to slip39.main o Deprecate output_pdf in favour of produce_pdf returning paper details
1 parent 0df2e8d commit 8b2d7e2

File tree

9 files changed

+430
-252
lines changed

9 files changed

+430
-252
lines changed

‎README.org‎

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ by entering the mnemonics right on the device.
723723

724724
#+LATEX: }
725725

726-
*** =slip39.output_pdf=
726+
*** =slip39.produce_pdf=
727727

728728
#+LATEX: {\scriptsize
729729
| Key | Description |
@@ -736,40 +736,57 @@ by entering the mnemonics right on the device.
736736
| paper_format | 'Letter', ... |
737737
#+LATEX: }
738738

739-
Produce a PDF containing all the SLIP-39 details for the account.
739+
Layout and produce a PDF containing all the SLIP-39 details on cards for the crypto accounts, on
740+
the paper_format provided. Returns the paper (orientation,format) used, the FPDF, and passes
741+
through the supplied cryptocurrency accounts derived.
740742

741743
#+LATEX: {\scriptsize
742744
#+BEGIN_SRC ipython :session :exports both :results raw drawer
743-
pdf,accounts = slip39.output_pdf( *create_details )
745+
(paper_format,orientation),pdf,accounts = slip39.produce_pdf( *create_details )
746+
pdf_binary = pdf.output()
747+
[
748+
[ "Orientation:", orientation ],
749+
[ "Paper:", paper_format ],
750+
[ "PDF Pages:", pdf.pages_count ],
751+
[ "PDF Size:", len( pdf_binary )],
752+
]
744753
#+END_SRC
745754

746755
#+RESULTS:
747756
:results:
748-
# Out[5]:
757+
# Out[20]:
758+
| 0 | 1 |
759+
|--------------+-----------|
760+
| Orientation: | landscape |
761+
| Paper: | Letter |
762+
| PDF Pages: | 1 |
763+
| PDF Size: | 12985 |
749764
:end:
750765

751766
#+LATEX: }
752767

753768
*** =slip39.write_pdfs=
754769

755770
#+LATEX: {\scriptsize
756-
| Key | Description |
757-
|-----------------+-----------------------------------------------------------------------------------------------------|
758-
| names | A sequence of Seed names, or a dict of { name: <details> } (from slip39.create) |
759-
| master_secret | A Seed secret (only appropriate if exactly one name supplied) |
760-
| passphrase | A SLIP-39 passphrase (not Trezor compatible; use "hidden wallet" phrase on device instead) |
761-
| group | A dict of {"<group>":(<required>, <members>), ...} |
762-
| group_threshold | How many groups are required to recover the Seed |
763-
| cryptocurrency | A sequence of [ "<crypto>", "<crypto>:<derivation>", ... ] w/ optional ranges |
764-
| edit | Derivation range(s) for each cryptocurrency, eg. "../0-4/-9" is 9 accounts first 5 change addresses |
765-
| card_format | Card size (eg. "credit"); False specifies no SLIP-39 cards (ie. only BIP-39 or JSON paper wallets) |
766-
| paper_format | Paper size (eg. "letter") |
767-
| filename | A filename; may contain "...{name}..." formatting, for name, date, time, crypto path and address |
768-
| json_pwd | If passphrase supplied, Ethereum JSON wallet files will be saved, and produced into PDF |
769-
| text | If True, outputs SLIP-39 phrases to stdout |
770-
| wallet_pwd | If passphrase supplied, produces encrypted BIP-38 or JSON paper wallets to PDF |
771-
| wallet_pwd_hint | An optional passphrase hint, printed on paper wallet |
772-
| wallet_format | Paper wallet size, (eg. "third"); the default is 1/3 letter size |
771+
| Key | Description |
772+
|-----------------+-------------------------------------------------------------------------------------------------------|
773+
| names | A sequence of Seed names, or a dict of { name: <details> } (from slip39.create) |
774+
| master_secret | A Seed secret (only appropriate if exactly one name supplied) |
775+
| passphrase | A SLIP-39 passphrase (not Trezor compatible; use "hidden wallet" phrase on device instead) |
776+
| group | A dict of {"<group>":(<required>, <members>), ...} |
777+
| group_threshold | How many groups are required to recover the Seed |
778+
| cryptocurrency | A sequence of [ "<crypto>", "<crypto>:<derivation>", ... ] w/ optional ranges |
779+
| edit | Derivation range(s) for each cryptocurrency, eg. "../0-4/-9" is 9 accounts first 5 change addresses |
780+
| card_format | Card size (eg. "credit"); False specifies no SLIP-39 cards (ie. only BIP-39 or JSON paper wallets) |
781+
| paper_format | Paper size (eg. "letter") |
782+
| filename | A filename; may contain "...{name}..." formatting, for name, date, time, crypto path and address |
783+
| filepath | A file path, if PDF output to file is desired; empty implies current dir. |
784+
| printer | A printer name (or True for default), if output to printer is desired |
785+
| json_pwd | If password supplied, encrypted Ethereum JSON wallet files will be saved, and produced into PDF |
786+
| text | If True, outputs SLIP-39 phrases to stdout |
787+
| wallet_pwd | If password supplied, produces encrypted BIP-38 or JSON Paper Wallets to PDF (preferred vs. json_pwd) |
788+
| wallet_pwd_hint | An optional passphrase hint, printed on paper wallet |
789+
| wallet_format | Paper wallet size, (eg. "third"); the default is 1/3 letter size |
773790
#+LATEX: }
774791

775792
For each of the names provided, produces a separate PDF containing all the SLIP-39 details and

‎README.pdf‎

2.65 KB
Binary file not shown.

0 commit comments

Comments
 (0)