ypricemagic 4.6.20.dev0__tar.gz → 4.6.22.dev0__tar.gz

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/.github/workflows/mypy.yaml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        pyversion: [ "3.9", "3.10", "3.11", "3.12" ]
+        pyversion: [ "3.10", "3.11", "3.12" ]
 
     steps:
     - uses: actions/checkout@v2

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/.github/workflows/pytest.yaml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        pyversion: [ "3.9", "3.10" ]
+        pyversion: [ "3.10", "3.11", "3.12" ]
         network: [ mainnet, bsc-main, polygon-main, ftm-main, arbitrum-main, optimism-main ]
         include:
         - os: ubuntu-latest

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/.github/workflows/release.yaml

@@ -41,15 +41,6 @@ jobs:
             cibw_archs_linux: x86_64
             artifact_name: "wheels-ubuntu-latest-musllinux-x64"
 
-          # ----------------------------------------------------
-          # musllinux 32-bit
-          # ----------------------------------------------------
-          - os: ubuntu-latest
-            build_type: musllinux-x86
-            cibw_build: "*musllinux*"
-            cibw_archs_linux: i686
-            artifact_name: "wheels-ubuntu-latest-musllinux-x86"
-
           # ----------------------------------------------------
           # macOS (64-bit only)
           # ----------------------------------------------------
@@ -129,7 +120,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine mypy[mypyc]
+          pip install setuptools wheel twine mypy[mypyc] types-cachetools types-python-dateutil types-requests
 
       - name: Build sdist
         run: |
@@ -156,12 +147,6 @@ jobs:
           name: "wheels-ubuntu-latest-musllinux-x64"
           path: wheelhouse/linux-musl-x64
 
-      - name: Download musllinux 32-bit wheels
-        uses: actions/download-artifact@v4
-        with:
-          name: "wheels-ubuntu-latest-musllinux-x86"
-          path: wheelhouse/linux-musl-x86
-
       - name: Download macOS wheels
         uses: actions/download-artifact@v4
         with:
