RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return python objects

Browse Source
This commit is contained in:
thomasv 2013-02-26 18:10:29 +01:00
parent 2e9c2c1f96
commit 963d542ac8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/commands.py
View File

@ -302,6 +302,7 @@ class Commands:
def history(self): def history(self):
import datetime import datetime
balance = 0 balance = 0
out = []
for item in self.wallet.get_tx_history(): for item in self.wallet.get_tx_history():
tx_hash, conf, is_mine, value, fee, balance, timestamp = item tx_hash, conf, is_mine, value, fee, balance, timestamp = item
try: try:
@ -313,8 +314,9 @@ class Commands:
if not label: label = tx_hash if not label: label = tx_hash
else: label = label + ' '*(64 - len(label) ) else: label = label + ' '*(64 - len(label) )
print_msg("%17s"%time_str, " " + label + " " + format_satoshis(value)+ " "+ format_satoshis(balance)) out.append( "%16s"%time_str + " " + label + " " + format_satoshis(value)+ " "+ format_satoshis(balance) )
print_msg("# balance: ", format_satoshis(balance)) return out
def setlabel(self, tx, label): def setlabel(self, tx, label):
@ -330,6 +332,7 @@ class Commands:
def addresses(self, show_all): def addresses(self, show_all):
out = []
for addr in self.wallet.all_addresses(): for addr in self.wallet.all_addresses():
if show_all or not self.wallet.is_change(addr): if show_all or not self.wallet.is_change(addr):
@ -338,5 +341,7 @@ class Commands:
if label: label = "\"%s\""%label if label: label = "\"%s\""%label
b = format_satoshis(self.wallet.get_addr_balance(addr)[0]) b = format_satoshis(self.wallet.get_addr_balance(addr)[0])
m_addr = "%34s"%addr m_addr = "%34s"%addr
print_msg(flags, m_addr, b, label) out.append( flags + ' ' + m_addr + ' ' + b + ' ' + label )
return out