version 0.40a
[electrum-server.git] / server.py
index 4793112..9b2fc49 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -27,13 +27,20 @@ Todo:
 
 import time, socket, operator, thread, ast, sys,re
 import psycopg2, binascii
-import bitcoinrpc
 
 from Abe.abe import hash_to_address, decode_check_address
 from Abe.DataStore import DataStore as Datastore_class
 from Abe import DataStore, readconf, BCDataStream,  deserialize, util, base58
 
 import ConfigParser
+from json import dumps, loads
+import urllib
+
+# we need to import electrum
+sys.path.append('../client/')
+from wallet import Wallet
+from interface import Interface
+
 
 config = ConfigParser.ConfigParser()
 # set some defaults, which will be overwritten by the config file
@@ -56,7 +63,15 @@ try:
 except:
     print "Could not read electrum.conf. I will use the default values."
 
+try:
+    f = open('/etc/electrum.banner','r')
+    config.set('server','banner', f.read())
+    f.close()
+except:
+    pass
+
 password = config.get('server','password')
+bitcoind_url = 'http://%s:%s@%s:%s/' % ( config.get('bitcoind','user'), config.get('bitcoind','password'), config.get('bitcoind','host'), config.get('bitcoind','port'))
 
 stopping = False
 block_number = -1
@@ -317,15 +332,123 @@ class MyStore(Datastore_class):
 
 
 
+class Direct_Interface(Interface):
+    def __init__(self):
+        pass
+
+    def handler(self, method, params = ''):
+        cmds = {'session.new':new_session,
+                'session.poll':poll_session,
+                'session.update':update_session,
+                'blockchain.transaction.broadcast':send_tx,
+                'blockchain.address.get_history':store.get_history
+                }
+        func = cmds[method]
+        return func( params )
+
+
+
 def send_tx(tx):
-    import bitcoinrpc
-    conn = bitcoinrpc.connect_to_local()
-    try:
-        v = conn.importtransaction(tx)
-    except:
-        v = "error: transaction rejected by memorypool"
-    return v
+    postdata = dumps({"method": 'importtransaction', 'params': [tx], 'id':'jsonrpc'})
+    respdata = urllib.urlopen(bitcoind_url, postdata).read()
+    r = loads(respdata)
+    if r['error'] != None:
+        out = "error: transaction rejected by memorypool"
+    else:
+        out = r['result']
+    return out
+
+
+
+def random_string(N):
+    import random, string
+    return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N))
+
+    
+
+def cmd_stop(data):
+    global stopping
+    if password == data:
+        stopping = True
+        return 'ok'
+    else:
+        return 'wrong password'
+
+def cmd_load(pw):
+    if password == pw:
+        return repr( len(sessions) )
+    else:
+        return 'wrong password'
+
+
+def clear_cache(pw):
+    if password == pw:
+        store.tx_cache = {}
+        return 'ok'
+    else:
+        return 'wrong password'
+
+def get_cache(pw,addr):
+    if password == pw:
+        return store.tx_cache.get(addr)
+    else:
+        return 'wrong password'
+
+
+def poll_session(session_id):
+    session = sessions.get(session_id)
+    if session is None:
+        print time.asctime(), "session not found", session_id
+        out = repr( (-1, {}))
+    else:
+        t1 = time.time()
+        addresses = session['addresses']
+        session['last_time'] = time.time()
+        ret = {}
+        k = 0
+        for addr in addresses:
+            if store.tx_cache.get( addr ) is not None: k += 1
+
+            # get addtess status, i.e. the last block for that address.
+            tx_points = store.get_history(addr)
+            if not tx_points:
+                status = None
+            else:
+                lastpoint = tx_points[-1]
+                status = lastpoint['blk_hash']
+                # this is a temporary hack; move it up once old clients have disappeared
+                if status == 'mempool' and session['version'] != "old":
+                    status = status + ':%d'% len(tx_points)
+
+            last_status = addresses.get( addr )
+            if last_status != status:
+                addresses[addr] = status
+                ret[addr] = status
+        if ret:
+            sessions[session_id]['addresses'] = addresses
+        out = repr( (block_number, ret ) )
+        t2 = time.time() - t1 
+        if t2 > 10:
+            print "high load:", session_id, "%d/%d"%(k,len(addresses)), t2
+
+        return out
+
+
+def new_session(version, addresses):
+    session_id = random_string(10)
+    sessions[session_id] = { 'addresses':{}, 'version':version }
+    for a in addresses:
+        sessions[session_id]['addresses'][a] = ''
+    out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
+    sessions[session_id]['last_time'] = time.time()
+    return out
 
