Prune more docker compose vars

Add demurrage token configuration support to new contract migration config setup
Remove commented code
2021-09-03 09:22:52 +02:00 · 2021-09-03 09:16:08 +02:00 · 2021-09-03 00:12:45 +02:00 · 2021-09-03 00:08:22 +02:00 · 2021-09-03 00:05:43 +02:00 · 2021-09-02 23:56:31 +02:00
13 changed files with 51 additions and 137 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,15 +29,8 @@ build-push:
  stage: build
  tags:
    - integration
-  #script:
-  #  - TAG=$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA sh ./scripts/build-push.sh
  script:
-    - TAG=latest sh ./scripts/build-push.sh
+    - TAG=$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA sh ./scripts/build-push.sh
  rules:
  - if: $CI_COMMIT_REF_PROTECTED == "true"
    when: always
-
-deploy-dev:
-  stage: deploy
-  trigger: grassrootseconomics/devops
-  when: manual
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -9,8 +9,8 @@ build-test-cic-eth:
    - cd apps/cic-eth
    - docker build -t $MR_IMAGE_TAG -f docker/Dockerfile . 
    - docker run $MR_IMAGE_TAG sh docker/run_tests.sh
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/$APP_NAME/**/*
-      when: always
+      #rules:
+      #- if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      #  changes:
+      #      - apps/$APP_NAME/**/*
+      #  when: always
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -13,16 +13,7 @@ ARG EXTRA_PIP_ARGS=""
 #    pip install --index-url https://pypi.org/simple \
 #    --force-reinstall \
 #	--extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-#    -r requirements.txt
-
-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 \
-    cic-eth-aux-erc20-demurrage-token~=0.0.2a6
-
-
+#    -r requirements.txt 
 COPY *requirements.txt ./
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
    pip install --index-url https://pypi.org/simple  \
@@ -31,21 +22,19 @@ 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

 ENV PYTHONPATH .

+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 \
+    cic-eth-aux-erc20-demurrage-token~=0.0.2a6

 COPY docker/entrypoints/* ./ 
 RUN chmod 755 *.sh
--- a/apps/cic-eth/docker/entrypoints/start_tasker.sh
+++ b/apps/cic-eth/docker/entrypoints/start_tasker.sh
@@ -5,27 +5,27 @@ set -e

 # set CONFINI_ENV_PREFIX to override the env prefix to override env vars

-#echo "!!! starting signer"
-#python /usr/local/bin/crypto-dev-daemon -c /usr/local/etc/crypto-dev-signer -vv 2> /tmp/signer.log &
+echo "!!! starting signer"
+python /usr/local/bin/crypto-dev-daemon -c /usr/local/etc/crypto-dev-signer -vv 2> /tmp/signer.log &

 echo "!!! starting taskerd"
 /usr/local/bin/cic-eth-taskerd $@

 # thanks! https://docs.docker.com/config/containers/multi-service_container/
-#sleep 1;
-#echo "!!! entering monitor loop"
-#while true; do
-#  ps aux | grep crypto-dev-daemon | grep -q -v grep
-#  PROCESS_1_STATUS=$?
-#  ps aux | grep cic-eth-tasker |grep -q -v grep
-#  PROCESS_2_STATUS=$?
-#  # If the greps above find anything, they exit with 0 status
-#  # If they are not both 0, then something is wrong
-#  if [ $PROCESS_1_STATUS -ne 0 -o $PROCESS_2_STATUS -ne 0 ]; then
-#    echo "One of the processes has already exited."
-#    exit 1
-#  fi
-#  sleep 15;
-#done
-#
+sleep 1;
+echo "!!! entering monitor loop"
+while true; do
+  ps aux | grep crypto-dev-daemon | grep -q -v grep
+  PROCESS_1_STATUS=$?
+  ps aux | grep cic-eth-tasker |grep -q -v grep
+  PROCESS_2_STATUS=$?
+  # If the greps above find anything, they exit with 0 status
+  # If they are not both 0, then something is wrong
+  if [ $PROCESS_1_STATUS -ne 0 -o $PROCESS_2_STATUS -ne 0 ]; then
+    echo "One of the processes has already exited."
+    exit 1
+  fi
+  sleep 15;
+done
+
 set +e
--- 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.15a1,<=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/cic-meta/.gitlab-ci.yml
+++ b/apps/cic-meta/.gitlab-ci.yml
@@ -9,8 +9,8 @@ build-test-cic-meta:
    - cd apps/cic-meta
    - docker build -t $MR_IMAGE_TAG -f docker/Dockerfile . 
    - docker run --entrypoint=sh $MR_IMAGE_TAG docker/run_tests.sh
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/$APP_NAME/**/*
-      when: always
+     #rules:
+     #- if: $CI_PIPELINE_SOURCE == "merge_request_event"
+     #  changes:
+     #      - apps/$APP_NAME/**/*
+     #  when: always
--- a/apps/cic-meta/README.md
+++ b/apps/cic-meta/README.md
@@ -1 +0,0 @@
-# CIC-Meta
--- 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/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 \
@@ -262,8 +260,8 @@ 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:-ipc:///run/crypto-dev-signer/jsonrpc.ipc}
+      SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-ipc:///run/crypto-dev-signer/jsonrpc.ipc}
      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}
