move 'addresses' command
This commit is contained in:
parent
96d459ab88
commit
999adc80af
29
electrum
29
electrum
|
@ -449,11 +449,10 @@ if __name__ == '__main__':
|
||||||
args = [ cmd, ast.literal_eval(args[1]), ast.literal_eval(args[2])]
|
args = [ cmd, ast.literal_eval(args[1]), ast.literal_eval(args[2])]
|
||||||
|
|
||||||
elif cmd == 'dumpprivkeys':
|
elif cmd == 'dumpprivkeys':
|
||||||
if options.show_all:
|
args = [cmd, wallet.all_addresses() if options.show_all else wallet.addresses + wallet.imported_keys.keys() ]
|
||||||
addresses = wallet.all_addresses()
|
|
||||||
else:
|
elif cmd=='addresses':
|
||||||
addresses = wallet.addresses + wallet.imported_keys.keys()
|
args = [cmd, options.show_all]
|
||||||
args = [cmd, addresses]
|
|
||||||
|
|
||||||
elif cmd == 'setlabel':
|
elif cmd == 'setlabel':
|
||||||
try:
|
try:
|
||||||
|
@ -553,26 +552,6 @@ if __name__ == '__main__':
|
||||||
else:
|
else:
|
||||||
print_msg(False)
|
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':
|
elif cmd == 'password':
|
||||||
new_password = prompt_password('New password:')
|
new_password = prompt_password('New password:')
|
||||||
|
|
|
@ -254,3 +254,15 @@ class Commands:
|
||||||
c[addr] = self.wallet.labels.get(addr)
|
c[addr] = self.wallet.labels.get(addr)
|
||||||
print_json(c)
|
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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue