iwa 0.0.62__tar.gz → 0.0.64__tar.gz

{iwa-0.0.62/src/iwa.egg-info → iwa-0.0.64}/PKG-INFO

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

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

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/models.py

@@ -2,7 +2,7 @@
 
 from typing import Dict, List, Optional
 
-from pydantic import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field
 
 from iwa.core.models import EthereumAddress
 
@@ -15,37 +15,20 @@ class Service(BaseModel):
     service_id: int  # Unique per chain
     agent_ids: List[int] = Field(default_factory=list)  # List of agent type IDs
 
-    # New explicit owner fields
+    # Owner fields:
+    # - service_owner_eoa_address: EOA that owns the service (or signs for the multisig)
+    # - service_owner_multisig_address: Safe multisig owner (optional, if service is owned by a Safe)
     service_owner_eoa_address: Optional[EthereumAddress] = None
     service_owner_multisig_address: Optional[EthereumAddress] = None
 
-    # Deprecated fields (kept for migration, removed from physical model via aliasing/validation)
-    # Actually, we keep it optional but not used, or use migration logic.
-    # Let's remove it from fields and rely on before validator to map it to eoa.
-
     agent_address: Optional[EthereumAddress] = None
     multisig_address: Optional[EthereumAddress] = None
     staking_contract_address: Optional[EthereumAddress] = None
     token_address: Optional[EthereumAddress] = None
 
-    @root_validator(pre=True)
-    def migrate_owner_fields(cls, values):  # noqa: N805
-        """Migrate legacy service_owner_address to service_owner_eoa_address."""
-        # Check for legacy 'service_owner_address'
-        if "service_owner_address" in values and values["service_owner_address"]:
-            legacy_addr = values["service_owner_address"]
-
-            # If service_owner_eoa_address is missing, use legacy
-            if "service_owner_eoa_address" not in values or not values["service_owner_eoa_address"]:
-                values["service_owner_eoa_address"] = legacy_addr
-
-            # Remove legacy field from values so it doesn't cause extra field errors if we removed it from model
-            # Or if strict.
-        return values
-
     @property
     def service_owner_address(self) -> Optional[EthereumAddress]:
-        """Backward compatibility property: Returns effective owner (Safe if present, else EOA)."""
+        """Returns effective owner address (Safe multisig if present, else EOA)."""
         return self.service_owner_multisig_address or self.service_owner_eoa_address
 
     @property

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/service_manager/drain.py

@@ -12,7 +12,9 @@ from iwa.plugins.olas.contracts.staking import StakingContract, StakingState
 class DrainManagerMixin:
     """Mixin for draining and service token management."""
 
-    def claim_rewards(self, staking_contract: Optional[StakingContract] = None) -> Tuple[bool, int]:
+    def claim_rewards(  # noqa: C901
+        self, staking_contract: Optional[StakingContract] = None
+    ) -> Tuple[bool, int]:
         """Claim staking rewards for the active service.
 
         The claimed OLAS tokens will be sent to the service's multisig (Safe).
@@ -51,13 +53,19 @@ class DrainManagerMixin:
             logger.info("Service not staked, skipping claim")
             return False, 0
 
-        # Check accrued rewards
-        accrued_rewards = staking_contract.get_accrued_rewards(service_id)
-        if accrued_rewards == 0:
-            logger.info("No accrued rewards to claim")
+        # Check claimable rewards using calculate_staking_reward for accurate value
+        # (get_accrued_rewards returns stored value which may be outdated)
+        try:
+            claimable_rewards = staking_contract.calculate_staking_reward(service_id)
+        except Exception:
+            # Fallback to stored value if calculation fails
+            claimable_rewards = staking_contract.get_accrued_rewards(service_id)
+
+        if claimable_rewards == 0:
+            logger.info("No rewards to claim")
             return False, 0
 
-        logger.info(f"Claiming {accrued_rewards / 1e18:.4f} OLAS rewards for service {service_id}")
+        logger.info(f"Claiming ~{claimable_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
@@ -83,11 +91,19 @@ class DrainManagerMixin:
             return False, 0
 
         events = staking_contract.extract_events(receipt)
-        if "RewardClaimed" not in [event["name"] for event in events]:
-            logger.warning("RewardClaimed event not found, but transaction succeeded")
 
-        logger.info(f"Successfully claimed {accrued_rewards / 1e18:.4f} OLAS rewards")
-        return True, accrued_rewards
+        # Extract actual claimed amount from RewardClaimed event
+        claimed_amount = claimable_rewards  # Default to estimated
+        for event in events:
+            if event["name"] == "RewardClaimed":
+                # RewardClaimed event has 'amount' or 'reward' field
+                claimed_amount = event["args"].get("amount", event["args"].get("reward", claimed_amount))
+                break
+        else:
+            logger.warning("RewardClaimed event not found, using estimated amount")
+
+        logger.info(f"Successfully claimed {claimed_amount / 1e18:.4f} OLAS rewards")
+        return True, claimed_amount
 
     def withdraw_rewards(self) -> Tuple[bool, float]:
         """Withdraw OLAS from the service Safe to the configured withdrawal address.
