diff --git a/jmclient/jmclient/wallet_utils.py b/jmclient/jmclient/wallet_utils.py index a77d678..ebc46a0 100644 --- a/jmclient/jmclient/wallet_utils.py +++ b/jmclient/jmclient/wallet_utils.py @@ -10,7 +10,7 @@ from optparse import OptionParser from jmclient import (get_network, Wallet, encryptData, get_p2pk_vbyte, jm_single, mn_decode, mn_encode, BitcoinCoreInterface, - JsonRpcError, sync_wallet, WalletError) + JsonRpcError, sync_wallet, WalletError, SegwitWallet) from jmbase.support import get_password import jmclient.btc as btc @@ -448,7 +448,7 @@ def wallet_tool_main(wallet_root_path): seed = args[0] method = ('display' if len(args) == 1 else args[1].lower()) if not os.path.exists(os.path.join(wallet_root_path, seed)): - wallet = Wallet(seed, None, options.maxmixdepth, + wallet = SegwitWallet(seed, None, options.maxmixdepth, options.gaplimit, extend_mixdepth= not maxmixdepth_configured, storepassword=(method == 'importprivkey'), wallet_dir=wallet_root_path) @@ -456,7 +456,7 @@ def wallet_tool_main(wallet_root_path): while True: try: pwd = get_password("Enter wallet decryption passphrase: ") - wallet = Wallet(seed, pwd, + wallet = SegwitWallet(seed, pwd, options.maxmixdepth, options.gaplimit, extend_mixdepth=not maxmixdepth_configured, diff --git a/scripts/wallet-tool.py b/scripts/wallet-tool.py index 957ce4c..2e50513 100644 --- a/scripts/wallet-tool.py +++ b/scripts/wallet-tool.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, print_function from jmclient import load_program_config, wallet_tool_main - SegwitWallet, get_p2sh_vbyte) if __name__ == "__main__": load_program_config()