@@ -193,7 +178,6 @@ jobs:
             wheelhouse/linux-many-x64/*.whl \
             wheelhouse/linux-many-x86/*.whl \
             wheelhouse/linux-musl-x64/*.whl \
-            wheelhouse/linux-musl-x86/*.whl \
             wheelhouse/macos/*.whl \
             wheelhouse/windows-x64/*.whl \
             wheelhouse/windows-x86/*.whl

{ypricemagic-4.6.20.dev0/ypricemagic.egg-info → ypricemagic-4.6.22.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ypricemagic
-Version: 4.6.20.dev0
+Version: 4.6.22.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
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.10,<3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 

ypricemagic-4.6.22.dev0/pyproject.toml

@@ -0,0 +1,14 @@
+[build-system]
+requires = [
+  "setuptools",
+  "wheel",
+  "mypy[mypyc]==1.17.0",
+  "types-python-dateutil",
+  "types-cachetools",
+  "types-requests",
+  "faster-eth-abi>=5.2.1,<6",
+  "eth-typing==4.4.0",
+]
+
+[tool.black]
+line-length = 100

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/requirements.txt

@@ -4,9 +4,11 @@ cchecksum>=0.0.3
 checksum_dict>=2.1.10.dev0,<3
 dank_mids>=4.20.161
 eth-brownie>=1.21.0,<1.23
+eth-event>=1.4.0
 eth_retry>=0.2.1
 evmspec>=0.3.4
 ez-a-sync>=0.32.18,<1
+faster-eth-abi>=5.2.1,<6
 faster-eth-utils
 inflection>=0.1,<0.6
 joblib>=1.0.1

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/setup.py

@@ -12,9 +12,10 @@ try:
 
     ext_modules = mypycify(
         [
+            "y/_db/brownie.py",
+            "y/_db/config.py",
             "y/_db/decorators.py",
             "y/_db/utils/stringify.py",
-            "y/_db/config.py",
             "y/ENVIRONMENT_VARIABLES.py",
             "y/convert.py",
             "y/exceptions.py",
@@ -24,8 +25,6 @@ try:
             "--pretty",
             "--install-types",
             "--disable-error-code=import-not-found",
-            "--disable-error-code=import-untyped",
-            "--disable-error-code=no-any-return",
             "--disable-error-code=misc",
             "--disable-error-code=attr-defined",
             "--disable-error-code=return-value",
@@ -70,7 +69,7 @@ setup(
     author_email="bobthebuidlerdefi@gmail.com",
     url="https://github.com/BobTheBuidler/ypricemagic",
     license="MIT",
-    python_requires=">=3.9,<3.13",
+    python_requires=">=3.10,<3.13",
     classifiers=[
         "Intended Audience :: Developers",
         "Programming Language :: Python :: 3",

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/_db/brownie.py

@@ -1,17 +1,15 @@
+import hashlib
+import json
 from asyncio import Lock
-from hashlib import sha1
-from json import dumps, loads
 from pathlib import Path
-from typing import Any, Container, Dict, Literal, Optional, Tuple
+from typing import Any, Callable, Container, Dict, Final, Literal, Optional, Tuple, final
 
 import aiosqlite
 from a_sync import SmartProcessingQueue
-from a_sync.async_property.cached import async_cached_property
 from brownie._config import CONFIG, _get_data_folder
 from brownie.exceptions import BrownieEnvironmentError
 from brownie.network.contract import _resolve_address
 from brownie.project.build import DEPLOYMENT_KEYS
-from eth_utils.toolz import keymap
 from functools import lru_cache
 from sqlite3 import InterfaceError, OperationalError
 
@@ -37,13 +35,31 @@ SourceKey = Literal[
     "type",
 ]
 
+# TODO: replace these with the typed dicts in brownie >=1.22
 BuildJson = Dict[str, Any]
 Sources = Dict[SourceKey, Any]
 
 
-SOURCE_KEYS: Tuple[SourceKey, ...] = SourceKey.__args__
+SOURCE_KEYS: Final = (
+    "address",
+    "alias",
+    "paths",
+    "abi",
+    "ast",
+    "bytecode",
+    "compiler",
+    "contractName",
+    "deployedBytecode",
+    "deployedSourceMap",
+    "language",
+    "natspec",
+    "opcodes",
+    "pcMap",
+    "sourceMap",
+    "type",
+)
 
-DISCARD_SOURCE_KEYS: Tuple[SourceKey, ...] = (
+DISCARD_SOURCE_KEYS: Final = (
     "ast",
     "bytecode",
     "coverageMap",
@@ -60,22 +76,39 @@ These keys will not be included in y.Contract object build data. If you need the
 """
 
 
-sqlite_lock = Lock()
+# C constants
+
+sha1: Final = hashlib.sha1
+
+dumps: Final = json.dumps
+loads: Final = json.loads
+
+sqlite_lock: Final = Lock()
 
 
+@final
 class AsyncCursor:
-    def __init__(self, filename):
-        self._filename = filename
+    def __init__(self, filename: Path) -> None:
+        self._filename: Final = filename
+        self._db: Optional[aiosqlite.Connection] = None
+        self._connected: bool = False
+        self._execute: Optional[Callable[..., aiosqlite.Cursor]] = None
 
-    @async_cached_property
-    async def connect(self):
+    async def connect(self) -> None:
         """Establish an async connection to the SQLite database"""
+        db = self._db  # must assign before checking to avoid a TypeError below
+        if db is not None:
+            raise RuntimeError("already connected")
         async with sqlite_lock:
+            if self._db is not None:
+                return
             self._db = await aiosqlite.connect(self._filename, isolation_level=None)
+            self._execute = self._db.execute
 
-    async def insert(self, table, *values):
+    async def insert(self, table: str, *values: Any) -> None:
         raise NotImplementedError
-        await self.connect
+        if self._db is None:
+            await self.connect()
 
         # Convert any dictionaries/lists to JSON strings before inserting
         values = [dumps(val) if isinstance(val, (dict, list)) else val for val in values]
@@ -85,20 +118,23 @@ class AsyncCursor:
         query = f"INSERT OR REPLACE INTO {table} VALUES ({placeholders})"
 
         # Execute the query and commit the changes
-        async with self._db.execute(query, values):
+        async with self._execute(query, values):
             await self._db.commit()
 
-    async def fetchone(self, cmd: str, *args) -> Optional[Tuple]:
-        await self.connect
+    async def fetchone(self, cmd: str, *args: Any) -> Optional[Tuple[Any, ...]]:
+        if self._db is None:
+            await self.connect()
         async with sqlite_lock:
-            async with self._db.execute(cmd, args) as cursor:
-                if row := await cursor.fetchone():
-                    # Convert any JSON-serialized columns back to their original data structures
-                    return tuple(loads(i) if str(i).startswith(("[", "{")) else i for i in row)
+            async with self._execute(cmd, args) as cursor:
+                row = await cursor.fetchone()
+                if row is None:
+                    return None
+                # Convert any JSON-serialized columns back to their original data structures
+                return tuple(loads(i) if str(i).startswith(("[", "{")) else i for i in row)
 
 
-cur = AsyncCursor(_get_data_folder().joinpath("deployments.db"))
-fetchone = SmartProcessingQueue(cur.fetchone, num_workers=32)
+cur: Final = AsyncCursor(_get_data_folder().joinpath("deployments.db"))
+fetchone: Final = SmartProcessingQueue(cur.fetchone, num_workers=32)
 
 
 @lru_cache(maxsize=None)
@@ -110,8 +146,8 @@ def _get_select_statement() -> str:
 
 
 async def _get_deployment(
-    address: str = None,
-    alias: str = None,
+    address: Optional[str] = None,
+    alias: Optional[str] = None,
     skip_source_keys: Container[SourceKey] = DISCARD_SOURCE_KEYS,
 ) -> Tuple[Optional[BuildJson], Optional[Sources]]:
     if address and alias:
@@ -130,7 +166,7 @@ async def _get_deployment(
         return None, None
 
     build_json = dict(zip(SOURCE_KEYS, row))
-    path_map = build_json.pop("paths")
+    path_map: dict = build_json.pop("paths")
 
     sources = {
         source_key: await __fetch_source_for_hash(val)
@@ -139,8 +175,9 @@ async def _get_deployment(
     }
 
     build_json["allSourcePaths"] = {k: v[1] for k, v in path_map.items()}
-    if isinstance(build_json.get("pcMap"), dict):
-        build_json["pcMap"] = keymap(int, build_json["pcMap"])
+    pc_map: Optional[dict] = build_json.get("pcMap")
+    if pc_map is not None:
+        build_json["pcMap"] = {int(key): pc_map[key] for key in pc_map}
 
     return build_json, sources
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/_db/common.py

@@ -30,7 +30,7 @@ from a_sync import (
     CounterLock,
     PruningThreadPoolExecutor,
 )
-from async_property import async_property
+from async_property import async_property  # type: ignore [import-untyped]
 from brownie import ZERO_ADDRESS
 from dank_mids import BlockSemaphore
 from evmspec.data import Address, HexBytes32

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/monkey_patches.py

@@ -63,7 +63,7 @@ def monkey_patch_checksum_cache():
         pass
 
     try:
-        import ens.ens
+        import ens.ens  # type: ignore [import-untyped]
 
         ens.ens.to_checksum_address = y.convert.to_address
     except ModuleNotFoundError:
@@ -71,7 +71,7 @@ def monkey_patch_checksum_cache():
         pass
 
     try:
-        import ens.async_ens
+        import ens.async_ens  # type: ignore [import-untyped]
 
         ens.async_ens.to_checksum_address = y.convert.to_address
     except ModuleNotFoundError:

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/prices/dex/uniswap/v3.py

@@ -8,6 +8,7 @@ from typing import (
     AsyncIterator,
     DefaultDict,
     Dict,
+    Final,
     Iterable,
     List,
     Literal,
@@ -22,6 +23,7 @@ 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 faster_eth_abi.packed import encode_packed
 from typing_extensions import Self
 
 from y import convert
@@ -41,21 +43,17 @@ from y.interfaces.uniswap.quoterv3 import UNIV3_QUOTER_ABI
 from y.networks import Network
 from y.utils.events import ProcessedEvents
 
-try:
-    from eth_abi.packed import encode_packed
-except ImportError:
-    from eth_abi.packed import encode_abi_packed as encode_packed
 
 # https://github.com/Uniswap/uniswap-v3-periphery/blob/main/deploys.md
-UNISWAP_V3_FACTORY = "0x1F98431c8aD98523631AE4a59f267346ea31F984"
-UNISWAP_V3_QUOTER = "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6"
+UNISWAP_V3_FACTORY: Final = "0x1F98431c8aD98523631AE4a59f267346ea31F984"
+UNISWAP_V3_QUOTER: Final = "0xb27308f9F90D607463bb33eA1BeBb41C27CE5AB6"
 
-logger = getLogger(__name__)
+logger: Final = getLogger(__name__)
 
 Path = Iterable[Union[Address, int]]
 
 # same addresses on all networks
-addresses = {
+addresses: Final = {
     Network.Mainnet: {
         "factory": UNISWAP_V3_FACTORY,
         "quoter": UNISWAP_V3_QUOTER,
@@ -78,7 +76,7 @@ addresses = {
     },
 }
 
-forked_deployments = {
+forked_deployments: Final = {
     Network.Optimism: [
         {
             # Velodrome slipstream
@@ -97,9 +95,9 @@ forked_deployments = {
     ],
 }
 
-_FEE_DENOMINATOR = Decimal(1_000_000)
+_FEE_DENOMINATOR: Final = Decimal(1_000_000)
 
-_PATH_TYPE_STRINGS: Dict[int, Tuple[Literal["address", "uint24"], ...]] = {
+_PATH_TYPE_STRINGS: Final[Dict[int, Tuple[Literal["address", "uint24"], ...]]] = {
     3: tuple(islice(cycle(("address", "uint24")), 3)),
     5: tuple(islice(cycle(("address", "uint24")), 5)),
 }

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.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 eth_abi.exceptions import InvalidPointer
+from faster_eth_abi.exceptions import InvalidPointer
 from typing_extensions import Self
 from web3.exceptions import ContractLogicError
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/prices/synthetix.py

@@ -1,10 +1,11 @@
 import logging
-from typing import Callable, List, Optional
+from typing import Callable, Final, List, Optional, final
 
 import a_sync
 from a_sync import cgather
 from a_sync.a_sync import HiddenMethodDescriptor
 from eth_typing import ChecksumAddress, HexStr
+from faster_eth_abi import encode
 from multicall import Call
 from typing_extensions import Self
 
@@ -16,23 +17,20 @@ from y.exceptions import UnsupportedNetwork, call_reverted
 from y.networks import Network
 from y.utils import a_sync_ttl_cache
 
-try:
-    from eth_abi import encode
 
-    encode_bytes: Callable[[str], bytes] = lambda s: encode(["bytes32"], [s.encode()])
-except ImportError:
-    from eth_abi import encode_single
+logger: Final = logging.getLogger(__name__)
 
-    encode_bytes: Callable[[str], bytes] = lambda s: encode_single("bytes32", s.encode())
-
-logger = logging.getLogger(__name__)
-
-addresses = {
+addresses: Final = {
     Network.Mainnet: "0x823bE81bbF96BEc0e25CA13170F5AaCb5B79ba83",
     Network.Optimism: "0x95A6a3f44a70172E7d50a9e28c85Dfd712756B8C",
 }
 
 
+def encode_bytes(s: str) -> bytes:
+    return encode(["bytes32"], [s.encode()])
+
+
+@final
 class Synthetix(a_sync.ASyncGenericSingleton):
     """A class to interact with the Synthetix protocol.
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/utils/cache.py

@@ -9,7 +9,7 @@ import eth_retry
 from a_sync._typing import AnyFn, P, T
 from a_sync.a_sync.function import ASyncDecorator
 from brownie import chain
-from joblib import Memory
+from joblib import Memory  # type: ignore [import-untyped]
 
 from y import ENVIRONMENT_VARIABLES as ENVS
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/utils/events.py

@@ -27,7 +27,7 @@ import dank_mids
 import eth_retry
 from a_sync import igather
 from a_sync.executor import _AsyncExecutorMixin
-from async_property import async_property
+from async_property import async_property  # type: ignore [import-untyped]
 from brownie import web3
 from brownie.network.event import (
     _EventItem,
@@ -37,10 +37,9 @@ from brownie.network.event import (
     EventDict,
 )
 from eth_typing import ChecksumAddress
-from eth_utils.toolz import concat
+from eth_utils.toolz import concat, groupby
 from evmspec import Log
 from msgspec.structs import force_setattr
-from toolz import groupby
 from web3.middleware.filter import block_ranges
 from web3.types import LogReceipt
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/utils/logging.py

@@ -7,7 +7,7 @@ from weakref import WeakValueDictionary, ref as weak_ref
 import a_sync
 from brownie import chain
 from eth_typing import BlockNumber, ChecksumAddress
-from lazy_logging import LazyLoggerFactory
+from lazy_logging import LazyLoggerFactory  # type: ignore [import-untyped]
 from typing_extensions import ParamSpec
 
 from y.datatypes import AnyAddressType, Block

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/y/utils/multicall.py

@@ -6,7 +6,7 @@ import a_sync
 import brownie
 import dank_mids
 from a_sync import igather
-from eth_abi.exceptions import InsufficientDataBytes
+from faster_eth_abi.exceptions import InsufficientDataBytes
 from multicall import Call
 from web3.exceptions import CannotHandleRequest
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0/ypricemagic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ypricemagic
-Version: 4.6.20.dev0
+Version: 4.6.22.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
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.10,<3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 

{ypricemagic-4.6.20.dev0 → ypricemagic-4.6.22.dev0}/ypricemagic.egg-info/requires.txt

@@ -4,9 +4,11 @@ cchecksum>=0.0.3
 checksum_dict<3,>=2.1.10.dev0
 dank_mids>=4.20.161
 eth-brownie<1.23,>=1.21.0
+eth-event>=1.4.0
 eth_retry>=0.2.1
 evmspec>=0.3.4
 ez-a-sync<1,>=0.32.18
+faster-eth-abi<6,>=5.2.1
 faster-eth-utils
 inflection<0.6,>=0.1
 joblib>=1.0.1

ypricemagic-4.6.22.dev0/ypricemagic.egg-info/top_level.txt

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

ypricemagic-4.6.20.dev0/pyproject.toml

@@ -1,5 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel", "mypy[mypyc]==1.17.0"]
-
-[tool.black]
-line-length = 100

ypricemagic-4.6.20.dev0/ypricemagic.egg-info/top_level.txt

@@ -1,3 +0,0 @@
-e48b665766e5f62102a4__mypyc
-y
-ypricemagic