diff --git a/docs/12_word_seed.pdf b/docs/12_word_seed.pdf deleted file mode 100644 index 9d42e600..00000000 Binary files a/docs/12_word_seed.pdf and /dev/null differ diff --git a/docs/24_word_seed.pdf b/docs/24_word_seed.pdf deleted file mode 100644 index a68a70ab..00000000 Binary files a/docs/24_word_seed.pdf and /dev/null differ diff --git a/docs/qr_code_template_21x21.html b/docs/qr_code_template_21x21.html deleted file mode 100644 index 61846116..00000000 --- a/docs/qr_code_template_21x21.html +++ /dev/null @@ -1,593 +0,0 @@ - - - - - - - - - - - -
-
- 1: ____________________________ -
-
- 2: ____________________________ -
-
- 3: ____________________________ -
-
- 4: ____________________________ -
-
- 5: ____________________________ -
-
- 6: ____________________________ -
-
- 7: ____________________________ -
-
- 8: ____________________________ -
-
- 9: ____________________________ -
-
- 10: ____________________________ -
-
- 11: ____________________________ -
-
- 12: ____________________________ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
12345
A·····················
·····················
·····················
·····················
·····················
B·····················
·····················
·····················
·····················
·····················
C·····················
·····················
·····················
·····················
·····················
D·····················
·····················
·····················
·····················
·····················
E·····················
- - \ No newline at end of file diff --git a/docs/qr_code_template_25x25.html b/docs/qr_code_template_25x25.html deleted file mode 100644 index e409f305..00000000 --- a/docs/qr_code_template_25x25.html +++ /dev/null @@ -1,725 +0,0 @@ - - - - - - - - - - - -
-
- 1: ____________________________ -
-
- 2: ____________________________ -
-
- 3: ____________________________ -
-
- 4: ____________________________ -
-
- 5: ____________________________ -
-
- 6: ____________________________ -
-
- 7: ____________________________ -
-
- 8: ____________________________ -
-
- 9: ____________________________ -
-
- 10: ____________________________ -
-
- 11: ____________________________ -
-
- 12: ____________________________ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
12345
A·························
·························
·························
·························
·························
B·························
·························
·························
·························
·························
C·························
·························
·························
·························
·························
D·························
·························
·························
·························
·························
E·························
·························
·························
·························
·························
- - \ No newline at end of file diff --git a/docs/qr_code_template_29x29.html b/docs/qr_code_template_29x29.html deleted file mode 100644 index 9fdacebd..00000000 --- a/docs/qr_code_template_29x29.html +++ /dev/null @@ -1,812 +0,0 @@ - - - - - - - - - - - - -
-
- 1: ____________________________ -
-
- 2: ____________________________ -
-
- 3: ____________________________ -
-
- 4: ____________________________ -
-
- 5: ____________________________ -
-
- 6: ____________________________ -
-
- 7: ____________________________ -
-
- 8: ____________________________ -
-
- 9: ____________________________ -
-
- 10: ____________________________ -
-
- 11: ____________________________ -
-
- 12: ____________________________ -
- - 		-
- 13: ____________________________ -
-
- 14: ____________________________ -
-
- 15: ____________________________ -
-
- 16: ____________________________ -
-
- 17: ____________________________ -
-
- 18: ____________________________ -
-
- 19: ____________________________ -
-
- 20: ____________________________ -
-
- 21: ____________________________ -
-
- 22: ____________________________ -
-
- 23: ____________________________ -
-
- 24: ____________________________ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
123456
A·····························
·····························
·····························
·····························
·····························
B·····························
·····························
·····························
·····························
·····························
C·····························
·····························
·····························
·····························
·····························
D·····························
·····························
·····························
·····························
·····························
E·····························
·····························
·····························
·····························
·····························
F·····························
·····························
·····························
·····························
- - \ No newline at end of file diff --git a/docs/qr_formats.md b/docs/qr_formats.md index ecdb930e..b0fd4224 100644 --- a/docs/qr_formats.md +++ b/docs/qr_formats.md @@ -14,8 +14,10 @@ Static QR Formats: - PSBT - Base64 (if the PSBT byte size is too large, SS may have trouble scanning) - Seed - - SeedSigner Seed QR format - - A 48 or 96 length string of numbers representing a bip39 wordlist (all wordlist languages supported). The numeric sequence is a concatination of four-digit zero padded segments. Each four-digit segment represents a bip39 word expressed by a zero-indexed position in the wordlist. For example "0000" is abandon in the english bip39 wordlist. + - [SeedSigner SeedQR](seed_qr/README.md) format + - A 48 or 96 length string of numbers representing a bip39 wordlist (all wordlist languages supported). The numeric sequence is a concatenation of four-digit, zero-padded segments. Each four-digit segment represents a bip39 word expressed by a zero-indexed position in the wordlist. For example "0000" is abandon in the english bip39 wordlist. + - [SeedSigner CompactSeedQR](seed_qr/README.md) format + - The 128- or 256-bit entropy encoded as a binary QR. - English Bip39 Mnemonic words separated by a space. Currently only supports 12 and 24 word seeds. - English Bip39 Mnemonic with only first 4 letters seperated by a space. Currently only supports 12 and 24 word seeds. diff --git a/docs/seed_qr/printable_templates/12words_seedqr_template.pdf b/docs/seed_qr/printable_templates/12words_seedqr_template.pdf new file mode 100644 index 00000000..4e6d1ab4 Binary files /dev/null and b/docs/seed_qr/printable_templates/12words_seedqr_template.pdf differ diff --git a/docs/seed_qr/printable_templates/24words_seedqr_template.pdf b/docs/seed_qr/printable_templates/24words_seedqr_template.pdf new file mode 100644 index 00000000..f1e2fa34 Binary files /dev/null and b/docs/seed_qr/printable_templates/24words_seedqr_template.pdf differ diff --git a/docs/Seed_QR_Card.pdf b/docs/seed_qr/printable_templates/Seed_QR_Card.pdf similarity index 100% rename from docs/Seed_QR_Card.pdf rename to docs/seed_qr/printable_templates/Seed_QR_Card.pdf diff --git a/docs/seed_qr/printable_templates/compact_seedqr/12words_compactseedqr_template.pdf b/docs/seed_qr/printable_templates/compact_seedqr/12words_compactseedqr_template.pdf new file mode 100644 index 00000000..173fbeb2 Binary files /dev/null and b/docs/seed_qr/printable_templates/compact_seedqr/12words_compactseedqr_template.pdf differ diff --git a/docs/seed_qr/printable_templates/compact_seedqr/24words_compactseedqr_template.pdf b/docs/seed_qr/printable_templates/compact_seedqr/24words_compactseedqr_template.pdf new file mode 100644 index 00000000..e218b08c Binary files /dev/null and b/docs/seed_qr/printable_templates/compact_seedqr/24words_compactseedqr_template.pdf differ diff --git a/docs/qr_code_template.py b/docs/seed_qr/qr_code_template.py similarity index 72% rename from docs/qr_code_template.py rename to docs/seed_qr/qr_code_template.py index 14bf1172..6c68e3df 100644 --- a/docs/qr_code_template.py +++ b/docs/seed_qr/qr_code_template.py @@ -1,11 +1,9 @@ import math -def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): - if qr_size == 29: - num_words = 24 +def generate_qr_template(qr_size, num_words=24, block_size=5, show_timing_marks=False): + if num_words == 24: word_cols = 2 else: - num_words = 12 word_cols = 1 html = """ @@ -29,12 +27,10 @@ def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): table { margin-top: 1em; border-collapse: collapse; - border: 1px solid black; } td { padding: 0; margin: 0; - # border: 1px dotted #c8c8c8; width: 12px; height: 12px; } @@ -42,17 +38,17 @@ def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): text-align: center; font-size: 0.35em; color: black; - width: 9px; + width: 13px; height: 9px; } .qr_table { - margin-top: 5em; - margin-right: 4em; - float: right; + margin-left: 4em; + display: inline-block; } .filled { background-color: black; - border: 1px solid black; + border: none; + color: #ccc; } .col_name, .row_name { text-align: center; @@ -60,13 +56,19 @@ def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): color: #aaa; } .col_name { + border-top: 1px solid #bbb; border-bottom: 1px solid #bbb; height: 2em; } .row_name { border-right: 1px solid #bbb; + border-left: 1px solid #bbb; width: 2em; } + .first_td { + border-top: 1px solid #bbb; + border-left: 1px solid #bbb; + } .col_block_divider { border-right: 1px solid #bbb; } @@ -74,10 +76,11 @@ def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): border-bottom: 1px solid #bbb; } .no_border { - border: none; + border: none !important; } .word_list_table { + border: 1px solid #aaa; """ if num_words == 12: @@ -130,7 +133,7 @@ def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): y_names = "A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,X,Y,Z" html += """""" - html += f"""""" + html += f"""""" for j in range(0, math.ceil(qr_size/block_size)): html += f"""""" html += "" @@ -140,35 +143,44 @@ def generate_qr_template(qr_size, block_size=5, show_timing_marks=False): if i % block_size == 0: html += f"""""" for j in range(0, qr_size): - html += f"""""" + html += f"""""" html += """\n""" html += "
{j + 1}
{y_names.split(",")[int(i / block_size)]}··
" html += "