kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct cic-types version

Browse Source
This commit is contained in:
nolash 2021-02-18 19:59:06 +01:00
parent 8449ff8b58
commit 9c687db9c0
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
2 changed files with 87 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
apps/cic-eth/cic_eth/queue/tx.py
View File

@ -52,10 +52,12 @@ def create(nonce, holder_address, tx_hash, signed_tx, chain_str, obsolete_predec
:returns: transaction hash :returns: transaction hash
:rtype: str, 0x-hash :rtype: str, 0x-hash
""" """
session = SessionBase.create_session() #session = SessionBase.create_session()
#sqlalchemy.exc.TimeoutError
session = SessionBase.bind_session()
lock = Lock.check_aggregate(chain_str, LockEnum.QUEUE, holder_address, session=session) lock = Lock.check_aggregate(chain_str, LockEnum.QUEUE, holder_address, session=session)
if lock > 0: if lock > 0:
session.close() SessionBase.release_session(session)
raise LockedError(lock) raise LockedError(lock)
o = Otx.add( o = Otx.add(
@ -81,7 +83,9 @@ def create(nonce, holder_address, tx_hash, signed_tx, chain_str, obsolete_predec
otx.cancel(confirmed=False, session=session) otx.cancel(confirmed=False, session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
logg.debug('queue created nonce {} from {} hash {}'.format(nonce, holder_address, tx_hash)) logg.debug('queue created nonce {} from {} hash {}'.format(nonce, holder_address, tx_hash))
return tx_hash return tx_hash
@ -99,7 +103,8 @@ def set_sent_status(tx_hash, fail=False):
:returns: True if tx is known, False otherwise :returns: True if tx is known, False otherwise
:rtype: boolean :rtype: boolean
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
logg.warning('not local tx, skipping {}'.format(tx_hash)) logg.warning('not local tx, skipping {}'.format(tx_hash))
@ -112,7 +117,8 @@ def set_sent_status(tx_hash, fail=False):
o.sent(session=session) o.sent(session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -129,7 +135,8 @@ def set_final_status(tx_hash, block=None, fail=False):
:type fail: boolean :type fail: boolean
:raises NotLocalTxError: If transaction not found in queue. :raises NotLocalTxError: If transaction not found in queue.
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query( q = session.query(
Otx.nonce.label('nonce'), Otx.nonce.label('nonce'),
TxCache.sender.label('sender'), TxCache.sender.label('sender'),
@ -140,7 +147,7 @@ def set_final_status(tx_hash, block=None, fail=False):
o = q.first() o = q.first()
if o == None: if o == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
@ -168,7 +175,8 @@ def set_final_status(tx_hash, block=None, fail=False):
otwo.cancel(True, session=session) otwo.cancel(True, session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -187,9 +195,10 @@ def set_cancel(tx_hash, manual=False):
""" """
session = SessionBase.create_session() session = SessionBase.create_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
session.close() session.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
@ -200,7 +209,8 @@ def set_cancel(tx_hash, manual=False):
o.cancel(session=session) o.cancel(session=session)
session.commit() session.commit()
session.close()
session.release_session(session)
return tx_hash return tx_hash
@ -216,17 +226,19 @@ def set_rejected(tx_hash):
:raises NotLocalTxError: If transaction not found in queue. :raises NotLocalTxError: If transaction not found in queue.
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
o.reject(session=session) o.reject(session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -242,17 +254,19 @@ def set_fubar(tx_hash):
:raises NotLocalTxError: If transaction not found in queue. :raises NotLocalTxError: If transaction not found in queue.
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
o.fubar(session=session) o.fubar(session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -268,17 +282,19 @@ def set_manual(tx_hash):
:raises NotLocalTxError: If transaction not found in queue. :raises NotLocalTxError: If transaction not found in queue.
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
o.manual(session=session) o.manual(session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -291,11 +307,13 @@ def set_ready(tx_hash):
:type tx_hash: str, 0x-hex :type tx_hash: str, 0x-hex
:raises NotLocalTxError: If transaction not found in queue. :raises NotLocalTxError: If transaction not found in queue.
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
if o.status & StatusBits.GAS_ISSUES or o.status == StatusEnum.PENDING: if o.status & StatusBits.GAS_ISSUES or o.status == StatusEnum.PENDING:
@ -304,7 +322,8 @@ def set_ready(tx_hash):
o.retry(session=session) o.retry(session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -319,18 +338,19 @@ def set_waitforgas(tx_hash):
:type tx_hash: str, 0x-hex :type tx_hash: str, 0x-hex
:raises NotLocalTxError: If transaction not found in queue. :raises NotLocalTxError: If transaction not found in queue.
""" """
session = SessionBase.bind_session()
session = SessionBase.create_session()
o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first() o = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
if o == None: if o == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
session.flush() session.flush()
o.waitforgas(session=session) o.waitforgas(session=session)
session.commit() session.commit()
session.close()
SessionBase.release_session(session)
return tx_hash return tx_hash
@ -340,16 +360,17 @@ def get_state_log(tx_hash):
logs = [] logs = []
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query(OtxStateLog) q = session.query(OtxStateLog)
q = q.join(Otx) q = q.join(Otx)
q = q.filter(Otx.tx_hash==tx_hash) q = q.filter(Otx.tx_hash==tx_hash)
q = q.order_by(OtxStateLog.date.asc()) q = q.order_by(OtxStateLog.date.asc())
for l in q.all(): for l in q.all():
logs.append((l.date, l.status,)) logs.append((l.date, l.status,))
session.close() SessionBase.release_session(session)
return logs return logs
@ -364,13 +385,14 @@ def get_tx_cache(tx_hash):
:returns: Transaction data :returns: Transaction data
:rtype: dict :rtype: dict
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query(Otx) q = session.query(Otx)
q = q.filter(Otx.tx_hash==tx_hash) q = q.filter(Otx.tx_hash==tx_hash)
otx = q.first() otx = q.first()
if otx == None: if otx == None:
session.close() SessionBase.release_session(session)
raise NotLocalTxError(tx_hash) raise NotLocalTxError(tx_hash)
session.flush() session.flush()
@ -379,7 +401,7 @@ def get_tx_cache(tx_hash):
q = q.filter(TxCache.otx_id==otx.id) q = q.filter(TxCache.otx_id==otx.id)
txc = q.first() txc = q.first()
session.close() SessionBase.release_session(session)
tx = { tx = {
'tx_hash': otx.tx_hash, 'tx_hash': otx.tx_hash,
@ -414,7 +436,8 @@ def get_lock(address=None):
:returns: List of locks :returns: List of locks
:rtype: list of dicts :rtype: list of dicts
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query( q = session.query(
Lock.date_created, Lock.date_created,
Lock.address, Lock.address,
@ -436,7 +459,8 @@ def get_lock(address=None):
'flags': lock[2], 'flags': lock[2],
} }
locks.append(o) locks.append(o)
session.close()
SessionBase.release_session(session)
return locks return locks
@ -451,8 +475,14 @@ def get_tx(tx_hash):
:returns: nonce, address and signed_tx (raw signed transaction) :returns: nonce, address and signed_tx (raw signed transaction)
:rtype: dict :rtype: dict
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
tx = session.query(Otx).filter(Otx.tx_hash==tx_hash).first()
q = session.query(Otx)
q = q.filter(Otx.tx_hash==tx_hash)
tx = q.first()
SessionBase.release_session(session)
if tx == None: if tx == None:
raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash)) raise NotLocalTxError('queue does not contain tx hash {}'.format(tx_hash))
@ -463,7 +493,7 @@ def get_tx(tx_hash):
'status': tx.status, 'status': tx.status,
} }
logg.debug('get tx {}'.format(o)) logg.debug('get tx {}'.format(o))
session.close()
return o return o
@ -478,7 +508,8 @@ def get_nonce_tx(nonce, sender, chain_id):
:returns: Transactions :returns: Transactions
:rtype: dict, with transaction hash as key, signed raw transaction as value :rtype: dict, with transaction hash as key, signed raw transaction as value
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query(Otx) q = session.query(Otx)
q = q.join(TxCache) q = q.join(TxCache)
q = q.filter(TxCache.sender==sender) q = q.filter(TxCache.sender==sender)
@ -491,7 +522,7 @@ def get_nonce_tx(nonce, sender, chain_id):
if sender == None or tx['from'] == sender: if sender == None or tx['from'] == sender:
txs[r.tx_hash] = r.signed_tx txs[r.tx_hash] = r.signed_tx
session.close() SessionBase.release_session(session)
return txs return txs
@ -511,12 +542,14 @@ def get_paused_txs(status=None, sender=None, chain_id=0):
:returns: Transactions :returns: Transactions
:rtype: dict, with transaction hash as key, signed raw transaction as value :rtype: dict, with transaction hash as key, signed raw transaction as value
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query(Otx) q = session.query(Otx)
if status != None: if status != None:
#if status == StatusEnum.PENDING or status >= StatusEnum.SENT: #if status == StatusEnum.PENDING or status >= StatusEnum.SENT:
if status == StatusEnum.PENDING or status & StatusBits.IN_NETWORK or not is_alive(status): if status == StatusEnum.PENDING or status & StatusBits.IN_NETWORK or not is_alive(status):
SessionBase.release_session(session)
raise ValueError('not a valid paused tx value: {}'.format(status)) raise ValueError('not a valid paused tx value: {}'.format(status))
q = q.filter(Otx.status.op('&')(status.value)==status.value) q = q.filter(Otx.status.op('&')(status.value)==status.value)
q = q.join(TxCache) q = q.join(TxCache)
@ -536,7 +569,7 @@ def get_paused_txs(status=None, sender=None, chain_id=0):
#gas += tx['gas'] * tx['gasPrice'] #gas += tx['gas'] * tx['gasPrice']
txs[r.tx_hash] = r.signed_tx txs[r.tx_hash] = r.signed_tx
session.close() SessionBase.release_session(session)
return txs return txs
@ -554,7 +587,9 @@ def get_status_tx(status, before=None, exact=False, limit=0):
:rtype: list of cic_eth.db.models.otx.Otx :rtype: list of cic_eth.db.models.otx.Otx
""" """
txs = {} txs = {}
session = SessionBase.create_session()
session = SessionBase.bind_session()
q = session.query(Otx) q = session.query(Otx)
q = q.join(TxCache) q = q.join(TxCache)
q = q.filter(TxCache.date_updated<before) q = q.filter(TxCache.date_updated<before)
@ -568,7 +603,9 @@ def get_status_tx(status, before=None, exact=False, limit=0):
break break
txs[o.tx_hash] = o.signed_tx txs[o.tx_hash] = o.signed_tx
i += 1 i += 1
session.close()
SessionBase.release_session(session)
return txs return txs
@ -592,7 +629,8 @@ def get_upcoming_tx(status=StatusEnum.READYSEND, recipient=None, before=None, ch
:returns: Transactions :returns: Transactions
:rtype: dict, with transaction hash as key, signed raw transaction as value :rtype: dict, with transaction hash as key, signed raw transaction as value
""" """
session = SessionBase.create_session() session = SessionBase.bind_session()
q_outer = session.query( q_outer = session.query(
TxCache.sender, TxCache.sender,
func.min(Otx.nonce).label('nonce'), func.min(Otx.nonce).label('nonce'),
@ -602,6 +640,7 @@ def get_upcoming_tx(status=StatusEnum.READYSEND, recipient=None, before=None, ch
q_outer = q_outer.filter(or_(Lock.flags==None, Lock.flags.op('&')(LockEnum.SEND.value)==0)) q_outer = q_outer.filter(or_(Lock.flags==None, Lock.flags.op('&')(LockEnum.SEND.value)==0))
if not is_alive(status): if not is_alive(status):
SessionBase.release_session(session)
raise ValueError('not a valid non-final tx value: {}'.format(status)) raise ValueError('not a valid non-final tx value: {}'.format(status))
if status == StatusEnum.PENDING: if status == StatusEnum.PENDING:
q_outer = q_outer.filter(Otx.status==status.value) q_outer = q_outer.filter(Otx.status==status.value)
@ -643,7 +682,7 @@ def get_upcoming_tx(status=StatusEnum.READYSEND, recipient=None, before=None, ch
session.add(o) session.add(o)
session.commit() session.commit()
session.close() SessionBase.release_session(session)
return txs return txs
@ -669,7 +708,8 @@ def get_account_tx(address, as_sender=True, as_recipient=True, counterpart=None)
txs = {} txs = {}
session = SessionBase.create_session() session = SessionBase.bind_session()
q = session.query(Otx) q = session.query(Otx)
q = q.join(TxCache) q = q.join(TxCache)
if as_sender and as_recipient: if as_sender and as_recipient:
@ -686,7 +726,8 @@ def get_account_tx(address, as_sender=True, as_recipient=True, counterpart=None)
logg.debug('tx {} already recorded'.format(r.tx_hash)) logg.debug('tx {} already recorded'.format(r.tx_hash))
continue continue
txs[r.tx_hash] = r.signed_tx txs[r.tx_hash] = r.signed_tx
session.close()
SessionBase.release_session(session)
return txs return txs

2
apps/contract-migration/scripts/requirements.txt
View File

@ -1,5 +1,4 @@
psycopg2==2.8.6 psycopg2==2.8.6
cic-types==0.1.0a7
chainlib~=0.0.1a15 chainlib~=0.0.1a15
chainsyncer==0.0.1a7 chainsyncer==0.0.1a7
cic-eth==0.10.0a27 cic-eth==0.10.0a27
@ -8,3 +7,4 @@ celery==4.4.7
redis==3.5.3 redis==3.5.3
hexathon==0.0.1a3 hexathon==0.0.1a3
faker==4.17.1 faker==4.17.1
cic-types==cic_types-0.1.0a7+build.1c254367