eth-portfolio-temp 0.1.3.dev0__cp310-cp310-macosx_11_0_arm64.whl → 0.1.5.dev0__cp310-cp310-macosx_11_0_arm64.whl

eth_portfolio/protocols/lending/maker.py

@@ -3,6 +3,7 @@ from typing import Final, List, Optional
 
 from a_sync import igather
 from async_lru import alru_cache
+from brownie import ZERO_ADDRESS
 from dank_mids.exceptions import Revert
 from eth_typing import HexStr
 from faster_eth_abi import encode
@@ -18,6 +19,8 @@ from eth_portfolio.typing import Balance, TokenBalances
 
 yfi: Final = "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e"
 dai: Contract
+_1e18: Final = Decimal(10**18)
+_1e45: Final = Decimal(10**45)
 
 
 def encode_bytes(bytestring: str) -> bytes:
@@ -46,8 +49,8 @@ class Maker(LendingProtocolWithLockedCollateral):
 
         balances: TokenBalances = TokenBalances(block=block)
         for token, data in zip(gems, ink_data):
-            if ink := data.dict()["ink"]:
-                balance = ink / Decimal(10**18)
+            if token != ZERO_ADDRESS and (ink := data.dict()["ink"]):
+                balance = ink / _1e18
                 value = round(balance * Decimal(await get_price(token, block, sync=False)), 18)
                 balances[token] = Balance(balance, value, token=token, block=block)
         return balances
@@ -71,7 +74,7 @@ class Maker(LendingProtocolWithLockedCollateral):
         for urns, ilk_info in data:
             art = urns.dict()["art"]
             rate = ilk_info.dict()["rate"]
-            debt = art * rate / Decimal(1e45)
+            debt = art * rate / _1e45
             balances[dai.address] += Balance(debt, debt, token=dai, block=block)
         return balances
 

eth_portfolio_scripts/docker/docker-compose.yaml

@@ -3,7 +3,7 @@ networks:
 
 services:
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:12.1.1
     ports:
       - 127.0.0.1:${GRAFANA_PORT:-3000}:3000
     environment:
@@ -47,7 +47,7 @@ services:
     restart: always
 
   victoria-metrics:
-    image: victoriametrics/victoria-metrics:v1.81.1
+    image: victoriametrics/victoria-metrics:v1.124.0
     volumes:
       - ~/.eth-portfolio/data/victoria/:/victoria-metrics-data
     command:

