iwa 0.0.17__py3-none-any.whl → 0.0.18__py3-none-any.whl

iwa/core/chain/interface.py

@@ -2,9 +2,8 @@
 
 import threading
 import time
-from typing import Callable, Dict, Optional, Tuple, TypeVar, Union
+from typing import Callable, Dict, Optional, TypeVar, Union
 
-from eth_account.datastructures import SignedTransaction
 from web3 import Web3
 
 from iwa.core.chain.errors import TenderlyQuotaExceededError, sanitize_rpc_url
@@ -449,69 +448,6 @@ class ChainInterface:
 
         return False
 
-    def send_native_transfer(
-        self,
-        from_address: EthereumAddress,
-        to_address: EthereumAddress,
-        value_wei: int,
-        sign_callback: Callable[[dict], SignedTransaction],
-    ) -> Tuple[bool, Optional[str]]:
-        """Send native currency transaction with retry logic."""
-
-        def _do_transfer() -> Tuple[bool, Optional[str]]:
-            tx = {
-                "from": from_address,
-                "to": to_address,
-                "value": value_wei,
-                "nonce": self.web3.eth.get_transaction_count(from_address),
-                "chainId": self.chain.chain_id,
-            }
-
-            balance_wei = self.get_native_balance_wei(from_address)
-            gas_price = self.web3.eth.gas_price
-            gas_estimate = self.web3.eth.estimate_gas(tx)
-            required_wei = value_wei + (gas_estimate * gas_price)
-
-            if balance_wei < required_wei:
-                logger.error(
-                    f"Insufficient balance. "
-                    f"Balance: {self.web3.from_wei(balance_wei, 'ether'):.4f} "
-                    f"{self.chain.native_currency}, "
-                    f"Required: {self.web3.from_wei(required_wei, 'ether'):.4f} "
-                    f"{self.chain.native_currency}"
-                )
-                return False, None
-
-            tx["gas"] = gas_estimate
-            tx["gasPrice"] = gas_price
-
-            signed_tx = sign_callback(tx)
-            txn_hash = self.web3.eth.send_raw_transaction(signed_tx.raw_transaction)
-            receipt = self.web3.eth.wait_for_transaction_receipt(txn_hash)
-
-            status = getattr(receipt, "status", None)
-            if status is None and isinstance(receipt, dict):
-                status = receipt.get("status")
-
-            if receipt and status == 1:
-                self.wait_for_no_pending_tx(from_address)
-                logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
-                # Check Tenderly block limit after each successful transaction
-                self.check_block_limit()
-                return True, receipt["transactionHash"].hex()
-
-            logger.error("Transaction failed (status != 1)")
-            return False, None
-
-        try:
-            return self.with_retry(
-                _do_transfer,
-                operation_name=f"native_transfer to {str(to_address)[:10]}...",
-            )
-        except Exception as e:
-            logger.exception(f"Native transfer failed: {e}")
-            return False, None
-
     def get_token_address(self, token_name: str) -> Optional[EthereumAddress]:
         """Get token address by name"""
         return self.chain.get_token_address(token_name)

iwa/core/pricing.py

@@ -19,7 +19,6 @@ class PriceService:
     """Service to fetch token prices from CoinGecko."""
 
     BASE_URL = "https://api.coingecko.com/api/v3"
-    DEMO_URL = "https://demo-api.coingecko.com/api/v3"
 
     def __init__(self):
         """Initialize PriceService."""
@@ -60,9 +59,7 @@ class PriceService:
         max_retries = 2
         for attempt in range(max_retries + 1):
             try:
-                # Use demo URL if API key is present, otherwise standard URL
-                # NOTE: Demo URL is significantly more reliable for demo keys
-                base_url = self.DEMO_URL if self.api_key else self.BASE_URL
+                base_url = self.BASE_URL
                 url = f"{base_url}/simple/price"
                 params = {"ids": token_id, "vs_currencies": vs_currency}
                 headers = {}

iwa/core/services/transaction.py

@@ -1,6 +1,5 @@
 """Transaction service module."""
 
-import time
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
 from loguru import logger
@@ -31,32 +30,37 @@ class TransferLogger:
         self.account_service = account_service
         self.chain_interface = chain_interface
 
-    def log_transfers(self, receipt: Dict, tx: Dict) -> None:
+    def log_transfers(self, receipt: Dict) -> None:
         """Log all transfers (ERC20 and native) from a transaction receipt.
 
         Args:
             receipt: Transaction receipt containing logs.
-            tx: Original transaction dict.
 
         """
-        # Log native value transfer if present
-        native_value = tx.get("value", 0)
-        if native_value and int(native_value) > 0:
-            self._log_native_transfer(tx, native_value)
+        # Get the original transaction to check for native value transfer
+        tx_hash = receipt.get("transactionHash") or getattr(receipt, "transactionHash", None)
+        if tx_hash:
+            try:
+                tx = self.chain_interface.web3.eth.get_transaction(tx_hash)
+                native_value = getattr(tx, "value", 0) or tx.get("value", 0) if isinstance(tx, dict) else getattr(tx, "value", 0)
+                if native_value and int(native_value) > 0:
+                    from_addr = getattr(tx, "from", "") if hasattr(tx, "from") else tx.get("from", "")
+                    # Handle AttributeDict's special 'from' attribute
+                    if not from_addr and hasattr(tx, "__getitem__"):
+                        from_addr = tx["from"]
+                    to_addr = getattr(tx, "to", "") or (tx.get("to", "") if isinstance(tx, dict) else "")
+                    self._log_native_transfer(from_addr, to_addr, native_value)
+            except Exception as e:
+                logger.debug(f"Could not get tx for native transfer logging: {e}")
 
         # Log ERC20 transfers from event logs
-        logs = receipt.get("logs", [])
-        if hasattr(receipt, "logs"):
-            logs = receipt.logs
+        logs = receipt.get("logs", []) if isinstance(receipt, dict) else getattr(receipt, "logs", [])
 
         for log in logs:
             self._process_log(log)
 
-    def _log_native_transfer(self, tx: Dict, value_wei: int) -> None:
+    def _log_native_transfer(self, from_addr: str, to_addr: str, value_wei: int) -> None:
         """Log a native currency transfer."""
-        from_addr = tx.get("from", "")
-        to_addr = tx.get("to", "")
-
         from_label = self._resolve_address_label(from_addr)
         to_label = self._resolve_address_label(to_addr)
 
@@ -213,53 +217,67 @@ class TransactionService:
         chain_name: str = "gnosis",
         tags: Optional[List[str]] = None,
     ) -> Tuple[bool, Dict]:
-        """Sign and send a transaction with retry logic for gas."""
+        """Sign and send a transaction using unified retry mechanism.
+
+        Uses ChainInterface.with_retry() for consistent RPC rotation and retry logic.
+        Gas errors are handled by increasing gas and retrying within the same mechanism.
+        """
         chain_interface = ChainInterfaces().get(chain_name)
         tx = dict(transaction)
-        max_retries = 10
 
         if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
             return False, {}
 
-        for attempt in range(1, max_retries + 1):
+        # Mutable state for retry attempts
+        state = {"gas_retries": 0, "max_gas_retries": 5}
+
+        def _do_sign_send_wait() -> Tuple[bool, Dict, bytes]:
+            """Inner operation wrapped by with_retry."""
             try:
                 signed_txn = self.key_storage.sign_transaction(tx, signer_address_or_tag)
-                txn_hash = chain_interface.web3.eth.send_raw_transaction(signed_txn.raw_transaction)
-
-                # Use chain_interface.with_retry for waiting for receipt to handle timeouts/RPC errors
-                def wait_for_receipt(tx_h=txn_hash):
-                    return chain_interface.web3.eth.wait_for_transaction_receipt(tx_h)
-
-                receipt = chain_interface.with_retry(
-                    wait_for_receipt, operation_name="wait_for_receipt"
+                txn_hash = chain_interface.web3.eth.send_raw_transaction(
+                    signed_txn.raw_transaction
                 )
+                receipt = chain_interface.web3.eth.wait_for_transaction_receipt(txn_hash)
 
-                if receipt and getattr(receipt, "status", None) == 1:
-                    signer_account = self.account_service.resolve_account(signer_address_or_tag)
-                    chain_interface.wait_for_no_pending_tx(signer_account.address)
-                    logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
-
-                    self._log_successful_transaction(
-                        receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
-                    )
-                    return True, receipt
+                status = getattr(receipt, "status", None)
+                if status is None and isinstance(receipt, dict):
+                    status = receipt.get("status")
 
-                # Transaction reverted
+                if receipt and status == 1:
+                    return True, receipt, txn_hash
+                # Transaction mined but reverted - don't retry
                 logger.error("Transaction failed (status 0).")
-                return False, {}
+                raise ValueError("Transaction reverted")
 
             except web3_exceptions.Web3RPCError as e:
-                if self._handle_gas_error(e, tx, attempt, max_retries):
-                    continue
-                return False, {}
+                # Handle gas errors by increasing gas and re-raising
+                self._handle_gas_retry(e, tx, state)
+                raise  # Re-raise to trigger with_retry's retry mechanism
 
-            except Exception as e:
-                # Attempt RPC rotation
-                if self._handle_generic_error(e, chain_interface, attempt, max_retries):
-                    continue
+        try:
+            success, receipt, txn_hash = chain_interface.with_retry(
+                _do_sign_send_wait,
+                operation_name=f"sign_and_send to {tx.get('to', 'unknown')[:10]}...",
+            )
+            if success:
+                signer_account = self.account_service.resolve_account(signer_address_or_tag)
+                chain_interface.wait_for_no_pending_tx(signer_account.address)
+                logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
+                self._log_successful_transaction(
+                    receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
+                )
+                return True, receipt
+            return False, {}
+        except ValueError as e:
+            # Transaction reverted - already logged
+            if "reverted" in str(e).lower():
                 return False, {}
-
-        return False, {}
+            logger.exception(f"Transaction failed: {e}")
+            return False, {}
+        except Exception as e:
+            logger.exception(f"Transaction failed after retries: {e}")
+            return False, {}
 
     def _prepare_transaction(self, tx: dict, signer_tag: str, chain_interface) -> bool:
         """Ensure nonce and chainId are set."""
@@ -274,32 +292,16 @@ class TransactionService:
             tx["chainId"] = chain_interface.chain.chain_id
         return True
 
-    def _handle_gas_error(self, e, tx, attempt, max_retries) -> bool:
-        err_text = str(e)
-        if self._is_gas_too_low_error(err_text) and attempt < max_retries:
-            logger.warning(
-                f"Gas too low error detected. Retrying with increased gas (Attempt {attempt}/{max_retries})..."
-            )
+    def _handle_gas_retry(self, e: Exception, tx: dict, state: dict) -> None:
+        """Increase gas if error is gas-related and retries remaining."""
+        if self._is_gas_too_low_error(str(e)) and state["gas_retries"] < state["max_gas_retries"]:
             current_gas = int(tx.get("gas", 30_000))
             tx["gas"] = int(current_gas * 1.5)
-            tx["gas"] = int(current_gas * 1.5)
-            # Exponential backoff for gas errors
-            time.sleep(min(2**attempt, 30))
-            return True
-        logger.exception(f"Error sending transaction: {e}")
-        return False
-
-    def _handle_generic_error(self, e, chain_interface, attempt, max_retries) -> bool:
-        if attempt < max_retries:
-            logger.warning(f"Error encountered: {e}. Attempting to rotate RPC...")
-
-            if chain_interface.rotate_rpc():
-                logger.info("Retrying with new RPC...")
-                # Exponential backoff
-                time.sleep(min(2**attempt, 30))
-                return True
-        logger.exception(f"Unexpected error sending transaction: {e}")
-        return False
+            state["gas_retries"] += 1
+            logger.warning(
+                f"Gas too low, increasing to {tx['gas']} "
+                f"(attempt {state['gas_retries']}/{state['max_gas_retries']})"
+            )
 
     def _log_successful_transaction(
         self, receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
@@ -323,7 +325,7 @@ class TransactionService:
 
             # Log transfer events (ERC20 and native value)
             transfer_logger = TransferLogger(self.account_service, chain_interface)
-            transfer_logger.log_transfers(receipt, tx)
+            transfer_logger.log_transfers(receipt)
 
         except Exception as log_err:
             logger.warning(f"Failed to log transaction: {log_err}")

iwa/core/services/transfer/erc20.py

@@ -64,6 +64,14 @@ class ERC20TransferMixin:
             value_eur=v_eur,
             tags=["erc20-transfer", "safe-transaction"],
         )
+
+        # Log transfers extracted from receipt events
+        if receipt:
+            from iwa.core.services.transaction import TransferLogger
+
+            transfer_logger = TransferLogger(self.account_service, interface)
+            transfer_logger.log_transfers(receipt)
+
         return tx_hash
 
     def _send_erc20_via_eoa(

iwa/core/services/transfer/native.py

@@ -61,6 +61,15 @@ class NativeTransferMixin:
             value_eur=v_eur,
             tags=["native-transfer", "safe-transaction"],
         )
+
+        # Log transfers extracted from receipt events
+        if receipt:
+            from iwa.core.services.transaction import TransferLogger
+
+            interface = ChainInterfaces().get(chain_name)
+            transfer_logger = TransferLogger(self.account_service, interface)
+            transfer_logger.log_transfers(receipt)
+
         return tx_hash
 
     def _send_native_via_eoa(
@@ -74,20 +83,38 @@ class NativeTransferMixin:
         to_tag: Optional[str],
         token_symbol: str,
     ) -> Optional[str]:
-        """Send native currency via EOA (externally owned account)."""
-        success, tx_hash = chain_interface.send_native_transfer(
-            from_address=from_account.address,
-            to_address=to_address,
-            value_wei=amount_wei,
-            sign_callback=lambda tx: self.key_storage.sign_transaction(tx, from_account.address),
+        """Send native currency via EOA using unified TransactionService."""
+        # Build transaction dict
+        try:
+            gas_price = chain_interface.web3.eth.gas_price
+            gas_estimate = chain_interface.web3.eth.estimate_gas({
+                "from": from_account.address,
+                "to": to_address,
+                "value": amount_wei,
+            })
+        except Exception as e:
+            logger.error(f"Failed to estimate gas for native transfer: {e}")
+            return None
+
+        tx = {
+            "from": from_account.address,
+            "to": to_address,
+            "value": amount_wei,
+            "gas": gas_estimate,
+            "gasPrice": gas_price,
+        }
+
+        # Use unified TransactionService
+        success, receipt = self.transaction_service.sign_and_send(
+            tx, from_account.address, chain_name, tags=["native-transfer"]
         )
-        if success and tx_hash:
-            # Get receipt for gas calculation
-            receipt = None
-            try:
-                receipt = chain_interface.web3.eth.get_transaction_receipt(tx_hash)
-            except Exception as e:
-                logger.warning(f"Could not get receipt for {tx_hash}: {e}")
+
+        if success and receipt:
+            tx_hash = receipt.get("transactionHash", b"")
+            if hasattr(tx_hash, "hex"):
+                tx_hash = tx_hash.hex()
+            elif isinstance(tx_hash, bytes):
+                tx_hash = tx_hash.hex()
 
             gas_cost, gas_value_eur = self._calculate_gas_info(receipt, chain_name)
             p_eur, v_eur = self._get_token_price_info(token_symbol, amount_wei, chain_name)
@@ -106,6 +133,13 @@ class NativeTransferMixin:
                 value_eur=v_eur,
                 tags=["native-transfer"],
             )
+
+            # Log transfers extracted from receipt events
+            from iwa.core.services.transaction import TransferLogger
+
+            transfer_logger = TransferLogger(self.account_service, chain_interface)
+            transfer_logger.log_transfers(receipt)
+
             return tx_hash
         return None
 

iwa/plugins/olas/contracts/activity_checker.py

@@ -10,8 +10,6 @@ requests relative to the time elapsed since the last checkpoint.
 
 from typing import Tuple
 
-from web3 import Web3
-
 from iwa.core.constants import DEFAULT_MECH_CONTRACT_ADDRESS
 from iwa.core.types import EthereumAddress
 from iwa.plugins.olas.contracts.base import OLAS_ABI_PATH, ContractInstance
@@ -70,9 +68,6 @@ class ActivityCheckerContract(ContractInstance):
     def get_multisig_nonces(self, multisig: EthereumAddress) -> Tuple[int, int]:
         """Get the nonces for a multisig address.
 
-        This method reads directly from the source contracts to ensure fresh data
-        and compatibility with Legacy/MM contracts.
-
         Args:
             multisig: The multisig address to check.
 
@@ -82,52 +77,8 @@ class ActivityCheckerContract(ContractInstance):
                 - mech_requests_count: Total mech requests made
 
         """
-        # 1. Get Safe Nonce
-        safe_nonce = 0
-        try:
-            # Minimal ABI for Safe nonce
-            safe_abi = [{"name": "nonce", "type": "function", "inputs": [], "outputs": [{"type": "uint256"}]}]
-            safe_contract = self.chain_interface.web3._web3.eth.contract(
-                address=Web3.to_checksum_address(multisig), abi=safe_abi
-            )
-            safe_nonce = safe_contract.functions.nonce().call()
-        except Exception as e:
-            # Fallback or log error? If safe read fails, something is very wrong.
-            # But we don't want to crash the whole status check if possible.
-            # For now, let's log and keep 0 or re-raise if critical.
-            # safe_nonce is critical for liveness check (diffNonces).
-            from loguru import logger
-            logger.warning(f"Failed to read Safe nonce for {multisig}: {e}")
-
-        # 2. Get Mech Requests Count
-        mech_requests = 0
-
-        if self.mech_marketplace:
-            # Case A: Marketplace (MM)
-            try:
-                # Minimal ABI for Marketplace mapRequestCounts
-                mp_abi = [{"name": "mapRequestCounts", "type": "function", "inputs": [{"type": "address"}], "outputs": [{"type": "uint256"}]}]
-                mp_contract = self.chain_interface.web3._web3.eth.contract(
-                    address=Web3.to_checksum_address(self.mech_marketplace), abi=mp_abi
-                )
-                mech_requests = mp_contract.functions.mapRequestCounts(multisig).call()
-            except Exception as e:
-                from loguru import logger
-                logger.warning(f"Failed to read Marketplace requests for {multisig}: {e}")
-        else:
-            # Case B: Legacy (AgentMech)
-            try:
-                # Minimal ABI for AgentMech getRequestsCount
-                mech_abi = [{"name": "getRequestsCount", "type": "function", "inputs": [{"type": "address"}], "outputs": [{"type": "uint256"}]}]
-                mech_contract = self.chain_interface.web3._web3.eth.contract(
-                    address=Web3.to_checksum_address(self.agent_mech), abi=mech_abi
-                )
-                mech_requests = mech_contract.functions.getRequestsCount(multisig).call()
-            except Exception as e:
-                from loguru import logger
-                logger.warning(f"Failed to read AgentMech requests for {multisig}: {e}")
-
-        return (safe_nonce, mech_requests)
+        nonces = self.contract.functions.getMultisigNonces(multisig).call()
+        return (nonces[0], nonces[1])
 
     def is_ratio_pass(
         self,

iwa/plugins/olas/service_manager/mech.py

@@ -140,11 +140,13 @@ class MechManagerMixin:
             )
             if use_marketplace:
                 priority_mech = priority_mech or detected_priority_mech
+                mech_address = mech_address or detected_marketplace
 
         if use_marketplace:
             return self._send_marketplace_mech_request(
                 data=data,
                 value=value,
+                marketplace_address=mech_address,
                 priority_mech=priority_mech,
                 max_delivery_rate=max_delivery_rate,
                 payment_type=payment_type,
@@ -260,10 +262,39 @@ class MechManagerMixin:
 
         return True
 
+    def _resolve_marketplace_config(
+        self, marketplace_addr: Optional[str], priority_addr: Optional[str]
+    ) -> tuple[str, str]:
+        """Resolve marketplace and priority mech addresses. Returns (marketplace, priority)."""
+        chain_name = self.chain_name if self.service else getattr(self, "chain_name", "gnosis")
+        protocol_contracts = OLAS_CONTRACTS.get(chain_name, {})
+
+        resolved_mp = marketplace_addr or protocol_contracts.get("OLAS_MECH_MARKETPLACE")
+        if not resolved_mp:
+            raise ValueError(f"Mech Marketplace address not found for chain {chain_name}")
+
+        if not priority_addr:
+            raise ValueError("priority_mech is required for marketplace requests")
+
+        return str(resolved_mp), Web3.to_checksum_address(priority_addr)
+
+    def _prepare_marketplace_params(
+        self,
+        value: Optional[int],
+        max_delivery_rate: Optional[int],
+        payment_type: Optional[bytes],
+    ) -> tuple[int, int, bytes]:
+        """Prepare default values for marketplace parameters."""
+        p_type = payment_type or bytes.fromhex(PAYMENT_TYPE_NATIVE)
+        val = value if value is not None else 10_000_000_000_000_000
+        rate = max_delivery_rate if max_delivery_rate is not None else val
+        return val, rate, p_type
+
     def _send_marketplace_mech_request(
         self,
         data: bytes,
         value: Optional[int] = None,
+        marketplace_address: Optional[str] = None,
         priority_mech: Optional[str] = None,
         max_delivery_rate: Optional[int] = None,
         payment_type: Optional[bytes] = None,
@@ -275,43 +306,30 @@ class MechManagerMixin:
             logger.error("No active service")
             return None
 
-        multisig_address = self.service.multisig_address
-        chain_name = self.chain_name if self.service else getattr(self, "chain_name", "gnosis")
-        protocol_contracts = OLAS_CONTRACTS.get(chain_name, {})
-        marketplace_address = protocol_contracts.get("OLAS_MECH_MARKETPLACE")
-
-        if not marketplace_address:
-            logger.error(f"Mech Marketplace address not found for chain {chain_name}")
-            return None
-
-        if not priority_mech:
-            logger.error("priority_mech is required for marketplace requests")
+        try:
+            marketplace_address, priority_mech = self._resolve_marketplace_config(
+                marketplace_address, priority_mech
+            )
+        except ValueError as e:
+            logger.error(e)
             return None
 
-        priority_mech = Web3.to_checksum_address(priority_mech)
-        marketplace = MechMarketplaceContract(str(marketplace_address), chain_name=chain_name)
+        marketplace = MechMarketplaceContract(marketplace_address, chain_name=self.chain_name)
 
         if not self._validate_priority_mech(marketplace, priority_mech):
             return None
 
-        # Set defaults for payment
-        if payment_type is None:
-            payment_type = bytes.fromhex(PAYMENT_TYPE_NATIVE)
-
-        if value is None:
-            value = 10_000_000_000_000_000
-            logger.info(f"Using default value: {value} wei (0.01 xDAI)")
-
-        if max_delivery_rate is None:
-            max_delivery_rate = value
-            logger.info(f"Using value as max_delivery_rate: {max_delivery_rate}")
+        # Set defaults for payment and delivery
+        value, max_delivery_rate, payment_type = self._prepare_marketplace_params(
+            value, max_delivery_rate, payment_type
+        )
 
         if not self._validate_marketplace_params(marketplace, response_timeout, payment_type):
             return None
 
         # Prepare transaction
         tx_data = marketplace.prepare_request_tx(
-            from_address=multisig_address,
+            from_address=self.service.multisig_address,
             request_data=data,
             priority_mech=priority_mech,
             response_timeout=response_timeout,

{iwa-0.0.17.dist-info → iwa-0.0.18.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ iwa/core/mnemonic.py,sha256=LiG1VmpydQoHQ0pHUJ1OIlrWJry47VSMnOqPM_Yk-O8,12930
 iwa/core/models.py,sha256=kBQ0cBe6uFmL2QfW7mjKiMFeZxhT-FRN-RyK3Ko0vE8,12849
 iwa/core/monitor.py,sha256=OmhKVMkfhvtxig3wDUL6iGwBIClTx0YUqMncCao4SqI,7953
 iwa/core/plugins.py,sha256=FLvOG4S397fKi0aTH1fWBEtexn4yvGv_QzGWqFrhSKE,1102
-iwa/core/pricing.py,sha256=U-vIjJwzh6O7MZTAFZx6mFFxaiLcwn6PnsZc4g0z4IQ,4293
+iwa/core/pricing.py,sha256=uENpqVMmuogZHctsLuEsU7WJ1cLSNAI-rZTtbpTDjeQ,4048
 iwa/core/secrets.py,sha256=U7DZKrwKuSOFV00Ij3ISrrO1cWn_t1GBW_0PyAqjcD4,2588
 iwa/core/tables.py,sha256=y7Cg67PAGHYVMVyAjbo_CQ9t2iz7UXE-OTuUHRyFRTo,2021
 iwa/core/test.py,sha256=gey0dql5eajo1itOhgkSrgfyGWue2eSfpr0xzX3vc38,643
@@ -20,7 +20,7 @@ iwa/core/utils.py,sha256=shJuANkXSWVO3NF49syPA9hCG7H5AzaMJOG8V4fo6IM,4279
 iwa/core/wallet.py,sha256=sNFK-_0y-EgeLpNHt9o5tCqTM0oVqJra-eAWjR7AgyU,13038
 iwa/core/chain/__init__.py,sha256=XJMmn0ed-_aVkY2iEMKpuTxPgIKBd41dexSVmEZTa-o,1604
 iwa/core/chain/errors.py,sha256=9SEbhxZ-qASPkzt-DoI51qq0GRJVqRgqgL720gO7a64,1275
-iwa/core/chain/interface.py,sha256=BIUPJUAV8oeeiUtZcj0zi2B0mGad2qS5ajy1PhBT-1k,21182
+iwa/core/chain/interface.py,sha256=uUIUo9Q6Sr4h9AjqFe6WqQzdbMs9VkJcUj0mgd6lfx4,18602
 iwa/core/chain/manager.py,sha256=cFEzh6pK5OyVhjhpeMAqhc9RnRDQR1DjIGiGKp-FXBI,1159
 iwa/core/chain/models.py,sha256=0OgBo08FZEQisOdd00YUMXSAV7BC0CcWpqJ2y-gs0cI,4863
 iwa/core/chain/rate_limiter.py,sha256=gU7TmWdH9D_wbXKT1X7mIgoIUCWVuebgvRhxiyLGAmI,6613
@@ -36,12 +36,12 @@ iwa/core/services/account.py,sha256=01MoEvl6FJlMnMB4fGwsPtnGa4kgA-d5hJeKu_ACg7Y,
 iwa/core/services/balance.py,sha256=mPE12CuOFfCaJXaQXWOcQM1O03ZF3ghpy_-oOjNk_GE,4104
 iwa/core/services/plugin.py,sha256=GNNlbtELyHl7MNVChrypF76GYphxXduxDog4kx1MLi8,3277
 iwa/core/services/safe.py,sha256=ytNJMndXrzTMHwhDZKYLIh4Q0UTWDBgQgTpof-UqIkA,14827
-iwa/core/services/transaction.py,sha256=3IeTLntewa9XevPTMrNhjOUwdv0nMdU3KqlxljjL0Z0,14286
+iwa/core/services/transaction.py,sha256=DiEVwE1L_UpCyC5UmknaRwRYRxsDlAkwMQRN64NiwIQ,15162
 iwa/core/services/transfer/__init__.py,sha256=ZJfshFxJRsp8rkOqfVvd1cqEzIJ9tqBJh8pc0l90GLk,5576
 iwa/core/services/transfer/base.py,sha256=sohz-Ss2i-pGYGl4x9bD93cnYKcSvsXaXyvyRawvgQs,9043
-iwa/core/services/transfer/erc20.py,sha256=0GvlfETgdJg15azs1apH1gI6Vm3gAv22o1saNbIfiAY,8685
+iwa/core/services/transfer/erc20.py,sha256=958ctXPWxq_KSQNoaG7RqWbC8SRb9NB3MzhtC2dp_NU,8960
 iwa/core/services/transfer/multisend.py,sha256=MuOTjzUQoYg1eSixXKhJGBmB1c0ymLelvk4puHm_VGE,15194
-iwa/core/services/transfer/native.py,sha256=Z0v41OMbbcTjwdYLDwMO-8G81UMPYDdQ3y8BdbsJimM,9350
+iwa/core/services/transfer/native.py,sha256=2CiUOP1gHEXAtLG0-8FaykV3u3jclq5y71gXQNEoc3w,10433
 iwa/core/services/transfer/swap.py,sha256=exOJdzwkZaGbrFWfmQT_2JMcZUxnkiehXca8TH-vlF0,12269
 iwa/core/tests/test_wallet.py,sha256=N8_gO7KkV5nqk_KcHqW_xOwNNKpDuXHeFgnala3bB84,9361
 iwa/plugins/__init__.py,sha256=zy-DjOZn8GSgIETN2X_GAb9O6yk71t6ZRzeUgoZ52KA,23
@@ -61,7 +61,7 @@ iwa/plugins/olas/importer.py,sha256=f8KlZ9dGcNbpg8uoTYbO9sDvbluZoslhpWFLqPjPnLA,
 iwa/plugins/olas/mech_reference.py,sha256=CaSCpQnQL4F7wOG6Ox6Zdoy-uNEQ78YBwVLILQZKL8Q,5782
 iwa/plugins/olas/models.py,sha256=xC5hYakX53pBT6zZteM9cyiC7t6XRLLpobjQmDYueOo,3520
 iwa/plugins/olas/plugin.py,sha256=S_vnvZ02VdVWD7N5kp7u5JIRQ2JLtfwGDZ7OHkAN0M8,9390
-iwa/plugins/olas/contracts/activity_checker.py,sha256=sQSzBWF7meXzCzVw4G0wowjTTRddraGPppQ8PyLcuaU,6429
+iwa/plugins/olas/contracts/activity_checker.py,sha256=PTLvsFdi3PdsFMxRVcXfwlQMRyJYHIzrHf3OaPVtFqU,3943
 iwa/plugins/olas/contracts/base.py,sha256=y73aQbDq6l4zUpz_eQAg4MsLkTAEqjjupXlcvxjfgCI,240
 iwa/plugins/olas/contracts/mech.py,sha256=dXYtyORc-oiu9ga5PtTquOFkoakb6BLGKvlUsteygIg,2767
 iwa/plugins/olas/contracts/mech_marketplace.py,sha256=hMADl5MQGvT2wLRKu4vHGe4RrAZVq8Y2M_EvXWWz528,1554
@@ -82,7 +82,7 @@ iwa/plugins/olas/service_manager/__init__.py,sha256=GXiThMEY3nPgHUl1i-DLrF4h96z9
 iwa/plugins/olas/service_manager/base.py,sha256=CCTH7RiYtgyFwRszrMLxNf1rNM_6leWHuJJmse4m2wI,4854
 iwa/plugins/olas/service_manager/drain.py,sha256=IS7YYKuQdkULcNdxfHVzjcq95pXKdpajolzLL78u4jc,12430
 iwa/plugins/olas/service_manager/lifecycle.py,sha256=DIB6yrP0VPICu6558uQJuFp2sgrA66iVNTzZVUUowGw,47159
-iwa/plugins/olas/service_manager/mech.py,sha256=Rl4FJIYrT9L4gzTd7-7xBZaxBEHWFyMmN5TuSNfEdZc,15964
+iwa/plugins/olas/service_manager/mech.py,sha256=eMynvChrUSaTZBk0XP9KkcI6xYA2KXh9sHPtekixqro,16810
 iwa/plugins/olas/service_manager/staking.py,sha256=Z9GzlPfY7qSSjc9xPhWvb9qywxu_7OB3Gc1eBli07pY,28058
 iwa/plugins/olas/tests/conftest.py,sha256=4vM7EI00SrTGyeP0hNzsGSQHEj2-iznVgzlNh2_OGfo,739
 iwa/plugins/olas/tests/test_importer.py,sha256=i9LKov7kNRECB3hmRnhKBwcfx3uxtjWe4BB77bOOpeo,4282
@@ -150,7 +150,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.17.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.18.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
@@ -159,7 +159,7 @@ tests/legacy_wallets_screen.py,sha256=9hZnX-VhKgwH9w8MxbNdboRyNxLDhOakLKJECsw_vh
 tests/legacy_web.py,sha256=q2ERIriaDHT3Q8axG2N3ucO7f2VSvV_WkuPR00DVko4,8577
 tests/test_account_service.py,sha256=g_AIVT2jhlvUtbFTaCd-d15x4CmXJQaV66tlAgnaXwY,3745
 tests/test_balance_service.py,sha256=86iEkPd2M1-UFy3qOxV1EguQOEYbboy2-2mAyS3ctGs,6549
-tests/test_chain.py,sha256=z3Mo9mHNQZ0aXSlrHUcdtNgGqsNyOwWYQAmmKa_dqiM,17221
+tests/test_chain.py,sha256=cWSLUHRl2Iz55wQA08bk8RvAQnp_ZHCqA829KJ3Ur6c,13609
 tests/test_chain_interface.py,sha256=Wu0q0sREtmYBp7YvWrBIrrSTtqeQj18oJp2VmMUEMec,8312
 tests/test_chain_interface_coverage.py,sha256=fvrVvw8-DMwdsSFKQHUhpbfutrVRxnnTc-tjB7Bb-jo,3327
 tests/test_cli.py,sha256=WW6EDeHLws5-BqFNOy11pH_D5lttuyspD5hrDCFpR0Q,3968
@@ -169,7 +169,7 @@ tests/test_drain_coverage.py,sha256=jtN5tIXzSTlS2IjwLS60azyMYsjFDlSTUa98JM1bMic,
 tests/test_erc20.py,sha256=kNEw1afpm5EbXRNXkjpkBNZIy7Af1nqGlztKH5IWAwU,3074
 tests/test_gnosis_plugin.py,sha256=XMoHBCTrnVBq9bXYPzMUIrhr95caucMVRxooCjKrzjg,3454
 tests/test_keys.py,sha256=pxlGlHB-NaTbC8qar093ttdHLLtkM8irVNmCbH2KVf4,17421
-tests/test_legacy_wallet.py,sha256=j7AorUMvuChyxy18y9j8Ux8wpZa2_ZvKutp5obKLLI0,49895
+tests/test_legacy_wallet.py,sha256=Caj3xP1FijRyLKa-xKiZu6NCAsQRHjWbsnAarncAoA0,49798
 tests/test_main.py,sha256=y2xr7HjCt4rHsxm8y6n24FKCteSHPyxC3DFuMcUgX1Y,475
 tests/test_migration.py,sha256=fYoxzI3KqGh0cPV0bFcbvGrAnKcNlvnwjggG_uD0QGo,1789
 tests/test_mnemonic.py,sha256=BFtXMMg17uHWh_H-ZwAOn0qzgbUCqL8BRLkgRjzfzxo,7379
@@ -187,11 +187,11 @@ tests/test_safe_coverage.py,sha256=g9Bdrpkc-Mc8HBjk07lYNRkzxWZiF922uiVLZqhehBE,5
 tests/test_safe_service.py,sha256=nxDYmGd6p2gGe7BEeMxsqS8CgeJarPofV38HC6Cop44,5770
 tests/test_service_manager_integration.py,sha256=I_BLUzEKrVTyg_8jqsUK0oFD3aQVPCRJ7z0gY8P-j04,2354
 tests/test_service_manager_structure.py,sha256=zK506ucCXCBHcjPYKrKEuK1bgq0xsbawyL8Y-wahXf8,868
-tests/test_service_transaction.py,sha256=SecU2Fy32jLH4lg0CZHNrNkqM1pzPnYB0qZtxqaDnFE,6416
-tests/test_staking_router.py,sha256=e8bI_u24SsORn9bkf4QWOtFoGxi86WTyu_Zl_QnUvpA,2769
+tests/test_service_transaction.py,sha256=IeqYhmRD-pIXffBJrBQwfPx-qnfNEJs0iPM3eCb8MLo,7054
+tests/test_staking_router.py,sha256=cnOtwWeQPu09kecVhlCf1WA4ONqs13OcQJhJCx2EOPY,3067
 tests/test_staking_simple.py,sha256=NHyZ1pcVQEJGFiGseC5m6Y9Y6FJGnRIFJUwhd1hAV9g,1138
 tests/test_tables.py,sha256=1KQHgxuizoOrRxpubDdnzk9iaU5Lwyp3bcWP_hZD5uU,2686
-tests/test_transaction_service.py,sha256=iuRMyOsMS4fRNIhudbW0ovSfA6vGzZpjIApVryOpO3U,5283
+tests/test_transaction_service.py,sha256=TXhIleUNOnp3DXi-RrKJ1Y_6dA6de5TQLOc9qndMHm4,5765
 tests/test_transfer_multisend.py,sha256=PErjNqNwN66TMh4oVa307re64Ucccg1LkXqB0KlkmsI,6677
 tests/test_transfer_native.py,sha256=cDbb4poV_veIw6eHpokrHe9yUndOjA6rQhrHd_IY3HQ,7445
 tests/test_transfer_security.py,sha256=gdpC6ybdXQbQgILbAQ0GqjWdwn9AJRNR3B_7TYg0NxI,3617
@@ -202,8 +202,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.17.dist-info/METADATA,sha256=vzZKb09UmfMfeWTcLbJnUCxWHIr-DGWNvSvUM5k9RcQ,7295
-iwa-0.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iwa-0.0.17.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.17.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.17.dist-info/RECORD,,
+iwa-0.0.18.dist-info/METADATA,sha256=dyyGDv8h7tk7l8RPTf4F69Guby5BxTzbOOGEOuWOYVI,7295
+iwa-0.0.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iwa-0.0.18.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.18.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.18.dist-info/RECORD,,

tests/test_chain.py

@@ -195,43 +195,8 @@ def test_wait_for_no_pending_tx(mock_web3):
             assert ci.wait_for_no_pending_tx("0xSender") is False
 
 
-def test_send_native_transfer(mock_web3):
-    chain = MagicMock(spec=SupportedChain, rpcs=["https://rpc"], chain_id=1, native_currency="ETH")
-    chain.name = "TestChain"
-    type(chain).rpc = PropertyMock(return_value="https://rpc")
-    ci = ChainInterface(chain)
-    account = MagicMock(address="0xSender", key="key")
-
-    ci.web3.eth.get_transaction_count.return_value = 0
-    ci.web3.eth.gas_price = 10
-    ci.web3.eth.estimate_gas.return_value = 21000
-
-    # Sufficient balance
-    ci.web3.eth.get_balance.return_value = 10**18  # plenty
-    ci.web3.eth.get_balance.return_value = 10**18  # plenty
-    # Valid mock return for success: (True, dict_receipt)
-    # The actual method returns tx_hash.hex().
-    mock_signed_tx = MagicMock()
-    mock_signed_tx.raw_transaction = b"raw"
-    mock_receipt = {"transactionHash": b"hash", "status": 1}
-
-    with (
-        patch.object(ci.web3.eth, "send_raw_transaction", return_value=b"hash"),
-        patch.object(ci.web3.eth, "wait_for_transaction_receipt", return_value=mock_receipt),
-        patch.object(ci, "wait_for_no_pending_tx", return_value=True),
-    ):
-        success, tx_hash = ci.send_native_transfer(
-            account.address, "0xReceiver", 1000, sign_callback=lambda tx: mock_signed_tx
-        )
-        assert success is True
-        assert tx_hash == "68617368"
-
-    # Insufficient balance
-    ci.web3.eth.get_balance.return_value = 0
-    ci.web3.from_wei.return_value = 0.0
-    assert ci.send_native_transfer(
-        account.address, "0xReceiver", 1000, sign_callback=lambda tx: mock_signed_tx
-    ) == (False, None)
+# NOTE: test_send_native_transfer was removed because the method was removed
+# from ChainInterface. Native transfers now go through TransactionService.
 
 
 def test_chain_interfaces_get():
@@ -352,66 +317,6 @@ def test_chain_interface_with_real_chains():
 # --- Negative Tests ---
 
 
-def test_send_native_transfer_insufficient_balance(mock_web3):
-    """Test send_native_transfer fails with insufficient balance."""
-    chain = MagicMock(spec=SupportedChain)
-    chain.name = "TestChain"
-    chain.rpcs = ["https://rpc"]
-    chain.chain_id = 1
-    chain.native_currency = "ETH"
-    type(chain).rpc = PropertyMock(return_value="https://rpc")
-
-    ci = ChainInterface(chain)
-    ci.web3.eth.get_transaction_count.return_value = 0
-    ci.web3.eth.gas_price = 1000000000  # 1 gwei
-    ci.web3.eth.estimate_gas.return_value = 21000
-    ci.web3.eth.get_balance.return_value = 1000  # Very low balance
-    ci.web3.from_wei.return_value = 0.000001
-
-    sign_callback = MagicMock()
-
-    success, tx_hash = ci.send_native_transfer(
-        from_address="0x1111111111111111111111111111111111111111",
-        to_address="0x2222222222222222222222222222222222222222",
-        value_wei=10**18,  # 1 ETH - more than available
-        sign_callback=sign_callback,
-    )
-
-    assert success is False
-    assert tx_hash is None
-    sign_callback.assert_not_called()
-
-
-def test_send_native_transfer_rpc_error(mock_web3):
-    """Test send_native_transfer handles RPC errors."""
-    chain = MagicMock(spec=SupportedChain)
-    chain.name = "TestChain"
-    chain.rpcs = ["https://rpc"]
-    chain.chain_id = 1
-    chain.native_currency = "ETH"
-    type(chain).rpc = PropertyMock(return_value="https://rpc")
-
-    ci = ChainInterface(chain)
-    ci.web3.eth.get_transaction_count.return_value = 0
-    ci.web3.eth.gas_price = 1000000000
-    ci.web3.eth.estimate_gas.return_value = 21000
-    ci.web3.eth.get_balance.return_value = 10**19  # Enough balance
-    ci.web3.from_wei.return_value = 10.0
-    ci.web3.eth.send_raw_transaction.side_effect = Exception("Connection refused")
-
-    sign_callback = MagicMock()
-    sign_callback.return_value = MagicMock(raw_transaction=b"signed")
-
-    success, tx_hash = ci.send_native_transfer(
-        from_address="0x1111111111111111111111111111111111111111",
-        to_address="0x2222222222222222222222222222222222222222",
-        value_wei=10**17,
-        sign_callback=sign_callback,
-    )
-
-    assert success is False
-    assert tx_hash is None
-
 
 def test_get_token_symbol_fallback_on_error(mock_web3):
     """Test get_token_symbol returns truncated address on error."""

tests/test_legacy_wallet.py

@@ -345,23 +345,23 @@ def test_send_native_success(wallet, mock_key_storage, mock_chain_interfaces, mo
     mock_key_storage.get_account.return_value = account
 
     chain_interface = mock_chain_interfaces.get.return_value
-    # chain_interface.get_native_balance_wei.return_value = ... # Ignored
     mock_balance_service.get_native_balance_wei.return_value = 2000000000000000000
 
     chain_interface.web3.eth.gas_price = 1000000000
     chain_interface.web3.eth.estimate_gas.return_value = 21000
     chain_interface.web3.from_wei.side_effect = lambda val, unit: float(val) / 10**18
 
-    # Mock return values for success
-    chain_interface.sign_and_send_transaction.return_value = (True, {})
-    chain_interface.send_native_transfer.return_value = (True, "0xHash")
+    # Mock TransactionService return (native transfers now go through TransactionService)
+    wallet.transaction_service.sign_and_send.return_value = (
+        True,
+        {"status": 1, "transactionHash": b"hash"},
+    )
 
     wallet.send(
         "sender", VALID_ADDR_2, amount_wei=1000000000000000000, token_address_or_name="native"
     )  # 1 ETH
 
-    # wallet.transaction_service.sign_and_send.assert_called_once()
-    chain_interface.send_native_transfer.assert_called_once()
+    wallet.transaction_service.sign_and_send.assert_called_once()
 
 
 def test_send_erc20_success(wallet, mock_key_storage, mock_chain_interfaces):

tests/test_service_transaction.py

@@ -18,8 +18,19 @@ def mock_chain_interfaces():
         gnosis_interface.web3 = MagicMock()
         instance.get.return_value = gnosis_interface
 
-        # Mock with_retry to execute the operation
-        gnosis_interface.with_retry.side_effect = lambda op, **kwargs: op()
+        # Mock with_retry to simulate retry behavior (up to 6 attempts)
+        def mock_with_retry(op, max_retries=6, **kwargs):
+            last_error = None
+            for attempt in range(max_retries + 1):
+                try:
+                    return op()
+                except Exception as e:
+                    last_error = e
+                    if attempt >= max_retries:
+                        raise
+            raise last_error
+
+        gnosis_interface.with_retry.side_effect = mock_with_retry
 
         yield instance
 
@@ -100,7 +111,7 @@ def test_sign_and_send_retry_on_low_gas(
 def test_sign_and_send_max_retries_exhausted(
     transaction_service, mock_key_storage, mock_chain_interfaces
 ):
-    """Test sign_and_send fails after max gas retries."""
+    """Test sign_and_send fails after max retries (with_retry default of 6 + 1)."""
     tx = {"to": "0x123", "value": 100, "nonce": 5, "gas": 10000}
     mock_key_storage.sign_transaction.return_value = MagicMock(raw_transaction=b"raw_tx")
 
@@ -119,8 +130,8 @@ def test_sign_and_send_max_retries_exhausted(
     # Should fail after max retries
     assert success is False
     assert receipt == {}  # Returns empty dict on failure
-    # Should have tried 10 times (max_retries)
-    assert chain_interface.web3.eth.send_raw_transaction.call_count == 10
+    # Should have tried 7 times (6 retries + 1 initial = max_retries+1 from with_retry)
+    assert chain_interface.web3.eth.send_raw_transaction.call_count == 7
 
 
 def test_sign_and_send_transaction_reverted(
@@ -144,7 +155,11 @@ def test_sign_and_send_transaction_reverted(
 def test_sign_and_send_rpc_error_triggers_rotation(
     transaction_service, mock_key_storage, mock_chain_interfaces
 ):
-    """Test sign_and_send rotates RPC on connection error."""
+    """Test sign_and_send retries on connection error via with_retry.
+
+    RPC rotation is now handled internally by with_retry, so we just verify
+    that the operation retries and eventually succeeds.
+    """
     tx = {"to": "0x123", "value": 100, "nonce": 5, "gas": 21000}
     mock_key_storage.sign_transaction.return_value = MagicMock(raw_transaction=b"raw_tx")
 
@@ -156,13 +171,13 @@ def test_sign_and_send_rpc_error_triggers_rotation(
         b"tx_hash",
     ]
     chain_interface.web3.eth.wait_for_transaction_receipt.return_value = MagicMock(status=1)
-    chain_interface.rotate_rpc.return_value = True
 
     with patch("time.sleep"):
         success, receipt = transaction_service.sign_and_send(tx, "signer")
 
     assert success is True
-    chain_interface.rotate_rpc.assert_called()
+    # Verify retry happened - send_raw_transaction called twice
+    assert chain_interface.web3.eth.send_raw_transaction.call_count == 2
 
 
 def test_sign_and_send_signer_not_found(

tests/test_staking_router.py

@@ -1,17 +1,25 @@
 """Tests for staking.py router coverage."""
 
+import sys
 from unittest.mock import MagicMock, patch
 
 import pytest
 
 
 @pytest.fixture(autouse=True)
-def mock_key_storage():
-    """Bypass KeyStorage security check."""
-    with (
-        patch("iwa.core.keys.KeyStorage.__init__", return_value=None),
-        patch("iwa.web.dependencies.wallet", MagicMock()),
-    ):
+def mock_dependencies():
+    """Mock wallet dependency before importing router modules.
+
+    The iwa.web.dependencies module instantiates Wallet() at module level,
+    which fails in test environment. We pre-populate sys.modules to prevent
+    the actual import.
+    """
+    # Create mock module
+    mock_dep_module = MagicMock()
+    mock_dep_module.wallet = MagicMock()
+
+    # Pre-populate sys.modules to prevent real import
+    with patch.dict(sys.modules, {"iwa.web.dependencies": mock_dep_module}):
         yield
 
 

tests/test_transaction_service.py

@@ -56,8 +56,19 @@ def mock_chain_interfaces():
 
         instance.get.return_value = gnosis_interface
 
-        # Mock with_retry to execute the operation
-        gnosis_interface.with_retry.side_effect = lambda op, **kwargs: op()
+        # Mock with_retry to simulate retry behavior (up to 6 attempts)
+        def mock_with_retry(op, max_retries=6, **kwargs):
+            last_error = None
+            for attempt in range(max_retries + 1):
+                try:
+                    return op()
+                except Exception as e:
+                    last_error = e
+                    if attempt >= max_retries:
+                        raise
+            raise last_error
+
+        gnosis_interface.with_retry.side_effect = mock_with_retry
 
         yield instance
 
@@ -68,7 +79,6 @@ def mock_external_deps():
     with (
         patch("iwa.core.services.transaction.log_transaction") as mock_log,
         patch("iwa.core.pricing.PriceService") as mock_price,
-        patch("iwa.core.services.transaction.time.sleep") as _,  # speed up tests
     ):
         mock_price.return_value.get_token_price.return_value = 1.0  # 1 EUR per Token
         yield {
@@ -146,7 +156,11 @@ def test_sign_and_send_low_gas_retry(
 def test_sign_and_send_rpc_rotation(
     mock_key_storage, mock_account_service, mock_chain_interfaces, mock_external_deps
 ):
-    """Test RPC rotation on generic error."""
+    """Test retry on generic error via with_retry.
+
+    RPC rotation is now handled internally by with_retry, so we just verify
+    that the operation retries and eventually succeeds.
+    """
     service = TransactionService(mock_key_storage, mock_account_service)
     chain_interface = mock_chain_interfaces.get.return_value
 
@@ -155,11 +169,11 @@ def test_sign_and_send_rpc_rotation(
         Exception("Connection reset"),
         b"tx_hash_bytes",
     ]
-    chain_interface.rotate_rpc.return_value = True
 
     tx = {"to": "0xDest", "value": 100}
 
     success, receipt = service.sign_and_send(tx, "signer")
 
     assert success is True
-    chain_interface.rotate_rpc.assert_called_once()
+    # Verify retry happened - send_raw_transaction called twice
+    assert chain_interface.web3.eth.send_raw_transaction.call_count == 2