"""
-import time, socket, operator, thread, ast, sys
+import time, socket, operator, thread, ast, sys,re
import psycopg2, binascii
import bitcoinrpc
from Abe.DataStore import DataStore as Datastore_class
from Abe import DataStore, readconf, BCDataStream, deserialize, util, base58
+import ConfigParser
+
+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', 'ecdsa.org')
+config.set('server', 'port', 50000)
+config.set('server', 'password', '')
+config.set('server', 'irc', 'yes')
+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 dafault values."
stopping = False
-
+block_number = -1
sessions = {}
sessions_last_time = {}
dblock = thread.allocate_lock()
class MyStore(Datastore_class):
- def safe_sql(self,sql):
+ def safe_sql(self,sql, params=()):
try:
dblock.acquire()
- ret = self.selectall(sql)
+ ret = self.selectall(sql,params)
dblock.release()
return ret
except:
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)
+ WHERE pubkey.pubkey_hash = ?
+ AND cc.in_longest = 1""", (dbhash,))
def get_address_out_rows_memorypool(self, dbhash):
return self.safe_sql(""" SELECT
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))
+ WHERE pubkey.pubkey_hash = ? """, (dbhash,))
def get_address_in_rows(self, dbhash):
return self.safe_sql(""" SELECT
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))
+ WHERE pubkey.pubkey_hash = ?
+ AND cc.in_longest = 1""", (dbhash,))
def get_address_in_rows_memorypool(self, dbhash):
return self.safe_sql( """ SELECT
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))
+ WHERE pubkey.pubkey_hash = ? """, (dbhash,))
def get_txpoints(self, addr):
version, binaddr = decode_check_address(addr)
def listen_thread(store):
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()
return
if cmd=='b':
- out = "%d"%store.get_block_number(1)
-
+ out = "%d"%block_number
elif cmd=='session':
session_id = random_string(10)
try:
sessions[session_id] = {}
for a in addresses:
sessions[session_id][a] = ''
- out = repr( (session_id, SERVER_MESSAGE) )
+ out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
sessions_last_time[session_id] = time.time()
elif cmd=='poll':
if last_status != status:
sessions[session_id][addr] = status
ret[addr] = status
- out = repr( (store.get_block_number(1), ret ) )
+ out = repr( (block_number, ret ) )
elif cmd == 'h':
# history
out = repr(h)
elif cmd == 'load':
- if PASSWORD == data:
+ if config.get('server','password') == data:
out = repr( len(sessions) )
else:
out = 'wrong password'
elif cmd == 'stop':
global stopping
- if PASSWORD == data:
+ if config.get('server','password') == data:
stopping = True
out = 'ok'
else:
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('USER '+config.get('server','host')+' '+NICK+' bla :'+NICK+'\n')
+ s.send('NICK '+NICK+'\n')
s.send('JOIN #electrum\n')
t = 0
while not stopping:
s.send('PONG '+line[1]+'\n')
elif '353' in line: # answer to /names
k = line.index('353')
- k2 = line.index('366')
+ 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+1]
- host = line[k+2].split('@')[1]
- peer_list[name] = host
+ m = re.match( "^:(.*?)=\+~(.*?)@(.*?)$", line[k+2] )
+ if m:
+ name = m.group(1)
+ host = m.group(2)
+ ip = m.group(3)
+ peer_list[name] = (ip,host)
elif time.time() - t > 5*60:
s.send('NAMES #electrum\n')
t = time.time()
if len(sys.argv)>1:
cmd = sys.argv[1]
if cmd == 'load':
- request = "('load','%s')#"%PASSWORD
+ request = "('load','%s')#"%config.get('server','password')
elif cmd == 'peers':
request = "('peers','')#"
elif cmd == 'stop':
- request = "('stop','%s')#"%PASSWORD
+ request = "('stop','%s')#"%config.get('server','password')
s = socket.socket( socket.AF_INET, socket.SOCK_STREAM)
- s.connect(( HOST, PORT))
+ s.connect((config.get('server','host'), config.getint('server','port')))
s.send( request )
out = ''
while 1:
print "starting Electrum server"
conf = DataStore.CONFIG_DEFAULTS
args, argv = readconf.parse_argv( [], conf)
- args.dbtype='psycopg2'
- args.connect_args = {"database":"abe"}
+ 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','user'), 'passwd' : config.get('database','pass') }
+ elif args.dbtype == 'psycopg2':
+ args.connect_args = { 'database' : config.get('database','database') }
store = MyStore(args)
thread.start_new_thread(listen_thread, (store,))
thread.start_new_thread(clean_session_thread, ())
- thread.start_new_thread(irc_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)
dblock.release()
except:
traceback.print_exc(file=sys.stdout)
git://git.novaco.in / electrum-server.git / blobdiff