ypricemagic 4.6.31.dev0__tar.gz → 4.7.2.dev0__tar.gz

{ypricemagic-4.6.31.dev0/ypricemagic.egg-info → ypricemagic-4.7.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ypricemagic
-Version: 4.6.31.dev0
+Version: 4.7.2.dev0
 Summary: Use this tool to extract historical on-chain price data from an archive node. Shoutout to @bantg and @nymmrx for their awesome work on yearn-exporter that made this library possible.
 Home-page: https://github.com/BobTheBuidler/ypricemagic
 Author: BobTheBuidler

{ypricemagic-4.6.31.dev0 → ypricemagic-4.7.2.dev0}/y/prices/dex/uniswap/v3.py

@@ -22,7 +22,7 @@ import eth_retry
 from a_sync import igather
 from a_sync.a_sync import HiddenMethodDescriptor
 from brownie.network.event import _EventItem
-from eth_typing import ChecksumAddress, HexAddress
+from eth_typing import BlockNumber, ChecksumAddress, HexAddress
 from faster_eth_abi.packed import encode_packed
 from typing_extensions import Self
 
@@ -115,7 +115,7 @@ class UniswapV3Pool(ContractBase):
         token1: Address,
         tick_spacing: int,
         fee: int,
-        deploy_block: int,
+        deploy_block: BlockNumber,
         asynchronous: bool = False,
     ) -> None:
         """
@@ -666,7 +666,9 @@ class UniswapV3(a_sync.ASyncGenericBase):
 
     @stuck_coro_debugger
     @eth_retry.auto_retry
-    async def _quote_exact_input(self, path: Path, amount_in: int, block: int) -> Optional[Decimal]:
+    async def _quote_exact_input(
+        self, path: Path, amount_in: int, block: BlockNumber
+    ) -> Optional[Decimal]:
         """
         Quote the exact input for a given path and amount.
 
@@ -690,15 +692,23 @@ class UniswapV3(a_sync.ASyncGenericBase):
             amount = await quoter.quoteExactInput.coroutine(
                 _encode_path(path), amount_in, block_identifier=block
             )
-            return (
-                # Quoter v2 uses this weird return struct, we must unpack it to get amount out.
-                (amount if isinstance(amount, int) else amount[0])
-                / _undo_fees(path)
-                / _FEE_DENOMINATOR
-            )
         except Exception as e:
-            if not call_reverted(e):
-                raise
+            if call_reverted(e):
+                return None
+            raise
+
+        scaled = (
+            # Quoter v2 uses this weird return struct, we must unpack it to get amount out.
+            (amount if isinstance(amount, int) else amount[0])
+            / _undo_fees(path)
+            / _FEE_DENOMINATOR
+        )
+        if scaled > 100_000_000:
+            # this is a totally arbitrary value used as a sense check,
+            # we were getting crazy prices from some pools on occasion
+            # but not sure why
+            return None
+        return round(scaled, 18)
 
 
 def _encode_path(path: Path) -> bytes:

{ypricemagic-4.6.31.dev0 → ypricemagic-4.7.2.dev0}/y/prices/stable_swap/curve.py

@@ -14,7 +14,7 @@ from brownie import ZERO_ADDRESS
 from brownie.convert.datatypes import EthAddress
 from brownie.exceptions import ContractNotFound, EventLookupError
 from brownie.network.event import _EventItem
-from faster_eth_abi.exceptions import InvalidPointer
+from faster_eth_abi.exceptions import InsufficientDataBytes, InvalidPointer
 from typing_extensions import Self
 from web3.exceptions import ContractLogicError
 
@@ -457,8 +457,11 @@ class CurvePool(ERC20):
             factory = await self.__factory__
             source = factory or await curve.__registry__
             balances = await source.get_balances.coroutine(self.address, block_identifier=block)
