adding new protocol (draft)

client/electrum

@@ -20,7 +20,6 @@ import re, sys, getpass
 
 from optparse import OptionParser
 from wallet import Wallet, SecretToASecret
-from interface import Interface
 from decimal import Decimal
 
 
@@ -43,11 +42,13 @@ if __name__ == '__main__':
     parser.add_option("-r", "--remote", dest="remote_url", default=None, help="URL of a remote wallet")
     options, args = parser.parse_args()
 
-    interface = Interface()
-    wallet = Wallet(interface)
+    wallet = Wallet()
     wallet.set_path(options.wallet_path)
+    wallet.read()
     wallet.remote_url = options.remote_url
 
+    interface = wallet.interface
+
     if len(args)==0:
         url = None
         cmd = 'gui'
@@ -71,7 +72,7 @@ if __name__ == '__main__':
         gui = gui.ElectrumGui(wallet)
 
         try:
-            found = wallet.read()
+            found = wallet.file_exists
             if not found:
                 found = gui.restore_or_create()
         except BaseException, e:
@@ -90,14 +91,14 @@ if __name__ == '__main__':
     if cmd not in known_commands:
         cmd = 'help'
 
-    if not wallet.read() and cmd not in ['help','create','restore']:
+    if not wallet.file_exists and cmd not in ['help','create','restore']:
         print "Wallet file not found."
         print "Type 'electrum.py create' to create a new wallet, or provide a path to a wallet with the -d option"
         sys.exit(0)
     
     if cmd in ['create', 'restore']:
         import mnemonic
-        if wallet.read():
+        if wallet.file_exists:
             print "remove the existing wallet first!"
             sys.exit(0)
         password = getpass.getpass("Password (hit return if you do not wish to encrypt your wallet):")