iwa 0.0.24__py3-none-any.whl → 0.0.26__py3-none-any.whl

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/plugins/olas/plugin.py

@@ -269,9 +269,9 @@ class OlasPlugin(Plugin):
         # Scan directory
         console.print(f"\n[bold]Scanning[/bold] {path}...")
 
-        # Ask for password in dry-run to allow signature verification of encrypted keys
-        if dry_run and not password:
-            password = self._prompt_dry_run_password()
+        # Ask for password before scan to allow signature verification of encrypted keys
+        if not password:
+            password = self._prompt_password_for_verification()
 
         importer = OlasServiceImporter(password=password)
         discovered = importer.scan_directory(Path(path))
@@ -306,8 +306,8 @@ class OlasPlugin(Plugin):
         results = self._import_and_print_results(console, importer, discovered, password)
         self._print_import_summary(console, *results)
 
-    def _prompt_dry_run_password(self) -> Optional[str]:
-        """Prompt for password during dry-run."""
+    def _prompt_password_for_verification(self) -> Optional[str]:
+        """Prompt for password to verify encrypted keys during scan."""
         pwd = typer.prompt(
             "Enter wallet password to verify encrypted keys (optional, press Enter to skip)",
             hide_input=True,

iwa/plugins/olas/tests/test_plugin_full.py

@@ -146,8 +146,8 @@ def test_import_services_cli_abort(plugin, runner):
             DiscoveredService(service_id=1, service_name="Test", chain_name="gnosis")
         ]
 
-        # Simulate 'n' to confirmation prompt
-        result = runner.invoke(app, ["/tmp/test"], input="n\n")
+        # input: first Enter to skip password prompt, then 'n' to abort confirmation
+        result = runner.invoke(app, ["/tmp/test"], input="\nn\n")
         assert result.exit_code == 0
         assert "Aborted" in result.output
         mock_importer.import_service.assert_not_called()
@@ -162,7 +162,8 @@ def test_import_services_cli_no_services(plugin, runner):
         mock_importer = mock_importer_cls.return_value
         mock_importer.scan_directory.return_value = []
 
-        result = runner.invoke(app, ["/tmp/test"])
+        # input: Enter to skip password prompt
+        result = runner.invoke(app, ["/tmp/test"], input="\n")
         assert result.exit_code == 0
         assert "No Olas services found" in result.output
 
@@ -208,8 +209,9 @@ def test_import_services_cli_password_prompt(plugin, runner):
         mock_importer.scan_directory.return_value = [service]
         mock_importer.import_service.return_value = ImportResult(success=True, message="OK")
 
-        # input="y\nsecret\n" -> 'y' for confirm import, 'secret' for password prompt
-        result = runner.invoke(app, ["/tmp/test"], input="y\nsecret\n")
+        # input: 'secret' for password before scan, 'y' for confirm import
+        # Note: password is now prompted BEFORE scan for signature verification
+        result = runner.invoke(app, ["/tmp/test"], input="secret\ny\n")
         assert result.exit_code == 0
         assert "password" in result.output.lower()
         mock_importer.import_service.assert_called_with(service, "secret")

{iwa-0.0.24.dist-info → iwa-0.0.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.24
+Version: 0.0.26
 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.24.dist-info → iwa-0.0.26.dist-info}/RECORD

@@ -61,10 +61,10 @@ iwa/plugins/gnosis/tests/test_safe.py,sha256=hQHVHBWQhGnuvzvx4U9fOWEwASJWwql42q6
 iwa/plugins/olas/__init__.py,sha256=_NhBczzM61fhGYwGhnWfEeL8Jywyy_730GASe2BxzeQ,106
 iwa/plugins/olas/constants.py,sha256=iTFoO2QW3KbhL5k5sKsJxxyDytl9wVIb_9hAih55KrE,7728
 iwa/plugins/olas/events.py,sha256=SWD3wYdQ-l6dLUJSkfh_WsLmedH4Vsw_EvYXg7QC3yc,5970
-iwa/plugins/olas/importer.py,sha256=-zI0Fqmf6E7w3OpqEuTR8vuQOaAGNykGWzHZgadrHmE,37362
+iwa/plugins/olas/importer.py,sha256=A7trGY8yz-uB0MNDcC7W3U_FR_wSECoFnMkzCVw3rlc,38059
 iwa/plugins/olas/mech_reference.py,sha256=CaSCpQnQL4F7wOG6Ox6Zdoy-uNEQ78YBwVLILQZKL8Q,5782
 iwa/plugins/olas/models.py,sha256=xC5hYakX53pBT6zZteM9cyiC7t6XRLLpobjQmDYueOo,3520
-iwa/plugins/olas/plugin.py,sha256=sv1Hx4-wHZOwpdjhrpvxrFaA44wiGkcCXjbI_7NLH2Y,13127
+iwa/plugins/olas/plugin.py,sha256=7vTnr7OUZhzXKxyQjjp5oiRkMsB5c-1arDW4YYoV9RM,13156
 iwa/plugins/olas/contracts/activity_checker.py,sha256=WXxuzbpXGVqIfEiMPiiqN3Z_UxIY-Lvx0raa1ErBfPA,5323
 iwa/plugins/olas/contracts/base.py,sha256=y73aQbDq6l4zUpz_eQAg4MsLkTAEqjjupXlcvxjfgCI,240
 iwa/plugins/olas/contracts/mech.py,sha256=dXYtyORc-oiu9ga5PtTquOFkoakb6BLGKvlUsteygIg,2767
@@ -101,7 +101,7 @@ iwa/plugins/olas/tests/test_olas_view.py,sha256=kh3crsriyoRiZC6l8vzGllocvQnYmqzi
 iwa/plugins/olas/tests/test_olas_view_actions.py,sha256=jAxr9bjFNAaxGf1btIrxdMaHgJ0PWX9aDwVU-oPGMpk,5109
 iwa/plugins/olas/tests/test_olas_view_modals.py,sha256=8j0PNFjKqFC5V1kBdVFWNLMvqGt49H6fLSYGxn02c8o,5562
 iwa/plugins/olas/tests/test_plugin.py,sha256=RVgU-Cq6t_3mOh90xFAGwlJOV7ZIgp0VNaK5ZAxisAQ,2565
-iwa/plugins/olas/tests/test_plugin_full.py,sha256=GBZ-TL5t8NXy6HVQozCI1hMEn2EY4lXjGFC89QpoPxQ,8415
+iwa/plugins/olas/tests/test_plugin_full.py,sha256=55EBa07JhJLVG3IMi6QKlR_ivWLYCdLQTySP66qbEXo,8584
 iwa/plugins/olas/tests/test_service_lifecycle.py,sha256=sOCtpz8T9s55AZe9AoqP1h3XrXw5NDSjDqwLgYThvU4,5559
 iwa/plugins/olas/tests/test_service_manager.py,sha256=rS2m0A26apc-o4HsfP5oXmVcmZSR5e874bjhQKZRaSg,40650
 iwa/plugins/olas/tests/test_service_manager_errors.py,sha256=udlAsQj_t1F5TwVQuWhroF6jDJ4RmGEXaxPh87tMsuA,8538
@@ -157,7 +157,7 @@ iwa/web/tests/test_web_endpoints.py,sha256=C264MH-CTyDW4GLUrTXBgLJKUk4-89pFAScBd
 iwa/web/tests/test_web_olas.py,sha256=0CVSsrncOeJ3x0ECV7mVLQV_CXZRrOqGiVjgLIi6hZ8,16308
 iwa/web/tests/test_web_swap.py,sha256=7A4gBJFL01kIXPtW1E1J17SCsVc_0DmUn-R8kKrnnVA,2974
 iwa/web/tests/test_web_swap_coverage.py,sha256=zGNrzlhZ_vWDCvWmLcoUwFgqxnrp_ACbo49AtWBS_Kw,5584
-iwa-0.0.24.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.26.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
 tests/legacy_cow.py,sha256=oOkZvIxL70ReEoD9oHQbOD5GpjIr6AGNHcOCgfPlerU,8389
 tests/legacy_safe.py,sha256=AssM2g13E74dNGODu_H0Q0y412lgqsrYnEzI97nm_Ts,2972
 tests/legacy_transaction_retry_logic.py,sha256=D9RqZ7DBu61Xr2djBAodU2p9UE939LL-DnQXswX5iQk,1497
@@ -210,8 +210,8 @@ tests/test_utils.py,sha256=vkP49rYNI8BRzLpWR3WnKdDr8upeZjZcs7Rx0pjbQMo,1292
 tests/test_workers.py,sha256=MInwdkFY5LdmFB3o1odIaSD7AQZb3263hNafO1De5PE,2793
 tools/create_and_stake_service.py,sha256=1xwy_bJQI1j9yIQ968Oc9Db_F6mk1659LuuZntTASDE,3742
 tools/verify_drain.py,sha256=PkMjblyOOAuQge88FwfEzRtCYeEtJxXhPBmtQYCoQ-8,6743
-iwa-0.0.24.dist-info/METADATA,sha256=N-qgeL8ZAmzJTvBthIa65x8zoZpsmqVuFG4YZ_K7-kA,7295
-iwa-0.0.24.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-iwa-0.0.24.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.24.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.24.dist-info/RECORD,,
+iwa-0.0.26.dist-info/METADATA,sha256=Wqiy2X1x-bMEyAb6hYzuWfhXhSp65n4HnCD5lK4GO5c,7295
+iwa-0.0.26.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+iwa-0.0.26.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.26.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.26.dist-info/RECORD,,