From 5e92feb8a67b890ad2995ca2662a4d1b1e671d59 Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 17:09:52 +0700 Subject: [PATCH 1/7] 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' From 9dceeb914cad8cdfd606646ae7427576f0c77fe2 Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 17:10:52 +0700 Subject: [PATCH 2/7] 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 | 0 server/version.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 server/session.py mode change 100755 => 100644 server/version.py diff --git a/server/session.py b/server/session.py old mode 100755 new mode 100644 diff --git a/server/version.py b/server/version.py old mode 100755 new mode 100644 From 9e34bf858320d9b98aff687509451df24450251c Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 17:43:47 +0700 Subject: [PATCH 3/7] reverted and made the version split isolated within the banner logic only as not to affect other parts of the code. --- server/session.py | 7 ++++--- server/version.py | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/session.py b/server/session.py index 1a3355e..a59c9a8 100644 --- a/server/session.py +++ b/server/session.py @@ -288,10 +288,11 @@ class ElectrumX(SessionBase): minor, revision = divmod(minor, 10000) revision //= 100 daemon_version = '{:d}.{:d}.{:d}'.format(major, minor, revision) + server_version = version.VERSION.split()[-1] for pair in [ - ('$VERSION', version.SUB_VERSION), # legacy - ('$SERVER_VERSION', version.VERSION), - ('$SERVER_SUBVERSION', version.SUB_VERSION), + ('$VERSION', version.VERSION), # legacy + ('$SERVER_VERSION', server_version), + ('$SERVER_SUBVERSION', version.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 index bcce393..cdab28f 100644 --- a/server/version.py +++ b/server/version.py @@ -1,6 +1,5 @@ # Server name and protocol versions -VERSION = '1.0.10' -SUB_VERSION = 'ElectrumX {}'.format(VERSION) +VERSION = 'ElectrumX 1.0.10' PROTOCOL_MIN = '1.0' PROTOCOL_MAX = '1.0' From c5c75c30defc17e82d0a13ea2b2cce64e67fb8e3 Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 19:25:14 +0700 Subject: [PATCH 4/7] Updated docs/ENVIRONMENT.rst to reflect changes in variables --- docs/ENVIRONMENT.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/ENVIRONMENT.rst b/docs/ENVIRONMENT.rst index 5c63cd5..31787b8 100644 --- a/docs/ENVIRONMENT.rst +++ b/docs/ENVIRONMENT.rst @@ -116,8 +116,10 @@ These environment variables are optional: You can place several meta-variables in your banner file, which will be replaced before serving to a client. - + **$VERSION** is replaced with the ElectrumX version you are - runnning, such as *ElectrumX 0.9.22*. + + **$SERVER_VERSION** is replaced with the ElectrumX version you are + runnning, such as *1.0.10*. + + **$_SERVER_SUBVERSION** is replace with the ElectrumX user agent + string. For example, `ElectrumX 1.0.10`. + **$DAEMON_VERSION** is replaced with the daemon's version as a dot-separated string. For example *0.12.1*. + **$DAEMON_SUBVERSION** is replaced with the daemon's user agent From 70c6c87852a3ce0f68d775ebc5b11d529f759b06 Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 19:26:49 +0700 Subject: [PATCH 5/7] fixed typo. --- docs/ENVIRONMENT.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 docs/ENVIRONMENT.rst diff --git a/docs/ENVIRONMENT.rst b/docs/ENVIRONMENT.rst old mode 100644 new mode 100755 index 31787b8..7eb3592 --- a/docs/ENVIRONMENT.rst +++ b/docs/ENVIRONMENT.rst @@ -118,7 +118,7 @@ These environment variables are optional: + **$SERVER_VERSION** is replaced with the ElectrumX version you are runnning, such as *1.0.10*. - + **$_SERVER_SUBVERSION** is replace with the ElectrumX user agent + + **$SERVER_SUBVERSION** is replace with the ElectrumX user agent string. For example, `ElectrumX 1.0.10`. + **$DAEMON_VERSION** is replaced with the daemon's version as a dot-separated string. For example *0.12.1*. From 3c8ab998e43a57e9014c6d17f7dba4fafbaa0631 Mon Sep 17 00:00:00 2001 From: LaoDC Date: Wed, 3 May 2017 19:27:00 +0700 Subject: [PATCH 6/7] sorry about permissions --- docs/ENVIRONMENT.rst | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 docs/ENVIRONMENT.rst diff --git a/docs/ENVIRONMENT.rst b/docs/ENVIRONMENT.rst old mode 100755 new mode 100644 From 37a9b276463b3fa3301d1b3fb79e2044a5e6655b Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 4 May 2017 00:22:53 +0900 Subject: [PATCH 7/7] Update ENVIRONMENT.rst --- docs/ENVIRONMENT.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ENVIRONMENT.rst b/docs/ENVIRONMENT.rst index 7eb3592..9a52245 100644 --- a/docs/ENVIRONMENT.rst +++ b/docs/ENVIRONMENT.rst @@ -118,7 +118,7 @@ These environment variables are optional: + **$SERVER_VERSION** is replaced with the ElectrumX version you are runnning, such as *1.0.10*. - + **$SERVER_SUBVERSION** is replace with the ElectrumX user agent + + **$SERVER_SUBVERSION** is replaced with the ElectrumX user agent string. For example, `ElectrumX 1.0.10`. + **$DAEMON_VERSION** is replaced with the daemon's version as a dot-separated string. For example *0.12.1*.