dao-treasury 0.0.37__tar.gz → 0.0.39__tar.gz

{dao_treasury-0.0.37 → dao_treasury-0.0.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 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 → dao_treasury-0.0.39}/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-0.0.39/dao_treasury/sorting/rules/ignore/__init__.py

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

dao_treasury-0.0.39/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-0.0.37 → dao_treasury-0.0.39}/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 → dao_treasury-0.0.39}/dao_treasury.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 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 → dao_treasury-0.0.39}/dao_treasury.egg-info/SOURCES.txt

@@ -37,5 +37,6 @@ dao_treasury/sorting/rule.py
 dao_treasury/sorting/rules/__init__.py
 dao_treasury/sorting/rules/ignore/__init__.py
 dao_treasury/sorting/rules/ignore/llamapay.py
+dao_treasury/sorting/rules/ignore/shitcoins.py
 dao_treasury/streams/__init__.py
 dao_treasury/streams/llamapay.py

{dao_treasury-0.0.37 → dao_treasury-0.0.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dao-treasury"
-version = "0.0.37"
+version = "0.0.39"
 description = "Produce comprehensive financial reports for your on-chain org"
 authors = ["BobTheBuidler <bobthebuidlerdefi@gmail.com>"]
 license = "MIT"

dao_treasury-0.0.37/dao_treasury/sorting/rules/ignore/__init__.py

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