@@ -132,8 +148,14 @@ class DrainManagerMixin:
             return False, 0
 
         olas_amount = olas_balance / 1e18
-        withdrawal_tag = self.wallet.get_tag_by_address(withdrawal_address) or withdrawal_address
-        multisig_tag = self.wallet.get_tag_by_address(multisig_address) or multisig_address
+        withdrawal_tag = (
+            self.wallet.account_service.get_tag_by_address(withdrawal_address)
+            or withdrawal_address
+        )
+        multisig_tag = (
+            self.wallet.account_service.get_tag_by_address(multisig_address)
+            or multisig_address
+        )
 
         logger.info(f"Withdrawing {olas_amount:.4f} OLAS from {multisig_tag} to {withdrawal_tag}")
 

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/service_manager/lifecycle.py

@@ -183,7 +183,7 @@ class LifecycleManagerMixin:
             service_name=service_name,
             chain_name=chain_name,
             agent_id_values=agent_id_values,
-            service_owner_address=service_owner_account.address,
+            service_owner_eoa_address=service_owner_account.address,
             token_address=token_address,
         )
 
@@ -263,7 +263,7 @@ class LifecycleManagerMixin:
         service_name: Optional[str],
         chain_name: str,
         agent_id_values: List[int],
-        service_owner_address: str,
+        service_owner_eoa_address: str,
         token_address: Optional[str],
     ) -> None:
         """Create and save the new Service model."""
@@ -272,7 +272,7 @@ class LifecycleManagerMixin:
             chain_name=chain_name,
             service_id=service_id,
             agent_ids=agent_id_values,
-            service_owner_address=service_owner_address,
+            service_owner_eoa_address=service_owner_eoa_address,
             token_address=token_address,
         )
 

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/tests/test_olas_models.py

@@ -14,7 +14,7 @@ class TestOlasConfig:
             chain_name="gnosis",
             service_id=456,
             agent_ids=[25],
-            service_owner_address="0x1234567890123456789012345678901234567890",
+            service_owner_eoa_address="0x1234567890123456789012345678901234567890",
         )
 
         config.add_service(service)
@@ -30,7 +30,7 @@ class TestOlasConfig:
             chain_name="gnosis",
             service_id=789,
             agent_ids=[25],
-            service_owner_address="0x1234567890123456789012345678901234567890",
+            service_owner_eoa_address="0x1234567890123456789012345678901234567890",
         )
         config.services["gnosis:789"] = service
 
@@ -53,7 +53,7 @@ class TestOlasConfig:
             chain_name="ethereum",
             service_id=200,
             agent_ids=[25],
-            service_owner_address="0x1234567890123456789012345678901234567890",
+            service_owner_eoa_address="0x1234567890123456789012345678901234567890",
         )
         config.services["ethereum:200"] = service
 
@@ -116,7 +116,7 @@ class TestService:
             chain_name="gnosis",
             service_id=123,
             agent_ids=[25],
-            service_owner_address="0x1234567890123456789012345678901234567890",
+            service_owner_eoa_address="0x1234567890123456789012345678901234567890",
         )
 
         assert service.key == "gnosis:123"
@@ -133,7 +133,7 @@ class TestService:
             chain_name="gnosis",
             service_id=456,
             agent_ids=[25],
-            service_owner_address="0x1234567890123456789012345678901234567890",
+            service_owner_eoa_address="0x1234567890123456789012345678901234567890",
             staking_contract_address=staking_addr,
             token_address=token_addr,
         )

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/tests/test_olas_view_actions.py

@@ -35,7 +35,7 @@ def mock_olas_config():
         chain_name="gnosis",
         agent_address=VALID_ADDR_1,
         multisig_address=VALID_ADDR_2,
