txpoint.pop('tx_id')
- # cache result
- # do not cache mempool results because statuses are ambiguous
- if not address_has_mempool:
- with self.cache_lock:
- self.tx_cache[addr] = txpoints
-
- return txpoints
- def get_history2(self, addr, cache_only=False):
- h = self.get_history(addr, cache_only)
- if cache_only and h==-1: return -1
+ txpoints = map(lambda x: {'tx_hash':x['tx_hash'], 'height':x['height']}, txpoints)
+ out = []
+ for item in txpoints:
+ if item not in out: out.append(item)
- out = map(lambda x: {'tx_hash':x['tx_hash'], 'height':x['height']}, h)
- out2 = []
- for item in out:
- if item not in out2: out2.append(item)
- return out2
+ # cache result
+ ## do not cache mempool results because statuses are ambiguous
+ #if not address_has_mempool:
+ with self.cache_lock:
+ self.tx_cache[addr] = out
+
+ return out
def get_status(self, addr, cache_only=False):
- # get address status, i.e. the last block for that address.
- tx_points = self.get_history(addr, cache_only)
- if cache_only and tx_points == -1: return -1
-
- if not tx_points:
- status = None
- else:
- lastpoint = tx_points[-1]
- status = lastpoint['block_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 get_status2(self, addr, cache_only=False):
# for 0.5 clients
- tx_points = self.get_history2(addr)
+ tx_points = self.get_history(addr, cache_only)
if cache_only and tx_points == -1: return -1
if not tx_points: return None
prev_block_hash,
block_height
FROM chain_summary
- WHERE block_height >= %d AND block_height< %d AND in_longest = 1"""%(index*2016, (index+1)*2016)
+ WHERE block_height >= %d AND block_height< %d AND in_longest = 1 ORDER BY block_height"""%(index*2016, (index+1)*2016)
out = self.safe_sql(sql)
msg = ''
ds = BCDataStream.BCDataStream()
postdata = dumps({"method": 'getrawmempool', 'params': [], 'id':'jsonrpc'})
respdata = urllib.urlopen(store.bitcoind_url, postdata).read()
+
r = loads(respdata)
if r['error'] != None:
print r['error']
return
mempool_hashes = r.get('result')
+ num_new_tx = 0
+
for tx_hash in mempool_hashes:
if tx_hash in store.known_mempool_hashes: continue
store.known_mempool_hashes.append(tx_hash)
+ num_new_tx += 1
postdata = dumps({"method": 'getrawtransaction', 'params': [tx_hash], 'id':'jsonrpc'})
respdata = urllib.urlopen(store.bitcoind_url, postdata).read()
store.commit()
store.known_mempool_hashes = mempool_hashes
+ return num_new_tx
def send_tx(self,tx):
def main_iteration(self):
with self.lock:
+ t1 = time.time()
self.catch_up()
- self.memorypool_update()
+ t2 = time.time()
+ time_catch_up = t2 - t1
+ n = self.memorypool_update()
+ time_mempool = time.time() - t2
height = self.get_block_number( self.chain_id )
- try: self.chunk_cache.pop(height/2016)
- except: pass
+
+ with self.cache_lock:
+ try:
+ self.chunk_cache.pop(height/2016)
+ except:
+ pass
block_header = self.get_block_header( height )
- return block_header
+ return block_header, time_catch_up, time_mempool, n
class BlockchainProcessor(Processor):
- def __init__(self, config):
+ def __init__(self, config, shared):
Processor.__init__(self)
self.store = AbeStore(config)
self.watched_addresses = []
+ self.shared = shared
# catch_up first
- self.block_header = self.store.main_iteration()
+ self.block_header, time_catch_up, time_mempool, n = self.store.main_iteration()
self.block_number = self.block_header.get('block_height')
print "blockchain: %d blocks"%self.block_number
def add_request(self, request):
# see if we can get if from cache. if not, add to queue
- if self.process( request, cache_only=True) == -1:
+ if self.process( request, cache_only = True) == -1:
self.queue.put(request)
error = str(e) + ': ' + address
print "error:", error
- elif method == 'blockchain.address.subscribe2':
- try:
- address = params[0]
- result = self.store.get_status2(address, cache_only)
- self.watch_address(address)
- except BaseException, e:
- error = str(e) + ': ' + address
- print "error:", error
-
elif method == 'blockchain.address.get_history':
try:
address = params[0]
error = str(e) + ': ' + address
print "error:", error
- elif method == 'blockchain.address.get_history2':
- try:
- address = params[0]
- result = self.store.get_history2( address, cache_only )
- except BaseException, e:
- error = str(e) + ': ' + address
- print "error:", error
-
elif method == 'blockchain.block.get_header':
if cache_only:
result = -1
def run_store_iteration(self):
try:
- t1 = time.time()
- block_header = self.store.main_iteration()
- t2 = time.time() - t1
+ block_header, time_catch_up, time_mempool, n = self.store.main_iteration()
except:
traceback.print_exc(file=sys.stdout)
print "terminating"
print "exit timer"
return
+ #print "block number: %d (%.3fs) mempool:%d (%.3fs)"%(self.block_number, time_catch_up, n, time_mempool)
+
if self.block_number != block_header.get('block_height'):
self.block_number = block_header.get('block_height')
- print "block number: %d (%.3f seconds)"%(self.block_number, t2)
+ print "block number: %d (%.3fs)"%(self.block_number, time_catch_up)
self.push_response({ 'id': None, 'method':'blockchain.numblocks.subscribe', 'params':[self.block_number] })
if self.block_header != block_header:
break
if addr in self.watched_addresses:
status = self.store.get_status( addr )
- status2 = self.store.get_status2( addr )
self.push_response({ 'id': None, 'method':'blockchain.address.subscribe', 'params':[addr, status] })
- self.push_response({ 'id': None, 'method':'blockchain.address.subscribe2', 'params':[addr, status2] })
threading.Timer(10, self.run_store_iteration).start()
git://git.novaco.in / electrum-server.git / blobdiff