Merge pull request SeedSigner#610 from fedebuyito/resolves_issue_582

Update encode_qr.py - Fixes SeedSigner#582
alvroble · Dec 24, 2024 · 9bfb7b2 · 9bfb7b2
2 parents c2ccb61 + 0496eea
commit 9bfb7b2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/seedsigner/models/encode_qr.py b/src/seedsigner/models/encode_qr.py
@@ -15,7 +15,7 @@
 from seedsigner.models.settings import SettingsConstants
 
 from urtypes.crypto import PSBT as UR_PSBT
-from urtypes.crypto import Account, HDKey, Output, Keypath, PathComponent, SCRIPT_EXPRESSION_TAG_MAP
+from urtypes.crypto import Account, HDKey, Output, Keypath, PathComponent, SCRIPT_EXPRESSION_TAG_MAP, CoinInfo
 
 
 
@@ -344,11 +344,13 @@ def derivation_to_keypath(path: str) -> list:
             return Keypath(arr, self.root.my_fingerprint, len(arr))
 
         origin = derivation_to_keypath(self.derivation)
+        self.use_info = None if self.network == SettingsConstants.MAINNET else CoinInfo(type=None, network=1)
 
         self.ur_hdkey = HDKey({ 'key': self.xpub.key.serialize(),
         'chain_code': self.xpub.chain_code,
         'origin': origin,
-        'parent_fingerprint': self.xpub.fingerprint})
+        'parent_fingerprint': self.xpub.fingerprint,
+        'use_info': self.use_info })
 
         ur_outputs = []
 

diff --git a/tests/test_encodepsbtqr.py b/tests/test_encodepsbtqr.py
@@ -68,12 +68,26 @@ def test_ur_xpub_qr():
 
     e = UrXpubQrEncoder(
         seed=Seed(mnemonic.split(), passphrase="pass"),
-        network=SettingsConstants.TESTNET,
+        network=SettingsConstants.MAINNET,
         derivation="m/48h/1h/0h/2h",
         qr_density=SettingsConstants.DENSITY__MEDIUM
     )
-    
+
     assert e.next_part() == "UR:CRYPTO-ACCOUNT/1-4/LPADAACSKPCYMOMNLGRYHDCKOEADCYSSMECPONAOLYTAADMETAADDLOXAXHDCLAOKSRLNLKPUEGYATHPMNSNIYMUECBY"
     assert e.next_part() == "UR:CRYPTO-ACCOUNT/2-4/LPAOAACSKPCYMOMNLGRYHDCKKKGHZMLUZORPVDGUOTECSTTKTOLPCWPTNTLKZTTIZTBEAAHDCXVDTPMYRSTDMOPSCXFZ"
     assert e.next_part() == "UR:CRYPTO-ACCOUNT/3-4/LPAXAACSKPCYMOMNLGRYHDCKSPZSBZSPGERLGDATUYNLPYBTGYIYYKBTWTAOSWKSVTSGCHBYDKYAVDAMTAADMONDGDFD"
-    assert e.next_part() == "UR:CRYPTO-ACCOUNT/4-4/LPAAAACSKPCYMOMNLGRYHDCKDYOTADLOCSDYYKADYKAEYKAOYKAOCYSSMECPONAXAAAYCYIOREKKJKAEAEAEWZWDMYON"
+    assert e.next_part() == "UR:CRYPTO-ACCOUNT/4-4/LPAAAACSKPCYMOMNLGRYHDCKDYOTADLOCSDYYKADYKAEYKAOYKAOCYSSMECPONAXAAAYCYIOREKKJKAEAEAEWZWDMYON"    
+
+
+    e = UrXpubQrEncoder(
+        seed=Seed(mnemonic.split(), passphrase="pass"),
+        network=SettingsConstants.TESTNET,
+        derivation="m/48h/1h/0h/2h",
+        qr_density=SettingsConstants.DENSITY__MEDIUM
+    )
+
+    assert e.next_part() == "UR:CRYPTO-ACCOUNT/1-5/LPADAHCSKECYRTPEDKMOHDCFOEADCYSSMECPONAOLYTAADMETAADDLONAXHDCLAOKSRLNLKPUENSAHBTHS"
+    assert e.next_part() == "UR:CRYPTO-ACCOUNT/2-5/LPAOAHCSKECYRTPEDKMOHDCFGYATHPMNSNKKGHZMLUZORPVDGUOTECSTTKTOLPCWPTNTLKZTTIZTNDJSCF"
+    assert e.next_part() == "UR:CRYPTO-ACCOUNT/3-5/LPAXAHCSKECYRTPEDKMOHDCFZTBEAAHDCXVDTPMYRSTDSPZSBZSPGERLGDATUYNLPYBTGYIYYKBDFGWPKE"
+    assert e.next_part() == "UR:CRYPTO-ACCOUNT/4-5/LPAAAHCSKECYRTPEDKMOHDCFBTWTAOSWKSVTSGCHBYDKYAVDAHTAADEHOYAOADAMTAADDYOTADGYBKBWFE"
+    assert e.next_part() == "UR:CRYPTO-ACCOUNT/5-5/LPAHAHCSKECYRTPEDKMOHDCFLOCSDYYKADYKAEYKAOYKAOCYSSMECPONAXAAAYCYIOREKKJKAETODLFYWP"