-        service_owner_address=VALID_ADDR_3,
+        service_owner_eoa_address=VALID_ADDR_3,
         staking_contract_address=VALID_ADDR_1,
     )
     config = OlasConfig(services={"gnosis:1": service})

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/tests/test_service_manager_rewards.py

@@ -108,6 +108,7 @@ def test_claim_rewards_no_accrued_rewards(mock_wallet):
 
     mock_staking = MagicMock()
     mock_staking.get_staking_state.return_value = StakingState.STAKED
+    mock_staking.calculate_staking_reward.return_value = 0
     mock_staking.get_accrued_rewards.return_value = 0
 
     success, amount = manager.claim_rewards(staking_contract=mock_staking)
@@ -129,9 +130,12 @@ def test_claim_rewards_success(mock_wallet):
 
     mock_staking = MagicMock()
     mock_staking.get_staking_state.return_value = StakingState.STAKED
+    mock_staking.calculate_staking_reward.return_value = 10 * 10**18  # 10 OLAS
     mock_staking.get_accrued_rewards.return_value = 10 * 10**18  # 10 OLAS
     mock_staking.prepare_claim_tx.return_value = {"data": "0x"}
-    mock_staking.extract_events.return_value = [{"name": "RewardClaimed"}]
+    mock_staking.extract_events.return_value = [
+        {"name": "RewardClaimed", "args": {"amount": 10 * 10**18}}
+    ]
 
     success, amount = manager.claim_rewards(staking_contract=mock_staking)
 
@@ -152,6 +156,7 @@ def test_claim_rewards_tx_fails(mock_wallet):
 
     mock_staking = MagicMock()
     mock_staking.get_staking_state.return_value = StakingState.STAKED
+    mock_staking.calculate_staking_reward.return_value = 10 * 10**18
     mock_staking.get_accrued_rewards.return_value = 10 * 10**18
     mock_staking.prepare_claim_tx.return_value = {"data": "0x"}
     mock_wallet.sign_and_send_transaction.return_value = (False, {})

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/plugins/olas/tests/test_service_staking.py

@@ -201,6 +201,7 @@ def test_sm_claim_rewards_tx_fails(mock_wallet):
         mock_staking = MagicMock()
         mock_staking.prepare_claim_tx.return_value = {"to": VALID_ADDR}
         mock_staking.get_staking_state.return_value = StakingState.STAKED
+        mock_staking.calculate_staking_reward.return_value = 100
         mock_staking.get_accrued_rewards.return_value = 100
 
         def get_contract_side_effect(cls, *args, **kwargs):

{iwa-0.0.62 → iwa-0.0.64}/src/iwa/web/tests/test_web_olas.py

@@ -43,7 +43,7 @@ def mock_olas_config():
         chain_name="gnosis",
         agent_address="0x78731D3Ca6b7E34aC0F824c42a7cC18A495cabaB",
         multisig_address="0x40A2aCCbd92BCA938b02010E17A5b8929b49130D",
-        service_owner_address="0x1111111111111111111111111111111111111111",
+        service_owner_eoa_address="0x1111111111111111111111111111111111111111",
         staking_contract_address="0x78731D3Ca6b7E34aC0F824c42a7cC18A495cabaB",
     )
     return OlasConfig(services={"gnosis:1": service})

{iwa-0.0.62 → iwa-0.0.64/src/iwa.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.62
+Version: 0.0.64
 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.62 → iwa-0.0.64}/src/iwa.egg-info/SOURCES.txt

@@ -189,6 +189,7 @@ src/tests/test_chain_interface_coverage.py
 src/tests/test_chainlist_enrichment.py
 src/tests/test_cli.py
 src/tests/test_contract.py
+src/tests/test_contract_cache.py
 src/tests/test_db.py
 src/tests/test_drain_coverage.py
 src/tests/test_erc20.py

{iwa-0.0.62 → iwa-0.0.64}/src/tests/test_chainlist_enrichment.py

@@ -352,3 +352,236 @@ class TestEnrichFromChainlist:
 
         # Already at MAX_RPCS=20, ChainlistRPC should not be called
         mock_cl_cls.assert_not_called()
