Merge #834: Output JM version at the start of yield generator

da1fa05f4c Output JM version at the start of yield generator (Kristaps Kaupe)

Pull request description:

  Resolves #706.

  Could help people to not forget which version they are running probably. :) (https://reddit.com/r/joinmarket/comments/m6ypz3/how_to_see_your_current_version_and_to_know_if/)

Top commit has no ACKs.

Tree-SHA512: 79d9ed76c8a5e7e4485c1bcd42db1d900686be72fadab2d3c9d0b1dba13f415a102fbc69445c5914d870cc39bf559df8ace112229581861c199a68dc545684d3

jmbase/jmbase/support.py

@@ -222,8 +222,11 @@ def lookup_appdata_folder(appname):
         data_folder = path.expanduser(path.join("~", "." + appname + "/"))
     return data_folder
 
+def get_jm_version_str():
+    return "JoinMarket " + JM_CORE_VERSION
+
 def print_jm_version(option, opt_str, value, parser):
-    print("JoinMarket " + JM_CORE_VERSION)
+    print(get_jm_version_str())
     sys.exit(EXIT_SUCCESS)
 
 # helper functions for conversions of format between over-the-wire JM
@@ -302,4 +305,4 @@ def wrapped_urlparse(url):
         a, b = (b".onion", b"http://")
     if url.endswith(a) and not url.startswith(b):
         url = b + url
-    return urlparse.urlparse(url)
+    return urlparse.urlparse(url)

jmclient/jmclient/yieldgenerator.py

@@ -12,7 +12,7 @@ from jmclient import (Maker, jm_single, load_program_config,
                       WalletService, add_base_options, SNICKERReceiver,
                       SNICKERClientProtocolFactory)
 from .wallet_utils import open_test_wallet_maybe, get_wallet_path
-from jmbase.support import EXIT_ARGERROR, EXIT_FAILURE
+from jmbase.support import EXIT_ARGERROR, EXIT_FAILURE, get_jm_version_str
 
 jlog = get_log()
 
@@ -27,6 +27,7 @@ class YieldGenerator(Maker):
 
     def __init__(self, wallet_service):
         Maker.__init__(self, wallet_service)
+        jlog.info(get_jm_version_str())
         self.tx_unconfirm_timestamp = {}
         self.statement_file = os.path.join(jm_single().datadir,
                                       'logs', 'yigen-statement.csv')