tfix #1525 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 369d5d881231cfdd8a4636da55989448edccc4ba
DIR parent bb7b0884e31f5c7d1a4f93cf63c65401c7f496fd
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 29 Oct 2015 14:36:50 +0100
fix #1525
Diffstat:
M lib/commands.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -201,7 +201,7 @@ class Commands:
tx = Transaction.from_io(tx_inputs, outputs)
if not unsigned:
self.wallet.sign_transaction(tx, self.password)
- return tx
+ return tx.as_dict()
@command('wp')
def signtransaction(self, tx, privkey=None):
t@@ -213,7 +213,7 @@ class Commands:
t.sign({pubkey:privkey})
else:
self.wallet.sign_transaction(t, self.password)
- return t
+ return t.as_dict()
@command('')
def deserialize(self, tx):
t@@ -423,14 +423,14 @@ class Commands:
"""Create a transaction. """
domain = [from_addr] if from_addr else None
tx = self._mktx([(destination, amount)], tx_fee, change_addr, domain, nocheck, unsigned)
- return tx.deserialize() if deserialized else tx
+ return tx.deserialize() if deserialized else tx.as_dict()
@command('wpn')
def paytomany(self, outputs, tx_fee=None, from_addr=None, change_addr=None, nocheck=False, unsigned=False, deserialized=False):
"""Create a multi-output transaction. """
domain = [from_addr] if from_addr else None
tx = self._mktx(outputs, tx_fee, change_addr, domain, nocheck, unsigned)
- return tx.deserialize() if deserialized else tx
+ return tx.deserialize() if deserialized else tx.as_dict()
@command('wn')
def history(self):
t@@ -512,7 +512,7 @@ class Commands:
tx = Transaction(raw)
else:
raise BaseException("Unknown transaction")
- return tx.deserialize() if deserialized else tx
+ return tx.deserialize() if deserialized else tx.as_dict()
@command('')
def encrypt(self, pubkey, message):