stopping = False
block_number = -1
sessions = {}
-sessions_last_time = {}
dblock = thread.allocate_lock()
-
peer_list = {}
-
class MyStore(Datastore_class):
def import_tx(self, tx, is_coinbase):
_hash = store.binout(row[6])
address = hash_to_address(chr(0), _hash)
if self.tx_cache.has_key(address):
- #print "cache: invalidating", address, self.ismempool
+ print "cache: invalidating", address, self.ismempool
self.tx_cache.pop(address)
outrows = self.get_tx_outputs(txid, False)
for row in outrows:
_hash = store.binout(row[6])
address = hash_to_address(chr(0), _hash)
if self.tx_cache.has_key(address):
- #print "cache: invalidating", address, self.ismempool
+ print "cache: invalidating", address, self.ismempool
self.tx_cache.pop(address)
def safe_sql(self,sql, params=(), lock=True):
rows = []
rows += self.get_address_in_rows_memorypool( dbhash )
rows += self.get_address_out_rows_memorypool( dbhash )
- address_has_no_mempool = (rows == [])
+ address_has_mempool = False
+
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
+ if tx_hash not in self.mempool_keys:
+ continue
+
+ address_has_mempool = True
#print "mempool", tx_hash
txpoint = {
"nTime": 0,
#"chain_id": 1,
"height": 0,
"is_in": int(is_in),
- "blk_hash": 'mempool',
+ "blk_hash": 'mempool',
"tx_hash": tx_hash,
"tx_id": int(tx_id),
"pos": int(pos),
if not row[4]: txpoint['raw_scriptPubKey'] = row[1]
# cache result
- if config.get('server','cache') == 'yes' and address_has_no_mempool:
+ if config.get('server','cache') == 'yes' and not address_has_mempool:
self.tx_cache[addr] = txpoints
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 send_tx(tx):
while 1:
d = conn.recv(1024)
msg += d
+ if not d:
+ break
if d[-1]=='#':
break
if cmd=='b':
out = "%d"%block_number
- elif cmd=='session':
+
+ elif cmd in ['session','new_session']:
session_id = random_string(10)
try:
- addresses = ast.literal_eval(data)
+ if cmd == 'session':
+ addresses = ast.literal_eval(data)
+ version = "old"
+ else:
+ version, addresses = ast.literal_eval(data)
+ version = "v"+version
except:
- print "error"
+ print "error", data
conn.close()
return
- print time.asctime(), "session", ipaddr, session_id, addresses[0], len(addresses)
+ print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
- sessions[session_id] = {}
+ sessions[session_id] = { 'addresses':{}, 'version':version, 'ip':ipaddr }
for a in addresses:
- sessions[session_id][a] = ''
+ sessions[session_id]['addresses'][a] = ''
out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
- sessions_last_time[session_id] = time.time()
+ sessions[session_id]['last_time'] = time.time()
+
+ elif cmd=='update_session':
+ try:
+ session_id, addresses = ast.literal_eval(data)
+ except:
+ print "error"
+ conn.close()
+ return
+
+ 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()
elif cmd=='poll':
session_id = data
- addresses = sessions.get(session_id)
- if not addresses:
- print "session not found", ipaddr
+ session = sessions.get(session_id)
+ if session is None:
+ print time.asctime(), "session not found", session_id, ipaddr
out = repr( (-1, {}))
else:
- sessions_last_time[session_id] = time.time()
+ t1 = time.time()
+ addresses = session['addresses']
+ session['last_time'] = time.time()
ret = {}
+ k = 0
for addr in addresses:
- status = store.get_status( addr )
- last_status = sessions[session_id].get( addr )
+ 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_txpoints(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 + ':%s'% lastpoint['tx_hash']
+
+ last_status = addresses.get( addr )
if last_status != status:
- sessions[session_id][addr] = 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
elif cmd == 'h':
# history
else:
out = 'wrong password'
- elif cmd =='tx':
+ elif cmd =='tx':
out = send_tx(data)
+ print "sent tx:", out
+
+ elif cmd =='clear_cache':
+ if config.get('server','password') == data:
+ self.tx_cache = {}
+ out = 'ok'
+ else:
+ out = 'wrong password'
+
+ elif cmd =='get_cache':
+ try:
+ pw, addr = data
+ except:
+ addr = None
+ if addr:
+ if config.get('server','password') == pw:
+ out = store.tx_cache.get(addr)
+ out = repr(out)
+ else:
+ out = 'wrong password'
+ else:
+ out = "error: "+ repr(data)
elif cmd == 'stop':
global stopping
def memorypool_update(store):
+ store.mempool_keys = []
conn = bitcoinrpc.connect_to_local()
try:
v = conn.getmemorypool()
ds.clear()
ds.write(hextx.decode('hex'))
tx = deserialize.parse_Transaction(ds)
- #print "new tx",tx
-
tx['hash'] = util.double_sha256(tx['tx'])
-
+ store.mempool_keys.append(tx['hash'][::-1].encode('hex'))
if store.tx_find_id_and_value(tx):
pass
- else:
+ else:
store.import_tx(tx, False)
store.commit()
-
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():
+ 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)
- sessions_last_time.pop(k)
def irc_thread():
name = line[k+6]
host = line[k+9]
peer_list[name] = (ip,host)
- elif time.time() - t > 5*60:
+ if time.time() - t > 5*60:
s.send('NAMES #electrum\n')
t = time.time()
peer_list = {}
request = "('peers','')#"
elif cmd == 'stop':
request = "('stop','%s')#"%config.get('server','password')
+ elif cmd == 'clear_cache':
+ request = "('clear_cache','%s')#"%config.get('server','password')
+ elif cmd == 'get_cache':
+ request = "('get_cache',('%s','%s'))#"%(config.get('server','password'),sys.argv[2])
elif cmd == 'h':
request = "('h','%s')#"%sys.argv[2]
+ elif cmd == 'b':
+ request = "('b','')#"
s = socket.socket( socket.AF_INET, socket.SOCK_STREAM)
s.connect((config.get('server','host'), config.getint('server','port')))
print "starting Electrum server"
+ print "cache:", config.get('server', 'cache')
+
conf = DataStore.CONFIG_DEFAULTS
args, argv = readconf.parse_argv( [], conf)
args.dbtype= config.get('database','type')
store = MyStore(args)
store.tx_cache = {}
store.ismempool = False
+ store.mempool_keys = {}
thread.start_new_thread(listen_thread, (store,))
thread.start_new_thread(clean_session_thread, ())
git://git.novaco.in / electrum-server.git / blobdiff