Browse Source
Merge pull request #3757 from ken2812221/patch-1
Shows correct bech32 address on ledger
3.1
ThomasV
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
1 deletions
-
plugins/ledger/ledger.py
|
|
@ -463,8 +463,9 @@ class Ledger_KeyStore(Hardware_KeyStore): |
|
|
address_path = self.get_derivation()[2:] + "/%d/%d"%sequence |
|
|
address_path = self.get_derivation()[2:] + "/%d/%d"%sequence |
|
|
self.handler.show_message(_("Showing address ...")) |
|
|
self.handler.show_message(_("Showing address ...")) |
|
|
segwit = Transaction.is_segwit_inputtype(txin_type) |
|
|
segwit = Transaction.is_segwit_inputtype(txin_type) |
|
|
|
|
|
segwitNative = txin_type == 'p2wpkh' |
|
|
try: |
|
|
try: |
|
|
client.getWalletPublicKey(address_path, showOnScreen=True, segwit=segwit) |
|
|
client.getWalletPublicKey(address_path, showOnScreen=True, segwit=segwit, segwitNative=segwitNative) |
|
|
except BTChipException as e: |
|
|
except BTChipException as e: |
|
|
if e.sw == 0x6985: # cancelled by user |
|
|
if e.sw == 0x6985: # cancelled by user |
|
|
pass |
|
|
pass |
|
|
|
