ipor-fusion 4.2.0.dev9__tar.gz → 4.2.0.dev11__tar.gz

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.2.0.dev9
+Version: 4.2.0.dev11
 Summary: The IPOR Fusion SDK for Python
 Project-URL: homepage, https://ipor.io
 Project-URL: repository, https://github.com/IPOR-Labs/ipor-fusion.py
@@ -520,7 +520,7 @@ Fuse.method()  -->  FuseAction  -->  PlasmaVault.execute([actions])  -->  Call
 | Euler V2 | `EulerV2SupplyFuse`, `EulerV2CollateralFuse`, `EulerV2ControllerFuse`, `EulerV2BorrowFuse`, `EulerV2BatchFuse`, `EulerV2SwapDeployFuse`, `EulerV2SwapReconfigureFuse`, `EulerV2SwapRegistryFuse` |
 | Uniswap V3 | `UniswapV3SwapFuse`, `UniswapV3NewPositionFuse`, `UniswapV3ModifyPositionFuse`, `UniswapV3CollectFuse` |
 | Ramses V2 | `RamsesV2NewPositionFuse`, `RamsesV2ModifyPositionFuse`, `RamsesV2CollectFuse`, `RamsesClaimFuse` |
-| Compound V3 | `CompoundV3SupplyFuse` |
+| Compound V3 | `CompoundV3SupplyFuse`, `CompoundV3BorrowFuse`, `CompoundV3ClaimFuse` |
 | Gearbox V3 | `GearboxSupplyFuse`, `GearboxStakeFuse` |
 | ERC-4626 | `ERC4626SupplyFuse` |
 | Fluid Instadapp | `FluidInstadappSupplyFuse`, `FluidInstadappStakingFuse` |

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/README.md

@@ -471,7 +471,7 @@ Fuse.method()  -->  FuseAction  -->  PlasmaVault.execute([actions])  -->  Call
 | Euler V2 | `EulerV2SupplyFuse`, `EulerV2CollateralFuse`, `EulerV2ControllerFuse`, `EulerV2BorrowFuse`, `EulerV2BatchFuse`, `EulerV2SwapDeployFuse`, `EulerV2SwapReconfigureFuse`, `EulerV2SwapRegistryFuse` |
 | Uniswap V3 | `UniswapV3SwapFuse`, `UniswapV3NewPositionFuse`, `UniswapV3ModifyPositionFuse`, `UniswapV3CollectFuse` |
 | Ramses V2 | `RamsesV2NewPositionFuse`, `RamsesV2ModifyPositionFuse`, `RamsesV2CollectFuse`, `RamsesClaimFuse` |
