dao-treasury 0.0.37__cp312-cp312-musllinux_1_2_x86_64.whl → 0.0.39__cp312-cp312-musllinux_1_2_x86_64.whl

dao_treasury/db.py

@@ -53,6 +53,7 @@ from pony.orm import (
     select,
 )
 from y import EEE_ADDRESS, Contract, Network, convert, get_block_timestamp_async
+from y._db.decorators import retry_locked
 from y.contracts import _get_code
 from y.exceptions import ContractNotVerified
 
@@ -294,7 +295,6 @@ class Address(DbEntity):
             )
 
         commit()
-
         return entity  # type: ignore [no-any-return]
 
     @staticmethod
@@ -923,6 +923,7 @@ class TreasuryTx(DbEntity):
             return dbid  # type: ignore [no-any-return]
 
     @staticmethod
+    @retry_locked
     def __set_txgroup(treasury_tx_dbid: int, txgroup_dbid: TxGroupDbid) -> None:
         with db_session:
             TreasuryTx[treasury_tx_dbid].txgroup = txgroup_dbid

dao_treasury/sorting/rules/ignore/__init__.py

@@ -1 +1,2 @@
 from dao_treasury.sorting.rules.ignore.llamapay import *
+from dao_treasury.sorting.rules.ignore.shitcoins import *

dao_treasury/sorting/rules/ignore/shitcoins.py

@@ -0,0 +1,24 @@
+"""This module is used to ignore any transactions that involve shitcoins in the :obj:`~eth_portfolio.SHITCOINS` mapping."""
+
+from typing import Final
+
+import eth_portfolio
+
+from dao_treasury import TreasuryTx
+from dao_treasury.constants import CHAINID
+from dao_treasury.sorting.factory import ignore
+
+
+SHITCOINS: Final = eth_portfolio.SHITCOINS[CHAINID]
+
+
+@ignore("Shitcoin")
+def is_shitcoin(tx: TreasuryTx) -> bool:
+    """
+    This category is for any token transfers involving any shitcoin which was added
+    to your database before the shitcoin was added to :obj:`eth_portfolio.SHITCOINS`.
+
+    Since the tx would now be excluded from the db entirely if you did a clean pull,
+    we can safely ignore it.
+    """
+    return tx.token.address.address in SHITCOINS

dao_treasury/streams/llamapay.py

@@ -22,7 +22,7 @@ from eth_typing import BlockNumber, ChecksumAddress, HexAddress, HexStr
 from tqdm.asyncio import tqdm_asyncio
 
 import y
-from y.time import UnixTimestamp
+from y.time import NoBlockFound, UnixTimestamp
 from y.utils.events import decode_logs, get_logs_asap
 
 from dao_treasury import constants
@@ -338,7 +338,19 @@ class LlamaPayProcessor:
         check_at = date_obj + timedelta(days=1) - timedelta(seconds=1)
         if check_at > now(tz=_UTC):
             await sleep((check_at - now(tz=_UTC)).total_seconds())
-        block = await get_block_at_timestamp(check_at, sync=False)
+
+        while True:
+            try:
+                block = await get_block_at_timestamp(check_at, sync=False)
+            except NoBlockFound:
+                sleep_time = (check_at - now(tz=_UTC)).total_seconds()
+                logger.debug(
+                    "no block found for %s, sleeping %ss", check_at, sleep_time
+                )
+                await sleep(sleep_time)
+            else:
+                break
+
         price_fut = create_task(get_price(stream_token, block, sync=False))
         start_timestamp = await _get_start_timestamp(stream_id, block)
         if start_timestamp == 0:

{dao_treasury-0.0.37.dist-info → dao_treasury-0.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.0.37
+Version: 0.0.39
 Summary: Produce comprehensive financial reports for your on-chain org
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

{dao_treasury-0.0.37.dist-info → dao_treasury-0.0.39.dist-info}/RECORD

@@ -1,20 +1,20 @@
-bf2b4fe1f86ad2ea158b__mypyc.cpython-312-x86_64-linux-musl.so,sha256=tH0sb2HB7DTDF3C6u09aXZlQPx7jnqEpj-5KgGKrX2U,1558592
+8a0ad9a1a4146730a0f6__mypyc.cpython-312-x86_64-linux-musl.so,sha256=xhHPPM8GVe4PXRb8qp1Z3PJ1bHUREekJscW30ZMBuZs,1580824
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=yKvgOMUyU7-fF_-1zSMXML7ah7-r2f0oHrOV0p10LPc,195
 dao_treasury/__init__.py,sha256=ZQ0ZROQzSyJdYuQS1Z_VD0c7CiV8BWZcLTX66wO4slc,1004
-dao_treasury/_docker.cpython-312-x86_64-linux-musl.so,sha256=mYyhF79--IqY25gNVcsnlj29fVHOByCKwTSLPuAm7m8,17752
+dao_treasury/_docker.cpython-312-x86_64-linux-musl.so,sha256=8uDk9AFQpwD_FRKqK5tlnLAe0hmmBYEcqd2c95e3hYM,17752
 dao_treasury/_docker.py,sha256=7MnPA5xhRCM8Kqiogk87ltUVn8i_hpkNgO_hFC-7sPw,5430
-dao_treasury/_nicknames.cpython-312-x86_64-linux-musl.so,sha256=f6IPfgH2-yVbz_t0IOo820JCkLbdaadsi-b4364kiZ4,17768
+dao_treasury/_nicknames.cpython-312-x86_64-linux-musl.so,sha256=ijUsxTAMyWzzaV-qlgSVoJP1h9SwEcDfdciiuMkoMtc,17768
 dao_treasury/_nicknames.py,sha256=deSpcDMtC_78C07tW0fZ_NzHIfHXsoHBVXfb_Dvlzsw,480
-dao_treasury/_wallet.cpython-312-x86_64-linux-musl.so,sha256=kqwRvoaGPO3HNbAzOeU6jo99nkbrGHh0F_BA46z_LXo,17752
+dao_treasury/_wallet.cpython-312-x86_64-linux-musl.so,sha256=B31tQkJmRYYaaPDEyC_3dH7e7YltwiwQovEVUL5-93I,17752
 dao_treasury/_wallet.py,sha256=epV8LVuwHlOzc9UkA66js7HfEiZBOSAGJMtWbDTzmjU,10462
-dao_treasury/constants.cpython-312-x86_64-linux-musl.so,sha256=wsN5MKS92Pe3Zo909vGHKs3DcdR1gPDRoUYkUqF57rM,17760
+dao_treasury/constants.cpython-312-x86_64-linux-musl.so,sha256=etgsR9te9HBus0VCgN83iXlCyXR5YnLq_Ds4tuAsHk8,17760
 dao_treasury/constants.py,sha256=IFg_CyVnfPhPjKyFX1Ix4QaB8ghbOI5QZGSy2TNsUSA,507
-dao_treasury/db.py,sha256=7d1OIz82DStylR3kpRz2U2wVB5c3bdGVc0lp_4mEaxg,47259
+dao_treasury/db.py,sha256=Qc95xWNIR_Wk7jutJnBe2eMntxRrdd2_pj68hqVK8kA,47318
 dao_treasury/docker-compose.yaml,sha256=E6KE-IjWDisAM19PPDi4ApR6Eu7jmMTM6J9DhtgJvR4,1309
 dao_treasury/main.py,sha256=31EA10Fpaj9y-cRJPnNnvCBI38UM0848xlzn7A0BzC4,8047
 dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/treasury.py,sha256=7xLVQPqnDd3cexbYuF1opTjCiHgkPqHFOanRom8wiLE,6506
-dao_treasury/types.cpython-312-x86_64-linux-musl.so,sha256=JyfC1keXoWVEiIdHWkT9laX_QirI1jEJEMaOBuyfs0U,17744
+dao_treasury/types.cpython-312-x86_64-linux-musl.so,sha256=ZaNKwYvLy8p3ht_IJcNxaPysxqkSHERvF2mPdcxuBgg,17744
 dao_treasury/types.py,sha256=dJDx0hYfDDL3slcUzRnCgrzFFsgCzoqg8uaTtLaT4kk,3685
 dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=tr6FBJeAAPX76db8E3qBBVWnq2-yrWDXDGuclMDg6dw,1277
 dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=9OzlVtq0wRBDw3MhoaYLrT_hd7w_V3c_B7bYNmX4TJo,7023
@@ -25,27 +25,29 @@ dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=DOpO
 dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=tKtUeBp9p-g21MOaFMPItUoXF_coHMM000yNipNB_RU,14352
 dao_treasury/.grafana/provisioning/dashboards/treasury/Treasury.json,sha256=p9bupL06-CKqkqCOb6KkgP1LCa6P1VMkq3yhkyqMAzI,70178
 dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=mjQs8or651NgD_bZnKBm8vSghzjw_g3enL01YPt0dik,327
-dao_treasury/sorting/__init__.cpython-312-x86_64-linux-musl.so,sha256=XhALJKKI478tRTrI4XCcmhMVi8nrBKmx14-aTS4SICM,17752
+dao_treasury/sorting/__init__.cpython-312-x86_64-linux-musl.so,sha256=ScHNyx8DfV6fS9oyzp4juSU1ZJI3cQNbw2_-dxnB1hg,17752
 dao_treasury/sorting/__init__.py,sha256=vKj3NPB7EWbX7_fSUWKXk-NsyPasOkFhJvJVGclBOAE,10371
-dao_treasury/sorting/_matchers.cpython-312-x86_64-linux-musl.so,sha256=gwV0ppJ0oDChTXgGKSxnz66CEmVJezYPruKGcMlktJw,17776
+dao_treasury/sorting/_matchers.cpython-312-x86_64-linux-musl.so,sha256=SEZ1zqB5QmM8ci2NGS6u-j66yyIpCBi0_Dd4_ZVm_Hk,17776
 dao_treasury/sorting/_matchers.py,sha256=u0GfPYiODr_NtzbfyLxEKDuXmWRiaeuZulDj9FPDOH8,14005
-dao_treasury/sorting/_rules.cpython-312-x86_64-linux-musl.so,sha256=hRMxwWDpuQQv4XVdKCDGE3_nc_RcUmxpPBND3qwrXL4,17768
+dao_treasury/sorting/_rules.cpython-312-x86_64-linux-musl.so,sha256=TVDIUL_x0vbxQYOWLPSoIqFV8AGg36_SXUW_2nBzYOc,17768
 dao_treasury/sorting/_rules.py,sha256=vWkqJVA8yCHKRv9sw872Jq6G0zpM-v_J1jCz-Mgleec,8994
-dao_treasury/sorting/factory.cpython-312-x86_64-linux-musl.so,sha256=S9r73sQvDFsJ_6f-VzTDF0TtX08OF0NoEwEgCWJvjW4,17768
+dao_treasury/sorting/factory.cpython-312-x86_64-linux-musl.so,sha256=610TqH1RUy0Xp-ijbM6w7-scOiOcMyJGpqqeu7673jk,17768
 dao_treasury/sorting/factory.py,sha256=pFD6luc0bKxOTT1hlAp3ZwJw6R0wN8pjIZrqMZwhsko,10185
-dao_treasury/sorting/rule.cpython-312-x86_64-linux-musl.so,sha256=Q0VTi8VfRBt8iafmSov1LX6Gd4BDDhSLAVwd7OCiaD0,17760
+dao_treasury/sorting/rule.cpython-312-x86_64-linux-musl.so,sha256=Ew6NVzYa0p5S-f-RUYjeK73eOhmnBB75dIS7FKVnIVw,17760
 dao_treasury/sorting/rule.py,sha256=-4dokQbRJ2GPJLEwtpgGG0aXAM1pW4jI17aezo--Z5g,11491
-dao_treasury/sorting/rules/__init__.cpython-312-x86_64-linux-musl.so,sha256=WjM-eM_fJB7IuC-s0FSHRfu9R6KIImiT876YdWIKTZE,17760
+dao_treasury/sorting/rules/__init__.cpython-312-x86_64-linux-musl.so,sha256=QHgg-GZdlKQCI5sZN-QYrzPK8g3Bs9035fULrsMmg7A,17760
 dao_treasury/sorting/rules/__init__.py,sha256=ofzIsW0P74kuKr6DlScZIF8p7hBh6guRpe1uOq6oLLA,48
-dao_treasury/sorting/rules/ignore/__init__.cpython-312-x86_64-linux-musl.so,sha256=g8S-OYZGX85wn5fShW0km0MfQTq3yuKyYj23qITnF5Y,17784
-dao_treasury/sorting/rules/ignore/__init__.py,sha256=dJ4oKSLe7fal1Ct7XtMCfVJAtvZXcyIomf8HF3gWUhQ,57
-dao_treasury/sorting/rules/ignore/llamapay.cpython-312-x86_64-linux-musl.so,sha256=OZUk8866WKulCDu_C_mWM1m1-Pk7pSI6TRCVRQREXS4,17800
+dao_treasury/sorting/rules/ignore/__init__.cpython-312-x86_64-linux-musl.so,sha256=SOUOoQX_AROYdST6eysBD9I7lnIaSEj-AXjBezN98Dc,17784
+dao_treasury/sorting/rules/ignore/__init__.py,sha256=JFmwn1bIX5UYDnCH0UU4UTFUFSFaqL-VBG9SYtJGYtI,115
+dao_treasury/sorting/rules/ignore/llamapay.cpython-312-x86_64-linux-musl.so,sha256=hNIlSEaLUuAWIc03ZA0EA2LkHxpfCXK30zEByRXTu_c,17800
 dao_treasury/sorting/rules/ignore/llamapay.py,sha256=NgiVt9MRtI-f4mw9U5_gqttdPqDa3vt_z5XWJP_UYWs,763
-dao_treasury/streams/__init__.cpython-312-x86_64-linux-musl.so,sha256=hdcFojfA4MIoo__tHkRrAa97I9mILWn14rFNMHgD-MU,17752
+dao_treasury/sorting/rules/ignore/shitcoins.cpython-312-x86_64-linux-musl.so,sha256=Gt0Oz-vquF_eZFs4mV0SAd-3c7zwhQDA-6FX8_jLQUE,17800
+dao_treasury/sorting/rules/ignore/shitcoins.py,sha256=XVozrgrHlBESih3-xqXksaktjf3AJzWseowd4_yXDdI,767
+dao_treasury/streams/__init__.cpython-312-x86_64-linux-musl.so,sha256=rqBoj3wab3950u5-n1saud3kSVraAKt-HT5p5XTpo9Y,17752
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dao_treasury/streams/llamapay.cpython-312-x86_64-linux-musl.so,sha256=vfWsqB5_KbA4AsgEkSW55gvKqXZaXIkaGDwhf_6CblQ,17776
-dao_treasury/streams/llamapay.py,sha256=xc2sgmTV4EnQFFemea87QoUdIeGtO9OJQCwJG9c-SJQ,12774
-dao_treasury-0.0.37.dist-info/METADATA,sha256=Q8MRCKdghUAPpRgwHIygGo6Wbd57MplYdt4hpBOsQyg,7030
-dao_treasury-0.0.37.dist-info/WHEEL,sha256=AwHYJA1Do1jwgPIoLQR4DiHSeYY_vU6Ht9Vljq5Yt_M,112
-dao_treasury-0.0.37.dist-info/top_level.txt,sha256=Gw-ri_26lZA_3hwhnOX48mffUbmBGr8NhtoQ0XoMeF8,41
-dao_treasury-0.0.37.dist-info/RECORD,,
+dao_treasury/streams/llamapay.cpython-312-x86_64-linux-musl.so,sha256=ebRKwBtnaXGp-uoNhagiZQvC_Vp2pF5jpGD3QnA7OKk,17776
+dao_treasury/streams/llamapay.py,sha256=yn37gwVfqGFF9fOhHuj9_t7KlHGyrdekF2TUmVDyg64,13147
+dao_treasury-0.0.39.dist-info/METADATA,sha256=gWkd23w5wkfZ5E-FrrWcWfnew1DJcvRNFKGcZDM7SAE,7030
+dao_treasury-0.0.39.dist-info/WHEEL,sha256=AwHYJA1Do1jwgPIoLQR4DiHSeYY_vU6Ht9Vljq5Yt_M,112
+dao_treasury-0.0.39.dist-info/top_level.txt,sha256=OJ9btLujcmz6HPYrhPuxnkTZ5Fl9uw584qBW96ZpkV4,41
+dao_treasury-0.0.39.dist-info/RECORD,,

dao_treasury-0.0.39.dist-info/top_level.txt

@@ -0,0 +1,2 @@
+8a0ad9a1a4146730a0f6__mypyc
+dao_treasury

dao_treasury-0.0.37.dist-info/top_level.txt

@@ -1,2 +0,0 @@
-bf2b4fe1f86ad2ea158b__mypyc
-dao_treasury