iwa 0.0.25__tar.gz → 0.0.27__tar.gz

{iwa-0.0.25/src/iwa.egg-info → iwa-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.25
+Version: 0.0.27
 Summary: A secure, modular, and plugin-based framework for crypto agents and ops
 Requires-Python: <4.0,>=3.12
 Description-Content-Type: text/markdown

{iwa-0.0.25 → iwa-0.0.27}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iwa"
-version = "0.0.25"
+version = "0.0.27"
 description = "A secure, modular, and plugin-based framework for crypto agents and ops"
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
@@ -71,7 +71,7 @@ where = ["src"]
 
 [tool.ruff]
 line-length = 100
-target-version = "0.0.25"
+target-version = "0.0.27"
 fix = true
 
 [tool.ruff.lint]

{iwa-0.0.25 → iwa-0.0.27}/src/iwa/plugins/olas/importer.py

@@ -234,6 +234,9 @@ class OlasServiceImporter:
         # Extract staking program from .env
         self._extract_staking_from_env(service, folder)
 
+        # Infer owner address from keys if not already set
+        self._infer_owner_address(service)
+
         if not service.keys and not service.service_id:
             logger.debug(f"No valid data found in {folder}")
             return None
@@ -423,6 +426,9 @@ class OlasServiceImporter:
         # 5. Extract owner address from wallets folder
         self._extract_owner_address(service, operate_folder)
 
+        # 6. Infer owner address from keys if not already set
+        self._infer_owner_address(service)
+
         return service
 
     def _extract_keys_from_operate_config(
@@ -534,6 +540,17 @@ class OlasServiceImporter:
                 service.keys.append(key)
                 existing_addrs.add(key.address.lower())
 
+    def _infer_owner_address(self, service: DiscoveredService) -> None:
+        """Infer service_owner_address from keys with role='owner' if not already set."""
+        if service.service_owner_address:
+            return  # Already set
+
+        for key in service.keys:
+            if key.role == "owner" and key.address:
+                service.service_owner_address = key.address
+                logger.debug(f"Inferred owner address from key: {key.address}")
+                return
+
     def _parse_keystore_file(
         self, file_path: Path, role: str = "unknown"
     ) -> Optional[DiscoveredKey]:

{iwa-0.0.25 → iwa-0.0.27}/src/iwa/plugins/olas/service_manager/drain.py

@@ -59,9 +59,12 @@ class DrainManagerMixin:
 
         logger.info(f"Claiming {accrued_rewards / 1e18:.4f} OLAS rewards for service {service_id}")
 
+        # Use service owner which holds the reward rights (not necessarily master)
+        owner_address = self.service.service_owner_address or self.wallet.master_account.address
+
         # Prepare and send claim transaction
         claim_tx = staking_contract.prepare_claim_tx(
-            from_address=self.wallet.master_account.address,
+            from_address=owner_address,
             service_id=service_id,
         )
 
@@ -71,7 +74,7 @@ class DrainManagerMixin:
 
         success, receipt = self.wallet.sign_and_send_transaction(
             claim_tx,
-            signer_address_or_tag=self.wallet.master_account.address,
+            signer_address_or_tag=owner_address,
             chain_name=self.chain_name,
             tags=["olas_claim_rewards"],
         )

{iwa-0.0.25 → iwa-0.0.27}/src/iwa/plugins/olas/service_manager/lifecycle.py

@@ -522,9 +522,14 @@ class LifecycleManagerMixin:
             f"activation_value={activation_value} wei"
         )
 
-        logger.debug(f"[ACTIVATE] Preparing tx: service_id={service_id}, value={activation_value}")
+        # Use service owner which holds the NFT (not necessarily master)
+        owner_address = self.service.service_owner_address or self.wallet.master_account.address
+
+        logger.debug(
+            f"[ACTIVATE] Preparing tx from {owner_address}: service_id={service_id}, value={activation_value}"
+        )
         activate_tx = self.manager.prepare_activate_registration_tx(
-            from_address=self.wallet.master_account.address,
+            from_address=owner_address,
             service_id=service_id,
             value=activation_value,
         )
@@ -532,7 +537,7 @@ class LifecycleManagerMixin:
 
         success, receipt = self.wallet.sign_and_send_transaction(
             transaction=activate_tx,
-            signer_address_or_tag=self.wallet.master_account.address,
+            signer_address_or_tag=owner_address,
             chain_name=self.chain_name,
         )
 
@@ -720,13 +725,16 @@ class LifecycleManagerMixin:
             f"total_value={total_value} wei"
         )
 
