From 697d8d76919767c9a775ae38548a448bf2dc131d Mon Sep 17 00:00:00 2001 From: AdamISZ Date: Sun, 28 Oct 2018 17:28:59 +0100 Subject: [PATCH] bugfix: sendpayment invalid reference to userpcwallet --- scripts/sendpayment.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/sendpayment.py b/scripts/sendpayment.py index b84a0e8..6c2b282 100644 --- a/scripts/sendpayment.py +++ b/scripts/sendpayment.py @@ -114,14 +114,12 @@ def main(): log.debug('starting sendpayment') - if not options.userpcwallet: - max_mix_depth = max([mixdepth, options.amtmixdepths - 1]) + max_mix_depth = max([mixdepth, options.amtmixdepths - 1]) + + wallet_path = get_wallet_path(wallet_name, None) + wallet = open_test_wallet_maybe( + wallet_path, wallet_name, max_mix_depth, gap_limit=options.gaplimit) - wallet_path = get_wallet_path(wallet_name, None) - wallet = open_test_wallet_maybe( - wallet_path, wallet_name, max_mix_depth, gap_limit=options.gaplimit) - else: - raise NotImplementedError("Using non-joinmarket wallet is not supported.") if jm_single().config.get("BLOCKCHAIN", "blockchain_source") == "electrum-server" and options.makercount != 0: jm_single().bc_interface.synctype = "with-script"