|
|
@ -447,10 +447,29 @@ class Commands: |
|
|
|
else: |
|
|
|
date = "----" |
|
|
|
label = self.wallet.get_label(tx_hash) |
|
|
|
tx = self.wallet.transactions.get(tx_hash) |
|
|
|
tx.deserialize() |
|
|
|
input_addresses = [] |
|
|
|
output_addresses = [] |
|
|
|
for x in tx.inputs(): |
|
|
|
if x['type'] == 'coinbase': continue |
|
|
|
addr = x.get('address') |
|
|
|
if addr == None: continue |
|
|
|
if addr == "(pubkey)": |
|
|
|
prevout_hash = x.get('prevout_hash') |
|
|
|
prevout_n = x.get('prevout_n') |
|
|
|
_addr = self.wallet.find_pay_to_pubkey_address(prevout_hash, prevout_n) |
|
|
|
if _addr: |
|
|
|
addr = _addr |
|
|
|
input_addresses.append(addr) |
|
|
|
for addr, v in tx.get_outputs(): |
|
|
|
output_addresses.append(addr) |
|
|
|
out.append({ |
|
|
|
'txid': tx_hash, |
|
|
|
'timestamp': timestamp, |
|
|
|
'date': date, |
|
|
|
'input_addresses': input_addresses, |
|
|
|
'output_addresses': output_addresses, |
|
|
|
'label': label, |
|
|
|
'value': float(value)/COIN if value is not None else None, |
|
|
|
'height': height, |
|
|
|