* 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
"""
stopping = False
block_number = -1
sessions = {}
-sessions_last_time = {}
dblock = thread.allocate_lock()
peer_list = {}
_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.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.tx_cache.pop(address)
def safe_sql(self,sql, params=(), lock=True):
JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
WHERE pubkey.pubkey_hash = ? """, (dbhash,))
- def get_txpoints(self, addr):
+ def get_history(self, addr):
if config.get('server','cache') == 'yes':
cached_version = self.tx_cache.get( addr )
version, binaddr = decode_check_address(addr)
if binaddr is None:
- return "err"
+ return None
+
dbhash = self.binin(binaddr)
rows = []
rows += self.get_address_out_rows( dbhash )
if tx_hash in known_tx:
continue
+ # this means that pending transactions were added to the db, even if they are not returned by getmemorypool
address_has_mempool = True
+
+ # this means pending transactions are returned by getmemorypool
+ if tx_hash not in self.mempool_keys:
+ continue
+
#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),
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):
import bitcoinrpc
try:
cmd, data = ast.literal_eval(msg[:-1])
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':
+ 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)
+ if version[0]=="0": version = "v" + version
except:
- print "error"
+ print "error", data
conn.close()
return
- print time.asctime(), "new session", ipaddr, session_id, addresses[0] if addresses else addresses, 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:
conn.close()
return
- print time.asctime(), "update session", ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses)
+ print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
- sessions[session_id] = {}
+ sessions[session_id]['addresses'] = {}
for a in addresses:
- sessions[session_id][a] = ''
+ sessions[session_id]['addresses'][a] = ''
out = 'ok'
- sessions_last_time[session_id] = time.time()
+ sessions[session_id]['last_time'] = time.time()
elif cmd=='poll':
session_id = data
- addresses = sessions.get(session_id)
- if addresses is None:
+ session = sessions.get(session_id)
+ if session is None:
print time.asctime(), "session not found", session_id, ipaddr
out = repr( (-1, {}))
else:
t1 = time.time()
- sessions_last_time[session_id] = 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 = store.get_status( addr )
+
+ # 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)
+
last_status = addresses.get( addr )
if last_status != status:
addresses[addr] = status
ret[addr] = status
if ret:
- sessions[session_id] = addresses
+ sessions[session_id]['addresses'] = addresses
out = repr( (block_number, ret ) )
t2 = time.time() - t1
if t2 > 10:
elif cmd == 'h':
# history
address = data
- out = repr( store.get_txpoints( address ) )
+ out = repr( store.get_history( address ) )
elif cmd == 'load':
if config.get('server','password') == data:
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 = {}
+ store.tx_cache = {}
out = 'ok'
else:
out = 'wrong password'
conn.close()
-ds = BCDataStream.BCDataStream()
def memorypool_update(store):
+ ds = BCDataStream.BCDataStream()
+ 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'])
-
+ tx_hash = tx['hash'][::-1].encode('hex')
+ store.mempool_keys.append(tx_hash)
if store.tx_find_id_and_value(tx):
pass
else:
-
def clean_session_thread():
while not stopping:
time.sleep(30)
t = time.time()
- for k,t0 in sessions_last_time.items():
+ for k,s in sessions.items():
+ t0 = s['last_time']
if t - t0 > 5*60:
- print time.asctime(), "lost session",k
+ print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "end session", s['ip']
sessions.pop(k)
- sessions_last_time.pop(k)
def irc_thread():
if len(sys.argv)>1:
cmd = sys.argv[1]
+ pw = config.get('server','password')
if cmd == 'load':
- request = "('load','%s')#"%config.get('server','password')
+ request = "('load','%s')#"%pw
elif cmd == 'peers':
request = "('peers','')#"
elif cmd == 'stop':
- request = "('stop','%s')#"%config.get('server','password')
+ request = "('stop','%s')#"%pw
elif cmd == 'clear_cache':
- request = "('clear_cache','%s')#"%config.get('server','password')
+ request = "('clear_cache','%s')#"%pw
elif cmd == 'get_cache':
- request = "('get_cache',('%s','%s'))#"%(config.get('server','password'),sys.argv[2])
+ request = "('get_cache',('%s','%s'))#"%(pw,sys.argv[2])
elif cmd == 'h':
request = "('h','%s')#"%sys.argv[2]
elif cmd == 'b':
args.connect_args = { 'database' : config.get('database','database') }
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, ())
try:
dblock.acquire()
store.catch_up()
- store.ismempool = True
memorypool_update(store)
- store.ismempool = False
block_number = store.get_block_number(1)
dblock.release()
except: