Merge pull request #970 from skalenetwork/develop

Develop to beta - passive node fix

Author: dmytrotkk

node_cli/core/node.py

@@ -177,6 +177,7 @@ def restore(
     config_only: bool = False,
 ):
     node_mode = NodeMode.ACTIVE
+    save_internal_settings(node_type=node_type, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, node_type, node_mode)
     compose_env = compose_node_env(node_type=node_type, node_mode=node_mode)
 
@@ -201,6 +202,7 @@ def init_passive(
     config_file: str, indexer: bool, archive: bool, snapshot: bool, snapshot_from: Optional[str]
 ) -> None:
     node_mode = NodeMode.PASSIVE
+    save_internal_settings(node_type=NodeType.SKALE, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, NodeType.SKALE, node_mode)
     compose_env = compose_node_env(node_type=NodeType.SKALE, node_mode=node_mode)
     init_passive_op(
@@ -225,6 +227,7 @@ def update_passive(config_file: str) -> None:
     prev_version = CliMetaManager().get_meta_info().version
     if (__version__ == 'test' or __version__.startswith('2.6')) and prev_version == '2.5.0':
         migrate_2_6()
+    save_internal_settings(node_type=NodeType.SKALE, node_mode=NodeMode.PASSIVE)
     settings = validate_and_save_node_settings(config_file, NodeType.SKALE, NodeMode.PASSIVE)
     compose_env = compose_node_env(node_type=NodeType.SKALE, node_mode=NodeMode.PASSIVE)
     update_ok = update_passive_op(settings=settings, compose_env=compose_env)

node_cli/fair/active.py

@@ -35,7 +35,7 @@
 from node_cli.utils.helper import error_exit, get_request, post_request
 from node_cli.utils.node_type import NodeMode, NodeType
 from node_cli.utils.print_formatters import print_node_cmd_error, print_node_info_fair
-from node_cli.utils.settings import validate_and_save_node_settings
+from node_cli.utils.settings import save_internal_settings, validate_and_save_node_settings
 from node_cli.utils.texts import safe_load_texts
 
 logger = logging.getLogger(__name__)
@@ -67,6 +67,7 @@ def migrate_from_boot(
     config_file: str,
 ) -> None:
     logger.info('Migrating from boot to fair node...')
+    save_internal_settings(node_type=NodeType.FAIR, node_mode=NodeMode.ACTIVE)
     settings = validate_and_save_node_settings(config_file, NodeType.FAIR, NodeMode.ACTIVE)
     compose_env = compose_node_env(node_type=NodeType.FAIR, node_mode=NodeMode.ACTIVE)
     migrate_ok = update_fair_op(
@@ -143,6 +144,7 @@ def exit() -> None:
 @check_not_inited
 def restore(backup_path: str, config_file: str, config_only: bool = False):
     node_mode = NodeMode.ACTIVE
+    save_internal_settings(node_type=NodeType.FAIR, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, NodeType.FAIR, node_mode)
     compose_env = compose_node_env(node_type=NodeType.FAIR, node_mode=node_mode)
 

node_cli/fair/boot.py

@@ -30,7 +30,7 @@
 from node_cli.utils.helper import error_exit
 from node_cli.utils.node_type import NodeMode, NodeType
 from node_cli.utils.print_formatters import print_node_cmd_error
-from node_cli.utils.settings import validate_and_save_node_settings
+from node_cli.utils.settings import save_internal_settings, validate_and_save_node_settings
 
 logger = logging.getLogger(__name__)
 
@@ -39,6 +39,7 @@
 def init(config_file: str) -> None:
     node_mode = NodeMode.ACTIVE
     node_type = NodeType.FAIR
+    save_internal_settings(node_type=node_type, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, node_type, node_mode)
     compose_env = compose_node_env(node_type=node_type, node_mode=node_mode)
 
@@ -55,6 +56,7 @@ def init(config_file: str) -> None:
 def update(config_file: str, pull_config_for_schain: str) -> None:
     logger.info('Fair boot node update started')
     node_mode = upsert_node_mode(node_mode=NodeMode.ACTIVE)
+    save_internal_settings(node_type=NodeType.FAIR, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, NodeType.FAIR, node_mode)
     compose_env = compose_node_env(node_type=NodeType.FAIR, node_mode=node_mode)
     migrate_ok = update_fair_boot_op(

node_cli/fair/common.py

@@ -38,7 +38,7 @@
 from node_cli.utils.helper import error_exit
 from node_cli.utils.node_type import NodeMode, NodeType
 from node_cli.utils.print_formatters import print_node_cmd_error
-from node_cli.utils.settings import validate_and_save_node_settings
+from node_cli.utils.settings import save_internal_settings, validate_and_save_node_settings
 from node_cli.utils.texts import safe_load_texts
 from skale_core.settings import get_settings
 
@@ -55,6 +55,7 @@ def init(
     archive: bool = False,
     snapshot: str | None = None,
 ) -> None:
+    save_internal_settings(node_type=NodeType.FAIR, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, NodeType.FAIR, node_mode)
     compose_env = compose_node_env(node_type=NodeType.FAIR, node_mode=node_mode)
 
@@ -101,6 +102,7 @@ def update(
     )
     node_mode = upsert_node_mode(node_mode=node_mode)
 
+    save_internal_settings(node_type=NodeType.FAIR, node_mode=node_mode)
     settings = validate_and_save_node_settings(config_file, NodeType.FAIR, node_mode)
     compose_env = compose_node_env(node_type=NodeType.FAIR, node_mode=node_mode)
     update_ok = update_fair_op(