eth-portfolio-temp 0.1.3.dev0__cp311-cp311-win32.whl → 0.1.5.dev0__cp311-cp311-win32.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,22 +1,22 @@
-295eace8438df6ec133b__mypyc.cp311-win32.pyd,sha256=5v1lNOxv9C9MTBjQ1JKzLeuVAmuil3IA3120e25qs5Y,225792
+295eace8438df6ec133b__mypyc.cp311-win32.pyd,sha256=8y-d0G_FgNpQqRqK8STw-HJqNao9JZcARGCGCN719cU,225792
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp311-win32.pyd,sha256=fTO-4m_8lQXSYGn7-CIKK5Vo6SwY2bQFz_axknfbWtc,9216
+eth_portfolio/_argspec.cp311-win32.pyd,sha256=9kzrSvo6mKviMByf2vtwNUeH6st2NqZ4lfkSrOowqRc,9216
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp311-win32.pyd,sha256=6gGocjyYna5qlpUw25YxiUyzld9r6o6naPIrQAwUXSE,9216
+eth_portfolio/_config.cp311-win32.pyd,sha256=B6LJK-yG3h6iGAbiX86Bcc5GG74qxPKn1X8LL4PWHEg,9216
 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.cp311-win32.pyd,sha256=GM5UyzkhnYwgiDON71wArtO3Slg45IzACWNUFZdSi9s,9216
+eth_portfolio/_shitcoins.cp311-win32.pyd,sha256=s9svf0Tm1nSz4HTbp1SL2gLjfmsruhiB1jRnPz1JE2E,9216
 eth_portfolio/_shitcoins.py,sha256=7oJavDOL9wPptHmJK_3OQs-T4XfugWh_om8Zx1DfzZo,14439
-eth_portfolio/_stableish.cp311-win32.pyd,sha256=4BIiKNHMIWGIJ6AEW0s3vTsatbeYI8mqsSDrzbFJoR8,9216
+eth_portfolio/_stableish.cp311-win32.pyd,sha256=7NXnk2PpaBfXrZ7SjExZ6CAeJ049q9u_D39yBCQqOsM,9216
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
 eth_portfolio/_utils.py,sha256=2-9J4NGyJW5MxmG3L6j8wh8cwq_8qwl_jiJjLcc9SRw,7590
 eth_portfolio/address.py,sha256=RrFIWSx6jSITwh16Hqs6W6S9fz1KEaebQEk1vqL3HwI,14536
 eth_portfolio/buckets.py,sha256=pm2-_8VbGKpe6hHM6eysj17JK7Rhngr9-_gpVi-J1uA,6889
-eth_portfolio/constants.cp311-win32.pyd,sha256=sJQI5u5-P-lCNACdZjXm9U-NMAKnoxKlO1r73ifhon4,9216
+eth_portfolio/constants.cp311-win32.pyd,sha256=fo82_evJuMWT-mUNoB0EXZW9cmDc4R6pyBNqQht9fCI,9216
 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.cp311-win32.pyd,sha256=1dE0zYWa1wtINeFsm8MhgUUZGraL6n1p1R4QsTdkdVw,9216
+eth_portfolio/_loaders/_nonce.cp311-win32.pyd,sha256=EtMg00oUyoCBuacSDYCJRbvOv6VN8grPJRw3_NszulY,9216
 eth_portfolio/_loaders/_nonce.py,sha256=bA-5fZG8ALuADgQGrnoxt6p6j7QEwI6vIGnZRF1Zx7M,6481
-eth_portfolio/_loaders/balances.cp311-win32.pyd,sha256=tJC8OUAP6QD5qmMbHiw2lDImX1UE-KCYwXZZGFp6s8w,9216
+eth_portfolio/_loaders/balances.cp311-win32.pyd,sha256=XOHdFexzJW4USIs_29NKZA9172jQnsEnm0o4Mwmp104,9216
 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.cp311-win32.pyd,sha256=yKmY2gd_8v5xKtm_-QC0a5W4_m55p8u7ohWTkhXDA44,9216
+eth_portfolio/_loaders/utils.cp311-win32.pyd,sha256=5u5YFmDUwsNqU875M1qydYWLbol2IYSTwecfhxiCy9o,9216
 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=HUTeWShcQD4IzocTHmBOreml0jbVttLcaed1fNiJ2qg,5297
