Merge pull request #848 from skalenetwork/beta

Beta 4.0 to stable

Author: DmytroNazarenko

README.md

@@ -1,4 +1,4 @@
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     print(__version__)

node_cli/cli/__init__.py

@@ -21,13 +21,13 @@
 
 import click
 
-from node_cli.core.node import init_sync, update_sync, repair_sync
+from node_cli.core.node import init_sync, update_sync, cleanup_sync
 from node_cli.utils.helper import (
     abort_if_false,
     error_exit,
     safe_load_texts,
     streamed_cmd,
-    URL_TYPE
+    URL_TYPE,
 )
 from node_cli.utils.exit_codes import CLIExitCodes
 
@@ -41,86 +41,54 @@ def sync_node_cli():
     pass
 
 
-@sync_node_cli.group(help="SKALE sync node commands")
+@sync_node_cli.group(help='SKALE sync node commands')
 def sync_node():
     pass
 
 
 @sync_node.command('init', help=TEXTS['init']['help'])
 @click.argument('env_file')
+@click.option('--indexer', help=TEXTS['init']['indexer'], is_flag=True)
+@click.option('--archive', help=TEXTS['init']['archive'], is_flag=True)
+@click.option('--snapshot', help=TEXTS['init']['snapshot'], is_flag=True)
 @click.option(
-    '--archive',
-    help=TEXTS['init']['archive'],
-    is_flag=True
-)
-@click.option(
-    '--historic-state',
-    help=TEXTS['init']['historic_state'],
-    is_flag=True
-)
-@click.option(
-    '--snapshot-from',
-    type=URL_TYPE,
-    default=None,
-    hidden=True,
-    help='Ip of the node from to download snapshot from'
+    '--snapshot-from', type=URL_TYPE, default=None, hidden=True, help=TEXTS['init']['snapshot_from']
 )
 @streamed_cmd
-def _init_sync(env_file, archive, historic_state, snapshot_from: Optional[str]):
-    if historic_state and not archive:
+def _init_sync(
+    env_file, indexer: bool, archive: bool, snapshot: bool, snapshot_from: Optional[str]
+) -> None:
+    if indexer and archive:
         error_exit(
-            '--historic-state can be used only is combination with --archive',
-            exit_code=CLIExitCodes.FAILURE
+            'Cannot use both --indexer and --archive options',
+            exit_code=CLIExitCodes.FAILURE,
         )
-    init_sync(env_file, archive, historic_state, snapshot_from)
+    init_sync(env_file, indexer, archive, snapshot, snapshot_from)
 
 
 @sync_node.command('update', help='Update sync node from .env file')
-@click.option('--yes', is_flag=True, callback=abort_if_false,
-              expose_value=False,
-              prompt='Are you sure you want to update SKALE node software?')
 @click.option(
-    '--unsafe',
-    'unsafe_ok',
-    help='Allow unsafe update',
-    hidden=True,
-    is_flag=True
+    '--yes',
+    is_flag=True,
+    callback=abort_if_false,
+    expose_value=False,
+    prompt='Are you sure you want to update SKALE node software?',
 )
+@click.option('--unsafe', 'unsafe_ok', help='Allow unsafe update', hidden=True, is_flag=True)
 @click.argument('env_file')
 @streamed_cmd
 def _update_sync(env_file, unsafe_ok):
     update_sync(env_file)
 
 
-@sync_node.command('repair', help='Start sync node from empty database')
-@click.option('--yes', is_flag=True, callback=abort_if_false,
-              expose_value=False,
-              prompt='Are you sure you want to start sync node from empty database?')
+@sync_node.command('cleanup', help='Remove sync node data and containers')
 @click.option(
-    '--archive',
-    help=TEXTS['init']['archive'],
-    is_flag=True
-)
-@click.option(
-    '--historic-state',
-    help=TEXTS['init']['historic_state'],
-    is_flag=True
-)
-@click.option(
-    '--snapshot-from',
-    type=URL_TYPE,
-    default=None,
-    hidden=True,
-    help='Ip of the node from to download snapshot from'
+    '--yes',
+    is_flag=True,
+    callback=abort_if_false,
+    expose_value=False,
+    prompt='Are you sure you want to remove all node containers and data?',
 )
 @streamed_cmd
