Bump chainlib to take dynamic arg vector for argparse

fix(contract-migration): Replace missing environment

See merge request grassrootseconomics/cic-internal-integration!271

apps/cic-eth/cic_eth/cli/rpc.py

@@ -35,14 +35,14 @@ class RPC:
     def from_config(config, use_signer=False, default_label='default', signer_label='signer'):
         chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 
-        RPCConnection.register_location(config.get('RPC_HTTP_PROVIDER'), chain_spec, default_label)
+        RPCConnection.register_location(config.get('RPC_PROVIDER'), chain_spec, default_label)
         if use_signer:
 
             RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, signer_label)
             RPCConnection.register_constructor(ConnType.HTTP, EthHTTPSignerConnection, signer_label)
             RPCConnection.register_constructor(ConnType.HTTP_SSL, EthHTTPSignerConnection, signer_label)
             RPCConnection.register_location(config.get('SIGNER_PROVIDER'), chain_spec, signer_label) 
-        rpc = RPC(chain_spec, config.get('RPC_HTTP_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
+        rpc = RPC(chain_spec, config.get('RPC_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
         logg.info('set up rpc: {}'.format(rpc))
         return rpc
 

apps/cic-eth/cic_eth/runnable/daemons/tasker.py

@@ -69,10 +69,15 @@ from cic_eth.registry import (
         )
 from cic_eth.task import BaseTask
 
-
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
+env = list(os.environ.keys())
+env.sort()
+for k in env:
+    logg.debug("env {} {}".format(k, os.environ[k]))
+
+
 arg_flags = cic_eth.cli.argflag_std_read
 local_arg_flags = cic_eth.cli.argflag_local_task
 argparser = cic_eth.cli.ArgumentParser(arg_flags)

apps/contract-migration/config.sh

@@ -36,7 +36,7 @@ export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOY
 
 # Migration variable processing
 
-confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
+confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
 
 cat ${DEV_DATA_DIR}/env_reset
 

apps/contract-migration/docker/Dockerfile_ci

@@ -1,44 +0,0 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e
-
-WORKDIR /root
-
-RUN touch /etc/apt/sources.list.d/ethereum.list
-RUN echo 'deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' > /etc/apt/sources.list.d/ethereum.list
-RUN echo 'deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' >> /etc/apt/sources.list.d/ethereum.list
-RUN cat /etc/apt/sources.list.d/ethereum.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9
-
-#RUN apt-get install solc
-
-RUN mkdir -vp /usr/local/etc/cic
-
-ENV CONFINI_DIR /usr/local/etc/cic/
-
-
-COPY config_template/ /usr/local/etc/cic/
-COPY requirements.txt . 
-COPY override_requirements.txt . 
-
-ARG pip_index_url=https://pypi.org/simple
-ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
-ARG EXTRA_PIP_ARGS=""
-ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-ARG pip_trusted_host=pypi.org
-RUN pip install --index-url https://pypi.org/simple \
-    pip install --index-url https://pypi.org/simple \
-    --pre \
-    --force-reinstall \
-    --trusted-host $pip_trusted_host \
-    --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \
-    -r requirements.txt 
-
-RUN pip install --index-url https://pypi.org/simple \
-    --force-reinstall \
-    --pre \
-    --trusted-host $pip_trusted_host \
-    --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL $EXTRA_PIP_ARGS \
-    -r override_requirements.txt 
-
-COPY . .
-RUN chmod +x *.sh

apps/contract-migration/envlist

@@ -56,6 +56,7 @@ ETH_PROVIDER
 ETH_ABI_DIR
 SIGNER_SOCKET_PATH
 SIGNER_SECRET
+SIGNER_PROVIDER
 CELERY_BROKER_URL
 CELERY_RESULT_URL
 META_PROVIDER

apps/contract-migration/requirements.txt

@@ -1,5 +1,5 @@
 cic-eth[tools]==0.12.4a8
-chainlib-eth>=0.0.9a9,<0.1.0
+chainlib-eth>=0.0.9a14,<0.1.0
 eth-erc20>=0.1.2a3,<0.2.0
 erc20-demurrage-token>=0.0.5a2,<0.1.0
 eth-accounts-index>=0.1.2a2,<0.2.0
@@ -9,4 +9,4 @@ erc20-transfer-authorization>=0.3.5a2,<0.4.0
 erc20-faucet>=0.3.2a2,<0.4.0
 sarafu-faucet>=0.0.7a2,<0.1.0
 confini>=0.4.2rc3,<1.0.0
-crypto-dev-signer>=0.4.15a4,<=0.4.15
+crypto-dev-signer>=0.4.15a7,<=0.4.15

apps/contract-migration/reset.sh

@@ -4,6 +4,8 @@ set -a
 
 . ${DEV_DATA_DIR}/env_reset
 
+WAIT_FOR_TIMEOUT=${WAIT_FOR_TIMEOUT:-60}
+
 set -e
 
 if [ ! -z $DEV_ETH_GAS_PRICE ]; then
@@ -24,7 +26,7 @@ if [ ! -z "$DEV_USE_DOCKER_WAIT_SCRIPT" ]; then
 	read -i "/" rpc_provider_port <<< "${p[2]}"
 	rpc_provider_host=${p[1]:2}
 	echo "waiting for provider host $rpc_provider_host port $rpc_provider_port..."
-	./wait-for-it.sh "$rpc_provider_host:$rpc_provider_port"
+	./wait-for-it.sh "$rpc_provider_host:$rpc_provider_port" -t $WAIT_FOR_TIMEOUT
 fi
 
 if [ "$TOKEN_TYPE" == "giftable_erc20_token" ]; then
@@ -107,7 +109,8 @@ giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $DEV_RESERV
 
 #echo "export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL" >> ${DEV_DATA_DIR}/env_reset
 export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL
-confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
+
+confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
 confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 
 
 set +a

apps/contract-migration/run_job.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 >&2 echo -e "\033[;96mRUNNING\033[;39m configurations"
-. ./config.sh
+./config.sh
 if [ $? -ne "0" ]; then
 	>&2 echo -e "\033[;31mFAILED\033[;39m configurations"
 	exit 1;

apps/contract-migration/seed_cic_eth.sh

@@ -78,6 +78,7 @@ export DEV_ETH_SARAFU_TOKEN_ADDRESS=$DEV_ETH_RESERVE_ADDRESS
 >&2 erc20-transfer -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER --fee-limit 100000 -e $reserve_address -w $debug -a $DEV_ETH_ACCOUNT_SARAFU_GIFTER ${DEV_TOKEN_AMOUNT:0:-1}
 
 # Remove the SEND (8), QUEUE (16) and INIT (2) locks (or'ed), set by default at migration
+echo "cic-eth-ctl -i $CHAIN_SPEC unlock INIT"
 cic-eth-ctl -i $CHAIN_SPEC unlock INIT
 cic-eth-ctl -i $CHAIN_SPEC unlock SEND
 cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE

apps/data-seeding/requirements.txt

@@ -1,10 +1,10 @@
 sarafu-faucet~=0.0.7a1
 cic-eth[tools]~=0.12.4a8
 cic-types~=0.1.0a14
-crypto-dev-signer>=0.4.15a1,<=0.4.15
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 faker==4.17.1
 chainsyncer~=0.0.6a3
-chainlib-eth~=0.0.9a7
+chainlib-eth~=0.0.9a13
 eth-address-index~=0.2.3a4
 eth-contract-registry~=0.6.3a3
 eth-accounts-index~=0.1.2a3

docker-compose.yml

@@ -73,7 +73,7 @@ services:
     # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest
     environment:
       RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
-      RPC_HTTP_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
+      ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
       DEV_USE_DOCKER_WAIT_SCRIPT: 1
       CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
       CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
@@ -262,8 +262,9 @@ services:
       CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis}
       CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis}
       CELERY_DEBUG: ${CELERY_DEBUG:-1}
-      SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
-      SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
+      #SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
+      SIGNER_PROVIDER: ${SIGNER_PROVIDER:-http://cic-eth-signer:8000}
+      SIGNER_PROVIDER: http://cic-eth-signer:8000
       SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
       ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
       TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}