BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move 'addresses' command

This commit is contained in:
thomasv 2013-02-26 16:11:19 +01:00
parent 96d459ab88
commit 999adc80af
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
electrum
View File

@ -449,11 +449,10 @@ if __name__ == '__main__':
args = [ cmd, ast.literal_eval(args[1]), ast.literal_eval(args[2])]
elif cmd == 'dumpprivkeys':
if options.show_all:
addresses = wallet.all_addresses()
else:
addresses = wallet.addresses + wallet.imported_keys.keys()
args = [cmd, addresses]
args = [cmd, wallet.all_addresses() if options.show_all else wallet.addresses + wallet.imported_keys.keys() ]
elif cmd=='addresses':
args = [cmd, options.show_all]
elif cmd == 'setlabel':
try:
@ -553,26 +552,6 @@ if __name__ == '__main__':
else:
print_msg(False)
elif cmd in [ 'addresses']:
for addr in wallet.all_addresses():
if options.show_all or not wallet.is_change(addr):
flags = wallet.get_address_flags(addr)
label = wallet.labels.get(addr,'')
if label: label = "\"%s\""%label
if options.show_balance:
h = wallet.history.get(addr,[])
#ni = no = 0
#for item in h:
# if item['is_input']: ni += 1
# else: no += 1
b = format_satoshis(wallet.get_addr_balance(addr)[0])
else: b=''
m_addr = "%34s"%addr
print_msg(flags, m_addr, b, label)
elif cmd == 'password':
new_password = prompt_password('New password:')

12
lib/commands.py
View File

@ -254,3 +254,15 @@ class Commands:
c[addr] = self.wallet.labels.get(addr)
print_json(c)
def addresses(self, show_all):
for addr in self.wallet.all_addresses():
if show_all or not self.wallet.is_change(addr):
flags = self.wallet.get_address_flags(addr)
label = self.wallet.labels.get(addr,'')
if label: label = "\"%s\""%label
b = format_satoshis(self.wallet.get_addr_balance(addr)[0])
m_addr = "%34s"%addr
print_msg(flags, m_addr, b, label)