yearn-treasury 0.0.8__cp310-cp310-win_amd64.whl → 0.0.48__cp310-cp310-win_amd64.whl

yearn_treasury/rules/expense/infrastructure.py

@@ -1,6 +1,13 @@
+"""
+Expense rules for infrastructure payments.
+
+This module defines matching logic for infrastructure-related expenses,
+including Tenderly, Wonderland Jobs, and generic infra payments.
+"""
+
 from typing import Final
 
-from dao_treasury import expense
+from dao_treasury import TreasuryTx, expense
 
 
 infrastructure: Final = expense("Infrastructure")
@@ -15,3 +22,26 @@ infrastructure("Tenderly Subscription").match(
 infrastructure("Wonderland Jobs").match(
     symbol="DAI", to_address="0x8bA72884984f669aBBc9a5a7b441AD8E3D9a4fD3"
 )
+
+
+@infrastructure("Unspecified Infra")
+def is_generic_infra(tx: TreasuryTx) -> bool:
+    txhash = tx.hash
+    if tx.symbol == "DAI" and txhash in {
+        "0x0c59e87027bcdcaa718e322a28bc436106d73ae8623071930437bdb0706c4d65",
+        "0x47035f156d4e6144c144b2ac5e91497e353c9a4e23133587bbf3da2f9d7da596",
+        "0x40352e7166bf5196aa1160302cfcc157facf99731af0e11741b8729dd84e131c",
+        "0xc269f6fb016a48fe150f689231a73532b631877d1376608df639dad79514904b",
+    }:
+        return True
+
+    other = {
+        "0x08ef1aacdf7d0f16be5e6fd0a64ebd0ba3b0c3dd0a7884a9a470aa89a7fe1a06": 222,
+        "0xeb51cb5a3b4ae618be75bf3e23c2d8e333d93d5e81e869eca7f9612a30079822": 195,
+        "0x3e75d22250d87c183824c3b77ddb9cb11935db2061ce7f34df4f024d0646fcfb": 117,
+        "0x1621ba5c9b57930c97cc43d5d6d401ee9c69fed435b0b458ee031544a10bfa75": 460,
+        "0x5deca5d6c934372c174bbef8be9a1e103e06d8b93fd3bf8d77865dfeb34fe3be": 98,
+        "0xfc07ee04d44f8e481f58339b7b8c998d454e4ec427b8021c4e453c8eeee6a9b9": 207,
+    }
+
+    return txhash in other and tx.log_index == other[txhash]

yearn_treasury/rules/expense/people.py

@@ -39,3 +39,46 @@ def is_coordinape(tx: TreasuryTx) -> bool:
 def is_ygift_grant(tx: TreasuryTx) -> bool:
     """Yearn used to use yGift to send team grants but that ended up being too expensive."""
     return tx.to_nickname == "Contract: yGift" and tx.symbol == "yyDAI+yUSDC+yUSDT+yTUSD"
+
+
+# TODO: refactor all of this, there's gotta be a better way to handle yteams who have received both one-off and streamed pmnts
+@grants("yHAAS Trinity [BR#263]")
+def is_yhaas_trinity_ii(tx: TreasuryTx) -> bool:
+    """https://github.com/yearn/budget/issues/263"""
+    return (
+        tx.hash == "0xd35c30664f3241ea2ec3df1c70261086247025eb72c2bc919108dfef9b08a450"
+        and tx.to_address.address
+        in (
+            # team
+            "0x35a83D4C1305451E0448fbCa96cAb29A7cCD0811",
+            # stream
+            "0xEC83C8c3156e4f6b95B048066F3b308C93cb5848",
+        )
+    )
+
+
+@grants("G-Team [BR#267]")
+def is_gteam(tx: TreasuryTx) -> bool:
+    """https://github.com/yearn/budget/issues/267"""
+    return (
+        tx.hash == "0xd35c30664f3241ea2ec3df1c70261086247025eb72c2bc919108dfef9b08a450"
+        and tx.to_address == "0x63E02F93622541CfE41aFedCF96a114DB71Ba4EE"
+    )
+
+
+@grants("Rantom [BR#129]")
+def is_rantom(tx: TreasuryTx) -> bool:
+    """https://github.com/yearn/budget/issues/129"""
+    return tx.to_address == "0x254b42CaCf7290e72e2C84c0337E36E645784Ce1"
+
+
+@grants("Worms")
+def is_worms(tx: TreasuryTx) -> bool:
+    return tx.to_address == "0xB1d693B77232D88a3C9467eD5619FfE79E80BCCc"
+
+
+# NOTE: this needs to go at the bottom because there are some streams that will already be caught by above matchers
+@grants("Simple Vesting Escrow")
+def is_simple_vesting_escrow(tx: TreasuryTx) -> bool:
+    # TODO: amortize the streamed funds as a daily amount and sort more granularly based on BR
+    return tx.to_nickname == "Contract: Simple Vesting Escrow"

yearn_treasury/rules/expense/security.py

@@ -1,15 +1,23 @@
+"""
+Expense rules for security, audits, and bug bounties.
+
+This module defines matching logic for security-related expenses,
+including audits (yAcademy, ChainSec, StateMind, MixBytes, unspecified),
+bug bounties, and other security-related deliverables.
+"""
+
 from typing import Final
 
 from dao_treasury import TreasuryTx, expense
 from y import Network
-from y.constants import CHAINID
 
 
-security: Final = expense("Secutiry")
+security: Final = expense("Security")
 audits: Final = security("Audits")
+grants: Final = security("Grants")
 
 
-@audits("yAcademy")
+@audits("yAcademy", Network.Mainnet)
 def is_yacademy_audit(tx: TreasuryTx) -> bool:
     """Expense for an audit performed by yAcademy"""
     # NOTE: the hash we're excluding was a one-time revshare tx before the splitter was set up.
@@ -19,62 +27,69 @@ def is_yacademy_audit(tx: TreasuryTx) -> bool:
     )
 
 
