From b5d1f401fdf0bbcbe2d5d40375a0b362a66ebde5 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sat, 5 Nov 2016 12:40:45 +0900
Subject: [PATCH] Fix bugs

---
 server/block_processor.py | 5 +++--
 server/protocol.py        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/block_processor.py b/server/block_processor.py
index 7aa0a86..34c9bce 100644
--- a/server/block_processor.py
+++ b/server/block_processor.py
@@ -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
diff --git a/server/protocol.py b/server/protocol.py
index df4a052..69105e2 100644
--- a/server/protocol.py
+++ b/server/protocol.py
@@ -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