-| Compound V3 | `CompoundV3SupplyFuse` |
+| Compound V3 | `CompoundV3SupplyFuse`, `CompoundV3BorrowFuse`, `CompoundV3ClaimFuse` |
 | Gearbox V3 | `GearboxSupplyFuse`, `GearboxStakeFuse` |
 | ERC-4626 | `ERC4626SupplyFuse` |
 | Fluid Instadapp | `FluidInstadappSupplyFuse`, `FluidInstadappStakingFuse` |

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ipor-fusion"
-version = "4.2.0.dev9"
+version = "4.2.0.dev11"
 description = "The IPOR Fusion SDK for Python"
 authors = [
     { name = "Adam Mydlarz", email = "amydlarz@gmail.com" },

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/src/ipor_fusion/__init__.py

@@ -171,6 +171,8 @@ from ipor_fusion.fuses import (
     AaveV3SupplyFuse,
     AsyncActionFuse,
     AsyncActionSubstrates,
+    CompoundV3BorrowFuse,
+    CompoundV3ClaimFuse,
     CompoundV3SupplyFuse,
     ERC4626SupplyFuse,
     EulerSwapDynamicParams,
@@ -656,6 +658,8 @@ __all__ = [
     "UniswapV3NewPositionEvent",
     "UniswapV3ClosePositionEvent",
     "UniswapV3Events",
+    "CompoundV3BorrowFuse",
+    "CompoundV3ClaimFuse",
     "CompoundV3SupplyFuse",
     "RamsesV2NewPositionFuse",
     "RamsesV2ModifyPositionFuse",

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/src/ipor_fusion/fuses/__init__.py

@@ -1,7 +1,11 @@
 from ipor_fusion.fuses.aave_v3 import AaveV3BorrowFuse, AaveV3SupplyFuse
 from ipor_fusion.fuses.async_action import AsyncActionFuse, AsyncActionSubstrates
 from ipor_fusion.fuses.base import Fuse, FuseAction, StakeFuse
-from ipor_fusion.fuses.compound_v3 import CompoundV3SupplyFuse
+from ipor_fusion.fuses.compound_v3 import (
+    CompoundV3BorrowFuse,
+    CompoundV3ClaimFuse,
+    CompoundV3SupplyFuse,
+)
 from ipor_fusion.fuses.erc4626 import ERC4626SupplyFuse
 from ipor_fusion.fuses.euler_v2 import (
     EulerSwapDynamicParams,
@@ -112,6 +116,8 @@ __all__ = [
     "UniswapV3NewPositionEvent",
     "UniswapV3ClosePositionEvent",
     "UniswapV3Events",
+    "CompoundV3BorrowFuse",
+    "CompoundV3ClaimFuse",
     "CompoundV3SupplyFuse",
     "RamsesV2NewPositionFuse",
     "RamsesV2ModifyPositionFuse",

ipor_fusion-4.2.0.dev11/src/ipor_fusion/fuses/compound_v3.py

@@ -0,0 +1,62 @@
+from eth_typing import ChecksumAddress
+
+from ipor_fusion.fuses.base import Fuse, FuseAction
+from ipor_fusion.types import Amount
+
+
+class CompoundV3SupplyFuse(Fuse):
+    """Fuse for supplying and withdrawing assets on Compound V3."""
+
+    SIGNATURES = (
+        "enter((address,uint256))",
+        "exit((address,uint256))",
+    )
+
+    def supply(self, *, asset: ChecksumAddress, amount: Amount) -> FuseAction:
+        self._validate_address(asset, "asset")
+        self._validate_amount(amount, "amount")
+        return self._action_raw("enter((address,uint256))", [[asset, amount]])
+
+    def withdraw(self, *, asset: ChecksumAddress, amount: Amount) -> FuseAction:
+        self._validate_address(asset, "asset")
+        self._validate_amount(amount, "amount")
+        return self._action_raw("exit((address,uint256))", [[asset, amount]])
+
+
+class CompoundV3BorrowFuse(Fuse):
+    """Fuse for borrowing and repaying the base token of a Comet.
+
+    The fuse is bound to one Comet, whose base token is the only asset it can
+    borrow, so neither action names an asset; the base token must be granted as
+    a substrate of the fuse's market. A repay is capped at the debt, so
+    ``MAX_UINT256`` repays in full.
+    """
+
+    SIGNATURES = (
+        "enter((uint256))",
+        "exit((uint256))",
+    )
+
+    def borrow(self, *, amount: Amount) -> FuseAction:
+        self._validate_amount(amount, "amount")
+        return self._action_raw("enter((uint256))", [[amount]])
+
+    def repay(self, *, amount: Amount) -> FuseAction:
+        self._validate_amount(amount, "amount")
+        return self._action_raw("exit((uint256))", [[amount]])
+
+
+class CompoundV3ClaimFuse(Fuse):
+    """Fuse for claiming a Comet's rewards to the vault's rewards claim manager.
+
+    The fuse is bound to one ``CometRewards``. Route the action through
+    ``RewardsManager.claim_rewards(...)``, not ``PlasmaVault.execute(...)``, and
+    register the fuse with ``RewardsManager.add_reward_fuses(...)`` first. A
+    Comet with no reward token configured reverts ``NotSupported(address)``.
+    """
+
+    SIGNATURES = ("claim(address)",)
+
+    def claim(self, *, comet: ChecksumAddress) -> FuseAction:
+        self._validate_address(comet, "comet")
+        return self._action_raw("claim(address)", [comet])

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/src/ipor_fusion/market_ids.py

@@ -106,6 +106,10 @@ class IporFusionMarkets:
     # Substrate type: HyperCoreSubstrateLib (1 SpotToken, 2 PerpMarket,
     # 3 Destination, 4 Builder, 5 Config, 6 SendCap, 7 PerpPositionCap).
     HYPERCORE = MarketId(55)
+    # Compound V3 Institutional USDC (ciUSDCv3) on Ethereum: its own Comet, so
+    # the Compound V3 fuses are deployed again under this id; substrates: asset
+    # addresses, as for COMPOUND_V3_USDC
+    COMPOUND_V3_INSTITUTIONAL_USDC = MarketId(57)
     # POL unstaking via sPOLController. The out-of-band id is baked into the
     # deployed fuses as an immutable (424243 = 0x67933), so it must match the
     # deployments. Substrates per IporFusionMarkets.sol: the sPOLController

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/src/ipor_fusion/readers/compound_v3.py

@@ -19,3 +19,14 @@ class CompoundV3Reader(ContractWrapper):
             output_types=["uint256"],
             decoder=Amount,
         )
+
+    def collateral_balance_of(
+        self, account: ChecksumAddress, asset: ChecksumAddress
+    ) -> Call[Amount]:
+        return self._view(
+            "collateralBalanceOf(address,address)",
+            account,
+            asset,
+            output_types=["uint128"],
+            decoder=Amount,
+        )

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/src/ipor_fusion/readers/lending_health.py

@@ -132,6 +132,7 @@ UNSUPPORTED_BORROW_MARKET_IDS = frozenset(
         IporFusionMarkets.MOONWELL,
         IporFusionMarkets.SILO_V2,
         IporFusionMarkets.EBISU,
+        IporFusionMarkets.COMPOUND_V3_INSTITUTIONAL_USDC,
     }
 )
 _UNSUPPORTED_REASON = "no lending health reader for this market"

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/src/ipor_fusion/substrates.py

@@ -527,6 +527,7 @@ _register_markets(
         37,
         44,  # SPARK_LEND — reuses AaveV3SupplyFuse (isSubstrateAsAssetGranted)
         46,  # NAPIER — isSubstrateAsAssetGranted, plain asset addresses
+        57,  # COMPOUND_V3_INSTITUTIONAL_USDC — same Compound V3 fuses as market 2
         *range(100_001, 100_021),  # ERC4626_0001 .. ERC4626_0020
     ],
     _decode_plain_address,

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/tests/constants.py

@@ -164,3 +164,21 @@ ETHEREUM_MORPHO_FLASH_LOAN_FUSE = Web3.to_checksum_address(
 ETHEREUM_MORPHO_CLAIM_FUSE = Web3.to_checksum_address(
     "0x6820df665ba09fbbd3240aa303421928ef4c71a1"
 )
+
+# Compound V3 Institutional USDC (market 57), ipor-abi names
+# SupplyFuseCompoundV3InstitutionalUsdc and so on
+ETHEREUM_COMPOUND_V3_INSTITUTIONAL_USDC_SUPPLY_FUSE = Web3.to_checksum_address(
+    "0xe7CaDa548534973b9d6A4124bBC476b586d1b3e4"
+)
+ETHEREUM_COMPOUND_V3_INSTITUTIONAL_USDC_BORROW_FUSE = Web3.to_checksum_address(
+    "0xff1762A6579787c7eab2E4f55A502F7c36714eF6"
+)
+ETHEREUM_COMPOUND_V3_INSTITUTIONAL_USDC_BALANCE_FUSE = Web3.to_checksum_address(
+    "0x5dF0CB1cE5159De1efb8038B5185E4612fAd9168"
+)
+ETHEREUM_COMPOUND_V3_INSTITUTIONAL_USDC_CLAIM_FUSE = Web3.to_checksum_address(
+    "0x77271931d24fDEE453C9fb9394F475D3431D80e2"
+)
+ETHEREUM_ERC20_BALANCE_FUSE = Web3.to_checksum_address(
+    "0x6cEBf3e3392D0860Ed174402884b941DCBB30654"
+)

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/tests/test_cli_lending_health.py

@@ -1306,6 +1306,7 @@ class TestUnsupportedBorrowMarkets:
             IporFusionMarkets.MOONWELL,
             IporFusionMarkets.SILO_V2,
             IporFusionMarkets.EBISU,
+            IporFusionMarkets.COMPOUND_V3_INSTITUTIONAL_USDC,
         ],
     )
     def test_borrow_capable_market_is_unreadable_not_absent(self, market_id):

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/tests/test_fuse_encoding.py

@@ -11,7 +11,11 @@ from ipor_fusion.core.fuse_action import FuseAction
 from ipor_fusion.fuses.aave_v3 import AaveV3BorrowFuse, AaveV3SupplyFuse
 from ipor_fusion.fuses.async_action import AsyncActionFuse, AsyncActionSubstrates
 from ipor_fusion.fuses.base import Fuse
-from ipor_fusion.fuses.compound_v3 import CompoundV3SupplyFuse
+from ipor_fusion.fuses.compound_v3 import (
+    CompoundV3BorrowFuse,
+    CompoundV3ClaimFuse,
+    CompoundV3SupplyFuse,
+)
 from ipor_fusion.fuses.erc4626 import ERC4626SupplyFuse
 from ipor_fusion.fuses.euler_v2 import (
     EulerSwapDynamicParams,
@@ -406,6 +410,38 @@ class TestCompoundV3SupplyFuse:
         assert action.data[:4] == _selector("exit((address,uint256))")
 
 
+class TestCompoundV3BorrowFuse:
+    def test_borrow(self):
+        action = CompoundV3BorrowFuse(FUSE_ADDR).borrow(amount=4000)
+        assert action.data[:4] == _selector("enter((uint256))")
+        assert decode(["uint256"], action.data[4:]) == (4000,)
+
+    def test_repay(self):
+        action = CompoundV3BorrowFuse(FUSE_ADDR).repay(amount=MAX_UINT256)
+        assert action.data[:4] == _selector("exit((uint256))")
+        assert decode(["uint256"], action.data[4:]) == (MAX_UINT256,)
+
+    @pytest.mark.parametrize("bad_amount", [0, -1])
+    def test_rejects_bad_amount(self, bad_amount):
+        fuse = CompoundV3BorrowFuse(FUSE_ADDR)
+        with pytest.raises(ValueError, match="amount"):
+            fuse.borrow(amount=bad_amount)
+        with pytest.raises(ValueError, match="amount"):
+            fuse.repay(amount=bad_amount)
+
+
+class TestCompoundV3ClaimFuse:
+    def test_claim(self):
+        action = CompoundV3ClaimFuse(FUSE_ADDR).claim(comet=TOKEN_A)
+        assert action.data[:4] == _selector("claim(address)")
+        (comet,) = decode(["address"], action.data[4:])
+        assert comet.lower() == TOKEN_A_LOW
+
+    def test_rejects_zero_comet(self):
+        with pytest.raises(ValueError, match="comet"):
+            CompoundV3ClaimFuse(FUSE_ADDR).claim(comet=ZERO_ADDR)
+
+
 # ── ERC4626 ─────────────────────────────────────────────────────────────
 
 

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/tests/test_public_api.py

@@ -90,6 +90,8 @@ _ALL_SNAPSHOT: dict[str, frozenset[str]] = {
             "Check",
             "CloneArgs",
             "CompoundV3Reader",
+            "CompoundV3BorrowFuse",
+            "CompoundV3ClaimFuse",
             "CompoundV3SupplyFuse",
             "ContextManager",
             "ContractCache",
@@ -859,6 +861,8 @@ _ALL_SNAPSHOT: dict[str, frozenset[str]] = {
             "AaveV3SupplyFuse",
             "AsyncActionFuse",
             "AsyncActionSubstrates",
+            "CompoundV3BorrowFuse",
+            "CompoundV3ClaimFuse",
             "CompoundV3SupplyFuse",
             "ERC4626SupplyFuse",
             "EXTERNAL_STATE_EVENTS",

{ipor_fusion-4.2.0.dev9 → ipor_fusion-4.2.0.dev11}/tests/test_reader_encoding.py

@@ -624,6 +624,14 @@ class TestCompoundV3Reader:
 
         assert result == Amount(7_500)
 
+    def test_collateral_balance_of(self):
+        reader, ctx = _make_reader(CompoundV3Reader)
+        ctx.call.return_value = encode(["uint128"], [9_000])
+
+        result = reader.collateral_balance_of(USER_ADDR, USER_ADDR).call(ctx)
+
+        assert result == Amount(9_000)
+
 
 # ── Uniswap V3 ────────────────────────────────────────────────────────