From e5c8af1aaa43d4eaf7e7e00489b2c3f679e74f42 Mon Sep 17 00:00:00 2001 From: lash Date: Thu, 7 Apr 2022 11:11:45 +0000 Subject: [PATCH] Remove reserved status requirements for fubar state set --- chainqueue/db/models/otx.py | 9 ++++----- chainqueue/sql/tx.py | 2 +- setup.cfg | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/chainqueue/db/models/otx.py b/chainqueue/db/models/otx.py index cf2c0ac..c64aece 100644 --- a/chainqueue/db/models/otx.py +++ b/chainqueue/db/models/otx.py @@ -168,11 +168,10 @@ class Otx(SessionBase): status = status_str(self.status) SessionBase.release_session(session) raise TxStateChangeError('FUBAR cannot be set on an entry with an error state already set ({})'.format(status)) - if not self.status & StatusBits.RESERVED: - status = status_str(self.status) - SessionBase.release_session(session) - raise TxStateChangeError('FUBAR on tx that has not been RESERVED ({})'.format(status)) - +# if not self.status & StatusBits.RESERVED: +# status = status_str(self.status) +# SessionBase.release_session(session) +# raise TxStateChangeError('FUBAR on tx that has not been RESERVED ({})'.format(status)) self.__set_status(StatusBits.UNKNOWN_ERROR | StatusBits.FINAL, session) self.__reset_status(StatusBits.QUEUED | StatusBits.RESERVED, session) diff --git a/chainqueue/sql/tx.py b/chainqueue/sql/tx.py index b090b5f..bd35a3b 100644 --- a/chainqueue/sql/tx.py +++ b/chainqueue/sql/tx.py @@ -76,7 +76,7 @@ def create(chain_spec, nonce, holder_address, tx_hash, signed_tx, obsolete_prede session.commit() SessionBase.release_session(session) - logg.debug('queue created nonce {} from {} hash {}'.format(nonce, holder_address, tx_hash)) + logg.debug('queue created nonce {} from {} hash {} tx {}'.format(nonce, holder_address, tx_hash, signed_tx)) return tx_hash diff --git a/setup.cfg b/setup.cfg index e9f068b..408e13f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = chainqueue -version = 0.0.6rc3 +version = 0.0.6rc4 description = Generic blockchain transaction queue control author = Louis Holbrook author_email = dev@holbrook.no