iwa 0.0.24__tar.gz → 0.0.26__tar.gz

{iwa-0.0.24/src/iwa.egg-info → iwa-0.0.26}/PKG-INFO

@@ -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 → iwa-0.0.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iwa"
-version = "0.0.24"
+version = "0.0.26"
 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.24"
+target-version = "0.0.26"
 fix = true
 
 [tool.ruff.lint]

{iwa-0.0.24 → iwa-0.0.26}/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.24 → iwa-0.0.26}/src/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-0.0.24 → iwa-0.0.26}/src/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 → iwa-0.0.26/src/iwa.egg-info}/PKG-INFO

@@ -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