{eth_portfolio_temp-0.1.3.dev0.dist-info → eth_portfolio_temp-0.1.5.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.1.3.dev0
+Version: 0.1.5.dev0
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
@@ -16,7 +16,7 @@ Requires-Dist: faster-eth-utils
 Requires-Dist: numpy<2
 Requires-Dist: pandas<3,>=1.4.3
 Requires-Dist: typed-envs>=0.0.9
-Requires-Dist: ypricemagic<5,>=4.6.22.dev0
+Requires-Dist: ypricemagic<5,>=4.6.27.dev0
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

{eth_portfolio_temp-0.1.3.dev0.dist-info → eth_portfolio_temp-0.1.5.dev0.dist-info}/RECORD

@@ -1,34 +1,34 @@
-295eace8438df6ec133b__mypyc.cpython-310-darwin.so,sha256=r1Kcw1Pj4l3MuJFn75bWQxeUgUMEzETb1UcETckYChE,461728
+295eace8438df6ec133b__mypyc.cpython-310-darwin.so,sha256=N9rMyTv8Drt27hKEn8cuTOCDOBUwa41V17OvFA2tiLg,461728
 eth_portfolio/address.py,sha256=LvBh4Vp2DBC3gQ0WD-TZ6jfe9s6FZbET1krYG9_KMAA,14139
 eth_portfolio/_cache.py,sha256=PYkR-yExjuwd_t7swv4euxL2daJ-VFwh3EMb3MciRJE,4745
-eth_portfolio/_stableish.cpython-310-darwin.so,sha256=-LXjz7e8_VbNqKVTXR12MsA1X_EkRmMgbkLYtA8GIU4,50656
+eth_portfolio/_stableish.cpython-310-darwin.so,sha256=sh1ZNzCXeodjCmOrN6FtGiPTXsrR1llycpqn4QUygAw,50656
 eth_portfolio/_argspec.py,sha256=VzUZkbDkmOSgNUZBGbGblqtxBfDcmBAB89dY2OX0j-U,1595
 eth_portfolio/_submodules.py,sha256=J8ht9bAAvblUXqwOGN7UIOXUPxrTiq7m1RWiB0-ObaE,2190
 eth_portfolio/constants.py,sha256=LS9H2P_Qfcreb6z6NknErxvq6OAtIHbHykXy0spol9E,3659
 eth_portfolio/__init__.py,sha256=0sO4cSJaLYwJfnfVOJRFw7p5_Lzhsr95YuJ1aNQM83A,500
-eth_portfolio/_argspec.cpython-310-darwin.so,sha256=mhHYoFAIlwdUgBLFUCdFloL_2URgrJ_swmtxDB0LYMw,50640
+eth_portfolio/_argspec.cpython-310-darwin.so,sha256=ZCdhoBsQalMXt8h96UBOXdDCwwt28uaET7GrHac5Ln4,50640
 eth_portfolio/_decimal.py,sha256=nuUl6DZHCtrbBN7snwvs4LLaoJ5k7mn3dt4qmlFCkTU,4731
-eth_portfolio/_config.cpython-310-darwin.so,sha256=taGQgYSrSWFw7hXpDgxTaoYuDZRlz3f0yDabVZAy8cU,50640
+eth_portfolio/_config.cpython-310-darwin.so,sha256=mkxg_sx_MCw1l8yp-lq5L8OxFrvJQ9IVJrT9SUne4Og,50640
 eth_portfolio/buckets.py,sha256=QwdqWzW9iWBmRcJ2aktRtL-obvtBnND179krY5ISbhY,6695
-eth_portfolio/_shitcoins.cpython-310-darwin.so,sha256=WzzvkOpur2FuOSIfULMC4PTbH4RCmNeMj_CV6QFq_HY,50656
+eth_portfolio/_shitcoins.cpython-310-darwin.so,sha256=fR7aYdQrrZKsH62pXb_kEUmKnoWKIaGdezOOcJl8B5A,50656
 eth_portfolio/_decorators.py,sha256=_ZSurUFEIwZRiMFMhLcIXkD-Ey1CqfBqGaE24hLzOuA,2815
 eth_portfolio/_stableish.py,sha256=VTv69Q91AHxbNbbY0LB4PFwKEseHdkE4_6fLPKH1uW0,2021
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_shitcoins.py,sha256=69XWPFHiySxiLJddR5b14eU01wQVPfQuS48laBI00j8,14162
-eth_portfolio/constants.cpython-310-darwin.so,sha256=gXWq-x-nyggNwSE6OU933rer6so2vVTulSDwUQjCKgY,50656
+eth_portfolio/constants.cpython-310-darwin.so,sha256=4ev2h1zjEyg_hVoaPasXSw0TYmfyowzDpQdTPGbYg6A,50656
 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=PUGQKa84BzuwprcFC_S5gjcx1h09-pC9CyZIvaYD6fU,7367
-eth_portfolio/_loaders/_nonce.cpython-310-darwin.so,sha256=WcdMTdaDsgYVCQpcj-uj5r7_ubte-FW4Uk1j5pUWBrM,50656
+eth_portfolio/_loaders/_nonce.cpython-310-darwin.so,sha256=o5xq1hRQ4ANFAzTFBi7jTGJEBdkK2pEKHmFCP8AKEVw,50656
 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=cx0EjTAhVU2EudMKSO-7-t1jl3y4dYn6as4XiY6KyS8,6285
 eth_portfolio/_loaders/utils.py,sha256=my3Wg2Ip5gSWuzAWcoLQQEmVmAPhIHbBzQQc0iP1iCA,2258
-eth_portfolio/_loaders/balances.cpython-310-darwin.so,sha256=Lnia7JlDoLT62CDNt1ReZAkhbZvDfUXbQ-PrZ_An1Gk,50656
+eth_portfolio/_loaders/balances.cpython-310-darwin.so,sha256=iDYKbtQK9ZXMBov89QM-IQkWDb2_GJN6jTuJ3vRr4ok,50656
 eth_portfolio/_loaders/balances.py,sha256=BTWfkJIoSraUMe94Wuj8NPyg5EO0OByIjbXu7j6PZEo,3132
 eth_portfolio/_loaders/token_transfer.py,sha256=MEw95D2iKBYa_9vIatCHJGe7zEJuYUEC8P1mTjjRXlo,8524
-eth_portfolio/_loaders/utils.cpython-310-darwin.so,sha256=Q0v35Fut3-kB1GlS2KgsJ3dGFtcgyqXZbU9h6IUzXzY,50648
+eth_portfolio/_loaders/utils.cpython-310-darwin.so,sha256=SozQEEtDz-h2WhyXS2z5WN2eGAGwLsyvKuZuPYc9Zdo,50648
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=aKaYSDnJehEcDb_c6YTmcKZxSfZ1jwHMXMOAmE8XH30,5152
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -50,7 +50,7 @@ eth_portfolio/protocols/convex.py,sha256=uNbXxEmhcpXulNkbxoqWl9eAJTZjPJlzXFtrBGv
 eth_portfolio/protocols/dsr.py,sha256=eGL0DK4IpZkv10CdNr-3OmlAYjqXJAtQHWL34HUBgpY,1755
 eth_portfolio/protocols/lending/_base.py,sha256=UBdJ5eV2baewEvppjES72eOJzKTK2XHGYnySQNBcack,2254
 eth_portfolio/protocols/lending/liquity.py,sha256=Cpa7TcxZjOqcNIIqfKrx1bLRtKtVgNv13zeUR8ndDI0,4177
-eth_portfolio/protocols/lending/maker.py,sha256=Ceo3Xa99uJTUzV8wAQ4JEwE8ddfU29DPKYu3sA8FS8c,3857
+eth_portfolio/protocols/lending/maker.py,sha256=ajqkBHAVnY5Tp8k-bew37CqyMi4WfOYgC-N8MVTT-AM,3962
 eth_portfolio/protocols/lending/__init__.py,sha256=BZtCOglz6R12wqETlECbCEITdtIT9J6bYzy61iDencI,1643
 eth_portfolio/protocols/lending/README.md,sha256=OhZfsW8e-aD-q02g0maG9QGgW0IietkDRZc7PBakBvc,493
 eth_portfolio/protocols/lending/compound.py,sha256=bqnIevm7NWhk6nMfkMZUKlQuVWr-tXnuntX-4De1YZM,7252
@@ -58,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-310-darwin.so,sha256=HmJbpmm8E_FotqkBTka4dq3LDkQpVk3YFX1VUZz0FTo,50656
+eth_portfolio_scripts/balances.cpython-310-darwin.so,sha256=ao2uZk_2aJVKRPfJUOAJqdlgb19fWzBu3VdTet_lBx4,50656
 eth_portfolio_scripts/_portfolio.py,sha256=cv4Qpb3EdwhO2sZEOnHYFWOHaoFo6wwt3nddyfDBYv0,6724
 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.cpython-310-darwin.so,sha256=92BlzNfANjxBsJ7MTGnQc5l2Br31XnBv4qtKvvuiWnk,50712
-eth_portfolio_scripts/docker/docker-compose.yaml,sha256=wITbD5P28WM0dEgQeTD_7ZOXnKIArDzR4siIoyFdb9I,1808
+eth_portfolio_scripts/docker/docker_compose.cpython-310-darwin.so,sha256=BMt1J976zJMiBnWSSdIB4eunmh8PsBI-n7nEOMXDYXA,50712
+eth_portfolio_scripts/docker/docker-compose.yaml,sha256=n3ifrPTq5UUN3rXfwR3WqLmFSwp2uT0v9RmXUtzy1HM,1809
 eth_portfolio_scripts/docker/docker_compose.py,sha256=K7_Y_8NeN5s0pb9WUamgfi9OppjpaU0Mlz2nDzewcRA,2226
-eth_portfolio_scripts/docker/check.cpython-310-darwin.so,sha256=34xVB388WwQUSNaWBVKVGtnhtM3Z0nyFJ4HNhWnMSR8,50664
+eth_portfolio_scripts/docker/check.cpython-310-darwin.so,sha256=D_9SS0MZWsn2Y0CNKDPIBIFfoynKguM6Q3dbiZzd91Q,50664
 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-310-darwin.so,sha256=YmbGOXztUqpikluBprMf-7x2n4cVTYLylqLh2Io_2ZQ,50656
+eth_portfolio_scripts/docker/__init__.cpython-310-darwin.so,sha256=lUkbJFmlZKRXyv_fhYrjN2BC-OV3pk_nJjouZ03hZWo,50656
 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=hHVexpiVFJdBrdztihYBKC5hCdYDopo6aSaErI0mmOo,1965
 eth_portfolio_scripts/victoria/types.py,sha256=FJossvAvwNGkufmEk3JD_I10EEaCsOb-m6aeX_vGsUg,707
-eth_portfolio_temp-0.1.3.dev0.dist-info/RECORD,,
-eth_portfolio_temp-0.1.3.dev0.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
-eth_portfolio_temp-0.1.3.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.1.3.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.1.3.dev0.dist-info/METADATA,sha256=PGTt800mz3nbsIV5U2qGeGqYhdTFLZ4fafz9UPZAPI0,778
+eth_portfolio_temp-0.1.5.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.1.5.dev0.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
+eth_portfolio_temp-0.1.5.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.1.5.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
+eth_portfolio_temp-0.1.5.dev0.dist-info/METADATA,sha256=vY6AY3tOD_9QYQQzf_exb6bHAUoeotXP57tvL0aKkVA,778