From d094de9854898db4b3872a4516c62f6275449f4e Mon Sep 17 00:00:00 2001 From: Nick Klockenga Date: Sat, 22 Jan 2022 17:07:19 -0500 Subject: [PATCH] update --- src/seedsigner/models/encode_qr.py | 5 +++-- src/seedsigner/models/qr_type.py | 1 + src/seedsigner/models/settings.py | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/seedsigner/models/encode_qr.py b/src/seedsigner/models/encode_qr.py index 788efd8b..9f06ac04 100644 --- a/src/seedsigner/models/encode_qr.py +++ b/src/seedsigner/models/encode_qr.py @@ -66,8 +66,10 @@ class EncodeQR: self.encoder = UREncodePSBTQR(self.psbt, self.qr_density) elif self.qr_type == QRType.SEEDSSQR: self.encoder = SeedSSQR(self.seed_phrase, self.wordlist) - elif self.qr_type == QRType.XPUBQR: + elif self.qr_type == QRType.URXPUBQR: self.encoder = URXPubQR(self.seed_phrase, self.passphrase, self.derivation, self.network, self.qr_density, self.wordlist) + elif self.qr_type == QRType.XPUBQR: + self.encoder = XPubQR(self.seed_phrase, self.passphrase, self.derivation, self.network, self.wordlist) elif self.qr_type == QRType.SPECTERXPUBQR: self.encoder = SpecterXPubQR(self.seed_phrase, self.passphrase, self.derivation, self.network, self.qr_density, self.wordlist) else: @@ -229,7 +231,6 @@ class XPubQR: raise Exception('Wordlist Required') version = bip32.detect_version(self.derivation, default="xpub", network=NETWORKS[network]) - print(self.derivation) self.seed = Seed(mnemonic=self.seed_phrase, passphrase=self.passphrase, wordlist=self.wordlist) self.root = bip32.HDKey.from_seed(self.seed.seed, version=NETWORKS[network]["xprv"]) self.fingerprint = self.root.child(0).fingerprint diff --git a/src/seedsigner/models/qr_type.py b/src/seedsigner/models/qr_type.py index 984e5d4c..a963d737 100644 --- a/src/seedsigner/models/qr_type.py +++ b/src/seedsigner/models/qr_type.py @@ -17,6 +17,7 @@ class QRType(IntEnum): SEED4LETTERMNEMONIC = 9 XPUBQR = 20 SPECTERXPUBQR = 21 + URXPUBQR = 22 BITCOINADDRESSQR = 30 SPECTERWALLETQR = 40 URWALLETQR = 41 diff --git a/src/seedsigner/models/settings.py b/src/seedsigner/models/settings.py index 586f3040..26c80bec 100644 --- a/src/seedsigner/models/settings.py +++ b/src/seedsigner/models/settings.py @@ -203,8 +203,10 @@ class Settings(Singleton): def getXPubType(software): if software == "Specter Desktop": return QRType.SPECTERXPUBQR - else: + elif software == "Blue Wallet": return QRType.XPUBQR + else: + return QRType.URXPUBQR @property def qr_density_name(self):