dao-treasury 0.0.37__cp310-cp310-win32.whl → 0.0.39__cp310-cp310-win32.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.cp310-win32.pyd,sha256=kiysIHy3iM6PC8n4Lsht2Wyqxs2eti9NlxxFTP9lWg4,407552
+8a0ad9a1a4146730a0f6__mypyc.cp310-win32.pyd,sha256=8IPlmGgqjJ-DWYoqcIGIC8dRdJxe1U10hjlu_NCte_w,414720
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=ci7djcsXc9uRi6_vBQv-avGQrrIacyftXmcwKuitWWU,203
 dao_treasury/__init__.py,sha256=U8BsakN_w15wVE_7MjVbHD9LBal48LfJ6a1Icf5oHdY,1052
-dao_treasury/_docker.cp310-win32.pyd,sha256=Q_AlBBD_KL_OxzJENv5e2v7sSPb_-mCN-GFEbHdVDLw,9216
+dao_treasury/_docker.cp310-win32.pyd,sha256=Po0_sKJqqpB_Bn75WrzGD3-HRLYkTaZRhorQAPa00Ek,9216
 dao_treasury/_docker.py,sha256=wY26wCrQ8p-L0KfMJftyzI_YAszHjnBWLw94eh0LxxY,5607
-dao_treasury/_nicknames.cp310-win32.pyd,sha256=bCSY4818CGezr_L2twqZMduR8xcwAZNgARSBSemk4bM,9216
+dao_treasury/_nicknames.cp310-win32.pyd,sha256=vINkv2UFNvdpl63BF58Kr-6CeOb66MLuOlYPNclcwfE,9216
 dao_treasury/_nicknames.py,sha256=NpbQ4NtmZF_A_vqTGSal2KzKzkH5t7_wbI8EtMBqEr4,497
-dao_treasury/_wallet.cp310-win32.pyd,sha256=9E8PgEoiyc2tKJ0-g46s0__i2URceDsszT568_xe9rQ,9216
+dao_treasury/_wallet.cp310-win32.pyd,sha256=feYt4hkgjBz7IwyLG4npYWmRysa2qEdrN1rTpGzjwVc,9216
 dao_treasury/_wallet.py,sha256=nHBAKFJstdKuYbvpskGVx2KU80YrZHGHsEh5V3TwIHs,10712
-dao_treasury/constants.cp310-win32.pyd,sha256=vsMNAGjjyefit699Rqb63dTd41Q4Zd0OtFFSW81uH68,9216
+dao_treasury/constants.cp310-win32.pyd,sha256=Hnouaw6DGICrdazcHbQgBK9rOs-fk8FrtoPwIYtn9Is,9216
 dao_treasury/constants.py,sha256=VNzlrwC8HB8LdKNmoIfncUACKHfXZxp2GtBBrH_lZKE,522
-dao_treasury/db.py,sha256=KH1yNuzSEO2Q6miLwM8W4l32qqlHkga3Nxxu-g_iS9s,48643
+dao_treasury/db.py,sha256=aZhY33XFHv5vwTQecolpaYXB_0SBPWvYGvZWlme_yH4,48703
 dao_treasury/docker-compose.yaml,sha256=s0Nq-u--kIyknC-rlmJW2ycdKPjwJ_HetG7jBBJD95A,1350
 dao_treasury/main.py,sha256=yVQGwDgO4XKcxV6tQQPxEcLcZPSEEK1yJS8Djfq3Esc,8294
 dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/treasury.py,sha256=64_z0lsjOngGFASCVQNUM-QfbC5YqhKMgOdtLh758co,6678
-dao_treasury/types.cp310-win32.pyd,sha256=9lV28irva8QVIBvAyUkKcxxiJXPX3b6S3mW4u_whmXk,9216
+dao_treasury/types.cp310-win32.pyd,sha256=rtTf_GVzYPBD_KflQwQyg_ZjV0KnEOnxNDu6d0UbOCY,9216
 dao_treasury/types.py,sha256=KFz4WKPp4t_RBwIT6YGwOcgbzw8tdHIOcXTFsUA0pJA,3818
 dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=PwGrxPA5snT37bmpCuP9WE9T7weACm39N9lEsudr7f0,1337
 dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=Q0QTL1UIYQCsqj8GQuZMt81Ick-FMhYphbBo8XV1TQs,7248
@@ -25,27 +25,29 @@ dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=TDDh
 dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=_W5Zt-J0YTVGAKPbM5kbMnv0EC3K_eZgJbqLgzkanS4,14844
 dao_treasury/.grafana/provisioning/dashboards/treasury/Treasury.json,sha256=6y7Fp-2g1iRanRBtWKKN13sXjaKxBvqld7416ZJu4YI,72196
 dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=gLmJsOkEXNzWRDibShfHFySWeuExW-dSB_U0OSfH868,344
-dao_treasury/sorting/__init__.cp310-win32.pyd,sha256=4P37P1BIqfwiU8sHcUHR6qu8e2OLOlyqB85qqw0kosw,9216
+dao_treasury/sorting/__init__.cp310-win32.pyd,sha256=C7Oo9AuY7okaRFtX-fBTfgOqia16zKC8VR6XmbUCu0I,9216
 dao_treasury/sorting/__init__.py,sha256=_uxM_FE1paM8oDAhDdHSyhDwnrlxCYX_lGn2DOqCaHU,10666
-dao_treasury/sorting/_matchers.cp310-win32.pyd,sha256=w1G6Ie4SEPOvmQ4mwkUlSAoyjNIVTDHzXYe095Ohs2o,9216
+dao_treasury/sorting/_matchers.cp310-win32.pyd,sha256=pd45Ay9xbJFpX_jUhHcazfGxlWnfuqNph3P4g01mKkI,9216
 dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
