From 5e92feb8a67b890ad2995ca2662a4d1b1e671d59 Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 17:09:52 +0700 Subject: [PATCH] Add new variables to BANNER(_TOR) $SERVER_VER will return the version number (eg: 1.0.10) $SERVER_SUBVERSION will return the full version string (eg: ElectrumX 1.0.10) $VERSION is kept for legacy which is the same as $SERVER_SUBVERSION --- server/session.py | 4 +++- server/version.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 server/session.py mode change 100644 => 100755 server/version.py diff --git a/server/session.py b/server/session.py old mode 100644 new mode 100755 index b184e41..1a3355e --- a/server/session.py +++ b/server/session.py @@ -289,7 +289,9 @@ class ElectrumX(SessionBase): revision //= 100 daemon_version = '{:d}.{:d}.{:d}'.format(major, minor, revision) for pair in [ - ('$VERSION', version.VERSION), + ('$VERSION', version.SUB_VERSION), # legacy + ('$SERVER_VERSION', version.VERSION), + ('$SERVER_SUBVERSION', version.SUB_VERSION), ('$DAEMON_VERSION', daemon_version), ('$DAEMON_SUBVERSION', network_info['subversion']), ('$DONATION_ADDRESS', self.env.donation_address), diff --git a/server/version.py b/server/version.py old mode 100644 new mode 100755 index cdab28f..bcce393 --- a/server/version.py +++ b/server/version.py @@ -1,5 +1,6 @@ # Server name and protocol versions -VERSION = 'ElectrumX 1.0.10' +VERSION = '1.0.10' +SUB_VERSION = 'ElectrumX {}'.format(VERSION) PROTOCOL_MIN = '1.0' PROTOCOL_MAX = '1.0'