RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted and made the version split isolated within the banner logic only as not to affect other parts of the code.

Browse Source
This commit is contained in:
LaoDC 2017-05-03 17:43:47 +07:00
parent 9dceeb914c
commit 9e34bf8583
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/session.py
View File

@ -288,10 +288,11 @@ class ElectrumX(SessionBase):
minor, revision = divmod(minor, 10000) minor, revision = divmod(minor, 10000)
revision //= 100 revision //= 100
daemon_version = '{:d}.{:d}.{:d}'.format(major, minor, revision) daemon_version = '{:d}.{:d}.{:d}'.format(major, minor, revision)
server_version = version.VERSION.split()[-1]
for pair in [ for pair in [
('$VERSION', version.SUB_VERSION), # legacy ('$VERSION', version.VERSION), # legacy
('$SERVER_VERSION', version.VERSION), ('$SERVER_VERSION', server_version),
('$SERVER_SUBVERSION', version.SUB_VERSION), ('$SERVER_SUBVERSION', version.VERSION),
('$DAEMON_VERSION', daemon_version), ('$DAEMON_VERSION', daemon_version),
('$DAEMON_SUBVERSION', network_info['subversion']), ('$DAEMON_SUBVERSION', network_info['subversion']),
('$DONATION_ADDRESS', self.env.donation_address), ('$DONATION_ADDRESS', self.env.donation_address),

3
server/version.py
View File

@ -1,6 +1,5 @@
# Server name and protocol versions # Server name and protocol versions
VERSION = '1.0.10' VERSION = 'ElectrumX 1.0.10'
SUB_VERSION = 'ElectrumX {}'.format(VERSION)
PROTOCOL_MIN = '1.0' PROTOCOL_MIN = '1.0'
PROTOCOL_MAX = '1.0' PROTOCOL_MAX = '1.0'