@@ -272,75 +270,18 @@ services:
      - eth
      - postgres
      - redis
-      - cic-eth-signer
    deploy:
      restart_policy:
        condition: on-failure
    volumes:
-      - signer-data:/run/crypto-dev-signer
+      - signer-data:/tmp/cic/signer
      - contract-config:/tmp/cic/config/:ro
-        #command: ["/usr/local/bin/cic-eth-taskerd"]
-        #command: ["sleep", "3600"]
    command:
      - /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:
-    image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-eth:${TAG:-latest}
-    build: 
-        context: apps/cic-eth
-        dockerfile: docker/Dockerfile
-        target: dev
-        args:
-          EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
-    environment:
-      CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
-      ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER
-      ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
-      RPC_HTTP_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
-      DATABASE_USER: ${DATABASE_USER:-grassroots}
-      DATABASE_HOST: ${DATABASE_HOST:-postgres}
-      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
-      DATABASE_NAME: ${DATABASE_NAME_CIC_ETH:-cic_eth}
-      DATABASE_PORT: ${DATABASE_PORT:-5432}
-      DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}
-      DATABASE_DRIVER: ${DATABASE_DRIVER:-psycopg2}
-      DATABASE_DEBUG: ${DATABASE_DEBUG:-0}
-      DATABASE_POOL_SIZE: 0
-      REDIS_PORT: 6379
-      REDIS_HOST: redis
-      PGPASSWORD: ${DATABASE_PASSWORD:-tralala}
-      CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-evm:bloxberg:8996}
-      CHAIN_SPEC: ${CIC_CHAIN_SPEC:-evm:bloxberg:8996}
-      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://0.0.0.0:8000}
-      SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://0.0.0.0: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}
-      CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
-    depends_on:
-      - eth
-      - postgres
-      - redis
-    deploy:
-      restart_policy:
-        condition: on-failure
-    volumes:
-      - signer-data:/run/crypto-dev-signer
-      - contract-config:/tmp/cic/config/:ro
-    command: ["python", "/usr/local/bin/crypto-dev-daemon", "-c", "/usr/local/etc/crypto-dev-signer", "-vv"]
-        #command:
-        #  - /bin/bash
-        #  - -c
-        #  - |
-        #    if [[ -f /tmp/cic/config/env_reset ]]; then source /tmp/cic/config/env_reset; fi 
-        #    ./start_tasker.sh --aux-all -q cic-eth  -vv
    # command: [/bin/sh, "./start_tasker.sh", -q, cic-eth, -vv ]

  cic-eth-tracker:
@@ -382,7 +323,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,10 +369,9 @@ 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"
-    


  cic-eth-retrier:
@@ -476,7 +416,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
Author	SHA1	Message	Date
nolash	46c39ad286	Prune more docker compose vars	2021-09-03 09:22:52 +02:00
nolash	cf7481ef66	Add demurrage token configuration support to new contract migration config setup	2021-09-03 09:16:08 +02:00
nolash	1107889077	Remove commented code	2021-09-03 00:12:45 +02:00
nolash	3504ae60e3	Add contract migrations dev ini	2021-09-03 00:08:22 +02:00
nolash	8e90fac7a0	Preserve configs between migration run phases	2021-09-03 00:05:43 +02:00
nolash	5f6c63e207	Use confini-dump for contract-migration configs and envs	2021-09-02 23:56:31 +02:00
				`@@ -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`