yearn-treasury 0.0.35__tar.gz → 0.0.37__tar.gz

{yearn_treasury-0.0.35/yearn_treasury.egg-info → yearn_treasury-0.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yearn_treasury
-Version: 0.0.35
+Version: 0.0.37
 Summary: This WIP library runs the eth-portfolio and dao-treasury exporters for the Yearn Finance treasury.
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -15,8 +15,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10,<3.13
 Description-Content-Type: text/markdown
-Requires-Dist: dao-treasury<0.1,>=0.0.51
+Requires-Dist: dao-treasury<0.1,>=0.0.53
 Requires-Dist: eth-brownie<1.23,>=1.21.0
+Requires-Dist: faster-async-lru<3,>=2.0.5
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yearn-treasury"
-version = "0.0.35"
+version = "0.0.37"
 description = "This WIP library runs the eth-portfolio and dao-treasury exporters for the Yearn Finance treasury."
 authors = ["Bob The Buidler <you@example.com>"]
 packages = [{ include = "yearn_treasury/*" }]
@@ -22,8 +22,9 @@ yearn-treasury = "yearn_treasury.main:main"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
-dao-treasury = ">=0.0.51,<0.1"
+dao-treasury = ">=0.0.53,<0.1"
 eth-brownie = ">=1.21.0,<1.23"
+faster-async-lru = ">=2.0.5,<3"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "*"

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/setup.py

@@ -14,14 +14,14 @@ else:
             "yearn_treasury/rules/expense",
             # "yearn_treasury/rules/ignore",
             "yearn_treasury/rules/ignore/swaps/conversion_factory.py",
-            # "yearn_treasury/rules/ignore/swaps/curve.py",  push async-lru-c first
+            # "yearn_treasury/rules/ignore/swaps/curve.py",  enable with brownie 1.22.0
             "yearn_treasury/rules/ignore/swaps/gearbox.py",
             "yearn_treasury/rules/ignore/swaps/iearn.py",
             "yearn_treasury/rules/ignore/swaps/otc.py",
             "yearn_treasury/rules/ignore/swaps/pooltogether.py",
             "yearn_treasury/rules/ignore/swaps/synthetix.py",
             "yearn_treasury/rules/ignore/swaps/unwrapper.py",
-            # "yearn_treasury/rules/ignore/swaps/vaults.py",  push async-lru-c first
+            "yearn_treasury/rules/ignore/swaps/vaults.py",
             "yearn_treasury/rules/ignore/swaps/woofy.py",
             # "yearn_treasury/rules/ignore/swaps/yfi.py",  enable with brownie 1.22.0
             "yearn_treasury/rules/ignore/swaps/yla.py",

yearn_treasury-0.0.37/yearn_treasury/rules/__init__.py

@@ -0,0 +1,20 @@
+import os
+
+__ALRU_ENV_NAME = "ASYNC_LRU_ALLOW_SYNC"
+__ALRU_ENV_VAL = os.environ.get(__ALRU_ENV_NAME)
+os.environ[__ALRU_ENV_NAME] = "1"
+
+from yearn_treasury.rules.cost_of_revenue import *
+from yearn_treasury.rules.expense import *
+from yearn_treasury.rules.ignore import *
+from yearn_treasury.rules.other_expense import *
+from yearn_treasury.rules.other_income import *
+from yearn_treasury.rules.revenue import *
+
+if __ALRU_ENV_VAL is None:
+    os.environ.pop(__ALRU_ENV_NAME)
+else:
+    os.environ[__ALRU_ENV_NAME] = __ALRU_ENV_VAL
+
+del __ALRU_ENV_NAME
+del __ALRU_ENV_VAL

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/yearn_treasury/rules/ignore/swaps/curve.py

@@ -1,10 +1,10 @@
 from typing import Final
 
-from async_lru import alru_cache
 from brownie.exceptions import EventLookupError
 from brownie.network.event import _EventItem
 from dao_treasury import TreasuryTx, TreasuryWallet
 from eth_typing import ChecksumAddress
+from faster_async_lru import alru_cache
 from y import Contract, Network
 
 from yearn_treasury.constants import CHAINID, ZERO_ADDRESS
@@ -120,7 +120,9 @@ async def _is_curve_withdrawal_multi(tx: TreasuryTx) -> bool:
             pool = await Contract.coroutine(event.address)  # type: ignore [assignment]
             if await _is_old_style(tx, pool) or _is_new_style(tx, pool):
                 return True
-            print(f"unhandled curve pool: {tx} symbol={tx.symbol} name={tx.token.name}")
+            print(
+                f"unhandled curve pool: {tx} symbol={tx.symbol} name={tx.token.name} address={tx.token.address}"
+            )
         # Tokens rec'd
         elif tx.from_address == event.address and TreasuryWallet.check_membership(
             tx.to_address.address, tx.block  # type: ignore [union-attr, arg-type]

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/yearn_treasury/rules/ignore/swaps/vaults.py

@@ -1,8 +1,8 @@
 from typing import Final
 
-from async_lru import alru_cache
 from dao_treasury import TreasuryTx, TreasuryWallet
 from eth_typing import BlockNumber, ChecksumAddress
+from faster_async_lru import alru_cache
 from y import Contract, Network
 from y.prices.yearn import YearnInspiredVault
 

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/yearn_treasury/rules/ignore/swaps/yfi.py

@@ -46,21 +46,30 @@ def is_buying_with_buyer(tx: TreasuryTx) -> bool:
             events = tx.events
         except KeyError as e:
             if "components" in str(e):
+                print(f"cannot parse events of possible YFI buyback {tx}")
                 return False
             raise
 
         if "Buyback" in events:
-            buyback_event = events["Buyback"]
-            if buyback_event.address in VYPER_BUYERS and all(
+            buyback_events = events["Buyback"]
+            if len(buyback_events) > 1:
+                print(f"Must code handler for multiple Buyback events in one tx: {tx}")
+                return False
+            buyback_event = buyback_events[0]
+            if buyback_event.address in VYPER_BUYERS and all(  # type: ignore [attr-defined]
                 arg in buyback_event for arg in ("buyer", "yfi", "dai")
             ):
-                buyback_amount = Decimal(buyback_event["yfi"]) / 10**18  # type: ignore [arg-type]
-                if tx.amount == buyback_amount:
+                # TODO get rid of this rounding once we've swapped out sqlite for postgres
+                buyback_amount = Decimal(buyback_event["yfi"]) / 10**18  # type: ignore [call-overload]
+                if round(tx.amount, 15) == round(buyback_amount, 15):
                     return True
                 print(
-                    f"from node: {buyback_amount} from db: {tx.amount} diff: {buyback_amount - tx.amount}"
+                    f"from node: {buyback_amount} "
+                    f"from db: {tx.amount} "
+                    f"diff: {buyback_amount - tx.amount}"
                 )
-                # raise ValueError(f'from node: {buyback_amount} from db: {tx.amount} diff: {buyback_amount - tx.amount}')
+            else:
+                print("unhandled Buyback event: buyback_event")
     return False
 
 

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/yearn_treasury/rules/revenue/vaults.py

@@ -1,9 +1,9 @@
 from logging import getLogger
 from typing import Final, Optional
 
-from async_lru import alru_cache
 from dao_treasury import TreasuryTx, revenue
 from eth_typing import ChecksumAddress
+from faster_async_lru import alru_cache
 from y import Contract, Network
 
 from yearn_treasury.vaults import v1, v2

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37}/yearn_treasury/shitcoins.py

@@ -50,6 +50,8 @@ _SHITCOINS: Final = {
         "0xe5868468Cb6Dd5d6D7056bd93f084816c6eF075f",
         "0x0a24Bb4842c301276c65086B5d78D5C872993c72",
         "0x63125c0d5Cd9071de9A1ac84c400982f41C697AE",
+        "0x4d22921215cF37e8d49e2Ac6d1F5e9672f63A7c6",
+        "0xe2549E429B78458fa60BC7B1b284d4411E1D5105",
         # just andre tinkering
         "0x5cB5e2d7Ab9Fd32021dF8F1D3E5269bD437Ec3Bf",
         # these arent shitcoins per se but we can't price them and dont expect to in the future, lets save cpu cycles

{yearn_treasury-0.0.35 → yearn_treasury-0.0.37/yearn_treasury.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yearn_treasury
-Version: 0.0.35
+Version: 0.0.37
 Summary: This WIP library runs the eth-portfolio and dao-treasury exporters for the Yearn Finance treasury.
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -15,8 +15,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10,<3.13
 Description-Content-Type: text/markdown
-Requires-Dist: dao-treasury<0.1,>=0.0.51
+Requires-Dist: dao-treasury<0.1,>=0.0.53
 Requires-Dist: eth-brownie<1.23,>=1.21.0
+Requires-Dist: faster-async-lru<3,>=2.0.5
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

yearn_treasury-0.0.37/yearn_treasury.egg-info/requires.txt

@@ -0,0 +1,3 @@
+dao-treasury<0.1,>=0.0.53
+eth-brownie<1.23,>=1.21.0
+faster-async-lru<3,>=2.0.5

yearn_treasury-0.0.35/yearn_treasury/rules/__init__.py

@@ -1,6 +0,0 @@
-from yearn_treasury.rules.cost_of_revenue import *
-from yearn_treasury.rules.expense import *
-from yearn_treasury.rules.ignore import *
-from yearn_treasury.rules.other_expense import *
-from yearn_treasury.rules.other_income import *
-from yearn_treasury.rules.revenue import *

yearn_treasury-0.0.35/yearn_treasury.egg-info/requires.txt

@@ -1,2 +0,0 @@
-dao-treasury<0.1,>=0.0.51
-eth-brownie<1.23,>=1.21.0