tfix input_info for signrawtransaction - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5a0283693347f5cef0a8672218d9ed6507e5359f
DIR parent 0c100c1480a3dc11b116d9f83504a4b2a045853b
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 26 Apr 2014 18:44:45 +0200
fix input_info for signrawtransaction
Diffstat:
M lib/transaction.py | 2 +-
M lib/wallet.py | 67 ++++++++++++++-----------------
2 files changed, 32 insertions(+), 37 deletions(-)
---
DIR diff --git a/lib/transaction.py b/lib/transaction.py
t@@ -755,8 +755,8 @@ class Transaction:
for i, txin in enumerate(self.inputs):
item = input_info[i]
txin['address'] = item['address']
- txin['signatures'] = item['signatures']
txin['scriptPubKey'] = item['scriptPubKey']
txin['redeemScript'] = item.get('redeemScript')
txin['redeemPubkey'] = item.get('redeemPubkey')
txin['KeyID'] = item.get('KeyID')
+ txin['signatures'] = item.get('signatures',{})
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -678,29 +678,24 @@ class NewWallet:
# check that the password is correct
seed = self.get_seed(password)
- # add input info
- tx.add_input_info(input_info)
-
- # add redeem script for coins that are in the wallet
- # FIXME: add redeemPubkey too!
-
- try:
+ # if input_info is not known, build it using wallet UTXOs
+ if not input_info:
+ input_info = []
unspent_coins = self.get_unspent_coins()
- except:
- # an exception may be raised is the wallet is not synchronized
- unspent_coins = []
-
- for txin in tx.inputs:
- for item in unspent_coins:
- if txin['prevout_hash'] == item['prevout_hash'] and txin['prevout_n'] == item['prevout_n']:
- print_error( "tx input is in unspent coins" )
- txin['scriptPubKey'] = item['scriptPubKey']
- account, sequence = self.get_address_index(item['address'])
- if account != -1:
- txin['redeemScript'] = self.accounts[account].redeem_script(sequence)
- print_error("added redeemScript", txin['redeemScript'])
- break
+ for txin in tx.inputs:
+ for item in unspent_coins:
+ if txin['prevout_hash'] == item['prevout_hash'] and txin['prevout_n'] == item['prevout_n']:
+ info = { 'address':item['address'], 'scriptPubKey':item['scriptPubKey'] }
+ self.add_input_info(info)
+ input_info.append(info)
+ break
+ else:
+ print_error( "input not in UTXOs" )
+ input_info.append(None)
+ # add input_info to the transaction
+ print_error("input_info", input_info)
+ tx.add_input_info(input_info)
# build a list of public/private keys
keypairs = {}
t@@ -712,9 +707,9 @@ class NewWallet:
# add private_keys from KeyID
self.add_keypairs_from_KeyID(tx, keypairs, password)
-
# add private keys from wallet
self.add_keypairs_from_wallet(tx, keypairs, password)
+ # sign the transaction
self.sign_transaction(tx, keypairs, password)
t@@ -1230,7 +1225,8 @@ class NewWallet:
inputs, total, fee = self.choose_tx_inputs( amount, fee, len(outputs), domain )
if not inputs:
raise ValueError("Not enough funds")
- self.add_input_info(inputs)
+ for txin in inputs:
+ self.add_input_info(txin)
outputs = self.add_tx_change(inputs, outputs, amount, fee, total, change_addr)
return Transaction.from_io(inputs, outputs)
t@@ -1244,19 +1240,18 @@ class NewWallet:
return tx
- def add_input_info(self, inputs):
- for txin in inputs:
- address = txin['address']
- if address in self.imported_keys.keys():
- continue
- account_id, sequence = self.get_address_index(address)
- account = self.accounts[account_id]
- txin['KeyID'] = account.get_keyID(sequence)
- redeemScript = account.redeem_script(sequence)
- if redeemScript:
- txin['redeemScript'] = redeemScript
- else:
- txin['redeemPubkey'] = account.get_pubkey(*sequence)
+ def add_input_info(self, txin):
+ address = txin['address']
+ if address in self.imported_keys.keys():
+ return
+ account_id, sequence = self.get_address_index(address)
+ account = self.accounts[account_id]
+ txin['KeyID'] = account.get_keyID(sequence)
+ redeemScript = account.redeem_script(sequence)
+ if redeemScript:
+ txin['redeemScript'] = redeemScript
+ else:
+ txin['redeemPubkey'] = account.get_pubkey(*sequence)
def sign_transaction(self, tx, keypairs, password):