tFix typo causing change address reuse - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a0ef42d572377a4d90047058e5a7f8b3e100521e
DIR parent 3a735d40acecbcee689e13e5d6dbef9d10c01584
HTML Author: Neil Booth <kyuupichan@gmail.com>
Date: Sun, 24 Jan 2016 11:16:05 +0900
Fix typo causing change address reuse
Diffstat:
M lib/wallet.py | 2 +-
M plugins/exchange_rate/exchange_rat… | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -951,7 +951,7 @@ class Abstract_Wallet(PrintError):
# gap limit; if none take one at random
addrs = self.accounts[account].get_addresses(1)[-self.gap_limit_for_change:]
change_addrs = [addr for addr in addrs if
- self.get_num_tx(change_addr) == 0]
+ self.get_num_tx(addr) == 0]
if not change_addrs:
change_addrs = [random.choice(addrs)]
else:
DIR diff --git a/plugins/exchange_rate/exchange_rate.py b/plugins/exchange_rate/exchange_rate.py
t@@ -56,7 +56,7 @@ class ExchangeBase(PrintError):
self.quotes = self.get_rates(ccy)
self.print_error("received fx quotes")
self.on_quotes()
- except Exception, e:
+ except BaseException as e:
self.print_error("failed fx quotes:", e)
def update(self, ccy):
t@@ -70,7 +70,7 @@ class ExchangeBase(PrintError):
self.history[ccy] = self.historical_rates(ccy)
self.print_error("received fx history for", ccy)
self.on_history()
- except Exception, e:
+ except BaseException as e:
self.print_error("failed fx history:", e)
def get_historical_rates(self, ccy):
t@@ -209,7 +209,7 @@ class CoinDesk(ExchangeBase):
% (start, end))
json = self.get_json('api.coindesk.com', query)
return json['bpi']
-
+
class Coinsecure(ExchangeBase):
def get_rates(self, ccy):
json = self.get_json('api.coinsecure.in', '/v0/noauth/newticker')