Various fixes for command line. Make 'payto' command require network (fixes #1525)

scripts/block_headers

@@ -3,11 +3,12 @@
 # A simple script that connects to a server and displays block headers
 
 import time
-import electrum
+from electrum import SimpleConfig, Network
+from electrum.util import print_msg, json_encode
 
 # start network
-c = electrum.SimpleConfig()
-network = electrum.Network(c)
+c = SimpleConfig()
+network = Network(c)
 network.start()
 
 # wait until connected
@@ -19,7 +20,7 @@ if not network.is_connected():
     sys.exit(1)
 
 # 2. send the subscription
-callback = lambda response: electrum.print_json(response.get('result'))
+callback = lambda response: print_msg(json_encode(response.get('result')))
 network.send([('blockchain.headers.subscribe',[])], callback)
 
 # 3. wait for results

scripts/get_history

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 
 import sys
-from electrum import Network, print_json
+from electrum import Network
+from electrum.util import json_encode, print_msg
 
 try:
     addr = sys.argv[1]
@@ -12,4 +13,4 @@ except Exception:
 n = Network()
 n.start()
 h = n.synchronous_get(('blockchain.address.get_history',[addr]))
-print_json(h)
+print_msg(json_encode(h))

scripts/watch_address

@@ -2,7 +2,8 @@
 
 import sys
 import time
-import electrum
+from electrum import SimpleConfig, Network
+from electrum.util import print_msg, json_encode
 
 try:
     addr = sys.argv[1]
@@ -11,8 +12,8 @@ except Exception:
     sys.exit(1)
 
 # start network
-c = electrum.SimpleConfig()
-network = electrum.Network(c)
+c = SimpleConfig()
+network = Network(c)
 network.start()
 
 # wait until connected
@@ -24,7 +25,7 @@ if not network.is_connected():
     sys.exit(1)
 
 # 2. send the subscription
-callback = lambda response: electrum.print_json(response.get('result'))
+callback = lambda response: print_msg(json_encode(response.get('result')))
 network.send([('blockchain.address.subscribe',[addr])], callback)
 
 # 3. wait for results