Merge pull request #3757 from ken2812221/patch-1

Shows correct bech32 address on ledger
This commit is contained in:
ThomasV 2018-01-25 15:50:42 +01:00 committed by GitHub
commit 78338c74eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -463,8 +463,9 @@ class Ledger_KeyStore(Hardware_KeyStore):
address_path = self.get_derivation()[2:] + "/%d/%d"%sequence
self.handler.show_message(_("Showing address ..."))
segwit = Transaction.is_segwit_inputtype(txin_type)
segwitNative = txin_type == 'p2wpkh'
try:
client.getWalletPublicKey(address_path, showOnScreen=True, segwit=segwit)
client.getWalletPublicKey(address_path, showOnScreen=True, segwit=segwit, segwitNative=segwitNative)
except BTChipException as e:
if e.sw == 0x6985: # cancelled by user
pass