-@audits("ChainSec")
+@audits("ChainSec", Network.Mainnet)
 def is_chainsec_audit(tx: TreasuryTx) -> bool:
     """Expense for an audit performed by chainsec"""
     if (
-        CHAINID == Network.Mainnet
-        and tx._symbol in ["USDC", "USDT"]
+        tx.symbol in ["USDC", "USDT"]
         and tx.to_address == "0x8bAf5eaF92E37CD9B1FcCD676918A9B3D4F87Dc7"
     ):
         return True
-    return tx.hash == "0x83ec212072f82f4aba4b512051d52c5f016de79a620a580622a0f051e3473a78" or (
+
+    txhash = tx.hash
+    return txhash == "0x83ec212072f82f4aba4b512051d52c5f016de79a620a580622a0f051e3473a78" or (
         # https://github.com/yearn/budget/issues/246
-        tx.hash == "0xd0fa31ccf6bf7577a533366955bb528d6d17c928bba1ff13ab273487a27d9602"
+        txhash == "0xd0fa31ccf6bf7577a533366955bb528d6d17c928bba1ff13ab273487a27d9602"
         and tx.log_index == 254
     )
 
 
-@audits("StateMind")
+@audits("StateMind", Network.Mainnet)
 def is_statemind_audit(tx: TreasuryTx) -> bool:
     """Expense for an audit performed by statemind"""
+    txhash = tx.hash
+    log_index = tx.log_index
+    if log_index is None:
+        return False
     if (
-        tx.hash == "0xeb51cb5a3b4ae618be75bf3e23c2d8e333d93d5e81e869eca7f9612a30079822"
-        and tx.log_index == 193
+        txhash == "0xeb51cb5a3b4ae618be75bf3e23c2d8e333d93d5e81e869eca7f9612a30079822"
+        and log_index == 193
     ):
         return True
     elif (
-        tx.hash == "0xcb79cbe5b68d04a1a3feab3360734277020ee0536380843a8c9db3e8356b81d6"
-        and tx.log_index == 398
+        txhash == "0xcb79cbe5b68d04a1a3feab3360734277020ee0536380843a8c9db3e8356b81d6"
+        and log_index == 398
     ):
         return True
     elif (
-        tx.hash == "0x3e75d22250d87c183824c3b77ddb9cb11935db2061ce7f34df4f024d0646fcfb"
-        and tx.log_index == 115
+        txhash == "0x3e75d22250d87c183824c3b77ddb9cb11935db2061ce7f34df4f024d0646fcfb"
+        and log_index == 115
     ):
         return True
     return False
 
 
-@audits("MixBytes")
+@audits("MixBytes", Network.Mainnet)
 def is_mixbytes_audit(tx: TreasuryTx) -> bool:
     """Expense for an audit performed by mixbytes"""
+    txhash = tx.hash
     if (
-        tx.hash == "0xcb79cbe5b68d04a1a3feab3360734277020ee0536380843a8c9db3e8356b81d6"
+        txhash == "0xcb79cbe5b68d04a1a3feab3360734277020ee0536380843a8c9db3e8356b81d6"
         and tx.log_index == 399
     ):
         return True
     elif (
-        tx.hash == "0xca61496c32806ba34f0deb331c32969eda11c947fdd6235173e6fa13d9a1c288"
+        txhash == "0xca61496c32806ba34f0deb331c32969eda11c947fdd6235173e6fa13d9a1c288"
         and tx.symbol == "USDC"
     ):
         return True
     return False
 
 
-@audits("Unspecified Audit")
+@audits("Unspecified Audit", Network.Mainnet)
 def is_other_audit(tx: TreasuryTx) -> bool:
-    if tx.hash in {
+    txhash = tx.hash
+    if txhash in {
         "0x7df5566cc9ff8ed0aafe126b74ad0e3957e62d530d007565ee32bd1303bcec32",
         "0x5e95d5b0773eefaef9c7187d5e9187a89717d269f48e5dcf707acfe1a7e55cb9",
         "0x9cfd1098c5459002a90ffa23931f7bbec430b3f2ec0ef2d3a641cef574eb0817",
@@ -82,25 +97,26 @@ def is_other_audit(tx: TreasuryTx) -> bool:
     }:
         return True
     elif (
-        tx.hash == "0x70ecc34da6c461a0bb9dadfbc4d082a8486e742cbb454f0f67b2df384fb9bffc"
+        txhash == "0x70ecc34da6c461a0bb9dadfbc4d082a8486e742cbb454f0f67b2df384fb9bffc"
         and tx.log_index == 89
     ):
         return True
     return False
 
 
-@security("Bug Bounty")
+@security("Bug Bounty", Network.Mainnet)
 def is_bug_bounty(tx: TreasuryTx) -> bool:
-    if tx.hash == "0x4df2eee567ebf2a41b555fca3fed41300b12ff2dc3c79ffaee8b7bdf262f9303":
+    txhash = tx.hash
+    if txhash == "0x4df2eee567ebf2a41b555fca3fed41300b12ff2dc3c79ffaee8b7bdf262f9303":
         return True
     elif (
-        tx.hash == "0x5deca5d6c934372c174bbef8be9a1e103e06d8b93fd3bf8d77865dfeb34fe3be"
+        txhash == "0x5deca5d6c934372c174bbef8be9a1e103e06d8b93fd3bf8d77865dfeb34fe3be"
         and tx.log_index in (100, 101)
     ):
         # Immunefi
         return True
     elif (
-        tx.hash == "0x3e045ced19590db8905d8a69c2f0fd0acd4f90301cf6356742e735cd7caa0964"
+        txhash == "0x3e045ced19590db8905d8a69c2f0fd0acd4f90301cf6356742e735cd7caa0964"
         and tx.log_index == 327
     ):
         # Sherlock
@@ -108,16 +124,24 @@ def is_bug_bounty(tx: TreasuryTx) -> bool:
     return False
 
 
-security("Anti-Spam Discord Bot").match(
+security("Anti-Spam Discord Bot", Network.Mainnet).match(
     hash="0xe397d5682ef780b5371f8c80670e0cd94b4f945c7b432319b24f65c288995a17",
     log_index=357,
 )
 
 
-@security("War Room Assistance")
+@security("War Room Assistance", Network.Mainnet)
 def is_warroom_help(tx: TreasuryTx) -> bool:
     """A past yearner was paid a one-time payment to assist in a war room."""
     return (
         tx.hash == "0xca61496c32806ba34f0deb331c32969eda11c947fdd6235173e6fa13d9a1c288"
         and tx.log_index == 152
     )
+
+
+@grants("ySecurity", Network.Mainnet)
+def is_ysecurity(tx: TreasuryTx) -> bool:
+    """
+    https://github.com/yearn/budget/issues/145
+    """
+    return tx.to_address == "0x4851C7C7163bdF04A22C9e12Ab77e184a5dB8F0E"

yearn_treasury/rules/ignore/__init__.py

@@ -1,6 +1,8 @@
-from .general import *
-from .maker import *
-from .staking import *
-from .swaps import *
-from .weth import *
-from .ygov import *
+from yearn_treasury.rules.ignore.general import *
+from yearn_treasury.rules.ignore.maker import *
+from yearn_treasury.rules.ignore.passthru import *
+from yearn_treasury.rules.ignore.staking import *
+from yearn_treasury.rules.ignore.swaps import *
+from yearn_treasury.rules.ignore.unit import *
+from yearn_treasury.rules.ignore.weth import *
+from yearn_treasury.rules.ignore.ygov import *

yearn_treasury/rules/ignore/general.py

@@ -4,7 +4,8 @@ from dao_treasury import TreasuryTx, ignore
 @ignore("Returned Funds")
 def is_returned_fundus(tx: TreasuryTx) -> bool:
     """A user accientally refunded their yield to yChad, yChad sent it back."""
-    return tx.hash == "0x2c2fb9d88a7a25b100ae3ba08bdb1cafbbd6a63386a08fdcfe32d077836defa3" or (
-        tx.hash == "0xd7e7abe600aad4a3181a3a410bef2539389579d2ed28f3e75dbbf3a7d8613688"
+    txhash = tx.hash
+    return txhash == "0x2c2fb9d88a7a25b100ae3ba08bdb1cafbbd6a63386a08fdcfe32d077836defa3" or (
+        txhash == "0xd7e7abe600aad4a3181a3a410bef2539389579d2ed28f3e75dbbf3a7d8613688"
         and tx.log_index == 556
     )

yearn_treasury/rules/ignore/maker.py

@@ -1,3 +1,11 @@
+"""
+Ignore rules for Maker protocol.
+
+This module defines matching logic for Maker protocol transactions,
+including DAI minting/burning, DSR deposit/withdrawal, and CDP
+deposit/withdrawal for YFI and USDC.
+"""
+
 from decimal import Decimal
 from typing import Final
 
@@ -10,10 +18,10 @@ DSPROXY: Final = "0xd42e1Cb8b98382df7Db43e0F09dFE57365659D16"
 DEPOSIT_EVENT_ARGS: Final = "ilk", "usr", "wad"
 WITHDRAWAL_EVENT_ARGS: Final = "cdp", "dst", "wad"
 
-maker = ignore("Maker")
-dai = maker("DAI")
-dsr = maker("DSR")
-cdp = maker("CDP")
+maker: Final = ignore("Maker")
+dai: Final = maker("DAI")
+dsr: Final = maker("DSR")
+cdp: Final = maker("CDP")
 
 
 dai("Minting").match(symbol="DAI", from_address=ZERO_ADDRESS)
@@ -26,83 +34,59 @@ dsr("Withdrawal").match(from_nickname="Contract: DsrManager")
 
 @cdp("YFI Deposit")
 def is_yfi_cdp_deposit(tx: TreasuryTx) -> bool:
-    if (
-        tx.symbol == "YFI"
-        and TreasuryWallet._get_instance(tx.from_address.address)  # type: ignore [union-attr, arg-type]
-        and slip_in_events(tx)
+    if tx.symbol == "YFI" and TreasuryWallet.check_membership(
+        tx.from_address.address, tx.block  # type: ignore [union-attr, arg-type]
     ):
-        for event in tx._events["slip"]:
-            if (
-                all(arg in event for arg in DEPOSIT_EVENT_ARGS)
-                and Decimal(event["wad"]) / 10**18 == tx.amount
-            ):
-                return True
+        for event in tx.get_events("slip"):
+            if all(arg in event for arg in DEPOSIT_EVENT_ARGS):
+                # TODO: remove this rounding once we move to postgres
+                scaled = round(Decimal(event["wad"]) / 10**18, 12)
+                rounded = round(tx.amount, 12)
+                if scaled == rounded:
+                    return True
+                print(f"yfi cdp deposit amount no match [{scaled}, {rounded}]")
     return False
 
 
 @cdp("YFI Withdrawal")
 def is_yfi_cdp_withdrawal(tx: TreasuryTx) -> bool:
-    if (
-        tx.symbol == "YFI"
-        and TreasuryWallet._get_instance(tx.to_address.address)  # type: ignore [union-attr, arg-type]
-        and flux_in_events(tx)
+    if tx.symbol == "YFI" and TreasuryWallet.check_membership(
+        tx.to_address.address, tx.block  # type: ignore [union-attr, arg-type]
     ):
-        for event in tx._events["flux"]:
-            if (
-                all(arg in event for arg in WITHDRAWAL_EVENT_ARGS)
-                and Decimal(event["wad"]) / 10**18 == tx.amount
-            ):
-                return True
+        for event in tx.get_events("flux"):
+            if all(arg in event for arg in WITHDRAWAL_EVENT_ARGS):
+                # TODO: remove this rounding once we move to postgres
+                scaled = round(Decimal(event["wad"]) / 10**18, 12)
+                rounded = round(tx.amount, 12)
+                if scaled == rounded:
+                    return True
+                print(f"yfi cdp withdrawal amount no match [{scaled}, {rounded}]")
     return False
 
 
 @cdp("USDC Deposit")
 def is_usdc_cdp_deposit(tx: TreasuryTx) -> bool:
-    if (
-        tx.symbol == "USDC"
-        and TreasuryWallet._get_instance(tx.from_address.address)  # type: ignore [union-attr, arg-type]
-        and slip_in_events(tx)
+    if tx.symbol == "USDC" and TreasuryWallet.check_membership(
+        tx.from_address.address, tx.block  # type: ignore [union-attr, arg-type]
     ):
-        for event in tx._events["slip"]:
-            if (
-                all(arg in event for arg in DEPOSIT_EVENT_ARGS)
-                and Decimal(event["wad"]) / 10**18 == tx.amount
-            ):
-                return True
+        for event in tx.get_events("slip"):
+            if all(arg in event for arg in DEPOSIT_EVENT_ARGS):
+                scaled = Decimal(event["wad"]) / 10**18
+                if scaled == tx.amount:
+                    return True
+                print(f"usdc cdp deposit amount no match [{scaled}, {tx.amount}]")
     return False
 
 
 @cdp("USDC Withdrawal")
 def is_usdc_cdp_withdrawal(tx: TreasuryTx) -> bool:
-    if (
-        tx.symbol == "USDC"
-        and TreasuryWallet._get_instance(tx.to_address.address)  # type: ignore [union-attr, arg-type]
-        and flux_in_events(tx)
+    if tx.symbol == "USDC" and TreasuryWallet.check_membership(
+        tx.to_address.address, tx.block  # type: ignore [union-attr, arg-type]
     ):
-        for event in tx._events["flux"]:
-            if (
-                all(arg in event for arg in WITHDRAWAL_EVENT_ARGS)
-                and Decimal(event["wad"]) / 10**18 == tx.amount
-            ):
-                return True
+        for event in tx.get_events("flux"):
+            if all(arg in event for arg in WITHDRAWAL_EVENT_ARGS):
+                scaled = Decimal(event["wad"]) / 10**18
+                if scaled == tx.amount:
+                    return True
+                print(f"usdc cdp withdrawal amount no match [{scaled}, {tx.amount}]")
     return False
-
-
-def flux_in_events(tx: TreasuryTx) -> bool:
-    try:
-        return "flux" in tx._events
-    except KeyError as e:
-        # This happens sometimes due to a busted abi and shouldnt impact us
-        if str(e) == "'components'":
-            return False
-        raise
-
-
-def slip_in_events(tx: TreasuryTx) -> bool:
-    try:
-        return "slip" in tx._events
-    except KeyError as e:
-        # This happens sometimes due to a busted abi and shouldnt impact us
-        if str(e) == "'components'":
-            return False
-        raise