diff --git a/apps/contract-migration/override_requirements.txt b/apps/contract-migration/override_requirements.txt index 62ba7a71..4f423706 100644 --- a/apps/contract-migration/override_requirements.txt +++ b/apps/contract-migration/override_requirements.txt @@ -1,3 +1,3 @@ -erc20-demurrage-token==0.0.1b1 - - +eth-contract-registry==0.5.5a3 +erc20-demurrage-token==0.0.1b4 +eth-address-index==0.1.1a12 diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt index 64ae898f..01b7e1a9 100644 --- a/apps/contract-migration/requirements.txt +++ b/apps/contract-migration/requirements.txt @@ -1,5 +1,4 @@ -cic-base[full_graph]==0.1.2b17 +cic-base[full]==0.1.2b18 sarafu-faucet~=0.0.3a4 -erc20-demurrage-token==0.0.1b1 -cic-eth~=0.11.0b16 - +cic-eth~=0.11.0b17 +erc20-demurrage-token==0.0.1b4 diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh index 6a2ea7ec..5f5ec43b 100755 --- a/apps/contract-migration/reset.sh +++ b/apps/contract-migration/reset.sh @@ -77,7 +77,6 @@ if [[ -n "${ETH_PROVIDER}" ]]; then >&2 echo "deploying 'redistributed demurrage token'" DEV_RESERVE_ADDRESS=`erc20-demurrage-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww` fi - exit 0 giftable-token-gift $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT >&2 echo "deploy account index contract" diff --git a/apps/contract-migration/run_job.sh b/apps/contract-migration/run_job.sh index 9c4c61b6..5edb2b00 100644 --- a/apps/contract-migration/run_job.sh +++ b/apps/contract-migration/run_job.sh @@ -2,13 +2,22 @@ if [[ $((RUN_MASK & 1)) -eq 1 ]] then + >&2 echo -e "\033[;96mRUNNING\033[;39m RUN_MASK 1 - contract deployment" ./reset.sh if [ $? -ne "0" ]; then - exit 1; + >&2 echo -e "\033[;31mFAILED\033[;39m RUN_MASK 1 - contract deployment" + exit 1; fi + >&2 echo -e "\033[;32mSUCCEEDED\033[;39m RUN_MASK 1 - contract deployment" fi if [[ $((RUN_MASK & 2)) -eq 2 ]] then + >&2 echo -e "\033[;96mRUNNING\033[;39m RUN_MASK 2 - custodial service initialization" ./seed_cic_eth.sh + if [ $? -ne "0" ]; then + >&2 echo -e "\033[;31mFAILED\033[;39m RUN_MASK 2 - custodial service initialization" + exit 1; + fi + >&2 echo -e "\033[;32mSUCCEEDED\033[;39m RUN_MASK 2 - custodial service initialization" fi diff --git a/docker-compose.yml b/docker-compose.yml index 50b64013..71e4e593 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,6 +73,7 @@ services: contract-migration: build: dockerfile: contract-migration/docker/Dockerfile.dev + #dockerfile: contract-migration/docker/Dockerfile args: pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple} pip_extra_args: $PIP_EXTRA_ARGS @@ -110,7 +111,7 @@ services: TOKEN_REDISTRIBUTION_PERIOD: $TOKEN_REDISTRIBUTION_PERIOD TOKEN_SUPPLY_LIMIT: $TOKEN_SUPPLY_LIMIT TOKEN_DEMURRAGE_LEVEL: ${TOKEN_DEMURRAGE_LEVEL:-196454828847045000000000000000000} - CONFINI_DIR: $CONFINI_DIR + #CONFINI_DIR: ${CONFINI_DIR:-/tmp/cic/config} command: ["./run_job.sh"] #command: ["./reset.sh"] depends_on: