helm chart seperations for sandbox (#55)

* helm chart seperations for sandbox

* fix key file export

Author: devalpatel67

application/service/k3s_service.py

@@ -77,9 +77,7 @@ def _initialize_k3s_control(
         try:
             external_ip = control_input.hostname
             disable_components = "traefik"
-            install_exec = (
-                f"--disable={disable_components} --flannel-backend=none --disable-network-policy --cluster-init"
-            )
+            install_exec = f"--disable={disable_components} --flannel-backend=none --disable-network-policy --cluster-init"
 
             internal_ip, _ = run_ssh_command(
                 ssh_client, self.INTERNAL_IP_CMD, task_id=task_id

application/service/provider_service.py

@@ -41,11 +41,19 @@ def _install_helm(self, ssh_client, task_id: str):
 
     def _setup_helm_repos(self, ssh_client, task_id: str):
         log.info("Setting up Helm repositories...")
+        repo_name = "akash" if Config.CHAIN_ID == "akashnet-2" else "akash-dev"
+        repo_url = ("https://akash-network.github.io/helm-charts" if repo_name == "akash" 
+                   else "https://akash-network.github.io/helm-charts/dev")
+        
         commands = [
-            "helm repo remove akash 2>/dev/null || true",
-            "helm repo add akash https://akash-network.github.io/helm-charts",
-            "helm repo update",
+            f"helm repo remove {repo_name} 2>/dev/null || true",
+            f"helm repo add {repo_name} {repo_url}",
         ]
+        
+        if repo_name == "akash-dev":
+            commands.append("helm search repo akash-dev --devel")
+            
+        commands.append("helm repo update")
         for cmd in commands:
             time.sleep(2)
             run_ssh_command(ssh_client, cmd, task_id=task_id)
@@ -55,14 +63,23 @@ def _install_akash_services(
         self, ssh_client, chain_id, provider_version, node_version, task_id: str
     ):
         log.info("Installing Akash services...")
+        # Define base helm commands based on chain ID
+        repo_prefix = "akash" if chain_id == "akashnet-2" else "akash-dev"
+        devel_flag = "" if chain_id == "akashnet-2" else " --devel"
+        
+        # Common helm install parameters
+        namespace = "-n akash-services"
+        version_tag = f"--set image.tag={provider_version}"
+        
         commands = [
-            f"helm install akash-hostname-operator akash/akash-hostname-operator -n akash-services --set image.tag={provider_version}",
-            f"helm install inventory-operator akash/akash-inventory-operator -n akash-services --set image.tag={provider_version}",
+            f"helm install akash-hostname-operator {repo_prefix}/akash-hostname-operator {namespace} {version_tag}{devel_flag}",
+            f"helm install inventory-operator {repo_prefix}/akash-inventory-operator {namespace} {version_tag}{devel_flag}",
         ]
-        if chain_id != "sandbox-01":
-            commands.append(
-                f"helm install akash-node akash/akash-node -n akash-services --set image.tag={node_version}"
-            )
+        
+        # Add akash-node installation only for mainnet
+        if chain_id == "akashnet-2":
+            node_version_tag = f"--set image.tag={node_version}"
+            commands.append(f"helm install akash-node akash/akash-node {namespace} {node_version_tag}")
         for cmd in commands:
             time.sleep(2)
             run_ssh_command(ssh_client, cmd, task_id=task_id)
@@ -90,7 +107,7 @@ def _prepare_provider_config(
 key: "{self._get_base64_encoded_key(ssh_client)}"
 keysecret: "{base64.b64encode(key_password.encode()).decode()}"
 domain: "{domain}"
-node: "http://akash-node-1:26657"
+node: "{f'http://akash-node-1:26657' if chain_id == 'akashnet-2' else 'https://rpc.sandbox-2.aksh.pw:443'}"
 withdrawalperiod: 12h
 chainid: "{chain_id}"
 organization: "{organization}"
@@ -144,7 +161,15 @@ def _install_akash_provider(self, ssh_client, provider_version, task_id: str):
             )
 
             # Prepare the Helm install command
-            install_cmd = f"helm install akash-provider akash/provider -n akash-services -f ~/provider/provider.yaml --set image.tag={provider_version}"
+            # Determine helm repo and flags based on chain ID
+            helm_repo = "akash" if Config.CHAIN_ID == "akashnet-2" else "akash-dev"
+            devel_flag = "" if Config.CHAIN_ID == "akashnet-2" else "--devel"
+            
+            install_cmd = (
+                f"helm install akash-provider {helm_repo}/provider "
+                f"-n akash-services -f ~/provider/provider.yaml "
+                f"--set image.tag={provider_version} {devel_flag}".strip()
+            )
 
             if pricing_script_b64:
                 install_cmd += f" --set bidpricescript='{pricing_script_b64}'"
@@ -582,7 +607,17 @@ async def restart_provider_service(self, ssh_client):
             provider_version = Config.PROVIDER_SERVICES_VERSION.replace("v", "")
 
             # Upgrade helm chart with the pricing script
-            command = f'helm upgrade --install akash-provider akash/provider -n akash-services -f ~/provider/provider.yaml --set bidpricescript="{pricing_script_b64}" --set image.tag={provider_version}'
+            # Determine helm repo and flags based on chain ID
+            helm_repo = "akash" if Config.CHAIN_ID == "akashnet-2" else "akash-dev"
+            devel_flag = "" if Config.CHAIN_ID == "akashnet-2" else "--devel"
+            
+            # Build helm upgrade command with consistent parameters
+            command = (
+                f'helm upgrade --install akash-provider {helm_repo}/provider '
+                f'-n akash-services -f ~/provider/provider.yaml '
+                f'--set bidpricescript="{pricing_script_b64}" '
+                f'--set image.tag={provider_version} {devel_flag}'
+            ).strip()
             run_ssh_command(ssh_client, command)
 
             time.sleep(10)

application/service/upgrade_service.py

@@ -68,9 +68,21 @@ async def check_upgrade_status(self, ssh_client) -> Dict:
         """
 
         def get_versions():
-            node_app_version, node_chart_version = self._get_helm_release_versions(
-                ssh_client, "node"
-            )
+            # For mainnet (akashnet-2), get versions from helm release
+            # For other networks, use configured versions since node is not deployed
+            is_mainnet = Config.CHAIN_ID == "akashnet-2"
+
+            # Get node versions
+            if is_mainnet:
+                node_app_version, node_chart_version = self._get_helm_release_versions(
+                    ssh_client, "node"
+                )
+            else:
+                # For non-mainnet, use configured versions since node is not deployed
+                node_app_version = Config.AKASH_VERSION
+                node_chart_version = Config.AKASH_NODE_HELM_CHART_VERSION
+
+            # Get provider versions
             provider_app_version, provider_chart_version = (
                 self._get_helm_release_versions(ssh_client, "provider")
             )
@@ -175,17 +187,19 @@ async def upgrade_network(self, ssh_client, task_id: str) -> Dict:
                 # Delete the pod to trigger upgrade
                 # Update Helm repositories
                 log.info("Updating Helm repositories...")
+                helm_repo_cmd = "helm repo update akash" if Config.CHAIN_ID == "akashnet-2" else "helm repo update akash-dev"
                 stdout, stderr = run_ssh_command(
                     ssh_client,
-                    "helm repo update akash",
+                    helm_repo_cmd,
                     True,
                     task_id=task_id,
                 )
                 # Update Helm repositories
                 log.info("Verifying akash-node chart availability...")
+                helm_search_cmd = "helm search repo akash-node" if Config.CHAIN_ID == "akashnet-2" else "helm search repo akash-dev --devel"
                 stdout, stderr = run_ssh_command(
                     ssh_client,
-                    "helm search repo akash-node",
+                    helm_search_cmd,
                     True,
                     task_id=task_id,
                 )
@@ -204,7 +218,10 @@ async def upgrade_network(self, ssh_client, task_id: str) -> Dict:
                 # Upgrade akash-node deployment
                 log.info(f"Upgrading akash-node to version {app_version}...")
                 if app_needs_upgrade:
-                    upgrade_command = f"helm upgrade --install akash-node akash/akash-node -n akash-services --set image.tag={app_version}"
+                    if Config.CHAIN_ID == "akashnet-2":
+                        upgrade_command = f"helm upgrade --install akash-node akash/akash-node -n akash-services --set image.tag={app_version}"
+                    else:
+                        upgrade_command = f"helm upgrade --install akash-node akash-dev/akash-node -n akash-services --set image.tag={app_version} --devel"
                 else:
                     upgrade_command = (
                         "kubectl delete pod -n akash-services -l app=akash-node"
@@ -267,17 +284,19 @@ async def upgrade_provider(self, ssh_client, task_id: str) -> Dict:
 
             # Update Helm repositories
             log.info("Updating Helm repositories...")
+            helm_repo_cmd = "helm repo update akash" if Config.CHAIN_ID == "akashnet-2" else "helm repo update akash-dev"
             stdout, stderr = run_ssh_command(
                 ssh_client,
-                "helm repo update akash",
+                helm_repo_cmd,
                 True,
                 task_id=task_id,
             )
 
             log.info(f"Upgrading provider to version {app_version}...")
+            helm_search_cmd = "helm search repo provider" if Config.CHAIN_ID == "akashnet-2" else "helm search repo provider --devel"
             stdout, stderr = run_ssh_command(
                 ssh_client,
-                "helm search repo provider",
+                helm_search_cmd,
                 True,
                 task_id=task_id,
             )
@@ -294,26 +313,18 @@ async def upgrade_provider(self, ssh_client, task_id: str) -> Dict:
 
             # Backup existing values
             log.info("Backing up helm values...")
-            backup_cmd = "cd /root/provider && for i in $(helm list -n akash-services -q | grep -vw akash-node); do helm -n akash-services get values $i > ${i}.pre-v0.8.2.values; done"
+            backup_cmd = "cd /root/provider && for i in $(helm list -n akash-services -q | grep -vw akash-node); do helm -n akash-services get values $i > ${i}.old.values; done"
             run_ssh_command(ssh_client, backup_cmd, True, task_id=task_id)
 
             # Upgrade hostname operator
             log.info("Upgrading hostname operator...")
-            run_ssh_command(
-                ssh_client,
-                f"helm -n akash-services upgrade akash-hostname-operator akash/akash-hostname-operator --set image.tag={app_version}",
-                True,
-                task_id=task_id,
-            )
+            akash_hostname_operator_cmd = f"helm -n akash-services upgrade akash-hostname-operator akash/akash-hostname-operator --set image.tag={app_version}" if Config.CHAIN_ID == "akashnet-2" else f"helm -n akash-services upgrade akash-hostname-operator akash-dev/akash-hostname-operator --set image.tag={app_version} --devel"
+            run_ssh_command(ssh_client, akash_hostname_operator_cmd, True, task_id=task_id)
 
             # Upgrade inventory operator
             log.info("Upgrading inventory operator...")
-            run_ssh_command(
-                ssh_client,
-                f"helm -n akash-services upgrade inventory-operator akash/akash-inventory-operator --set image.tag={app_version}",
-                True,
-                task_id=task_id,
-            )
+            akash_inventory_operator_cmd = f"helm -n akash-services upgrade inventory-operator akash/akash-inventory-operator --set image.tag={app_version}" if Config.CHAIN_ID == "akashnet-2" else f"helm -n akash-services upgrade inventory-operator akash-dev/akash-inventory-operator --set image.tag={app_version} --devel"
+            run_ssh_command(ssh_client, akash_inventory_operator_cmd, True, task_id=task_id)
 
             # Update price script
             log.info("Updating price script...")
@@ -327,10 +338,14 @@ async def upgrade_provider(self, ssh_client, task_id: str) -> Dict:
 
             # Upgrade provider chart
             log.info("Upgrading provider chart...")
-            provider_upgrade_cmd = (
-                "helm upgrade akash-provider akash/provider -n akash-services -f ~/provider/provider.yaml "
-                '--set bidpricescript="$(cat ~/provider/price_script_generic.sh | openssl base64 -A)"'
-            )
+            if Config.CHAIN_ID == "akashnet-2":
+                provider_upgrade_cmd = (
+                    f"helm upgrade akash-provider akash/provider -n akash-services -f ~/provider/provider.yaml --set bidpricescript=\"$(cat ~/provider/price_script_generic.sh | openssl base64 -A)\" --set image.tag={app_version}"
+                )
+            else:
+                provider_upgrade_cmd = (
+                    f"helm upgrade akash-provider akash-dev/provider -n akash-services -f ~/provider/provider.yaml --set bidpricescript=\"$(cat ~/provider/price_script_generic.sh | openssl base64 -A)\" --set image.tag={app_version} --devel"
+                )
             run_ssh_command(ssh_client, provider_upgrade_cmd, True, task_id=task_id)
 
             # Verify pod versions

application/service/wallet_service.py

@@ -188,6 +188,15 @@ def _export_and_store_key(self, key_id: str) -> None:
                 watchers=[passphrase_prompt, export_passphrase_prompt],
                 hide=True,
             )
+            
+            lines = exported_key.strip().splitlines()
+            try:
+                begin = next(i for i, l in enumerate(lines) if l.startswith("-----BEGIN "))
+                end = next(i for i, l in reversed(list(enumerate(lines))) if l.startswith("-----END "))
+                exported_key = "\n".join(lines[begin : end + 1]) + "\n"
+            except StopIteration:
+                # Fallback: preserve original content with a single trailing newline
+                exported_key = exported_key.strip() + "\n"
 
             if not exported_key:
                 raise ApplicationError(
@@ -202,6 +211,7 @@ def _export_and_store_key(self, key_id: str) -> None:
             run_ssh_command(self.ssh_client, "rm -f ~/key.pem")
             store_command = f"cat > ~/key.pem << EOF\n{exported_key}\nEOF"
             run_ssh_command(self.ssh_client, store_command)
+            run_ssh_command(self.ssh_client, "chmod 600 ~/key.pem")
             log.info("Key exported and stored successfully in ~/key.pem")
 
         except Exception as e: