eth-protocols-py 0.1.5.dev1__tar.gz → 0.1.6.dev1__tar.gz

{eth_protocols_py-0.1.5.dev1 → eth_protocols_py-0.1.6.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-protocols-py
-Version: 0.1.5.dev1
+Version: 0.1.6.dev1
 Requires-Python: >=3.10
 Requires-Dist: eth_rpc_py
 Requires-Dist: eth_typeshed_py

{eth_protocols_py-0.1.5.dev1 → eth_protocols_py-0.1.6.dev1}/src/eth_protocols/helpers/dex_pairs.py

@@ -5,6 +5,7 @@ from eth_protocols.uniswap_v2 import V2Pair
 from eth_protocols.uniswap_v3 import V3Pool
 from eth_rpc.types.primitives import uint24
 from eth_typeshed.camelot_v3 import CamelotV3Factory
+from eth_typeshed.camelot_v3 import CamelotV3Pool as CamelotV3PoolContract
 from eth_typeshed.camelot_v3 import GetPoolRequest as CamelotGetPoolRequest
 from eth_typeshed.constants import Factories, Tokens
 from eth_typeshed.erc20 import OwnerRequest
@@ -24,79 +25,88 @@ class DexPairHelper(BaseModel):
         addr: HexAddress,
         paired_with: HexAddress,
         fee_tiers: list[int],
-        uniswap_v2_factory_address: HexAddress,
-        uniswap_v3_factory_address: HexAddress,
+        factories: list[HexAddress],
     ):
         addr = to_checksum_address(addr)
         paired_with = to_checksum_address(paired_with)
-        calls_list = [
-            (
-                UniswapV2Factory(address=uniswap_v2_factory_address).get_pair(
-                    GetPairRequest(token_a=addr, token_b=paired_with)
-                ),
-                lambda result, addr=addr, paired_with=paired_with: (
-                    data.setdefault(addr, []).append(
-                        V2Pair.load_static(
-                            pair_address=result,
-                            tokena=addr,
-                            tokenb=paired_with,
-                        )
-                    )
-                ),
-            ),
-        ]
 
