Merge branch 'mirage' into mirage-new-cmds

Author: badrogger

.github/workflows/test.yml

@@ -71,6 +71,10 @@ jobs:
       run: |
         scripts/build.sh test test normal
 
+    - name: Run redis
+      run: |
+        ./helper-scripts/redis/run.sh
+
     - name: Run tests
       run: |
         export PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages/

helper-scripts

@@ -19,10 +19,11 @@
 
 import click
 
-from node_cli.core.node import get_node_signature, register_node as register, get_node_info
-from node_cli.core.mirage_boot import init, update
 from node_cli.configs import DEFAULT_NODE_BASE_PORT
-from node_cli.utils.helper import streamed_cmd, IP_TYPE, error_exit, abort_if_false
+from node_cli.core.node import get_node_info, get_node_signature
+from node_cli.core.node import register_node as register
+from node_cli.mirage.mirage_boot import init, update
+from node_cli.utils.helper import IP_TYPE, abort_if_false, error_exit, streamed_cmd
 
 
 @click.group()

node_cli/cli/mirage_boot.py

@@ -20,9 +20,12 @@
 import click
 
 from node_cli.core.node import get_node_signature, backup, get_node_info
-from node_cli.core.mirage_node import migrate_from_boot, restore_mirage
+from node_cli.mirage.mirage_node import migrate_from_boot, request_repair, restore_mirage
 from node_cli.utils.helper import error_exit, streamed_cmd, abort_if_false
+from node_cli.utils.helper import URL_TYPE
+from node_cli.utils.texts import safe_load_texts
 
+TEXTS = safe_load_texts()
 
 @click.group()
 def mirage_node_cli():
@@ -108,3 +111,16 @@ def restore_node(backup_path, env_file, config_only):
 @streamed_cmd
 def migrate_node(env_filepath: str) -> None:
     migrate_from_boot(env_filepath=env_filepath)
+    prompt=TEXTS['mirage']['node']['repair']['warning'],
+)
+
+@node.command('repair', help='Toggle mirage chain repair mode')
+@click.option(
+    '--snapshot-from',
+    type=URL_TYPE,
+    default='',
+    hidden=True,
+    help=TEXTS['mirage']['node']['repair']['snapshot_from'],
+)
+def repair(snapshot_from: str = '') -> None:
+    request_repair(snapshot_from=snapshot_from)

node_cli/cli/mirage_node.py

@@ -169,3 +169,5 @@ def _get_env():
 
 UFW_CONFIG_PATH = '/etc/default/ufw'
 UFW_IPV6_BEFORE_INPUT_CHAIN = 'ufw6-before-input'
+
+REDIS_URI: str = os.getenv('REDIS_URI', 'redis://@127.0.0.1:6379')

node_cli/configs/__init__.py

@@ -45,7 +45,6 @@
 
 import docker  # type: ignore
 import psutil  # type: ignore
-import yaml
 from debian import debian_support
 from packaging.version import parse as version_parse
 
@@ -55,11 +54,10 @@
     DOCKER_CONFIG_FILEPATH,
     DOCKER_DAEMON_HOSTS,
     REPORTS_PATH,
-    STATIC_PARAMS_FILEPATH,
-    MIRAGE_STATIC_PARAMS_FILEPATH,
 )
 from node_cli.core.host import is_ufw_ipv6_chain_exists, is_ufw_ipv6_option_enabled
 from node_cli.core.resources import get_disk_size
+from node_cli.core.static_config import get_static_params
 from node_cli.utils.docker_utils import NodeType
 from node_cli.utils.helper import run_cmd, safe_mkdir
 
@@ -78,23 +76,6 @@
 FuncList = List[Func]
 
 
-def get_static_params(
-    node_type: NodeType,
-    env_type: str = 'mainnet',
-    config_path: str = CONTAINER_CONFIG_PATH,
-) -> Dict:
-    if node_type == NodeType.MIRAGE:
-        static_params_base_filepath = MIRAGE_STATIC_PARAMS_FILEPATH
-    else:
-        static_params_base_filepath = STATIC_PARAMS_FILEPATH
-
-    static_params_filename = os.path.basename(static_params_base_filepath)
-    static_params_filepath = os.path.join(config_path, static_params_filename)
-    with open(static_params_filepath) as requirements_file:
-        ydata = yaml.load(requirements_file, Loader=yaml.Loader)
-        return ydata['envs'][env_type]
-
-
 def check_quietly(check: Func, *args, **kwargs) -> CheckResult:
     try:
         return check(*args, **kwargs)

node_cli/core/checks.py

@@ -1,35 +1,57 @@
+#   -*- coding: utf-8 -*-
+#
+#   This file is part of node-cli
+#
+#   Copyright (C) 2025 SKALE Labs
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import glob
 import logging
 import os
 import pprint
 import shutil
 import time
 from pathlib import Path
-
 from typing import Dict, Optional
 
+from lvmpy.src.core import mount, volume_mountpoint
 from node_cli.configs import (
     ALLOCATION_FILEPATH,
-    NODE_CONFIG_PATH,
     NODE_CLI_STATUS_FILENAME,
+    NODE_CONFIG_PATH,
     SCHAIN_NODE_DATA_PATH,
     SCHAINS_MNT_DIR_SINGLE_CHAIN,
 )
 from node_cli.configs.user import get_validated_user_config
-
-from node_cli.utils.helper import get_request, error_exit, safe_load_yml
+from node_cli.utils.docker_utils import ensure_volume, is_volume_exists
 from node_cli.utils.exit_codes import CLIExitCodes
+from node_cli.utils.helper import (
+    error_exit,
+    get_request,
+    read_json,
+    run_cmd,
+    safe_load_yml,
+    save_json,
+)
+from node_cli.utils.node_type import NodeType
 from node_cli.utils.print_formatters import (
     print_dkg_statuses,
     print_firewall_rules,
     print_schain_info,
     print_schains,
 )
-from node_cli.utils.docker_utils import ensure_volume, is_volume_exists
-from node_cli.utils.helper import read_json, run_cmd, save_json
-from node_cli.utils.node_type import NodeType
-from lvmpy.src.core import mount, volume_mountpoint
-
 
 logger = logging.getLogger(__name__)
 

node_cli/core/schains.py

@@ -0,0 +1,46 @@
+#   -*- coding: utf-8 -*-
+#
+#   This file is part of node-cli
+#
+#   Copyright (C) 2025 SKALE Labs
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+import os
+
+import yaml
+
+from node_cli.configs import (
+    CONTAINER_CONFIG_PATH,
+    MIRAGE_STATIC_PARAMS_FILEPATH,
+    STATIC_PARAMS_FILEPATH,
+)
+from node_cli.utils.node_type import NodeType
+
+
+def get_static_params(
+    node_type: NodeType,
+    env_type: str = 'mainnet',
+    config_path: str = CONTAINER_CONFIG_PATH,
+) -> dict:
+    if node_type == NodeType.MIRAGE:
+        static_params_base_filepath = MIRAGE_STATIC_PARAMS_FILEPATH
+    else:
+        static_params_base_filepath = STATIC_PARAMS_FILEPATH
+
+    static_params_filename = os.path.basename(static_params_base_filepath)
+    static_params_filepath = os.path.join(config_path, static_params_filename)
+    with open(static_params_filepath) as requirements_file:
+        ydata = yaml.load(requirements_file, Loader=yaml.Loader)
+        return ydata['envs'][env_type]