ttext mode improvements - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit db26c12335d03c859b88d062276b0e3ea8abb728
DIR parent f56622137e5c3214207d3662e64ff5e4c99e1ff7
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 12 Nov 2011 00:07:41 +0100
ttext mode improvements
Diffstat:
M client/electrum.py | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
---
DIR diff --git a/client/electrum.py b/client/electrum.py
t@@ -625,7 +625,7 @@ if __name__ == '__main__':
except:
cmd = "gui"
- known_commands = ['balance', 'sendtoaddress', 'password', 'getnewaddress', 'addresses', 'history', 'label', 'gui', 'all_addresses', 'gentx']
+ known_commands = ['balance', 'contacts', 'send', 'sendtoaddress', 'password', 'getnewaddress', 'addresses', 'history', 'label', 'gui', 'all_addresses', 'gentx']
if cmd not in known_commands:
print "Known commands:", ', '.join(known_commands)
sys.exit(0)
t@@ -683,6 +683,17 @@ if __name__ == '__main__':
wallet.update()
wallet.save()
+ # check syntax
+ if cmd in ['sendtoaddress', 'sendto', 'gentx']:
+ try:
+ to_address = sys.argv[2]
+ amount = float(sys.argv[3])
+ label = ' '.join(sys.argv[4:])
+ except:
+ print "syntax: send <recipient> <amount> [label]"
+ sys.exit(1)
+
+ # password
if cmd in ['sendtoaddress', 'password', 'getnewaddress','gentx']:
password = getpass.getpass('Password:') if wallet.use_encryption else None
t@@ -693,6 +704,10 @@ if __name__ == '__main__':
else:
print c*1e-8
+ elif cmd in [ 'contacts', 'addressbook']:
+ for addr in wallet.addressbook:
+ print addr, " ", wallet.labels.get(addr)
+
elif cmd in [ 'addresses', 'all_addresses']:
for addr in wallet.addresses:
if cmd == 'all_addresses' or not wallet.is_change(addr):
t@@ -736,13 +751,11 @@ if __name__ == '__main__':
wallet.save()
elif cmd in ['sendtoaddress', 'gentx']:
- try:
- to_address = sys.argv[2]
- amount = float(sys.argv[3])
- label = ' '.join(sys.argv[4:])
- except:
- print "syntax: send <recipient> <amount> [label]"
- sys.exit(1)
+ for k, v in wallet.labels.items():
+ if v == to_address:
+ to_address = k
+ break
+ print "alias", to_address
r, h = wallet.send( to_address, amount, label, password, cmd=='sendtoaddress' )
print h