-        for fee in fee_tiers:
-            calls_list.extend(
-                [
+        for factory in factories:
+            if (
+                factory == Factories.for_network().UniswapV2
+                or factory == Factories.for_network().pod_factory
+            ):
+                calls_list = [
                     (
-                        UniswapV3Factory(address=uniswap_v3_factory_address).get_pool(
-                            GetPoolRequest(
-                                token_a=addr,
-                                token_b=paired_with,
-                                fee=uint24(fee),
-                            )
+                        UniswapV2Factory(address=factory).get_pair(
+                            GetPairRequest(token_a=addr, token_b=paired_with)
                         ),
-                        lambda result, addr=addr, paired_with=paired_with, fee=fee: (  # type: ignore
+                        lambda result, addr=addr, paired_with=paired_with: (
                             data.setdefault(addr, []).append(
-                                V3Pool.load_static(
+                                V2Pair.load_static(
+                                    pair_address=result,
                                     tokena=addr,
                                     tokenb=paired_with,
-                                    pair_address=result,
-                                    fee=fee,
                                 )
                             )
                         ),
                     ),
                 ]
-            )
-        if uniswap_v3_factory_address == Factories.Arbitrum.Camelot_V3:
-            calls_list.extend(
-                [
-                    (
-                        CamelotV3Factory(
-                            address=uniswap_v3_factory_address
-                        ).pool_by_pair(
-                            CamelotGetPoolRequest(token_a=addr, token_b=paired_with)
-                        ),
-                        lambda result, addr=addr, paired_with=paired_with: (  # type: ignore
-                            data.setdefault(addr, []).append(
-                                CamelotV3Pool.load_static(
-                                    tokena=addr, tokenb=paired_with, pair_address=result
+
+            if factory == Factories.for_network().UniswapV3:
+                for fee in fee_tiers:
+                    calls_list.extend(
+                        [
+                            (
+                                UniswapV3Factory(
+                                    address=uniswap_v3_factory_address
+                                ).get_pool(
+                                    GetPoolRequest(
+                                        token_a=addr,
+                                        token_b=paired_with,
+                                        fee=uint24(fee),
+                                    )
+                                ),
+                                lambda result, addr=addr, paired_with=paired_with, fee=fee: (  # type: ignore
+                                    data.setdefault(addr, []).append(
+                                        V3Pool.load_static(
+                                            tokena=addr,
+                                            tokenb=paired_with,
+                                            pair_address=result,
+                                            fee=fee,
+                                        )
+                                    )
+                                ),
+                            ),
+                        ]
+                    )
+            if factories == Factories.Arbitrum.Camelot_V3:
+                calls_list.extend(
+                    [
+                        (
+                            CamelotV3Factory(
+                                address=uniswap_v3_factory_address
+                            ).pool_by_pair(
+                                CamelotGetPoolRequest(token_a=addr, token_b=paired_with)
+                            ),
+                            lambda result, addr=addr, paired_with=paired_with: (  # type: ignore
+                                data.setdefault(addr, []).append(
+                                    CamelotV3Pool.load_static(
+                                        tokena=addr,
+                                        tokenb=paired_with,
+                                        pair_address=result,
+                                    )
                                 )
-                            )
+                            ),
                         ),
-                    ),
-                ]
-            )
+                    ]
+                )
         return calls_list
 
     @staticmethod
     async def find_all_pairs(
         addresses: list[HexAddress],
         find_pairs: list[HexAddress] = Tokens.for_network().main,
-        uniswap_v2_factory_address: HexAddress = Factories.for_network().UniswapV2,
-        uniswap_v3_factory_address: HexAddress = Factories.for_network().UniswapV3,
+        factories: list[HexAddress] = Factories.for_network().all_factories,
         fee_tiers: list[int] = [500, 3000, 10000],
         block_number: int | None = None,
     ) -> dict[HexAddress, list[V2Pair | V3Pool]]:
@@ -112,8 +122,7 @@ class DexPairHelper(BaseModel):
                         addr,
                         paired_with,
                         fee_tiers,
-                        uniswap_v2_factory_address,
-                        uniswap_v3_factory_address,
+                        factories,
                     )
                 )
         await try_execute_with_setters(
@@ -125,8 +134,7 @@ class DexPairHelper(BaseModel):
     @staticmethod
     async def find_all_stables_pairs(
         find_pairs: list[HexAddress] = Tokens.for_network().main,
-        uniswap_v2_factory_address: HexAddress = Factories.for_network().UniswapV2,
-        uniswap_v3_factory_address: HexAddress = Factories.for_network().UniswapV3,
+        factories=Factories.for_network().all_factories,
         fee_tiers: list[int] = [500, 3000, 10000],
         block_number: int | None = None,
     ) -> dict[HexAddress, list[V2Pair | V3Pool]]:
@@ -166,7 +174,7 @@ class DexPairHelper(BaseModel):
                         (
                             UniswapV2Pair(address=pair.pair_address).get_reserves(),
                             lambda result, pair=pair: (
-                                pair.set_reserves(result[0], result[1])
+                                pair.set_reserves(result.reserve0, result.reserve1)
                             ),
                         )
                     )
@@ -249,6 +257,61 @@ class DexPairHelper(BaseModel):
                             lambda result, pair=pair: (pair.token1.set_symbol(result)),
                         )
                     )
+
+                elif isinstance(pair, CamelotV3Pool):
+                    calls_with_setters.append(
+                        (
+                            CamelotV3PoolContract(
+                                address=pair.pair_address
+                            ).global_state(),
+                            lambda result, pair=pair: (pair.set_global_state(result)),
+                        )
+                    )
+                    calls_with_setters.append(
+                        (
+                            pair.token0.raw.balance_of(
+                                OwnerRequest(owner=pair.pair_address)
+                            ),
+                            lambda result, pair=pair: (pair.set_reserve0(result)),
+                        )
+                    )
+                    calls_with_setters.append(
+                        (
+                            pair.token1.raw.balance_of(
+                                OwnerRequest(owner=pair.pair_address)
+                            ),
+                            lambda result, pair=pair: (pair.set_reserve1(result)),
+                        )
+                    )
+                    calls_with_setters.append(
+                        (
+                            pair.token0.raw.decimals(),
+                            lambda result, pair=pair: (
+                                pair.token0.set_decimals(result)
+                            ),
+                        )
+                    )
+                    calls_with_setters.append(
+                        (
+                            pair.token0.raw.symbol(),
+                            lambda result, pair=pair: (pair.token0.set_symbol(result)),
+                        )
+                    )
+                    calls_with_setters.append(
+                        (
+                            pair.token1.raw.decimals(),
+                            lambda result, pair=pair: (
+                                pair.token1.set_decimals(result)
+                            ),
+                        )
+                    )
+                    calls_with_setters.append(
+                        (
+                            pair.token1.raw.symbol(),
+                            lambda result, pair=pair: (pair.token1.set_symbol(result)),
+                        )
+                    )
+
         await try_execute_with_setters(
             calls_with_setters, block_number=block_number or "latest"
         )

{eth_protocols_py-0.1.5.dev1 → eth_protocols_py-0.1.6.dev1}/src/eth_protocols_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-protocols-py
-Version: 0.1.5.dev1
+Version: 0.1.6.dev1
 Requires-Python: >=3.10
 Requires-Dist: eth_rpc_py
 Requires-Dist: eth_typeshed_py