iwa 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

iwa/core/chain/interface.py

@@ -94,6 +94,9 @@ class ChainInterface:
         """Get the current active RPC URL."""
         if not self.chain.rpcs:
             return ""
+        # Ensure index is valid (could be stale after rpcs list changes or singleton reuse)
+        if self._current_rpc_index >= len(self.chain.rpcs):
+            self._current_rpc_index = 0
         return self.chain.rpcs[self._current_rpc_index]
 
     @property

iwa/core/services/transaction.py

@@ -1,5 +1,6 @@
 """Transaction service module."""
 
+import threading
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
 from loguru import logger
@@ -220,12 +221,29 @@ class TransferLogger:
 class TransactionService:
     """Manages transaction lifecycle: signing, sending, retrying."""
 
+    # Class-level lock for managing per-address locks
+    _locks_lock = threading.Lock()
+    _address_locks: Dict[str, threading.Lock] = {}
+
     def __init__(self, key_storage: KeyStorage, account_service: AccountService, safe_service=None):
         """Initialize TransactionService."""
         self.key_storage = key_storage
         self.account_service = account_service
         self.safe_service = safe_service
 
+    @classmethod
+    def _get_address_lock(cls, address: str) -> threading.Lock:
+        """Get or create a lock for a specific address.
+
+        This prevents nonce collisions when sending multiple transactions
+        from the same address concurrently.
+        """
+        address_lower = address.lower()
+        with cls._locks_lock:
+            if address_lower not in cls._address_locks:
+                cls._address_locks[address_lower] = threading.Lock()
+            return cls._address_locks[address_lower]
+
     def _resolve_label(self, address: str, chain_name: str = "gnosis") -> str:
         """Resolve address to human-readable label."""
         if not address:
@@ -255,69 +273,84 @@ class TransactionService:
 
         Uses ChainInterface.with_retry() for consistent RPC rotation and retry logic.
         Gas errors are handled by increasing gas and retrying within the same mechanism.
+
+        Note: Uses per-address locking to prevent nonce collisions when multiple
+        transactions are sent from the same address concurrently.
         """
         chain_interface = ChainInterfaces().get(chain_name)
         tx = dict(transaction)
 
-        if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
+        # Resolve signer first to get the address for locking
+        signer_account = self.account_service.resolve_account(signer_address_or_tag)
+        if not signer_account:
+            logger.error(f"Signer {signer_address_or_tag} not found")
             return False, {}
 
-        # CHECK FOR SAFE TRANSACTION
-        signer_account = self.account_service.resolve_account(signer_address_or_tag)
+        # CHECK FOR SAFE TRANSACTION (Safe has its own nonce management)
         if isinstance(signer_account, StoredSafeAccount):
             if not self.safe_service:
                 logger.error("Attempted Safe transaction but SafeService is not initialized.")
                 return False, {}
+            # Safe transactions don't need EOA nonce locking
+            if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
+                return False, {}
             return self._execute_via_safe(tx, signer_account, chain_interface, chain_name, tags)
 
-        # Mutable state for retry attempts
-        state = {"gas_retries": 0, "max_gas_retries": 5}
+        # Acquire lock for this address to prevent nonce collisions
+        address_lock = self._get_address_lock(signer_account.address)
+        with address_lock:
+            if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
+                return False, {}
 
-        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)
-                receipt = chain_interface.web3.eth.wait_for_transaction_receipt(txn_hash)
+            # Mutable state for retry attempts
+            state = {"gas_retries": 0, "max_gas_retries": 5}
 
-                status = getattr(receipt, "status", None)
-                if status is None and isinstance(receipt, dict):
-                    status = receipt.get("status")
+            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
+                    )
+                    receipt = chain_interface.web3.eth.wait_for_transaction_receipt(txn_hash)
 
-                if receipt and status == 1:
-                    return True, receipt, txn_hash
-                # Transaction mined but reverted - don't retry
-                logger.error("Transaction failed (status 0).")
-                raise ValueError("Transaction reverted")
+                    status = getattr(receipt, "status", None)
+                    if status is None and isinstance(receipt, dict):
+                        status = receipt.get("status")
 
-            except web3_exceptions.Web3RPCError as e:
-                # 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
+                    if receipt and status == 1:
+                        return True, receipt, txn_hash
+                    # Transaction mined but reverted - don't retry
+                    logger.error("Transaction failed (status 0).")
+                    raise ValueError("Transaction reverted")
 
-        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
+                except web3_exceptions.Web3RPCError as e:
+                    # 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
+
+            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]}...",
                 )
-                return True, receipt
-            return False, {}
-        except ValueError as e:
-            # Transaction reverted - already logged
-            if "reverted" in str(e).lower():
+                if success:
+                    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, {}
+                logger.exception(f"Transaction failed: {e}")
+                return False, {}
+            except Exception as e:
+                logger.exception(f"Transaction failed after retries: {e}")
                 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."""