+def update_session(session_id,addresses):
+    sessions[session_id]['addresses'] = {}
+    for a in addresses:
+        sessions[session_id]['addresses'][a] = ''
+    sessions[session_id]['last_time'] = time.time()
+    return 'ok'
 
 def listen_thread(store):
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -334,11 +457,13 @@ def listen_thread(store):
     s.listen(1)
     while not stopping:
         conn, addr = s.accept()
-        thread.start_new_thread(client_thread, (addr, conn,))
+        try:
+            thread.start_new_thread(client_thread, (addr, conn,))
+        except:
+            # can't start new thread if there is no memory..
+            traceback.print_exc(file=sys.stdout)
+
 
-def random_string(N):
-    import random, string
-    return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N))
 
 def client_thread(ipaddr,conn):
     #print "client thread", ipaddr
@@ -370,44 +495,16 @@ def client_thread(ipaddr,conn):
 
     finally:
         conn.close()
-    
-
-def cmd_stop(data):
-    global stopping
-    if password == data:
-        stopping = True
-        return 'ok'
-    else:
-        return 'wrong password'
-
-def cmd_load(pw):
-    if password == pw:
-        return repr( len(sessions) )
-    else:
-        return 'wrong password'
-
-
-def clear_cache(pw):
-    if password == pw:
-        store.tx_cache = {}
-        return 'ok'
-    else:
-        return 'wrong password'
-
-def get_cache(pw,addr):
-    if password == pw:
-        return store.tx_cache.get(addr)
-    else:
-        return 'wrong password'
 
 
 def do_command(cmd, data, ipaddr):
 
+    timestr = time.strftime("[%d/%m/%Y-%H:%M:%S]")
+
     if cmd=='b':
         out = "%d"%block_number
 
     elif cmd in ['session','new_session']:
-        session_id = random_string(10)
         try:
             if cmd == 'session':
                 addresses = ast.literal_eval(data)
@@ -418,14 +515,8 @@ def do_command(cmd, data, ipaddr):
         except:
             print "error", data
             return None
-
-        print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
-
-        sessions[session_id] = { 'addresses':{}, 'version':version, 'ip':ipaddr }
-        for a in addresses:
-            sessions[session_id]['addresses'][a] = ''
-        out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
-        sessions[session_id]['last_time'] = time.time()
+        print timestr, "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
+        out = new_session(version, addresses)
 
     elif cmd=='update_session':
         try:
@@ -433,14 +524,8 @@ def do_command(cmd, data, ipaddr):
         except:
             print "error"
             return None
-
-        print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
-
-        sessions[session_id]['addresses'] = {}
-        for a in addresses:
-            sessions[session_id]['addresses'][a] = ''
-        out = 'ok'
-        sessions[session_id]['last_time'] = time.time()
+        print timestr, "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
+        out = update_session(session_id,addresses)
 
     elif cmd == 'bccapi_login':
         import electrum
@@ -449,7 +534,7 @@ def do_command(cmd, data, ipaddr):
         master_public_key = k.decode('hex') # todo: sanitize. no need to decode twice...
         print master_public_key
         wallet_id = random_string(10)
-        w = electrum.Wallet()
+        w = Wallet( Direct_Interface() )
         w.master_public_key = master_public_key.decode('hex')
         w.synchronize()
         wallets[wallet_id] = w
@@ -457,7 +542,7 @@ def do_command(cmd, data, ipaddr):
         print "wallets", wallets
 
     elif cmd == 'bccapi_getAccountInfo':
-        from electrum import int_to_hex
+        from wallet import int_to_hex
         v, wallet_id = ast.literal_eval(data)
         w = wallets.get(wallet_id)
         if w is not None:
@@ -470,7 +555,7 @@ def do_command(cmd, data, ipaddr):
             out = "error"
 
     elif cmd == 'bccapi_getAccountStatement':
-        from electrum import int_to_hex
+        from wallet import int_to_hex
         v, wallet_id = ast.literal_eval(data)
         w = wallets.get(wallet_id)
         if w is not None:
@@ -490,41 +575,7 @@ def do_command(cmd, data, ipaddr):
         out = ''
             
     elif cmd=='poll': 
