eth-portfolio-temp 0.0.30.dev0__cp39-cp39-win_amd64.whl → 0.0.31.dev0__cp39-cp39-win_amd64.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,21 +1,23 @@
-bb56d21cd75f4f6de8f2__mypyc.cp39-win_amd64.pyd,sha256=zmW2fZ1M_Lt5fGkr74quUsGn7X5hp772HiTKvNIT61o,279040
+295eace8438df6ec133b__mypyc.cp39-win_amd64.pyd,sha256=GVTRcFqvZFku3U8DEykc3MwUIfgbZEvaw7CPWuY0Fjg,284672
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp39-win_amd64.pyd,sha256=90b-NGp6CyVyLQiGZf5TEFNm5tfFHG7hcOCK91fhrPQ,10752
+eth_portfolio/_argspec.cp39-win_amd64.pyd,sha256=pdy4vjrrrF4CKOesGTEnXt8tej0-1gfUexQUbzJlx60,10752
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp39-win_amd64.pyd,sha256=TJ_FWhsNiFvWuBC-yIV_IJNTNuXC-2qsEHKLfFgW4KU,10752
+eth_portfolio/_config.cp39-win_amd64.pyd,sha256=UwMbxeHlb5fclwBaeAR2fROESqgeXeAayMug5exoeWU,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.cp39-win_amd64.pyd,sha256=559dn9_19HWomtJTJ7MifhcV9o7vLaZYo_WPzjOzUko,10752
+eth_portfolio/_shitcoins.cp39-win_amd64.pyd,sha256=yl-5gScUvGG3XhFYiejeH5q0RpqLlrUBjRQtKpmnNXs,10752
 eth_portfolio/_shitcoins.py,sha256=Kx7OpfbV5SytD0EQdJLjd4LBlAIRcrsCH2kf-xmUZgA,14274
+eth_portfolio/_stableish.cp39-win_amd64.pyd,sha256=Ksh40WlnOEwMC53p2FPLubht_CmyDpecpp7VJ5JSXiI,10752
+eth_portfolio/_stableish.py,sha256=lcRQHwDztfFHKV0CbfSLBoR3AYaBjKapnXytx944pU0,1680
 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=_75U2su7rKn2Rx6FVQmYGqoovJaXSQSWFGSxtWu0R98,6074
-eth_portfolio/constants.cp39-win_amd64.pyd,sha256=B0MYWNQDnsKld5Wy6GFCsnh_NTTRrAU7QBW2kouFmKQ,10752
-eth_portfolio/constants.py,sha256=akMKnQYnTCPTmwzb1orPRMP8bY4vK0T87MCRH8VdlFE,2461
+eth_portfolio/buckets.py,sha256=B_-WjIcHyDBgNlpJdyhHnOscegUp2K6bUrPFbAQ92uU,6412
+eth_portfolio/constants.cp39-win_amd64.pyd,sha256=Qpq_QIWF1m0Xwa-wYETU83B-uOjCHxamFBrinOXPhjQ,10752
+eth_portfolio/constants.py,sha256=fSSVRyWVy4JjE9-ZVwpFXnGmeCg_BxZGjd5F6Flv5Zo,2524
 eth_portfolio/portfolio.py,sha256=FVx4QwnJH4llTWcYln9UpDkKridHSEAENbTHCBOSq_o,24904
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -26,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.cp39-win_amd64.pyd,sha256=iPLn8aAZUYjgS8mlDMaKOO_zzOOIqR1i6dr4zATYVHo,10752
+eth_portfolio/_loaders/_nonce.cp39-win_amd64.pyd,sha256=z_xbVqnr06IQDWBrPV_8ALfSLXZcse8xENMS3V4cnyc,10752
 eth_portfolio/_loaders/_nonce.py,sha256=S9x7SA-VgRD-KJMgbKS-X2Cq-51kxLNyeWa1LjeAxHk,6435
-eth_portfolio/_loaders/balances.cp39-win_amd64.pyd,sha256=lGnTKgk6_mE_jE6KJNQwjTy-7SnP4bwUO8WJbkc0pVg,10752
+eth_portfolio/_loaders/balances.cp39-win_amd64.pyd,sha256=cHcTezNV7qTB-b9BZGYevxVBL2GCc2Jylgce9NLZS0I,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.cp39-win_amd64.pyd,sha256=P4e2-fmDvbXN-zfnT80e9TV8WJ05fVkUp-CwtCwLZow,10752
+eth_portfolio/_loaders/utils.cp39-win_amd64.pyd,sha256=gisax59CWFQ12EZ3zugtJAs2esRscASO6UB5ZR3cMGY,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
@@ -58,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.cp39-win_amd64.pyd,sha256=vVQSriaHfg8Hhfa5aRZsGtcigUAoc7oXHyoFqLpA5bQ,10752
+eth_portfolio_scripts/balances.cp39-win_amd64.pyd,sha256=4O80f0WZEREBLc2OgWChqIMmPcyS_vWTMbhQQSC_fJo,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__.cp39-win_amd64.pyd,sha256=1kgy3il0Su26DKfLmA4aNq20rH6q0DVTJx44GP3CTL8,10752
+eth_portfolio_scripts/docker/__init__.cp39-win_amd64.pyd,sha256=HkRWZqQQeSsgPjVBCXUqPvfnrO-N0oRGGgrCnAXOpPc,10752
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp39-win_amd64.pyd,sha256=Vp5RGf21TT65vfBY_2nr5GHnnchfSO-DwofbRi_uaLc,10752
+eth_portfolio_scripts/docker/check.cp39-win_amd64.pyd,sha256=EHLz4Pl1QroAIz-9ZPSNmAXcT6TdVNcbthlpg0f87qQ,10752
 eth_portfolio_scripts/docker/check.py,sha256=JFxUxGRSz20EgjKqCLBkCqR4N1ihzO_3ykU3jPzp_UU,1801
-eth_portfolio_scripts/docker/docker-compose.yaml,sha256=ntdCvEJtYwpiDlt1xsHGKhuA488XJOziQVeIMPBiMR0,1940
-eth_portfolio_scripts/docker/docker_compose.cp39-win_amd64.pyd,sha256=VmYGLqu0B1MWI2XJ636obIu3L-2OBWOMYYNTkYwYnec,10752
+eth_portfolio_scripts/docker/docker-compose.yaml,sha256=vx1HGuqBoB7Tpu2-J322oMtMWW46O7knDGtys99mYb4,1869
+eth_portfolio_scripts/docker/docker_compose.cp39-win_amd64.pyd,sha256=letHqc-TEpWLzV-lV0NM7L2lkyr5UlfxUYZwVRSxfG0,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.30.dev0.dist-info/METADATA,sha256=7CMoJmhr6OElMMSP7OkmAt9HmJMwxdH0IDTMlP1saJc,800
-eth_portfolio_temp-0.0.30.dev0.dist-info/WHEEL,sha256=XkFE14KmFh7mutkkb-qn_ueuH2lwfT8rLdfc5xpQ7wE,99
-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/RECORD,,
+eth_portfolio_temp-0.0.31.dev0.dist-info/METADATA,sha256=1MRQ739fislZAsPqj-dZKGB1WZzUg3FnqlsIlXzHAxs,800
+eth_portfolio_temp-0.0.31.dev0.dist-info/WHEEL,sha256=XkFE14KmFh7mutkkb-qn_ueuH2lwfT8rLdfc5xpQ7wE,99
+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/RECORD,,

{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