{iwa-0.1.1.dist-info → iwa-0.1.2.dist-info}/METADATA

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

@@ -23,7 +23,7 @@ iwa/core/utils.py,sha256=FTYpIdQ1wnugD4lYU4TQ7d7_TlDs4CTUIhEpHGEJph4,4281
 iwa/core/wallet.py,sha256=xSGFOK5Wzh-ctLGhBMK1BySlXN0Ircpztyk1an21QiQ,13129
 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=D_bDIQhQVfY9A2nLPpQ3bipmywoYsi2wVNPXPKutFec,30760
+iwa/core/chain/interface.py,sha256=Z7AcLjlYRw8uBj1zklVGep8Z21T-uBCamW48df7w0ew,30952
 iwa/core/chain/manager.py,sha256=XHwn7ciapFCZVk0rPSJopUqM5Wu3Kpp6XrenkgTE1HA,1397
 iwa/core/chain/models.py,sha256=WUhAighMKcFdbAUkPU_3dkGbWyAUpRJqXMHLcWFC1xg,5261
 iwa/core/chain/rate_limiter.py,sha256=Ps1MrR4HHtylxgUAawe6DoC9tuqKagjQdKulqcJD2gs,9093
@@ -42,7 +42,7 @@ iwa/core/services/balance.py,sha256=MSCEzPRDPlHIjaWD1A2X2oIuiMz5MFJjD7sSHUxQ8OM,
 iwa/core/services/plugin.py,sha256=GNNlbtELyHl7MNVChrypF76GYphxXduxDog4kx1MLi8,3277
 iwa/core/services/safe.py,sha256=HG3yAN5IdNR45uuHfjAuaT4XVy_tiivoMTQLoEHlEwY,15701
 iwa/core/services/safe_executor.py,sha256=uZIoE_VeB0B9b-HhZ5jNWXna1kr8e_LZ8qEt63kGxIU,17082
-iwa/core/services/transaction.py,sha256=FrGRWn1xo5rbGIr2ToZ2kPzapr3zmWW38oycyB87TK8,19971
+iwa/core/services/transaction.py,sha256=eh--51bAA3rbK1gPjfk7zA5Gm9GJ7CJ82uzG4O5A-Rs,21501
 iwa/core/services/transfer/__init__.py,sha256=7p22xtwrH0murXWTuTGNw0WRKBDqjJEnnVaUpWd8Vfo,5589
 iwa/core/services/transfer/base.py,sha256=sohz-Ss2i-pGYGl4x9bD93cnYKcSvsXaXyvyRawvgQs,9043
 iwa/core/services/transfer/erc20.py,sha256=e6RD1_QcI_-iJvP85kj7aw4p6NnCPjZcm-QSKi14RRA,10104
@@ -166,7 +166,7 @@ iwa/web/tests/test_web_endpoints.py,sha256=vA25YghHNB23sbmhD4ciesn_f_okSq0tjlkrS
 iwa/web/tests/test_web_olas.py,sha256=GunKEAzcbzL7FoUGMtEl8wqiqwYwA5lB9sOhfCNj0TA,16312
 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.1.1.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.1.2.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
@@ -224,8 +224,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.1.1.dist-info/METADATA,sha256=jQxFBAjZ8GWJqgloxJkCLzHmgC7rO2YmkwZOpb0EIIM,7336
-iwa-0.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-iwa-0.1.1.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.1.1.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.1.1.dist-info/RECORD,,
+iwa-0.1.2.dist-info/METADATA,sha256=5YMpXIjANu_J3sb6-iP2cCGT0cFTMTVKg6qRw9RMVqg,7336
+iwa-0.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+iwa-0.1.2.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.1.2.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.1.2.dist-info/RECORD,,