eth-portfolio-temp 0.1.4.dev0__cp311-cp311-macosx_11_0_arm64.whl → 0.1.5.dev0__cp311-cp311-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:12.1.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.123.0
+    image: victoriametrics/victoria-metrics:v1.124.0
     volumes:
       - ~/.eth-portfolio/data/victoria/:/victoria-metrics-data
     command:

{eth_portfolio_temp-0.1.4.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.4.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.4.dev0.dist-info → eth_portfolio_temp-0.1.5.dev0.dist-info}/RECORD

@@ -1,34 +1,34 @@
-295eace8438df6ec133b__mypyc.cpython-311-darwin.so,sha256=0Q4Y7OzVQnKNtiyxw7dmTggsCSIviUsn-U4KlExH6P0,445088
+295eace8438df6ec133b__mypyc.cpython-311-darwin.so,sha256=PHkIVqcg9zoz9fUdqEr3KfP6Z5eQBjvtPmg39vfgi0Y,445088
 eth_portfolio/address.py,sha256=LvBh4Vp2DBC3gQ0WD-TZ6jfe9s6FZbET1krYG9_KMAA,14139
 eth_portfolio/_cache.py,sha256=PYkR-yExjuwd_t7swv4euxL2daJ-VFwh3EMb3MciRJE,4745
 eth_portfolio/_argspec.py,sha256=VzUZkbDkmOSgNUZBGbGblqtxBfDcmBAB89dY2OX0j-U,1595
-eth_portfolio/_argspec.cpython-311-darwin.so,sha256=PhCRzEveHZOMdVLcUwJ0RaBUI0OnGVrfgUznyKpA4Uo,50640
-eth_portfolio/_config.cpython-311-darwin.so,sha256=1GVJeZMOyVk3d5uiAYnsI8-p3u7-VZTQQq7qqY3BBjs,50640
+eth_portfolio/_argspec.cpython-311-darwin.so,sha256=BmO9sqIezUUbnJSdKuNQh1rA9yJaX5YcuhDRUIzQzhE,50640
+eth_portfolio/_config.cpython-311-darwin.so,sha256=ZLbL5552BwbaXvMzYef4gjreSjHVNGQqaei-ERA1VJI,50640
 eth_portfolio/_submodules.py,sha256=J8ht9bAAvblUXqwOGN7UIOXUPxrTiq7m1RWiB0-ObaE,2190
 eth_portfolio/constants.py,sha256=LS9H2P_Qfcreb6z6NknErxvq6OAtIHbHykXy0spol9E,3659
-eth_portfolio/_stableish.cpython-311-darwin.so,sha256=pazR2eHgbF3somgURfdlI4PC45_VGKDJL0VPWquHCNM,50656
+eth_portfolio/_stableish.cpython-311-darwin.so,sha256=ScmLxd72IDALLrihu4G4bQ0RBKUIdGN07ofxcwnfEQc,50656
 eth_portfolio/__init__.py,sha256=0sO4cSJaLYwJfnfVOJRFw7p5_Lzhsr95YuJ1aNQM83A,500
 eth_portfolio/_decimal.py,sha256=nuUl6DZHCtrbBN7snwvs4LLaoJ5k7mn3dt4qmlFCkTU,4731
 eth_portfolio/buckets.py,sha256=QwdqWzW9iWBmRcJ2aktRtL-obvtBnND179krY5ISbhY,6695
-eth_portfolio/constants.cpython-311-darwin.so,sha256=bdIC-c4X0Q5OsVaytPmkJ2hoRSb1VCyBEW6risCOnOs,50656
+eth_portfolio/constants.cpython-311-darwin.so,sha256=NmCsd-8B5HLfOxxW0P7D5WZBe6TVCZKpzmuUVV4kD8A,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/_config.py,sha256=mw-OA3M8rUA2hqy5wNt30AZRHkWFgR8K2sJg0o5Baxg,98
-eth_portfolio/_shitcoins.cpython-311-darwin.so,sha256=6MH7PGlSWLUAg8WPIdP4NOiCORCiHtMaKNL6zmw0ptk,50656
+eth_portfolio/_shitcoins.cpython-311-darwin.so,sha256=FqEcqyLumfjbMc9IUeA2HenY24jP1j5ZV51Jm8eAYbY,50656
 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/transaction.py,sha256=FEYdoNDCgD6-mqZT9MuyYIEkdhG3iUwyNeMmqjpMGJw,9146
 eth_portfolio/_loaders/__init__.py,sha256=lb45_0ak32Z7N3-Nx1CAoRKiZ1_w-_YGbmSCNuunro8,1702
