From 444122122ef6a4464b47465255fef95f060e7c42 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Mon, 12 Dec 2016 08:21:55 +0900 Subject: [PATCH] Fix unconfirmed flag Prepare 0.9.3 --- RELEASE-NOTES | 6 ++++++ server/mempool.py | 5 ++--- server/version.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 55a6e95..e20961a 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,3 +1,9 @@ +version 0.9.3 +------------- + +- unconfirmed flag indicating whether mempool txs have unconfirmed inputs + was inverted + version 0.9.2 ------------- diff --git a/server/mempool.py b/server/mempool.py index 5f53e4e..36fa664 100644 --- a/server/mempool.py +++ b/server/mempool.py @@ -268,12 +268,11 @@ class MemPool(util.LoggedClass): item = self.txs.get(hex_hash) if not item or not raw_tx: continue - tx = Deserializer(raw_tx).read_tx() txin_pairs, txout_pairs = item tx_fee = (sum(v for hash168, v in txin_pairs) - sum(v for hash168, v in txout_pairs)) - unconfirmed = any(txin.prev_hash not in self.txs - for txin in tx.inputs) + tx = Deserializer(raw_tx).read_tx() + unconfirmed = any(txin.prev_hash in self.txs for txin in tx.inputs) result.append((hex_hash, tx_fee, unconfirmed)) return result diff --git a/server/version.py b/server/version.py index dccaa71..8dddfb1 100644 --- a/server/version.py +++ b/server/version.py @@ -1 +1 @@ -VERSION = "ElectrumX 0.9.2" +VERSION = "ElectrumX 0.9.3"