BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Ledger fixed 2.3.2
This commit is contained in:
ThomasV 2015-06-26 17:46:35 +02:00
parent 37d5e3b42a 3a22fe758f
commit f8b5c66284
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/btchipwallet.py
View File

@ -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