commit 9119d0d0d13b21cb355280b003e408ffbb68cbee
parent b1481c338457cdb4643c10abceeb5c7bf4c279b8
Author: chris-belcher <chris-belcher@users.noreply.github.com>
Date: Tue, 13 Nov 2018 19:56:58 +0000
Move around print statements for readability
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/electrumpersonalserver/server/common.py b/electrumpersonalserver/server/common.py
@@ -453,7 +453,6 @@ def run_electrum_server(rpc, txmonitor, hostport, ip_whitelist,
def get_scriptpubkeys_to_monitor(rpc, config):
logger = logging.getLogger('ELECTRUMPERSONALSERVER')
- logger.info("Obtaining bitcoin addresses to monitor . . .")
st = time.time()
try:
imported_addresses = set(rpc.call("getaddressesbyaccount",
@@ -488,13 +487,15 @@ def get_scriptpubkeys_to_monitor(rpc, config):
first_spks = wal.get_scriptpubkeys(change=0, from_index=0,
count=TEST_ADDR_COUNT)
first_addrs = [hashes.script_to_address(s, rpc) for s in first_spks]
- logger.info("\n" + config_mpk_key + " =>\n\t" + "\n\t".join(first_addrs))
+ logger.info("\n" + config_mpk_key + " =>\n\t" + "\n\t".join(
+ first_addrs))
if not set(first_addrs).issubset(imported_addresses):
import_needed = True
wallets_imported += 1
for change in [0, 1]:
spks_to_import.extend(wal.get_scriptpubkeys(change, 0,
int(config.get("bitcoin-rpc", "initial_import_count"))))
+ logger.info("Obtaining bitcoin addresses to monitor . . .")
#check whether watch-only addresses have been imported
watch_only_addresses = []
for key in config.options("watch-only-addresses"):