-        session_id = data
-        session = sessions.get(session_id)
-        if session is None:
-            print time.asctime(), "session not found", session_id, ipaddr
-            out = repr( (-1, {}))
-        else:
-            t1 = time.time()
-            addresses = session['addresses']
-            session['last_time'] = time.time()
-            ret = {}
-            k = 0
-            for addr in addresses:
-                if store.tx_cache.get( addr ) is not None: k += 1
-
-                # get addtess status, i.e. the last block for that address.
-                tx_points = store.get_history(addr)
-                if not tx_points:
-                    status = None
-                else:
-                    lastpoint = tx_points[-1]
-                    status = lastpoint['blk_hash']
-                    # this is a temporary hack; move it up once old clients have disappeared
-                    if status == 'mempool' and session['version'] != "old":
-                        status = status + ':%d'% len(tx_points)
-
-                last_status = addresses.get( addr )
-                if last_status != status:
-                    addresses[addr] = status
-                    ret[addr] = status
-            if ret:
-                sessions[session_id]['addresses'] = addresses
-            out = repr( (block_number, ret ) )
-            t2 = time.time() - t1 
-            if t2 > 10:
-                print "high load:", session_id, "%d/%d"%(k,len(addresses)), t2
+        out = poll_session(data)
 
     elif cmd == 'h': 
         # history
@@ -536,7 +587,7 @@ def do_command(cmd, data, ipaddr):
 
     elif cmd =='tx':
         out = send_tx(data)
-        print "sent tx:", out
+        print timestr, "sent tx:", ipaddr, out
 
     elif cmd == 'stop':
         out = cmd_stop(data)
@@ -555,13 +606,14 @@ def do_command(cmd, data, ipaddr):
 def memorypool_update(store):
     ds = BCDataStream.BCDataStream()
     store.mempool_keys = []
-    conn = bitcoinrpc.connect_to_local()
-    try:
-        v = conn.getmemorypool()
-    except:
-        print "cannot contact bitcoin daemon"
+
+    postdata = dumps({"method": 'getmemorypool', 'params': [], 'id':'jsonrpc'})
+    respdata = urllib.urlopen(bitcoind_url, postdata).read()
+    r = loads(respdata)
+    if r['error'] != None:
         return
-    v = v['transactions']
+
+    v = r['result'].get('transactions')
     for hextx in v:
         ds.clear()
         ds.write(hextx.decode('hex'))
@@ -585,7 +637,6 @@ def clean_session_thread():
         for k,s in sessions.items():
             t0 = s['last_time']
             if t - t0 > 5*60:
-                print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "end session", s['ip']
                 sessions.pop(k)
             
 
@@ -634,15 +685,21 @@ def irc_thread():
 
 def jsonrpc_thread(store):
     # see http://code.google.com/p/jsonrpclib/
+    from SocketServer import ThreadingMixIn
     from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
-    server = SimpleJSONRPCServer(('localhost', 8080))
-    server.register_function(store.get_history, 'history')
+    class SimpleThreadedJSONRPCServer(ThreadingMixIn, SimpleJSONRPCServer): pass
+    server = SimpleThreadedJSONRPCServer(( config.get('server','host'), 8081))
     server.register_function(lambda : peer_list.values(), 'peers')
     server.register_function(cmd_stop, 'stop')
     server.register_function(cmd_load, 'load')
     server.register_function(lambda : block_number, 'blocks')
     server.register_function(clear_cache, 'clear_cache')
     server.register_function(get_cache, 'get_cache')
+    server.register_function(send_tx, 'blockchain.transaction.broadcast')
+    server.register_function(store.get_history, 'blockchain.address.get_history')
+    server.register_function(new_session, 'session.new')
+    server.register_function(update_session, 'session.update')
+    server.register_function(poll_session, 'session.poll')
     server.serve_forever()
 
 
@@ -653,7 +710,7 @@ if __name__ == '__main__':
 
     if len(sys.argv)>1:
         import jsonrpclib
-        server = jsonrpclib.Server('http://localhost:8080')
+        server = jsonrpclib.Server('http://%s:8081'%config.get('server','host'))
         cmd = sys.argv[1]
         if cmd == 'load':
             out = server.load(password)
@@ -666,9 +723,13 @@ if __name__ == '__main__':
         elif cmd == 'get_cache':
             out = server.get_cache(password,sys.argv[2])
         elif cmd == 'h':
-            out = server.history(sys.argv[2])
+            out = server.blockchain.address.get_history(sys.argv[2])
+        elif cmd == 'tx':
+            out = server.blockchain.transaction.broadcast(sys.argv[2])
         elif cmd == 'b':
             out = server.blocks()
+        else:
+            out = "Unknown command: '%s'" % cmd
         print out
         sys.exit(0)
 
@@ -701,9 +762,14 @@ if __name__ == '__main__':
             store.catch_up()
             memorypool_update(store)
             block_number = store.get_block_number(1)
-            dblock.release()
+        except IOError:
+            print "IOError: cannot reach bitcoind"
+            block_number = 0
         except:
             traceback.print_exc(file=sys.stdout)
+            block_number = 0
+        finally:
+            dblock.release()
         time.sleep(10)
 
     print "server stopped"