From b7db6d1b8a1702c76ab849d6606f9923d31f59b2 Mon Sep 17 00:00:00 2001 From: Alex Cato Date: Mon, 4 Jul 2016 02:33:22 +0200 Subject: [PATCH] wallet-tool.py / wallet.py: change default max_mixdepth to -1 and auto-detect number of mixdepths if not overridden by user --- joinmarket/wallet.py | 8 +++++--- wallet-tool.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/joinmarket/wallet.py b/joinmarket/wallet.py index fd37d78f..1605cc59 100644 --- a/joinmarket/wallet.py +++ b/joinmarket/wallet.py @@ -113,7 +113,7 @@ def get_balance_by_mixdepth(self): class Wallet(AbstractWallet): def __init__(self, seedarg, - max_mix_depth=2, + max_mix_depth=-1, gaplimit=6, extend_mixdepth=False, storepassword=False): @@ -127,8 +127,10 @@ def __init__(self, self.spent_utxos = [] self.imported_privkeys = {} self.seed = self.read_wallet_file_data(seedarg) - if extend_mixdepth and len(self.index_cache) > max_mix_depth: - self.max_mix_depth = len(self.index_cache) + if len(self.index_cache) > max_mix_depth: + if extend_mixdepth or max_mix_depth == -1: + log.debug('Detected ' + str(len(self.index_cache)) + ' mixdepths in wallet-file.') + self.max_mix_depth = len(self.index_cache) self.gaplimit = gaplimit master = btc.bip32_master_key(self.seed, (btc.MAINNET_PRIVATE if get_network() == 'mainnet' else btc.TESTNET_PRIVATE)) diff --git a/wallet-tool.py b/wallet-tool.py index f7a0655c..7ca41c89 100644 --- a/wallet-tool.py +++ b/wallet-tool.py @@ -66,7 +66,7 @@ maxmixdepth_configured = True if not options.maxmixdepth: maxmixdepth_configured = False - options.maxmixdepth = 5 + options.maxmixdepth = -1 noseed_methods = ['generate', 'recover', 'listwallets'] methods = ['display', 'displayall', 'summary', 'showseed', 'importprivkey',