From 471243488e98dd43385fb785e145f6d9d176fe6e Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Thu, 9 Sep 2021 14:27:47 +0200
Subject: [PATCH] Add latest crypto-dev-signer install explicitly in dockerfile
 for cic-eth

---
 apps/cic-eth/docker/Dockerfile           | 12 ++++++++++--
 apps/cic-eth/requirements.txt            |  2 +-
 apps/cic-eth/tools_requirements.txt      |  2 +-
 apps/contract-migration/requirements.txt |  1 +
 apps/contract-migration/reset.sh         |  1 +
 apps/contract-migration/seed_cic_eth.sh  |  2 ++
 docker-compose.yml                       |  1 +
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile
index 5e798d72..3331458a 100644
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -31,8 +31,16 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
     $EXTRA_PIP_ARGS \
     -r requirements.txt \
     -r services_requirements.txt \
-    -r admin_requirements.txt
-    
+    -r admin_requirements.txt 
+   
+# always install the latest signer 
+RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
+    pip install --index-url https://pypi.org/simple  \
+	  --extra-index-url $GITLAB_PYTHON_REGISTRY \
+    --extra-index-url $EXTRA_INDEX_URL \
+    $EXTRA_PIP_ARGS \
+    crypto-dev-signer
+
 COPY . .
 RUN python setup.py install
 
diff --git a/apps/cic-eth/requirements.txt b/apps/cic-eth/requirements.txt
index 037ca9a6..46482052 100644
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,3 +1,3 @@
 celery==4.4.7
-chainlib-eth>=0.0.9a7,<0.1.0
+chainlib-eth>=0.0.9a11,<0.1.0
 semver==2.13.0
diff --git a/apps/cic-eth/tools_requirements.txt b/apps/cic-eth/tools_requirements.txt
index 54200ef7..4a6a7fee 100644
--- a/apps/cic-eth/tools_requirements.txt
+++ b/apps/cic-eth/tools_requirements.txt
@@ -1,4 +1,4 @@
-crypto-dev-signer>=0.4.15a2,<=0.4.15
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 chainqueue>=0.0.5a1,<0.1.0
 cic-eth-registry>=0.6.1a2,<0.7.0
 redis==3.5.3
diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt
index 37bd17c6..b04c6d90 100644
--- a/apps/contract-migration/requirements.txt
+++ b/apps/contract-migration/requirements.txt
@@ -9,3 +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
diff --git a/apps/contract-migration/reset.sh b/apps/contract-migration/reset.sh
index 1c221021..5a1dc532 100755
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@@ -106,6 +106,7 @@ giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $DEV_RESERV
 
 
 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 --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 
 
 set +a
 set +e
diff --git a/apps/contract-migration/seed_cic_eth.sh b/apps/contract-migration/seed_cic_eth.sh
index 36731720..eb1bfd59 100755
--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@@ -82,5 +82,7 @@ cic-eth-ctl -i $CHAIN_SPEC unlock INIT
 cic-eth-ctl -i $CHAIN_SPEC unlock SEND
 cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE
 
+confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 
+
 set +a
 set +e
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a21962e..960bb9b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -270,6 +270,7 @@ services:
       - eth
       - postgres
       - redis
+      - cic-eth-signer
     deploy:
       restart_policy:
         condition: on-failure