tMerge pull request #1044 from LedgerHQ/ledger - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5ee4a87f29bfa1d5e9a24affd6fcacdb2dc95ce5
DIR parent b701ca185cbdadd3d4753535e5460a777366ce01
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Mon, 23 Feb 2015 17:10:44 +0100
Merge pull request #1044 from LedgerHQ/ledger
New firmware integration
Diffstat:
M plugins/btchipwallet.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
DIR diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
t@@ -158,7 +158,7 @@ class BTChipWallet(BIP32_HD_Wallet):
d.setWaitImpl(DongleWaitQT(d))
self.client = btchip(d)
firmware = self.client.getFirmwareVersion()['version'].split(".")
- if (not checkFirmware(firmware)) or (int(firmware[0]) <> 1) or (int(firmware[1]) <> 4) or (int(firmware[2]) < 9):
+ if not checkFirmware(firmware):
d.close()
try:
updateFirmware()
t@@ -307,11 +307,13 @@ class BTChipWallet(BIP32_HD_Wallet):
self.device_checked = False
self.get_client(True)
signature = self.get_client().signMessageSign(pin)
- except Exception, e:
+ except BTChipException, e:
if e.sw == 0x6a80:
self.give_error("Unfortunately, this message cannot be signed by BTChip. Only alphanumerical messages shorter than 140 characters are supported. Please remove any extra characters (tab, carriage return) and retry.")
else:
- self.give_error(e, True)
+ self.give_error(e, True)
+ except Exception, e:
+ self.give_error(e, True)
finally:
if waitDialog.waiting:
waitDialog.emit(SIGNAL('dongle_done'))