Bump version, deps

chainqueue/db/models/otx.py

@@ -238,9 +238,11 @@ class Otx(SessionBase):
             SessionBase.release_session(session)
             raise TxStateChangeError('OVERRIDDEN/OBSOLETED cannot be set on an entry with FINAL state set ({})'.format(status))
         if self.status & StatusBits.IN_NETWORK:
+            status = status_str(self.status)
             SessionBase.release_session(session)
             raise TxStateChangeError('OVERRIDDEN/OBSOLETED cannot be set on an entry already IN_NETWORK ({})'.format(status))
         if self.status & StatusBits.OBSOLETE:
+            status = status_str(self.status)
             SessionBase.release_session(session)
             raise TxStateChangeError('OVERRIDDEN/OBSOLETED cannot be set on an entry already OBSOLETE ({})'.format(status))
 

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 exclude_obsolete:
-        q = q.filter(not_(Otx.status.op('&')(StatusBits.OBSOLETE.value)==0))
     if sender != None:
         q = q.filter(TxCache.sender==sender)
+    if exclude_obsolete:
+        q = q.filter(Otx.status.op('&')(StatusBits.OBSOLETE.value)==0)
 
     txs = {}
     gas = 0

chainqueue/sql/state.py

@@ -405,7 +405,7 @@ def obsolete_by_cache(chain_spec, tx_hash, final, session=None):
     q = q.join(TxCache)
     q = q.filter(Otx.nonce==nonce)
     q = q.filter(TxCache.sender==sender)
-    q = q.filter(Otx.tx_hash!=strip_0x(tx_hash))
+    q = q.filter(Otx.id!=otxid)
 
     for otwo in q.all():
         try:

requirements.txt

@@ -3,6 +3,6 @@ hexathon~=0.1.0
 leveldir~=0.3.0
 alembic==1.4.2
 SQLAlchemy==1.3.20
-confini~=0.5.1
+confini>=0.5.1,<0.7.0
 pyxdg~=0.27
-chainlib~=0.0.12
+chainlib>=0.1.0b1,<0.2.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = chainqueue
-version = 0.0.6rc6
+version = 0.0.6rc9
 description = Generic blockchain transaction queue control
 author = Louis Holbrook
 author_email = dev@holbrook.no