ipor-fusion 4.0.0.dev149__tar.gz → 4.0.0.dev151__tar.gz

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.0.0.dev149
+Version: 4.0.0.dev151
 Summary: The IPOR Fusion SDK for Python
 Project-URL: homepage, https://ipor.io
 Project-URL: repository, https://github.com/IPOR-Labs/ipor-fusion.py

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/examples/advanced_euler_v2_credit_market_base.py

@@ -72,7 +72,7 @@ from ipor_fusion.fuses import (
     euler_substrate,
 )
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import MAX_UINT256, Amount, ChainId, MarketId, Period
+from ipor_fusion.types import MAX_UINT256, Amount, ChainId, Period
 
 log = logging.getLogger("advanced_euler_v2_credit_market_base")
 
@@ -83,7 +83,7 @@ log = logging.getLogger("advanced_euler_v2_credit_market_base")
 # deployments -- see their note below.
 
 BASE_CHAIN_ID = ChainId(8453)
-EULER_MARKET = MarketId(IporFusionMarkets.EULER_V2)
+EULER_MARKET = IporFusionMarkets.EULER_V2
 
 # IporFusionFactoryProxy on Base. Its clone(...) takes the six args in clone_args().
 BASE_FUSION_FACTORY = Web3.to_checksum_address(

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/examples/advanced_euler_v2_looping_arbitrum.py

@@ -61,7 +61,7 @@ from ipor_fusion.fuses import (
     euler_substrate,
 )
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, MarketId, Period
+from ipor_fusion.types import Amount, ChainId, Period
 
 log = logging.getLogger("advanced_euler_v2_looping_arbitrum")
 
@@ -71,9 +71,9 @@ log = logging.getLogger("advanced_euler_v2_looping_arbitrum")
 # mainnet-arbitrum-fusion/addresses.json
 
 ARBITRUM_CHAIN_ID = ChainId(42161)
-EULER_MARKET = MarketId(IporFusionMarkets.EULER_V2)
-SWAPPER_MARKET = MarketId(IporFusionMarkets.UNIVERSAL_TOKEN_SWAPPER_V2)
-MORPHO_FLASH_MARKET = MarketId(IporFusionMarkets.MORPHO_FLASH_LOAN)
+EULER_MARKET = IporFusionMarkets.EULER_V2
+SWAPPER_MARKET = IporFusionMarkets.UNIVERSAL_TOKEN_SWAPPER_V2
+MORPHO_FLASH_MARKET = IporFusionMarkets.MORPHO_FLASH_LOAN
 
 ARBITRUM_FUSION_FACTORY = Web3.to_checksum_address(
     "0x134fCAce7a2C7Ef3dF2479B62f03ddabAEa922d5"

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/examples/composed_hypercore_flow_arbitrum_hyperevm.py

@@ -113,7 +113,6 @@ from ipor_fusion.types import (
     Decimals,
     HyperCoreAsset,
     HyperCoreClientOrderId,
-    MarketId,
     Period,
     Shares,
 )
@@ -162,7 +161,7 @@ HYPERCORE_BALANCE_FUSE = parse_fuse_address(
     "0xaC7404Ec2Bc3F2d3c0853633e0c3edfA25DC50F9"
 )
 HYPERCORE_MARKET = IporFusionMarkets.HYPERCORE
-CROSSCHAIN_MARKET = MarketId(int(IporFusionMarkets.CROSSCHAIN))
+CROSSCHAIN_MARKET = IporFusionMarkets.CROSSCHAIN
 
 # ── Actors ───────────────────────────────────────────────────────────────────
 # One EOA holds the alpha role on both vaults in this test deployment; the two

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/examples/crosschain_ccip_usdc_arbitrum_hyperevm.py

@@ -86,7 +86,7 @@ from ipor_fusion import (
     parse_plasma_vault_address,
 )
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, Decimals, MarketId, Period, Shares
+from ipor_fusion.types import Amount, ChainId, Decimals, Period, Shares
 
 log = logging.getLogger("crosschain_ccip_usdc_arbitrum_hyperevm")
 
@@ -123,7 +123,7 @@ EXECUTOR = Web3.to_checksum_address("0xcb83A78BD8e8c284d5704B62945EF2C454266dB0"
 SPOKE_VAULT = parse_plasma_vault_address("0xA342eBA00bD725799828A34EA55D25a55958f643")
 # ``IporFusionMarkets.CROSSCHAIN``: the market the four crosschain fuses are
 # registered under on the hub vault.
-CROSSCHAIN_MARKET = MarketId(int(IporFusionMarkets.CROSSCHAIN))
+CROSSCHAIN_MARKET = IporFusionMarkets.CROSSCHAIN
 
 # ── Actors ───────────────────────────────────────────────────────────────────
 # Role separation: the alpha is an online, least-privilege key that can only

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/examples/external_state_margin_leg_base.py

@@ -96,7 +96,7 @@ from ipor_fusion import (
 )
 from ipor_fusion.fuses import ExternalStateOperationFuse
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, MarketId, Period, ProposalHash, Shares
+from ipor_fusion.types import Amount, ChainId, Period, ProposalHash, Shares
 
 log = logging.getLogger("external_state_margin_leg_base")
 
@@ -121,7 +121,7 @@ BASE_FUSION_FACTORY = Web3.to_checksum_address(
 BASE_USDC = Web3.to_checksum_address("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913")
 
 # External-state market (IporFusionMarkets.EXTERNAL_STATE).
-EXTERNAL_STATE_MARKET = MarketId(IporFusionMarkets.EXTERNAL_STATE)
+EXTERNAL_STATE_MARKET = IporFusionMarkets.EXTERNAL_STATE
 
 # External-state *operation* fuse (enter/exit) -- the functional fuse. It also
 # lazily deploys the per-vault ExternalStateExecutor on the first enter.

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/examples/simple_aave_v3_supply_base.py

@@ -53,7 +53,7 @@ from ipor_fusion import (
 )
 from ipor_fusion.fuses import AaveV3SupplyFuse
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, MarketId, Period
+from ipor_fusion.types import Amount, ChainId, Period
 
 log = logging.getLogger("simple_aave_v3_supply_base")
 
@@ -75,7 +75,7 @@ BASE_FUSION_FACTORY = Web3.to_checksum_address(
 BASE_USDC = Web3.to_checksum_address("0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913")
 
 # Aave V3 market (IporFusionMarkets.AAVE_V3).
-AAVE_MARKET = MarketId(IporFusionMarkets.AAVE_V3)
+AAVE_MARKET = IporFusionMarkets.AAVE_V3
 
 # Aave V3 *supply* fuse (registry name SupplyFuseAaveV3) -- the functional fuse
 # that encodes supply/withdraw.

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/pyproject.toml

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

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/src/ipor_fusion/readers/hypercore.py

@@ -68,7 +68,7 @@ from ipor_fusion.types import (
 T = TypeVar("T")
 
 #: New HyperCore vaults use market 55; the abandoned pilot still keys 54.
-HYPERCORE_MARKET = MarketId(IporFusionMarkets.HYPERCORE)
+HYPERCORE_MARKET = IporFusionMarkets.HYPERCORE
 #: The only chain with the HyperCore precompiles.
 HYPEREVM_CHAIN_ID = ChainId(999)
 #: Known ``HyperCorePendingReader`` deployments per chain. The reader is a

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/_crosschain.py

@@ -46,7 +46,7 @@ from ipor_fusion import (
 from ipor_fusion.crosschain import CrosschainTransportKind
 from ipor_fusion.crosschain.fuses import crosschain_market_id
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import ChainId
+from ipor_fusion.types import ChainId, MarketId
 
 ETHEREUM = ChainId(1)
 BASE = ChainId(8453)
@@ -292,7 +292,7 @@ class Deployment:
     owner: str  # holds ATOMIST, ALPHA, FUSE_MANAGER and UPDATE_MARKETS_BALANCES
     balance_proposer: str
     balance_approver: str
-    market_id: int
+    market_id: MarketId
     transports: dict[CrosschainTransportKind, TransportDeployment]
     claim_fuse: str
     spokes: tuple[Spoke, ...]
@@ -407,7 +407,7 @@ CANARY = Deployment(
     balance_approver=Web3.to_checksum_address(
         "0x64D345FE416EE6b841B544F27277d9B61b61A02a"
     ),
-    market_id=int(IporFusionMarkets.CROSSCHAIN),
+    market_id=IporFusionMarkets.CROSSCHAIN,
     transports={
         CrosschainTransportKind.CHAINLINK_CCIP: TransportDeployment(
             executor=Web3.to_checksum_address(

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/_euler_v2.py

@@ -36,7 +36,7 @@ from ipor_fusion.fuses import (
     euler_substrate,
 )
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, MarketId, Period
+from ipor_fusion.types import Amount, Period
 
 ZERO_ADDRESS = Web3.to_checksum_address("0x0000000000000000000000000000000000000000")
 
@@ -98,7 +98,7 @@ SUPPLY_AMOUNT = Amount(10 * 10**18)
 OWNER = Web3.to_checksum_address("0x533ac556E288625B267bD71B7928E0a8B46DcE82")
 
 SUB_ACCOUNT = 0x01
-EULER_MARKET = MarketId(IporFusionMarkets.EULER_V2)
+EULER_MARKET = IporFusionMarkets.EULER_V2
 
 # Uniswap-v4 hook-flag constraint on the pool address (EulerSwap v2):
 # low 14 bits must equal exactly beforeInitialize|beforeAddLiquidity|beforeSwap|

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/test_cli_helpers.py

@@ -1859,7 +1859,7 @@ class TestFetchAavePools:
         ctx = MagicMock()
         morpho_only = [
             BalanceFuse(
-                market_id=MarketId(IporFusionMarkets.MORPHO),
+                market_id=IporFusionMarkets.MORPHO,
                 fuse=self._FUSES[IporFusionMarkets.MORPHO],
             )
         ]

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/test_cli_vault_info_golden.py

@@ -43,7 +43,7 @@ from ipor_fusion.core.plasma_vault import BalanceFuse, PlasmaVault
 from ipor_fusion.market_ids import IporFusionMarkets
 from ipor_fusion.readers.lending_health import LendingMarketHealth, VaultLendingHealth
 from ipor_fusion.readers.unpriceable import MiddlewarePricedToken
-from ipor_fusion.types import ChainId, MarketId, Shares
+from ipor_fusion.types import ChainId, Shares
 from ipor_fusion.vault_data import (
     GET_TOTAL_SUPPLY_CAP,
     VaultData,
@@ -74,10 +74,10 @@ FUSE_AAVE_DUP = _addr("f4")
 FUSE_ORPHAN = _addr("f5")
 PRICE_SOURCE = _addr("5e")
 
-AAVE = MarketId(IporFusionMarkets.AAVE_V3)
-MORPHO = MarketId(IporFusionMarkets.MORPHO)
-ERC20_MARKET = MarketId(IporFusionMarkets.ERC20_VAULT_BALANCE)
-ORPHAN_MARKET = MarketId(IporFusionMarkets.COMPOUND_V3_USDC)
+AAVE = IporFusionMarkets.AAVE_V3
+MORPHO = IporFusionMarkets.MORPHO
+ERC20_MARKET = IporFusionMarkets.ERC20_VAULT_BALANCE
+ORPHAN_MARKET = IporFusionMarkets.COMPOUND_V3_USDC
 
 USDC = 10**6
 WAD = 10**18

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/test_simulate_vault_from_scratch_base.py

@@ -40,7 +40,7 @@ from ipor_fusion import (
 from ipor_fusion.core import FusionFactory
 from ipor_fusion.fuses import AaveV3SupplyFuse
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, MarketId
+from ipor_fusion.types import Amount, ChainId
 
 logging.basicConfig(level=logging.INFO)
 log = logging.getLogger(__name__)
@@ -54,7 +54,7 @@ BASE_FUSION_FACTORY = Web3.to_checksum_address(
 # works since validation=False lets us impersonate it.
 OWNER = Web3.to_checksum_address("0x533ac556E288625B267bD71B7928E0a8B46DcE82")
 
-AAVE_MARKET = MarketId(IporFusionMarkets.AAVE_V3)
+AAVE_MARKET = IporFusionMarkets.AAVE_V3
 ONE_YEAR_SECONDS = 365 * 24 * 3600
 
 # --- deployment-specific values (BASE mainnet) ------------------------------

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/test_unpriceable_tokens.py

@@ -13,7 +13,6 @@ from ipor_fusion.readers.unpriceable import (
     MiddlewarePricedToken,
     fetch_unpriceable_priced_tokens,
 )
-from ipor_fusion.types import MarketId
 from ipor_fusion.validation import _unpriceable_token_findings
 
 
@@ -244,15 +243,13 @@ class TestFetch:
     def test_aave_v3_only_the_middleware_variant(self, chain, code, flagged):
         chain.ctx.web3.eth.get_code.return_value = code
         chain.answers.update(_oracle_answers({UNPRICED: ZERO}, priced=set()))
-        market = MarketId(IporFusionMarkets.AAVE_V3)
+        market = IporFusionMarkets.AAVE_V3
         result = _fetch(
             chain,
             {market: [_plain(UNPRICED)]},
             balance_fuses=[
                 BalanceFuse(market_id=market, fuse=AAVE_FUSE),
-                BalanceFuse(
-                    market_id=MarketId(IporFusionMarkets.MORPHO), fuse=AAVE_FUSE
-                ),
+                BalanceFuse(market_id=IporFusionMarkets.MORPHO, fuse=AAVE_FUSE),
             ],
         )
         assert bool(result) is flagged

{ipor_fusion-4.0.0.dev149 → ipor_fusion-4.0.0.dev151}/tests/test_validation.py

@@ -34,7 +34,7 @@ from ipor_fusion import (
 from ipor_fusion.cache import NullCache
 from ipor_fusion.core.oracle import price_oracle_middleware
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import ChainId, MarketId
+from ipor_fusion.types import ChainId
 from ipor_fusion.validation import GET_MARKET_SUBSTRATES, Reconciliation
 from ipor_fusion.vault_data import VaultData, _MarketReads
 from ipor_fusion.vault_erc20 import _Asset, _erc20_holdings, _read_erc20_market
@@ -51,9 +51,9 @@ TOKEN = _addr("b1")
 OTHER = _addr("b2")
 FUSE = _addr("f1")
 ORPHAN_FUSE = _addr("f5")
-AAVE = MarketId(IporFusionMarkets.AAVE_V3)
-MORPHO = MarketId(IporFusionMarkets.MORPHO)
-ERC20_MARKET = MarketId(IporFusionMarkets.ERC20_VAULT_BALANCE)
+AAVE = IporFusionMarkets.AAVE_V3
+MORPHO = IporFusionMarkets.MORPHO
+ERC20_MARKET = IporFusionMarkets.ERC20_VAULT_BALANCE
 WAD = 10**18