eth-portfolio-temp 0.0.33.dev0__cp310-cp310-win_amd64.whl → 0.0.35.dev0__cp310-cp310-win_amd64.whl

eth_portfolio/_shitcoins.py

@@ -88,6 +88,7 @@ shitcoins: Final = {
         "0xECF0dE4C8498Cfd686E4702D955426b22d812d6B",
         "0xF01f7A348681776c1FC9A066c6973882B693cdC6",
         "0x0e1CD6d2715432e4DBedFE969b0Eb2867FF61d5b",
+        "0x9aE357521153FB07bE6F5792CE7a49752638fbb7",
         # Generally looks like shit
         "0xDFC01a7956C0d151ae197274B974fA7527EbAFB9",
         "0xE256CF1C7caEff4383DabafEe6Dd53910F97213D",
@@ -216,6 +217,7 @@ shitcoins: Final = {
         "0xd27255AA153ae470419B0198fa61e892a612aFE8",
         "0xbADbe6619c0563c60E62C7409681440a80391a27",
         "0x89D3Ac7C32Aa14bEE6Fa90E041241dc4eEbbDFB3",
+        "0x640c6fdAfbDaC9bfCe79943890fdc98f8d39bE3e",
         # fake DAI
         "0xf84f908E78f9295b53883AD9ACa38F86d513f03F",
         "0x20Dd160716b0387220Eea7B9951bDb51B3728DC4",

eth_portfolio/buckets.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional, Set
+from typing import Final, Optional, Set
 
 from a_sync import igather
 from async_lru import alru_cache
@@ -16,10 +16,11 @@ from y.prices.yearn import YearnInspiredVault, is_yearn_vault
 from eth_portfolio.constants import BTC_LIKE, ETH_LIKE, INTL_STABLECOINS
 from eth_portfolio._stableish import STABLEISH_COINS
 
-logger = logging.getLogger(__name__)
+logger: Final = logging.getLogger(__name__)
+log_debug: Final = logger.debug
 
-SORT_AS_STABLES = STABLECOINS.keys() | STABLEISH_COINS[CHAINID]
-OTHER_LONG_TERM_ASSETS: Set[Address] = {}.get(CHAINID, set())
+SORT_AS_STABLES: Final = STABLECOINS.keys() | STABLEISH_COINS[CHAINID]
+OTHER_LONG_TERM_ASSETS: Final[Set[ChecksumAddress]] = {}.get(CHAINID, set())  # type: ignore [call-overload]
 
 
 async def get_token_bucket(token: AnyAddressType) -> str:
@@ -103,23 +104,31 @@ async def _unwrap_token(token) -> ChecksumAddress:
         - :class:`y.prices.lending.aave`
         - :class:`y.prices.lending.compound.CToken`
     """
+    log_debug("unwrapping %s", token)
     if str(token) in {"ETH", "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"}:
+        log_debug("returning eee address")
         return token
 
     if await is_yearn_vault(token, sync=False):
         underlying = await YearnInspiredVault(token, asynchronous=True).underlying
+        log_debug("underlying: %s", underlying)
         return await _unwrap_token(underlying)
     if curve and (pool := await curve.get_pool(token)):
         pool_tokens = set(await igather(map(_unwrap_token, await pool.coins)))
+        log_debug("pool_tokens: %s", pool_tokens)
         if pool_bucket := _pool_bucket(pool_tokens):
+            log_debug("returning pool bucket: %s", pool_bucket)
             return pool_bucket  # type: ignore
     if aave and await aave.is_atoken(token):
+        log_debug("atoken")
         return str(await aave.underlying(token))
     if compound and await compound.is_compound_market(token):
+        log_debug("unwrapping ctoken %s", token)
         try:
             return str(await CToken(token, asynchronous=True).underlying)
         except AttributeError:
             return WRAPPED_GAS_COIN
+    log_debug("returning: %s", token)
     return token
 
 
@@ -150,7 +159,7 @@ def _pool_bucket(pool_tokens: set) -> Optional[str]:
         - :data:`STABLECOINS`
         - :data:`INTL_STABLECOINS`
     """
-    logger.debug("Pool tokens: %s", pool_tokens)
+    log_debug("Pool tokens: %s", pool_tokens)
     if pool_tokens < BTC_LIKE:
         return list(BTC_LIKE)[0]
     if pool_tokens < ETH_LIKE:
@@ -182,4 +191,4 @@ def _is_stable(token: ChecksumAddress) -> bool:
         - :data:`INTL_STABLECOINS`
         - :data:`STABLEISH_COINS`
     """
-    return token in STABLECOINS or token in INTL_STABLECOINS or token in STABLEISH
+    return token in SORT_AS_STABLES or token in INTL_STABLECOINS

{eth_portfolio_temp-0.0.33.dev0.dist-info → eth_portfolio_temp-0.0.35.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.0.33.dev0
+Version: 0.0.35.dev0
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler

{eth_portfolio_temp-0.0.33.dev0.dist-info → eth_portfolio_temp-0.0.35.dev0.dist-info}/RECORD

@@ -1,22 +1,22 @@
-295eace8438df6ec133b__mypyc.cp310-win_amd64.pyd,sha256=hDIcyMIQAy_gce18-rydXrDXDsY1PZiUFbswn5YT-zk,287232
+295eace8438df6ec133b__mypyc.cp310-win_amd64.pyd,sha256=s3DD82qC54-s5SlZEhcOHbGKpgdlh0Wmvde7lQLnZa8,287744
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp310-win_amd64.pyd,sha256=QPh2p9sryvefQSEo1aEbPVh_l9IqnePktlIzrDJt_vw,10752
+eth_portfolio/_argspec.cp310-win_amd64.pyd,sha256=3PJXFEApJpEGj_5iO9b5wwJGVsFmzmfTAtWICQxC47M,10752
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp310-win_amd64.pyd,sha256=6MUkMoALKTUtQrPUIFQqOSSMpZih91HEs2szylIHFT0,10752
+eth_portfolio/_config.cp310-win_amd64.pyd,sha256=mhux1ugEFRqcFzuSuD3s0GxwnUEn3HRicEXshULHnDE,10752
 eth_portfolio/_config.py,sha256=BSOvFS4D0oqgVTtBbtW2g2kpL8Mk6xiP0PipfXs_91A,102
 eth_portfolio/_decimal.py,sha256=XhuxnVTAhJF6OILJ1MpbdwkAiy1D5NuS9jRmDRpCSYg,4886
 eth_portfolio/_decorators.py,sha256=AvB-q69MvaFe0Ykh1os6hSewcUujURQ9onqobMaONOM,2899
 eth_portfolio/_exceptions.py,sha256=xb5VmCtBtXy9WXu_1ofoG4j9BJsMQXMVydCJNUulrNY,2500
-eth_portfolio/_shitcoins.cp310-win_amd64.pyd,sha256=hqRXVUTEMpzKw2XqrGo0ms8X63cttvd7we12CfF8oWE,10752
-eth_portfolio/_shitcoins.py,sha256=Kx7OpfbV5SytD0EQdJLjd4LBlAIRcrsCH2kf-xmUZgA,14274
-eth_portfolio/_stableish.cp310-win_amd64.pyd,sha256=wAuJ5bdgHL-PlQ0JtGRM_k2eGR6WYaksDx5yQH47LZw,10752
+eth_portfolio/_shitcoins.cp310-win_amd64.pyd,sha256=1NAkOowgisg4kcPpqx10cHuC52_lssv5Bi93bP-vLo0,10752
+eth_portfolio/_shitcoins.py,sha256=ngslu8nTVgTwYSZ-HtXdfwi7dyUf3iraiod5dUpOwbY,14384
+eth_portfolio/_stableish.cp310-win_amd64.pyd,sha256=nvQfQxNqkZOEbxmn8F_9tf_phwRH0qtTQbfExNGz-EM,10752
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
 eth_portfolio/_utils.py,sha256=LQtg467tXBCQh7sGFepOe440XgTOu9bqJsY9qSg-Xs8,7583
 eth_portfolio/address.py,sha256=m8BE6Tk12mXDGYD_X-ctLGcWszwd0MC9uNP32OVxLJc,14487
-eth_portfolio/buckets.py,sha256=gUBjM2wIxR6cFfHaOE0BtDhSEafLPqiQFX5menftV-g,6433
-eth_portfolio/constants.cp310-win_amd64.pyd,sha256=MQxVjoTyq8dfk7TsiMIzejsx5ueohRZplJZD19nhHzs,10752
+eth_portfolio/buckets.py,sha256=LgUer32CUNFoACKUFCbqZ74Jh_wjpX5eWxfRQ9ImPQs,6879
+eth_portfolio/constants.cp310-win_amd64.pyd,sha256=TggiD0cNIHxXwTtbfijyi8BEoAKFfc8n3dtv6xOw9tI,10752
 eth_portfolio/constants.py,sha256=rUXWFaCGrrF_qzIdDvVzakQJsLnrGtFNn2EgRbZh8fQ,3741
 eth_portfolio/portfolio.py,sha256=FVx4QwnJH4llTWcYln9UpDkKridHSEAENbTHCBOSq_o,24904
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,13 +28,13 @@ eth_portfolio/_ledgers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 eth_portfolio/_ledgers/address.py,sha256=ZI4lVsxtXoffDHFBm0pUrSKU42KleBKThNdDHm1Nqtg,33823
 eth_portfolio/_ledgers/portfolio.py,sha256=rAr5S1tksgLPUOK1J1FbIWgvTQNzTqrRp8oukiP2BTo,13427
 eth_portfolio/_loaders/__init__.py,sha256=YrBeRuA48cN2Bg2R2nXiNt1CsUIG_7N6ENIpY6aISPo,1735
-eth_portfolio/_loaders/_nonce.cp310-win_amd64.pyd,sha256=kZm7sU3wc0HeX3DmG9pCT31MNcaIJvqbotU_OaOR59I,10752
+eth_portfolio/_loaders/_nonce.cp310-win_amd64.pyd,sha256=8lrhS6cRLyGquOaN1JX57uAxQsDyQZg7GLWoJNjLliM,10752
 eth_portfolio/_loaders/_nonce.py,sha256=S9x7SA-VgRD-KJMgbKS-X2Cq-51kxLNyeWa1LjeAxHk,6435
-eth_portfolio/_loaders/balances.cp310-win_amd64.pyd,sha256=_SYVsetm3COrmBQ5BBEy8hAjKJ052ijJ5lSzBu-TFa4,10752
+eth_portfolio/_loaders/balances.cp310-win_amd64.pyd,sha256=FTGde1mH8XHwUf4MJbqouSqZbLE2i79yhcvISnTO4IA,10752
 eth_portfolio/_loaders/balances.py,sha256=_v-x1M3lzDHPt8svHmCcpxZKw0BaGHfZimhkwgphY8A,3226
 eth_portfolio/_loaders/token_transfer.py,sha256=58NoMc28CRSjuxP-_kNmXL7jS1oEFZayTZ9VAKQcVow,8741
 eth_portfolio/_loaders/transaction.py,sha256=WXsiNahcb5jNbXCX2-ceao3Cybfi-7_th8bnw9elmP0,9386
-eth_portfolio/_loaders/utils.cp310-win_amd64.pyd,sha256=Wk0ZSQrE4857ciJ1fCPmfeibR0YPwpSPJsfTPDVr9Gc,10752
+eth_portfolio/_loaders/utils.cp310-win_amd64.pyd,sha256=pKgc4LCLXydi8Mv7dGEuWSMdj3LQ0zW1xLh3co0QYyc,10752
 eth_portfolio/_loaders/utils.py,sha256=_nhPmGq_h_y_JPU9vXvhzqoKAWtgLRhYy_PdJXbyUdw,2326
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=ECxnrYSIZZ2ZbOBLZnZ8DIxOsM8fKdyt8ztMPZZdYxQ,5139
@@ -60,24 +60,24 @@ eth_portfolio_scripts/_args.py,sha256=M33vPkja62XEJeCZAqacNSBCqbzse07wepwyBOtkvV
 eth_portfolio_scripts/_logging.py,sha256=EgW8ozQZLAgt_cUgqe5BYZLMVQwB6X-0gq0T-BvqlTY,369
 eth_portfolio_scripts/_portfolio.py,sha256=LIFug8lsfnbr67-93DWWD4Mj0QMvbqlgivY69uOAKbU,6821
 eth_portfolio_scripts/_utils.py,sha256=7maEWyS5i_Kp7iVaa5puf2ZyefqHDsUOqTDLz-UwIQY,2630
-eth_portfolio_scripts/balances.cp310-win_amd64.pyd,sha256=5aCHNNzug98Em9GcAMSyvkW5R15fm-sMSeuR9Z0wnBo,10752
+eth_portfolio_scripts/balances.cp310-win_amd64.pyd,sha256=JwAVzluU2FNLkzq70hAvrj5LPEP8BNbAB3QbA4FuHXU,10752
 eth_portfolio_scripts/balances.py,sha256=reli3W6K9-8F8I_n0tIwS9SuUykpPJnbiMsnJgY9N_w,1573
 eth_portfolio_scripts/main.py,sha256=vSYt6Ajq2wZ1ErSoEdLaLQmfpZnFcN6S-kSYaKQ0KEY,3633
 eth_portfolio_scripts/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-eth_portfolio_scripts/docker/__init__.cp310-win_amd64.pyd,sha256=0vGo0f5AWz2RDgods2FWg6wnKvLXnnTZrXejausMXOQ,10752
+eth_portfolio_scripts/docker/__init__.cp310-win_amd64.pyd,sha256=rvVltC5PfRu_XB9uLjtUK915ex-9L8iKv4YSXMMq9n8,10752
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp310-win_amd64.pyd,sha256=K46qqocSDbz30UftmMNRGJzHLXT_Koyx1nBsVZsRuMI,10752
+eth_portfolio_scripts/docker/check.cp310-win_amd64.pyd,sha256=IxNz0bEijE-nL725TeLQnJfSXRt4ecWknlkwKtIUrhY,10752
 eth_portfolio_scripts/docker/check.py,sha256=JFxUxGRSz20EgjKqCLBkCqR4N1ihzO_3ykU3jPzp_UU,1801
 eth_portfolio_scripts/docker/docker-compose.yaml,sha256=vx1HGuqBoB7Tpu2-J322oMtMWW46O7knDGtys99mYb4,1869
-eth_portfolio_scripts/docker/docker_compose.cp310-win_amd64.pyd,sha256=_nK6aQZBNE3jzHM6mDGUEjxOzixeFcLfHh1DdHJl4Dg,10752
+eth_portfolio_scripts/docker/docker_compose.cp310-win_amd64.pyd,sha256=df5SrARKdOQdysZMtKQRuU9yZg2mW6gNDUXVwv6q9bA,10752
 eth_portfolio_scripts/docker/docker_compose.py,sha256=tewgCWZP6g9sVFHbQnGC1au-bTnvuvXMZgTKKgpmeOc,2304
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=wktTI-OAdF_khhbciZFo4Gt2V9bUjbe7GLqwdzTKf0U,212
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=XGMV8e4tDak53e9bmymwAB4uqZmAIcU5JlRT3OiwTeU,70750
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=8PPH_QDhfbRRh3IidskW46rifJejloa1a9I1KCw2FTk,199
 eth_portfolio_scripts/victoria/__init__.py,sha256=LcTK1HO42JEWMJ20NVIneKCmXtXPYEhLxsvvC9HBoVs,1992
 eth_portfolio_scripts/victoria/types.py,sha256=KNq8aIiNXeiDnCKL7xycmouo0YeKI-sbQkIcTymcSYk,745
-eth_portfolio_temp-0.0.33.dev0.dist-info/METADATA,sha256=D0sPR9rCLa70RtrNcWph2phr8Vu06dlEEFAsyLJ_Mp8,800
-eth_portfolio_temp-0.0.33.dev0.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-eth_portfolio_temp-0.0.33.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.0.33.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.0.33.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.0.35.dev0.dist-info/METADATA,sha256=st5btUhaUQv6MRZO-65uy7pv6JjVieWHhaK73YDt5fE,800
+eth_portfolio_temp-0.0.35.dev0.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+eth_portfolio_temp-0.0.35.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.0.35.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
+eth_portfolio_temp-0.0.35.dev0.dist-info/RECORD,,