RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'get_mempool' into develop

Browse Source
This commit is contained in:
Neil Booth 2016-11-18 21:52:56 +09:00
commit f7ceac839a
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/protocol.py
View File

@ -415,17 +415,20 @@ class ElectrumX(Session):
return {"block_height": height, "merkle": merkle_branch, "pos": pos} return {"block_height": height, "merkle": merkle_branch, "pos": pos}
async def get_history(self, hash168): def unconfirmed_history(self, hash168):
# Note history is ordered and mempool unordered in electrum-server # Note unconfirmed history is unordered in electrum-server
# For mempool, height is -1 if unconfirmed txins, otherwise 0 # Height is -1 if unconfirmed txins, otherwise 0
history = await self.async_get_history(hash168)
mempool = self.bp.mempool_transactions(hash168) mempool = self.bp.mempool_transactions(hash168)
return [{'tx_hash': tx_hash, 'height': -unconfirmed, 'fee': fee}
for tx_hash, fee, unconfirmed in mempool]
conf = tuple({'tx_hash': hash_to_str(tx_hash), 'height': height} async def get_history(self, hash168):
for tx_hash, height in history) # Note history is ordered but unconfirmed is unordered in e-s
unconf = tuple({'tx_hash': tx_hash, 'height': -unconfirmed, 'fee': fee} history = await self.async_get_history(hash168)
for tx_hash, fee, unconfirmed in mempool) conf = [{'tx_hash': hash_to_str(tx_hash), 'height': height}
return conf + unconf for tx_hash, height in history]
return conf + self.unconfirmed_history(hash168)
def get_chunk(self, index): def get_chunk(self, index):
'''Return header chunk as hex. Index is a non-negative integer.''' '''Return header chunk as hex. Index is a non-negative integer.'''
@ -476,7 +479,7 @@ class ElectrumX(Session):
async def address_get_mempool(self, params): async def address_get_mempool(self, params):
hash168 = self.extract_hash168(params) hash168 = self.extract_hash168(params)
raise self.RPCError('get_mempool is not yet implemented') return self.unconfirmed_history(hash168)
async def address_get_proof(self, params): async def address_get_proof(self, params):
hash168 = self.extract_hash168(params) hash168 = self.extract_hash168(params)