AaronFiore/electrum
1
0
Fork 0
Code Activity

fix Transaction.deserialize() to Transaction()

Browse Source
This commit is contained in:
Roman Zeyde
2015-03-30 18:22:52 +03:00
parent 9d0aa737e5
commit c4b306cdbe
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/commands.py
View File

@@ -176,22 +176,22 @@ class Commands:
return tx
def signtxwithkey(self, raw_tx, sec):
tx = Transaction.deserialize(raw_tx)
tx = Transaction(raw_tx)
pubkey = bitcoin.public_key_from_private_key(sec)
tx.sign({ pubkey:sec })
return tx
def signtxwithwallet(self, raw_tx):
tx = Transaction.deserialize(raw_tx)
tx = Transaction(raw_tx)
self.wallet.sign_transaction(tx, self.password)
return tx
def decoderawtransaction(self, raw):
tx = Transaction.deserialize(raw)
tx = Transaction(raw)
return {'inputs':tx.inputs, 'outputs':tx.outputs}
def sendrawtransaction(self, raw):
tx = Transaction.deserialize(raw)
tx = Transaction(raw)
return self.network.synchronous_get([('blockchain.transaction.broadcast', [str(tx)])])[0]
def createmultisig(self, num, pubkeys):
@@ -403,7 +403,7 @@ class Commands:
raw = self.network.synchronous_get([ ('blockchain.transaction.get',[tx_hash]) ])[0]
if raw:
return Transaction.deserialize(raw)
return Transaction(raw)
else:
return "unknown transaction"