diff --git a/apps/cic-eth/cic_eth/api/api_admin.py b/apps/cic-eth/cic_eth/api/api_admin.py index dbc71a6f..927be064 100644 --- a/apps/cic-eth/cic_eth/api/api_admin.py +++ b/apps/cic-eth/cic_eth/api/api_admin.py @@ -470,7 +470,8 @@ class AdminApi: try: o = receipt(tx_hash) 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' else: tx['network_status'] = 'Reverted' diff --git a/apps/contract-migration/docker/Dockerfile b/apps/contract-migration/docker/Dockerfile index 2a25e7b6..cd9325f7 100644 --- a/apps/contract-migration/docker/Dockerfile +++ b/apps/contract-migration/docker/Dockerfile @@ -57,8 +57,8 @@ WORKDIR /home/grassroots USER grassroots ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 -ARG cic_base_version=0.1.2a48 -ARG cic_eth_version=0.10.1a5+build.792715ca +ARG cic_base_version=0.1.2a49 +ARG cic_eth_version=0.10.1a5+build.02d23112 ARG sarafu_faucet_version=0.0.2a13 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 \ diff --git a/apps/contract-migration/run_job.sh b/apps/contract-migration/run_job.sh index e01e105f..9c4c61b6 100644 --- a/apps/contract-migration/run_job.sh +++ b/apps/contract-migration/run_job.sh @@ -2,10 +2,13 @@ if [[ $((RUN_MASK & 1)) -eq 1 ]] then - ./reset.sh + ./reset.sh + if [ $? -ne "0" ]; then + exit 1; + fi fi if [[ $((RUN_MASK & 2)) -eq 2 ]] then - ./seed_cic_eth.sh + ./seed_cic_eth.sh fi diff --git a/docker-compose.yml b/docker-compose.yml index 00052d17..f61a92dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -101,7 +101,7 @@ services: CELERY_BROKER_URL: ${CELERY_BROKER_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} - 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: ["./reset.sh"] depends_on: