eth-portfolio-temp 0.0.30.dev0__cp39-cp39-macosx_11_0_arm64.whl → 0.0.31.dev0__cp39-cp39-macosx_11_0_arm64.whl

eth_portfolio/_stableish.py

@@ -0,0 +1,36 @@
+from collections import defaultdict
+from typing import DefaultDict, Final, Set
+
+from eth_typing import ChecksumAddress
+from y import Network, convert
+
+stableish: Final = {
+    Network.Mainnet: [
+        "0x674C6Ad92Fd080e4004b2312b45f796a192D27a0",  # USDN
+        "0x1456688345527bE1f37E9e627DA0837D6f08C925",  # USDP
+        "0x865377367054516e17014CcdED1e7d814EDC9ce4",  # DOLA
+        "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0",  # LUSD
+        "0x4Fabb145d64652a948d72533023f6E7A623C7C53",  # BUSD
+        "0x853d955aCEf822Db058eb8505911ED77F175b99e",  # FRAX
+        "0x5BC25f649fc4e26069dDF4cF4010F9f706c23831",  # DUSD
+        "0x99D8a9C45b2ecA8864373A26D1459e3Dff1e17F3",  # MIM
+        "0x056Fd409E1d7A124BD7017459dFEa2F387b6d5Cd",  # GUSD
+        "0x03ab458634910AaD20eF5f1C8ee96F1D6ac54919",  # RAI
+        "0x2A8e1E676Ec238d8A992307B495b45B3fEAa5e86",  # OUSD
+        "0x57Ab1ec28D129707052df4dF418D58a2D46d5f51",  # sUSD
+        "0xe2f2a5C287993345a840Db3B0845fbC70f5935a5",  # mUSD
+        "0x5B3b5DF2BF2B6543f78e053bD91C4Bdd820929f1",  # USDM
+        "0xdF574c24545E5FfEcb9a659c229253D4111d87e1",  # HUSD
+        "0xa47c8bf37f92aBed4A126BDA807A7b7498661acD",  # UST
+    ],
+}
+
+STABLEISH_COINS: DefaultDict[int, Set[ChecksumAddress]] = defaultdict(set)
+"""
+A dictionary that contains, for each chain, a set of 'stable-ish' coins that are considered stable by the wider market but not by ypriceamgic.
+
+These coins, and wrapper tokens that contain them, will be considered stablecoins on all dashboards.
+"""
+
+for chain, tokens in stableish.items():
+    STABLEISH_COINS[chain].update(convert.to_address(token) for token in tokens)

eth_portfolio/buckets.py

@@ -3,19 +3,23 @@ from typing import Optional, Set
 
 from a_sync import igather
 from async_lru import alru_cache
-from brownie import chain
-from y.constants import STABLECOINS, WRAPPED_GAS_COIN
+from eth_typing import ChecksumAddress
+from y.constants import CHAINID, STABLECOINS, WRAPPED_GAS_COIN
+from y.convert import to_address
 from y.datatypes import Address, AnyAddressType
+from y.exceptions import ContractNotVerified
 from y.prices.lending.aave import aave
 from y.prices.lending.compound import CToken, compound
 from y.prices.stable_swap.curve import curve
 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__)
 
-OTHER_LONG_TERM_ASSETS: Set[Address] = {}.get(chain.id, set())
+STABLEISH = STABLEISH_COINS[CHAINID]
+OTHER_LONG_TERM_ASSETS: Set[Address] = {}.get(CHAINID, set())
 
 
 async def get_token_bucket(token: AnyAddressType) -> str:
@@ -53,27 +57,25 @@ async def get_token_bucket(token: AnyAddressType) -> str:
         - :func:`_unwrap_token`
         - :func:`_is_stable`
     """
-    token = str(token)
+    token_address = to_address(token)
     try:
-        token = str(await _unwrap_token(token))
-    except ValueError as e:
-        if str(e).startswith("Source for") and str(e).endswith("has not been verified"):
-            return "Other short term assets"
-        raise
+        token_address = await _unwrap_token(token_address)
+    except ContractNotVerified as e:
+        return "Other short term assets"
 
-    if _is_stable(token):
+    if _is_stable(token_address):
         return "Cash & cash equivalents"
-    if token in ETH_LIKE:
+    if token_address in ETH_LIKE:
         return "ETH"
-    if token in BTC_LIKE:
+    if token_address in BTC_LIKE:
         return "BTC"
-    if token in OTHER_LONG_TERM_ASSETS:
+    if token_address in OTHER_LONG_TERM_ASSETS:
         return "Other long term assets"
     return "Other short term assets"
 
 
 @alru_cache(maxsize=None)
-async def _unwrap_token(token) -> str:
+async def _unwrap_token(token) -> ChecksumAddress:
     """
     Recursively unwrap a token to its underlying asset.
 
@@ -158,18 +160,19 @@ def _pool_bucket(pool_tokens: set) -> Optional[str]:
     return list(INTL_STABLECOINS)[0] if pool_tokens < INTL_STABLECOINS else None
 
 
-def _is_stable(token: Address) -> bool:
+def _is_stable(token: ChecksumAddress) -> bool:
     """
-    Check if a token is a stablecoin.
+    Check if a token is a stablecoin or stable-ish coin.
 
-    This function checks if a given token is present in the :data:`STABLECOINS` or
-    :data:`INTL_STABLECOINS` sets, indicating that it is a stablecoin.
+    This function checks if a given token is present in the :data:`STABLECOINS`,
+    :data:`INTL_STABLECOINS`, or :data:`STABLEISH_COINS` sets, indicating that it is
+    a stablecoin or considered stable by the wider market.
 
     Args:
         token: The address of the token to check.
 
     Example:
-        Check if a token is a stablecoin:
+        Check if a token is a stablecoin or stable-ish coin:
 
         >>> _is_stable("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48")
         True
@@ -177,5 +180,6 @@ def _is_stable(token: Address) -> bool:
     See Also:
         - :data:`STABLECOINS`
         - :data:`INTL_STABLECOINS`
+        - :data:`STABLEISH_COINS`
     """
-    return token in STABLECOINS or token in INTL_STABLECOINS
+    return token in STABLECOINS or token in INTL_STABLECOINS or token in STABLEISH

eth_portfolio/constants.py

@@ -52,6 +52,7 @@ INTL_STABLECOINS: Final = {
         "0xC581b735A1688071A1746c968e0798D642EDE491",  # EURT
         "0xdB25f211AB05b1c97D595516F45794528a807ad8",  # EURS
         "0x96E61422b6A9bA0e068B6c5ADd4fFaBC6a4aae27",  # ibEUR
+        "0x9fcf418B971134625CdF38448B949C8640971671",  # EURN
         "0x269895a3dF4D73b077Fc823dD6dA1B95f72Aaf9B",  # sKRW
         "0x3F1B0278A9ee595635B61817630cC19DE792f506",  # sAUD
         "0x97fe22E7341a0Cd8Db6F6C021A24Dc8f4DAD855F",  # sGBP

eth_portfolio_scripts/docker/docker-compose.yaml

@@ -1,9 +1,6 @@
 networks:
   eth_portfolio:
 
-volumes:
-  grafana_data: {}
-
 services:
   grafana:
     image: grafana/grafana:10.2.0
@@ -22,7 +19,6 @@ services:
     #command: >
     #  sh -c "grafana-cli plugins install frser-sqlite-datasource && /run.sh"
     volumes:
-      - grafana_data:/var/lib/grafana
       - ./.grafana/:/etc/grafana/provisioning/
     networks:
       - eth_portfolio

{eth_portfolio_temp-0.0.30.dev0.dist-info → eth_portfolio_temp-0.0.31.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.0.30.dev0
+Version: 0.0.31.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.30.dev0.dist-info → eth_portfolio_temp-0.0.31.dev0.dist-info}/RECORD

@@ -1,32 +1,34 @@
-bb56d21cd75f4f6de8f2__mypyc.cpython-39-darwin.so,sha256=1sszslUVARjSkmGzcZmdDBelSbi2TxUJQ1mOxqf_SgQ,469744
+295eace8438df6ec133b__mypyc.cpython-39-darwin.so,sha256=w24V3ojkD8934BJ-hVkhVGJQKyxukLl6DCKstLm7BeY,487056
 eth_portfolio/address.py,sha256=HQICTWIesTZgEbLTH7bQlehBIX5m_ZbppA5bAlnONhI,14091
 eth_portfolio/_cache.py,sha256=PYkR-yExjuwd_t7swv4euxL2daJ-VFwh3EMb3MciRJE,4745
 eth_portfolio/_argspec.py,sha256=VzUZkbDkmOSgNUZBGbGblqtxBfDcmBAB89dY2OX0j-U,1595
-eth_portfolio/_config.cpython-39-darwin.so,sha256=GlLuMUWNaXImwfbwUOBg8-6yVdEOlorCYZmRSX-YKMU,50640
+eth_portfolio/_config.cpython-39-darwin.so,sha256=dwo2ltaFqgaH1CwNNIMTG1hYnD0FTzoOOeT587RzIrc,50640
 eth_portfolio/_submodules.py,sha256=J8ht9bAAvblUXqwOGN7UIOXUPxrTiq7m1RWiB0-ObaE,2190
-eth_portfolio/_shitcoins.cpython-39-darwin.so,sha256=DmHGot39O5Z8-b6AeR-UpntA6NQJLMqGJD4C3yaJ-GE,50656
-eth_portfolio/constants.py,sha256=arJcI-_N8rcFBQTTHsobRdc8FkxRfP8LZk_5LBGzrBQ,2399
+eth_portfolio/_shitcoins.cpython-39-darwin.so,sha256=d41Ewjt-vZ6dQVAqL-LfWjAdPjN9APfDu42vqyY_E7o,50656
+eth_portfolio/constants.py,sha256=mnJRzVpBqBumLBxNUH4-qbt9CGXOqv-UtG82BHQdMpE,2461
 eth_portfolio/__init__.py,sha256=0sO4cSJaLYwJfnfVOJRFw7p5_Lzhsr95YuJ1aNQM83A,500
 eth_portfolio/_decimal.py,sha256=nuUl6DZHCtrbBN7snwvs4LLaoJ5k7mn3dt4qmlFCkTU,4731
-eth_portfolio/buckets.py,sha256=JXRJ7zg0ELeggqmb10-pr1MqMGQW3rccGFu_Oz-RepQ,5893
-eth_portfolio/constants.cpython-39-darwin.so,sha256=P4oU87EWNiL0cr0_krUouPzOizwgq9b2S2OXMUiXYEY,50656
+eth_portfolio/buckets.py,sha256=KEPK-ecZl4GMt5Layqdh0vMtCrd7uWIVJiZ697PRLFw,6227
+eth_portfolio/_stableish.cpython-39-darwin.so,sha256=0qpzE1zXy0we6kpobrWJDp_G24JxMt_rLPAH4fpMTtc,50656
+eth_portfolio/constants.cpython-39-darwin.so,sha256=2P2TYBD4AsyVCRXZobZGqN1LulxeECFvdCElgFN0-lM,50656
 eth_portfolio/_decorators.py,sha256=_ZSurUFEIwZRiMFMhLcIXkD-Ey1CqfBqGaE24hLzOuA,2815
+eth_portfolio/_stableish.py,sha256=BJUhGhJ9bci96ydcTjVeLR-DbvUaFgnXBP59FdZqg6I,1644
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_shitcoins.py,sha256=eyWkQGx6HpQGf1HsNOMtGjRLvqP3uh3hwO9Ubw8eUSY,14000
 eth_portfolio/_config.py,sha256=mw-OA3M8rUA2hqy5wNt30AZRHkWFgR8K2sJg0o5Baxg,98
 eth_portfolio/_exceptions.py,sha256=bw3IdXhqrWxeFqYLm7pJZqRHKZas_cCg8A5Ih1WQEqQ,2433
 eth_portfolio/portfolio.py,sha256=KljK3FZQMtRQLs1D-HHgCN-DVoZ6ZzEdmclmF3__oz0,24243
 eth_portfolio/_utils.py,sha256=j1LncNsKQWAC3mnnXtGIr-A7PXUEOPKB7zS995YW0yo,7360
-eth_portfolio/_argspec.cpython-39-darwin.so,sha256=SFGKEog7kQ50AWKZLuSzouJIANB5ZrSdKpJIs5UWanc,50640
+eth_portfolio/_argspec.cpython-39-darwin.so,sha256=Sbh4lAt77NSfeg2daX_f9r-BoRsCfCpBgeWDuOnScCE,50640
 eth_portfolio/_loaders/transaction.py,sha256=FEYdoNDCgD6-mqZT9MuyYIEkdhG3iUwyNeMmqjpMGJw,9146
 eth_portfolio/_loaders/__init__.py,sha256=lb45_0ak32Z7N3-Nx1CAoRKiZ1_w-_YGbmSCNuunro8,1702
 eth_portfolio/_loaders/_nonce.py,sha256=RQlsfycYxKe26Fjh_H7p-WHUJxScMgXU7a2FesfTD9s,6239
-eth_portfolio/_loaders/balances.cpython-39-darwin.so,sha256=1vY4DRaZBMbY98BzzZE70JdD1GxXTXKLS6r5DznLunI,50656
+eth_portfolio/_loaders/balances.cpython-39-darwin.so,sha256=ac1aopUQq2biSxSYV4uYsHvMpjQKhA3D3AGaPIjeD88,50656
 eth_portfolio/_loaders/utils.py,sha256=my3Wg2Ip5gSWuzAWcoLQQEmVmAPhIHbBzQQc0iP1iCA,2258
-eth_portfolio/_loaders/_nonce.cpython-39-darwin.so,sha256=U01UF2aMPOC4oJR7xTfhzDbTU1Ac-qp_rislP231yuM,50648
+eth_portfolio/_loaders/_nonce.cpython-39-darwin.so,sha256=1M3qHNMKMAQgUZhZPY3w_Hp2ujuoJ4z4nTaDiYFS__4,50648
 eth_portfolio/_loaders/balances.py,sha256=BTWfkJIoSraUMe94Wuj8NPyg5EO0OByIjbXu7j6PZEo,3132
 eth_portfolio/_loaders/token_transfer.py,sha256=MEw95D2iKBYa_9vIatCHJGe7zEJuYUEC8P1mTjjRXlo,8524
-eth_portfolio/_loaders/utils.cpython-39-darwin.so,sha256=LbkNqy9uwP7anoHSpYKcOXlFOYaZdmDkBPMcELi2Vhs,50648
+eth_portfolio/_loaders/utils.cpython-39-darwin.so,sha256=k2Xx-Vj0_93ix4yJzG5P_5i-C--Z4Xbe1kf1zESQCmA,50648
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=_6WChlA6dGcc4c3aJy8hJf8BVmKWwTL_YCUe8O7p4PY,5003
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -56,26 +58,26 @@ eth_portfolio/protocols/lending/unit.py,sha256=7oRvIkoKUm8IOnDv59pILSSJWFNNjwr4C
 eth_portfolio_scripts/_logging.py,sha256=B_rQMYt_1PhpwCOLBRpkKK6M1ljcF0wAIgqfPIsFUGU,354
 eth_portfolio_scripts/_args.py,sha256=k6J6XkRe1VuN1DiyGuXLCR7NBSvzH5jnVChfzodKuB8,656
 eth_portfolio_scripts/__init__.py,sha256=TC5c4WZdzSHhTIBYuwzrAyzFuGzBmHiDX_g6ghO09jQ,261
-eth_portfolio_scripts/balances.cpython-39-darwin.so,sha256=ItbNAskVqMdtdkkej6IaydUED6lyxBKhGBafHbBI8TA,50656
+eth_portfolio_scripts/balances.cpython-39-darwin.so,sha256=OECjL7udnRmHqmvDbVbku-EhsaYXsJTnytXl0oTqVAU,50656
 eth_portfolio_scripts/_portfolio.py,sha256=fDodXRCUo9EoGWEFBKMfWHCxo8ItAqqsWqD9X0jZYR0,6640
 eth_portfolio_scripts/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 eth_portfolio_scripts/balances.py,sha256=o94uA4FVgPE-chbaoQgQazfXQ0O8k6W_yk9JY2bgRpQ,1524
 eth_portfolio_scripts/main.py,sha256=A7N78d2hxoU-Xu-dITCRqZ7yRL2l5r26WWzXzMdbeYo,3520
 eth_portfolio_scripts/_utils.py,sha256=qyct1Mwf2-1DYj7BUWt2bocUfGKMap1l9sxUfHAjER0,2538
-eth_portfolio_scripts/docker/docker-compose.yaml,sha256=384qUv3SuBd3uUl2QUlzHCtUhhdvk9_2Z9sIZQczLMk,1875
+eth_portfolio_scripts/docker/docker-compose.yaml,sha256=wITbD5P28WM0dEgQeTD_7ZOXnKIArDzR4siIoyFdb9I,1808
 eth_portfolio_scripts/docker/docker_compose.py,sha256=K7_Y_8NeN5s0pb9WUamgfi9OppjpaU0Mlz2nDzewcRA,2226
 eth_portfolio_scripts/docker/check.py,sha256=E6_Ar4dr6HfVAgpwoDPcObIolikHKQr8VFkH01sOuIM,1745
 eth_portfolio_scripts/docker/__init__.py,sha256=ZXSIYcjp94c0O9o39BDGWju3YrCMLl4gtov7YChc9Ig,393
-eth_portfolio_scripts/docker/__init__.cpython-39-darwin.so,sha256=NTDx7Ikto3i0-YJj2V_Q1zecI8fEf3BIk_FqbPa34bk,50656
-eth_portfolio_scripts/docker/check.cpython-39-darwin.so,sha256=RoSLjX3oZw9_Y1pr1mPB3wAYO0PHvSMk7BHTR3Dp5Uk,50648
-eth_portfolio_scripts/docker/docker_compose.cpython-39-darwin.so,sha256=0-ZHEwN2rH91ax6MVF4EiOUzbUFrDQiCd9U0YEDYggw,50704
+eth_portfolio_scripts/docker/__init__.cpython-39-darwin.so,sha256=5UtdVtSmoMcgOwXXcdiTfaDIhhERzL2hOcEY9WgeH5g,50656
+eth_portfolio_scripts/docker/check.cpython-39-darwin.so,sha256=TA3aeB8tDpP4TDCLE2QVpKEvzVQP0Oz4uxRFcEwweBs,50648
+eth_portfolio_scripts/docker/docker_compose.cpython-39-darwin.so,sha256=ap4z2yfJBE5BqV-a3q5waswuWb9m2Y8cy7RJ-N7fLLk,50704
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=pBE_0Nh_J7d9Fiy3Xu6vuac_HWCBcFsJJSV-ryjQR1Y,188
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=MynNDOk69IihoYdd2bL7j8CnRb2Co4gdqW7T4m6AaEU,202
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=dBmjogLJRuixCHWSs4ROE0_FXb-PUbqWBHEdLoP-1MU,68788
 eth_portfolio_scripts/victoria/__init__.py,sha256=IUBwX_CRYWFchMf_S-IaLOKP2Vh6sxNIIhhy7YEOmeA,1922
 eth_portfolio_scripts/victoria/types.py,sha256=FJossvAvwNGkufmEk3JD_I10EEaCsOb-m6aeX_vGsUg,707
-eth_portfolio_temp-0.0.30.dev0.dist-info/RECORD,,
-eth_portfolio_temp-0.0.30.dev0.dist-info/WHEEL,sha256=bDWaFWigpG5bEpqw9IoRiyYs8MvmSFh0OhUAOoi_-KA,134
-eth_portfolio_temp-0.0.30.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.0.30.dev0.dist-info/top_level.txt,sha256=RFDADjpLoCyoOexqChHlvRDt5rzZtjEscRPIISyJCRc,64
-eth_portfolio_temp-0.0.30.dev0.dist-info/METADATA,sha256=YIzuEawIXLzuOn3Vydms6O46--BUlblnB_3NLPBSQiM,775
+eth_portfolio_temp-0.0.31.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.0.31.dev0.dist-info/WHEEL,sha256=bDWaFWigpG5bEpqw9IoRiyYs8MvmSFh0OhUAOoi_-KA,134
+eth_portfolio_temp-0.0.31.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.0.31.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
+eth_portfolio_temp-0.0.31.dev0.dist-info/METADATA,sha256=-Lagsr2on5gWi33WrI4Bv5IqG2_Hexlp_KVEIKOuHNA,775

{eth_portfolio_temp-0.0.30.dev0.dist-info → eth_portfolio_temp-0.0.31.dev0.dist-info}/top_level.txt

@@ -1,3 +1,3 @@
-bb56d21cd75f4f6de8f2__mypyc
+295eace8438df6ec133b__mypyc
 eth_portfolio
 eth_portfolio_scripts