Merge pull request #38 from valory-xyz/feat/remove_agent_id_check

Remove agent_id check from staking mechanism

Author: OjusWiZard

operate/__init__.py

@@ -18,3 +18,8 @@
 # ------------------------------------------------------------------------------
 
 """Operate app."""
+
+import logging
+
+
+logging.getLogger("aea").setLevel(logging.ERROR)

operate/cli.py

@@ -134,13 +134,16 @@ def update_password_with_mnemonic(self, mnemonic: str, new_password: str) -> Non
         wallet_manager.update_password_with_mnemonic(mnemonic, new_password)
         self.user_account.force_update(new_password)
 
-    def service_manager(self) -> services.manage.ServiceManager:
+    def service_manager(
+        self, skip_dependency_check: t.Optional[bool] = False
+    ) -> services.manage.ServiceManager:
         """Load service manager."""
         return services.manage.ServiceManager(
             path=self._services,
             keys_manager=self.keys_manager,
             wallet_manager=self.wallet_manager,
             logger=self.logger,
+            skip_dependency_check=skip_dependency_check,
         )
 
     @property
@@ -1019,12 +1022,21 @@ def qs_start(
     build_only: Annotated[
         bool, params.Boolean(help="Only build the service without running it")
     ] = False,
+    skip_dependency_check: Annotated[
+        bool,
+        params.Boolean(help="Will skip the dependencies check for minting the service"),
+    ] = False,
 ) -> None:
     """Quickstart."""
     os.environ["ATTENDED"] = attended.lower()
     operate = OperateApp()
     operate.setup()
-    run_service(operate=operate, config_path=config, build_only=build_only)
+    run_service(
+        operate=operate,
+        config_path=config,
+        build_only=build_only,
+        skip_dependency_check=skip_dependency_check,
+    )
 
 
 @_operate.command(name="quickstop")

operate/quickstart/run_service.py

@@ -316,11 +316,29 @@ def configure_local_config(
                 raise
 
         if config.staking_program_id == CUSTOM_PROGRAM_ID:
-            config.staking_program_id = ask_or_get_from_env(
-                "Enter the staking contract address: ",
-                False,
-                "STAKING_CONTRACT_ADDRESS",
-            )
+            while True:
+                try:
+                    config.staking_program_id = ask_or_get_from_env(
+                        "Enter the staking contract address: ",
+                        False,
+                        "STAKING_CONTRACT_ADDRESS",
+                    )
+                    instance = staking_ctr.get_instance(
+                        ledger_api=ledger_api,
+                        contract_address=config.staking_program_id,
+                    )
+                    max_services = instance.functions.maxNumServices().call()
+                    current_services = instance.functions.getServiceIds().call()
+                    available_slots = max_services - len(current_services)
+                    if available_slots > 0:
+                        print(f"Found {available_slots} available staking slots.")
+                        break
+                    else:
+                        print(
+                            "No available staking slots found. Please enter another address."
+                        )
+                except Exception:
+                    print("This address is not a valid staking contract address.")
 
     # set chain configs in the service template
     for chain in template["configurations"]:
@@ -664,7 +682,10 @@ def ensure_enough_funds(operate: "OperateApp", service: Service) -> None:
 
 
 def run_service(
-    operate: "OperateApp", config_path: str, build_only: bool = False
+    operate: "OperateApp",
+    config_path: str,
+    build_only: bool = False,
+    skip_dependency_check: bool = False,
 ) -> None:
     """Run service."""
 
@@ -682,7 +703,7 @@ def run_service(
     ask_password_if_needed(operate, config)
 
     # reload manger and config after setting operate.password
-    manager = operate.service_manager()
+    manager = operate.service_manager(skip_dependency_check=skip_dependency_check)
     config = load_local_config(operate=operate, service_name=t.cast(str, service.name))
     ensure_enough_funds(operate, service)
 

operate/services/manage.py

@@ -110,6 +110,7 @@ def __init__(
         keys_manager: KeysManager,
         wallet_manager: MasterWalletManager,
         logger: t.Optional[logging.Logger] = None,
+        skip_dependency_check: t.Optional[bool] = False,
     ) -> None:
         """
         Initialze service manager
@@ -123,6 +124,7 @@ def __init__(
         self.keys_manager = keys_manager
         self.wallet_manager = wallet_manager
         self.logger = logger or setup_logger(name="operate.manager")
+        self.skip_depencency_check = skip_dependency_check
 
     def setup(self) -> None:
         """Setup service manager."""
@@ -446,6 +448,7 @@ def _deploy_service_onchain(  # pylint: disable=too-many-statements,too-many-loc
                         OLAS[ledger_config.chain] if user_params.use_staking else None
                     ),
                     metadata_description=service.description,
+                    skip_dependency_check=self.skip_depencency_check,
                 ).get("token"),
             )
             chain_data.on_chain_state = OnChainState.PRE_REGISTRATION
@@ -792,6 +795,7 @@ def _deploy_service_onchain_from_safe(  # pylint: disable=too-many-statements,to
                                 else None
                             ),
                             metadata_description=service.description,
+                            skip_depencency_check=self.skip_depencency_check,
                         )
                     )
                     .settle()
@@ -843,6 +847,7 @@ def _deploy_service_onchain_from_safe(  # pylint: disable=too-many-statements,to
                             else None
                         ),
                         metadata_description=service.description,
+                        skip_depencency_check=self.skip_depencency_check,
                     )
                 )
                 .settle()

operate/services/protocol.py

@@ -866,6 +866,7 @@ def mint(  # pylint: disable=too-many-arguments,too-many-locals
         update_token: t.Optional[int] = None,
         token: t.Optional[str] = None,
         metadata_description: t.Optional[str] = None,
+        skip_dependency_check: t.Optional[bool] = False,
     ) -> t.Dict:
         """Mint service."""
         # TODO: Support for update
@@ -888,10 +889,14 @@ def mint(  # pylint: disable=too-many-arguments,too-many-locals
             .load_metadata()
             .set_metadata_fields(description=metadata_description)
             .verify_nft(nft=nft)
-            .verify_service_dependencies(agent_id=agent_id)
-            .publish_metadata()
         )
 
+        if skip_dependency_check is False:
+            logging.warning("Skipping depencencies check")
+            manager.verify_service_dependencies(agent_id=agent_id)
+
+        manager.publish_metadata()
+
         with tempfile.TemporaryDirectory() as temp, contextlib.redirect_stdout(
             io.StringIO()
         ):
@@ -1092,6 +1097,7 @@ def get_mint_tx_data(  # pylint: disable=too-many-arguments
         update_token: t.Optional[int] = None,
         token: t.Optional[str] = None,
         metadata_description: t.Optional[str] = None,
+        skip_depencency_check: t.Optional[bool] = False,
     ) -> t.Dict:
         """Build mint transaction."""
         # TODO: Support for update
@@ -1106,17 +1112,22 @@ def get_mint_tx_data(  # pylint: disable=too-many-arguments
             sleep=ON_CHAIN_INTERACT_SLEEP,
         )
         # Prepare for minting
+
         (
             manager.load_package_configuration(
                 package_path=package_path, package_type=PackageType.SERVICE
             )
             .load_metadata()
             .set_metadata_fields(description=metadata_description)
             .verify_nft(nft=nft)
-            .verify_service_dependencies(agent_id=agent_id)
-            .publish_metadata()
         )
 
+        if skip_depencency_check is False:
+            logging.warning("Skipping depencencies check")
+            manager.verify_service_dependencies(agent_id=agent_id)
+
+        manager.publish_metadata()
+
         instance = self.service_manager_instance
         if update_token is None:
             safe = self.safe