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

Fix bugs

Browse Source
This commit is contained in:
Neil Booth 2016-11-05 12:40:45 +09:00
parent 48b8b9332e
commit b5d1f401fd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/block_processor.py
View File

@ -222,7 +222,8 @@ class MemPool(LoggedClass):
.format(hash_to_str(txin.prev_hash),
txin.prev_idx))
raise MissingUTXOError
return (entry[:21], struct.unpack('<Q', entry[-8:])), False
value, = struct.unpack('<Q', entry[-8:])
return (entry[:21], value), False
# Now add the inputs
for hex_hash, tx in new_txs.items():
@ -269,7 +270,7 @@ class MemPool(LoggedClass):
'''
value = 0
for tx_hash in self.hash168s[hash168]:
txin_pairs, txout_pairs, unconfirmed = self.txs[hex_hash]
txin_pairs, txout_pairs, unconfirmed = self.txs[tx_hash]
value -= sum(v for h168, v in txin_pairs if h168 == hash168)
value += sum(v for h168, v in txout_pairs if h168 == hash168)
return value

4
server/protocol.py
View File

@ -310,8 +310,8 @@ class ElectrumX(JSONRPC):
conf = tuple({'tx_hash': hash_to_str(tx_hash), 'height': height}
for tx_hash, height in history)
unconf = tuple({'tx_hash': hex, 'height': -unconfirmed, 'fee': fee}
for hex, tx_fee, unconfirmed in mempool)
unconf = tuple({'tx_hash': tx_hash, 'height': -unconfirmed, 'fee': fee}
for tx_hash, fee, unconfirmed in mempool)
return conf + unconf
@classmethod