-dao_treasury/sorting/_rules.cp310-win32.pyd,sha256=qw46fV2acchhr43yyT-E5Ctb2DUy6Z03Y-_omrq_uL0,9216
+dao_treasury/sorting/_rules.cp310-win32.pyd,sha256=4ioO7KD4ISzSOX3pWGXiXf9Cy_VxzBT2CCI8nLFh4HU,9216
 dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
-dao_treasury/sorting/factory.cp310-win32.pyd,sha256=83vYEzimua_9hXftAcZ496aBdWEQV4L6rL7I1XJXGU8,9216
+dao_treasury/sorting/factory.cp310-win32.pyd,sha256=XqkHItBcFOZPMd-V2u8_NAx9pPI1VePlzBQXsUaolC4,9216
 dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
-dao_treasury/sorting/rule.cp310-win32.pyd,sha256=CE3nh-Ita4VirJe0cS7gqZKSmmyed88M2Ssl5bMz--s,9216
+dao_treasury/sorting/rule.cp310-win32.pyd,sha256=B0-zIceGWEBDCweee_PtgeZAFUwVT_PmdqjkBc8kZsc,9216
 dao_treasury/sorting/rule.py,sha256=TsSlaU4UlYr4QWJBdUY7EOAfC_SK6_VA3wEFOFNUUrU,11837
-dao_treasury/sorting/rules/__init__.cp310-win32.pyd,sha256=H8GMeEz8T8euPEG97C1YtvAFusLjDC_FLPyF9zGW8uo,9216
+dao_treasury/sorting/rules/__init__.cp310-win32.pyd,sha256=1rNAQtdeV7VN7CWDJOBJA4ar_BcSBq7ffIThtK5EL9g,9216
 dao_treasury/sorting/rules/__init__.py,sha256=hcLfejOEwD8RaM2RE-38Ej6_WkvL9BVGvIIGY848E6E,49
-dao_treasury/sorting/rules/ignore/__init__.cp310-win32.pyd,sha256=ublti3qLWgWWUCgVtWiUBM7crZ17MS0qwkV29V0rQSQ,9216
-dao_treasury/sorting/rules/ignore/__init__.py,sha256=16THKoGdj6qfkkytuCFVG_R1M6KSErMI4AVE1p0ukS4,58
-dao_treasury/sorting/rules/ignore/llamapay.cp310-win32.pyd,sha256=55MhrJMqvsa_oM1IUTm6z7Ec47B1JQMPleMYJ6tsWC0,9216
+dao_treasury/sorting/rules/ignore/__init__.cp310-win32.pyd,sha256=ilYo8VZqmOJIPb-3EcR9qm55pcRze_nr5GgxN0H2JBU,9216
+dao_treasury/sorting/rules/ignore/__init__.py,sha256=5zsmr_PMgVUXhQDz5grBtYhfSjqKMI_amFjvD2G6lZs,117
+dao_treasury/sorting/rules/ignore/llamapay.cp310-win32.pyd,sha256=TU9r5TFcHGfhESn2VFlAmRLrZ7gc-tN1hY98mgDisf0,9216
 dao_treasury/sorting/rules/ignore/llamapay.py,sha256=aYyAJRlmv419IeaqkcV5o3ffx0UVfteU0lTl80j0BGo,783
-dao_treasury/streams/__init__.cp310-win32.pyd,sha256=qEJZ64tGQI2k_SpSVQ4sNIQyZmzbnfeBrzgHgArxg-E,9216
+dao_treasury/sorting/rules/ignore/shitcoins.cp310-win32.pyd,sha256=18RiZtaYsJSAVfxxoO6Epn27-Nmnm1RRh0G9CmBYxiE,9216
+dao_treasury/sorting/rules/ignore/shitcoins.py,sha256=8zdwOSi46yJeASEu8M6Ji_zG36IM8Nbu0SSYtcl32u4,791
+dao_treasury/streams/__init__.cp310-win32.pyd,sha256=RrH4JVZea6NHVf7FVVAygKs-YK_ViTk-QPZyKTRqpIs,9216
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dao_treasury/streams/llamapay.cp310-win32.pyd,sha256=S4qGmr_6wH9yV1n6nP7qhKBa1Oxh-pKloPFAMsi0I8E,9216
-dao_treasury/streams/llamapay.py,sha256=HXG3Qg8R5l1FTVgmSnpOBRoDt2VchjOI-dU9rrC_mjQ,13150
-dao_treasury-0.0.37.dist-info/METADATA,sha256=BdH9RLd1zae3aHFvdFhp3fxLvHFHaBPFKurTnaYnR2E,7149
-dao_treasury-0.0.37.dist-info/WHEEL,sha256=GWZF0cboiU4MhsG0baPl8rrtCaXFSLW25384gp3vddM,97
-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.cp310-win32.pyd,sha256=Lw72bxxcdKwI1p9MnjJjTtWY1WgAyadTpjZB11EYuOc,9216
+dao_treasury/streams/llamapay.py,sha256=rO1Mh2ndTziR6pnRkKHnQ22a_Yx9PM_-BG7I4dspEZ8,13535
+dao_treasury-0.0.39.dist-info/METADATA,sha256=-wDgbX3YfkykBjBD0ztk8uYjAl2GfGDOcOvHilFMlrY,7149
+dao_treasury-0.0.39.dist-info/WHEEL,sha256=GWZF0cboiU4MhsG0baPl8rrtCaXFSLW25384gp3vddM,97
+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