AaronFiore/electrum
1
0
Fork 0
Code Activity

hardware wallets: pass xtype to get_xpub

Browse Source
This commit is contained in:
ThomasV
2017-10-31 11:45:25 +01:00
parent 1ecfcea8dc
commit f36024e216
8 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/digitalbitbox/digitalbitbox.py
View File

@@ -84,7 +84,8 @@ class DigitalBitbox_Client():
return self.hid_send_encrypt(b'{"xpub": "%s"}' % bip32_path.encode('utf8'))
def get_xpub(self, bip32_path):
def get_xpub(self, bip32_path, xtype):
assert xpub == 'standard'
reply = self._get_xpub(bip32_path)
if reply:
return reply['xpub']
@@ -646,7 +647,7 @@ class DigitalBitboxPlugin(HW_PluginBase):
client = devmgr.client_by_id(device_id)
client.handler = self.create_handler(wizard)
client.setupRunning = True
client.get_xpub("m/44'/0'")
client.get_xpub("m/44'/0'", 'standard')
def is_mobile_paired(self):
@@ -667,12 +668,12 @@ class DigitalBitboxPlugin(HW_PluginBase):
self.handler.show_error(str(e))
def get_xpub(self, device_id, derivation, wizard):
def get_xpub(self, device_id, derivation, xtype, wizard):
devmgr = self.device_manager()
client = devmgr.client_by_id(device_id)
client.handler = self.create_handler(wizard)
client.check_device_dialog()
xpub = client.get_xpub(derivation)
xpub = client.get_xpub(derivation, xtype)
return xpub