-        except (ContractLogicError, ValueError):
-            # ContractLogicError in web3>=6.0, ValueError in <6.0
+        except (ContractLogicError, ValueError, InsufficientDataBytes):
+            # ContractLogicError in web3>=6.0, ValueError in <6.0,
+            # InsufficientDataBytes sometimes too, not sure why.
+            # Potentially related to https://github.com/ethereum/eth-abi/pull/247
+
             # fallback for historical queries where registry was not yet deployed
             balances = await a_sync.map(self._get_balance, range(len(coins)), block=block).values(
                 pop=True

{ypricemagic-4.6.31.dev0 → ypricemagic-4.7.2.dev0/ypricemagic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ypricemagic
-Version: 4.6.31.dev0
+Version: 4.7.2.dev0
 Summary: Use this tool to extract historical on-chain price data from an archive node. Shoutout to @bantg and @nymmrx for their awesome work on yearn-exporter that made this library possible.
 Home-page: https://github.com/BobTheBuidler/ypricemagic
 Author: BobTheBuidler

{ypricemagic-4.6.31.dev0 → ypricemagic-4.7.2.dev0}/ypricemagic.egg-info/SOURCES.txt

@@ -179,8 +179,6 @@ y/utils/logging.py
 y/utils/middleware.py
 y/utils/multicall.py
 y/utils/raw_calls.py
-ypricemagic/__init__.py
-ypricemagic/magic.py
 ypricemagic.egg-info/PKG-INFO
 ypricemagic.egg-info/SOURCES.txt
 ypricemagic.egg-info/dependency_links.txt

{ypricemagic-4.6.31.dev0 → ypricemagic-4.7.2.dev0}/ypricemagic.egg-info/top_level.txt

@@ -1,3 +1,2 @@
 839fc216801717d47e67__mypyc
 y
-ypricemagic

ypricemagic-4.6.31.dev0/ypricemagic/__init__.py

@@ -1,12 +0,0 @@
-import os
-
-from brownie import network
-
-if not network.is_connected():
-    try:
-        network_name = os.environ["BROWNIE_NETWORK_ID"]
-    except KeyError:
-        raise KeyError(
-            "In order to use pricemagic outside of a brownie project directory, you will need to set $BROWNIE_NETWORK_ID environment variable with the id of your preferred brownie network connection."
-        )
-    network.connect(network_name)

ypricemagic-4.6.31.dev0/ypricemagic/magic.py

@@ -1,45 +0,0 @@
-import logging
-from typing import Optional
-
-from y import magic
-from y.datatypes import AnyAddressType, Block, UsdPrice
-
-logger = logging.getLogger(__name__)
-
-
-def get_price(token: AnyAddressType, block: Optional[Block] = None) -> UsdPrice:
-    """
-    Retrieve the USD price of a given token at a specific block.
-
-    This function serves as a wrapper around `y.magic.get_price` and provides a warning
-    about the migration from `ypricemagic` to `y`. The `y` module offers the same functionality
-    with additional features.
-
-    .. warning::
-        `ypricemagic` is in the process of being migrated to `y`.
-        `y` can do all of the same old stuff you expect, plus some new stuff you may or may not need.
-        This method still works for now, but will be removed soon.
-        Please update your scripts to use `y.magic.get_price(token, block)`.
-
-    Args:
-        token: The address of the token to get the price for.
-        block: The block number to get the price at. If not provided, the latest block is used.
-
-    Examples:
-        >>> from ypricemagic.magic import get_price
-        >>> price = get_price("0x6B175474E89094C44Da98b954EedeAC495271d0F")
-        >>> print(price)
-
-        >>> price_at_block = get_price("0x6B175474E89094C44Da98b954EedeAC495271d0F", block=12345678)
-        >>> print(price_at_block)
-
-    See Also:
-        - :func:`y.magic.get_price` for the recommended function to use.
-    """
-    logger.warning(
-        "ypricemagic is in the process of being migrated to y."
-        "y can do all of the same old stuff you expect, plus some new stuff you may or may not need."
-        "This method still works for now, but will be removed soon."
-        "Please update your scripts to use `y.magic.get_price(token, block)`."
-    )
-    return magic.get_price(token, block)