tMerge pull request #1211 from mikeland86/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e927766698475017ce4432c65c83c9c6028aad10
DIR parent 5fa2a48343be7253497bb96ad70d091011ef4389
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Wed, 13 May 2015 15:18:03 +0200
Merge pull request #1211 from mikeland86/master
Fix createrawtransaction and add missing deserialize() calls
Diffstat:
M lib/commands.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -173,7 +173,7 @@ class Commands:
else:
raise BaseException('Transaction output not in wallet', prevout_hash+":%d"%prevout_n)
outputs = map(lambda x: ('address', x[0], int(1e8*x[1])), outputs.items())
- tx = Transaction(tx_inputs, outputs)
+ tx = Transaction.from_io(tx_inputs, outputs)
return tx
def signtxwithkey(self, raw_tx, sec):
t@@ -184,11 +184,13 @@ class Commands:
def signtxwithwallet(self, raw_tx):
tx = Transaction(raw_tx)
+ tx.deserialize()
self.wallet.sign_transaction(tx, self.password)
return tx
def decoderawtransaction(self, raw):
tx = Transaction(raw)
+ tx.deserialize()
return {'inputs':tx.inputs, 'outputs':tx.outputs}
def sendrawtransaction(self, raw):