Merge pull request #19 from tadeubas/develop_rc

Typos and bugfix
odudex · Aug 31, 2023 · 48fc765 · 48fc765
2 parents 94f0d7f + 75485e3
commit 48fc765
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 175 deletions.
diff --git a/docs/getting-started/using-a-single-sig-wallet.en.md b/docs/getting-started/using-a-single-sig-wallet.en.md
@@ -42,27 +42,27 @@ Selecting `single-sig` will derive an xpub using the derivation path `m/84'/0'/0
 
     Choose to create a *Single key wallet* when it asks which type of wallet you want on the following screen.
 
-    <img src="../../img/specter/select-wallet-type-screen-singlekey-400.png">
+    <img src="../../img/specter/select-wallet-type-screen-singlesig-400.png">
 
     Select the device you just added.
 
-    <img src="../../img/specter/pick-device-screen-singlekey-400.png">
+    <img src="../../img/specter/pick-device-screen-singlesig-400.png">
 
     Give your wallet a name and make sure to select *Segwit* for the wallet type, then press *Create wallet*.
 
-    <img src="../../img/specter/create-singlekey-wallet-screen-600.png">
+    <img src="../../img/specter/create-singlesig-wallet-screen-600.png">
 
     Congrats, you just created a single-sig wallet with your key!
 
 === "Sparrow"
 
     In Sparrow, create a new wallet by going to *File > New Wallet* and give it a name.
 
-    <img src="../../img/sparrow/new-singlekey-wallet-400.png">
+    <img src="../../img/sparrow/new-singlesig-wallet-400.png">
 
     On the wallet screen, make sure to select a *Single Signature* policy type with the *Native Segwit (P2WPKH)* script type.
 
-    <img src="../../img/sparrow/singlekey-wallet-settings-400.png">
+    <img src="../../img/sparrow/singlesig-wallet-settings-400.png">
 
     Now, you will need to import your public key. To do so, press the *Airgapped Hardware Wallet* button under *Keystores*. On the screen that pops up, Krux is not listed as one of the available device types, so look for the *Specter DIY* option and click its *Scan...* button.
 
@@ -75,7 +75,7 @@ Selecting `single-sig` will derive an xpub using the derivation path `m/84'/0'/0
 
     It should import the xpub and show a key under *Keystores* like the following:
 
-    <img src="../../img/sparrow/keystore-singlekey-key-settings-600.png">
+    <img src="../../img/sparrow/keystore-singlesig-key-settings-600.png">
 
     If everything looks right, click the blue *Apply* button to create your wallet.
 
@@ -102,7 +102,7 @@ Selecting `single-sig` will derive an xpub using the derivation path `m/84'/0'/0
 
     It should import the key and create a watch-only wallet. From here, you can send or receive.
 
-    <img src="../../img/blue/singlekey-wallet-home-400.png">
+    <img src="../../img/blue/singlesig-wallet-home-400.png">
 
     Congrats, you just created a single-sig wallet with your key!
 
@@ -146,11 +146,11 @@ Selecting `single-sig` will derive an xpub using the derivation path `m/84'/0'/0
 
     Load the wallet into Krux by tapping the ellipsis in the top-right to see the wallet settings.
 
-    <img src="../../img/blue/singlekey-wallet-home-400.png">
+    <img src="../../img/blue/singlesig-wallet-home-400.png">
 
     From here, tap *Export/Backup* in order to display a QR code of your wallet.
 
-    <img src="../../img/blue/export-singlekey-wallet-400.png">
+    <img src="../../img/blue/export-singlesig-wallet-400.png">
 
     In Krux, select the *Wallet* menu item option and scan the QR code.
 