+        # Use service owner which holds the NFT (not necessarily master)
+        owner_address = self.service.service_owner_address or self.wallet.master_account.address
+
         logger.debug(
-            f"[REGISTER] Preparing tx: agent={agent_account_address}, "
+            f"[REGISTER] Preparing tx from {owner_address}: agent={agent_account_address}, "
             f"agent_ids={self.service.agent_ids}, value={total_value}"
         )
 
         register_tx = self.manager.prepare_register_agents_tx(
-            from_address=self.wallet.master_account.address,
+            from_address=owner_address,
             service_id=service_id,
             agent_instances=[agent_account_address],
             agent_ids=self.service.agent_ids,
@@ -736,7 +744,7 @@ class LifecycleManagerMixin:
 
         success, receipt = self.wallet.sign_and_send_transaction(
             transaction=register_tx,
-            signer_address_or_tag=self.wallet.master_account.address,
+            signer_address_or_tag=owner_address,
             chain_name=self.chain_name,
             tags=["olas_register_agent"],
         )

{iwa-0.0.25 → iwa-0.0.27}/src/iwa/plugins/olas/service_manager/staking.py

@@ -408,17 +408,20 @@ class StakingManagerMixin:
             True if approval succeeded, False otherwise.
 
         """
+        # Use service owner which holds the NFT (not necessarily master)
+        owner_address = self.service.service_owner_address or self.wallet.master_account.address
+
         # Approve service NFT - this is an ERC-721 approval, not ERC-20
-        logger.debug("[STAKE] Approving service NFT for staking contract...")
+        logger.debug(f"[STAKE] Approving service NFT for staking contract from {owner_address}...")
         approve_tx = self.registry.prepare_approve_tx(
-            from_address=self.wallet.master_account.address,
+            from_address=owner_address,
             spender=staking_contract.address,
             id_=self.service.service_id,
         )
 
         success, receipt = self.wallet.sign_and_send_transaction(
             transaction=approve_tx,
-            signer_address_or_tag=self.wallet.master_account.address,
+            signer_address_or_tag=owner_address,
             chain_name=self.chain_name,
             tags=["olas_approve_service_nft"],
         )
@@ -452,16 +455,19 @@ class StakingManagerMixin:
             True if stake succeeded and ServiceStaked event was found.
 
         """
-        logger.debug("[STAKE] Preparing stake transaction...")
+        # Use service owner which holds the NFT (not necessarily master)
+        owner_address = self.service.service_owner_address or self.wallet.master_account.address
+
+        logger.debug(f"[STAKE] Preparing stake transaction from {owner_address}...")
         stake_tx = staking_contract.prepare_stake_tx(
-            from_address=self.wallet.master_account.address,
+            from_address=owner_address,
             service_id=self.service.service_id,
         )
         logger.debug(f"[STAKE] TX prepared: to={stake_tx.get('to')}")
 
         success, receipt = self.wallet.sign_and_send_transaction(
             transaction=stake_tx,
-            signer_address_or_tag=self.wallet.master_account.address,
+            signer_address_or_tag=owner_address,
             chain_name=self.chain_name,
             tags=["olas_stake_service"],
         )
@@ -541,11 +547,16 @@ class StakingManagerMixin:
         except Exception as e:
             logger.warning(f"Could not verify staking duration: {e}. Proceeding with caution.")
 
+        # Use service owner which holds the NFT (not necessarily master)
+        owner_address = self.service.service_owner_address or self.wallet.master_account.address
+
         # Unstake the service
         try:
-            logger.info(f"Preparing unstake transaction for service {self.service.service_id}")
+            logger.info(
+                f"Preparing unstake transaction for service {self.service.service_id} from {owner_address}"
+            )
             unstake_tx = staking_contract.prepare_unstake_tx(
-                from_address=self.wallet.master_account.address,
+                from_address=owner_address,
                 service_id=self.service.service_id,
             )
             logger.info("Unstake transaction prepared successfully")
@@ -556,7 +567,7 @@ class StakingManagerMixin:
 
         success, receipt = self.wallet.sign_and_send_transaction(
             transaction=unstake_tx,
-            signer_address_or_tag=self.wallet.master_account.address,
+            signer_address_or_tag=owner_address,
             chain_name=self.chain_name,
             tags=["olas_unstake_service"],
         )

{iwa-0.0.25 → iwa-0.0.27/src/iwa.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.25
+Version: 0.0.27
 Summary: A secure, modular, and plugin-based framework for crypto agents and ops
 Requires-Python: <4.0,>=3.12
 Description-Content-Type: text/markdown