zebra.lucky
/
joinmarket-clientserver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

tumbler now working for segwit

master
Adam Gibson 9 years ago
parent
990e5d02f2
commit
bf596414b5
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      scripts/tumbler.py

10
scripts/tumbler.py
Unescape View File

@ -13,9 +13,9 @@ import copy
import logging import logging
from jmclient import (Taker, load_program_config, get_schedule, from jmclient import (Taker, load_program_config, get_schedule,
weighted_order_choose, JMTakerClientProtocolFactory, weighted_order_choose, JMClientProtocolFactory,
start_reactor, validate_address, jm_single, WalletError, start_reactor, validate_address, jm_single, WalletError,
Wallet, sync_wallet, get_tumble_schedule, Wallet, SegwitWallet, sync_wallet, get_tumble_schedule,
RegtestBitcoinCoreInterface, estimate_tx_fee, RegtestBitcoinCoreInterface, estimate_tx_fee,
tweak_tumble_schedule, human_readable_schedule_entry, tweak_tumble_schedule, human_readable_schedule_entry,
schedule_to_text, restart_waiter, get_tumble_log, schedule_to_text, restart_waiter, get_tumble_log,
@ -40,12 +40,12 @@ def main():
wallet_name = args[0] wallet_name = args[0]
max_mix_depth = options['mixdepthsrc'] + options['mixdepthcount'] max_mix_depth = options['mixdepthsrc'] + options['mixdepthcount']
if not os.path.exists(os.path.join('wallets', wallet_name)): if not os.path.exists(os.path.join('wallets', wallet_name)):
wallet = Wallet(wallet_name, None, max_mix_depth) wallet = SegwitWallet(wallet_name, None, max_mix_depth)
else: else:
while True: while True:
try: try:
pwd = get_password("Enter wallet decryption passphrase: ") pwd = get_password("Enter wallet decryption passphrase: ")
wallet = Wallet(wallet_name, pwd, max_mix_depth) wallet = SegwitWallet(wallet_name, pwd, max_mix_depth)
except WalletError: except WalletError:
print("Wrong password, try again.") print("Wrong password, try again.")
continue continue
@ -129,7 +129,7 @@ def main():
order_chooser=weighted_order_choose, order_chooser=weighted_order_choose,
callbacks=(filter_orders_callback, None, taker_finished), callbacks=(filter_orders_callback, None, taker_finished),
tdestaddrs=destaddrs) tdestaddrs=destaddrs)
clientfactory = JMTakerClientProtocolFactory(taker) clientfactory = JMClientProtocolFactory(taker)
nodaemon = jm_single().config.getint("DAEMON", "no_daemon") nodaemon = jm_single().config.getint("DAEMON", "no_daemon")
daemon = True if nodaemon == 1 else False daemon = True if nodaemon == 1 else False
start_reactor(jm_single().config.get("DAEMON", "daemon_host"), start_reactor(jm_single().config.get("DAEMON", "daemon_host"),

Write Preview
Loading…
Cancel
Save