iwa 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

iwa/core/chain/interface.py

@@ -379,7 +379,8 @@ class ChainInterface:
         """
         try:
             # Call decimals() directly without with_retry to avoid error logging
-            contract = self.web3.eth.contract(
+            # Use _web3 directly to ensure current provider after RPC rotation
+            contract = self.web3._web3.eth.contract(
                 address=self.web3.to_checksum_address(address),
                 abi=[{"constant": True, "inputs": [], "name": "decimals", "outputs": [{"type": "uint8"}], "type": "function"}]
             )

iwa/core/contracts/contract.py

@@ -63,10 +63,15 @@ class ContractInstance:
 
         This property ensures that after an RPC rotation, contract calls
         use the updated provider instead of the original one.
+
+        Note: We use _web3 directly (not the RateLimitedWeb3 wrapper) to ensure
+        the contract is bound to the current provider. The wrapper's set_backend()
+        updates _web3, but contracts created via the wrapper may cache old providers.
         """
         # Always create a fresh contract to use the current Web3 provider
         # This is necessary because RPC rotation changes the underlying provider
-        return self.chain_interface.web3.eth.contract(address=self.address, abi=self.abi)
+        # Access _web3 directly to ensure we get the current provider
+        return self.chain_interface.web3._web3.eth.contract(address=self.address, abi=self.abi)
 
     def load_error_selectors(self) -> Dict[str, Any]:
         """Load error selectors from the contract ABI."""

iwa/core/utils.py

@@ -87,7 +87,7 @@ def configure_logger():
 
 def get_version(package_name: str) -> str:
     """Get package version."""
-    from importlib.metadata import version, PackageNotFoundError
+    from importlib.metadata import PackageNotFoundError, version
     try:
         return version(package_name)
     except PackageNotFoundError:

iwa/plugins/olas/tests/test_staking_integration.py

@@ -194,9 +194,10 @@ def test_staking_contract(tmp_path):  # noqa: C901
             mock_chain = MagicMock()
             mock_interfaces.return_value.get.return_value = mock_chain
 
-            # Mock web3
+            # Mock web3 - use _web3 since contract.py now accesses _web3 directly
             mock_web3 = MagicMock()
             mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3  # For RPC rotation fix
 
             # Mock contract factory
             mock_contract = MagicMock()
@@ -252,6 +253,9 @@ def test_staking_contract(tmp_path):  # noqa: C901
 
                 staking.ts_checkpoint = MagicMock(return_value=0)
 
+                # Mock get_required_requests to return an int (not MagicMock)
+                staking.get_required_requests = MagicMock(return_value=2)
+
                 # Trigger original_open hit
                 try:
                     test_file = tmp_path / "test_lookup.txt"

iwa/web/static/app.js

