self.tx_cache = {}
self.bitcoind_url = 'http://%s:%s@%s:%s/' % ( config.get('bitcoind','user'), config.get('bitcoind','password'), config.get('bitcoind','host'), config.get('bitcoind','port'))
+ self.chunk_cache = {}
+
self.address_queue = Queue()
- self.dblock = thread.allocate_lock()
+ self.lock = threading.Lock() # for the database
+ self.cache_lock = threading.Lock() # for the cache
self.last_tx_id = 0
self.known_mempool_hashes = []
+
def import_tx(self, tx, is_coinbase):
tx_id = super(AbeStore, self).import_tx(tx, is_coinbase)
continue
address = hash_to_address(chr(self.addrtype), _hash)
- if self.tx_cache.has_key(address):
- print "cache: invalidating", address
- self.tx_cache.pop(address)
+ with self.cache_lock:
+ if self.tx_cache.has_key(address):
+ print "cache: invalidating", address
+ self.tx_cache.pop(address)
+
self.address_queue.put(address)
outrows = self.get_tx_outputs(txid, False)
continue
address = hash_to_address(chr(self.addrtype), _hash)
- if self.tx_cache.has_key(address):
- print "cache: invalidating", address
- self.tx_cache.pop(address)
+ with self.cache_lock:
+ if self.tx_cache.has_key(address):
+ print "cache: invalidating", address
+ self.tx_cache.pop(address)
+
self.address_queue.put(address)
def safe_sql(self,sql, params=(), lock=True):
error = False
try:
- if lock: self.dblock.acquire()
+ if lock: self.lock.acquire()
ret = self.selectall(sql,params)
except:
error = True
traceback.print_exc(file=sys.stdout)
finally:
- if lock: self.dblock.release()
+ if lock: self.lock.release()
if error:
raise BaseException('sql error')
raise BaseException('limit reached')
return out
- def get_history(self, addr):
- cached_version = self.tx_cache.get( addr )
- if cached_version is not None:
- return cached_version
+
+ def get_history(self, addr, cache_only=False):
+ with self.cache_lock:
+ cached_version = self.tx_cache.get( addr )
+ if cached_version is not None:
+ return cached_version
+
+ if cache_only: return -1
version, binaddr = decode_check_address(addr)
if binaddr is None:
# cache result
# do not cache mempool results because statuses are ambiguous
if not address_has_mempool:
- self.tx_cache[addr] = txpoints
+ 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
+
+ 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
- def get_status(self,addr):
+
+ 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)
+ tx_points = self.get_history(addr, cache_only)
+ if cache_only and tx_points == -1: return -1
+
if not tx_points:
status = None
else:
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)
+ if cache_only and tx_points == -1: return -1
+
+ if not tx_points: return None
+ status = ''
+ for tx in tx_points:
+ status += tx.get('tx_hash') + ':%d:' % tx.get('height')
+ return hashlib.sha256( status ).digest().encode('hex')
+
def get_block_header(self, block_height):
out = self.safe_sql("""
def get_chunk(self, index):
+ with self.cache_lock:
+ msg = self.chunk_cache.get(index)
+ if msg: return msg
+
sql = """
SELECT
block_hash,
#print "hash", encode(Hash(msg.decode('hex')))
#if h.get('block_height')==1:break
+ with self.cache_lock:
+ self.chunk_cache[index] = msg
print "get_chunk", index, len(msg)
return msg
+ def get_raw_tx(self, tx_hash, height):
+ postdata = dumps({"method": 'getrawtransaction', 'params': [tx_hash, 0, height], 'id':'jsonrpc'})
+ respdata = urllib.urlopen(self.bitcoind_url, postdata).read()
+ r = loads(respdata)
+ if r['error'] != None:
+ raise BaseException(r['error'])
+
+ hextx = r.get('result')
+ return hextx
+
+
def get_tx_merkle(self, tx_hash):
out = self.safe_sql("""
return out
- def main_iteration(store):
- with store.dblock:
- store.catch_up()
- store.memorypool_update()
- height = store.get_block_number( store.chain_id )
+ def main_iteration(self):
+ with self.lock:
+ self.catch_up()
+ self.memorypool_update()
+ height = self.get_block_number( self.chain_id )
+ try: self.chunk_cache.pop(height/2016)
+ except: pass
- block_header = store.get_block_header( height )
+ block_header = self.get_block_header( height )
return block_header
threading.Timer(10, self.run_store_iteration).start()
- def process(self, request):
+
+ 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:
+ self.queue.put(request)
+
+
+ def process(self, request, cache_only = False):
#print "abe process", request
message_id = request['id']
elif method == 'blockchain.address.subscribe':
try:
address = params[0]
- result = self.store.get_status(address)
+ result = self.store.get_status(address, cache_only)
self.watch_address(address)
except BaseException, e:
error = str(e) + ': ' + address
print "error:", error
- elif method == 'blockchain.address.get_history':
+ elif method == 'blockchain.address.subscribe2':
try:
address = params[0]
- result = self.store.get_history( address )
+ 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.block.get_header':
+ elif method == 'blockchain.address.get_history':
try:
- height = params[0]
- result = self.store.get_block_header( height )
+ address = params[0]
+ result = self.store.get_history( address, cache_only )
except BaseException, e:
- error = str(e) + ': %d'% height
+ error = str(e) + ': ' + address
print "error:", error
- elif method == 'blockchain.block.get_chunk':
+ elif method == 'blockchain.address.get_history2':
try:
- index = params[0]
- result = self.store.get_chunk( index )
+ address = params[0]
+ result = self.store.get_history2( address, cache_only )
except BaseException, e:
- error = str(e) + ': %d'% index
+ error = str(e) + ': ' + address
print "error:", error
+ elif method == 'blockchain.block.get_header':
+ if cache_only:
+ result = -1
+ else:
+ try:
+ height = params[0]
+ result = self.store.get_block_header( height )
+ except BaseException, e:
+ error = str(e) + ': %d'% height
+ print "error:", error
+
+ elif method == 'blockchain.block.get_chunk':
+ if cache_only:
+ result = -1
+ else:
+ try:
+ index = params[0]
+ result = self.store.get_chunk( index )
+ except BaseException, e:
+ error = str(e) + ': %d'% index
+ print "error:", error
+
elif method == 'blockchain.transaction.broadcast':
txo = self.store.send_tx(params[0])
print "sent tx:", txo
result = txo
elif method == 'blockchain.transaction.get_merkle':
+ if cache_only:
+ result = -1
+ else:
+ try:
+ tx_hash = params[0]
+ result = self.store.get_tx_merkle(tx_hash )
+ except BaseException, e:
+ error = str(e) + ': ' + tx_hash
+ print "error:", error
+
+ elif method == 'blockchain.transaction.get':
try:
tx_hash = params[0]
- result = self.store.get_tx_merkle(tx_hash )
+ height = params[1]
+ result = self.store.get_raw_tx(tx_hash, height )
except BaseException, e:
error = str(e) + ': ' + tx_hash
print "error:", error
else:
error = "unknown method:%s"%method
+ if cache_only and result == -1: return -1
if error:
response = { 'id':message_id, 'error':error }
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