big refactoring: command line options and electrum.conf options override settings in wallet file.

scripts/blocks

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from electrum import TcpStratumInterface
+from electrum import Interface
 
-i = TcpStratumInterface('electrum.novit.ro', 50001)
+i = Interface({'server':'electrum.novit.ro:50001:t'})
 i.init_socket()
 i.start()
 i.send([('blockchain.numblocks.subscribe',[])])

scripts/get_history

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import sys
-from electrum import TcpStratumInterface
+from electrum import Interface
 
 try:
     addr = sys.argv[1]
@@ -9,7 +9,7 @@ except:
     print "usage: get_history <bitcoin_address>"
     sys.exit(1)
 
-i = TcpStratumInterface('electrum.novit.ro', 50001)
+i = Interface({'server':'electrum.novit.ro:50001:t'})
 i.init_socket()
 i.start()
 i.send([('blockchain.address.get_history',[addr])])

scripts/merchant.py

@@ -21,7 +21,7 @@ import time, thread, sys, socket, os
 import urllib2,json
 import MySQLdb as mdb
 import Queue
-from electrum import Wallet, TcpStratumInterface
+from electrum import Wallet, Interface
 
 import ConfigParser
 config = ConfigParser.ConfigParser()
@@ -157,7 +157,7 @@ if __name__ == '__main__':
     print "using database", db_name
     conn = mdb.connect(db_instance, db_user, db_password, db_name);
 
-    i = TcpStratumInterface(electrum_server, 50001)
+    i = Interface({'server':"%s:%d:t"%(electrum_server, 50001)})
     i.init_socket()
     i.start()
     

scripts/peers

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from electrum import TcpStratumInterface
+from electrum import Interface
 
-i = TcpStratumInterface('electrum.novit.ro', 50001)
+i = Interface({'server':'electrum.novit.ro:50001:t'})
 i.init_socket()
 i.start()
 i.send([('server.peers.subscribe',[])])

scripts/watch_address

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import sys
-from electrum import TcpStratumInterface
+from electrum import Interface
 
 try:
     addr = sys.argv[1]
@@ -9,7 +9,7 @@ except:
     print "usage: watch_address <bitcoin_address>"
     sys.exit(1)
 
-i = TcpStratumInterface('electrum.novit.ro', 50001)
+i = Interface({'server':'electrum.novit.ro:50001:t'})
 i.init_socket()
 i.start()
 i.send([('blockchain.address.subscribe',[addr])])