-eth_portfolio/_loaders/_nonce.cpython-311-darwin.so,sha256=scdRAatlOozR1JP4U3Os56wnRQxln0ju7VDg7DR2sA4,50656
+eth_portfolio/_loaders/_nonce.cpython-311-darwin.so,sha256=8L2s-BYO0LBr_OyEtXXBof9axJxS3hH-bJCVIXfM_-4,50656
 eth_portfolio/_loaders/_nonce.py,sha256=cx0EjTAhVU2EudMKSO-7-t1jl3y4dYn6as4XiY6KyS8,6285
-eth_portfolio/_loaders/utils.cpython-311-darwin.so,sha256=yxEsOq2d30GlbCeaGcrorUzFgmmKUyEvMyWzx-J4fp0,50648
+eth_portfolio/_loaders/utils.cpython-311-darwin.so,sha256=ijuKPYC75mnZCWeBeTNfog3snWrbBuUFzsI1S-6Lpt0,50648
 eth_portfolio/_loaders/utils.py,sha256=my3Wg2Ip5gSWuzAWcoLQQEmVmAPhIHbBzQQc0iP1iCA,2258
 eth_portfolio/_loaders/balances.py,sha256=BTWfkJIoSraUMe94Wuj8NPyg5EO0OByIjbXu7j6PZEo,3132
 eth_portfolio/_loaders/token_transfer.py,sha256=MEw95D2iKBYa_9vIatCHJGe7zEJuYUEC8P1mTjjRXlo,8524
-eth_portfolio/_loaders/balances.cpython-311-darwin.so,sha256=WrtvSXIBh4nM36GYiWh-QbYbaEx9VL4Qr9v498YFxLw,50656
+eth_portfolio/_loaders/balances.cpython-311-darwin.so,sha256=vTJb5cUk1WPsNhrFcEKhccz3tJaKCkQ8mM9GnzeCO30,50656
 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
@@ -62,22 +62,22 @@ eth_portfolio_scripts/_portfolio.py,sha256=cv4Qpb3EdwhO2sZEOnHYFWOHaoFo6wwt3nddy
 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/balances.cpython-311-darwin.so,sha256=RZjNRimP12uEjHKndssb_641H2Yv57Ihh9HSLwPvaL8,50656
+eth_portfolio_scripts/balances.cpython-311-darwin.so,sha256=CRJce7VsjYvmZUsNIlmfPrva0aefrB0lGAmUMlpV6CY,50656
 eth_portfolio_scripts/_utils.py,sha256=qyct1Mwf2-1DYj7BUWt2bocUfGKMap1l9sxUfHAjER0,2538
-eth_portfolio_scripts/docker/docker-compose.yaml,sha256=mBJkXpf81nfIoVQm1UaJe_k3Ck7MZSmQeasIXjqAMRw,1809
+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.py,sha256=E6_Ar4dr6HfVAgpwoDPcObIolikHKQr8VFkH01sOuIM,1745
-eth_portfolio_scripts/docker/docker_compose.cpython-311-darwin.so,sha256=z1PMjTImGue4cvtpUO7QIr_LZMw0polE9ulo-mnDqNY,50712
+eth_portfolio_scripts/docker/docker_compose.cpython-311-darwin.so,sha256=_o4l5nCXlbCVMZBLgPTrsjVfytCX7VsuiviUZC6kLKg,50712
 eth_portfolio_scripts/docker/__init__.py,sha256=ZXSIYcjp94c0O9o39BDGWju3YrCMLl4gtov7YChc9Ig,393
-eth_portfolio_scripts/docker/check.cpython-311-darwin.so,sha256=FjMc3Mfw4OYSTm-Zygvpdyc2JVjBiY9CrPlX_8o_KIg,50664
-eth_portfolio_scripts/docker/__init__.cpython-311-darwin.so,sha256=VaG8UeRfO4izAYYKqYOjEV8Tki1ck2y87tWG2C8dUm0,50656
+eth_portfolio_scripts/docker/check.cpython-311-darwin.so,sha256=_oU0mmskDhKKtUvWkR2SMxrO4W-5ezDSnTaW2bTEVMA,50664
+eth_portfolio_scripts/docker/__init__.cpython-311-darwin.so,sha256=gYOt_vDbdkweXo-SkhH5XnTm2xuwtpp_r4g0Me1Ei5I,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.4.dev0.dist-info/RECORD,,
-eth_portfolio_temp-0.1.4.dev0.dist-info/WHEEL,sha256=sunMa2yiYbrNLGeMVDqEA0ayyJbHlex7SCn1TZrEq60,136
-eth_portfolio_temp-0.1.4.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.1.4.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.1.4.dev0.dist-info/METADATA,sha256=SjDTmz5ogp_V0TFCWuxv3Z08mFemCTnptYaMyEwWsxU,778
+eth_portfolio_temp-0.1.5.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.1.5.dev0.dist-info/WHEEL,sha256=sunMa2yiYbrNLGeMVDqEA0ayyJbHlex7SCn1TZrEq60,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