ensure xud

Author: reliveyy

images/utils/launcher/__init__.py

@@ -1,12 +1,13 @@
 import logging
 import shlex
 import traceback
+from threading import Event
 
 from launcher.close_other_utils import Action as CloseOtherUtilsAction
 from launcher.config import Config
 from launcher.errors import FatalError, ConfigError, ConfigErrorScope
-from launcher.node import NodeManager, ServiceNotFound, ContainerNotFound
-from launcher.utils import ParallelExecutionError, ArgumentError
+from launcher.node import NodeManager, ServiceNotFound, ContainerNotFound, NoWaiting
+from launcher.utils import ArgumentError
 import docker.errors
 import os
 
@@ -185,7 +186,15 @@ def pre_shell(self):
         print("\n🏃 Warming up...\n")
 
         xud = self.node_manager.get_service("xud")
-        xud.ensure_ready()
+        stop = Event()
+        try:
+            # FIXME pty signal only works in main thread
+            xud.ensure_ready(stop)
+        except KeyboardInterrupt:
+            stop.set()
+            raise
+        except NoWaiting:
+            pass
 
         self.close_other_utils()
 

images/utils/launcher/auto_unlock.py

@@ -948,13 +948,11 @@ def conf_file(self) -> str:
         return os.path.join(self.network_dir, filename)
 
     def parse_network_config(self):
-        conf = ""
-
         try:
             with open(self.conf_file) as f:
                 conf = f.read()
         except FileNotFoundError:
-            return
+            conf = ""
 
         parsed = toml.loads(conf)
 

images/utils/launcher/config/config.py

@@ -17,7 +17,7 @@
 from launcher.utils import get_hostfs_file, ArgumentParser, yes_or_no
 from .DockerTemplate import DockerTemplate
 from .arby import Arby
-from .base import Node, ContainerNotFound
+from .base import Node, ContainerNotFound, NoWaiting
 from .bitcoind import Bitcoind, Litecoind
 from .boltz import Boltz
 from .connext import Connext
@@ -434,4 +434,5 @@ def wrapper(node):
 
     @property
     def newly_installed(self):
-        return not os.path.exists(f"{get_hostfs_file(self.config.network_dir)}/data/xud/nodekey.dat")
+        xud = self.get_service("xud")
+        return not xud.has_wallets()

images/utils/launcher/node/__init__.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
+
 import datetime
 import itertools
 import logging
 import os
-from typing import List, Dict, Any, Optional
+from threading import Event
+from typing import List, Dict, Any, Optional, Tuple
+from typing import TYPE_CHECKING
+
 import docker
 from docker import DockerClient
 from docker.errors import NotFound
 from docker.models.containers import Container
-from typing import TYPE_CHECKING
 
 from launcher.config import PortPublish
 from .image import Image
@@ -19,7 +22,6 @@
     from .image import ImageManager
     from . import NodeManager
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -33,6 +35,10 @@ class ContainerNotFound(Exception):
     pass
 
 
+class NoWaiting(Exception):
+    pass
+
+
 class ContainerSpec:
     def __init__(self, name: str, image: Image, hostname: str, environment: List[str], command: List[str],
                  volumes: Dict, ports: Dict):
@@ -108,6 +114,9 @@ def __init__(self, name: str, ctx):
 
         self._cli = None
 
+    def __repr__(self):
+        return "<Service %s>" % self.name
+
     def generate_environment(self):
         environment = [f"NETWORK={self.network}"]
         if self.node_config["preserve_config"]:
@@ -251,8 +260,9 @@ def status(self) -> str:
         except ContainerNotFound:
             return "Container missing"
 
-    def exec(self, command: str) -> Any:
-        return self.container.exec_run(command)
+    def exec(self, command: str) -> Tuple[int, str]:
+        exit_code, output = self.container.exec_run(command)
+        return exit_code, output.decode()
 
     def cli(self, command: str, exception=False) -> None:
         if self.mode != "native":
@@ -465,7 +475,7 @@ def get_update_action(self) -> str:
         logger.info("Container %s: action=%s", self.container_name, action)
         return action
 
-    def ensure_ready(self):
+    def ensure_ready(self, stop: Event) -> None:
         pass
 
 

images/utils/launcher/node/base.py

@@ -1,9 +1,14 @@
 import json
+import logging
 import re
 from datetime import datetime, timedelta
+from threading import Event
 
+from launcher.utils import get_percentage
 from .base import Node, CliBackend, CliError
 
+logger = logging.getLogger(__name__)
+
 
 class InvalidChain(Exception):
     def __init__(self, chain: str):
@@ -26,6 +31,20 @@ def getinfo(self):
             raise LndApiError(e.output)
 
 
+class CFHeaderState:
+    def __init__(self):
+        self.current = 0
+        self.total = 0
+        self.ready = False
+
+    def __repr__(self):
+        return "%s/%s (%s)" % (self.current, self.total, self.ready)
+
+    @property
+    def message(self):
+        return "Syncing " + get_percentage(self.current, self.total)
+
+
 class Lnd(Node):
     def __init__(self, name, ctx, chain: str):
         super().__init__(name, ctx)
@@ -159,6 +178,60 @@ def status(self):
             self._logger.exception("Failed to get advanced running status")
         return "Waiting for lnd ({}) to come up...".format(self.chain)
 
+    def ensure_ready(self, stop: Event):
+        # [lncli] open /root/.lnd/tls.cert: no such file or directory
+        # [lncli] unable to read macaroon path (check the network setting!): open /root/.lnd/data/chain/bitcoin/testnet/admin.macaroon: no such file or directory
+        # [lncli] Wallet is encrypted. Please unlock using 'lncli unlock', or set password using 'lncli create' if this is the first time starting lnd.
+        while not stop.is_set():
+            exit_code, output = self.exec(self._cli + " getinfo")
+            if exit_code == 0:
+                break
+            if "unable to read macaroon path" in output:
+                break
+            if "Wallet is encrypted" in output:
+                break
+            stop.wait(3)
+
+    def update_cfheader(self, state: CFHeaderState, stop: Event):
+        container = self.container
+        started_at = container.attrs["State"]["StartedAt"]  # e.g. 2020-06-22T17:26:01.541780733Z
+        started_at = started_at.split(".")[0]
+        t_utc = datetime.strptime(started_at, "%Y-%m-%dT%H:%M:%S")
+        t_local = datetime.fromtimestamp(t_utc.timestamp())
+
+        p0 = re.compile(r"^.*Fully caught up with cfheaders at height (\d+), waiting at tip for new blocks$")
+        if self.config.network == "simnet":
+            p1 = re.compile(r"^.*Writing cfheaders at height=(\d+) to next checkpoint$")
+        else:
+            p1 = re.compile(r"^.*Fetching set of checkpointed cfheaders filters from height=(\d+).*$")
+        p2 = re.compile(r"^.*Syncing to block height (\d+) from peer.*$")
+
+        if stop.is_set():
+            return
+
+        for line in container.logs(stream=True, follow=True, since=t_local):
+            if stop.is_set():
+                break
+            line = line.decode().strip()
+            m = p0.match(line)
+
+            if m:
+                state.current = int(m.group(1))
+                state.ready = True
+                h = max(state.current, state.total)
+                state.current = h
+                state.total = h
+                break
+
+            m = p1.match(line)
+            if m:
+                state.current = int(m.group(1))
+                continue
+
+            m = p2.match(line)
+            if m:
+                state.total = int(m.group(1))
+
 
 class Lndbtc(Lnd):
     def __init__(self, *args):