@@ -2358,7 +2358,7 @@ document.addEventListener("DOMContentLoaded", () => {
                             ? "Claim staking rewards"
                             : "No rewards available to claim";
                         const claimLabel = hasRewards
-                          ? `Claim ${escapeHtml(staking.accrued_reward_olas)} OLAS`
+                          ? `Claim ${escapeHtml(formatBalance(staking.accrued_reward_olas))} OLAS`
                           : "Claim";
                         return `
                         <button class="btn-primary btn-sm"

{iwa-0.0.12.dist-info → iwa-0.0.14.dist-info}/METADATA

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

@@ -16,16 +16,16 @@ iwa/core/tables.py,sha256=y7Cg67PAGHYVMVyAjbo_CQ9t2iz7UXE-OTuUHRyFRTo,2021
 iwa/core/test.py,sha256=gey0dql5eajo1itOhgkSrgfyGWue2eSfpr0xzX3vc38,643
 iwa/core/types.py,sha256=EfDfIwLajTNK-BP9K17QLOIsGCs8legplKI_bUD_NjM,1992
 iwa/core/ui.py,sha256=DglmrI7XhUmOpLn9Nog9Cej4r-VT0JGFkuSNBx-XorQ,3131
-iwa/core/utils.py,sha256=TYgRQVbSJ0qSLh1azhX9DP9APlwf9QQa4FvGXvEpQ3o,4279
+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=GRfWvSPUKdFNrkFD-lR7qFJYbQJs-oE7G_tQMBn4jA0,21097
+iwa/core/chain/interface.py,sha256=BIUPJUAV8oeeiUtZcj0zi2B0mGad2qS5ajy1PhBT-1k,21182
 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
 iwa/core/contracts/__init__.py,sha256=P5GFY_pnuI02teqVY2U0t98bn1_SSPAbcAzRMpCdTi4,34
-iwa/core/contracts/contract.py,sha256=qHU1bvo1uhL2smY-dOrLSwVo6fb0ouWcpMsralGwJio,11440
+iwa/core/contracts/contract.py,sha256=Gx9L9wRithMALhdnQeF-0JA30_ZRHzlczAGiJXEfU5k,11766
 iwa/core/contracts/erc20.py,sha256=VqriOdUXej0ilTgpukpm1FUF_9sSrVMAPuEpIvyZ2SQ,2646
 iwa/core/contracts/multisend.py,sha256=tSdBCWe7LSdBoKZ7z2QebmRFK4M2ln7H3kmJBeEb4Ho,2431
 iwa/core/contracts/abis/erc20.json,sha256=vrdExMWcIogg_nO59j1Pmipmpa2Ulj3oCCdcdrrFVCE,16995
@@ -104,7 +104,7 @@ iwa/plugins/olas/tests/test_service_manager_mech.py,sha256=qG6qu5IPRNypXUsblU2OE
 iwa/plugins/olas/tests/test_service_manager_rewards.py,sha256=hIVckGl5rEr-KHGNUxxVopal0Tpw4EZharBt0MbaCVA,11798
 iwa/plugins/olas/tests/test_service_manager_validation.py,sha256=ajlfH5uc4mAHf8A7GLE5cW7X8utM2vUilM0JdGDdlVg,5382
 iwa/plugins/olas/tests/test_service_staking.py,sha256=XkC8H_qVumOQ1i4_vidEdXqkK5stInd2tgT50l0SRMk,12201
-iwa/plugins/olas/tests/test_staking_integration.py,sha256=zQdhhSLz5h2OvQ6GOJ-Yl_Y17itPML4Pr9VPkjWoz9c,9420
+iwa/plugins/olas/tests/test_staking_integration.py,sha256=QCBQf6P2ZmmsEGt2k8W2r53lG2aVRuoMJE-aFxVDLss,9701
 iwa/plugins/olas/tests/test_staking_validation.py,sha256=J7DgDdIiVTkKv_7obtSHQ2lgfUGPmUwuPjTUkiT4cbs,4198
 iwa/plugins/olas/tui/__init__.py,sha256=5ZRsbC7J3z1xfkZRiwr4bLEklf78rNVjdswe2p7SlS8,28
 iwa/plugins/olas/tui/olas_view.py,sha256=qcPxhurDPJjHWln6R64ZVAJ2h82IXzw48unhRvQVZqQ,36448
@@ -143,14 +143,14 @@ iwa/web/routers/olas/funding.py,sha256=f8fADNtbZEBFl-vuVKfas6os38Vot6K5tJBTenZmC
 iwa/web/routers/olas/general.py,sha256=dPsBQppTGoQY1RztliUhseOHOZGeeCR10lhThD9kyXo,803
 iwa/web/routers/olas/services.py,sha256=IpjvkpJeCwREbdHt47gov-fvTl9bY4EBUmZZZEHi3iI,16310
 iwa/web/routers/olas/staking.py,sha256=N1pMcPjhpfSPi7Sl7XIIAPoFxf0hptdvkUqkTtgqPcc,12424
-iwa/web/static/app.js,sha256=BCpAp1BcFVcfEfqXa-9gOtjb-8YlV5NIPWgSeCchD1E,113472
+iwa/web/static/app.js,sha256=CWm_TR2nKSDe8z0-nUQp7VaBHIGJg7mAOU-XJDveFsk,113487
 iwa/web/static/index.html,sha256=q7s7plnMbN1Nkzr5bRxZgvgOFerUChEGIZW7SpAVtPc,28514
 iwa/web/static/style.css,sha256=aTtE42mmfYV6y7xfo9cUgUhT8x-KyNC1zmPjSdskxIk,24315
 iwa/web/tests/test_web_endpoints.py,sha256=C264MH-CTyDW4GLUrTXBgLJKUk4-89pFAScBddd4Fvk,23995
 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.12.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.14.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,11 +159,11 @@ 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=naDz3WNrB8J3hAcId8of8R4_jN0vEWMC28-70hQEU_s,17240
+tests/test_chain.py,sha256=z3Mo9mHNQZ0aXSlrHUcdtNgGqsNyOwWYQAmmKa_dqiM,17221
 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
-tests/test_contract.py,sha256=MuL9dI_EJXo7hNiapUPNqmP87LRh3_HluAtOEGEWyus,14116
+tests/test_contract.py,sha256=EP0dJzViJn0Hbqw3hkCN6nygx5O1v2-DH7Lu8iDBACM,14235
 tests/test_db.py,sha256=dmbrupj0qlUeiiycZ2mzMFjf7HrDa6tcqMPY8zpiKIk,5710
 tests/test_drain_coverage.py,sha256=jtN5tIXzSTlS2IjwLS60azyMYsjFDlSTUa98JM1bMic,6786
 tests/test_erc20.py,sha256=kNEw1afpm5EbXRNXkjpkBNZIy7Af1nqGlztKH5IWAwU,3074
@@ -181,6 +181,7 @@ tests/test_plugin_service.py,sha256=ZEe37kV_sv4Eb04032O1hZIoo9yf5gJo83ks7Grzrng,
 tests/test_pricing.py,sha256=ptu_2Csc6d64bIzMMw3TheJge2Kfn05Gs-twz_KmBzg,5276
 tests/test_rate_limiter.py,sha256=DOIlrBP2AtVFHCpznIoFn2FjFc33emG7M_FffLh4MGE,7314
 tests/test_reset_tenderly.py,sha256=GVoqbDT3n4_GnlKF5Lx-8ew15jT8I2hIPdTulQDb6dI,7215
+tests/test_rpc_rotation.py,sha256=YU21TrMnEbcb36zu_L8dpCSbaHX7CkqXLjipz1swkkc,10554
 tests/test_rpc_view.py,sha256=sgZ53KEHl8VGb7WKYa0VI7Cdxbf8JH1SdroHYbWHjfQ,2031
 tests/test_safe_coverage.py,sha256=g9Bdrpkc-Mc8HBjk07lYNRkzxWZiF922uiVLZqhehBE,5093
 tests/test_safe_service.py,sha256=nxDYmGd6p2gGe7BEeMxsqS8CgeJarPofV38HC6Cop44,5770
@@ -201,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.12.dist-info/METADATA,sha256=4V-Vxvi5u3z7CGm5nROLqsdmPLD-aFYJtzpo9Jl21Ow,7295
-iwa-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iwa-0.0.12.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.12.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.12.dist-info/RECORD,,
+iwa-0.0.14.dist-info/METADATA,sha256=7Ymm-F6pLqq7zyN1r-5FQAfLhhtEDzjpPpgGuMf1-Vo,7295
+iwa-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iwa-0.0.14.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.14.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.14.dist-info/RECORD,,

tests/test_chain.py

@@ -340,10 +340,10 @@ def test_chain_interface_with_real_chains():
             sym = interface.get_token_symbol(valid_addr_1)
             assert sym == "SYM"
 
-        # get_token_decimals uses web3.eth.contract directly, not ERC20Contract
+        # get_token_decimals uses web3._web3.eth.contract directly
         mock_contract = MagicMock()
         mock_contract.functions.decimals.return_value.call.return_value = 18
-        interface.web3.eth.contract.return_value = mock_contract
+        interface.web3._web3.eth.contract.return_value = mock_contract
 
         dec = interface.get_token_decimals(valid_addr_1)
         assert dec == 18
@@ -443,8 +443,8 @@ def test_get_token_decimals_fallback_on_error(mock_web3):
 
     ci = ChainInterface(chain)
 
-    # get_token_decimals uses web3.eth.contract directly, mock it to raise error
-    ci.web3.eth.contract.side_effect = Exception("Contract not found")
+    # get_token_decimals uses web3._web3.eth.contract directly
+    ci.web3._web3.eth.contract.side_effect = Exception("Contract not found")
 
     decimals = ci.get_token_decimals("0x1234567890123456789012345678901234567890")
 

tests/test_contract.py

@@ -11,7 +11,8 @@ from iwa.core.contracts.contract import ContractInstance
 def mock_chain_interface():
     with patch("iwa.core.contracts.contract.ChainInterfaces") as mock:
         mock_ci = mock.return_value.get.return_value
-        mock_ci.web3.eth.contract.return_value = MagicMock()
+        # contract.py now uses web3._web3.eth.contract directly for RPC rotation compatibility
+        mock_ci.web3._web3.eth.contract.return_value = MagicMock()
         yield mock_ci
 
 
@@ -226,7 +227,7 @@ def test_call_reevaluates_contract_on_retry(mock_chain_interface, mock_abi_file)
             mock.functions.testFunc.return_value.call.return_value = "success"
         return mock
 
-    mock_chain_interface.web3.eth.contract.side_effect = counting_contract_factory
+    mock_chain_interface.web3._web3.eth.contract.side_effect = counting_contract_factory
 
     # Implement with_retry that actually retries on 429
     def real_with_retry(fn, max_retries=6, operation_name="operation"):
@@ -274,7 +275,7 @@ def test_call_uses_fresh_provider_after_rotation(mock_chain_interface, mock_abi_
         provider_versions.append(current_provider_version[0])
         return mock
 
-    mock_chain_interface.web3.eth.contract.side_effect = mock_contract_factory
+    mock_chain_interface.web3._web3.eth.contract.side_effect = mock_contract_factory
 
     # Simulate RPC rotation by incrementing provider version
     def simulate_rotation():
@@ -335,7 +336,7 @@ def test_call_with_429_triggers_retry_with_new_contract(mock_chain_interface, mo
         contract_call_count[0] += 1
         return result
 
-    mock_chain_interface.web3.eth.contract.side_effect = mock_contract_factory
+    mock_chain_interface.web3._web3.eth.contract.side_effect = mock_contract_factory
 
     # Implement with_retry that actually retries
     def real_with_retry(fn, max_retries=6, operation_name="operation"):

tests/test_rpc_rotation.py

@@ -0,0 +1,287 @@
+"""Comprehensive RPC rotation tests.
+
+These tests verify that RPC rotation works correctly when rate limit errors occur,
+ensuring that after rotation, requests actually go to the new RPC.
+"""
+
+from unittest.mock import MagicMock, PropertyMock, patch
+
+import pytest
+
+from iwa.core.chain import ChainInterface, SupportedChain
+
+
+class MockHTTPError(Exception):
+    """Mock HTTP 429 error with URL info."""
+
+    def __init__(self, url: str):
+        self.url = url
+        super().__init__(f"429 Client Error: Too Many Requests for url: {url}")
+
+
+@pytest.fixture
+def multi_rpc_chain():
+    """Create a chain with multiple RPCs for testing rotation."""
+    chain = MagicMock(spec=SupportedChain)
+    chain.name = "TestChain"
+    chain.rpcs = [
+        "https://rpc1.example.com",
+        "https://rpc2.example.com",
+        "https://rpc3.example.com",
+        "https://rpc4.example.com",
+        "https://rpc5.example.com",
+    ]
+    chain.chain_id = 1
+    chain.native_currency = "ETH"
+    chain.tokens = {}
+    type(chain).rpc = PropertyMock(return_value=chain.rpcs[0])
+    return chain
+
+
+@pytest.fixture
+def mock_web3_factory():
+    """Factory to create mock Web3 instances that track their RPC URL."""
+
+    def create_mock_web3(rpc_url: str):
+        mock = MagicMock()
+        mock.provider.endpoint_uri = rpc_url
+        mock.eth.block_number = 12345
+        return mock
+
+    return create_mock_web3
+
+
+def test_rpc_rotation_basic(multi_rpc_chain):
+    """Test that RPC rotation cycles through all available RPCs."""
+    with patch("iwa.core.chain.interface.RateLimitedWeb3", side_effect=lambda w3, rl, ci: w3):
+        ci = ChainInterface(multi_rpc_chain)
+
+        # Should start at index 0
+        assert ci._current_rpc_index == 0
+
+        # Rotate through all RPCs
+        for expected_index in [1, 2, 3, 4, 0, 1]:  # Wraps around
+            result = ci.rotate_rpc()
+            assert result is True
+            assert ci._current_rpc_index == expected_index
+
+
+def test_rpc_rotation_updates_provider():
+    """Test that after rotation, set_backend is called to update the provider.
+
+    The current implementation uses set_backend() to hot-swap the underlying
+    Web3 instance rather than creating a new RateLimitedWeb3 wrapper.
+    """
+    chain = MagicMock(spec=SupportedChain)
+    chain.name = "TestChain"
+    chain.rpcs = ["https://rpc1.example.com", "https://rpc2.example.com"]
+    type(chain).rpc = PropertyMock(return_value=chain.rpcs[0])
+
+    set_backend_calls = []
+
+    class MockRateLimitedWeb3:
+        def __init__(self, w3, rl, ci):
+            self._web3 = w3
+            self.set_backend = MagicMock(side_effect=lambda new_w3: set_backend_calls.append(new_w3))
+
+        def __getattr__(self, name):
+            return getattr(self._web3, name)
+
+    with patch("iwa.core.chain.interface.Web3") as mock_web3_class:
+        with patch("iwa.core.chain.interface.RateLimitedWeb3", MockRateLimitedWeb3):
+            # Make Web3 return a mock with the correct provider URL
+            def create_web3_mock(provider):
+                mock = MagicMock()
+                mock.provider = provider
+                return mock
+
+            mock_web3_class.side_effect = create_web3_mock
+            mock_web3_class.HTTPProvider = lambda url, **kwargs: MagicMock(endpoint_uri=url)
+
+            ci = ChainInterface(chain)
+
+            # Initially no set_backend calls
+            assert len(set_backend_calls) == 0
+
+            # Rotate
+            ci.rotate_rpc()
+
+            # After rotation, set_backend should have been called
+            assert len(set_backend_calls) == 1
+            # And it should have been called with a new Web3 instance
+            assert set_backend_calls[0].provider.endpoint_uri == "https://rpc2.example.com"
+
+
+def test_rate_limit_triggers_rotation(multi_rpc_chain):
+    """Test that a 429 rate limit error triggers RPC rotation."""
+    with patch("iwa.core.chain.interface.RateLimitedWeb3", side_effect=lambda w3, rl, ci: w3):
+        ci = ChainInterface(multi_rpc_chain)
+
+        initial_index = ci._current_rpc_index
+        assert initial_index == 0
+
+        # Simulate a rate limit error
+        error = MockHTTPError("https://rpc1.example.com")
+        result = ci._handle_rpc_error(error)
+
+        # Should have detected rate limit and rotated
+        assert result["is_rate_limit"] is True
+        assert result["rotated"] is True
+        assert result["should_retry"] is True
+        assert ci._current_rpc_index == 1
+
+
+def test_with_retry_rotates_on_rate_limit(multi_rpc_chain):
+    """Test that with_retry properly rotates RPC on rate limit and succeeds on new RPC."""
+    with patch("iwa.core.chain.interface.RateLimitedWeb3", side_effect=lambda w3, rl, ci: w3):
+        ci = ChainInterface(multi_rpc_chain)
+
+        call_count = 0
+        rpc_indices_seen = []
+
+        def flaky_operation():
+            nonlocal call_count
+            call_count += 1
+            rpc_indices_seen.append(ci._current_rpc_index)
+
+            # Fail on first RPC, succeed on second
+            if ci._current_rpc_index == 0:
+                raise MockHTTPError(ci.chain.rpcs[0])
+            return "success"
+
+        with patch("time.sleep"):  # Skip actual delays
+            result = ci.with_retry(flaky_operation, operation_name="test_operation")
+
+        assert result == "success"
+        assert 0 in rpc_indices_seen  # Started on RPC 0
+        assert 1 in rpc_indices_seen  # Rotated to RPC 1
+        assert ci._current_rpc_index == 1  # Ended on RPC 1
+
+
+def test_with_retry_exhausts_all_rpcs_then_backs_off(multi_rpc_chain):
+    """Test that when all RPCs fail, we trigger backoff."""
+    with patch("iwa.core.chain.interface.RateLimitedWeb3", side_effect=lambda w3, rl, ci: w3):
+        ci = ChainInterface(multi_rpc_chain)
+
+        # All RPCs fail
+        def always_fail():
+            raise MockHTTPError(ci.chain.rpcs[ci._current_rpc_index])
+
+        with patch("time.sleep"):
+            with pytest.raises(MockHTTPError):
+                ci.with_retry(always_fail, max_retries=6, operation_name="doomed_operation")
+
+        # Should have rotated through multiple RPCs
+        assert ci._current_rpc_index > 0
+
+
+def test_rotation_applies_to_subsequent_calls():
+    """Test that after rotation, subsequent method calls use the new RPC.
+
+    This is the critical test - verifying that the fix for the RPC rotation
+    bug actually works. After rotation, calls should go to the new RPC.
+    """
+    chain = MagicMock(spec=SupportedChain)
+    chain.name = "TestChain"
+    chain.rpcs = ["https://rpc1.example.com", "https://rpc2.example.com"]
+    type(chain).rpc = PropertyMock(return_value=chain.rpcs[0])
+
+    with patch("iwa.core.chain.interface.Web3") as mock_web3_class:
+        # Track which provider is being used for each call
+        current_provider_url = ["https://rpc1.example.com"]
+
+        def create_web3(provider):
+            mock = MagicMock()
+            mock.provider = provider
+
+            # eth.get_balance should use the current provider
+            def mock_get_balance(addr):
+                return f"balance_from_{current_provider_url[0]}"
+
+            mock.eth.get_balance = mock_get_balance
+            mock.eth.block_number = 12345
+            return mock
+
+        def create_provider(url, **kwargs):
+            prov = MagicMock()
+            prov.endpoint_uri = url
+            current_provider_url[0] = url
+            return prov
+
+        mock_web3_class.side_effect = create_web3
+        mock_web3_class.HTTPProvider = create_provider
+
+        with patch(
+            "iwa.core.chain.interface.RateLimitedWeb3", side_effect=lambda w3, rl, ci: w3
+        ):
+            ci = ChainInterface(chain)
+
+            # First call uses RPC 1
+            result1 = ci.web3.eth.get_balance("0xtest")
+            assert "rpc1" in result1
+
+            # Rotate to RPC 2
+            ci.rotate_rpc()
+
+            # Second call should use RPC 2
+            result2 = ci.web3.eth.get_balance("0xtest")
+            assert "rpc2" in result2
+
+
+def test_contract_uses_current_provider_after_rotation():
+    """Test that ContractInstance.contract property recreates contract each time.
+
+    This verifies the contract property doesn't cache and always
+    uses the current provider.
+    """
+    # This is a simplified test that verifies the contract property
+    # creates a new contract each time it's accessed
+    from pathlib import Path
+
+    from iwa.core.contracts.contract import ContractInstance
+
+    # Mock a minimal chain interface
+    mock_web3 = MagicMock()
+    mock_web3._web3.eth.contract = MagicMock()
+
+    mock_chain_interface = MagicMock()
+    mock_chain_interface.web3 = mock_web3
+
+    # Create a ContractInstance with mocked dependencies
+    with patch("iwa.core.chain.ChainInterfaces") as mock_interfaces:
+        mock_interfaces.return_value.get.return_value = mock_chain_interface
+
+        # Mock the ABI loading
+        mock_abi = [{"type": "function", "name": "test", "inputs": [], "outputs": []}]
+
+        with patch("builtins.open", MagicMock()):
+            with patch("json.load", return_value=mock_abi):
+                # Need to mock abi_path for ContractInstance
+                with patch.object(ContractInstance, "abi_path", Path("/fake/path.json")):
+                    with patch.object(ContractInstance, "load_error_selectors", return_value={}):
+                        instance = ContractInstance.__new__(ContractInstance)
+                        instance.address = "0x1234567890123456789012345678901234567890"
+                        instance.abi = mock_abi
+                        instance.chain_interface = mock_chain_interface
+                        instance._contract_cache = None
+                        instance.error_selectors = {}
+
+                        # Access contract property twice
+                        # The key test: verify it calls web3._web3.eth.contract each time
+                        _ = instance.contract
+                        _ = instance.contract
+
+                        # Should have called contract() twice (no caching)
+                        assert mock_web3._web3.eth.contract.call_count == 2
+
+
+def test_single_rpc_no_rotation(multi_rpc_chain):
+    """Test that rotation returns False when there's only one RPC."""
+    multi_rpc_chain.rpcs = ["https://only-one.example.com"]
+
+    with patch("iwa.core.chain.interface.RateLimitedWeb3", side_effect=lambda w3, rl, ci: w3):
+        ci = ChainInterface(multi_rpc_chain)
+
+        result = ci.rotate_rpc()
+        assert result is False
+        assert ci._current_rpc_index == 0