Merge pull request #316 from f321x/check_daemon_version

check daemon version on startup, fix version in banner

Author: SomberNight

src/electrumx/lib/coins.py

@@ -35,7 +35,7 @@
 from decimal import Decimal
 from functools import partial
 from hashlib import sha256
-from typing import Sequence, Tuple
+from typing import Sequence, Tuple, Optional
 
 import electrumx.lib.util as util
 from electrumx.lib.hash import Base58, double_sha256, hash_to_hex_str
@@ -114,6 +114,7 @@ class Coin:
     RPC_PORT: int
     NAME: str
     NET: str
+    MIN_REQUIRED_DAEMON_VERSION: Optional[str] = None
 
     # only used for initial db sync ETAs:
     TX_COUNT_HEIGHT: int  # at a given snapshot of the chain,
@@ -306,6 +307,8 @@ class Bitcoin(BitcoinMixin, Coin):
     TX_COUNT_HEIGHT = 646855
     TX_PER_BLOCK = 2200
     CRASH_CLIENT_VER = (3, 2, 3)
+    # core version 28 introduced 1p1c package relay required for protocol 1.6
+    MIN_REQUIRED_DAEMON_VERSION = "28.0"
     BLACKLIST_URL = 'https://electrum.org/blacklist.json'
     PEERS = [
         'electrum.vom-stausee.de s t',
@@ -382,6 +385,7 @@ class BitcoinTestnet(BitcoinTestnetMixin, Coin):
     NAME = "Bitcoin"
     DESERIALIZER = lib_tx.DeserializerSegWit
     CRASH_CLIENT_VER = (3, 2, 3)
+    MIN_REQUIRED_DAEMON_VERSION = "28.0"
     PEERS = [
         'testnet.hsmiths.com t53011 s53012',
         'testnet.qtornado.com s t',

src/electrumx/server/controller.py

@@ -73,7 +73,7 @@ async def on_block(self, touched, height):
 
 
 class Controller(ServerBase):
-    '''Manages server initialisation and stutdown.
+    '''Manages server initialisation and shutdown.
 
     Servers are started once the mempool is synced after the block
     processor first catches up with the daemon.
@@ -127,9 +127,12 @@ def get_db_height():
             )
 
             # Test daemon authentication, and also ensure it has a cached
-            # height.  Do this before entering the task group.
+            # height. Do this before entering the task group.
             await daemon.height()
 
+            # Check if daemon is recent enough
+            await daemon.check_daemon_version()
+
             caught_up_event = Event()
             mempool_event = Event()
 

src/electrumx/server/daemon.py

@@ -93,6 +93,21 @@ async def __aexit__(self, exc_type, exc_value, traceback):
     def connector(self):
         return None
 
+    async def check_daemon_version(self):
+        assert self.session is not None and self.coin is not None, f"{self.session=}, {self.coin=}"
+        if self.coin.MIN_REQUIRED_DAEMON_VERSION is None:
+            return
+
+        required_version = tuple(map(int, self.coin.MIN_REQUIRED_DAEMON_VERSION.split('.')))
+        network_info = await self.getnetworkinfo()
+        ni_version = network_info['version']
+        daemon_major = ni_version // 10_000
+        daemon_minor = (ni_version % 10_000) // 100
+        daemon_rev = ni_version % 100
+        daemon_version = (daemon_major, daemon_minor, daemon_rev)
+        if daemon_version < required_version:
+            raise RuntimeError(f"Bitcoin Core {daemon_version=} < {required_version=}.")
+
     def set_url(self, url):
         '''Set the URLS to the given list, and switch to the first one.'''
         urls = url.split(',')
@@ -137,7 +152,7 @@ async def _send_data(self, data):
     async def _send(self, payload, processor):
         '''Send a payload to be converted to JSON.
 
-        Handles temporary connection issues.  Daemon response errors
+        Handles temporary connection issues. Daemon response errors
         are raise through DaemonError.
         '''
         def log_error(error):

src/electrumx/server/session.py

@@ -1036,6 +1036,7 @@ class ElectrumX(SessionBase):
     '''A TCP server that handles incoming Electrum connections.'''
 
     PROTOCOL_MIN = (1, 4)
+    # consider bumping Coin.MIN_REQUIRED_DAEMON_VERSION too when releasing a new protocol version
     PROTOCOL_MAX = (1, 4, 3)
 
     def __init__(self, *args, **kwargs):
@@ -1355,10 +1356,10 @@ def is_tor(self):
 
     async def replaced_banner(self, banner):
         network_info = await self.daemon_request('getnetworkinfo')
-        ni_version = network_info['version']
-        major, minor = divmod(ni_version, 1000000)
-        minor, revision = divmod(minor, 10000)
-        revision //= 100
+        ni_version = network_info['version']  # e.g. 290100 (for /Satoshi:29.1.0/)
+        major = ni_version // 10_000
+        minor = (ni_version % 10_000) // 100
+        revision = ni_version % 100
         daemon_version = f'{major:d}.{minor:d}.{revision:d}'
         for pair in [
                 ('$SERVER_VERSION', electrumx.version_short),