Merge "origin/master" into "philip/bump-test-coverage"

- Added appropriate imports:
  - from okota.token_index.index import to_identifier
  - from cic_eth.error import SignerError
- cleaned up balance func.

README.md

@@ -15,5 +15,5 @@ To get started see [./apps/contract-migration/README.md](./apps/contract-migrati
 
 ## Documentation 
 
-[https://docs.grassecon.org/software/](https://docs.grassecon.org/software/)
+[https://docs.grassecon.org/cic_stack/](https://docs.grassecon.org/cic_stack/)
 

apps/cic-ussd/config/app.ini

@@ -13,4 +13,4 @@ port =
 ssl =
 
 [system]
-guardians_file = cic_ussd/data/sys/guardians.txt
+guardians_file = var/lib/sys/guardians.txt

apps/cic-ussd/config/test/app.ini

@@ -8,4 +8,4 @@ states=states/
 transitions=transitions/
 
 [system]
-guardians_file = cic_ussd/data/sys/guardians.txt
+guardians_file = var/lib/sys/guardians.txt

apps/cic-ussd/config/test/translations.ini

@@ -1,10 +1,10 @@
 [locale]
 fallback=sw
-path=cic_ussd/data/locale/
+path=
-file_builders=cic_ussd/data/sys/
+file_builders=var/lib/sys/
 
 [schema]
 file_path = data/schema
 
 [languages]
-file = cic_ussd/data/sys/languages.json
+file = var/lib/sys/languages.json

apps/cic-ussd/config/test/ussd.ini

@@ -1,5 +1,5 @@
 [ussd]
-menu_file=cic_ussd/data/sys/ussd_menu.json
+menu_file=cic_ussd/db/ussd_menu.json
 service_code=*483*46#,*483*061#,*384*96#
 user =
 pass =

apps/cic-ussd/config/translations.ini

@@ -1,10 +1,10 @@
 [locale]
 fallback=sw
-path=cic_ussd/data/locale/
+path=var/lib/locale/
-file_builders=cic_ussd/data/sys/
+file_builders=var/lib/sys/
 
 [schema]
 file_path = /usr/local/lib/python3.8/site-packages/cic_translations/data/schema
 
 [languages]
-file = cic_ussd/data/sys/languages.json
+file = var/lib/sys/languages.json

apps/cic-ussd/config/ussd.ini

@@ -1,5 +1,5 @@
 [ussd]
-menu_file=cic_ussd/data/sys/ussd_menu.json
+menu_file=data/ussd_menu.json
 service_code=*483*46#,*483*061#,*384*96#
 user =
 pass =

apps/cic-ussd/docker/Dockerfile

@@ -3,10 +3,12 @@ ARG DOCKER_REGISTRY="registry.gitlab.com/grassrootseconomics"
 FROM $DOCKER_REGISTRY/cic-base-images:python-3.8.6-dev-e8eb2ee2
 
 RUN apt-get install -y redis-server
-
 # create secrets directory
 RUN mkdir -vp pgp/keys
 
+# create application directory
+RUN mkdir -vp cic-ussd
+RUN mkdir -vp data
 
 ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net
 ARG EXTRA_PIP_ARGS=""
@@ -23,8 +25,7 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
 COPY . .
 RUN python setup.py install
 
-# create local files directory
+COPY cic_ussd/db/ussd_menu.json data/
-RUN mkdir -vp cic_ussd/data/locale
 
 COPY docker/*.sh ./
 RUN chmod +x /root/*.sh

apps/cic-ussd/var/lib/sys/ussd.csv

@@ -796,18 +796,18 @@ invalid_service_code,Please dial %{valid_service_code} to access Sarafu Network,
 help,"CON For assistance call %{support_phone}
 00. Back
 99. Exit","CON Kwa usaidizi piga simu %{support_phone}
-00. Rudi
+0. Rudi
-99. Ondoka","CON Kwa utethyo kuna simu %{support_phone}
+9. Ondoka","CON Kwa utethyo kuna simu %{support_phone}
-00. Itina
+0. Itina
-99. Ondoka","CON Kwa uteithio hora thimu %{support_phone}
+9. Ondoka","CON Kwa uteithio hora thimu %{support_phone}
-00. Coka
+0. Coka
-99. Uma","CON Kwa Kuavizwa piga simu  %{support_phone}
+9. Uma","CON Kwa Kuavizwa piga simu  %{support_phone}
-00. Uya nyuma
+0. Uya nyuma
-99. Uka","CON Kuom kony go simu e %{support_phone}
+9. Uka","CON Kuom kony go simu e %{support_phone}
-00. Dog chien
+0. Dog chien
-99. Wuogi","CON Qarqars simu dai%{support_phone}
+9. Wuogi","CON Qarqars simu dai%{support_phone}
-00. Dheebi
+0. Dheebi
-99. Bai"
+9. Bai"
 complete,"CON Your request has been sent. You will receive an SMS shortly.
 00. Back
 99. Exit","CON Ombi lako limetumwa. Utapokea uthibitishaji wa SMS kwa muda mfupi.

docker-compose.build.yml

@@ -1,52 +0,0 @@
-version: '3.2'
-
-services:
-  cic-cache:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-cache:${TAG:-latest}
-    build:
-      context: apps/cic-cache
-      dockerfile: docker/Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-cache:latest
-  cic-eth:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-eth:${TAG:-latest}
-    build:
-      context: apps/cic-eth
-      dockerfile: docker/Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-eth:latest
-  cic-meta:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-meta:${TAG:-latest}
-    build:
-      context: apps/cic-meta
-      dockerfile: docker/Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-meta:latest
-  cic-notify:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-notify:${TAG:-latest}
-    build:
-      context: apps/cic-notify
-      dockerfile: docker/Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-notify:latest
-  funga-eth:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/funga-eth:${TAG:-latest}
-    build:
-      context: apps/cic-signer
-      dockerfile: Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/funga-eth:latest
-  cic-ussd:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-ussd:${TAG:-latest}
-    build:
-      context: apps/cic-ussd
-      dockerfile: docker/Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-ussd:latest
-  cic-contract-bootstrap:
-    image: ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-contract-bootstrap:${TAG:-latest}
-    build:
-      context: apps/contract-migration
-      dockerfile: docker/Dockerfile
-      cache_from:
-        - ${IMAGE_BASE_URL:-registry.gitlab.com/grassrootseconomics/cic-internal-integration}/cic-ussd:latest

scripts/local-build-push.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env sh
-
-# dependencies:
-#   - docker-compose >= v1.25.0
-#   - sbot >= v1.0.0.
-
-set -e
-
-export DOCKER_BUILDKIT=1
-export COMPOSE_DOCKER_CLI_BUILD=1
-
-PREDICTED_TAG=$(sbot predict version -m auto)
-
-docker-compose -f docker-compose.build.yml build --progress plain
-
-export TAG=v$PREDICTED_TAG
-
-docker-compose -f docker-compose.build.yml build --progress plain
-docker-compose -f docker-compose.build.yml push
-
-export TAG=latest
-
-docker-compose -f docker-compose.build.yml push