diff --git a/joinmarket/yieldgenerator.py b/joinmarket/yieldgenerator.py index 2a915366..f44a961c 100644 --- a/joinmarket/yieldgenerator.py +++ b/joinmarket/yieldgenerator.py @@ -141,11 +141,11 @@ def ygmain(ygclass, txfee=1000, cjfee_a=200, cjfee_r=0.002, ordertype='reloffer' wallet = Wallet(seed, max_mix_depth=mix_levels) jm_single().bc_interface.sync_wallet(wallet) - log.debug('starting yield generator') mcs = [IRCMessageChannel(c, realname='btcint=' + jm_single().config.get( "BLOCKCHAIN", "blockchain_source"), password=nickserv_password) for c in get_irc_mchannels()] mcc = MessageChannelCollection(mcs) + log.debug('starting yield generator') maker = ygclass(mcc, wallet, [options.txfee, cjfee_a, cjfee_r, options.ordertype, options.minsize, mix_levels]) try: diff --git a/ob-watcher.py b/ob-watcher.py index 431fec39..abf80270 100644 --- a/ob-watcher.py +++ b/ob-watcher.py @@ -20,7 +20,9 @@ from joinmarket import jm_single, load_program_config, MessageChannelCollection from joinmarket import random_nick, calc_cj_fee, OrderbookWatch, get_irc_mchannels -from joinmarket import IRCMessageChannel +from joinmarket import IRCMessageChannel, get_log + +log = get_log() matplotlib.use('Agg') import matplotlib.pyplot as plt @@ -344,7 +346,6 @@ def on_welcome(self): def main(): - jm_single().nickname = random_nick() # watcher' +binascii.hexlify(os.urandom(4)) load_program_config() parser = OptionParser( @@ -369,7 +370,7 @@ def main(): hostport = (options.host, options.port) mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()] mcc = MessageChannelCollection(mcs) - + log.debug("Starting ob-watcher") # todo: is the call to GUITaker needed, or the return. taker unused taker = GUITaker(mcc, hostport) print('starting irc') diff --git a/sendpayment.py b/sendpayment.py index 52e6c844..497b6762 100644 --- a/sendpayment.py +++ b/sendpayment.py @@ -320,6 +320,7 @@ def main(): mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()] mcc = MessageChannelCollection(mcs) + log.debug("starting sendpayment") taker = SendPayment(mcc, wallet, destaddr, amount, options.makercount, options.txfee, options.waittime, options.mixdepth, options.answeryes, chooseOrdersFunc) diff --git a/tumbler.py b/tumbler.py index 43e2e0af..21f82bbb 100644 --- a/tumbler.py +++ b/tumbler.py @@ -634,9 +634,9 @@ def main(): max_mix_depth=options['mixdepthsrc'] + options['mixdepthcount']) jm_single().bc_interface.sync_wallet(wallet) jm_single().wait_for_commitments = 1 - log.debug('starting tumbler') mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()] mcc = MessageChannelCollection(mcs) + log.debug('starting tumbler') tumbler = Tumbler(mcc, wallet, tx_list, options) try: log.debug('connecting to message channels')