yearn-treasury 0.0.39__tar.gz → 0.0.45__tar.gz

{yearn_treasury-0.0.39/yearn_treasury.egg-info → yearn_treasury-0.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yearn_treasury
-Version: 0.0.39
+Version: 0.0.45
 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,7 @@ 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.55
-Requires-Dist: eth-brownie<1.23,>=1.21.0
+Requires-Dist: dao-treasury==0.0.67
 Requires-Dist: faster-async-lru<3,>=2.0.5
 Dynamic: classifier
 Dynamic: description

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yearn-treasury"
-version = "0.0.39"
+version = "0.0.45"
 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/*" }]
@@ -12,8 +12,9 @@ requires = [
     "mypy[mypyc]==1.18.2",
     "tomli>=2.0.0; python_version < '3.11'",
     "types-requests",
-    "dao-treasury>=0.0.45,<0.1; platform_system == 'Linux'",
-    "eth-typing==4.4.0",
+    "dao-treasury==0.0.66; platform_system == 'Linux'",
+    "eth-brownie==1.22.0.dev0; platform_system == 'Linux'",
+    "eth-typing==5.2.1",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -22,12 +23,11 @@ yearn-treasury = "yearn_treasury.main:main"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
-dao-treasury = ">=0.0.55,<0.1"
-eth-brownie = ">=1.21.0,<1.23"
+dao-treasury = "==0.0.67"
 faster-async-lru = ">=2.0.5,<3"
 
 [tool.poetry.group.dev.dependencies]
-mypy = "*"
+mypy = "1.18.2"
 types-requests = "*"
 
 [tool.poetry.group.docs.dependencies]

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/setup.py

@@ -14,6 +14,7 @@ else:
             "yearn_treasury/rules/expense",
             # "yearn_treasury/rules/ignore",
             "yearn_treasury/rules/ignore/swaps/conversion_factory.py",
+            "yearn_treasury/rules/ignore/swaps/auctions.py",
             # "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",
@@ -23,7 +24,7 @@ else:
             "yearn_treasury/rules/ignore/swaps/unwrapper.py",
             "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/yfi.py",
             "yearn_treasury/rules/ignore/swaps/yla.py",
             "yearn_treasury/rules/ignore/general.py",
             "yearn_treasury/rules/ignore/unit.py",
@@ -40,7 +41,7 @@ else:
             "yearn_treasury/_db.py",
             "yearn_treasury/_ens.py",
             "yearn_treasury/_logging.py",
-            # "yearn_treasury/vaults.py",  enable with brownie 1.22.0
+            "yearn_treasury/vaults.py",
             "--strict",
             "--pretty",
             "--disable-error-code=unused-ignore",
@@ -48,6 +49,7 @@ else:
             "--disable-error-code=no-any-return",
             "--disable-error-code=misc",  # TODO: drop support for 32bit systems
         ],
+        group_name="yearn_treasury",
     )
 
 

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/_logging.py

@@ -25,6 +25,8 @@ suppress_logs_for: Final[Dict[Network, List[HexAddress]]] = {
         "0xBF7AA989192b020a8d3e1C65a558e123834325cA",  # unpriceable yvWBTC - This vault had a bug and does not have a pricePerShare
         "0x5aFE3855358E112B5647B952709E6165e1c1eEEe",  # SAFE - This was not tradeable at the time of the first airdrops
         "0x718AbE90777F5B778B52D553a5aBaa148DD0dc5D",  # yvCurve-alETH - The underlying curve pool had an issue and is unpriceable
+        "0x3819f64f282bf135d62168C1e513280dAF905e06",  # HDRN
+        "0x5fAa989Af96Af85384b8a938c2EdE4A7378D9875",  # GAL
     ],
 }
 

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/address_labels.yaml

@@ -28,6 +28,12 @@
     - "0xC564EE9f21Ed8A2d8E7e76c085740d5e4c5FaFbE"
   yLockers Multisig:
     - "0x4444AAAACDBa5580282365e25b16309Bd770ce4a"
+  yRoboTreasury Treasury Contract:
+    - "0xEf77cc176c748d291EfB6CdC982c5744fC7211c8"
+  yRoboTreasury Stables Reserve:
+    - "0x278374fFb10B7D16E7633444c13e6E565EA57c28"
+  yearn.fi Dutch Auctions:
+    - "0x861fE45742f70054917B65bE18904662bD0dBd30"
 250:
   Yearn Strategist Multisig:
     - "0x72a34AbafAB09b15E7191822A679f28E067C4a16"

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/main.py

@@ -2,9 +2,9 @@
 Command-line interface for the Yearn Treasury exporter.
 
 This module provides the `yearn-treasury` CLI, which connects to a Brownie network
-based on the `--network` option (or the `BROWNIE_NETWORK_ID` environment variable),
-periodically snapshots treasury balances via :func:`export_balances`, and
-pushes metrics to Victoria Metrics.
+(based on the `--network` option or the `BROWNIE_NETWORK_ID` environment variable),
+periodically snapshots treasury metrics, and pushes them to Victoria Metrics.
+It also launches Yearn Treasury's Grafana dashboard and an optional renderer for visual reports.
 
 Example:
     Run export every 12 hours on mainnet:
@@ -12,15 +12,24 @@ Example:
     .. code-block:: bash
 
         yearn-treasury run --network mainnet --interval 12h
+
+CLI Options:
+    --network         Brownie network identifier (default: mainnet)
+    --interval        Time interval between datapoints (default: 12h)
+    --concurrency     Max number of historical blocks to export concurrently (default: 30)
+    --daemon          Run as a background daemon (currently unsupported)
+    --grafana-port    Port for the Grafana dashboard (default: 3004)
+    --victoria-port   Port for the Victoria metrics endpoint (default: 8430)
+    --start-renderer  Start the Grafana renderer container for dashboard image export
+    --renderer-port   Port for the renderer service (default: 8080)
 """
 
 import asyncio
 import os
 from argparse import ArgumentParser
-from pathlib import Path
 from typing import Final, final
 
-from eth_portfolio_scripts.balances import export_balances
+from yearn_treasury import yteams
 
 
 parser = ArgumentParser(description="Treasury CLI")
@@ -42,8 +51,8 @@ run_parser.add_argument(
 run_parser.add_argument(
     "--concurrency",
     type=int,
-    help="The max number of historical blocks to export concurrently. default: 40",
-    default=40,
+    help="The max number of historical blocks to export concurrently. default: 30",
+    default=30,
 )
 run_parser.add_argument(
     "--daemon",
@@ -83,23 +92,19 @@ BROWNIE_NETWORK = os.environ["BROWNIE_NETWORK_ID"]
 # TODO: run forever arg
 def main() -> None:
     """
-    Connect to the configured Brownie network and start the export loop.
+    Connect to the configured Brownie network, clean up the database, and start the export loop.
 
     This function is registered as a console script entrypoint under
-    ``yearn-treasury`` and delegates execution to Brownie's script runner.
-
-    Steps:
+    ``yearn-treasury``. It performs the following steps:
         1. Reads the ``BROWNIE_NETWORK_ID`` environment variable (populated from
            the ``--network`` option or existing env var).
-        2. Connects to that Brownie network.
-        3. Patches the global SHITCOINS mapping with local tokens.
-        4. Constructs a frozen Args subclass to pass CLI parameters to
-           :func:`export_balances`.
-        5. Exports ports for external services into environment variables.
-        6. Runs :func:`eth_portfolio_scripts.balances.export_balances` under asyncio.
-
-    Raises:
-        RuntimeError: If the Brownie network cannot be determined.
+        2. Connects to the specified Brownie network.
+        3. Merges local SHITCOINS into eth_portfolio's config to skip tokens we don't care about.
+        4. Drops any shitcoin transactions that might be in the database.
+        5. Constructs an immutable Args subclass to pass CLI parameters to
+           :func:`dao_treasury.main.export`.
+        6. Exports ports for external services into environment variables.
+        7. Runs both the DAO Treasury export and Yearn team revenue/expenses calculation concurrently under asyncio.
     """
     import dao_treasury.db
     import eth_portfolio
@@ -115,7 +120,10 @@ def main() -> None:
     @final
     class Args(constants.Args):
         """
-        Immutable container of CLI arguments for :func:`~export_balances`.
+        Immutable container of CLI arguments for export and dashboard/renderer configuration.
+
+        Inherits from DAO Treasury's :class:`constants.Args` and is used to pass runtime
+        parameters to the DAO Treasury export and related services.
         """
 
         network: Final[str] = args.network
@@ -149,7 +157,20 @@ def main() -> None:
     os.environ["DAO_TREASURY_RENDERER_PORT"] = str(Args.renderer_port)
     os.environ["VICTORIA_PORT"] = str(Args.victoria_port)
 
+    async def yearn_wrapper():
+        """
+        Run the DAO Treasury export and Yearn team revenue/expenses calculation concurrently.
+
+        This coroutine gathers:
+            - The main DAO Treasury export process (dao_treasury.main.export)
+            - The Yearn teams' revenue and expenses calculation (yteams.calculate_teams_revenue_expenses)
+        """
+        return await asyncio.gather(
+            dao_treasury.main.export(Args),
+            yteams.calculate_teams_revenue_expenses(),
+        )
+
     # Start the balance export routine
-    asyncio.get_event_loop().run_until_complete(dao_treasury.main.export(Args))
+    asyncio.get_event_loop().run_until_complete(yearn_wrapper())
 
     rules  # I just put this here so the import isn't flagged as unused

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/ignore/swaps/__init__.py

@@ -7,6 +7,7 @@ swaps: Final[SortRuleFactory[IgnoreSortRule]] = ignore("Swaps")
 
 
 from yearn_treasury.rules.ignore.swaps.aave import *
+from yearn_treasury.rules.ignore.swaps.auctions import *
 from yearn_treasury.rules.ignore.swaps.compound import *
 from yearn_treasury.rules.ignore.swaps.conversion_factory import *
 from yearn_treasury.rules.ignore.swaps.cowswap import *

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/ignore/swaps/aave.py

@@ -43,20 +43,27 @@ async def is_aave_withdrawal(tx: TreasuryTx) -> bool:
                 if (
                     from_address == event["_user"]
                     and await token.contract.underlyingAssetAddress == event["_reserve"]
-                    and token.scale_value(event["_amount"]) == tx.amount
                 ):
-                    return True
+                    # TODO get rid of this rounding when we migrate the db to postgres
+                    event_amount = round(token.scale_value(event["_amount"]), 11)
+                    if event_amount == round(tx.amount, 11):
+                        return True
+                    print(
+                        f"Aave Withdrawal atoken side does not match: {round(tx.amount, 14)}  {event_amount}"
+                    )
 
     # Underlying side
     if TreasuryWallet.check_membership(tx.to_address.address, tx.block):  # type: ignore [union-attr, arg-type]
         token = tx.token
         for event in await tx.get_events("RedeemUnderlying", sync=False):
-            if (
-                token == event["_reserve"]
-                and to_address == event["_user"]
-                and token.scale_value(event["_amount"]) == tx.amount
-            ):
-                return True
+            if token == event["_reserve"] and to_address == event["_user"]:
+                # TODO get rid of this rounding when we migrate the db to postgres
+                event_amount = round(token.scale_value(event["_amount"]), 11)
+                if event_amount == round(tx.amount, 11):
+                    return True
+                print(
+                    f"Aave Withdrawal underlying side does not match: {round(tx.amount, 14)}  {event_amount}"
+                )
 
     # TODO: If these end up becoming more frequent, figure out sorting hueristics.
     return tx.hash == "0x36ee5631859a15f57b44e41b8590023cf6f0c7b12d28ea760e9d8f8003f4fc50"

yearn_treasury-0.0.45/yearn_treasury/rules/ignore/swaps/auctions.py

@@ -0,0 +1,31 @@
+from typing import Final
+
+from dao_treasury import TreasuryTx
+from y import Network
+
+from yearn_treasury.rules.ignore.swaps import swaps
+
+
+auctions: Final = swaps("Auctions")
+
+YEARNFI_DUTCH_AUCTIONS: Final = "0x861fE45742f70054917B65bE18904662bD0dBd30"
+
+
+@auctions("Auction Proceeds", Network.Mainnet)
+async def is_auction_proceeds(tx: TreasuryTx) -> bool:
+    # NOTE: the other side of these swaps is currently recorded under
+    # 'Ignore:Internal Transfer' when it goes to the Generic bucket contract
+    if tx.from_nickname != "Contract: GPv2Settlement":
+        return False
+
+    for trade in await tx.get_events("Trade", sync=False):
+        if trade["owner"] != YEARNFI_DUTCH_AUCTIONS or tx.token != trade["buyToken"]:
+            continue
+        buy_amount = tx.token.scale_value(trade["buyAmount"])
+        if round(buy_amount, 14) == round(tx.amount, 14):
+            return True
+        print(
+            f"auction proceeds amount does not match: {round(buy_amount, 14)}  {round(tx.amount, 14)}"
+        )
+
+    return False

yearn_treasury-0.0.45/yearn_treasury/rules/ignore/swaps/compound.py

@@ -0,0 +1,58 @@
+from typing import Final
+
+from dao_treasury import TreasuryTx
+
+from yearn_treasury.rules.ignore.swaps import swaps
+
+
+compound: Final = swaps("Compound")
+
+
+@compound("Deposit")
+async def is_compound_deposit(tx: TreasuryTx) -> bool:
+    for event in await tx.get_events("Mint", sync=False):
+        if all(arg in event for arg in ("minter", "mintTokens", "mintAmount")):
+            minter = event["minter"]
+            minted = tx.token.scale_value(event["mintTokens"])
+            # cToken side
+            if tx.token == tx.from_address == event.address and tx.to_address == minter:
+                # TODO: get rid of this rounding when we migrate to postgres
+                if round(minted, 14) == round(tx.amount, 14):
+                    return True
+                print(
+                    f"Compound deposit ctoken side does not match: {round(minted, 14)}  {round(tx.amount, 14)}"
+                )
+            # underlying side
+            elif tx.to_address == event.address and tx.from_address == minter:
+                # TODO: get rid of this rounding when we migrate to postgres
+                if round(minted, 14) == round(tx.amount, 14):
+                    return True
+                print(
+                    f"Compound deposit underlying side does not match: {round(minted, 14)}  {round(tx.amount, 14)}"
+                )
+    return False
+
+
+@compound("Withdrawal")
+async def is_compound_withdrawal(tx: TreasuryTx) -> bool:
+    for event in await tx.get_events("Redeem", sync=False):
+        if all(arg in event for arg in ("redeemer", "redeemTokens", "redeemAmount")):
+            redeemer = event["redeemer"]
+            redeemed = tx.token.scale_value(event["redeemTokens"])
+            # cToken side
+            if tx.token == event.address and tx.from_address == redeemer:
+                # TODO: get rid of this rounding when we migrate to postgres
+                if round(redeemed, 7) == round(tx.amount, 7):
+                    return True
+                print(
+                    f"Compound withdrawal ctoken side does not match: {round(redeemed, 7)}  {round(tx.amount, 7)}"
+                )
+            # underlying side
+            elif tx.to_address == redeemer and tx.from_address == event.address:
+                # TODO: get rid of this rounding when we migrate to postgres
+                if round(redeemed, 14) == round(tx.amount, 14):
+                    return True
+                print(
+                    f"Compound withdrawal underlying side does not match: {round(redeemed, 14)}  {round(tx.amount, 14)}"
+                )
+    return False

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/ignore/swaps/cowswap.py

@@ -10,7 +10,7 @@ from yearn_treasury.rules.ignore.swaps import swaps
 from yearn_treasury.rules.ignore.swaps._skip_tokens import SKIP_TOKENS
 
 
-YSWAPS: Final = "0x9008D19f58AAbD9eD0D60971565AA8510560ab41"
+COWSWAP: Final = "0x9008D19f58AAbD9eD0D60971565AA8510560ab41"
 
 
 @swaps("Cowswap", Network.Mainnet)
@@ -34,23 +34,26 @@ def is_cowswap_swap(tx: TreasuryTx) -> bool:
 
     for trade in tx.events["Trade"]:
         if (
-            trade.address == YSWAPS
+            trade.address == COWSWAP
             and TreasuryWallet.check_membership(trade["owner"], block)
             and trade["buyToken"] not in SKIP_TOKENS
         ):
             # buy side
-            if (
-                token_address == trade["buyToken"]
-                and TreasuryWallet.check_membership(tx.to_address.address, block)  # type: ignore [union-attr, arg-type]
-                and amount == token.scale_value(trade["buyAmount"])
+            if token_address == trade["buyToken"] and TreasuryWallet.check_membership(
+                tx.to_address.address, block  # type: ignore [union-attr, arg-type]
             ):
-                return True
+                # TODO get rid of this rounding when we move to postgres
+                buy_amount = round(token.scale_value(trade["buyAmount"]), 8)
+                if round(amount, 8) == buy_amount:
+                    return True
+                print(f"Cowswap buy amount does not match: {round(amount, 8)}   {buy_amount}")
             # sell side
-            elif (
-                token_address == trade["sellToken"]
-                and tx.from_address == trade["owner"]
-                and amount == token.scale_value(trade["sellAmount"])
-            ):
+            elif token_address == trade["sellToken"] and tx.from_address == trade["owner"]:
+                # TODO get rid of this rounding when we move to postgres
+                sell_amount = round(token.scale_value(trade["sellAmount"]), 8)
+                if round(amount, 8) != sell_amount:
+                    print(f"Cowswap sell amount does not match: {round(amount, 8)}   {sell_amount}")
+                    continue
                 # Did Yearn actually receive the other side of the trade?
                 for address in TREASURY_WALLETS:
                     if TreasuryWallet.check_membership(address, block):
@@ -59,7 +62,7 @@ def is_cowswap_swap(tx: TreasuryTx) -> bool:
                             for t in TreasuryTx  # type: ignore [attr-defined]
                             if t.hash == tx.hash
                             and t.token.address.address == trade["buyToken"]
-                            and t.from_address.address == YSWAPS
+                            and t.from_address.address == COWSWAP
                             and t.to_address.address == address
                         )
 

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/ignore/swaps/curve.py

@@ -50,11 +50,19 @@ async def is_curve_deposit(tx: TreasuryTx) -> bool:
         # Tokens sent
         elif tx.to_address == event.address:
             try:
+                tx_amount = round(tx.amount, 8)
                 for i, amount in enumerate(event["token_amounts"]):
-                    if tx.amount == tx.token.scale_value(amount):
+                    # TODO: get rid of this rounding when we migrate to postgres
+                    event_amount = round(tx.token.scale_value(amount), 8)
+                    if tx_amount == event_amount:
                         pool = await Contract.coroutine(event.address)  # type: ignore [assignment]
                         if tx.token == await _get_coin_at_index(pool, i):
                             return True
+                        return True
+                else:
+                    print(
+                        f"Curve AddLiquidity sent amount does not match: {tx_amount}  {event_amount}"
+                    )
             except EventLookupError:
                 pass
 
@@ -67,10 +75,16 @@ async def is_curve_deposit(tx: TreasuryTx) -> bool:
             print(f"AddLiquidity-3crv: {event}")
             token = tx.token
             for i, amount in enumerate(event["token_amounts"]):
-                if tx.amount == token.scale_value(amount):
+                event_amount = token.scale_value(amount)
+                # TODO: get rid of this rounding when we migrate to postgres
+                if round(tx.amount, 14) == round(event_amount, 14):
                     pool = await Contract.coroutine(event.address)  # type: ignore [assignment]
                     if token == await _get_coin_at_index(pool, i):
                         return True
+                else:
+                    print(
+                        f"AddLiquidity-3crv amount does not match: {round(tx.amount, 14)}  {round(event_amount)}"
+                    )
 
     # TODO: see if we can remove these with latest hueristics
     return CHAINID == Network.Mainnet and tx.hash in (
@@ -98,17 +112,24 @@ async def is_curve_withdrawal(tx: TreasuryTx) -> bool:
 def _is_curve_withdrawal_one(tx: TreasuryTx) -> bool:
     for event in tx.get_events("RemoveLiquidityOne"):
         # LP Token Side
-        if (
-            tx.to_address == ZERO_ADDRESS
-            and _token_is_curvey(tx)
-            and tx.amount == tx.token.scale_value(event["token_amount"])
-        ):
-            return True
+        if tx.to_address == ZERO_ADDRESS and _token_is_curvey(tx):
+            # TODO: get rid of this rounding when we migrate to postgres
+            event_amount = round(tx.token.scale_value(event["token_amount"]), 9)
+            if round(tx.amount, 9) == event_amount:
+                return True
+            print(
+                f"Curve withdrawal one curvey amount does not match: {round(tx.amount, 9)}  {event_amount}"
+            )
         # Tokens rec'd
-        elif tx.from_address == event.address and tx.amount == tx.token.scale_value(
-            event["coin_amount"]
-        ):
+        if tx.from_address != event.address:
+            continue
+        # TODO: get rid of this rounding when we migrate to postgres
+        event_amount = tx.token.scale_value(event["coin_amount"])
+        if round(tx.amount, 9) == round(event_amount, 9):
             return True
+        print(
+            f"Curve withdrawal one amount does not match: {round(tx.amount, 9)}  {round(event_amount, 9)}"
+        )
     return False
 
 
@@ -127,15 +148,22 @@ async def _is_curve_withdrawal_multi(tx: TreasuryTx) -> bool:
         elif tx.from_address == event.address and TreasuryWallet.check_membership(
             tx.to_address.address, tx.block  # type: ignore [union-attr, arg-type]
         ):
+            tx_amount = round(tx.amount, 7)
             try:
                 for i, amount in enumerate(event["token_amounts"]):
-                    if tx.amount == tx.token.scale_value(amount):
+                    # TODO: get rid of this rounding when we migrate to postgres
+                    event_amount = round(tx.token.scale_value(amount), 7)
+                    if tx_amount == event_amount:
                         pool = await Contract.coroutine(event.address)  # type: ignore [assignment]
                         if hasattr(pool, "underlying_coins"):
                             coin: ChecksumAddress = await pool.underlying_coins.coroutine(i)
                             return tx.token == coin
                         else:
                             return tx.token == await _get_coin_at_index(pool, i)
+                    else:
+                        print(
+                            f"Curve withdrawal multi amount does not match: {tx_amount}  {event_amount}"
+                        )
             except EventLookupError:
                 # some other event has different keys, maybe we need to implement logic to capture these. time will tell.
                 pass

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/ignore/swaps/uniswap.py

@@ -57,7 +57,7 @@ async def is_uniswap_deposit(tx: TreasuryTx) -> bool:
                         if any(
                             tokens[1] == transfer.address
                             and tx.to_address
-                            == transfer.values()[:1]
+                            == transfer.values()[:1]  # type: ignore [index]
                             == [mint["sender"], mint.address]
                             for transfer in transfers
                         ):
@@ -78,7 +78,7 @@ async def is_uniswap_deposit(tx: TreasuryTx) -> bool:
                         if any(
                             tokens[0] == transfer.address
                             and tx.to_address
-                            == transfer.values()[:1]
+                            == transfer.values()[:1]  # type: ignore [index]
                             == [mint["sender"], mint.address]
                             for transfer in transfers
                         ):
@@ -243,11 +243,21 @@ async def is_uniswap_swap(tx: TreasuryTx) -> bool:
                 continue
 
             if tx.token == token0:
-                if tx.token.scale_value(swap["amount0In"]) == tx.amount:
+                # TODO: get rid of this rounding when we migrate to postgres
+                event_amount = round(tx.token.scale_value(swap["amount0In"]), 10)
+                if event_amount == round(tx.amount, 10):
                     return True
+                print(
+                    f"Uniswap sell token0 amount does not match: {round(tx.amount, 10)}  {event_amount}"
+                )
             elif tx.token == token1:
-                if tx.token.scale_value(swap["amount1In"]) == tx.amount:
+                # TODO: get rid of this rounding when we migrate to postgres
+                event_amount = round(tx.token.scale_value(swap["amount1In"]), 10)
+                if event_amount == round(tx.amount, 10):
                     return True
+                print(
+                    f"Uniswap sell token1 amount does not match: {round(tx.amount, 10)}  {event_amount}"
+                )
 
         # Buy side
         elif tx.from_address == swap.address and TreasuryWallet._get_instance(
@@ -262,11 +272,21 @@ async def is_uniswap_swap(tx: TreasuryTx) -> bool:
                 # This will be recorded elsewhere
                 continue
             if "amount0Out" in swap and tx.token == token0:
-                if tx.token.scale_value(swap["amount0Out"]) == tx.amount:
+                # TODO: get rid of this rounding when we migrate to postgres
+                event_amount = round(tx.token.scale_value(swap["amount0Out"]), 9)
+                if event_amount == round(tx.amount, 9):
                     return True
+                print(
+                    f"Uniswap buy token0 amount does not match: {round(tx.amount, 9)}  {event_amount}"
+                )
             elif "amount1Out" in swap and tx.token == token1:
-                if tx.token.scale_value(swap["amount1Out"]) == tx.amount:
+                # TODO: get rid of this rounding when we migrate to postgres
+                event_amount = round(tx.token.scale_value(swap["amount1Out"]), 10)
+                if event_amount == round(tx.amount, 10):
                     return True
+                print(
+                    f"Uniswap buy token1 amount does not match: {round(tx.amount, 10)}  {event_amount}"
+                )
     return False
 
 

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/ignore/swaps/yfi.py

@@ -104,7 +104,8 @@ def is_buying_with_auction(tx: TreasuryTx) -> bool:
             if tx.from_address != receiver:
                 print(f"Transfer does not match auction taker:  taker={tx.from_address.address}  transfer={receiver}")  # type: ignore [union-attr]
                 continue
-            if amount == event["taken"]:  # type: ignore [call-overload]
+            # TODO get rid of this rounding once we've swapped out sqlite for postgres
+            if round(amount, 14) == round(event["taken"], 14):  # type: ignore [call-overload]
                 return True
             print(f"AuctionTaken: {event} amount does not match Transfer: {transfer}")
     return False

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/rules/other_income/misc.py

@@ -29,7 +29,7 @@ async def is_robovault_share(tx: TreasuryTx) -> bool:
         return False
 
     try:
-        strat = await Contract.coroutine(tx.from_address.address)
+        strat = await tx.from_address.contract_coro
     except ContractNotVerified:
         return False
     else:

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/shitcoins.py

@@ -54,6 +54,9 @@ _SHITCOINS: Final = {
         "0xe2549E429B78458fa60BC7B1b284d4411E1D5105",
         "0xCfdD747d041397bcE08B0Fe6ebF7Ef65E9F46795",
         "0x9745969171a38B40db05c506fe2DA2C36f317627",
+        "0x6051C1354Ccc51b4d561e43b02735DEaE64768B8",
+        "0xf0814d0E47F2390a8082C4a1BD819FDDe50f9bFc",
+        "0x2DBd330bC9B7f3A822a9173aB52172BdDDcAcE2A",
         # 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
@@ -80,6 +83,8 @@ _SHITCOINS: Final = {
         "0xdE56173463d6461001B0891bC90DB224965f5762",  # MAGNUS
         "0x922824A5b3B3D5f4485fF52F4Ab7Cba5eA491874",  # POSEIDON
         "0x84F7D2f6FB447Bb11d3E7Ce64D83e1c02c2F3078",  # VIRTUAL
+        "0x5C6Ed14E1017cf75C237A4A4b93Ce1D2f83EB002",  # GRVT
+        "0xf76E6eFf109258fd5F52823d9F9feE7c90C97251",  # wkeyDAO
         # test token?
         "0x372d5d02c6b4075bd58892f80300cA590e92d29E",  # tOUSG
         # dETH? don't think this is needed
@@ -106,6 +111,8 @@ _SHITCOINS: Final = {
         "0xc83377b9eE3CEe4Cc03CCd58AfdE1FB12864aEE3",  # E AI
         "0x927402ab67c0CDA3c187E9DFE34554AC581441f2",  # SAITABIT
         "0x691539810DF6e879A377C24CfEE130BBE92708d8",  # NVIDIA AI
+        "0xdC82aC0A89197854cb2240FaBF7E7760a4fF4d9e",  # NVIDIA
+        "0x5Fba8ea5A559CF5c99BA6dd884Ae17C1d621fE5B",  # OSCAR AI
         # matt furry spam
         "0x73228b3D33cC71cB721Fc62950577bE63bd9c8C9",  # Maskman by Matt Furie
         "0x7c28e66436C93BB9F657dDF2BA0eeeCf61369b92",  # Bloodboy by Matt Furie

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury/vaults.py

@@ -12,7 +12,7 @@ Key Responsibilities:
     - Provide lookup tables for use in vault deposit/withdrawal sort rules.
 """
 
-from typing import Dict, Final, List
+from typing import Dict, Final
 
 from brownie import chain
 from eth_typing import ChecksumAddress
@@ -41,11 +41,10 @@ if chain.id == Network.Mainnet:
 
     # TODO: make resolve_ens util in eth-port and refactor this out
     v2_registries = [
-        event["newAddress"].hex()  # type: ignore [attr-defined]
-        for event in Events(addresses=resolver, topics=topics).events(now)
+        event["newAddress"].hex() for event in Events(addresses=resolver, topics=topics).events(now)
     ]
 
     for event in Events(addresses=list(map(str, v2_registries))).events(now):
         if event.name == "NewVault":
             vault_address = event["vault"]
-            v2[vault_address] = Contract(vault_address)  # type: ignore [index]
+            v2[vault_address] = Contract(vault_address)

yearn_treasury-0.0.45/yearn_treasury/yteams.py

@@ -0,0 +1,208 @@
+# This is a loose copy of an old script and will not likely be refactored into something pretty
+import os
+from datetime import datetime, timedelta, timezone
+from decimal import Decimal
+from functools import lru_cache
+from logging import getLogger
+from typing import Any, Dict, Final, List, Set, Tuple
+
+import a_sync
+from brownie import chain
+from eth_portfolio.structs import TokenTransfer
+from eth_portfolio._ydb.token_transfers import InboundTokenTransfers
+from pandas import DataFrame, MultiIndex
+from y import Contract, Network, get_block_at_timestamp
+from y.exceptions import ContractNotVerified
+
+from yearn_treasury.constants import ZERO_ADDRESS
+
+
+DATA_FOLDER: Final = os.path.join(".", "data")
+OUTPUT_FILE: Final = os.path.join(DATA_FOLDER, f"teams_revenue_{chain.id}.csv")
+NUMBER_OF_MONTHS_TO_INCLUDE_IN_REPORT: Final = 36
+
+if not os.path.exists(DATA_FOLDER):
+    os.makedirs(DATA_FOLDER)
+
+
+# TODO: maybe move this into constants for reuse
+yteams_addresses = {
+    Network.Mainnet: {
+        "v3": {
+            "ms": "0x33333333D5eFb92f19a5F94a43456b3cec2797AE",
+            "splits": {"0x2A12CAA2c13Af03c117D836CA3811a5Ca946133B": 12.5},
+        },
+        "dinobots": {
+            "ms": "0x2C01B4AD51a67E2d8F02208F54dF9aC4c0B778B6",
+            "splits": {"0xC4f238633A85A854C4702d2c66264771D1fa7904": 17.5},
+        },
+        "ylockers": {
+            "ms": "0x4444AAAACDBa5580282365e25b16309Bd770ce4a",
+            "splits": {
+                "0xac580302548FCCBBf00020de20C3A8AA516821AD": 2.5,
+                "0x794f80E899c772de9E326eC83cCfD8D94e208B49": 6.25,
+                "0x5FF0f87b05806ce89967638CA727Af8309d92A89": 12.5,
+                "0x5A7575368797695BefD785f546C6b8B7e9D37f8c": 15.625,
+            },
+        },
+        # "ylockers others": {"ms": "0x4444AAAACDBa5580282365e25b16309Bd770ce4a","splits":{"0x5FF0f87b05806ce89967638CA727Af8309d92A89":12.5, "0x5A7575368797695BefD785f546C6b8B7e9D37f8c":15.625}},
+        "yaudit": {
+            "ms": "0x8973B848775a87a0D5bcf262C555859b87E6F7dA",
+            "splits": {
+                "0xd7A1DBe236A38528D54317415a530b2326068373": 35,
+                "0xF104F38592287e25868BD8C3dcCCa1a311916f88": 35,
+                "0x1a9D272C3b7fE427639702A332D51348213B0bC1": 20,
+            },
+        },
+        "yeth": {
+            "ms": "0xeEEEEeeeEe274C3CCe13f77C85d8eBd9F7fd4479",
+            "splits": {"0x14EFe6390C6758E3fE4379A14e3B329274b1b072": 25},
+        },
+        "yfarm": {
+            "ms": "0x55157997cb324a374cCd7c40914ff879Fd9D515C",
+            "splits": {"0x0B3cCe59E038373F6008D9266B6D6eB4d21689b1": 50},
+        },
+        "sms": {
+            "ms": "0x16388463d60FFE0661Cf7F1f31a7D658aC790ff7",
+            "splits": {"0xd6748776CF06a80EbE36cd83D325B31bb916bf54": 25},
+        },
+    }
+}[Network(chain.id)]
+
+
+logger: Final = getLogger(__name__)
+
+_not_verified: Final[Set[str]] = set()
+_warned: Final[Set[TokenTransfer]] = set()
+
+_known_tokens_without_prices: Final = frozenset({"SAFE", "vCOW"})
+"""When there is a PriceError for these tokens, no logs will be emitted."""
+
+
+@lru_cache(maxsize=None)
+def transfers_for(wallet: str) -> InboundTokenTransfers:
+    return InboundTokenTransfers(wallet, 0, load_prices=True)  # type: ignore [arg-type]
+
+
+async def calculate_teams_revenue_expenses() -> None:
+    logger.info("Starting process to calculate teams revenues and expenses")
+    timestamps = get_timestamps_for_report()
+
+    async def get_coros_for_timestamp(dt: datetime) -> Dict[str, Dict[str, Decimal]]:
+        return await a_sync.gather(
+            {
+                label: total(label, wallet_info, dt)
+                for label, wallet_info in yteams_addresses.items()
+            }
+        )
+
+    all_data = await a_sync.gather({dt: get_coros_for_timestamp(dt) for dt in timestamps})
+
+    result = {
+        (dt, teams, movement): values
+        for dt, data in all_data.items()
+        for teams, info in data.items()
+        for movement, values in info.items()
+    }
+    df = DataFrame.from_dict(result, orient="index")
+    print("------------")
+    # print(df.index)
+    # print(df.head(10))
+    df.index = MultiIndex.from_tuples(df.index)
+    print("********")
+    # print(df.index)
+    df.reset_index(inplace=True)
+    df.columns = ["datetime", "team", "label", "value"]
+    df.to_csv(OUTPUT_FILE)
+    logger.info(
+        f"Finished processing yteams calculations and saved file to {os.path.abspath(OUTPUT_FILE)}"
+    )
+
+
+def get_timestamps_for_report() -> List[datetime]:
+    now = datetime.now(tz=timezone.utc)
+    prev_month_end = datetime(
+        year=now.year,
+        month=now.month,
+        day=1,
+        hour=0,
+        minute=0,
+        second=0,
+        microsecond=0,
+        tzinfo=timezone.utc,
+    ) - timedelta(microseconds=1)
+    datetimes = []
+    print("Exporting report for timestamps:")
+    for _ in range(NUMBER_OF_MONTHS_TO_INCLUDE_IN_REPORT):
+        print(f" - {prev_month_end}")
+        datetimes.append(prev_month_end)
+        prev_month_end -= timedelta(days=prev_month_end.day)
+    return datetimes
+
+
+async def total(label: str, wallet_info: Dict[str, Any], timestamp: datetime) -> Dict[str, Decimal]:
+    rev = await sum_revenue_transfers.sum(wallet_info["splits"].items(), timestamp=timestamp)
+    grants = await sum_grants_received(wallet_info["ms"], timestamp)
+    if rev > 10_000_000:
+        raise ValueError(rev)
+    if grants > 10_000_000:
+        raise ValueError(grants)
+    net = rev - grants
+    if label == "yaudit":
+        logger.info("--- %s thru %s ---", label, timestamp)
+        logger.info("inbound  %s", rev)
+        logger.info("grants  -%s", grants)
+        logger.info("net      %s", net)
+    return {"revenue": rev, "grants": grants, "total": net}
+
+
+@a_sync.a_sync(default="async")
+async def sum_revenue_transfers(params: Tuple[str, Decimal], timestamp: datetime) -> Decimal:
+    wallet, rev_share = params
+    block = await get_block_at_timestamp(timestamp)
+    total = Decimal(0)
+    async for transfer in transfers_for(wallet).yield_thru_block(block):
+        transfer = await transfer
+        if transfer is None:
+            # failed to decode, probably shitcoin
+            continue
+        if not transfer.value:
+            # zero value transfer
+            continue
+        if transfer.price:
+            total += transfer.value * transfer.price
+        elif transfer not in _warned and transfer.token not in _known_tokens_without_prices:
+            logger.warning(f"BAD: {transfer}")
+            _warned.add(transfer)
+    return round(total * Decimal((100 - rev_share) / 100), 8)
+
+
+async def sum_grants_received(wallet: str, timestamp: datetime) -> Decimal:
+    grants = Decimal(0)
+    block = await get_block_at_timestamp(timestamp)
+    async for transfer in transfers_for(wallet).yield_thru_block(block):
+        transfer = await transfer
+        if transfer is None:
+            # failed to decode, probably shitcoin
+            continue
+        if not transfer.value:
+            # zero value transfer
+            continue
+        if transfer.price:
+            if transfer.from_address != ZERO_ADDRESS:
+                try:
+                    contract = await Contract.coroutine(transfer.from_address)
+                    if (
+                        hasattr(contract, "recipient") and await contract.recipient == wallet
+                    ) or transfer.from_address == "0xFEB4acf3df3cDEA7399794D0869ef76A6EfAff52":
+                        grants += transfer.value * transfer.price
+                except ContractNotVerified as e:
+                    if str(e) not in _not_verified:
+                        _not_verified.add(str(e))
+                        logger.debug(f"{e.__class__.__name__}: {e}")
+                except Exception as e:
+                    logger.warning(f"{e.__class__.__name__}: {e}")
+        elif transfer not in _warned and transfer.token not in _known_tokens_without_prices:
+            logger.warning(f"BAD: {transfer}")
+            _warned.add(transfer)
+    return round(grants, 8)

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45/yearn_treasury.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yearn_treasury
-Version: 0.0.39
+Version: 0.0.45
 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,7 @@ 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.55
-Requires-Dist: eth-brownie<1.23,>=1.21.0
+Requires-Dist: dao-treasury==0.0.67
 Requires-Dist: faster-async-lru<3,>=2.0.5
 Dynamic: classifier
 Dynamic: description

{yearn_treasury-0.0.39 → yearn_treasury-0.0.45}/yearn_treasury.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ yearn_treasury/py.typed
 yearn_treasury/shitcoins.py
 yearn_treasury/vaults.py
 yearn_treasury/wallets.yaml
+yearn_treasury/yteams.py
 yearn_treasury.egg-info/PKG-INFO
 yearn_treasury.egg-info/SOURCES.txt
 yearn_treasury.egg-info/dependency_links.txt
@@ -46,6 +47,7 @@ yearn_treasury/rules/ignore/ygov.py
 yearn_treasury/rules/ignore/swaps/__init__.py
 yearn_treasury/rules/ignore/swaps/_skip_tokens.py
 yearn_treasury/rules/ignore/swaps/aave.py
+yearn_treasury/rules/ignore/swaps/auctions.py
 yearn_treasury/rules/ignore/swaps/compound.py
 yearn_treasury/rules/ignore/swaps/conversion_factory.py
 yearn_treasury/rules/ignore/swaps/cowswap.py

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

@@ -0,0 +1,2 @@
+dao-treasury==0.0.67
+faster-async-lru<3,>=2.0.5

yearn_treasury-0.0.39/yearn_treasury/rules/ignore/swaps/compound.py

@@ -1,48 +0,0 @@
-from typing import Final
-
-from dao_treasury import TreasuryTx
-
-from yearn_treasury.rules.ignore.swaps import swaps
-
-
-compound: Final = swaps("Compound")
-
-
-@compound("Deposit")
-async def is_compound_deposit(tx: TreasuryTx) -> bool:
-    for event in await tx.get_events("Mint", sync=False):
-        if all(arg in event for arg in ("minter", "mintTokens", "mintAmount")):
-            minter = event["minter"]
-            minted = tx.token.scale_value(event["mintTokens"])
-            # cToken side
-            if (
-                tx.token == tx.from_address == event.address
-                and tx.to_address == minter
-                and minted == tx.amount
-            ):
-                return True
-            # underlying side
-            elif (
-                tx.to_address == event.address and tx.from_address == minter and minted == tx.amount
-            ):
-                return True
-    return False
-
-
-@compound("Withdrawal")
-async def is_compound_withdrawal(tx: TreasuryTx) -> bool:
-    for event in await tx.get_events("Redeem", sync=False):
-        if all(arg in event for arg in ("redeemer", "redeemTokens", "redeemAmount")):
-            redeemer = event["redeemer"]
-            redeemed = tx.token.scale_value(event["redeemTokens"])
-            # cToken side
-            if tx.token == event.address and tx.from_address == redeemer and redeemed == tx.amount:
-                return True
-            # underlying side
-            elif (
-                tx.to_address == redeemer
-                and tx.from_address == event.address
-                and redeemed == tx.amount
-            ):
-                return True
-    return False

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

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