Allow existing symlinks

2021-09-09 09:32:25 +02:00
10 changed files with 21 additions and 39 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,3 @@ build-push:
  rules:
  - if: $CI_COMMIT_REF_PROTECTED == "true"
    when: always
-
-deploy-dev:
-  stage: deploy
-  trigger: grassrootseconomics/devops
-  when: manual
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -31,16 +31,8 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
    $EXTRA_PIP_ARGS \
    -r requirements.txt \
    -r services_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
-
+    -r admin_requirements.txt
+    
 COPY . .
 RUN python setup.py install

--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,3 +1,3 @@
 celery==4.4.7
-chainlib-eth>=0.0.9a11,<0.1.0
+chainlib-eth>=0.0.9a7,<0.1.0
 semver==2.13.0
--- a/apps/cic-eth/tools_requirements.txt
+++ b/apps/cic-eth/tools_requirements.txt
@@ -1,4 +1,4 @@
-crypto-dev-signer>=0.4.15a4,<=0.4.15
+crypto-dev-signer>=0.4.15a2,<=0.4.15
 chainqueue>=0.0.5a1,<0.1.0
 cic-eth-registry>=0.6.1a2,<0.7.0
 redis==3.5.3
--- a/apps/contract-migration/requirements.txt
+++ b/apps/contract-migration/requirements.txt
@@ -9,4 +9,3 @@ 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
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@@ -96,7 +96,7 @@ eth-token-index-add $fee_price_arg -s -u -w -y $WALLET_KEY_FILE  -i $CIC_CHAIN_S
 DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS -s`

 >&2 echo "set token faucet amount"
-sarafu-faucet-set $fee_price_arg -w -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_FAUCET_ADDRESS -vv -s --fee-limit 100000 $DEV_FAUCET_AMOUNT
+sarafu-faucet-set $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_FAUCET_ADDRESS -vv -s --fee-limit 100000 $DEV_FAUCET_AMOUNT

 >&2 echo "register faucet in registry"
 eth-contract-registry-set -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier Faucet $DEV_FAUCET_ADDRESS
@@ -105,10 +105,7 @@ eth-contract-registry-set -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $CIC_RE
 giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv $DEV_FAUCET_ADDRESS


-#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 --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 

 set +a
 set +e
--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@@ -82,7 +82,5 @@ 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
--- a/apps/data-seeding/cic_eth/import_users.py
+++ b/apps/data-seeding/cic_eth/import_users.py
@@ -216,7 +216,10 @@ if __name__ == '__main__':
            f.write(to_checksum_address(new_address_clean))
            f.close()

-            os.symlink(os.path.realpath(filepath), meta_phone_filepath)
+            try:
+                os.symlink(os.path.realpath(filepath), meta_phone_filepath)
+            except FileExistsError as e:
+                logg.warning('phone pointer for {} already exists: {}'.format(new_address_clean, e))


            # custom data
@@ -239,8 +242,10 @@ if __name__ == '__main__':
            f.write(json.dumps(tag_data))
            f.close()

-            os.symlink(os.path.realpath(filepath), custom_filepath)
-
+            try:
+                os.symlink(os.path.realpath(filepath), custom_filepath)
+            except FileExistsError as e:
+                logg.warning('custom data pointer for {} already exists: {}'.format(new_address_clean, e))

            i += 1
            sys.stdout.write('imported {} {}'.format(i, u).ljust(200) + "\r")
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -73,7 +73,6 @@ 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}
      DEV_USE_DOCKER_WAIT_SCRIPT: 1
      CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
      CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
@@ -102,7 +101,6 @@ services:
      TOKEN_DEMURRAGE_LEVEL: $TOKEN_DEMURRAGE_LEVEL
      TOKEN_SINK_ADDRESS: $TOKEN_SINK_ADDRESS
      TOKEN_TYPE: $TOKEN_TYPE
-      SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
    command: ["./run_job.sh"]
        #command: ["./reset.sh"]
    depends_on:
@@ -150,7 +148,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        ./start_tracker.sh -c /usr/local/etc/cic-cache -vv
    volumes:
      - contract-config:/tmp/cic/config/:ro
@@ -191,7 +189,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        /usr/local/bin/cic-cache-taskerd -vv
    volumes:
      - contract-config:/tmp/cic/config/:ro
@@ -225,7 +223,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        "/usr/local/bin/uwsgi" \
        --wsgi-file /root/cic_cache/runnable/daemons/server.py \
        --http :8000 \
@@ -272,7 +270,6 @@ services:
      - eth
      - postgres
      - redis
-      - cic-eth-signer
    deploy:
      restart_policy:
        condition: on-failure
@@ -285,7 +282,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        ./start_tasker.sh --aux-all -q cic-eth  -vv
    
  cic-eth-signer:
@@ -339,7 +336,7 @@ services:
        #  - /bin/bash
        #  - -c
        #  - |
-        #    if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        #    if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        #    ./start_tasker.sh --aux-all -q cic-eth  -vv
    # command: [/bin/sh, "./start_tasker.sh", -q, cic-eth, -vv ]

@@ -382,7 +379,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        #./start_tracker.sh -vv -c /usr/local/etc/cic-eth
        ./start_tracker.sh -vv
    # command: "/root/start_manager.sh head -vv"
@@ -428,7 +425,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        ./start_dispatcher.sh -q cic-eth -vv
    # command: "/root/start_dispatcher.sh -q cic-eth -vv"
    
@@ -476,7 +473,7 @@ services:
      - /bin/bash
      - -c
      - |
-        if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
+        if [[ -f /tmp/cic/config/.env ]]; then source /tmp/cic/config/.env; fi 
        ./start_retry.sh -vv 
    # command: "/root/start_retry.sh -q cic-eth -vv"

--- a/dump.sh
+++ b/dump.sh
@@ -1 +0,0 @@
-docker run -t -v cic-internal-integration_contract-config:/tmp/cic/config cic-internal-integration_contract-migration cat /tmp/cic/config/env_reset
				`@@ -1 +0,0 @@`
				`docker run -t -v cic-internal-integration_contract-config:/tmp/cic/config cic-internal-integration_contract-migration cat /tmp/cic/config/env_reset`