Browse Source

fix createrawtransaction (issue #574)

master
ThomasV 12 years ago
parent
commit
9d5f39c235
  1. 6
      lib/commands.py
  2. 2
      lib/transaction.py

6
lib/commands.py

@ -160,14 +160,12 @@ class Commands:
def createrawtransaction(self, inputs, outputs):
# convert to own format
for i in inputs:
i['tx_hash'] = i['txid']
i['index'] = i['vout']
inputs = map(lambda i: {'prevout_hash': i['txid'], 'prevout_n':i['vout']}, inputs )
outputs = map(lambda x: (x[0],int(1e8*x[1])), outputs.items())
tx = Transaction.from_io(inputs, outputs)
return tx
def signrawtransaction(self, raw_tx, input_info, private_keys):
tx = Transaction(raw_tx)
self.wallet.signrawtransaction(tx, input_info, private_keys, self.password)

2
lib/transaction.py

@ -671,7 +671,7 @@ class Transaction:
item = {
'prevout_hash':i['prevout_hash'],
'prevout_n':i['prevout_n'],
'address':i['address'],
'address':i.get('address'),
'KeyID':i.get('KeyID'),
'scriptPubKey':i.get('scriptPubKey'),
'redeemScript':i.get('redeemScript'),

Loading…
Cancel
Save