@@ -48,7 +48,7 @@ eth_portfolio/protocols/lending/__init__.py,sha256=4jKDPx3sb7Iyi9kOdJRpM6LJy_GhU
 eth_portfolio/protocols/lending/_base.py,sha256=_1zXroYHlliLP685xiRfw8I_tQOoZyaPlnxA_gzLytU,2311
 eth_portfolio/protocols/lending/compound.py,sha256=1aoksFSvIIsk-cNDs2-Kdwl-RtIdTzh3QgpksXG1kEs,7439
 eth_portfolio/protocols/lending/liquity.py,sha256=JQLObd59whRiZ9NADCLs94_3P-1Ff7xVGcTmqrOV_2w,4287
-eth_portfolio/protocols/lending/maker.py,sha256=aj7rQ0xC6BAlS43kYtDmk8n1ks3rA73sG1wXAkxijgM,3958
+eth_portfolio/protocols/lending/maker.py,sha256=CoQhaD7cJwfvIlXa7g9c9oHPPZcsgfd_FpKFQrPxIaI,4066
 eth_portfolio/protocols/lending/unit.py,sha256=OQGDZWdsTOUL4jOKJ1xef6wXhWLHnsRFJjAzn0XSBmM,2011
 eth_portfolio/structs/__init__.py,sha256=x-9CdKe8XMukp8Kjr_lD49ohrSd0iGEvvsMAHtAPrLI,1486
 eth_portfolio/structs/modified.py,sha256=QIuFh-u5VTHe0oborn3oHAiAGD0wqhUQW7XFJVZu2KI,1853
@@ -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=xa-xNI3w6P54evq0qfRL0Vv2LEZ-6GnNKsSfDVaK-H0,6905
 eth_portfolio_scripts/_utils.py,sha256=7maEWyS5i_Kp7iVaa5puf2ZyefqHDsUOqTDLz-UwIQY,2630
-eth_portfolio_scripts/balances.cp311-win32.pyd,sha256=LsVD13cN6kxXH-Eufp_a2iiT77MiaoneArZgBEQD8vw,9216
+eth_portfolio_scripts/balances.cp311-win32.pyd,sha256=uYdUIM33YWAq7Vo_nuqqGIsuglrwYlA65Wju-iz4oso,9216
 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__.cp311-win32.pyd,sha256=fR87JAGq764EGd-M6pN1FmyJlsrQewSuDKMnXHG5wGE,9216
+eth_portfolio_scripts/docker/__init__.cp311-win32.pyd,sha256=OzVB-c9ib_dratd3tbnjpbR-9lR4TcJu2gExkXPJ7C8,9216
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp311-win32.pyd,sha256=WVmd27kp9lfHonLRXUjjtws4EGoePoRm9fuBthgjLlg,9216
+eth_portfolio_scripts/docker/check.cp311-win32.pyd,sha256=qqQmCU7LTQIv5BXaYjMv8dsmqXYBHclD5oEHgTCMYKo,9216
 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.cp311-win32.pyd,sha256=_Z-zASv7z1RDjkgu15LF4mcDOmT42XhA4J1KS1Ay6Go,9216
+eth_portfolio_scripts/docker/docker-compose.yaml,sha256=lOQA7xSDGnM8wW1Ij6GUCiE9HkfxRF7FJXv9scWoAd8,1870
+eth_portfolio_scripts/docker/docker_compose.cp311-win32.pyd,sha256=o1CUIzEQccMXCckel9wWZuVfDdGMDi9Hqm8ntjpCCSc,9216
 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=R0VvKiAC0e57zZNihcCptVkFO5CBHIbp2trFYuyY01M,2038
 eth_portfolio_scripts/victoria/types.py,sha256=KNq8aIiNXeiDnCKL7xycmouo0YeKI-sbQkIcTymcSYk,745
-eth_portfolio_temp-0.1.3.dev0.dist-info/METADATA,sha256=uMMz3jD7M6ggNAH9uw9hlWIPlIUmb-UL5rxdu9pieoQ,803
-eth_portfolio_temp-0.1.3.dev0.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
-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/RECORD,,
+eth_portfolio_temp-0.1.5.dev0.dist-info/METADATA,sha256=YiKqMSH649oXjjOmlMOUb7fQTOq5ewn-kcDfma68vwA,803
+eth_portfolio_temp-0.1.5.dev0.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
+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/RECORD,,