X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Fbitcoind%2Fblockchain_processor.py;h=32cc4f255930edf65254d606ac1234bddd1eb0a2;hb=2985fab9e0b1d283765abd7a5810cf44b10cb551;hp=e93439ee38e369d3732723b0477e0b5f76263fb8;hpb=e23814bf5b18f1f6983606e5b1ee01a43acc9d2a;p=electrum-server.git diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index e93439e..32cc4f2 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -266,14 +266,14 @@ class BlockchainProcessor(Processor): # sort history, because redeeming transactions are next to the corresponding txout hist.sort(key=lambda tup: tup[2]) - # uniqueness - hist = set(map(lambda x: (x[0], x[2]), hist)) - # add memory pool with self.mempool_lock: for txid in self.mempool_hist.get(addr, []): hist.append((txid, 0, 0)) + # uniqueness + hist = set(map(lambda x: (x[0], x[2]), hist)) + # convert to dict hist = map(lambda x: {'tx_hash': x[0], 'height': x[1]}, hist)