major reorganisation, http works now
[electrum-server.git] / server.py
old mode 100644 (file)
new mode 100755 (executable)
index 7896f8e..6ab0512
--- a/server.py
+++ b/server.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright(C) 2011 thomasv@gitorious
+# Copyright(C) 2012 thomasv@gitorious
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 Todo:
    * server should check and return bitcoind status..
    * improve txpoint sorting
+   * command to check cache
+
+ mempool transactions do not need to be added to the database; it slows it down
 """
 
+import abe_backend
+
+
+
 
-import time, socket, operator, thread, ast, sys
-import psycopg2, binascii
-import bitcoinrpc
+import time, json, socket, operator, thread, ast, sys, re, traceback
+import ConfigParser
+from json import dumps, loads
+import urllib
+import threading
 
-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
+config = ConfigParser.ConfigParser()
+# set some defaults, which will be overwritten by the config file
+config.add_section('server')
+config.set('server','banner', 'Welcome to Electrum!')
+config.set('server', 'host', 'localhost')
+config.set('server', 'port', '50000')
+config.set('server', 'password', '')
+config.set('server', 'irc', 'yes')
+config.set('server', 'ircname', 'Electrum server')
+config.add_section('database')
+config.set('database', 'type', 'psycopg2')
+config.set('database', 'database', 'abe')
 
 try:
     f = open('/etc/electrum.conf','r')
-    data = f.read()
+    config.readfp(f)
     f.close()
-    HOST, PORT, PASSWORD, SERVER_MESSAGE = ast.literal_eval(data)
 except:
-    print "could not read /etc/electrum.conf"
-    SERVER_MESSAGE = "Welcome to Electrum"
-    HOST = 'ecdsa.org'
-    PORT = 50000
-    PASSWORD = ''
+    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')
 stopping = False
-block_number = -1
 sessions = {}
-sessions_last_time = {}
-dblock = thread.allocate_lock()
 
-peer_list = {}
 
-class MyStore(Datastore_class):
-
-    def safe_sql(self,sql):
-        try:
-            dblock.acquire()
-            ret = self.selectall(sql)
-            dblock.release()
-            return ret
-        except:
-            print "sql error", sql
-            return []
-
-    def get_tx_outputs(self, tx_id):
-        return self.safe_sql("""SELECT
-                txout.txout_pos,
-                txout.txout_scriptPubKey,
-                txout.txout_value,
-                nexttx.tx_hash,
-                nexttx.tx_id,
-                txin.txin_pos,
-                pubkey.pubkey_hash
-              FROM txout
-              LEFT JOIN txin ON (txin.txout_id = txout.txout_id)
-              LEFT JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
-              LEFT JOIN tx nexttx ON (txin.tx_id = nexttx.tx_id)
-             WHERE txout.tx_id = %d 
-             ORDER BY txout.txout_pos
-        """%(tx_id))
-
-    def get_tx_inputs(self, tx_id):
-        return self.safe_sql(""" SELECT
-                txin.txin_pos,
-                txin.txin_scriptSig,
-                txout.txout_value,
-                COALESCE(prevtx.tx_hash, u.txout_tx_hash),
-                prevtx.tx_id,
-                COALESCE(txout.txout_pos, u.txout_pos),
-                pubkey.pubkey_hash
-              FROM txin
-              LEFT JOIN txout ON (txout.txout_id = txin.txout_id)
-              LEFT JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
-              LEFT JOIN tx prevtx ON (txout.tx_id = prevtx.tx_id)
-              LEFT JOIN unlinked_txin u ON (u.txin_id = txin.txin_id)
-             WHERE txin.tx_id = %d
-             ORDER BY txin.txin_pos
-             """%(tx_id,))
-
-    def get_address_out_rows(self, dbhash):
-        return self.safe_sql(""" SELECT
-                b.block_nTime,
-                cc.chain_id,
-                b.block_height,
-                1,
-                b.block_hash,
-                tx.tx_hash,
-                tx.tx_id,
-                txin.txin_pos,
-                -prevout.txout_value
-              FROM chain_candidate cc
-              JOIN block b ON (b.block_id = cc.block_id)
-              JOIN block_tx ON (block_tx.block_id = b.block_id)
-              JOIN tx ON (tx.tx_id = block_tx.tx_id)
-              JOIN txin ON (txin.tx_id = tx.tx_id)
-              JOIN txout prevout ON (txin.txout_id = prevout.txout_id)
-              JOIN pubkey ON (pubkey.pubkey_id = prevout.pubkey_id)
-             WHERE pubkey.pubkey_hash = '%s'
-               AND cc.in_longest = 1"""%dbhash)
-
-    def get_address_out_rows_memorypool(self, dbhash):
-        return self.safe_sql(""" SELECT
-                1,
-                tx.tx_hash,
-                tx.tx_id,
-                txin.txin_pos,
-                -prevout.txout_value
-              FROM tx 
-              JOIN txin ON (txin.tx_id = tx.tx_id)
-              JOIN txout prevout ON (txin.txout_id = prevout.txout_id)
-              JOIN pubkey ON (pubkey.pubkey_id = prevout.pubkey_id)
-             WHERE pubkey.pubkey_hash ='%s' """%(dbhash))
-
-    def get_address_in_rows(self, dbhash):
-        return self.safe_sql(""" SELECT
-                b.block_nTime,
-                cc.chain_id,
-                b.block_height,
-                0,
-                b.block_hash,
-                tx.tx_hash,
-                tx.tx_id,
-                txout.txout_pos,
-                txout.txout_value
-              FROM chain_candidate cc
-              JOIN block b ON (b.block_id = cc.block_id)
-              JOIN block_tx ON (block_tx.block_id = b.block_id)
-              JOIN tx ON (tx.tx_id = block_tx.tx_id)
-              JOIN txout ON (txout.tx_id = tx.tx_id)
-              JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
-             WHERE pubkey.pubkey_hash = '%s'
-               AND cc.in_longest = 1"""%(dbhash))
-
-    def get_address_in_rows_memorypool(self, dbhash):
-        return self.safe_sql( """ SELECT
-                0,
-                tx.tx_hash,
-                tx.tx_id,
-                txout.txout_pos,
-                txout.txout_value
-              FROM tx
-              JOIN txout ON (txout.tx_id = tx.tx_id)
-              JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
-             WHERE pubkey.pubkey_hash = '%s' """%(dbhash))
-
-    def get_txpoints(self, addr):
-        version, binaddr = decode_check_address(addr)
-        if binaddr is None:
-            return "err"
-        dbhash = self.binin(binaddr)
-        rows = []
-        rows += self.get_address_out_rows( dbhash )
-        rows += self.get_address_in_rows( dbhash )
-
-        txpoints = []
-        known_tx = []
-
-        for row in rows:
-            try:
-                nTime, chain_id, height, is_in, blk_hash, tx_hash, tx_id, pos, value = row
-            except:
-                print "cannot unpack row", row
-                break
-            tx_hash = self.hashout_hex(tx_hash)
-            txpoint = {
-                    "nTime":    int(nTime),
-                    #"chain_id": int(chain_id),
-                    "height":   int(height),
-                    "is_in":    int(is_in),
-                    "blk_hash": self.hashout_hex(blk_hash),
-                    "tx_hash":  tx_hash,
-                    "tx_id":    int(tx_id),
-                    "pos":      int(pos),
-                    "value":    int(value),
-                    }
-
-            txpoints.append(txpoint)
-            known_tx.append(self.hashout_hex(tx_hash))
-
-
-        # todo: sort them really...
-        txpoints = sorted(txpoints, key=operator.itemgetter("nTime"))
-
-        # read memory pool
-        rows = []
-        rows += self.get_address_in_rows_memorypool( dbhash )
-        rows += self.get_address_out_rows_memorypool( dbhash )
-        for row in rows:
-            is_in, tx_hash, tx_id, pos, value = row
-            tx_hash = self.hashout_hex(tx_hash)
-            if tx_hash in known_tx:
-                continue
-            #print "mempool", tx_hash
-            txpoint = {
-                    "nTime":    0,
-                    "chain_id": 1,
-                    "height":   0,
-                    "is_in":    int(is_in),
-                    "blk_hash": 'mempool',
-                    "tx_hash":  tx_hash,
-                    "tx_id":    int(tx_id),
-                    "pos":      int(pos),
-                    "value":    int(value),
-                    }
-            txpoints.append(txpoint)
-
-
-        for txpoint in txpoints:
-            tx_id = txpoint['tx_id']
-            
-            txinputs = []
-            inrows = self.get_tx_inputs(tx_id)
-            for row in inrows:
-                _hash = self.binout(row[6])
-                address = hash_to_address(chr(0), _hash)
-                txinputs.append(address)
-            txpoint['inputs'] = txinputs
-            txoutputs = []
-            outrows = self.get_tx_outputs(tx_id)
-            for row in outrows:
-                _hash = self.binout(row[6])
-                address = hash_to_address(chr(0), _hash)
-                txoutputs.append(address)
-            txpoint['outputs'] = txoutputs
-
-            # for all unspent inputs, I want their scriptpubkey. (actually I could deduce it from the address)
-            if not txpoint['is_in']:
-                # detect if already redeemed...
-                for row in outrows:
-                    if row[6] == dbhash: break
-                else:
-                    raise
-                #row = self.get_tx_output(tx_id,dbhash)
-                # pos, script, value, o_hash, o_id, o_pos, binaddr = row
-                # if not redeemed, we add the script
-                if row:
-                    if not row[4]: txpoint['raw_scriptPubKey'] = row[1]
-
-
-        return txpoints
-
-
-    def get_status(self, addr):
-        # last block for an address
-        tx_points = self.get_txpoints(addr)
-        if not tx_points:
-            return None
-        else:
-            return tx_points[-1]['blk_hash']
 
+def random_string(N):
+    import random, string
+    return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N))
 
-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
 
 
-def listen_thread(store):
+def modified_addresses(a_session):
+    #t1 = time.time()
+    import copy
+    session = copy.deepcopy(a_session)
+    addresses = session['addresses']
+    session['last_time'] = time.time()
+    ret = {}
+    k = 0
+    for addr in addresses:
+        status = store.get_status( addr )
+        msg_id, last_status = addresses.get( addr )
+        if last_status != status:
+            addresses[addr] = msg_id, status
+            ret[addr] = status
+
+    #t2 = time.time() - t1 
+    #if t2 > 10: print "high load:", session_id, "%d/%d"%(k,len(addresses)), t2
+    return ret, addresses
+
+
+def poll_session(session_id): 
+    # native
+    session = sessions.get(session_id)
+    if session is None:
+        print time.asctime(), "session not found", session_id
+        return -1, {}
+    else:
+        sessions[session_id]['last_time'] = time.time()
+        ret, addresses = modified_addresses(session)
+        if ret: sessions[session_id]['addresses'] = addresses
+        return repr( (store.block_number,ret))
+
+
+def add_address_to_session(session_id, address):
+    status = store.get_status(address)
+    sessions[session_id]['addresses'][address] = ("", status)
+    sessions[session_id]['last_time'] = time.time()
+    return status
+
+
+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):
+    """deprecated in 0.42, wad replaced by add_address_to_session"""
+    sessions[session_id]['addresses'] = {}
+    for a in addresses:
+        sessions[session_id]['addresses'][a] = ''
+    sessions[session_id]['last_time'] = time.time()
+    return 'ok'
+
+
+def native_server_thread():
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    s.bind((HOST, PORT))
+    s.bind((config.get('server','host'), config.getint('server','port')))
     s.listen(1)
     while not stopping:
         conn, addr = s.accept()
-        thread.start_new_thread(client_thread, (addr, conn,))
+        try:
+            thread.start_new_thread(native_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):
+def native_client_thread(ipaddr,conn):
     #print "client thread", ipaddr
     try:
         ipaddr = ipaddr[0]
@@ -301,83 +156,19 @@ def client_thread(ipaddr,conn):
         while 1:
             d = conn.recv(1024)
             msg += d
-            if d[-1]=='#':
+            if not d: 
+                break
+            if '#' in msg:
+                msg = msg.split('#', 1)[0]
                 break
-
-        #print msg
-
         try:
-            cmd, data = ast.literal_eval(msg[:-1])
+            cmd, data = ast.literal_eval(msg)
         except:
-            print "syntax error", repr(msg)
+            print "syntax error", repr(msg), ipaddr
             conn.close()
             return
 
-        if cmd=='b':
-            out = "%d"%block_number
-        elif cmd=='session':
-            session_id = random_string(10)
-            try:
-                addresses = ast.literal_eval(data)
-            except:
-                print "error"
-                conn.close()
-                return
-
-            print time.asctime(), "session", ipaddr, session_id, addresses[0], len(addresses)
-
-            sessions[session_id] = {}
-            for a in addresses:
-                sessions[session_id][a] = ''
-            out = repr( (session_id, SERVER_MESSAGE) )
-            sessions_last_time[session_id] = time.time()
-
-        elif cmd=='poll': 
-            session_id = data
-            addresses = sessions.get(session_id)
-            if not addresses:
-                print "session not found", ipaddr
-                out = repr( (-1, {}))
-            else:
-                sessions_last_time[session_id] = time.time()
-                ret = {}
-                for addr in addresses:
-                    status = store.get_status( addr )
-                    last_status = sessions[session_id].get( addr )
-                    if last_status != status:
-                        sessions[session_id][addr] = status
-                        ret[addr] = status
-                out = repr( (block_number, ret ) )
-
-        elif cmd == 'h': 
-            # history
-            addr = data
-            h = store.get_txpoints( addr )
-            out = repr(h)
-
-        elif cmd == 'load': 
-            if PASSWORD == data:
-                out = repr( len(sessions) )
-            else:
-                out = 'wrong password'
-
-        elif cmd =='tx':        
-            out = send_tx(data)
-
-        elif cmd == 'stop':
-            global stopping
-            if PASSWORD == data:
-                stopping = True
-                out = 'ok'
-            else:
-                out = 'wrong password'
-
-        elif cmd == 'peers':
-            out = repr(peer_list.values())
-
-        else:
-            out = None
-
+        out = do_command(cmd, data, ipaddr)
         if out:
             #print ipaddr, cmd, len(out)
             try:
@@ -387,135 +178,244 @@ def client_thread(ipaddr,conn):
 
     finally:
         conn.close()
-    
 
-ds = BCDataStream.BCDataStream()
 
+def timestr():
+    return time.strftime("[%d/%m/%Y-%H:%M:%S]")
 
-def memorypool_update(store):
+# used by the native handler
+def do_command(cmd, data, ipaddr):
 
-    conn = bitcoinrpc.connect_to_local()
-    try:
-        v = conn.getmemorypool()
-    except:
-        print "cannot contact bitcoin daemmon"
-        return
-    v = v['transactions']
-    for hextx in v:
-        ds.clear()
-        ds.write(hextx.decode('hex'))
-        tx = deserialize.parse_Transaction(ds)
-        tx['hash'] = util.double_sha256(tx['tx'])
+    if cmd=='b':
+        out = "%d"%block_number
+
+    elif cmd in ['session','new_session']:
+        try:
+            if cmd == 'session':
+                addresses = ast.literal_eval(data)
+                version = "old"
+            else:
+                version, addresses = ast.literal_eval(data)
+                if version[0]=="0": version = "v" + version
+        except:
+            print "error", data
+            return None
+        print timestr(), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
+        out = new_session(version, addresses)
+
+    elif cmd=='address.subscribe':
+        try:
+            session_id, addr = ast.literal_eval(data)
+        except:
+            traceback.print_exc(file=sys.stdout)
+            print data
+            return None
+        out = add_address_to_session(session_id,addr)
+
+    elif cmd=='update_session':
+        try:
+            session_id, addresses = ast.literal_eval(data)
+        except:
+            traceback.print_exc(file=sys.stdout)
+            return None
+        print timestr(), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
+        out = update_session(session_id,addresses)
             
-        if store.tx_find_id_and_value(tx):
-            pass
-        else:
-            store.import_tx(tx, False)
-            #print tx['hash'][::-1].encode('hex')
-    store.commit()
+    elif cmd=='poll': 
+        out = poll_session(data)
+
+    elif cmd == 'h': 
+        address = data
+        out = repr( store.get_history( address ) )
+
+    elif cmd =='tx':
+        out = store.send_tx(data)
+        print timestr(), "sent tx:", ipaddr, out
 
+    elif cmd == 'peers':
+        out = repr(irc.get_peers())
 
+    else:
+        out = None
+
+    return out
 
 
 def clean_session_thread():
     while not stopping:
         time.sleep(30)
         t = time.time()
-        for k,t0 in sessions_last_time.items():
-            if t - t0 > 60:
-                print "lost session",k
+        for k,s in sessions.items():
+            if s.get('type') == 'persistent': continue
+            t0 = s['last_time']
+            if t - t0 > 5*60:
                 sessions.pop(k)
-                sessions_last_time.pop(k)
+                print "lost session", k
             
 
-def irc_thread():
-    global peer_list
-    NICK = 'E_'+random_string(10)
-    while not stopping:
-        try:
-            s = socket.socket()
-            s.connect(('irc.freenode.net', 6667))
-            s.send('USER '+NICK+' '+NICK+' bla :'+NICK+'\n') 
-            s.send('NICK '+NICK+'\n') 
-            s.send('JOIN #electrum\n')
-            t = 0
-            while not stopping:
-                line = s.recv(2048)
-                line = line.rstrip('\r\n')
-                line = line.split()
-                if line[0]=='PING': 
-                    s.send('PONG '+line[1]+'\n')
-                elif '353' in line: # answer to /names
-                    k = line.index('353')
-                    try:
-                        k2 = line.index('366')
-                    except:
-                        continue
-                    for item in line[k+1:k2]:
-                        if item[0:2] == 'E_':
-                            s.send('USERHOST %s\n'%item)
-                elif '302' in line: # answer to /userhost
-                    k = line.index('302')
-                    name = line[k+2].split('=')[0]
-                    host = line[k+2].split('@')[1]
-                    peer_list[name] = host
-                elif time.time() - t > 5*60:
-                    s.send('NAMES #electrum\n')
-                    t = time.time()
-        except:
-            traceback.print_exc(file=sys.stdout)
-        finally:
-            s.close()
+####################################################################
+
+
+from processor import Shared, Processor, Dispatcher
+from stratum_http import HttpServer
+from stratum import TcpServer
+
+class AbeProcessor(Processor):
+    def process(self,request):
+        message_id = request['id']
+        method = request['method']
+        params = request.get('params',[])
+        #print request
+
+        result = ''
+        if method == 'numblocks.subscribe':
+            result = store.block_number
+        elif method == 'address.subscribe':
+            address = params[0]
+            store.watch_address(address)
+            status = store.get_status(address)
+            result = status
+        elif method == 'client.version':
+            #session.version = params[0]
+            pass
+        elif method == 'server.banner':
+            result = config.get('server','banner').replace('\\n','\n')
+        elif method == 'server.peers':
+            result = irc.get_peers()
+        elif method == 'address.get_history':
+            address = params[0]
+            result = store.get_history( address ) 
+        elif method == 'transaction.broadcast':
+            txo = store.send_tx(params[0])
+            print "sent tx:", txo
+            result = txo 
+        else:
+            print "unknown method", request
+
+        if result!='':
+            response = { 'id':message_id, 'method':method, 'params':params, 'result':result }
+            self.push_response(response)
+
+    def get_status(self,addr):
+        return store.get_status(addr)
+
+
+
+####################################################################
+
+
+
+class Irc(threading.Thread):
+
+    def __init__(self, processor):
+        self.processor = processor
+        threading.Thread.__init__(self)
+        self.daemon = True
+        self.peers = {}
+
+    def get_peers(self):
+        return self.peers.values()
+
+    def run(self):
+        NICK = 'E_'+random_string(10)
+        while not self.processor.shared.stopped():
+            try:
+                s = socket.socket()
+                s.connect(('irc.freenode.net', 6667))
+                s.send('USER electrum 0 * :'+config.get('server','host')+' '+config.get('server','ircname')+'\n')
+                s.send('NICK '+NICK+'\n')
+                s.send('JOIN #electrum\n')
+                sf = s.makefile('r', 0)
+                t = 0
+                while not self.processor.shared.stopped():
+                    line = sf.readline()
+                    line = line.rstrip('\r\n')
+                    line = line.split()
+                    if line[0]=='PING': 
+                        s.send('PONG '+line[1]+'\n')
+                    elif '353' in line: # answer to /names
+                        k = line.index('353')
+                        for item in line[k+1:]:
+                            if item[0:2] == 'E_':
+                                s.send('WHO %s\n'%item)
+                    elif '352' in line: # answer to /who
+                        # warning: this is a horrible hack which apparently works
+                        k = line.index('352')
+                        ip = line[k+4]
+                        ip = socket.gethostbyname(ip)
+                        name = line[k+6]
+                        host = line[k+9]
+                        self.peers[name] = (ip,host)
+                    if time.time() - t > 5*60:
+                        self.processor.push_response({'method':'server.peers', 'result':[self.get_peers()]})
+                        s.send('NAMES #electrum\n')
+                        t = time.time()
+                        self.peers = {}
+            except:
+                traceback.print_exc(file=sys.stdout)
+            finally:
+                sf.close()
+                s.close()
 
 
-import traceback
 
 
 if __name__ == '__main__':
 
     if len(sys.argv)>1:
+        import jsonrpclib
+        server = jsonrpclib.Server('http://%s:8081'%config.get('server','host'))
         cmd = sys.argv[1]
         if cmd == 'load':
-            request = "('load','%s')#"%PASSWORD
+            out = server.load(password)
         elif cmd == 'peers':
-            request = "('peers','')#"
+            out = server.server.peers()
         elif cmd == 'stop':
-            request = "('stop','%s')#"%PASSWORD
-
-        s = socket.socket( socket.AF_INET, socket.SOCK_STREAM)
-        s.connect(( HOST, PORT))
-        s.send( request )
-        out = ''
-        while 1:
-            msg = s.recv(1024)
-            if msg: out += msg
-            else: break
-        s.close()
+            out = server.stop(password)
+        elif cmd == 'clear_cache':
+            out = server.clear_cache(password)
+        elif cmd == 'get_cache':
+            out = server.get_cache(password,sys.argv[2])
+        elif cmd == 'h':
+            out = server.address.get_history(sys.argv[2])
+        elif cmd == 'tx':
+            out = server.transaction.broadcast(sys.argv[2])
+        elif cmd == 'b':
+            out = server.numblocks.subscribe()
+        else:
+            out = "Unknown command: '%s'" % cmd
         print out
         sys.exit(0)
 
+    # backend
+    store = abe_backend.AbeStore(config)
 
-    print "starting Electrum server"
-    conf = DataStore.CONFIG_DEFAULTS
-    args, argv = readconf.parse_argv( [], conf)
-    args.dbtype='psycopg2'
-    args.connect_args = {"database":"abe"}
-    store = MyStore(args)
-
-    thread.start_new_thread(listen_thread, (store,))
+    # old protocol
+    thread.start_new_thread(native_server_thread, ())
     thread.start_new_thread(clean_session_thread, ())
-    thread.start_new_thread(irc_thread, ())
 
-    while not stopping:
-        try:
-            dblock.acquire()
-            store.catch_up()
-            memorypool_update(store)
-            block_number = store.get_block_number(1)
-            dblock.release()
-        except:
-            traceback.print_exc(file=sys.stdout)
-        time.sleep(10)
+    processor = AbeProcessor()
+    shared = Shared()
+    # Bind shared to processor since constructor is user defined
+    processor.shared = shared
+    processor.start()
+    # dispatcher
+    dispatcher = Dispatcher(shared, processor)
+    dispatcher.start()
+    # Create various transports we need
+    transports = [ TcpServer(shared, processor, "ecdsa.org",50001),
+                   HttpServer(shared, processor, "ecdsa.org",8081)
+                   ]
+    for server in transports:
+        server.start()
+
 
+    if (config.get('server','irc') == 'yes' ):
+       irc = Irc(processor)
+        irc.start()
+
+
+    print "starting Electrum server"
+    store.run(processor)
     print "server stopped"