X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=8050c55e413eabd9441cab30ae0e1a49b42d4338;hb=1ec6053579c72699825d723bb1ef41c702e8c428;hp=78c409848da6c04a62f34d4617451b760504d4c5;hpb=24bd9b7ebda29e5f760a837c96b7a2780f3c12a6;p=electrum-server.git diff --git a/server.py b/server.py index 78c4098..8050c55 100755 --- a/server.py +++ b/server.py @@ -25,7 +25,7 @@ Todo: """ -import time, socket, operator, thread, ast, sys,re +import time, json, socket, operator, thread, ast, sys,re import psycopg2, binascii from Abe.abe import hash_to_address, decode_check_address @@ -50,7 +50,6 @@ config.set('server', 'host', 'localhost') config.set('server', 'port', 50000) config.set('server', 'password', '') config.set('server', 'irc', 'yes') -config.set('server', 'cache', 'no') config.set('server', 'ircname', 'Electrum server') config.add_section('database') config.set('database', 'type', 'psycopg2') @@ -63,22 +62,48 @@ 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 +old_block_number = -1 sessions = {} +sessions_sub_numblocks = [] # sessions that have subscribed to the service + dblock = thread.allocate_lock() peer_list = {} wallets = {} # for ultra-light clients such as bccapi +from Queue import Queue +input_queue = Queue() +output_queue = Queue() +address_queue = Queue() + class MyStore(Datastore_class): - def import_tx(self, tx, is_coinbase): - tx_id = super(MyStore, self).import_tx(tx, is_coinbase) - if config.get('server', 'cache') == 'yes': self.update_tx_cache(tx_id) + def import_block(self, b, chain_ids=frozenset()): + block_id = super(MyStore, self).import_block(b, chain_ids) + print "import block", block_id + for pos in xrange(len(b['transactions'])): + tx = b['transactions'][pos] + if 'hash' not in tx: + tx['hash'] = util.double_sha256(tx['tx']) + tx_id = store.tx_find_id_and_value(tx) + if tx_id: + self.update_tx_cache(tx_id) + else: + print "error: import_block: no tx_id" + return block_id + def update_tx_cache(self, txid): inrows = self.get_tx_inputs(txid, False) @@ -88,6 +113,8 @@ class MyStore(Datastore_class): if self.tx_cache.has_key(address): print "cache: invalidating", address self.tx_cache.pop(address) + address_queue.put(address) + outrows = self.get_tx_outputs(txid, False) for row in outrows: _hash = store.binout(row[6]) @@ -95,6 +122,7 @@ class MyStore(Datastore_class): if self.tx_cache.has_key(address): print "cache: invalidating", address self.tx_cache.pop(address) + address_queue.put(address) def safe_sql(self,sql, params=(), lock=True): try: @@ -209,10 +237,9 @@ class MyStore(Datastore_class): def get_history(self, addr): - if config.get('server','cache') == 'yes': - cached_version = self.tx_cache.get( addr ) - if cached_version is not None: - return cached_version + cached_version = self.tx_cache.get( addr ) + if cached_version is not None: + return cached_version version, binaddr = decode_check_address(addr) if binaddr is None: @@ -235,7 +262,6 @@ class MyStore(Datastore_class): 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), @@ -274,7 +300,6 @@ class MyStore(Datastore_class): #print "mempool", tx_hash txpoint = { "nTime": 0, - #"chain_id": 1, "height": 0, "is_in": int(is_in), "blk_hash": 'mempool', @@ -318,7 +343,7 @@ class MyStore(Datastore_class): if not row[4]: txpoint['raw_scriptPubKey'] = row[1] # cache result - if config.get('server','cache') == 'yes' and not address_has_mempool: + if not address_has_mempool: self.tx_cache[addr] = txpoints return txpoints @@ -346,7 +371,7 @@ def send_tx(tx): respdata = urllib.urlopen(bitcoind_url, postdata).read() r = loads(respdata) if r['error'] != None: - out = "error: transaction rejected by memorypool" + out = "error: transaction rejected by memorypool\n"+tx else: out = r['result'] return out @@ -401,18 +426,7 @@ def poll_session(session_id): 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) - + status = get_address_status( addr ) last_status = addresses.get( addr ) if last_status != status: addresses[addr] = status @@ -427,6 +441,57 @@ def poll_session(session_id): return out +def do_update_address(addr): + # an address was involved in a transaction; we check if it was subscribed to in a session + # the address can be subscribed in several sessions; the cache should ensure that we don't do redundant requests + for session_id in sessions.keys(): + session = sessions[session_id] + if session.get('type') != 'subscribe': continue + addresses = session['addresses'].keys() + + if addr in addresses: + print "address ", addr, "is watched by", session_id + status = get_address_status( addr ) + last_status = session['addresses'][addr] + if last_status != status: + print "sending new status for %s:"%addr, status + send_status(session_id,addr,status) + sessions[session_id]['addresses'][addr] = status + + +def get_address_status(addr): + # get address 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) + return status + + +def send_numblocks(session_id): + out = json.dumps( {'method':'numblocks.subscribe', 'result':block_number} ) + output_queue.put((session_id, out)) + +def send_status(session_id, address, status): + out = json.dumps( { 'method':'address.subscribe', 'address':address, 'status':status } ) + output_queue.put((session_id, out)) + +def subscribe_to_numblocks(session_id): + sessions_sub_numblocks.append(session_id) + send_numblocks(session_id) + +def subscribe_to_address(session_id, address): + status = get_address_status(address) + sessions[session_id]['type'] = 'subscribe' + sessions[session_id]['addresses'][address] = status + sessions[session_id]['last_time'] = time.time() + send_status(session_id, address, status) + def new_session(version, addresses): session_id = random_string(10) sessions[session_id] = { 'addresses':{}, 'version':version } @@ -443,18 +508,21 @@ def update_session(session_id,addresses): sessions[session_id]['last_time'] = time.time() return 'ok' -def listen_thread(store): +def native_server_thread(): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) 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 client_thread(ipaddr,conn): +def native_client_thread(ipaddr,conn): #print "client thread", ipaddr try: ipaddr = ipaddr[0] @@ -486,6 +554,8 @@ def client_thread(ipaddr,conn): conn.close() + +# used by the native handler def do_command(cmd, data, ipaddr): timestr = time.strftime("[%d/%m/%Y-%H:%M:%S]") @@ -591,9 +661,133 @@ def do_command(cmd, data, ipaddr): +#################################################################### + +def tcp_server_thread(): + thread.start_new_thread(process_input_queue, ()) + thread.start_new_thread(process_output_queue, ()) + + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + s.bind((config.get('server','host'), 50001)) + s.listen(1) + while not stopping: + conn, addr = s.accept() + try: + thread.start_new_thread(tcp_client_thread, (addr, conn,)) + except: + # can't start new thread if there is no memory.. + traceback.print_exc(file=sys.stdout) + + +def close_session(session_id): + print "lost connection", session_id + sessions.pop(session_id) + if session_id in sessions_sub_numblocks: + sessions_sub_numblocks.remove(session_id) + + +# one thread per client. put requests in a queue. +def tcp_client_thread(ipaddr,conn): + """ use a persistent connection. put commands in a queue.""" + print "persistent client thread", ipaddr + global sessions + + session_id = random_string(10) + sessions[session_id] = { 'conn':conn, 'addresses':{}, 'version':'unknown' } + + ipaddr = ipaddr[0] + msg = '' + + while not stopping: + try: + d = conn.recv(1024) + except socket.error: + d = '' + if not d: + close_session(session_id) + break + + msg += d + while True: + s = msg.find('\n') + if s ==-1: + break + else: + c = msg[0:s].strip() + msg = msg[s+1:] + if c == 'quit': + conn.close() + close_session(session_id) + return + try: + c = json.loads(c) + except: + print "json error", repr(c) + continue + try: + cmd = c.get('method') + data = c.get('params') + except: + print "syntax error", repr(c), ipaddr + continue + + # add to queue + input_queue.put((session_id, cmd, data)) + + + +# read commands from the input queue. perform requests, etc. this should be called from the main thread. +def process_input_queue(): + while not stopping: + session_id, cmd, data = input_queue.get() + if session_id not in sessions.keys(): + continue + out = None + if cmd == 'address.subscribe': + subscribe_to_address(session_id,data) + elif cmd == 'numblocks.subscribe': + subscribe_to_numblocks(session_id) + elif cmd == 'client.version': + sessions[session_id]['version'] = data + elif cmd == 'server.banner': + out = json.dumps( { 'method':'server.banner', 'result':config.get('server','banner').replace('\\n','\n') } ) + elif cmd == 'server.peers': + out = json.dumps( { 'method':'server.peers', 'result':peer_list.values() } ) + elif cmd == 'address.get_history': + address = data + out = json.dumps( { 'method':'address.get_history', 'address':address, 'result':store.get_history( address ) } ) + elif cmd == 'transaction.broadcast': + txo = send_tx(data) + print "sent tx:", txo + out = json.dumps( { 'method':'transaction.broadcast', 'result':txo } ) + else: + print "unknown command", cmd + if out: + output_queue.put((session_id, out)) + +# this is a separate thread +def process_output_queue(): + while not stopping: + session_id, out = output_queue.get() + session = sessions.get(session_id) + if session: + try: + conn = session.get('conn') + conn.send(out+'\n') + except: + close_session(session_id) + + + + +#################################################################### + def memorypool_update(store): + ds = BCDataStream.BCDataStream() + previous_transactions = store.mempool_keys store.mempool_keys = [] postdata = dumps({"method": 'getmemorypool', 'params': [], 'id':'jsonrpc'}) @@ -608,25 +802,28 @@ def memorypool_update(store): ds.write(hextx.decode('hex')) tx = deserialize.parse_Transaction(ds) tx['hash'] = util.double_sha256(tx['tx']) - tx_hash = tx['hash'][::-1].encode('hex') + tx_hash = store.hashin(tx['hash']) + store.mempool_keys.append(tx_hash) if store.tx_find_id_and_value(tx): pass else: - store.import_tx(tx, False) + tx_id = store.import_tx(tx, False) + store.update_tx_cache(tx_id) store.commit() - def clean_session_thread(): while not stopping: time.sleep(30) t = time.time() for k,s in sessions.items(): + if s.get('type') == 'subscribe': continue t0 = s['last_time'] if t - t0 > 5*60: sessions.pop(k) + print "lost session", k def irc_thread(): @@ -672,7 +869,7 @@ def irc_thread(): -def jsonrpc_thread(store): +def http_server_thread(store): # see http://code.google.com/p/jsonrpclib/ from SocketServer import ThreadingMixIn from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer @@ -724,7 +921,6 @@ if __name__ == '__main__': print "starting Electrum server" - print "cache:", config.get('server', 'cache') conf = DataStore.CONFIG_DEFAULTS args, argv = readconf.parse_argv( [], conf) @@ -739,9 +935,13 @@ if __name__ == '__main__': store.tx_cache = {} store.mempool_keys = {} - thread.start_new_thread(listen_thread, (store,)) - thread.start_new_thread(jsonrpc_thread, (store,)) + # supported protocols + thread.start_new_thread(native_server_thread, ()) + thread.start_new_thread(tcp_server_thread, ()) + thread.start_new_thread(http_server_thread, (store,)) + thread.start_new_thread(clean_session_thread, ()) + if (config.get('server','irc') == 'yes' ): thread.start_new_thread(irc_thread, ()) @@ -750,7 +950,13 @@ if __name__ == '__main__': dblock.acquire() store.catch_up() memorypool_update(store) + block_number = store.get_block_number(1) + if block_number != old_block_number: + old_block_number = block_number + for session_id in sessions_sub_numblocks: + send_numblocks(session_id) + except IOError: print "IOError: cannot reach bitcoind" block_number = 0 @@ -759,6 +965,15 @@ if __name__ == '__main__': block_number = 0 finally: dblock.release() + + # do addresses + while True: + try: + addr = address_queue.get(False) + except: + break + do_update_address(addr) + time.sleep(10) print "server stopped"