tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5c59b017ae0a5a693990d410f7441eedbeeb0c93
DIR parent 0682695da988e131614e348b0edd44f4d2c9c6cc
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 14 Jun 2015 11:39:51 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M plugins/btchipwallet.py | 51 +++++++++++++++++++------------
1 file changed, 31 insertions(+), 20 deletions(-)
---
DIR diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
t@@ -20,7 +20,6 @@ from electrum.util import format_satoshis
import hashlib
try:
- from usb.core import USBError
from btchip.btchipComm import getDongle, DongleWait
from btchip.btchip import btchip
from btchip.btchipUtils import compress_public_key,format_transaction, get_regular_input_script
t@@ -29,7 +28,7 @@ try:
from btchip.btchipFirmwareWizard import checkFirmware, updateFirmware
from btchip.btchipException import BTChipException
BTCHIP = True
- BTCHIP_DEBUG = False
+ BTCHIP_DEBUG = False
except ImportError:
BTCHIP = False
t@@ -354,6 +353,7 @@ class BTChipWallet(BIP32_HD_Wallet):
outputAmount = None
use2FA = False
pin = ""
+ rawTx = tx.serialize()
# Fetch inputs of the transaction to sign
for txinput in tx.inputs:
if ('is_coinbase' in txinput and txinput['is_coinbase']):
t@@ -397,17 +397,39 @@ class BTChipWallet(BIP32_HD_Wallet):
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)
+ format_satoshis(self.get_tx_fee(tx)), changePath, bytearray(rawTx.decode('hex')))
if firstTransaction:
transactionOutput = outputData['outputData']
if outputData['confirmationNeeded']:
use2FA = True
# TODO : handle different confirmation types. For the time being only supports keyboard 2FA
waitDialog.emit(SIGNAL('dongle_done'))
- confirmed, p, pin = self.password_dialog()
- if not confirmed:
- raise Exception('Aborted by user')
- pin = pin.encode()
+ if 'keycardData' in outputData:
+ pin2 = ""
+ for keycardIndex in range(len(outputData['keycardData'])):
+ msg = "Do not enter your device PIN here !\r\n\r\n" + \
+ "Your BTChip wants to talk to you and tell you a unique second factor code.\r\n" + \
+ "For this to work, please match the character between stars of the output address using your security card\r\n\r\n" + \
+ "Output address : "
+ for index in range(len(output)):
+ if index == outputData['keycardData'][keycardIndex]:
+ msg = msg + "*" + output[index] + "*"
+ else:
+ msg = msg + output[index]
+ msg = msg + "\r\n"
+ confirmed, p, pin = self.password_dialog(msg)
+ if not confirmed:
+ raise Exception('Aborted by user')
+ try:
+ pin2 = pin2 + chr(int(pin[0], 16))
+ except:
+ raise Exception('Invalid PIN character')
+ pin = pin2
+ else:
+ confirmed, p, pin = self.password_dialog()
+ if not confirmed:
+ raise Exception('Aborted by user')
+ pin = pin.encode()
self.client.bad = True
self.device_checked = False
self.get_client(True)
t@@ -502,16 +524,5 @@ if BTCHIP:
self.dongle = dongle
def waitFirstResponse(self, timeout):
- customTimeout = 0
- while customTimeout < timeout:
- try:
- response = self.dongle.waitFirstResponse(200)
- return response
- except USBError, e:
- if e.backend_error_code == -7:
- QApplication.processEvents()
- customTimeout = customTimeout + 100
- pass
- else:
- raise e
- raise e
+ return self.dongle.waitFirstResponse(timeout)
+