electrum

commit f8b5c662849fd4066ac850a86beb225b0e07a652
parent 37d5e3b42af7ac5df3d499af75f1f20a3f498a77
Author: ThomasV <electrumdev@gmail.com>
Date:   Fri, 26 Jun 2015 17:46:35 +0200

Merge pull request #1319 from LedgerHQ/ledger-fixed-2.3.2

Ledger fixed 2.3.2
Diffstat:
M
plugins/btchipwallet.py
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
@@ -16,7 +16,7 @@ from electrum.plugins import BasePlugin, hook
 from electrum.transaction import deserialize
 from electrum.wallet import BIP32_HD_Wallet, BIP32_Wallet
 
-from electrum.util import format_satoshis
+from electrum.util import format_satoshis_plain
 import hashlib
 
 try:
@@ -396,8 +396,8 @@ class BTChipWallet(BIP32_HD_Wallet):
             while inputIndex < len(inputs):
                 self.get_client().startUntrustedTransaction(firstTransaction, inputIndex, 
                 trustedInputs, redeemScripts[inputIndex])
-                outputData = self.get_client().finalizeInput(output, format_satoshis(outputAmount), 
-                format_satoshis(self.get_tx_fee(tx)), changePath, bytearray(rawTx.decode('hex')))
+                outputData = self.get_client().finalizeInput(output, format_satoshis_plain(outputAmount), 
+                format_satoshis_plain(self.get_tx_fee(tx)), changePath, bytearray(rawTx.decode('hex')))
                 if firstTransaction:
                     transactionOutput = outputData['outputData']
                 if outputData['confirmationNeeded']:                
@@ -430,9 +430,9 @@ class BTChipWallet(BIP32_HD_Wallet):
                         if not confirmed:
                             raise Exception('Aborted by user')                                            
                         pin = pin.encode()
-                    self.client.bad = True
-                    self.device_checked = False
-                    self.get_client(True)
+                        self.client.bad = True
+                        self.device_checked = False
+                        self.get_client(True)
                     waitDialog.start("Signing ...")
                 else:
                     # Sign input with the provided PIN