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

WIP add writer registration to seed script

Browse Source
This commit is contained in:
nolash
2021-03-28 21:29:05 +02:00
parent 1322ebc8b6
commit e3846809a6
8 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cic-eth/cic_eth/api/api_admin.py
View File

@@ -463,7 +463,7 @@ class AdminApi:
o = transaction(tx_hash)
r = self.rpc.do(o)
except Exception as e:
logg.warning('too permissive exception handler, please fix!')
logg.warning('(too permissive exception handler, please fix!) {}'.format(e))
tx['network_status'] = 'Mempool'
if r != None:

4
apps/cic-eth/cic_eth/db/models/otx.py
View File

@@ -355,10 +355,10 @@ class Otx(SessionBase):
if self.status & StatusBits.FINAL:
SessionBase.release_session(session)
raise TxStateChangeError('SENDFAIL cannot be set on an entry with FINAL state set ({})'.format(status_str(self.status)))
raise TxStateChangeError('QUEUED cannot be unset on an entry with FINAL state set ({})'.format(status_str(self.status)))
if self.status & StatusBits.IN_NETWORK:
SessionBase.release_session(session)
raise TxStateChangeError('SENDFAIL cannot be set on an entry with IN_NETWORK state set ({})'.format(status_str(self.status)))
raise TxStateChangeError('QUEUED cannot be unset on an entry with IN_NETWORK state set ({})'.format(status_str(self.status)))
self.__reset_status(StatusBits.QUEUED, session)

3
apps/cic-eth/cic_eth/eth/tx.py
View File

@@ -261,10 +261,11 @@ def send(self, txs, chain_spec_dict):
chain_spec = ChainSpec.from_dict(chain_spec_dict)
tx_hex = txs[0]
logg.debug('send transaction {}'.format(tx_hex))
tx_hash_hex = add_0x(keccak256_hex_to_hex(tx_hex))
logg.debug('send transaction {} -> {}'.format(tx_hash_hex, tx_hex))
queue = self.request.delivery_info.get('routing_key')
r = None

2
apps/cic-eth/docker/Dockerfile
View File

@@ -29,7 +29,7 @@ RUN /usr/local/bin/python -m pip install --upgrade pip
# python merge_requirements.py | tee merged_requirements.txt
#RUN cd cic-base && \
# pip install $pip_extra_index_url_flag -r ./merged_requirements.txt
RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a39
RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a44
COPY cic-eth/scripts/ scripts/
COPY cic-eth/setup.cfg cic-eth/setup.py ./

2
apps/cic-eth/requirements.txt
View File

@@ -1,4 +1,4 @@
cic-base~=0.1.2a42
cic-base~=0.1.2a45
celery==4.4.7
crypto-dev-signer~=0.4.14a16
confini~=0.3.6rc3