-def _repair_sync(
-    archive: str,
-    historic_state: str,
-    snapshot_from: Optional[str] = None
-) -> None:
-    repair_sync(
-        archive=archive,
-        historic_state=historic_state,
-        snapshot_from=snapshot_from
-    )
+def _cleanup_sync() -> None:
+    cleanup_sync()

node_cli/cli/sync_node.py

@@ -56,8 +56,8 @@
     turn_on_op,
     restore_op,
     init_sync_op,
-    repair_sync_op,
     update_sync_op,
+    cleanup_sync_op,
 )
 from node_cli.utils.print_formatters import (
     print_failed_requirements_checks,
@@ -176,11 +176,14 @@ def restore(backup_path, env_filepath, no_snapshot=False, config_only=False):
     print('Node is restored from backup')
 
 
-def init_sync(env_filepath: str, archive: bool, historic_state: bool, snapshot_from: str) -> None:
+@check_not_inited
+def init_sync(
+    env_filepath: str, indexer: bool, archive: bool, snapshot: bool, snapshot_from: Optional[str]
+) -> None:
     env = compose_node_env(env_filepath, sync_node=True)
     if env is None:
         return
-    inited_ok = init_sync_op(env_filepath, env, archive, historic_state, snapshot_from)
+    inited_ok = init_sync_op(env_filepath, env, indexer, archive, snapshot, snapshot_from)
     if not inited_ok:
         error_exit('Init operation failed', exit_code=CLIExitCodes.OPERATION_EXECUTION_ERROR)
     logger.info('Waiting for containers initialization')
@@ -212,16 +215,11 @@ def update_sync(env_filepath: str, unsafe_ok: bool = False) -> None:
 
 @check_inited
 @check_user
-def repair_sync(archive: bool, historic_state: bool, snapshot_from: str) -> None:
-    env_params = extract_env_params(INIT_ENV_FILEPATH, sync_node=True)
-    schain_name = env_params['SCHAIN_NAME']
-    repair_sync_op(
-        schain_name=schain_name,
-        archive=archive,
-        historic_state=historic_state,
-        snapshot_from=snapshot_from,
-    )
-    logger.info('Schain was started from scratch')
+def cleanup_sync() -> None:
+    env = compose_node_env(SKALE_DIR_ENV_FILEPATH, save=False, sync_node=True)
+    schain_name = env['SCHAIN_NAME']
+    cleanup_sync_op(env, schain_name)
+    logger.info('Sync node was cleaned up, all containers and data removed')
 
 
 def compose_node_env(
@@ -230,7 +228,7 @@ def compose_node_env(
     sync_schains=None,
     pull_config_for_schain=None,
     sync_node=False,
-    save: bool = True
+    save: bool = True,
 ):
     if env_filepath is not None:
         env_params = extract_env_params(env_filepath, sync_node=sync_node, raise_for_status=True)

node_cli/core/node.py

@@ -13,21 +13,17 @@
     NODE_CONFIG_PATH,
     NODE_CLI_STATUS_FILENAME,
     SCHAIN_NODE_DATA_PATH,
-    SCHAINS_MNT_DIR_SYNC
+    SCHAINS_MNT_DIR_SYNC,
 )
 from node_cli.configs.env import get_env_config
 
-from node_cli.utils.helper import (
-    get_request,
-    error_exit,
-    safe_load_yml
-)
+from node_cli.utils.helper import get_request, error_exit, safe_load_yml
 from node_cli.utils.exit_codes import CLIExitCodes
 from node_cli.utils.print_formatters import (
     print_dkg_statuses,
     print_firewall_rules,
     print_schain_info,
-    print_schains
+    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
@@ -41,9 +37,7 @@
 
 def get_schain_firewall_rules(schain: str) -> None:
     status, payload = get_request(
-        blueprint=BLUEPRINT_NAME,
-        method='firewall-rules',
-        params={'schain_name': schain}
+        blueprint=BLUEPRINT_NAME, method='firewall-rules', params={'schain_name': schain}
     )
     if status == 'ok':
         print_firewall_rules(payload['endpoints'])
@@ -52,10 +46,7 @@ def get_schain_firewall_rules(schain: str) -> None:
 
 
 def show_schains() -> None:
-    status, payload = get_request(
-        blueprint=BLUEPRINT_NAME,
-        method='list'
-    )
+    status, payload = get_request(blueprint=BLUEPRINT_NAME, method='list')
     if status == 'ok':
         schains = payload
         if not schains:
@@ -69,11 +60,7 @@ def show_schains() -> None:
 
 def show_dkg_info(all_: bool = False) -> None:
     params = {'all': all_}
-    status, payload = get_request(
-        blueprint=BLUEPRINT_NAME,
-        method='dkg-statuses',
-        params=params
-    )
+    status, payload = get_request(blueprint=BLUEPRINT_NAME, method='dkg-statuses', params=params)
     if status == 'ok':
         print_dkg_statuses(payload)
     else:
@@ -82,9 +69,7 @@ def show_dkg_info(all_: bool = False) -> None:
 
 def show_config(name: str) -> None:
     status, payload = get_request(
-        blueprint=BLUEPRINT_NAME,
-        method='config',
-        params={'schain_name': name}
+        blueprint=BLUEPRINT_NAME, method='config', params={'schain_name': name}
     )
     if status == 'ok':
         pprint.pprint(payload)
@@ -97,9 +82,7 @@ def get_node_cli_schain_status_filepath(schain_name: str) -> str:
 
 
 def update_node_cli_schain_status(
-    schain_name: str,
-    repair_ts: Optional[int] = None,
-    snapshot_from: Optional[str] = None
+    schain_name: str, repair_ts: Optional[int] = None, snapshot_from: Optional[str] = None
 ) -> None:
     path = get_node_cli_schain_status_filepath(schain_name)
     if os.path.isdir(path):
@@ -110,7 +93,7 @@ def update_node_cli_schain_status(
         status = {
             'schain_name': schain_name,
             'repair_ts': repair_ts,
-            'snapshot_from': snapshot_from
+            'snapshot_from': snapshot_from,
         }
         os.makedirs(os.path.dirname(path), exist_ok=True)
     save_json(path, status)
@@ -121,20 +104,15 @@ def get_node_cli_schain_status(schain_name: str) -> dict:
     return read_json(path)
 
 
-def toggle_schain_repair_mode(
-    schain: str,
-    snapshot_from: Optional[str] = None
-) -> None:
+def toggle_schain_repair_mode(schain: str, snapshot_from: Optional[str] = None) -> None:
     ts = int(time.time())
     update_node_cli_schain_status(schain_name=schain, repair_ts=ts, snapshot_from=snapshot_from)
     print('Schain has been set for repair')
 
 
 def describe(schain: str, raw=False) -> None:
     status, payload = get_request(
-        blueprint=BLUEPRINT_NAME,
-        method='get',
-        params={'schain_name': schain}
+        blueprint=BLUEPRINT_NAME, method='get', params={'schain_name': schain}
     )
     if status == 'ok':
         print_schain_info(payload, raw=raw)
@@ -193,23 +171,18 @@ def rm_btrfs_subvolume(subvolume: str) -> None:
 
 def fillin_snapshot_folder(src_path: str, block_number: int) -> None:
     snapshots_dirname = 'snapshots'
-    snapshot_folder_path = os.path.join(
-        src_path, snapshots_dirname, str(block_number))
+    snapshot_folder_path = os.path.join(src_path, snapshots_dirname, str(block_number))
     os.makedirs(snapshot_folder_path, exist_ok=True)
     for subvolume in os.listdir(src_path):
         if subvolume != snapshots_dirname:
             logger.debug('Copying %s to %s', subvolume, snapshot_folder_path)
             subvolume_path = os.path.join(src_path, subvolume)
-            subvolume_snapshot_path = os.path.join(
-                snapshot_folder_path, subvolume)
+            subvolume_snapshot_path = os.path.join(snapshot_folder_path, subvolume)
             make_btrfs_snapshot(subvolume_path, subvolume_snapshot_path)
 
 
 def restore_schain_from_snapshot(
-    schain: str,
-    snapshot_path: str,
-    env_type: Optional[str] = None,
-    schain_type: str = 'medium'
+    schain: str, snapshot_path: str, env_type: Optional[str] = None, schain_type: str = 'medium'
 ) -> None:
     if env_type is None:
         env_config = get_env_config()

node_cli/core/schains.py

@@ -25,6 +25,6 @@
     turn_off as turn_off_op,
     turn_on as turn_on_op,
     restore as restore_op,
-    repair_sync as repair_sync_op,
-    configure_nftables
+    cleanup_sync as cleanup_sync_op,
+    configure_nftables,
 )