@@ -174,7 +174,7 @@ Selecting `single-sig` will derive an xpub using the derivation path `m/84'/0'/0
 
     Navigate to the *Receive* screen where you should see a receive address that you can send funds to.
 
-    <img src="../../img/sparrow/singlekey-receive-address-600.png">
+    <img src="../../img/sparrow/singlesig-receive-address-600.png">
 
 === "BlueWallet"
 

diff --git a/src/krux/qr.py b/src/krux/qr.py
@@ -195,8 +195,11 @@ def parse_pmofn_qr_part(data):
 def detect_format(data):
     """Detects the QR format of the given data"""
     qr_format = FORMAT_NONE
-    if data.startswith("p") and data.index("of") <= 5:
-        qr_format = FORMAT_PMOFN
-    elif data.lower().startswith("ur:"):
-        qr_format = FORMAT_UR
+    try:
+        if data.startswith("p") and data.index("of") <= 5:
+            qr_format = FORMAT_PMOFN
+        elif data.lower().startswith("ur:"):
+            qr_format = FORMAT_UR
+    except:
+        pass
     return qr_format
diff --git a/tests/pages/test_addresses.py b/tests/pages/test_addresses.py
@@ -11,8 +11,8 @@ def test_scan_address(mocker, m5stickv, tdata):
     cases = [
         # Single-sig, loaded, owned address, No print prompt, search successful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "bc1qrhjqrz2d9tdym3p2r9m2vwzn2sn2yl6k5m357y",
             None,
@@ -21,8 +21,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, not loaded, owned address, No print prompt, search successful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             False,
             "bc1qrhjqrz2d9tdym3p2r9m2vwzn2sn2yl6k5m357y",
             None,
@@ -31,8 +31,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, owned address, Print, search successful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "bc1qrhjqrz2d9tdym3p2r9m2vwzn2sn2yl6k5m357y",
             MockPrinter(),
@@ -41,8 +41,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, owned address, Decline to print, search successful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "bc1qrhjqrz2d9tdym3p2r9m2vwzn2sn2yl6k5m357y",
             MockPrinter(),
@@ -91,8 +91,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned address, No print prompt, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "bc1q6y95p2qkcmsr7kp5zpnt04qx5l2slq73d9um62ka3s5nr83mlcfsywsn65",
             None,
@@ -111,8 +111,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/44 address, No print prompt, skip search
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "14ihRbmxbgZ6JN9HdDDo6u6nGradHDy4GJ",
             None,
@@ -121,8 +121,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/44 address, No print prompt, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "14ihRbmxbgZ6JN9HdDDo6u6nGradHDy4GJ",
             None,
@@ -131,8 +131,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/44 address, No print prompt, 2x search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "14ihRbmxbgZ6JN9HdDDo6u6nGradHDy4GJ",
             None,
@@ -141,8 +141,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/48/0/0/2 address, No print prompt, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "1BRwWQ3GHabCV5DP6MfnCpr6dF6GBAwQ7k",
             None,
@@ -151,8 +151,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/84 address, No print prompt, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "bc1qx2zuday8d6j4ufh4df6e9ttd06lnfmn2cuz0vn",
             None,
@@ -161,8 +161,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/49 address, No print prompt, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "32iCX1pY1iztdgM5qzurGLPMu5xhNfAUtg",
             None,
@@ -171,8 +171,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/0 address, No print prompt, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "3KLoUhwLihgC5aPQPFHakWUtJ4QoBkT7Aw",
             None,
@@ -181,8 +181,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/0 address, Print, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "3KLoUhwLihgC5aPQPFHakWUtJ4QoBkT7Aw",
             MockPrinter(),
@@ -191,8 +191,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, unowned m/0 address, Decline to print, search unsuccessful
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "3KLoUhwLihgC5aPQPFHakWUtJ4QoBkT7Aw",
             MockPrinter(),
@@ -201,8 +201,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, fail to capture QR of address, No print prompt, can't search
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             None,
             None,
@@ -211,8 +211,8 @@ def test_scan_address(mocker, m5stickv, tdata):
         ),
         # Single-sig, loaded, invalid address, No print prompt, can't search
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             True,
             "invalidaddress",
             None,
@@ -258,8 +258,8 @@ def test_list_receive_addresses(mocker, m5stickv, tdata):
     cases = [
         # Single-sig, loaded, No print prompt, show address nº1
         (
-            tdata.SINGLEKEY_12_WORD_KEY,
-            tdata.SPECTER_SINGLEKEY_WALLET_DATA,
+            tdata.SINGLESIG_12_WORD_KEY,
+            tdata.SPECTER_SINGLESIG_WALLET_DATA,
             False,
             "bc1qrhjqrz2d9tdym3p2r9m2vwzn2sn2yl6k5m357y",
             None,