From 8d7d82f15c0141e9d71918432e3e35b65f6d7a38 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Fri, 8 Apr 2022 14:35:36 +0300 Subject: [PATCH] Add local Tor autostart to missing scripts --- scripts/receive-payjoin.py | 5 ++++- scripts/snicker/create-snicker-proposal.py | 5 ++++- scripts/snicker/receive-snicker.py | 4 +++- scripts/snicker/snicker-server.py | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/receive-payjoin.py b/scripts/receive-payjoin.py index 307d3de..f0d5d6e 100755 --- a/scripts/receive-payjoin.py +++ b/scripts/receive-payjoin.py @@ -7,7 +7,8 @@ from twisted.internet import reactor from jmbase import get_log, jmprint from jmclient import jm_single, load_program_config, \ WalletService, open_test_wallet_maybe, get_wallet_path, check_regtest, \ - add_base_options, JMBIP78ReceiverManager, start_reactor + add_base_options, JMBIP78ReceiverManager, start_reactor, \ + check_and_start_tor from jmbase.support import EXIT_FAILURE, EXIT_ARGERROR from jmbitcoin import amount_to_sat jlog = get_log() @@ -48,6 +49,8 @@ def receive_payjoin_main(): sys.exit(EXIT_FAILURE) load_program_config(config_path=options.datadir) + check_and_start_tor() + check_regtest() wallet_path = get_wallet_path(wallet_name, None) diff --git a/scripts/snicker/create-snicker-proposal.py b/scripts/snicker/create-snicker-proposal.py index 6a6db6e..89397d9 100755 --- a/scripts/snicker/create-snicker-proposal.py +++ b/scripts/snicker/create-snicker-proposal.py @@ -30,7 +30,7 @@ from jmclient import (process_shutdown, jm_single, load_program_config, check_regtest, estimate_tx_fee, add_base_options, get_wallet_path, open_test_wallet_maybe, WalletService, SNICKERClientProtocolFactory, - start_reactor, JMPluginService) + start_reactor, JMPluginService, check_and_start_tor) from jmclient.configure import get_log log = get_log() @@ -96,6 +96,9 @@ def main(): wallet_name, hextx, input_index, output_index, net_transfer = args input_index, output_index, net_transfer = [int(x) for x in [ input_index, output_index, net_transfer]] + + check_and_start_tor() + check_regtest() # If tx_fees are set manually by CLI argument, override joinmarket.cfg: diff --git a/scripts/snicker/receive-snicker.py b/scripts/snicker/receive-snicker.py index cd4403d..411efbe 100755 --- a/scripts/snicker/receive-snicker.py +++ b/scripts/snicker/receive-snicker.py @@ -7,7 +7,7 @@ from jmclient import (jm_single, load_program_config, WalletService, open_test_wallet_maybe, get_wallet_path, check_regtest, add_base_options, start_reactor, SNICKERClientProtocolFactory, SNICKERReceiver, - JMPluginService) + JMPluginService, check_and_start_tor) from jmbase.support import EXIT_ARGERROR jlog = get_log() @@ -56,6 +56,8 @@ Usage: %prog [options] wallet file [proposal] load_program_config(config_path=options.datadir, plugin_services=[snicker_plugin]) + check_and_start_tor() + check_regtest() wallet_path = get_wallet_path(wallet_name, None) diff --git a/scripts/snicker/snicker-server.py b/scripts/snicker/snicker-server.py index 9601ebf..a132c69 100755 --- a/scripts/snicker/snicker-server.py +++ b/scripts/snicker/snicker-server.py @@ -35,7 +35,7 @@ import sqlite3 import threading from io import BytesIO from jmbase import jmprint, hextobin, verify_pow -from jmclient import process_shutdown, jm_single, load_program_config +from jmclient import process_shutdown, jm_single, load_program_config, check_and_start_tor from jmclient.configure import get_log # Note: this is actually a duplication of the @@ -331,6 +331,7 @@ def snicker_server_start(port, local_port=None, hsdir=None): if __name__ == "__main__": load_program_config(bs="no-blockchain") + check_and_start_tor() # in testing, we can optionally use ephemeral; # in testing or prod we can use persistent: if len(sys.argv) < 2: