Merge branch 'mirage-new-cmds' into add-mirage-cleanup

Author: badrogger

node_cli/cli/mirage_boot.py

@@ -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.mirage.mirage_boot import init, migrate, 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()
@@ -76,21 +77,6 @@ def signature_boot(validator_id):
     print(f'Signature: {res}')
 
 
-@boot.command('migrate', help='Migrate mirage node from Mirage Boot Phase to Mirage Main Phase.')
-@click.option(
-    '--yes',
-    is_flag=True,
-    callback=abort_if_false,
-    expose_value=False,
-    prompt='Are you sure you want to mirage node from Mirage Boot Phase to Mirage Main Phase?',
-)
-@click.option('--pull-config', 'pull_config_for_schain', hidden=True, type=str)
-@click.argument('env_file')
-@streamed_cmd
-def migrate_boot(env_file, pull_config_for_schain):
-    migrate(env_file, pull_config_for_schain)
-
-
 @boot.command('update', help='Update Mirage node from .env file')
 @click.option(
     '--yes',

node_cli/cli/mirage_node.py

@@ -21,7 +21,7 @@
 
 from node_cli.core.node import backup, get_node_info, get_node_signature
 from node_cli.mirage.mirage_node import cleanup as mirage_cleanup
-from node_cli.mirage.mirage_node import request_repair, restore_mirage
+from node_cli.mirage.mirage_node import migrate_from_boot, request_repair, restore_mirage
 from node_cli.utils.helper import URL_TYPE, abort_if_false, error_exit, streamed_cmd
 from node_cli.utils.texts import safe_load_texts
 
@@ -100,21 +100,35 @@ def restore_node(backup_path, env_file, config_only):
     restore_mirage(backup_path, env_file, config_only)
 
 
-@node.command('repair', help='Toggle mirage chain repair mode')
+@node.command('migrate', help='Switch from boot to regular Mirage node.')
+@click.argument('env_filepath')
 @click.option(
     '--yes',
     is_flag=True,
     callback=abort_if_false,
     expose_value=False,
-    prompt=TEXTS['mirage']['node']['repair']['warning'],
+    prompt='Are you sure you want to migrate to regular Mirage node? The action cannot be undone',
 )
+@streamed_cmd
+def migrate_node(env_filepath: str) -> None:
+    migrate_from_boot(env_filepath=env_filepath)
+
+
+@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'],
 )
+@click.option(
+    '--yes',
+    is_flag=True,
+    callback=abort_if_false,
+    expose_value=False,
+    prompt=TEXTS['mirage']['node']['repair']['warning'],
+)
 def repair(snapshot_from: str = '') -> None:
     request_repair(snapshot_from=snapshot_from)
 

node_cli/cli/node.py

@@ -37,11 +37,11 @@
     run_checks,
 )
 from node_cli.configs import DEFAULT_NODE_BASE_PORT
-from node_cli.configs.env import ALLOWED_ENV_TYPES
+from node_cli.configs.user import ALLOWED_ENV_TYPES
 from node_cli.utils.decorators import check_inited
 from node_cli.utils.helper import abort_if_false, streamed_cmd, IP_TYPE
 from node_cli.utils.texts import safe_load_texts
-from node_cli.utils.meta import get_meta_info
+from node_cli.utils.meta import CliMetaManager
 from node_cli.utils.print_formatters import print_meta_info
 
 
@@ -248,7 +248,7 @@ def configure_firewall(monitoring):
 @check_inited
 @click.option('--json', 'raw', is_flag=True, help=TEXTS['common']['json'])
 def version(raw: bool) -> None:
-    meta_info = get_meta_info(raw=raw)
+    meta_info = CliMetaManager().get_meta_info(raw=raw)
     if raw:
         print(meta_info)
     else:

node_cli/configs/alias_address_validation.py

@@ -38,7 +38,7 @@ class ContractType(Enum):
     MANAGER = 'skale-manager'
 
 
-def validate_env_alias_or_address(
+def validate_alias_or_address(
     alias_or_address: str, contract_type: ContractType, endpoint: str
 ) -> None:
     if is_contract_address(alias_or_address):