X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=5d1b1e01b031ec7f7c1ff2646188b62a5073b507;hb=b328090bcd9b05790a638f2a99ef7fcc5056a6c8;hp=d8a3683a502f9f99520876667cd899a0eb8331f0;hpb=851dc213489be9439a841ee168f0029bae281e6d;p=electrum-server.git diff --git a/server.py b/server.py index d8a3683..5d1b1e0 100755 --- 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 @@ -25,78 +25,43 @@ Todo: """ -import time, json, socket, operator, thread, ast, sys,re -import psycopg2, binascii - 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 -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') - config.readfp(f) - f.close() -except: - print "Could not read electrum.conf. I will use the default values." +import psycopg2, binascii -try: - f = open('/etc/electrum.banner','r') - config.set('server','banner', f.read()) - f.close() -except: - pass +import thread, traceback, sys, urllib, operator +from json import dumps, loads -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 +class MyStore(Datastore_class): -m_sessions = [{}] # served by http + def __init__(self, config): + conf = DataStore.CONFIG_DEFAULTS + args, argv = readconf.parse_argv( [], conf) + args.dbtype = config.get('database','type') + if args.dbtype == 'sqlite3': + args.connect_args = { 'database' : config.get('database','database') } + elif args.dbtype == 'MySQLdb': + args.connect_args = { 'db' : config.get('database','database'), 'user' : config.get('database','username'), 'passwd' : config.get('database','password') } + elif args.dbtype == 'psycopg2': + args.connect_args = { 'database' : config.get('database','database') } -dblock = thread.allocate_lock() -peer_list = {} + Datastore_class.__init__(self,args) -wallets = {} # for ultra-light clients such as bccapi + self.tx_cache = {} + self.mempool_keys = {} + self.bitcoind_url = 'http://%s:%s@%s:%s/' % ( config.get('bitcoind','user'), config.get('bitcoind','password'), config.get('bitcoind','host'), config.get('bitcoind','port')) -from Queue import Queue -input_queue = Queue() -output_queue = Queue() -address_queue = Queue() + self.address_queue = Queue() + self.dblock = thread.allocate_lock() -class MyStore(Datastore_class): def import_block(self, b, chain_ids=frozenset()): block_id = super(MyStore, self).import_block(b, chain_ids) - #print "block", block_id for pos in xrange(len(b['transactions'])): tx = b['transactions'][pos] if 'hash' not in tx: @@ -112,27 +77,27 @@ class MyStore(Datastore_class): def update_tx_cache(self, txid): inrows = self.get_tx_inputs(txid, False) for row in inrows: - _hash = store.binout(row[6]) + _hash = self.binout(row[6]) address = hash_to_address(chr(0), _hash) if self.tx_cache.has_key(address): print "cache: invalidating", address self.tx_cache.pop(address) - address_queue.put(address) + self.address_queue.put(address) outrows = self.get_tx_outputs(txid, False) for row in outrows: - _hash = store.binout(row[6]) + _hash = self.binout(row[6]) address = hash_to_address(chr(0), _hash) if self.tx_cache.has_key(address): print "cache: invalidating", address self.tx_cache.pop(address) - address_queue.put(address) + self.address_queue.put(address) def safe_sql(self,sql, params=(), lock=True): try: - if lock: dblock.acquire() + if lock: self.dblock.acquire() ret = self.selectall(sql,params) - if lock: dblock.release() + if lock: self.dblock.release() return ret except: print "sql error", sql @@ -354,31 +319,119 @@ class MyStore(Datastore_class): -class Direct_Interface(Interface): - def __init__(self): - pass + def memorypool_update(store): - def handler(self, method, params = ''): - cmds = {'session.new':new_session, - 'session.poll':poll_session, - 'session.update':update_session, - 'transaction.broadcast':send_tx, - 'address.get_history':store.get_history - } - func = cmds[method] - return func( params ) + ds = BCDataStream.BCDataStream() + previous_transactions = store.mempool_keys + store.mempool_keys = [] + postdata = dumps({"method": 'getmemorypool', 'params': [], 'id':'jsonrpc'}) + respdata = urllib.urlopen(store.bitcoind_url, postdata).read() + r = loads(respdata) + if r['error'] != None: + return + + v = r['result'].get('transactions') + for hextx in v: + ds.clear() + ds.write(hextx.decode('hex')) + tx = deserialize.parse_Transaction(ds) + tx['hash'] = util.double_sha256(tx['tx']) + tx_hash = store.hashin(tx['hash']) + + store.mempool_keys.append(tx_hash) + if store.tx_find_id_and_value(tx): + pass + else: + tx_id = store.import_tx(tx, False) + store.update_tx_cache(tx_id) + + store.commit() + + + def send_tx(self,tx): + postdata = dumps({"method": 'importtransaction', 'params': [tx], 'id':'jsonrpc'}) + respdata = urllib.urlopen(self.bitcoind_url, postdata).read() + r = loads(respdata) + if r['error'] != None: + out = "error: transaction rejected by memorypool\n"+tx + else: + out = r['result'] + return out + + + def main_iteration(store): + try: + store.dblock.acquire() + store.catch_up() + store.memorypool_update() + block_number = store.get_block_number(1) + + except IOError: + print "IOError: cannot reach bitcoind" + block_number = 0 + except: + traceback.print_exc(file=sys.stdout) + block_number = 0 + finally: + store.dblock.release() + + return block_number + + + +import time, json, socket, operator, thread, ast, sys, re, traceback +import ConfigParser +from json import dumps, loads +import urllib + + +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') + config.readfp(f) + f.close() +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') + +stopping = False +block_number = -1 +sessions = {} +sessions_sub_numblocks = {} # sessions that have subscribed to the service + +m_sessions = [{}] # served by http + +peer_list = {} + +wallets = {} # for ultra-light clients such as bccapi + +from Queue import Queue +input_queue = Queue() +output_queue = Queue() -def send_tx(tx): - 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\n"+tx - else: - out = r['result'] - return out @@ -403,40 +456,27 @@ def cmd_load(_,__,pw): 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 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 = get_address_status( addr ) + msg_id, last_status = addresses.get( addr ) + if last_status != status: + addresses[addr] = msg_id, status + ret[addr] = status - -def modified_addresses(session): - if 1: - 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 - status = get_address_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 + #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): @@ -446,6 +486,7 @@ def poll_session(session_id): 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( (block_number,ret)) @@ -456,6 +497,7 @@ def poll_session_json(session_id, message_id): if session is None: raise BaseException("session not found %s"%session_id) else: + m_sessions[0][session_id]['last_time'] = time.time() out = [] ret, addresses = modified_addresses(session) if ret: @@ -542,7 +584,7 @@ def add_address_to_session_json(session_id, message_id, address): def add_address_to_session(session_id, address): status = get_address_status(address) - sessions[session_id]['addresses'][addr] = ("", status) + sessions[session_id]['addresses'][address] = ("", status) sessions[session_id]['last_time'] = time.time() return status @@ -657,7 +699,8 @@ def do_command(cmd, data, ipaddr): try: session_id, addr = ast.literal_eval(data) except: - print "error" + traceback.print_exc(file=sys.stdout) + print data return None out = add_address_to_session(session_id,addr) @@ -665,57 +708,10 @@ def do_command(cmd, data, ipaddr): try: session_id, addresses = ast.literal_eval(data) except: - print "error" + 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) - - elif cmd == 'bccapi_login': - import electrum - print "data",data - v, k = ast.literal_eval(data) - master_public_key = k.decode('hex') # todo: sanitize. no need to decode twice... - print master_public_key - wallet_id = random_string(10) - w = Wallet( Direct_Interface() ) - w.master_public_key = master_public_key.decode('hex') - w.synchronize() - wallets[wallet_id] = w - out = wallet_id - print "wallets", wallets - - elif cmd == 'bccapi_getAccountInfo': - from wallet import int_to_hex - v, wallet_id = ast.literal_eval(data) - w = wallets.get(wallet_id) - if w is not None: - num = len(w.addresses) - c, u = w.get_balance() - out = int_to_hex(num,4) + int_to_hex(c,8) + int_to_hex( c+u, 8 ) - out = out.decode('hex') - else: - print "error",data - out = "error" - - elif cmd == 'bccapi_getAccountStatement': - from wallet import int_to_hex - v, wallet_id = ast.literal_eval(data) - w = wallets.get(wallet_id) - if w is not None: - num = len(w.addresses) - c, u = w.get_balance() - total_records = num_records = 0 - out = int_to_hex(num,4) + int_to_hex(c,8) + int_to_hex( c+u, 8 ) + int_to_hex( total_records ) + int_to_hex( num_records ) - out = out.decode('hex') - else: - print "error",data - out = "error" - - elif cmd == 'bccapi_getSendCoinForm': - out = '' - - elif cmd == 'bccapi_submitTransaction': - out = '' elif cmd=='poll': out = poll_session(data) @@ -726,10 +722,10 @@ def do_command(cmd, data, ipaddr): out = repr( store.get_history( address ) ) elif cmd == 'load': - out = cmd_load(data) + out = cmd_load(None,None,data) elif cmd =='tx': - out = send_tx(data) + out = store.send_tx(data) print timestr(), "sent tx:", ipaddr, out elif cmd == 'stop': @@ -845,10 +841,9 @@ def process_input_queue(): address = data[0] out = { 'result':store.get_history( address ) } elif method == 'transaction.broadcast': - postdata = dumps({"method": 'importtransaction', 'params': [data], 'id':'jsonrpc'}) - txo = urllib.urlopen(bitcoind_url, postdata).read() + txo = store.send_tx(data[0]) print "sent tx:", txo - out = json.loads(txo) + out = {'result':txo } else: print "unknown command", method if out: @@ -874,34 +869,6 @@ def process_output_queue(): #################################################################### -def memorypool_update(store): - - ds = BCDataStream.BCDataStream() - previous_transactions = store.mempool_keys - store.mempool_keys = [] - - postdata = dumps({"method": 'getmemorypool', 'params': [], 'id':'jsonrpc'}) - respdata = urllib.urlopen(bitcoind_url, postdata).read() - r = loads(respdata) - if r['error'] != None: - return - - v = r['result'].get('transactions') - for hextx in v: - ds.clear() - ds.write(hextx.decode('hex')) - tx = deserialize.parse_Transaction(ds) - tx['hash'] = util.double_sha256(tx['tx']) - tx_hash = store.hashin(tx['hash']) - - store.mempool_keys.append(tx_hash) - if store.tx_find_id_and_value(tx): - pass - else: - tx_id = store.import_tx(tx, False) - store.update_tx_cache(tx_id) - - store.commit() def clean_session_thread(): @@ -961,7 +928,7 @@ def irc_thread(): def get_peers_json(_,__): return peer_list.values() -def http_server_thread(store): +def http_server_thread(): # see http://code.google.com/p/jsonrpclib/ from SocketServer import ThreadingMixIn from StratumJSONRPCServer import StratumJSONRPCServer @@ -970,10 +937,8 @@ def http_server_thread(store): server.register_function(get_peers_json, 'server.peers') server.register_function(cmd_stop, 'stop') server.register_function(cmd_load, 'load') - server.register_function(clear_cache, 'clear_cache') - server.register_function(get_cache, 'get_cache') server.register_function(get_banner, 'server.banner') - server.register_function(lambda a,b,c: send_tx(c), 'transaction.broadcast') + server.register_function(lambda a,b,c: store.send_tx(c), 'transaction.broadcast') server.register_function(address_get_history_json, 'address.get_history') server.register_function(add_address_to_session_json, 'address.subscribe') server.register_function(subscribe_to_numblocks_json, 'numblocks.subscribe') @@ -983,9 +948,6 @@ def http_server_thread(store): server.serve_forever() -import traceback - - if __name__ == '__main__': if len(sys.argv)>1: @@ -1013,62 +975,36 @@ if __name__ == '__main__': print out sys.exit(0) - - print "starting Electrum server" - - conf = DataStore.CONFIG_DEFAULTS - args, argv = readconf.parse_argv( [], conf) - args.dbtype= config.get('database','type') - if args.dbtype == 'sqlite3': - args.connect_args = { 'database' : config.get('database','database') } - elif args.dbtype == 'MySQLdb': - args.connect_args = { 'db' : config.get('database','database'), 'user' : config.get('database','username'), 'passwd' : config.get('database','password') } - elif args.dbtype == 'psycopg2': - args.connect_args = { 'database' : config.get('database','database') } - store = MyStore(args) - store.tx_cache = {} - store.mempool_keys = {} + # backend + # from db import MyStore + store = MyStore(config) # 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(http_server_thread, ()) thread.start_new_thread(clean_session_thread, ()) if (config.get('server','irc') == 'yes' ): 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) - if block_number != old_block_number: - old_block_number = block_number - for session_id in sessions_sub_numblocks.keys(): - send_numblocks(session_id) + print "starting Electrum server" - except IOError: - print "IOError: cannot reach bitcoind" - block_number = 0 - except: - traceback.print_exc(file=sys.stdout) - block_number = 0 - finally: - dblock.release() + old_block_number = None + while not stopping: + block_number = store.main_iteration() - # do addresses + if block_number != old_block_number: + old_block_number = block_number + for session_id in sessions_sub_numblocks.keys(): + send_numblocks(session_id) while True: try: - addr = address_queue.get(False) + addr = store.address_queue.get(False) except: break do_update_address(addr) time.sleep(10) - print "server stopped"