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

Parse receipt value correctly

Browse Source
This commit is contained in:
nolash 2021-03-29 09:55:57 +02:00
parent 02d23112cd
commit bd9070ae44
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -470,7 +470,8 @@ class AdminApi:
try: try:
o = receipt(tx_hash) o = receipt(tx_hash)
r = self.rpc.do(o) r = self.rpc.do(o)
if r['status'] == 1: logg.debug('h {} o {}'.format(tx_hash, o))
if int(strip_0x(r['status'])) == 1:
tx['network_status'] = 'Confirmed' tx['network_status'] = 'Confirmed'
else: else:
tx['network_status'] = 'Reverted' tx['network_status'] = 'Reverted'

4
apps/contract-migration/docker/Dockerfile
View File

@ -57,8 +57,8 @@ WORKDIR /home/grassroots
USER grassroots USER grassroots
ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
ARG cic_base_version=0.1.2a48 ARG cic_base_version=0.1.2a49
ARG cic_eth_version=0.10.1a5+build.792715ca ARG cic_eth_version=0.10.1a5+build.02d23112
ARG sarafu_faucet_version=0.0.2a13 ARG sarafu_faucet_version=0.0.2a13
ARG cic_contracts_version=0.0.2a2 ARG cic_contracts_version=0.0.2a2
RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \ RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \

3
apps/contract-migration/run_job.sh
View File

@ -3,6 +3,9 @@
if [[ $((RUN_MASK & 1)) -eq 1 ]] if [[ $((RUN_MASK & 1)) -eq 1 ]]
then then
./reset.sh ./reset.sh
if [ $? -ne "0" ]; then
exit 1;
fi
fi fi
if [[ $((RUN_MASK & 2)) -eq 2 ]] if [[ $((RUN_MASK & 2)) -eq 2 ]]

2
docker-compose.yml
View File

@ -101,7 +101,7 @@ services:
CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379} CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379}
CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis:6379} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis:6379}
DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433} DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
RUN_MASK: 3 #0: noop 1: contract migrations 2: seed data RUN_MASK: 2 #0: nohp 1: contract migrations 2: seed data
command: ["./run_job.sh"] command: ["./run_job.sh"]
#command: ["./reset.sh"] #command: ["./reset.sh"]
depends_on: depends_on: