Skip to content

Commit 0df2e8d

Browse files
pjkundertpjkundert
committed
Simplify layout, work toward direct printing
1 parent 9d13997 commit 0df2e8d

21 files changed

+747
-117
lines changed

‎GNUmakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test:
6060

6161
analyze:
6262
flake8 -j 1 --max-line-length=200 \
63-
--ignore=W503,E201,E202,E221,E223,E226,E231,E241,E242,E251,E265,E272,E274 \
63+
--ignore=W503,E201,E202,E127,E221,E223,E226,E231,E241,E242,E251,E265,E272,E274 \
6464
slip39
6565

6666
pylint:

‎SLIP-39-macOS.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ coll = COLLECT(exe,
5050
app = BUNDLE(coll,
5151
name='SLIP-39.app',
5252
icon='images/SLIP-39.icns',
53-
version='7.3.0',
53+
version='7.4.0',
5454
info_plist={
55-
'CFBundleVersion':'7.3.0',
55+
'CFBundleVersion':'7.4.0',
5656
'CFBundlePackageType':'APPL',
5757
'LSApplicationCategoryType':'public.app-category.finance',
5858
'LSMinimumSystemVersion':'10.15.0',

‎setup.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@
4747
}
4848

4949
package_data = {
50-
'slip39': [ 'layout/*.png' ],
50+
'slip39': [
51+
'layout/*.png',
52+
'gui/*.txt'
53+
],
5154
}
5255

5356
long_description_content_type = 'text/markdown'

‎slip39/defaults.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@
8282
Photo = (int( 4 * MM_IN ), int( 6 * MM_IN )),
8383
)
8484

85+
# The available GUI controls Layout Options
86+
LAYOUT = 'Basic'
87+
LAYOUT_OPTIONS = [
88+
'Basic',
89+
'Extra',
90+
'Pro',
91+
]
92+
8593
BITS = (128, 256, 512)
8694
BITS_DEFAULT = 128
8795

‎slip39/gui/SLIP-39-CRYPTO.org‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#+title: Cryptocurrencies
2+
#+OPTIONS: toc:nil title:nil author:nil
3+
4+
#+BEGIN_ABSTRACT
5+
Cryptocurrencies Wallet addresses to display, and Paper Wallets to produce (if password supplied).
6+
7+
On each SLIP-39 card, up to 2 Wallet addresses and QR codes will be displayed, for information
8+
purposes only, to illustrate *which* Wallets are derived from this Seed. The cryptocurrencies
9+
supported, and the standard BIP-44 derivation paths (Trezor compatible) displayed are:
10+
11+
| BTC | m/84'/0'/0'/0/0 (Bech32) |
12+
| ETH | m/44'/60'/0'/0/0 |
13+
| LTC | m/44'/2'/0'/0/0 |
14+
| DOGE | m/44'/3'/0'/0/0 |
15+
#+END_ABSTRACT

‎slip39/gui/SLIP-39-CRYPTO.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Cryptocurrencies Wallet addresses to display, and Paper Wallets to
2+
produce (if password supplied).
3+
4+
On each SLIP-39 card, up to 2 Wallet addresses and QR codes will be
5+
displayed, for information purposes only, to illustrate *which* Wallets
6+
are derived from this Seed. The cryptocurrencies supported, and the
7+
standard BIP-44 derivation paths (Trezor compatible) displayed are:
8+
9+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
10+
BTC m/84'/0'/0'/0/0 (Bech32)
11+
ETH m/44'/60'/0'/0/0
12+
LTC m/44'/2'/0'/0/0
13+
DOGE m/44'/3'/0'/0/0
14+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

‎slip39/gui/SLIP-39-G-NAME.org‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#+title: SLIP-39 Group Names
2+
#+OPTIONS: toc:nil title:nil author:nil
3+
4+
#+BEGIN_ABSTRACT
5+
Name each Group according to "who" or "where" you plan to distribute it.
6+
7+
The default Group names and their intended usages are:
8+
9+
| First | A 1-card group stored in the First safe place |
10+
| Second | A 1-card group stored in the First safe place |
11+
| Fam | A smaller group of Family members |
12+
| Fren | A larger group of Friends; increase Needed |
13+
14+
#+END_ABSTRACT
15+
16+
* 1-Card Groups
17+
18+
Useful for the direct owners of the Seed. Just one Card for these groups must be collected;
19+
ensure that 2+ of these Groups are created, and a "Requires recovery" threshold of least 2 is
20+
specified.
21+
22+
If /less than/ the threshold amount of these cards is found by an attacker, the Seed /cannot/ be
23+
recovered (unless other Groups are also recovered).
24+
25+
* Multi-Card Groups
26+
27+
If you have a group of people (or places) that may be lost or destroyed, or where some Mnemonics
28+
(cards) may be found and fall into hostile hands, use a multi-card group.
29+
30+
** Hostile Groups
31+
32+
The more /hostile/ (untrustworthy) the group (ie. the more likely that any card(s) may be stolen
33+
by an attacker) -- make the Group's Needed/#-in-Group ratio larger. Then, the attacker must
34+
collect more cards to defeat the Group.
35+
36+
** Fragile Groups
37+
38+
The more /fragile/ (unreliable) the group (ie. the more likely that any card(s) may be lost or
39+
destroyed) -- make the Group's Needed/#-in-Group ratio smaller. Thus, more cards may be
40+
lost/destroyed before the Group can no longer be recovered (an *other* Group(s) must be
41+
colledted, instead, to recover the Seed).

‎slip39/gui/SLIP-39-G-NAME.txt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Name each Group according to "who" or "where" you plan to distribute it.
2+
3+
The default Group names and their intended usages are:
4+
5+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
6+
First A 1-card group stored in the First safe place
7+
Second A 1-card group stored in the First safe place
8+
Fam A smaller group of Family members
9+
Fren A larger group of Friends; increase Needed
10+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
11+
12+
13+
1 1-Card Groups
14+
═══════════════
15+
16+
Useful for the direct owners of the Seed. Just one Card for these
17+
groups must be collected; ensure that 2+ of these Groups are created,
18+
and a "Requires recovery" threshold of least 2 is specified.
19+
20+
If /less than/ the threshold amount of these cards is found by an
21+
attacker, the Seed /cannot/ be recovered (unless other Groups are also
22+
recovered).
23+
24+
25+
2 Multi-Card Groups
26+
═══════════════════
27+
28+
If you have a group of people (or places) that may be lost or
29+
destroyed, or where some Mnemonics (cards) may be found and fall into
30+
hostile hands, use a multi-card group.
31+
32+
33+
2.1 Hostile Groups
34+
──────────────────
35+
36+
The more /hostile/ (untrustworthy) the group (ie. the more likely that
37+
any card(s) may be stolen by an attacker) – make the Group's
38+
Needed/#-in-Group ratio larger. Then, the attacker must collect more
39+
cards to defeat the Group.
40+
41+
42+
2.2 Fragile Groups
43+
──────────────────
44+
45+
The more /fragile/ (unreliable) the group (ie. the more likely that
46+
any card(s) may be lost or destroyed) – make the Group's
47+
Needed/#-in-Group ratio smaller. Thus, more cards may be
48+
lost/destroyed before the Group can no longer be recovered (an *other*
49+
Group(s) must be colledted, instead, to recover the Seed).

‎slip39/gui/SLIP-39-G.org‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#+title: SLIP-39 Group Needed/#-in-Group
2+
#+OPTIONS: toc:nil title:nil author:nil
3+
4+
#+BEGIN_ABSTRACT
5+
Increase "# in Group" as your target group locations or members grows.
6+
7+
Increase "# Needed", the more Hostile/Untrustorthy the Group is.
8+
9+
Decrease "# Needed", the less Fragile/Unreliable the Group is.
10+
11+
#+END_ABSTRACT
12+
13+
* 1-Card Groups
14+
15+
Useful for the direct owners of the Seed. Just one Card for these groups must be collected;
16+
ensure that 2+ of these Groups are created, and a "Requires recovery" threshold of least 2 is
17+
specified.
18+
19+
If /less than/ the threshold amount of these cards is found by an attacker, the Seed /cannot/ be
20+
recovered (unless other Groups are also recovered).
21+
22+
* Multi-Card Groups
23+
24+
If you have a group of people (or places) that may be lost or destroyed, or where some Mnemonics
25+
(cards) may be found and fall into hostile hands, use a multi-card group.
26+
27+
** Hostile Groups
28+
29+
The more /hostile/ (untrustworthy) the group (ie. the more likely that any card(s) may be stolen
30+
by an attacker) -- make the Group's Needed/#-in-Group ratio larger. Then, the attacker must
31+
collect more cards to defeat the Group.
32+
33+
** Fragile Groups
34+
35+
The more /fragile/ (unreliable) the group (ie. the more likely that any card(s) may be lost or
36+
destroyed) -- make the Group's Needed/#-in-Group ratio smaller. Thus, more cards may be
37+
lost/destroyed before the Group can no longer be recovered (an *other* Group(s) must be
38+
colledted, instead, to recover the Seed).

‎slip39/gui/SLIP-39-G.txt‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Increase "# in Group" as your target group locations or members grows.
2+
3+
Increase "# Needed", the more Hostile/Untrustorthy the Group is.
4+
5+
Decrease "# Needed", the less Fragile/Unreliable the Group is.
6+
7+
8+
1 1-Card Groups
9+
═══════════════
10+
11+
Useful for the direct owners of the Seed. Just one Card for these
12+
groups must be collected; ensure that 2+ of these Groups are created,
13+
and a "Requires recovery" threshold of least 2 is specified.
14+
15+
If /less than/ the threshold amount of these cards is found by an
16+
attacker, the Seed /cannot/ be recovered (unless other Groups are also
17+
recovered).
18+
19+
20+
2 Multi-Card Groups
21+
═══════════════════
22+
23+
If you have a group of people (or places) that may be lost or
24+
destroyed, or where some Mnemonics (cards) may be found and fall into
25+
hostile hands, use a multi-card group.
26+
27+
28+
2.1 Hostile Groups
29+
──────────────────
30+
31+
The more /hostile/ (untrustworthy) the group (ie. the more likely that
32+
any card(s) may be stolen by an attacker) – make the Group's
33+
Needed/#-in-Group ratio larger. Then, the attacker must collect more
34+
cards to defeat the Group.
35+
36+
37+
2.2 Fragile Groups
38+
──────────────────
39+
40+
The more /fragile/ (unreliable) the group (ie. the more likely that
41+
any card(s) may be lost or destroyed) – make the Group's
42+
Needed/#-in-Group ratio smaller. Thus, more cards may be
43+
lost/destroyed before the Group can no longer be recovered (an *other*
44+
Group(s) must be colledted, instead, to recover the Seed).

0 commit comments

Comments
 (0)