AaronFiore/electrum
1
0
Fork 0
Code Activity

fix xtype of ypub keys in plugins and bip39 seeds

Browse Source
This commit is contained in:
ThomasV
2017-10-26 17:24:50 +02:00
parent 0af700bda0
commit a10e6b6436
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ledger/ledger.py
View File

@@ -65,7 +65,7 @@ class Ledger_Client():
elif bip32_path.startswith("m/49'/"):
if not self.supports_segwit():
raise Exception("Firmware version too old for Segwit support. Please update at https://www.ledgerwallet.com")
xtype = 'segwit_p2sh'
xtype = 'p2wpkh-p2sh'
else:
xtype = 'standard'
splitPath = bip32_path.split('/')

2
plugins/trezor/clientbase.py
View File

@@ -151,7 +151,7 @@ class TrezorClientBase(GuiMixin, PrintError):
address_n = self.expand_path(bip32_path)
creating = False #self.next_account_number() == 0
node = self.get_public_node(address_n, creating).node
xtype = 'segwit_p2sh' if bip32_path.startswith("m/49'/") else 'standard'
xtype = 'p2wpkh-p2sh' if bip32_path.startswith("m/49'/") else 'standard'
return serialize_xpub(xtype, node.chain_code, node.public_key, node.depth, self.i4b(node.fingerprint), self.i4b(node.child_num))
#def address_from_derivation(self, derivation):