olas-operate-middleware 0.10.7__tar.gz → 0.10.8__tar.gz

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: olas-operate-middleware
-Version: 0.10.7
+Version: 0.10.8
 Summary: 
 Author: David Vilela
 Author-email: dvilelaf@gmail.com

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/__init__.py

@@ -20,6 +20,18 @@
 """Operate app."""
 
 import logging
+from importlib.metadata import PackageNotFoundError, version
 
 
+try:
+    # Prefer the distribution name if installed; fall back to the module name
+    __version__ = version("olas-operate-middleware")
+except PackageNotFoundError:
+    try:
+        __version__ = version("operate")
+    except PackageNotFoundError:
+        logger = logging.getLogger("operate")
+        logger.warning("Could not determine version, using 0.0.0+local")
+        __version__ = "0.0.0+local"
+
 logging.getLogger("aea").setLevel(logging.ERROR)

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/cli.py

@@ -20,7 +20,6 @@
 """Operate app CLI module."""
 import asyncio
 import atexit
-import logging
 import multiprocessing
 import os
 import signal
@@ -46,7 +45,7 @@ from typing_extensions import Annotated
 from uvicorn.config import Config
 from uvicorn.server import Server
 
-from operate import services
+from operate import __version__, services
 from operate.account.user import UserAccount
 from operate.bridge.bridge_manager import BridgeManager
 from operate.constants import (
@@ -54,6 +53,9 @@ from operate.constants import (
     MIN_PASSWORD_LENGTH,
     OPERATE_HOME,
     SERVICES_DIR,
+    USER_JSON,
+    WALLETS_DIR,
+    WALLET_RECOVERY_DIR,
     ZERO_ADDRESS,
 )
 from operate.ledger.profiles import (
@@ -76,18 +78,28 @@ from operate.services.health_checker import HealthChecker
 from operate.utils import subtract_dicts
 from operate.utils.gnosis import get_assets_balances
 from operate.wallet.master import MasterWalletManager
+from operate.wallet.wallet_recovery_manager import (
+    WalletRecoveryError,
+    WalletRecoveryManager,
+)
 
 
 DEFAULT_MAX_RETRIES = 3
 USER_NOT_LOGGED_IN_ERROR = JSONResponse(
     content={"error": "User not logged in."}, status_code=HTTPStatus.UNAUTHORIZED
 )
+USER_LOGGED_IN_ERROR = JSONResponse(
+    content={"error": "User must be logged out to perform this operation."},
+    status_code=HTTPStatus.FORBIDDEN,
+)
 ACCOUNT_NOT_FOUND_ERROR = JSONResponse(
     content={"error": "User account not found."},
     status_code=HTTPStatus.NOT_FOUND,
 )
 TRY_TO_SHUTDOWN_PREVIOUS_INSTANCE = True
 
+logger = setup_logger(name="operate")
+
 
 def service_not_found_error(service_config_id: str) -> JSONResponse:
     """Service not found error response"""
@@ -103,7 +115,6 @@ class OperateApp:
     def __init__(
         self,
         home: t.Optional[Path] = None,
-        logger: t.Optional[logging.Logger] = None,
     ) -> None:
         """Initialize object."""
         super().__init__()
@@ -112,14 +123,13 @@ class OperateApp:
         self._keys = self._path / KEYS_DIR
         self.setup()
 
-        self.logger = logger or setup_logger(name="operate")
         services.manage.KeysManager(
             path=self._keys,
-            logger=self.logger,
+            logger=logger,
         )
         self.password: t.Optional[str] = os.environ.get("OPERATE_USER_PASSWORD")
 
-        mm = MigrationManager(self._path, self.logger)
+        mm = MigrationManager(self._path, logger)
         mm.migrate_user_account()
         mm.migrate_services(self.service_manager())
         mm.migrate_wallets(self.wallet_manager)
@@ -130,14 +140,14 @@ class OperateApp:
         self.password = password
         return UserAccount.new(
             password=password,
-            path=self._path / "user.json",
+            path=self._path / USER_JSON,
         )
 
     def update_password(self, old_password: str, new_password: str) -> None:
         """Updates current password"""
 
         if not new_password:
-            raise ValueError("'password' is required.")
+            raise ValueError("'new_password' is required.")
 
         if not (
             self.user_account.is_valid(old_password)
@@ -154,7 +164,7 @@ class OperateApp:
         """Updates current password using the mnemonic"""
 
         if not new_password:
-            raise ValueError("'password' is required.")
+            raise ValueError("'new_password' is required.")
 
         mnemonic = mnemonic.strip().lower()
         if not self.wallet_manager.is_mnemonic_valid(mnemonic):
@@ -171,37 +181,45 @@ class OperateApp:
         return services.manage.ServiceManager(
             path=self._services,
             wallet_manager=self.wallet_manager,
-            logger=self.logger,
+            logger=logger,
             skip_dependency_check=skip_dependency_check,
         )
 
     @property
     def user_account(self) -> t.Optional[UserAccount]:
         """Load user account."""
-        return (
-            UserAccount.load(self._path / "user.json")
-            if (self._path / "user.json").exists()
-            else None
-        )
+        if (self._path / USER_JSON).exists():
+            return UserAccount.load(self._path / USER_JSON)
+        return None
 
     @property
     def wallet_manager(self) -> MasterWalletManager:
-        """Load master wallet."""
+        """Load wallet manager."""
         manager = MasterWalletManager(
-            path=self._path / "wallets",
+            path=self._path / WALLETS_DIR,
             password=self.password,
-            logger=self.logger,
+            logger=logger,
         )
         manager.setup()
         return manager
 
+    @property
+    def wallet_recoverey_manager(self) -> WalletRecoveryManager:
+        """Load wallet recovery manager."""
+        manager = WalletRecoveryManager(
+            path=self._path / WALLET_RECOVERY_DIR,
+            wallet_manager=self.wallet_manager,
+            logger=self.logger,
+        )
+        return manager
+
     @property
     def bridge_manager(self) -> BridgeManager:
-        """Load master wallet."""
+        """Load bridge manager."""
         manager = BridgeManager(
             path=self._path / "bridge",
             wallet_manager=self.wallet_manager,
-            logger=self.logger,
+            logger=logger,
         )
         return manager
 
@@ -232,10 +250,9 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
         )
     )
 
-    logger = setup_logger(name="operate")
     if HEALTH_CHECKER_OFF:
         logger.warning("Healthchecker is off!!!")
-    operate = OperateApp(home=home, logger=logger)
+    operate = OperateApp(home=home)
 
     funding_jobs: t.Dict[str, asyncio.Task] = {}
     health_checker = HealthChecker(
@@ -877,6 +894,21 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
         deployment_json["healthcheck"] = service.get_latest_healthcheck()
         return JSONResponse(content=deployment_json)
 
+    @app.get("/api/v2/service/{service_config_id}/agent_performance")
+    @with_retries
+    async def _get_agent_performance(request: Request) -> JSONResponse:
+        """Get the service refill requirements."""
+        service_config_id = request.path_params["service_config_id"]
+
+        if not operate.service_manager().exists(service_config_id=service_config_id):
+            return service_not_found_error(service_config_id=service_config_id)
+
+        return JSONResponse(
+            content=operate.service_manager()
+            .load(service_config_id=service_config_id)
+            .get_agent_performance()
+        )
+
     @app.get("/api/v2/service/{service_config_id}/refill_requirements")
     @with_retries
     async def _get_refill_requirements(request: Request) -> JSONResponse:
@@ -1166,12 +1198,103 @@ def create_app(  # pylint: disable=too-many-locals, unused-argument, too-many-st
                 status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
             )
 
+    @app.post("/api/wallet/recovery/initiate")
+    @with_retries
+    async def _wallet_recovery_initiate(request: Request) -> JSONResponse:
+        """Initiate wallet recovery."""
+        if operate.user_account is None:
+            return ACCOUNT_NOT_FOUND_ERROR
+
+        if operate.password:
+            return USER_LOGGED_IN_ERROR
+
+        data = await request.json()
+        new_password = data.get("new_password")
+
+        if not new_password or len(new_password) < MIN_PASSWORD_LENGTH:
+            return JSONResponse(
+                content={
+                    "error": f"New password must be at least {MIN_PASSWORD_LENGTH} characters long."
+                },
+                status_code=HTTPStatus.BAD_REQUEST,
+            )
+
+        try:
+            output = operate.wallet_recoverey_manager.initiate_recovery(
+                new_password=new_password
+            )
+            return JSONResponse(
+                content=output,
+                status_code=HTTPStatus.OK,
+            )
+        except (ValueError, WalletRecoveryError) as e:
+            logger.error(f"_recovery_initiate error: {e}")
+            return JSONResponse(
+                content={"error": f"Failed to initiate recovery: {e}"},
+                status_code=HTTPStatus.BAD_REQUEST,
+            )
+        except Exception as e:  # pylint: disable=broad-except
+            logger.error(f"_recovery_initiate error: {e}\n{traceback.format_exc()}")
+            return JSONResponse(
+                content={
+                    "error": "Failed to initiate recovery. Please check the logs."
+                },
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            )
+
+    @app.post("/api/wallet/recovery/complete")
+    @with_retries
+    async def _wallet_recovery_complete(request: Request) -> JSONResponse:
+        """Complete wallet recovery."""
+        if operate.user_account is None:
+            return ACCOUNT_NOT_FOUND_ERROR
+
+        if operate.password:
+            return USER_LOGGED_IN_ERROR
+
+        data = await request.json()
+        bundle_id = data.get("id")
+        password = data.get("password")
+        raise_if_inconsistent_owners = data.get("require_consistent_owners", True)
+
+        try:
+            operate.wallet_recoverey_manager.complete_recovery(
+                bundle_id=bundle_id,
+                password=password,
+                raise_if_inconsistent_owners=raise_if_inconsistent_owners,
+            )
+            return JSONResponse(
+                content=operate.wallet_manager.json,
+                status_code=HTTPStatus.OK,
+            )
+        except KeyError as e:
+            logger.error(f"_recovery_complete error: {e}")
+            return JSONResponse(
+                content={"error": f"Failed to complete recovery: {e}"},
+                status_code=HTTPStatus.NOT_FOUND,
+            )
+        except (ValueError, WalletRecoveryError) as e:
+            logger.error(f"_recovery_complete error: {e}")
+            return JSONResponse(
+                content={"error": f"Failed to complete recovery: {e}"},
+                status_code=HTTPStatus.BAD_REQUEST,
+            )
+        except Exception as e:  # pylint: disable=broad-except
+            logger.error(f"_recovery_complete error: {e}\n{traceback.format_exc()}")
+            return JSONResponse(
+                content={
+                    "error": "Failed to complete recovery. Please check the logs."
+                },
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+            )
+
     return app
 
 
 @group(name="operate")
 def _operate() -> None:
     """Operate - deploy autonomous services."""
+    logger.info(f"Operate version: {__version__}")
 
 
 @_operate.command(name="daemon")
@@ -1188,7 +1311,6 @@ def _daemon(
 ) -> None:
     """Launch operate daemon."""
     app = create_app(home=home)
-    logger = setup_logger(name="daemon")
 
     config_kwargs = {
         "app": app,

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/constants.py

@@ -26,9 +26,18 @@ OPERATE = ".operate"
 OPERATE_HOME = Path.cwd() / OPERATE
 SERVICES_DIR = "services"
 KEYS_DIR = "keys"
+WALLETS_DIR = "wallets"
+WALLET_RECOVERY_DIR = "wallet_recovery"
 DEPLOYMENT_DIR = "deployment"
 DEPLOYMENT_JSON = "deployment.json"
 CONFIG_JSON = "config.json"
+USER_JSON = "user.json"
+
+AGENT_PERSISTENT_STORAGE_DIR = "persistent_data"
+AGENT_PERSISTENT_STORAGE_ENV_VAR = "STORE_PATH"
+AGENT_LOG_DIR = "benchmarks"
+AGENT_LOG_ENV_VAR = "LOG_DIR"
+
 ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
 
 ON_CHAIN_INTERACT_TIMEOUT = 120.0

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/keys.py

@@ -92,16 +92,22 @@ class KeysManager(metaclass=SingletonMeta):
             suffix=".txt",
             delete=False,  # Handle cleanup manually
         ) as temp_file:
+            temp_file_name = temp_file.name
             temp_file.write(key.private_key)
             temp_file.flush()
             temp_file.close()  # Close the file before reading
 
             # Set proper file permissions (readable by owner only)
-            os.chmod(temp_file.name, 0o600)
-            crypto = EthereumCrypto(private_key_path=temp_file.name)
+            os.chmod(temp_file_name, 0o600)
+            crypto = EthereumCrypto(private_key_path=temp_file_name)
 
             try:
-                os.unlink(temp_file.name)  # Clean up the temporary file
+                with open(temp_file_name, "r+", encoding="utf-8") as f:
+                    f.seek(0)
+                    f.write("\0" * len(key.private_key))
+                    f.flush()
+                    f.close()
+                os.unlink(temp_file_name)  # Clean up the temporary file
             except OSError as e:
                 self.logger.error(f"Failed to delete temp file {temp_file.name}: {e}")
 

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/ledger/__init__.py

@@ -24,62 +24,76 @@ import os
 from operate.operate_types import Chain
 
 
-ETHEREUM_PUBLIC_RPC = os.environ.get("ETHEREUM_RPC", "https://ethereum.publicnode.com")
-GNOSIS_PUBLIC_RPC = os.environ.get("GNOSIS_RPC", "https://gnosis-rpc.publicnode.com")
-SOLANA_PUBLIC_RPC = os.environ.get("SOLANA_RPC", "https://api.mainnet-beta.solana.com")
+ARBITRUM_ONE_PUBLIC_RPC = os.environ.get(
+    "ARBITRUM_ONE_RPC", "https://arb1.arbitrum.io/rpc"
+)
 BASE_PUBLIC_RPC = os.environ.get("BASE_RPC", "https://mainnet.base.org")
 CELO_PUBLIC_RPC = os.environ.get("CELO_RPC", "https://forno.celo.org")
-OPTIMISM_PUBLIC_RPC = os.environ.get("OPTIMISM_RPC", "https://mainnet.optimism.io")
+ETHEREUM_PUBLIC_RPC = os.environ.get("ETHEREUM_RPC", "https://ethereum.publicnode.com")
+GNOSIS_PUBLIC_RPC = os.environ.get("GNOSIS_RPC", "https://gnosis-rpc.publicnode.com")
 MODE_PUBLIC_RPC = os.environ.get("MODE_RPC", "https://mainnet.mode.network/")
+OPTIMISM_PUBLIC_RPC = os.environ.get("OPTIMISM_RPC", "https://mainnet.optimism.io")
+POLYGON_PUBLIC_RPC = os.environ.get("POLYGON_RPC", "https://polygon-rpc.com")
+SOLANA_PUBLIC_RPC = os.environ.get("SOLANA_RPC", "https://api.mainnet-beta.solana.com")
 
-ETHEREUM_RPC = os.environ.get("ETHEREUM_RPC", "https://ethereum.publicnode.com")
-GNOSIS_RPC = os.environ.get("GNOSIS_RPC", "https://rpc-gate.autonolas.tech/gnosis-rpc/")
-SOLANA_RPC = os.environ.get("SOLANA_RPC", "https://api.mainnet-beta.solana.com")
+ARBITRUM_ONE_RPC = os.environ.get("ARBITRUM_ONE_RPC", "https://arb1.arbitrum.io/rpc")
 BASE_RPC = os.environ.get("BASE_RPC", "https://mainnet.base.org")
 CELO_RPC = os.environ.get("CELO_RPC", "https://forno.celo.org")
-OPTIMISM_RPC = os.environ.get("OPTIMISM_RPC", "https://mainnet.optimism.io")
+ETHEREUM_RPC = os.environ.get("ETHEREUM_RPC", "https://ethereum.publicnode.com")
+GNOSIS_RPC = os.environ.get("GNOSIS_RPC", "https://rpc-gate.autonolas.tech/gnosis-rpc/")
 MODE_RPC = os.environ.get("MODE_RPC", "https://mainnet.mode.network/")
+OPTIMISM_RPC = os.environ.get("OPTIMISM_RPC", "https://mainnet.optimism.io")
+POLYGON_RPC = os.environ.get("POLYGON_RPC", "https://polygon-rpc.com")
+SOLANA_RPC = os.environ.get("SOLANA_RPC", "https://api.mainnet-beta.solana.com")
 
 PUBLIC_RPCS = {
-    Chain.ETHEREUM: ETHEREUM_PUBLIC_RPC,
-    Chain.GNOSIS: GNOSIS_PUBLIC_RPC,
-    Chain.SOLANA: SOLANA_PUBLIC_RPC,
+    Chain.ARBITRUM_ONE: ARBITRUM_ONE_PUBLIC_RPC,
     Chain.BASE: BASE_PUBLIC_RPC,
     Chain.CELO: CELO_PUBLIC_RPC,
-    Chain.OPTIMISM: OPTIMISM_PUBLIC_RPC,
+    Chain.ETHEREUM: ETHEREUM_PUBLIC_RPC,
+    Chain.GNOSIS: GNOSIS_PUBLIC_RPC,
     Chain.MODE: MODE_PUBLIC_RPC,
+    Chain.OPTIMISM: OPTIMISM_PUBLIC_RPC,
+    Chain.POLYGON: POLYGON_PUBLIC_RPC,
+    Chain.SOLANA: SOLANA_PUBLIC_RPC,
 }
 
 DEFAULT_RPCS = {
-    Chain.ETHEREUM: ETHEREUM_RPC,
-    Chain.GNOSIS: GNOSIS_RPC,
-    Chain.SOLANA: SOLANA_RPC,
+    Chain.ARBITRUM_ONE: ARBITRUM_ONE_RPC,
     Chain.BASE: BASE_RPC,
     Chain.CELO: CELO_RPC,
-    Chain.OPTIMISM: OPTIMISM_RPC,
+    Chain.ETHEREUM: ETHEREUM_RPC,
+    Chain.GNOSIS: GNOSIS_RPC,
     Chain.MODE: MODE_RPC,
+    Chain.OPTIMISM: OPTIMISM_RPC,
+    Chain.POLYGON: POLYGON_RPC,
+    Chain.SOLANA: SOLANA_RPC,
 }
 
 # Base currency for each chain
 CURRENCY_DENOMS = {
-    Chain.ETHEREUM: "ETH",
-    Chain.GNOSIS: "xDAI",
-    Chain.SOLANA: "SOL",
+    Chain.ARBITRUM_ONE: "ETH",
     Chain.BASE: "ETH",
     Chain.CELO: "CELO",
-    Chain.OPTIMISM: "ETH",
+    Chain.ETHEREUM: "ETH",
+    Chain.GNOSIS: "xDAI",
     Chain.MODE: "ETH",
+    Chain.OPTIMISM: "ETH",
+    Chain.POLYGON: "POL",
+    Chain.SOLANA: "SOL",
 }
 
 # Smallest denomination for each chain
 CURRENCY_SMALLEST_UNITS = {
-    Chain.ETHEREUM: "Wei",
-    Chain.GNOSIS: "Wei",
-    Chain.SOLANA: "Lamport",
+    Chain.ARBITRUM_ONE: "Wei",
     Chain.BASE: "Wei",
     Chain.CELO: "Wei",
-    Chain.OPTIMISM: "Wei",
+    Chain.ETHEREUM: "Wei",
+    Chain.GNOSIS: "Wei",
     Chain.MODE: "Wei",
+    Chain.OPTIMISM: "Wei",
+    Chain.POLYGON: "Wei",
+    Chain.SOLANA: "Lamport",
 }
 
 

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/migration.py

@@ -29,11 +29,10 @@ from time import time
 
 from aea_cli_ipfs.ipfs_utils import IPFSTool
 
-from operate.constants import ZERO_ADDRESS
+from operate.constants import USER_JSON, ZERO_ADDRESS
 from operate.operate_types import Chain, LedgerType
 from operate.services.manage import ServiceManager
 from operate.services.service import (
-    DEFAULT_TRADER_ENV_VARS,
     NON_EXISTENT_MULTISIG,
     SERVICE_CONFIG_PREFIX,
     SERVICE_CONFIG_VERSION,
@@ -43,11 +42,67 @@ from operate.utils import create_backup
 from operate.wallet.master import LEDGER_TYPE_TO_WALLET_CLASS, MasterWalletManager
 
 
+DEFAULT_TRADER_ENV_VARS = {
+    "GNOSIS_LEDGER_RPC": {
+        "name": "Gnosis ledger RPC",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+    "STAKING_CONTRACT_ADDRESS": {
+        "name": "Staking contract address",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+    "MECH_MARKETPLACE_CONFIG": {
+        "name": "Mech marketplace configuration",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+    "MECH_ACTIVITY_CHECKER_CONTRACT": {
+        "name": "Mech activity checker contract",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+    "MECH_CONTRACT_ADDRESS": {
+        "name": "Mech contract address",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+    "MECH_REQUEST_PRICE": {
+        "name": "Mech request price",
+        "description": "",
+        "value": "10000000000000000",
+        "provision_type": "computed",
+    },
+    "USE_MECH_MARKETPLACE": {
+        "name": "Use Mech marketplace",
+        "description": "",
+        "value": "False",
+        "provision_type": "computed",
+    },
+    "REQUESTER_STAKING_INSTANCE_ADDRESS": {
+        "name": "Requester staking instance address",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+    "PRIORITY_MECH_ADDRESS": {
+        "name": "Priority Mech address",
+        "description": "",
+        "value": "",
+        "provision_type": "computed",
+    },
+}
+
+
 class MigrationManager:
     """MigrationManager"""
 
-    # TODO Backport here migration for services/config.json, etc.
-
     def __init__(
         self,
         home: Path,
@@ -62,12 +117,12 @@ class MigrationManager:
         """Log directories present in `path`."""
         directories = [f"  - {str(p)}" for p in path.iterdir() if p.is_dir()]
         directories_str = "\n".join(directories)
-        self.logger.info(f"Directories in {path}\n: {directories_str}")
+        self.logger.info(f"Directories in {path}:\n{directories_str}")
 
     def migrate_user_account(self) -> None:
         """Migrates user.json"""
 
-        path = self._path / "user.json"
+        path = self._path / USER_JSON
         if not path.exists():
             return
 
@@ -102,18 +157,22 @@ class MigrationManager:
 
         self.logger.info("Migrating wallet configs done.")
 
-    @staticmethod
     def _migrate_service(  # pylint: disable=too-many-statements,too-many-locals
+        self,
         path: Path,
     ) -> bool:
         """Migrate the JSON file format if needed."""
 
         if not path.is_dir():
+            self.logger.warning(f"Service config path {path} is not a directory.")
             return False
 
         if not path.name.startswith(SERVICE_CONFIG_PREFIX) and not path.name.startswith(
             "bafybei"
         ):
+            self.logger.warning(
+                f"Service config path {path} is not a valid service config."
+            )
             return False
 
         if path.name.startswith("bafybei"):
@@ -155,6 +214,10 @@ class MigrationManager:
         if version == SERVICE_CONFIG_VERSION:
             return False
 
+        self.logger.info(
+            f"Migrating service config in {path} from version {version} to {SERVICE_CONFIG_VERSION}..."
+        )
+
         # Migration steps for older versions
         if version == 0:
             new_data = {
@@ -344,13 +407,9 @@ class MigrationManager:
         paths = list(service_manager.path.iterdir())
         for path in paths:
             try:
-                if path.name.startswith(SERVICE_CONFIG_PREFIX) or path.name.startswith(
-                    "bafybei"
-                ):
-                    self.logger.info(f"migrate_service_configs {str(path)}")
-                    migrated = self._migrate_service(path)
-                    if migrated:
-                        self.logger.info(f"Folder {str(path)} has been migrated.")
+                migrated = self._migrate_service(path)
+                if migrated:
+                    self.logger.info(f"Folder {str(path)} has been migrated.")
             except Exception as e:  # pylint: disable=broad-except
                 self.logger.error(
                     f"Failed to migrate service: {path.name}. Exception {e}: {traceback.format_exc()}"

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/quickstart/reset_password.py

@@ -21,6 +21,7 @@
 from typing import TYPE_CHECKING
 
 from operate.account.user import UserAccount
+from operate.constants import USER_JSON
 from operate.operate_types import LedgerType
 from operate.quickstart.run_service import ask_confirm_password
 from operate.quickstart.utils import ask_or_get_from_env, print_section, print_title
@@ -36,7 +37,7 @@ def reset_password(operate: "OperateApp") -> None:
     print_title("Reset your password")
 
     # check if agent was started before
-    if not (operate._path / "user.json").exists():
+    if not (operate._path / USER_JSON).exists():
         print("No previous agent setup found. Exiting.")
         return
 
@@ -57,7 +58,7 @@ def reset_password(operate: "OperateApp") -> None:
     print("Resetting password of user account...")
     UserAccount.new(
         password=old_password,
-        path=operate._path / "user.json",
+        path=operate._path / USER_JSON,
     ).update(
         old_password=old_password,
         new_password=new_password,

{olas_operate_middleware-0.10.7 → olas_operate_middleware-0.10.8}/operate/quickstart/run_service.py

@@ -34,7 +34,12 @@ from halo import Halo  # type: ignore[import]
 from web3.exceptions import Web3Exception
 
 from operate.account.user import UserAccount
-from operate.constants import IPFS_ADDRESS, NO_STAKING_PROGRAM_ID, OPERATE_HOME
+from operate.constants import (
+    IPFS_ADDRESS,
+    NO_STAKING_PROGRAM_ID,
+    OPERATE_HOME,
+    USER_JSON,
+)
 from operate.data import DATA_DIR
 from operate.data.contracts.staking_token.contract import StakingTokenContract
 from operate.ledger.profiles import STAKING, get_staking_contract
@@ -453,7 +458,7 @@ def ask_password_if_needed(operate: "OperateApp") -> None:
         password = ask_confirm_password()
         UserAccount.new(
             password=password,
-            path=operate._path / "user.json",
+            path=operate._path / USER_JSON,
         )
     else:
         _password = None