iwa 0.0.23__tar.gz → 0.0.25__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.23
+Version: 0.0.25
 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.23 → iwa-0.0.25}/pyproject.toml

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

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

@@ -7,6 +7,7 @@ Supports two formats:
 """
 
 import json
+import re
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import List, Optional, Tuple
@@ -273,7 +274,6 @@ class OlasServiceImporter:
             key = self._parse_keystore_file(operator_file, role="owner")
             if key:
                 keys.append(key)
-                self._verify_key_signature(key)
 
         # Also check keys.json (array of keystores)
         keys_file = folder / "keys.json"
@@ -793,8 +793,6 @@ class OlasServiceImporter:
         Tags follow the pattern: {service_name}_{role}
         Example: trader_alpha_agent, trader_alpha_operator
         """
-        import re
-
         # Use service name as prefix, or 'imported' as fallback
         prefix = service_name or "imported"
 
@@ -835,7 +833,6 @@ class OlasServiceImporter:
                 signers.append(key.address)
 
         # Generate tag
-        import re
 
         prefix = service.service_name or "imported"
         prefix = re.sub(r"[^a-z0-9]+", "_", prefix.lower()).strip("_")
@@ -898,7 +895,7 @@ class OlasServiceImporter:
                 olas_service.agent_address = agent_key.address
 
             olas_config.add_service(olas_service)
-            self.config.save()
+            self.config.save_config()
             logger.info(f"Imported service {key}")
             return True, "ok"
 
@@ -924,7 +921,6 @@ class OlasServiceImporter:
         except ValueError as e:
             # Password incorrect
             logger.warning(f"Decryption failed (ValueError) for {key.address}: {e}")
-            pass
         except Exception as e:
             logger.warning(f"Error decrypting key {key.address}: {type(e).__name__} - {e}")
 

{iwa-0.0.23 → iwa-0.0.25}/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.23 → iwa-0.0.25}/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.23 → iwa-0.0.25/src/iwa.egg-info}/PKG-INFO

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