tfix: update commands with new transaction constructors - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 24f40f610ffecdf4399c810f74306f2a654a295d
DIR parent 597dd49e8c51aeea0466759ee874fd7d72bfd059
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 14 Jul 2014 01:07:54 +0200
fix: update commands with new transaction constructors
Diffstat:
M lib/commands.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -162,20 +162,20 @@ class Commands:
i['prevout_hash'] = i['txid']
i['prevout_n'] = i['vout']
outputs = map(lambda x: (x[0],int(1e8*x[1])), outputs.items())
- tx = Transaction.from_io(inputs, outputs)
+ tx = Transaction(inputs, outputs)
return tx
def signrawtransaction(self, raw_tx, private_keys):
- tx = Transaction(raw_tx)
+ tx = Transaction.deserialize(raw_tx)
self.wallet.signrawtransaction(tx, private_keys, self.password)
return tx
def decoderawtransaction(self, raw):
- tx = Transaction(raw)
- return tx.deserialize()
+ tx = Transaction.deserialize(raw)
+ return {'inputs':tx.inputs, 'outputs':tx.outputs}
def sendrawtransaction(self, raw):
- tx = Transaction(raw)
+ tx = Transaction.deserialize(raw)
return self.network.synchronous_get([('blockchain.transaction.broadcast', [str(tx)])])[0]
def createmultisig(self, num, pubkeys):
t@@ -375,9 +375,9 @@ class Commands:
if tx:
return tx
- r = self.network.synchronous_get([ ('blockchain.transaction.get',[tx_hash]) ])[0]
- if r:
- return Transaction(r)
+ raw = self.network.synchronous_get([ ('blockchain.transaction.get',[tx_hash]) ])[0]
+ if raw:
+ return Transaction.deserialize(raw)
else:
return "unknown transaction"