Merge pull request #227 from kdmukai/bump_embit_0_5_0

Bump `embit` to v0.5.0
This commit is contained in:
Nick Klockenga
2022-08-05 10:55:47 -04:00
committed by GitHub
3 changed files with 36 additions and 55 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
embit @ git+https://github.com/seedsigner/embit.git@03cba13e0add64b241972c67e2aa970cb2e3a5d2
embit==0.5.0
numpy==1.21.1
picamera==1.13
Pillow==8.2.0
-6
View File
@@ -472,15 +472,9 @@ class PSBTFinalizeView(View):
if selected_menu_num == 0:
# Sign PSBT
loading_screen = LoadingScreenThread(text="Signing PSBT...")
loading_screen.start()
try:
sig_cnt = PSBTParser.sig_count(psbt)
psbt.sign_with(psbt_parser.root)
trimmed_psbt = PSBTParser.trim(psbt)
finally:
loading_screen.stop()
if sig_cnt == PSBTParser.sig_count(trimmed_psbt):
# Signing failed / didn't do anything
+3 -16
View File
@@ -643,11 +643,6 @@ class SeedExportXpubDetailsView(View):
def run(self):
# The calc_derivation takes a few moments. Run the loading screen while we wait.
self.loading_screen = LoadingScreenThread(text="Generating xpub...")
self.loading_screen.start()
try:
if self.script_type == SettingsConstants.CUSTOM_DERIVATION:
derivation_path = self.custom_derivation
else:
@@ -675,30 +670,22 @@ class SeedExportXpubDetailsView(View):
xpub = xprv.to_public()
xpub_base58 = xpub.to_string(version=version)
screen = seed_screens.SeedExportXpubDetailsScreen(
selected_menu_num = seed_screens.SeedExportXpubDetailsScreen(
fingerprint=fingerprint,
has_passphrase=self.seed.passphrase is not None,
derivation_path=derivation_path,
xpub=xpub_base58,
)
self.loading_screen.stop()
selected_menu_num = screen.display()
).display()
else:
selected_menu_num = 0
finally:
self.loading_screen.stop()
if selected_menu_num == 0:
return Destination(
SeedExportXpubQRDisplayView,
{
"seed_num": self.seed_num,
"sig_type": self.sig_type,
"script_type": self.script_type,
"coordinator": self.coordinator,
"derivation_path": derivation_path,
}
@@ -710,7 +697,7 @@ class SeedExportXpubDetailsView(View):
class SeedExportXpubQRDisplayView(View):
def __init__(self, seed_num: int, sig_type: str, script_type: str, coordinator: str, derivation_path: str):
def __init__(self, seed_num: int, coordinator: str, derivation_path: str):
super().__init__()
self.seed = self.controller.get_seed(seed_num)