From 4c520e343346df5faa3d9d7f49d2062e4e7baf30 Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Sat, 16 Apr 2022 13:05:16 +0000
Subject: [PATCH] Add checked date bump

---
 chainqueue/sql/query.py | 11 +++++++----
 chainqueue/sql/state.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/chainqueue/sql/query.py b/chainqueue/sql/query.py
index 6eb3714..51c26dc 100644
--- a/chainqueue/sql/query.py
+++ b/chainqueue/sql/query.py
@@ -185,10 +185,10 @@ def get_paused_tx_cache(chain_spec, status=None, sender=None, session=None, deco
         q = q.filter(Otx.status>StatusEnum.PENDING.value)
         q = q.filter(not_(Otx.status.op('&')(StatusBits.IN_NETWORK.value)==0))
         q = q.filter(not_(Otx.status.op('&')(StatusBits.FINAL.value)==0))
-    if sender != None:
-        q = q.filter(TxCache.sender==sender)
     if exclude_obsolete:
         q = q.filter(not_(Otx.status.op('&')(StatusBits.OBSOLETE.value)==0))
+    if sender != None:
+        q = q.filter(TxCache.sender==sender)
 
     txs = {}
     gas = 0
@@ -210,7 +210,7 @@ def get_paused_tx_cache(chain_spec, status=None, sender=None, session=None, deco
     return txs
 
 
-def get_status_tx_cache(chain_spec, status, not_status=None, before=None, exact=False, limit=0, session=None, decoder=None):
+def get_status_tx_cache(chain_spec, status, not_status=None, before=None, exact=False, compare_checked=False, limit=0, session=None, decoder=None):
     """Retrieve transaction with a specific queue status.
 
     :param chain_spec: Chain spec for transaction network
@@ -235,7 +235,10 @@ def get_status_tx_cache(chain_spec, status, not_status=None, before=None, exact=
     q = session.query(Otx)
     q = q.join(TxCache)
     if before != None:
-        q = q.filter(Otx.date_updated<before)
+        if compare_checked:
+            q = q.filter(Otx.date_updated<before)
+        else:
+            q = q.filter(TxCache.date_checked<before)
     if exact:
         q = q.filter(Otx.status==status)
     else:
diff --git a/chainqueue/sql/state.py b/chainqueue/sql/state.py
index 3df5c0f..0945e73 100644
--- a/chainqueue/sql/state.py
+++ b/chainqueue/sql/state.py
@@ -424,3 +424,33 @@ def obsolete_by_cache(chain_spec, tx_hash, final, session=None):
     SessionBase.release_session(session)
 
     return tx_hash
+
+
+def set_checked(chain_spec, tx_hash, session=None):
+    """Set the checked date for the transaction to current datetime
+
+    :param chain_spec: Chain spec for transaction network
+    :type chain_spec: chainlib.chain.ChainSpec
+    :param tx_hash: Transaction hash of record to modify
+    :type tx_hash: str, 0x-hex
+    :param session: Backend state integrity session
+    :type session: varies
+    :raises NotLocalTxError: If transaction not found in queue.
+    :rtype: str
+    :returns: Transaction hash, in hex
+    """
+
+    session = SessionBase.bind_session(session)
+    o = TxCache.load(tx_hash, session=session)
+    if o == None:
+        SessionBase.release_session(session)
+        raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
+
+    session.flush()
+
+    o.check()
+    session.add(o)
+    session.commit()
+    SessionBase.release_session(session)
+
+    return tx_hash