+
+
+class TestRPCNode:
+    """Test RPCNode dataclass."""
+
+    def test_is_tracking_privacy(self):
+        """Test is_tracking returns True for privacy tracking."""
+        node = RPCNode(url="https://example.com", is_working=True, privacy="privacy")
+        assert node.is_tracking is True
+
+    def test_is_tracking_limited(self):
+        """Test is_tracking returns True for limited tracking."""
+        node = RPCNode(url="https://example.com", is_working=True, tracking="limited")
+        assert node.is_tracking is True
+
+    def test_is_tracking_yes(self):
+        """Test is_tracking returns True for explicit yes tracking."""
+        node = RPCNode(url="https://example.com", is_working=True, tracking="yes")
+        assert node.is_tracking is True
+
+    def test_is_tracking_none(self):
+        """Test is_tracking returns False for no tracking."""
+        node = RPCNode(url="https://example.com", is_working=True, tracking="none")
+        assert node.is_tracking is False
+
+    def test_is_tracking_default(self):
+        """Test is_tracking returns False by default."""
+        node = RPCNode(url="https://example.com", is_working=True)
+        assert node.is_tracking is False
+
+
+class TestFilterCandidates:
+    """Test _filter_candidates function."""
+
+    def test_max_candidates_limit(self):
+        """Test that _filter_candidates respects MAX_CHAINLIST_CANDIDATES."""
+        from iwa.core.chainlist import MAX_CHAINLIST_CANDIDATES, _filter_candidates
+
+        # Create more nodes than MAX_CHAINLIST_CANDIDATES
+        nodes = [
+            RPCNode(url=f"https://rpc{i}.example.com", is_working=True)
+            for i in range(MAX_CHAINLIST_CANDIDATES + 10)
+        ]
+
+        result = _filter_candidates(nodes, set())
+
+        # Should be limited to MAX_CHAINLIST_CANDIDATES
+        assert len(result) == MAX_CHAINLIST_CANDIDATES
+
+
+class TestChainlistRPCFetchData:
+    """Test ChainlistRPC.fetch_data with caching."""
+
+    def test_fetch_data_uses_cache(self, tmp_path):
+        """Test fetch_data uses cached data when valid."""
+        import json
+        from unittest.mock import patch
+
+        cache_file = tmp_path / "chainlist_rpcs.json"
+        cache_data = [{"chainId": 100, "name": "Test", "rpc": []}]
+        cache_file.write_text(json.dumps(cache_data))
+
+        with patch.object(ChainlistRPC, "CACHE_PATH", cache_file):
+            with patch("iwa.core.chainlist.requests.Session") as mock_session:
+                cl = ChainlistRPC()
+                cl.fetch_data()
+
+                # Should not make network request when cache is valid
+                mock_session.return_value.get.assert_not_called()
+                assert cl._data == cache_data
+
+    def test_fetch_data_force_refresh(self, tmp_path):
+        """Test fetch_data ignores cache when force_refresh=True."""
+        import json
+
+        cache_file = tmp_path / "chainlist_rpcs.json"
+        cache_data = [{"chainId": 100, "name": "Cached", "rpc": []}]
+        cache_file.write_text(json.dumps(cache_data))
+
+        fresh_data = [{"chainId": 100, "name": "Fresh", "rpc": []}]
+
+        with patch.object(ChainlistRPC, "CACHE_PATH", cache_file):
+            with patch("iwa.core.chainlist.requests.Session") as mock_session_cls:
+                mock_session = MagicMock()
+                mock_session_cls.return_value.__enter__ = MagicMock(
+                    return_value=mock_session
+                )
+                mock_session_cls.return_value.__exit__ = MagicMock(return_value=False)
+                mock_resp = MagicMock()
+                mock_resp.json.return_value = fresh_data
+                mock_session.get.return_value = mock_resp
+
+                cl = ChainlistRPC()
+                cl.fetch_data(force_refresh=True)
+
+                mock_session.get.assert_called_once()
+                assert cl._data == fresh_data
+
+    def test_fetch_data_network_error_falls_back_to_cache(self, tmp_path):
+        """Test fetch_data falls back to expired cache on network error."""
+        import json
+
+        cache_file = tmp_path / "chainlist_rpcs.json"
+        cache_data = [{"chainId": 100, "name": "ExpiredCache", "rpc": []}]
+        cache_file.write_text(json.dumps(cache_data))
+
+        with patch.object(ChainlistRPC, "CACHE_PATH", cache_file):
+            # Force cache to be expired by setting CACHE_TTL to 0
+            with patch.object(ChainlistRPC, "CACHE_TTL", 0):
+                with patch("iwa.core.chainlist.requests.Session") as mock_session_cls:
+                    mock_session = MagicMock()
+                    mock_session_cls.return_value.__enter__ = MagicMock(
+                        return_value=mock_session
+                    )
+                    mock_session_cls.return_value.__exit__ = MagicMock(return_value=False)
+                    mock_session.get.side_effect = requests.RequestException("Network error")
+
+                    cl = ChainlistRPC()
+                    cl.fetch_data()
+
+                    # Should fall back to expired cache
+                    assert cl._data == cache_data
+
+
+class TestChainlistRPCGetRpcs:
+    """Test ChainlistRPC.get_rpcs and related methods."""
+
+    def test_get_chain_data_no_data(self):
+        """Test get_chain_data returns None when no data."""
+        with patch.object(ChainlistRPC, "fetch_data"):
+            cl = ChainlistRPC()
+            cl._data = []
+            result = cl.get_chain_data(999)
+            assert result is None
+
+    def test_get_chain_data_found(self):
+        """Test get_chain_data returns chain data when found."""
+        with patch.object(ChainlistRPC, "fetch_data"):
+            cl = ChainlistRPC()
+            cl._data = [{"chainId": 100, "name": "Gnosis"}, {"chainId": 1, "name": "Ethereum"}]
+            result = cl.get_chain_data(100)
+            assert result == {"chainId": 100, "name": "Gnosis"}
+
+    def test_get_rpcs_parses_nodes(self):
+        """Test get_rpcs parses RPC data into RPCNode objects."""
+        with patch.object(ChainlistRPC, "fetch_data"):
+            cl = ChainlistRPC()
+            cl._data = [
+                {
+                    "chainId": 100,
+                    "rpc": [
+                        {"url": "https://rpc1.example.com", "privacy": "privacy"},
+                        {"url": "https://rpc2.example.com", "tracking": "none"},
+                    ],
+                }
+            ]
+            result = cl.get_rpcs(100)
+
+            assert len(result) == 2
+            assert result[0].url == "https://rpc1.example.com"
+            assert result[0].privacy == "privacy"
+            assert result[1].url == "https://rpc2.example.com"
+            assert result[1].tracking == "none"
+
+    def test_get_rpcs_chain_not_found(self):
+        """Test get_rpcs returns empty list when chain not found."""
+        with patch.object(ChainlistRPC, "fetch_data"):
+            cl = ChainlistRPC()
+            cl._data = [{"chainId": 1, "rpc": []}]
+            result = cl.get_rpcs(999)
+            assert result == []
+
+    def test_get_https_rpcs(self):
+        """Test get_https_rpcs filters to HTTPS/HTTP URLs."""
+        with patch.object(ChainlistRPC, "fetch_data"):
+            cl = ChainlistRPC()
+            cl._data = [
+                {
+                    "chainId": 100,
+                    "rpc": [
+                        {"url": "https://rpc1.example.com"},
+                        {"url": "http://rpc2.example.com"},
+                        {"url": "wss://ws.example.com"},
+                    ],
+                }
+            ]
+            result = cl.get_https_rpcs(100)
+
+            assert len(result) == 2
+            assert "https://rpc1.example.com" in result
+            assert "http://rpc2.example.com" in result
+            assert "wss://ws.example.com" not in result
+
+    def test_get_wss_rpcs(self):
+        """Test get_wss_rpcs filters to WSS/WS URLs."""
+        with patch.object(ChainlistRPC, "fetch_data"):
+            cl = ChainlistRPC()
+            cl._data = [
+                {
+                    "chainId": 100,
+                    "rpc": [
+                        {"url": "https://rpc1.example.com"},
+                        {"url": "wss://ws.example.com"},
+                        {"url": "ws://ws2.example.com"},
+                    ],
+                }
+            ]
+            result = cl.get_wss_rpcs(100)
+
+            assert len(result) == 2
+            assert "wss://ws.example.com" in result
+            assert "ws://ws2.example.com" in result
+            assert "https://rpc1.example.com" not in result
+
+
+class TestGetValidatedRpcsEdgeCases:
+    """Test edge cases in get_validated_rpcs."""
+
+    def _make_node(self, url):
+        return RPCNode(url=url, is_working=True)
+
+    @patch.object(ChainlistRPC, "get_rpcs")
+    def test_returns_empty_when_all_filtered(self, mock_get_rpcs):
+        """Test returns empty list when all candidates are filtered."""
+        mock_get_rpcs.return_value = [
+            self._make_node("https://template.com/${API_KEY}"),
+            self._make_node("http://insecure.com"),  # Not HTTPS
+        ]
+
+        cl = ChainlistRPC()
+        result = cl.get_validated_rpcs(100, existing_rpcs=[])
+
+        assert result == []