Add long timeout to first account create in contract migration part 2

Bumps cic-eth and cic-base versions.

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

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

@@ -21,7 +21,7 @@ from chainqueue.db.enum import (
     StatusBits,
     )
 from chainqueue.error import NotLocalTxError
-from chainqueue.state import set_reserved
+from chainqueue.sql.state import set_reserved
 
 # local imports
 import cic_eth

apps/cic-eth/cic_eth/version.py

@@ -10,7 +10,7 @@ version = (
         0,
         11,
         0,
-        'beta.15',
+        'beta.16',
         )
 
 version_object = semver.VersionInfo(

apps/cic-eth/requirements.txt

@@ -1,4 +1,4 @@
-cic-base~=0.1.2b14
+cic-base~=0.1.2b15
 celery==4.4.7
 crypto-dev-signer~=0.4.14b3
 confini~=0.3.6rc3

apps/cic-ussd/requirements.txt

@@ -1,4 +1,4 @@
-cic_base[full_graph]~=0.1.2b14
-cic-eth~=0.11.0b15
+cic_base[full_graph]~=0.1.2b15
+cic-eth~=0.11.0b16
 cic-notify~=0.4.0a5
 cic-types~=0.1.0a10

apps/contract-migration/docker/Dockerfile

@@ -51,19 +51,13 @@ ENV PATH      $NVM_DIR/versions/node//v$NODE_VERSION/bin:$PATH
 # WORKDIR /home/grassroots
 # USER grassroots
 
+COPY contract-migration/requirements.txt . 
+
 ARG pip_extra_args=""
 ARG pip_index_url=https://pypi.org/simple
 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
-ARG cic_base_version=0.1.2b11
-ARG cic_eth_version=0.11.0b14
-ARG sarafu_token_version=0.0.1a8
-ARG sarafu_faucet_version=0.0.3a3
-RUN pip install --index-url https://pypi.org/simple --extra-index-url $pip_extra_index_url \
-	cic-base[full_graph]==$cic_base_version \
-	cic-eth==$cic_eth_version \
-	sarafu-faucet==$sarafu_faucet_version \
-	sarafu-token==$sarafu_token_version \
-	cic-eth==$cic_eth_version 
+RUN pip install --index-url https://pypi.org/simple \
+    --extra-index-url $pip_extra_index_url -r requirements.txt
 
 # -------------- begin runtime container ---------------- 
 FROM python:3.8.6-slim-buster as runtime-image

apps/contract-migration/requirements.txt

@@ -0,0 +1,4 @@
+	cic-base[full_graph]==0.1.2b15
+	sarafu-faucet==0.0.3a3
+	sarafu-token==0.0.1a8
+	cic-eth==0.11.0b16 

apps/contract-migration/seed_cic_eth.sh

@@ -47,7 +47,7 @@ EOF
 
 >&2 echo "create account for gas gifter"
 old_gas_provider=$DEV_ETH_ACCOUNT_GAS_PROVIDER
-DEV_ETH_ACCOUNT_GAS_GIFTER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
+DEV_ETH_ACCOUNT_GAS_GIFTER=`cic-eth-create --timeout 120 $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_GAS_GIFTER=$DEV_ETH_ACCOUNT_GAS_GIFTER >> $env_out_file
 cic-eth-tag -i $CIC_CHAIN_SPEC GAS_GIFTER $DEV_ETH_ACCOUNT_GAS_GIFTER
 

apps/data-seeding/README.md

@@ -259,4 +259,6 @@ Should exit with code 0 if all input data is found in the respective services.
 
 - Running the balance script should be _optional_ in all cases, but is currently required in the case of `cic_ussd` because it is needed to generate the metadata. An improvement would be moving the task to `import_users.py`, for a different queue than the balance tx handler.
 
+- MacOS BigSur issue when installing psycopg2: ld: library not found for -lssl -> https://github.com/psycopg/psycopg2/issues/1115#issuecomment-831498953
+
 - `cic_ussd` imports is poorly implemented, and consumes a lot of resources. Therefore it takes a long time to complete. Reducing the amount of polls for the phone pointer would go a long way to improve it.

apps/data-seeding/requirements.txt

@@ -1,5 +1,5 @@
-cic-base[full_graph]==0.1.2b11
+cic-base[full_graph]==0.1.2b15
 sarafu-faucet==0.0.3a3
-cic-eth==0.11.0b15
+cic-eth==0.11.0b16
 cic-types==0.1.0a11
 crypto-dev-signer==0.4.14b3

docker-compose.yml

@@ -6,11 +6,7 @@ volumes:
   bee-data: {}
   signer-data: {}
   bloxberg-data: {}
-  contract-config: 
-    driver_opts:
-      type: local
-      o: bind
-      device: ./service-configs
+  contract-config: {} 
 
 networks:
   default: