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 99b60980cd1c01e79a7229303b6397d447fef683
DIR parent 27c966c5f65fa33fc0376134b3c0a22004ea36e3
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 19 Sep 2014 05:18:54 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M plugins/btchipwallet.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
---
DIR diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
t@@ -303,12 +303,6 @@ class BTChipWallet(NewWallet):
return b64encode(chr(27 + 4 + (signature[0] & 0x01)) + r + s)
- def choose_tx_inputs( self, amount, fixed_fee, num_outputs, domain = None, coins = None ):
- # Overloaded to get the fee, as BTChip recomputes the change amount
- inputs, total, fee = super(BTChipWallet, self).choose_tx_inputs(amount, fixed_fee, num_outputs, domain, coins)
- self.lastFee = fee
- return inputs, total, fee
-
def sign_transaction(self, tx, keypairs, password):
if tx.error or tx.is_complete():
return
t@@ -368,7 +362,7 @@ class BTChipWallet(NewWallet):
self.get_client().startUntrustedTransaction(firstTransaction, inputIndex,
trustedInputs, redeemScripts[inputIndex])
outputData = self.get_client().finalizeInput(output, format_satoshis(outputAmount),
- format_satoshis(self.lastFee), changePath)
+ format_satoshis(self.get_tx_fee(tx)), changePath)
if firstTransaction:
transactionOutput = outputData['outputData']
if outputData['confirmationNeeded']: