adds an id to the cache mount

fix issues with build cicada, now it should do auto reload
2021-08-19 16:09:40 -04:00 · 2021-08-19 16:08:56 -04:00
894 changed files with 238303 additions and 4887 deletions
--- a/.env
+++ b/.env
@@ -0,0 +1,39 @@
+DOMAIN=localhost
+
+STACK_NAME=cic-net
+
+TRAEFIK_PUBLIC_NETWORK=traefik-public
+TRAEFIK_TAG=cic.net
+TRAEFIK_PUBLIC_TAG=traefik-public
+
+FRONTEND_ENV=dev
+
+# Flower
+FLOWER_BASIC_AUTH=admin:changethis
+
+# Postgres
+DATABASE_HOST=postgres
+DATABASE_PORT=5432
+DATABASE_ENGINE=postgresql
+DATABASE_DRIVER=psycopg2
+
+DATABASE_USER=postgres
+DATABASE_NAME=cic_eth
+
+# Redis
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_DB=0
+
+# Celery Broker
+CELERY_BROKER_URL=redis://redis:6379
+CELERY_RESULT_URL=redis://redis:6379
+
+# Blockchain node
+ETH_PROVIDER=http://eth:8545
+CIC_CHAIN_SPEC=evm:bloxberg:8996
+
+# PgAdmin
+PGADMIN_LISTEN_PORT=5050
+PGADMIN_DEFAULT_EMAIL=admin@cic.net
+PGADMIN_DEFAULT_PASSWORD=changethis
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ build/
 **/.venv
 .idea
 **/.vim
-**/*secret.yaml
+docker-stack.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,43 +1,99 @@
 include:
-  #- local: 'ci_templates/.cic-template.yml' #kaniko build templates
-  # these includes are app specific unit tests
+#  - local: 'ci_templates/.cic-template.yml'
+#  - local: 'apps/contract-migration/.gitlab-ci.yml'
  - local: 'apps/cic-eth/.gitlab-ci.yml'
  - local: 'apps/cic-ussd/.gitlab-ci.yml'
  - local: 'apps/cic-notify/.gitlab-ci.yml'
  - local: 'apps/cic-meta/.gitlab-ci.yml'
  - local: 'apps/cic-cache/.gitlab-ci.yml'
-    #- local: 'apps/contract-migration/.gitlab-ci.yml'
-    #- local: 'apps/data-seeding/.gitlab-ci.yml'
+#  - local: 'apps/data-seeding/.gitlab-ci.yml'
+
+image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest  
+

 stages:
  - build
  - test
  - deploy

-image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest
-
 variables:
  DOCKER_BUILDKIT: "1"
-  COMPOSE_DOCKER_CLI_BUILD: "1"
-  CI_DEBUG_TRACE: "true"
+  COMPOSE_DOCKER_CLI_BUILD: "1" 
+  MR_IMAGE_TAG: mr-$CI_COMMIT_SHORT_SHA

-before_script:
+# todo you can probably just build the single image w/o docker-compose
+build-merge-request:
+  before_script:
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-
-# runs on protected branches and pushes to repo
-build-push:
  stage: build
  tags:
    - integration
-  #script:
-  #  - TAG=$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA sh ./scripts/build-push.sh
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
-    - TAG=latest sh ./scripts/build-push.sh
+    - TAG=$MR_IMAGE_TAG FRONTEND_ENV=dev sh ./scripts/build-push.sh
  rules:
-  - if: $CI_COMMIT_REF_PROTECTED == "true"
+  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
    when: always

-deploy-dev:
+build-staging:
+  before_script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  tags:
+    - integration
+       #- blocal
+  variables: 
+    CI_DEBUG_TRACE: "true"
+  stage: build
+  script:
+    - TAG=stag FRONTEND_ENV=staging sh ./scripts/build-push.sh
+  only:
+    - staging 
+
+deploy-staging:
+  before_script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - pip install docker-auto-labels
+  tags:
+    - integration
  stage: deploy
-  trigger: grassrootseconomics/devops
-  when: manual
+  script: 
+        - >
+          DOMAIN=stag.grassrootseconomics.net
+          TRAEFIK_TAG=grassrootseconomics.net
+          STACK_NAME=stag-cic-net
+          TAG=stag
+          sh ./scripts/deploy.sh
+  environment:
+    name: staging
+    url: https://stag.grassrootseconomics.net
+  only:
+    - staging 
+
+      #build-prod:
+      #  stage: build
+      #  script:
+      #    - TAG=prod FRONTEND_ENV=production sh ./scripts/build-push.sh
+      #  only:
+      #    - production
+      #  tags:
+      #    - build
+      #    - test
+      #
+      #deploy-prod:
+      #  stage: deploy
+      #  script:
+      #    - >
+      #      DOMAIN=demo1.com
+      #      TRAEFIK_TAG=demo1.com
+      #      STACK_NAME=demo1-com
+      #      TAG=prod
+      #      sh ./scripts/deploy.sh
+      #  environment:
+      #    name: production
+      #    url: https://demo1.com
+      #  only:
+      #    - production
+      #  tags:
+      #    - swarm
+      #    - prod
--- a/README.md
+++ b/README.md
@@ -1,40 +1,104 @@
 # cic-internal-integration

-## Getting started 
+## Backend Requirements

-This repo uses docker-compose and docker buildkit. Set the following environment variables to get started:
+* [Docker](https://www.docker.com/).
+* [Docker Compose](https://docs.docker.com/compose/install/).

-```
-export COMPOSE_DOCKER_CLI_BUILD=1
-export DOCKER_BUILDKIT=1
-```
+## Backend local development

-start services, database, redis and local ethereum node
-```
+* Start the stack with Docker Compose:
+
+```bash
 docker-compose up -d
 ```

-Run app/contract-migration to deploy contracts
-```
-RUN_MASK=3 docker-compose up contract-migration
+* Now you can open your browser and interact with these URLs:
+
+Frontend (CICADA), built with Docker, with routes handled based on the path: http://localhost
+
+PGAdmin, PostgreSQL web administration: http://localhost:5050
+
+Flower, administration of Celery tasks: http://localhost:5555
+
+Traefik UI, to see how the routes are being handled by the proxy: http://localhost:8090
+
+**Note**: The first time you start your stack, it might take a minute for it to be ready. While the backend waits for the database to be ready and configures everything. You can check the logs to monitor it.
+
+To check the logs, run:
+
+```bash
+docker-compose logs
 ```

-stop cluster
-```
-docker-compose down
+To check the logs of a specific service, add the name of the service, e.g.:
+
+```bash
+docker-compose logs backend
 ```

-stop cluster and delete data
+If your Docker is not running in `localhost` (the URLs above wouldn't work) check the sections below on **Development with Docker Toolbox** and **Development with a custom IP**.
+
+#### Deploy the stack locally
+
+If you want to run the docker stack locally on swarm 
+
 ```
-docker-compose down -v --remove-orphans
+ docker-compose -f docker-compose.yml -f docker-compose.override.yml  config > docker-stack.yml
 ```

-rebuild an images
 ```
-docker-compose up --build <service_name>
+docker node update z1ehkrw1mvqlxc2udwt4xpype --label-add cic-net.app-db-data=true
+ docker stack deploy -c docker-stack.yml  cic-net  
 ```

-to delete the buildkit cache
+
+## Backend local development, additional details
+
+**fill  me in**
+
+### Docker Compose Override
+
+During development, you can change Docker Compose settings that will only affect the local development environment, in the file `docker-compose.override.yml`.
+
+The changes to that file only affect the local development environment, not the production environment. So, you can add "temporary" changes that help the development workflow.
+
+For example, the directory with the backend code is mounted as a Docker "host volume", mapping the code you change live to the directory inside the container. That allows you to test your changes right away, without having to build the Docker image again. It should only be done during development, for production, you should build the Docker image with a recent version of the backend code. But during development, it allows you to iterate very fast.
+
+There is also a command override that runs `/start-reload.sh` (included in the base image) instead of the default `/start.sh` (also included in the base image). It starts a single server process (instead of multiple, as would be for production) and reloads the process whenever the code changes. Have in mind that if you have a syntax error and save the Python file, it will break and exit, and the container will stop. After that, you can restart the container by fixing the error and running again:
+
+```console
+$ docker-compose up -d
 ```
-docker builder prune --filter type=exec.cachemount
+
+There is also a commented out `command` override, you can uncomment it and comment the default one. It makes the backend container run a process that does "nothing", but keeps the container alive. That allows you to get inside your running container and execute commands inside, for example a Python interpreter to test installed dependencies, or start the development server that reloads when it detects changes, or start a Jupyter Notebook session.
+
+To get inside the container with a `bash` session you can start the stack with:
+
+```console
+$ docker-compose up -d
 ```
+
+and then `exec` inside the running container:
+
+```console
+$ docker-compose exec backend bash
+```
+
+You should see an output like:
+
+```console
+root@7f2607af31c3:/app#
+```
+
+
+
+#### Test running stack
+
+
+```bash
+docker-compose exec -T some-container bash /script/start-tests.sh
+```
+
+
+
--- a/apps/.dockerignore
+++ b/apps/.dockerignore
@@ -1,4 +1,5 @@
 .git
 .cache
 .dot
-**/doc
+**/doc
+**/node_modules/
--- a/apps/cic-cache/.gitlab-ci.yml
+++ b/apps/cic-cache/.gitlab-ci.yml
@@ -1,17 +1,41 @@
-build-test-cic-cache:
-  stage: test 
-  tags:
-    - integration
-  variables:
-    APP_NAME: cic-cache
-    MR_IMAGE_TAG: mr-$APP_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-  script:
-    - cd apps/cic-cache
-    - docker build -t $MR_IMAGE_TAG -f docker/Dockerfile . 
-    - docker run $MR_IMAGE_TAG sh docker/run_tests.sh
-  allow_failure: true
-  rules:
-  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    changes:
-        - apps/$APP_NAME/**/*
-    when: always
+.cic_cache_variables:
+    variables:
+        APP_NAME: cic-cache
+
+#build-mr-cic-cache:
+#    extends:
+#        - .py_build_merge_request
+#        - .cic_cache_variables
+#    rules:
+#    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+#      changes:
+#          - apps/cic-cache/**/*
+#      when: always
+
+test-mr-cic-cache:
+    stage: test
+    tags:
+      - integration
+    extends:
+    - .cic_cache_variables
+    cache:
+      key:
+        files:
+        - test_requirements.txt
+      paths:
+      - /root/.cache/pip
+    image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
+    script:
+      - cd apps/$APP_NAME/
+      - >
+        pip install --extra-index-url https://pip.grassrootseconomics.net:8433
+        --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
+        -r test_requirements.txt 
+      - export PYTHONPATH=. && pytest -x --cov=cic_cache --cov-fail-under=90 --cov-report term-missing tests
+    allow_failure: true
+    needs: ["build-merge-request"]
+    rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+          - apps/$APP_NAME/**/*
+      when: always
--- a/apps/cic-cache/README.md
+++ b/apps/cic-cache/README.md
@@ -1 +0,0 @@
-# CIC-CACHE
--- a/apps/cic-cache/cic_cache/cli/rpc.py
+++ b/apps/cic-cache/cic_cache/cli/rpc.py
@@ -27,11 +27,11 @@ class RPC:
    @staticmethod
    def from_config(config):
        chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-        RPCConnection.register_location(config.get('RPC_PROVIDER'), chain_spec, 'default')
+        RPCConnection.register_location(config.get('RPC_HTTP_PROVIDER'), chain_spec, 'default')
        if config.get('SIGNER_PROVIDER'):
            RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, tag='signer')
            RPCConnection.register_location(config.get('SIGNER_PROVIDER'), chain_spec, 'signer')
-        rpc = RPC(chain_spec, config.get('RPC_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
+        rpc = RPC(chain_spec, config.get('RPC_HTTP_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
        logg.info('set up rpc: {}'.format(rpc))
        return rpc

--- a/apps/cic-cache/cic_cache/version.py
+++ b/apps/cic-cache/cic_cache/version.py
@@ -5,7 +5,7 @@ version = (
        0,
        2,
        1,
-        'alpha.2',
+        'alpha.1',
        )

 version_object = semver.VersionInfo(
--- a/apps/cic-cache/docker/Dockerfile
+++ b/apps/cic-cache/docker/Dockerfile
@@ -10,10 +10,9 @@ COPY requirements.txt .

 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-ARG EXTRA_PIP_ARGS=""
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
+RUN --mount=type=cache, id=pip, 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 \
+	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
    -r requirements.txt

 COPY . . 
--- a/apps/cic-cache/docker/run_tests.sh
+++ b/apps/cic-cache/docker/run_tests.sh
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-set -e
-
-pip install --extra-index-url https://pip.grassrootseconomics.net:8433 \
--extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
-r test_requirements.txt 
-
-export PYTHONPATH=. && pytest -x --cov=cic_cache --cov-fail-under=90 --cov-report term-missing tests
-
--- a/apps/cic-cache/requirements.txt
+++ b/apps/cic-cache/requirements.txt
@@ -2,13 +2,16 @@ alembic==1.4.2
 confini>=0.3.6rc4,<0.5.0
 uwsgi==2.0.19.1
 moolb~=0.1.1b2
-cic-eth-registry~=0.6.1a1
+cic-eth-registry~=0.5.8a1
 SQLAlchemy==1.3.20
 semver==2.13.0
 psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
-chainsyncer[sql]>=0.0.6a3,<0.1.0
-erc20-faucet>=0.3.2a2, <0.4.0
-chainlib-eth>=0.0.9a14,<0.1.0
-eth-address-index>=0.2.3a4,<0.3.0
+chainsyncer[sql]>=0.0.6a1,<0.1.0
+erc20-faucet>=0.2.4a2, <0.3.0
+#chainlib-eth==0.0.7a5,<0.1.0
+chainlib-eth==0.0.7a5
+#chainlib==0.0.7a4,<0.1.0
+chainlib==0.0.7a4
+eth-address-index>=0.1.4a1,<0.2.0
--- a/apps/cic-cache/test_requirements.txt
+++ b/apps/cic-cache/test_requirements.txt
@@ -6,5 +6,5 @@ sqlparse==0.4.1
 pytest-celery==0.0.0a1
 eth_tester==0.5.0b3
 py-evm==0.3.0a20
-sarafu-faucet~=0.0.7a1
-erc20-transfer-authorization>=0.3.5a1,<0.4.0
+sarafu-faucet~=0.0.5a2
+erc20-transfer-authorization>=0.3.4a1,<0.4.0
--- a/apps/cic-eth-aux/erc20-demurrage-token/requirements.txt
+++ b/apps/cic-eth-aux/erc20-demurrage-token/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.7
-erc20-demurrage-token~=0.0.5a3
-cic-eth-registry~=0.6.1a5
-chainlib~=0.0.9rc3
-cic_eth~=0.12.4a9
+erc20-demurrage-token~=0.0.3a1
+cic-eth-registry~=0.5.8a1
+chainlib~=0.0.7a1
+cic_eth~=0.12.2a4
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -1,16 +1,53 @@
-build-test-cic-eth:
-  stage: test
-  tags:
-    - integration
-  variables:
-    APP_NAME: cic-eth
-    MR_IMAGE_TAG: mr-$APP_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-  script:
-    - cd apps/cic-eth
-    - docker build -t $MR_IMAGE_TAG -f docker/Dockerfile . 
-    - docker run $MR_IMAGE_TAG sh docker/run_tests.sh
-  rules:
+.cic_eth_variables:
+    variables:
+        APP_NAME: cic-eth
+
+        #build-mr-cic-eth:
+        #    extends:
+        #        - .cic_eth_variables
+        #        - .py_build_target_dev
+        #    rules:
+        #    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+        #      changes:
+        #          - apps/cic-eth/**/*
+        #      when: always
+
+test-mr-cic-eth:
+    stage: test
+    tags:
+      - integration
+    extends:
+        - .cic_eth_variables
+    cache:
+      key:
+        files:
+        - test_requirements.txt
+      paths:
+      - /root/.cache/pip
+    image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
+    script:
+        - cd apps/$APP_NAME/
+        - >
+          pip install --extra-index-url https://pip.grassrootseconomics.net:8433
+          --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
+          -r admin_requirements.txt
+          -r services_requirements.txt
+          -r test_requirements.txt 
+        - export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests
+    allow_failure: true
+    needs: ["build-merge-request"]
+    rules:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
      changes:
          - apps/$APP_NAME/**/*
      when: always
+
+      #build-push-cic-eth:
+      #    extends:
+      #        - .py_build_push
+      #        - .cic_eth_variables
+      #    rules:
+      #    - if:  $CI_COMMIT_BRANCH == "master"
+      #      changes:
+      #          - apps/cic-eth/**/*
+      #      when: always
--- a/apps/cic-eth/admin_requirements.txt
+++ b/apps/cic-eth/admin_requirements.txt
@@ -1,6 +1,5 @@
 SQLAlchemy==1.3.20
-cic-eth-registry>=0.6.1a5,<0.7.0
-hexathon~=0.0.1a8
-chainqueue>=0.0.4a6,<0.1.0
-eth-erc20>=0.1.2a2,<0.2.0
-chainlib-eth>=0.0.10a2,<0.1.0
+cic-eth-registry>=0.5.6a2,<0.6.0
+hexathon~=0.0.1a7
+chainqueue>=0.0.3a1,<0.1.0
+eth-erc20>=0.0.10a3,<0.1.0
--- a/apps/cic-eth/cic_eth/admin/ctrl.py
+++ b/apps/cic-eth/cic_eth/admin/ctrl.py
@@ -4,6 +4,7 @@ import logging

 # external imports
 import celery
+from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.chain import ChainSpec
 from hexathon import (
        add_0x,
@@ -19,17 +20,18 @@ from cic_eth.task import (
        CriticalSQLAlchemyTask,
        )
 from cic_eth.error import LockedError
-from cic_eth.encode import (
-        tx_normalize,
-        ZERO_ADDRESS_NORMAL,
-        )

 celery_app = celery.current_app
 logg = logging.getLogger()


+def normalize_address(a):
+    if a == None:
+        return None
+    return add_0x(hex_uniform(strip_0x(a)))
+
@celery_app.task(base=CriticalSQLAlchemyTask)
-def lock(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, flags=LockEnum.ALL, tx_hash=None):
+def lock(chained_input, chain_spec_dict, address=ZERO_ADDRESS, flags=LockEnum.ALL, tx_hash=None):
    """Task wrapper to set arbitrary locks

    :param chain_str: Chain spec string representation
@@ -41,7 +43,7 @@ def lock(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, flags=Lock
    :returns: New lock state for address
    :rtype: number
    """
-    address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = '::'
    if chain_spec_dict != None:
        chain_str = str(ChainSpec.from_dict(chain_spec_dict))
@@ -51,7 +53,7 @@ def lock(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, flags=Lock


@celery_app.task(base=CriticalSQLAlchemyTask)
-def unlock(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, flags=LockEnum.ALL):
+def unlock(chained_input, chain_spec_dict, address=ZERO_ADDRESS, flags=LockEnum.ALL):
    """Task wrapper to reset arbitrary locks

    :param chain_str: Chain spec string representation
@@ -63,7 +65,7 @@ def unlock(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, flags=Lo
    :returns: New lock state for address
    :rtype: number
    """
-    address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = '::'
    if chain_spec_dict != None:
        chain_str = str(ChainSpec.from_dict(chain_spec_dict))
@@ -73,7 +75,7 @@ def unlock(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, flags=Lo


@celery_app.task(base=CriticalSQLAlchemyTask)
-def lock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, tx_hash=None):
+def lock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS, tx_hash=None):
    """Task wrapper to set send lock

    :param chain_str: Chain spec string representation
@@ -83,7 +85,7 @@ def lock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, tx_ha
    :returns: New lock state for address
    :rtype: number
    """
-    address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = str(ChainSpec.from_dict(chain_spec_dict))
    r = Lock.set(chain_str, LockEnum.SEND, address=address, tx_hash=tx_hash)
    logg.debug('Send locked for {}, flag now {}'.format(address, r))
@@ -91,7 +93,7 @@ def lock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, tx_ha


@celery_app.task(base=CriticalSQLAlchemyTask)
-def unlock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL):
+def unlock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS):
    """Task wrapper to reset send lock

    :param chain_str: Chain spec string representation
@@ -101,7 +103,7 @@ def unlock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL):
    :returns: New lock state for address
    :rtype: number
    """
-    address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = str(ChainSpec.from_dict(chain_spec_dict))
    r = Lock.reset(chain_str, LockEnum.SEND, address=address)
    logg.debug('Send unlocked for {}, flag now {}'.format(address, r))
@@ -109,7 +111,7 @@ def unlock_send(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL):


@celery_app.task(base=CriticalSQLAlchemyTask)
-def lock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, tx_hash=None):
+def lock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS, tx_hash=None):
    """Task wrapper to set queue direct lock

    :param chain_str: Chain spec string representation
@@ -119,7 +121,7 @@ def lock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, tx_h
    :returns: New lock state for address
    :rtype: number
    """
-    address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = str(ChainSpec.from_dict(chain_spec_dict))
    r = Lock.set(chain_str, LockEnum.QUEUE, address=address, tx_hash=tx_hash)
    logg.debug('Queue direct locked for {}, flag now {}'.format(address, r))
@@ -127,7 +129,7 @@ def lock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL, tx_h


@celery_app.task(base=CriticalSQLAlchemyTask)
-def unlock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL):
+def unlock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS):
    """Task wrapper to reset queue direct lock

    :param chain_str: Chain spec string representation
@@ -137,7 +139,7 @@ def unlock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL):
    :returns: New lock state for address
    :rtype: number
    """
-    address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = str(ChainSpec.from_dict(chain_spec_dict))
    r = Lock.reset(chain_str, LockEnum.QUEUE, address=address)
    logg.debug('Queue direct unlocked for {}, flag now {}'.format(address, r))
@@ -146,13 +148,12 @@ def unlock_queue(chained_input, chain_spec_dict, address=ZERO_ADDRESS_NORMAL):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def check_lock(chained_input, chain_spec_dict, lock_flags, address=None):
-    if address != None:
-        address = tx_normalize.wallet_address(address)
+    address = normalize_address(address)
    chain_str = '::'
    if chain_spec_dict != None:
        chain_str = str(ChainSpec.from_dict(chain_spec_dict))
    session = SessionBase.create_session()
-    r = Lock.check(chain_str, lock_flags, address=ZERO_ADDRESS_NORMAL, session=session)
+    r = Lock.check(chain_str, lock_flags, address=ZERO_ADDRESS, session=session)
    if address != None:
        r |= Lock.check(chain_str, lock_flags, address=address, session=session)
    if r > 0:
--- a/apps/cic-eth/cic_eth/admin/nonce.py
+++ b/apps/cic-eth/cic_eth/admin/nonce.py
@@ -33,7 +33,6 @@ from cic_eth.admin.ctrl import (
 from cic_eth.queue.tx import queue_create
 from cic_eth.eth.gas import create_check_gas_task
 from cic_eth.task import BaseTask
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app
 logg = logging.getLogger()
@@ -74,7 +73,7 @@ def shift_nonce(self, chainspec_dict, tx_hash_orig_hex, delta=1):

    set_cancel(chain_spec, strip_0x(tx['hash']), manual=True, session=session)

-    query_address = tx_normalize.wallet_address(address)
+    query_address = add_0x(hex_uniform(strip_0x(address))) # aaaaargh
    q = session.query(Otx)
    q = q.join(TxCache)
    q = q.filter(TxCache.sender==query_address)
--- a/apps/cic-eth/cic_eth/admin/token.py
+++ b/apps/cic-eth/cic_eth/admin/token.py
@@ -1,2 +1,21 @@
+# standard imports
+import logging
+
+# external imports
+import celery
+
 # local imports
-from cic_eth.eth.erc20 import default_token
+from cic_eth.task import BaseTask
+
+celery_app = celery.current_app
+logg = logging.getLogger()
+
+
+@celery_app.task(bind=True, base=BaseTask)
+def default_token(self):
+    return {
+            'symbol': self.default_token_symbol,
+            'address': self.default_token_address,
+            'name': self.default_token_name,
+            'decimals': self.default_token_decimals,
+            }
--- a/apps/cic-eth/cic_eth/api/admin.py
+++ b/apps/cic-eth/cic_eth/api/admin.py
@@ -32,6 +32,7 @@ from chainqueue.db.enum import (
        status_str,
    )
 from chainqueue.error import TxStateChangeError
+from chainqueue.sql.query import get_tx
 from eth_erc20 import ERC20

 # local imports
@@ -39,7 +40,6 @@ from cic_eth.db.models.base import SessionBase
 from cic_eth.db.models.role import AccountRole
 from cic_eth.db.models.nonce import Nonce
 from cic_eth.error import InitializationError
-from cic_eth.queue.query import get_tx_local

 app = celery.current_app

@@ -284,7 +284,7 @@ class AdminApi:
        tx_hash_hex = None
        session = SessionBase.create_session()
        for k in txs.keys():
-            tx_dict = get_tx_local(chain_spec, k, session=session)
+            tx_dict = get_tx(chain_spec, k, session=session)
            if tx_dict['nonce'] == nonce:
                tx_hash_hex = k
        session.close()
--- a/apps/cic-eth/cic_eth/api/api_task.py
+++ b/apps/cic-eth/cic_eth/api/api_task.py
@@ -9,7 +9,6 @@ import logging
 # external imports 
 import celery
 from chainlib.chain import ChainSpec
-from hexathon import strip_0x

 # local imports
 from cic_eth.api.base import ApiBase
@@ -17,50 +16,15 @@ from cic_eth.enum import LockEnum

 app = celery.current_app

-#logg = logging.getLogger(__name__)
-logg = logging.getLogger()
+logg = logging.getLogger(__name__)


 class Api(ApiBase):
-
-    @staticmethod
-    def to_v_list(v, n):
-        """Translate an arbitrary number of string and/or list arguments to a list of list of string arguments
-
-        :param v: Arguments
-        :type v: str or list
-        :param n: Number of elements to generate arguments for
-        :type n: int
-        :rtype: list
-        :returns: list of assembled arguments
-        """
-        if isinstance(v, str):
-            vv = v
-            v = []
-            for i in range(n):
-                v.append([vv])
-        elif not isinstance(v, list):
-            raise ValueError('argument must be single string, or list or strings or lists')
-        else:
-            if len(v) != n:
-                raise ValueError('v argument count must match integer n')
-            for i in range(n):
-                if isinstance(v[i], str):
-                    v[i] = [v[i]]
-                elif not isinstance(v, list):
-                    raise ValueError('proof argument must be single string, or list or strings or lists')
-
-        return v
-   
+    

    def default_token(self):
-        """Retrieves the default fallback token of the custodial network.
-
-        :returns: uuid of root task
-        :rtype: celery.Task
-        """
        s_token = celery.signature(
-                'cic_eth.eth.erc20.default_token',
+                'cic_eth.admin.token.default_token',
                [],
                queue=self.queue,
                )
@@ -70,97 +34,6 @@ class Api(ApiBase):
        return s_token.apply_async()


-    def token(self, token_symbol, proof=None):
-        """Single-token alias for tokens method.
-
-        See tokens method for details.
-
-        :param token_symbol: Token symbol to look up
-        :type token_symbol: str
-        :param proof: Proofs to add to signature verification for the token
-        :type proof: str or list
-        :returns: uuid of root task
-        :rtype: celery.Task
-        """
-        if not isinstance(token_symbol, str):
-            raise ValueError('token symbol must be string')
-
-        return self.tokens([token_symbol], proof=proof)
-
-
-    def tokens(self, token_symbols, proof=None):
-        """Perform a token data lookup from the token index. The token index will enforce unique associations between token symbol and contract address.
-
-        Token symbols are always strings, and should be specified using uppercase letters.
-
-        If the proof argument is included, the network will be queried for trusted signatures on the given proof(s). There must exist at least one trusted signature for every given proof for every token. Trusted signatures for the custodial system are provided at service startup.
-
-        The proof argument may be specified in a number of ways:
-
-        - as None, in which case proof checks are skipped (although there may still be builtin proof checks being performed)
-        - as a single string, where the same proof is used for each token lookup
-        - as an array of strings, where the respective proof is used for the respective token. number of proofs must match the number of tokens.
-        - as an array of lists, where the respective proofs in each list is used for the respective token. number of lists of proofs must match the number of tokens.
-
-        The success callback provided at the Api object instantiation will receive individual calls for each token that passes the proof checks. Each token that does not pass is passed to the Api error callback.
-
-        This method is not intended to be used synchronously. Do so at your peril.
-
-        :param token_symbols: Token symbol strings to look up
-        :type token_symbol: list
-        :param proof: Proof(s) to verify tokens against
-        :type proof: None, str or list
-        :returns: uuid of root task
-        :rtype: celery.Task
-        """
-        if not isinstance(token_symbols, list):
-            raise ValueError('token symbols argument must be list')
-
-        if proof == None:
-            logg.debug('looking up tokens without external proof check: {}'.format(','.join(token_symbols)))
-            proof = ''
-
-        logg.debug('proof is {}'.format(proof))
-        l = len(token_symbols)
-        if len(proof) == 0:
-            l = 0 
-        proof = Api.to_v_list(proof, l)
-
-        chain_spec_dict = self.chain_spec.asdict()
-
-        s_token_resolve = celery.signature(
-                'cic_eth.eth.erc20.resolve_tokens_by_symbol',
-                [
-                    token_symbols,
-                    chain_spec_dict,
-                    ],
-                queue=self.queue,
-                )
-
-        s_token_info = celery.signature(
-                'cic_eth.eth.erc20.token_info',
-                [
-                    chain_spec_dict,
-                    proof,
-                    ],
-                queue=self.queue,
-                )
-
-        s_token_verify = celery.signature(
-                    'cic_eth.eth.erc20.verify_token_info',
-                    [
-                        chain_spec_dict,
-                        self.callback_success,
-                        self.callback_error,
-                        ],
-                    queue=self.queue,
-                    )
-
-        s_token_info.link(s_token_verify)
-        s_token_resolve.link(s_token_info)
-        return s_token_resolve.apply_async()
-
-
 #    def convert_transfer(self, from_address, to_address, target_return, minimum_return, from_token_symbol, to_token_symbol):
 #        """Executes a chain of celery tasks that performs conversion between two ERC20 tokens, and transfers to a specified receipient after convert has completed.
 #
@@ -381,8 +254,6 @@ class Api(ApiBase):
        :returns: uuid of root task
        :rtype: celery.Task
        """
-        #from_address = strip_0x(from_address)
-        #to_address = strip_0x(to_address)
        s_check = celery.signature(
                'cic_eth.admin.ctrl.check_lock',
                [
--- a/apps/cic-eth/cic_eth/callbacks/noop.py
+++ b/apps/cic-eth/cic_eth/callbacks/noop.py
@@ -1,10 +1,7 @@
-import logging
-
 import celery

 celery_app = celery.current_app
-#logg = celery_app.log.get_default_logger()
-logg = logging.getLogger()
+logg = celery_app.log.get_default_logger()


@celery_app.task(bind=True)
--- a/apps/cic-eth/cic_eth/cli/rpc.py
+++ b/apps/cic-eth/cic_eth/cli/rpc.py
@@ -35,14 +35,14 @@ class RPC:
    def from_config(config, use_signer=False, default_label='default', signer_label='signer'):
        chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))

-        RPCConnection.register_location(config.get('RPC_PROVIDER'), chain_spec, default_label)
+        RPCConnection.register_location(config.get('RPC_HTTP_PROVIDER'), chain_spec, default_label)
        if use_signer:

            RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, signer_label)
            RPCConnection.register_constructor(ConnType.HTTP, EthHTTPSignerConnection, signer_label)
            RPCConnection.register_constructor(ConnType.HTTP_SSL, EthHTTPSignerConnection, signer_label)
            RPCConnection.register_location(config.get('SIGNER_PROVIDER'), chain_spec, signer_label) 
-        rpc = RPC(chain_spec, config.get('RPC_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
+        rpc = RPC(chain_spec, config.get('RPC_HTTP_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
        logg.info('set up rpc: {}'.format(rpc))
        return rpc

--- a/apps/cic-eth/cic_eth/db/migrations/default/versions/75d4767b3031_lock.py
+++ b/apps/cic-eth/cic_eth/db/migrations/default/versions/75d4767b3031_lock.py
@@ -8,8 +8,8 @@ Create Date: 2021-04-02 18:41:20.864265
 import datetime
 from alembic import op
 import sqlalchemy as sa
+from chainlib.eth.constant import ZERO_ADDRESS
 from cic_eth.db.enum import LockEnum
-from cic_eth.encode import ZERO_ADDRESS_NORMAL


 # revision identifiers, used by Alembic.
@@ -30,7 +30,7 @@ def upgrade():
            sa.Column("otx_id", sa.Integer, sa.ForeignKey('otx.id'), nullable=True),
            )
    op.create_index('idx_chain_address', 'lock', ['blockchain', 'address'], unique=True)
-    op.execute("INSERT INTO lock (address, date_created, blockchain, flags) VALUES('{}', '{}', '::', {})".format(ZERO_ADDRESS_NORMAL, datetime.datetime.utcnow(), LockEnum.INIT | LockEnum.SEND | LockEnum.QUEUE))
+    op.execute("INSERT INTO lock (address, date_created, blockchain, flags) VALUES('{}', '{}', '::', {})".format(ZERO_ADDRESS, datetime.datetime.utcnow(), LockEnum.INIT | LockEnum.SEND | LockEnum.QUEUE))


 def downgrade():
--- a/apps/cic-eth/cic_eth/db/models/lock.py
+++ b/apps/cic-eth/cic_eth/db/models/lock.py
@@ -4,12 +4,12 @@ import logging

 # third-party imports
 from sqlalchemy import Column, String, Integer, DateTime, ForeignKey
+from chainlib.eth.constant import ZERO_ADDRESS
 from chainqueue.db.models.tx import TxCache
 from chainqueue.db.models.otx import Otx

 # local imports
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode  import ZERO_ADDRESS_NORMAL

 logg = logging.getLogger()

@@ -37,7 +37,7 @@ class Lock(SessionBase):


    @staticmethod
-    def set(chain_str, flags, address=ZERO_ADDRESS_NORMAL, session=None, tx_hash=None):
+    def set(chain_str, flags, address=ZERO_ADDRESS, session=None, tx_hash=None):
        """Sets flags associated with the given address and chain.

        If a flags entry does not exist it is created.
@@ -90,7 +90,7 @@ class Lock(SessionBase):


    @staticmethod
-    def reset(chain_str, flags, address=ZERO_ADDRESS_NORMAL, session=None):
+    def reset(chain_str, flags, address=ZERO_ADDRESS, session=None):
        """Resets flags associated with the given address and chain.

        If the resulting flags entry value is 0, the entry will be deleted.
@@ -134,7 +134,7 @@ class Lock(SessionBase):


    @staticmethod
-    def check(chain_str, flags, address=ZERO_ADDRESS_NORMAL, session=None):
+    def check(chain_str, flags, address=ZERO_ADDRESS, session=None):
        """Checks whether all given flags are set for given address and chain. 

        Does not validate the address against any other tables or components.
--- a/apps/cic-eth/cic_eth/encode.py
+++ b/apps/cic-eth/cic_eth/encode.py
@@ -1,16 +0,0 @@
-# external imports
-from chainlib.eth.constant import ZERO_ADDRESS
-from chainqueue.encode import TxHexNormalizer
-from chainlib.eth.tx import unpack
-
-tx_normalize = TxHexNormalizer()
-
-ZERO_ADDRESS_NORMAL = tx_normalize.wallet_address(ZERO_ADDRESS)
-
-
-def unpack_normal(signed_tx_bytes, chain_spec):
-    tx = unpack(signed_tx_bytes, chain_spec)
-    tx['hash'] = tx_normalize.tx_hash(tx['hash'])
-    tx['from'] = tx_normalize.wallet_address(tx['from'])
-    tx['to'] = tx_normalize.wallet_address(tx['to'])
-    return tx
--- a/apps/cic-eth/cic_eth/error.py
+++ b/apps/cic-eth/cic_eth/error.py
@@ -48,6 +48,8 @@ class RoleMissingError(Exception):
    pass


+
+
 class IntegrityError(Exception):
    """Exception raised to signal irregularities with deduplication and ordering of tasks

@@ -83,8 +85,3 @@ class RoleAgencyError(SeppukuError):
 class YouAreBrokeError(Exception):
    """Exception raised when a value transfer is attempted without access to sufficient funds
    """
-
-
-class TrustError(Exception):
-    """Exception raised when required trust proofs are missing for a request
-    """
--- a/apps/cic-eth/cic_eth/eth/account.py
+++ b/apps/cic-eth/cic_eth/eth/account.py
@@ -13,8 +13,11 @@ from chainlib.eth.sign import (
        new_account,
        sign_message,
        )
-from chainlib.eth.address import to_checksum_address, is_address
-from chainlib.eth.tx import TxFormat
+from chainlib.eth.address import to_checksum_address
+from chainlib.eth.tx import (
+        TxFormat,
+        unpack,
+        )
 from chainlib.chain import ChainSpec
 from chainlib.error import JSONRPCException
 from eth_accounts_index.registry import AccountRegistry
@@ -31,7 +34,6 @@ from cic_eth.eth.gas import (
 from cic_eth.db.models.nonce import Nonce
 from cic_eth.db.models.base import SessionBase
 from cic_eth.db.models.role import AccountRole
-from cic_eth.encode import tx_normalize
 from cic_eth.error import (
        RoleMissingError,
        SignerError,
@@ -47,11 +49,6 @@ from cic_eth.eth.nonce import (
 from cic_eth.queue.tx import (
        register_tx,
        )
-from cic_eth.encode import (
-        unpack_normal,
-        ZERO_ADDRESS_NORMAL,
-        tx_normalize,
-        )

 logg = logging.getLogger()
 celery_app = celery.current_app 
@@ -86,7 +83,7 @@ def create(self, password, chain_spec_dict):
    # TODO: It seems infeasible that a can be None in any case, verify
    if a == None:
        raise SignerError('create account')
-    a = tx_normalize.wallet_address(a)
+        
    logg.debug('created account {}'.format(a))

    # Initialize nonce provider record for account
@@ -177,9 +174,6 @@ def gift(self, account_address, chain_spec_dict):
    """
    chain_spec = ChainSpec.from_dict(chain_spec_dict)

-    if is_address(account_address):
-        account_address = tx_normalize.wallet_address(account_address)
-
    logg.debug('gift account address {} to index'.format(account_address))
    queue = self.request.delivery_info.get('routing_key')

@@ -253,9 +247,8 @@ def have(self, account, chain_spec_dict):

@celery_app.task(bind=True, base=CriticalSQLAlchemyTask)
 def set_role(self, tag, address, chain_spec_dict):
-    if not is_address(address):
-        raise ValueError('invalid address {}'.format(address))
-    address = tx_normalize.wallet_address(address)
+    if not to_checksum_address(address):
+        raise ValueError('invalid checksum address {}'.format(address))
    session = SessionBase.create_session()
    role = AccountRole.set(tag, address, session=session) 
    session.add(role)
@@ -302,19 +295,17 @@ def cache_gift_data(
    chain_spec = ChainSpec.from_dict(chain_spec_dict)

    tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
-    tx = unpack_normal(tx_signed_raw_bytes, chain_spec)
+    tx = unpack(tx_signed_raw_bytes, chain_spec)
    tx_data = Faucet.parse_give_to_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx['to'])

    session = self.create_session()

    tx_dict = {
-            'hash': tx['hash'],
-            'from': sender_address,
-            'to': recipient_address,
-            'source_token': ZERO_ADDRESS_NORMAL,
-            'destination_token': ZERO_ADDRESS_NORMAL,
+            'hash': tx_hash_hex,
+            'from': tx['from'],
+            'to': tx['to'],
+            'source_token': ZERO_ADDRESS,
+            'destination_token': ZERO_ADDRESS,
            'from_value': 0,
            'to_value': 0,
            }
@@ -343,19 +334,17 @@ def cache_account_data(
    :rtype: tuple
    """
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
-    tx = unpack_normal(tx_signed_raw_bytes, chain_spec)
+    tx_signed_raw_bytes = bytes.fromhex(tx_signed_raw_hex[2:])
+    tx = unpack(tx_signed_raw_bytes, chain_spec)
    tx_data = AccountsIndex.parse_add_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx['to'])

    session = SessionBase.create_session()
    tx_dict = {
-            'hash': tx['hash'],
-            'from': sender_address,
-            'to': recipient_address,
-            'source_token': ZERO_ADDRESS_NORMAL,
-            'destination_token': ZERO_ADDRESS_NORMAL,
+            'hash': tx_hash_hex,
+            'from': tx['from'],
+            'to': tx['to'],
+            'source_token': ZERO_ADDRESS,
+            'destination_token': ZERO_ADDRESS,
            'from_value': 0,
            'to_value': 0,
            }
--- a/apps/cic-eth/cic_eth/eth/erc20.py
+++ b/apps/cic-eth/cic_eth/eth/erc20.py
@@ -12,14 +12,10 @@ from chainlib.eth.tx import (
        )
 from cic_eth_registry import CICRegistry
 from cic_eth_registry.erc20 import ERC20Token
-from hexathon import (
-        strip_0x,
-        add_0x,
-        )
+from hexathon import strip_0x
 from chainqueue.error import NotLocalTxError
 from eth_erc20 import ERC20
 from chainqueue.sql.tx import cache_tx_dict
-from okota.token_index import to_identifier

 # local imports
 from cic_eth.db.models.base import SessionBase
@@ -40,11 +36,8 @@ from cic_eth.task import (
        CriticalSQLAlchemyTask,
        CriticalWeb3Task,
        CriticalSQLAlchemyAndSignerTask,
-        BaseTask,
    )
 from cic_eth.eth.nonce import CustodialTaskNonceOracle
-from cic_eth.encode import tx_normalize
-from cic_eth.eth.trust import verify_proofs

 celery_app = celery.current_app
 logg = logging.getLogger()
@@ -69,8 +62,7 @@ def balance(tokens, holder_address, chain_spec_dict):

    for t in tokens:
        address = t['address']
-        logg.debug('address {} {}'.format(address, holder_address))
-        token = ERC20Token(chain_spec, rpc, add_0x(address))
+        token = ERC20Token(chain_spec, rpc, address)
        c = ERC20(chain_spec)
        o = c.balance_of(address, holder_address, sender_address=caller_address)
        r = rpc.do(o)
@@ -379,15 +371,13 @@ def cache_transfer_data(
    tx = unpack(tx_signed_raw_bytes, chain_spec)

    tx_data = ERC20.parse_transfer_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx_data[0])
+    recipient_address = tx_data[0]
    token_value = tx_data[1]

-
    session = SessionBase.create_session()
    tx_dict = {
            'hash': tx_hash_hex,
-            'from': sender_address,
+            'from': tx['from'],
            'to': recipient_address,
            'source_token': tx['to'],
            'destination_token': tx['to'],
@@ -458,14 +448,13 @@ def cache_approve_data(
    tx = unpack(tx_signed_raw_bytes, chain_spec)

    tx_data = ERC20.parse_approve_request(tx['data'])
-    sender_address = tx_normalize.wallet_address(tx['from'])
-    recipient_address = tx_normalize.wallet_address(tx_data[0])
+    recipient_address = tx_data[0]
    token_value = tx_data[1]

    session = SessionBase.create_session()
    tx_dict = {
            'hash': tx_hash_hex,
-            'from': sender_address,
+            'from': tx['from'],
            'to': recipient_address,
            'source_token': tx['to'],
            'destination_token': tx['to'],
@@ -476,69 +465,3 @@ def cache_approve_data(
    session.close()
    return (tx_hash_hex, cache_id)

-
-@celery_app.task(bind=True, base=BaseTask)
-def token_info(self, tokens, chain_spec_dict, proofs=[]):
-    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    rpc = RPCConnection.connect(chain_spec, 'default')
-
-    i = 0
-
-    for token in tokens:
-        result_data = []
-        token_chain_object = ERC20Token(chain_spec, rpc, add_0x(token['address']))
-        token_chain_object.load(rpc)
-
-        token_symbol_proof_hex = to_identifier(token_chain_object.symbol)
-        token_proofs = [token_symbol_proof_hex]
-        if len(proofs) > 0:
-            token_proofs += proofs[i]
-
-        tokens[i] = {
-            'decimals': token_chain_object.decimals,
-            'name': token_chain_object.name,
-            'symbol': token_chain_object.symbol,
-            'address': tx_normalize.executable_address(token_chain_object.address),
-            'proofs': token_proofs,
-            'converters': tokens[i]['converters'],
-                }   
-        i += 1
-
-    return tokens
-
-
-@celery_app.task(bind=True, base=BaseTask)
-def verify_token_info(self, tokens, chain_spec_dict, success_callback, error_callback):
-    queue = self.request.delivery_info.get('routing_key')
-
-    for token in tokens:
-        s = celery.signature(
-                'cic_eth.eth.trust.verify_proofs',
-                [
-                    token,
-                    token['address'],
-                    token['proofs'],
-                    chain_spec_dict,
-                    success_callback,
-                    error_callback,
-                    ],
-                queue=queue,
-                )
-
-        if success_callback != None:
-            s.link(success_callback)
-        if error_callback != None:
-            s.on_error(error_callback)
-        s.apply_async()
-
-    return tokens
-
-
-@celery_app.task(bind=True, base=BaseTask)
-def default_token(self):
-    return {
-        'symbol': self.default_token_symbol,
-        'address': self.default_token_address,
-        'name': self.default_token_name,
-        'decimals': self.default_token_decimals,
-        }
--- a/apps/cic-eth/cic_eth/eth/gas.py
+++ b/apps/cic-eth/cic_eth/eth/gas.py
@@ -3,17 +3,10 @@ import logging

 # external imports
 import celery
-from hexathon import (
-        strip_0x,
-        add_0x,
-        )
-#from chainlib.eth.constant import ZERO_ADDRESS
+from hexathon import strip_0x
+from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.chain import ChainSpec
-from chainlib.eth.address import (
-        is_checksum_address,
-        to_checksum_address,
-        is_address
-        )
+from chainlib.eth.address import is_checksum_address
 from chainlib.connection import RPCConnection
 from chainqueue.db.enum import StatusBits
 from chainqueue.sql.tx import cache_tx_dict
@@ -28,6 +21,7 @@ from chainlib.eth.error import (
 from chainlib.eth.tx import (
        TxFactory,
        TxFormat,
+        unpack,
        )
 from chainlib.eth.contract import (
        abi_decode_single,
@@ -51,7 +45,6 @@ from cic_eth.eth.nonce import CustodialTaskNonceOracle
 from cic_eth.queue.tx import (
        queue_create,
        register_tx,
-        unpack,
        )
 from cic_eth.queue.query import get_tx
 from cic_eth.task import (
@@ -60,11 +53,6 @@ from cic_eth.task import (
        CriticalSQLAlchemyAndSignerTask,
        CriticalWeb3AndSignerTask,
        )
-from cic_eth.encode import (
-        tx_normalize,
-        ZERO_ADDRESS_NORMAL,
-        unpack_normal,
-        )

 celery_app = celery.current_app
 logg = logging.getLogger()
@@ -142,16 +130,16 @@ def cache_gas_data(
    """
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    tx_signed_raw_bytes = bytes.fromhex(strip_0x(tx_signed_raw_hex))
-    tx = unpack_normal(tx_signed_raw_bytes, chain_spec)
+    tx = unpack(tx_signed_raw_bytes, chain_spec)

    session = SessionBase.create_session()

    tx_dict = {
-            'hash': tx['hash'],
+            'hash': tx_hash_hex,
            'from': tx['from'],
            'to': tx['to'],
-            'source_token': ZERO_ADDRESS_NORMAL,
-            'destination_token': ZERO_ADDRESS_NORMAL,
+            'source_token': ZERO_ADDRESS,
+            'destination_token': ZERO_ADDRESS,
            'from_value': tx['value'],
            'to_value': tx['value'],
            }
@@ -162,7 +150,7 @@ def cache_gas_data(


@celery_app.task(bind=True, throws=(OutOfGasError), base=CriticalSQLAlchemyAndWeb3Task)
-def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, gas_required=MAXIMUM_FEE_UNITS):
+def check_gas(self, tx_hashes, chain_spec_dict, txs=[], address=None, gas_required=MAXIMUM_FEE_UNITS):
    """Check the gas level of the sender address of a transaction.

    If the account balance is not sufficient for the required gas, gas refill is requested and OutOfGasError raiser.
@@ -182,23 +170,8 @@ def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, ga
    :return: Signed raw transaction data list
    :rtype: param txs, unchanged
    """
-    rpc_format_address = None
-    if address != None:
-        if not is_address(address):
-            raise ValueError('invalid address {}'.format(address))
-        address = tx_normalize.wallet_address(address)
-        address = add_0x(address)
-
-    tx_hashes = []
-    txs = []
-    for tx_hash in tx_hashes_hex:
-        tx_hash = tx_normalize.tx_hash(tx_hash)
-        tx_hashes.append(tx_hash)
-    for tx in txs_hex:
-        tx = tx_normalize.tx_wire(tx)
-        txs.append(tx)
-
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
+    logg.debug('txs {} tx_hashes {}'.format(txs, tx_hashes))

    addresspass = None
    if len(txs) == 0:
@@ -214,7 +187,8 @@ def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, ga
                raise ValueError('txs passed to check gas must all have same sender; had {} got {}'.format(address, tx['from']))
            addresspass.append(address)

-    rpc_format_address = add_0x(to_checksum_address(address))
+    if not is_checksum_address(address):
+        raise ValueError('invalid address {}'.format(address))

    queue = self.request.delivery_info.get('routing_key')

@@ -222,7 +196,7 @@ def check_gas(self, tx_hashes_hex, chain_spec_dict, txs_hex=[], address=None, ga

    gas_balance = 0
    try:
-        o = balance(rpc_format_address)
+        o = balance(address)
        r = conn.do(o)
        conn.disconnect()
        gas_balance = abi_decode_single(ABIContractType.UINT256, r)
@@ -330,7 +304,6 @@ def refill_gas(self, recipient_address, chain_spec_dict):
    # Determine value of gas tokens to send
    # if an uncompleted gas refill for the same recipient already exists, we still need to spend the nonce
    # however, we will perform a 0-value transaction instead
-    recipient_address = tx_normalize.wallet_address(recipient_address)
    zero_amount = False
    session = SessionBase.create_session()
    status_filter = StatusBits.FINAL | StatusBits.NODE_ERROR | StatusBits.NETWORK_ERROR | StatusBits.UNKNOWN_ERROR
@@ -405,7 +378,6 @@ def resend_with_higher_gas(self, txold_hash_hex, chain_spec_dict, gas=None, defa
    :returns: Transaction hash
    :rtype: str, 0x-hex
    """
-    txold_hash_hex = tx_normalize.tx_hash(txold_hash_hex)
    session = SessionBase.create_session()

    otx = Otx.load(txold_hash_hex, session)
--- a/apps/cic-eth/cic_eth/eth/meta.py
+++ b/apps/cic-eth/cic_eth/eth/meta.py
@@ -2,9 +2,8 @@
 from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.status import Status as TxStatus
 from cic_eth_registry.erc20 import ERC20Token
-from hexathon import add_0x

-# local impor:ts
+# local imports
 from cic_eth.ext.address import translate_address


@@ -45,8 +44,8 @@ class ExtendedTx:
            destination = source
        if destination_value == None:
            destination_value = source_value
-        st = ERC20Token(self.chain_spec, self.rpc, add_0x(source))
-        dt = ERC20Token(self.chain_spec, self.rpc, add_0x(destination))
+        st = ERC20Token(self.chain_spec, self.rpc, source)
+        dt = ERC20Token(self.chain_spec, self.rpc, destination)
        self.source_token = source
        self.source_token_symbol = st.symbol
        self.source_token_name = st.name
--- a/apps/cic-eth/cic_eth/eth/nonce.py
+++ b/apps/cic-eth/cic_eth/eth/nonce.py
@@ -3,12 +3,11 @@ import logging

 # external imports
 import celery
-from chainlib.eth.address import is_checksum_address, is_address, strip_0x
+from chainlib.eth.address import is_checksum_address

 # local imports
 from cic_eth.db.models.role import AccountRole
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import tx_normalize
 from cic_eth.task import CriticalSQLAlchemyTask
 from cic_eth.db.models.nonce import (
        Nonce,
@@ -43,8 +42,7 @@ class CustodialTaskNonceOracle():
        :returns: Nonce
        :rtype: number
        """
-        address = tx_normalize.wallet_address(self.address)
-        r = NonceReservation.release(address, self.uuid, session=self.session)
+        r = NonceReservation.release(self.address, self.uuid, session=self.session)
        return r[1]


@@ -60,18 +58,17 @@ def reserve_nonce(self, chained_input, chain_spec_dict, signer_address=None):
        address = chained_input
        logg.debug('non-explicit address for reserve nonce, using arg head {}'.format(chained_input))
    else:
-        if is_address(signer_address):
+        if is_checksum_address(signer_address):
            address = signer_address
            logg.debug('explicit address for reserve nonce {}'.format(signer_address))
        else:
            address = AccountRole.get_address(signer_address, session=session)
            logg.debug('role for reserve nonce {} -> {}'.format(signer_address, address))

-    if not is_address(address):
+    if not is_checksum_address(address):
        raise ValueError('invalid result when resolving address for nonce {}'.format(address))

    root_id = self.request.root_id
-    address = tx_normalize.wallet_address(address)
    r = NonceReservation.next(address, root_id, session=session)
    logg.debug('nonce {} reserved for address {} task {}'.format(r[1], address, r[0]))

--- a/apps/cic-eth/cic_eth/eth/trust.py
+++ b/apps/cic-eth/cic_eth/eth/trust.py
@@ -1,77 +0,0 @@
-# standard imports
-import logging
-
-# external imports
-import celery
-from eth_address_declarator import Declarator
-from chainlib.connection import RPCConnection
-from chainlib.chain import ChainSpec
-from cic_eth.db.models.role import AccountRole
-from cic_eth_registry import CICRegistry
-from hexathon import strip_0x
-
-# local imports
-from cic_eth.task import BaseTask
-from cic_eth.error import TrustError
-
-celery_app = celery.current_app
-logg = logging.getLogger()
-
-
-@celery_app.task(bind=True, base=BaseTask)
-def verify_proof(self, chained_input, proof, subject, chain_spec_dict, success_callback, error_callback):
-    proof = strip_0x(proof)
-
-    proofs = []
- 
-    logg.debug('proof count {}'.format(len(proofs)))
-    if len(proofs) == 0:
-        logg.debug('error {}'.format(len(proofs)))
-        raise TrustError('foo')
-
-    return (chained_input, (proof, proofs))
-
-
-@celery_app.task(bind=True, base=BaseTask)
-def verify_proofs(self, chained_input, subject, proofs, chain_spec_dict, success_callback, error_callback):
-    queue = self.request.delivery_info.get('routing_key')
-
-    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    rpc = RPCConnection.connect(chain_spec, 'default')
-
-    session = self.create_session()
-    sender_address = AccountRole.get_address('DEFAULT', session)
-
-    registry = CICRegistry(chain_spec, rpc)
-    declarator_address = registry.by_name('AddressDeclarator', sender_address=sender_address)
-
-    declarator = Declarator(chain_spec)
-
-    have_proofs = {}
-
-    for proof in proofs:
-
-        proof = strip_0x(proof)
-
-        have_proofs[proof] = []
-
-        for trusted_address in self.trusted_addresses:
-            o = declarator.declaration(declarator_address, trusted_address, subject, sender_address=sender_address)
-            r = rpc.do(o)
-            declarations = declarator.parse_declaration(r)
-            logg.debug('comparing proof {} with declarations for {} by {}: {}'.format(proof, subject, trusted_address, declarations))
-
-            for declaration in declarations:
-                declaration = strip_0x(declaration)
-                if declaration == proof:
-                    logg.debug('have token proof {} match for trusted address {}'.format(declaration, trusted_address))
-                    have_proofs[proof].append(trusted_address)
-
-    out_proofs = {}
-    for proof in have_proofs.keys():
-        if len(have_proofs[proof]) == 0:
-            logg.error('missing signer for proof {} subject {}'.format(proof, subject))
-            raise TrustError((subject, proof,))
-        out_proofs[proof] = have_proofs[proof]
-       
-    return (chained_input, out_proofs)
--- a/apps/cic-eth/cic_eth/ext/tx.py
+++ b/apps/cic-eth/cic_eth/ext/tx.py
@@ -32,7 +32,6 @@ from potaahto.symbols import snake_and_camel
 from cic_eth.queue.time import tx_times
 from cic_eth.task import BaseTask
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app
 logg = logging.getLogger()
@@ -135,7 +134,7 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
                    tx_address = transfer_data[0]
                    tx_token_value = transfer_data[1]
                    
-                    if tx_normalize.wallet_address(address) == tx_normalize.wallet_address(tx_address):
+                    if address == tx_address:
                        status = StatusEnum.SENT
                        try:
                            o = receipt(tx['hash'])
@@ -153,8 +152,8 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
                        times = tx_times(tx['hash'], chain_spec)
                        tx_r = {
                            'hash': tx['hash'],
-                            'sender': tx_normalize.wallet_address(tx['from']),
-                            'recipient': tx_normalize.wallet_address(tx_address),
+                            'sender': tx['from'],
+                            'recipient': tx_address,
                            'source_value': tx_token_value,
                            'destination_value': tx_token_value,
                            'source_token': tx['to'],
@@ -165,12 +164,12 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
                            tx_r['date_created'] = times['queue']
                        else:
                            tx_r['date_created'] = times['network']
-                        txs[strip_0x(tx['hash'])] = tx_r
+                        txs[tx['hash']] = tx_r
                        break
-
    return txs


+
 # TODO: Surely it must be possible to optimize this
 # TODO: DRY this with callback filter in cic_eth/runnable/manager
 # TODO: Remove redundant fields from end representation (timestamp, tx_hash)
@@ -231,8 +230,6 @@ def tx_collate(self, tx_batches, chain_spec_dict, offset, limit, newest_first=Tr
            except UnknownContractError:
                logg.error('verify failed on tx {}, skipping'.format(tx['hash']))
                continue
-        tx['recipient'] = tx_normalize.wallet_address(tx['recipient'])
-        tx['sender'] = tx_normalize.wallet_address(tx['sender'])
        txs.append(tx)

    return txs
--- a/apps/cic-eth/cic_eth/pytest/fixtures_celery.py
+++ b/apps/cic-eth/cic_eth/pytest/fixtures_celery.py
@@ -4,21 +4,18 @@ import tempfile
 import logging
 import shutil

-# local imports
+# local impors
 from cic_eth.task import BaseTask

 #logg = logging.getLogger(__name__)
 logg = logging.getLogger()

+
@pytest.fixture(scope='function')
 def init_celery_tasks(
    contract_roles, 
        ):
    BaseTask.call_address = contract_roles['DEFAULT']
-    BaseTask.trusted_addresses = [
-            contract_roles['TRUSTED_DECLARATOR'],
-            contract_roles['CONTRACT_DEPLOYER'],
-            ]


 # celery fixtures
@@ -41,7 +38,6 @@ def celery_includes():
        'cic_eth.callbacks.noop',
        'cic_eth.callbacks.http',
        'cic_eth.pytest.mock.filter',
-        'cic_eth.pytest.mock.callback',
    ]


--- a/apps/cic-eth/cic_eth/pytest/mock/init.py
+++ b/apps/cic-eth/cic_eth/pytest/mock/init.py
@@ -1,2 +1 @@
 from .filter import *
-from .callback import *
--- a/apps/cic-eth/cic_eth/pytest/mock/callback.py
+++ b/apps/cic-eth/cic_eth/pytest/mock/callback.py
@@ -1,38 +0,0 @@
-# standard imports
-import os
-import logging
-import mmap
-
-# standard imports
-import tempfile
-
-# external imports
-import celery
-
-#logg = logging.getLogger(__name__)
-logg = logging.getLogger()
-
-celery_app = celery.current_app
-
-
-class CallbackTask(celery.Task):
-
-    mmap_path = tempfile.mkdtemp()
-
-
-@celery_app.task(bind=True, base=CallbackTask)
-def test_callback(self, a, b, c):
-    s = 'ok'
-    if c > 0:
-        s = 'err'
-
-    fp = os.path.join(self.mmap_path, b)
-    f = open(fp, 'wb+')
-    f.write(b'\x00')
-    f.seek(0)
-    m = mmap.mmap(f.fileno(), length=1)
-    m.write(c.to_bytes(1, 'big'))
-    m.close()
-    f.close()
-
-    logg.debug('test callback ({}): {} {} {}'.format(s, a, b, c))
--- a/apps/cic-eth/cic_eth/queue/balance.py
+++ b/apps/cic-eth/cic_eth/queue/balance.py
@@ -15,7 +15,6 @@ from chainqueue.db.enum import (
 # local imports
 from cic_eth.db import SessionBase
 from cic_eth.task import CriticalSQLAlchemyTask
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app

@@ -23,9 +22,6 @@ logg = logging.getLogger()


 def __balance_outgoing_compatible(token_address, holder_address):
-    token_address = tx_normalize.executable_address(token_address)
-    holder_address = tx_normalize.wallet_address(holder_address)
-
    session = SessionBase.create_session()
    q = session.query(TxCache.from_value)
    q = q.join(Otx)
@@ -62,9 +58,6 @@ def balance_outgoing(tokens, holder_address, chain_spec_dict):


 def __balance_incoming_compatible(token_address, receiver_address):
-    token_address = tx_normalize.executable_address(token_address)
-    receiver_address = tx_normalize.wallet_address(receiver_address)
-
    session = SessionBase.create_session()
    q = session.query(TxCache.to_value)
    q = q.join(Otx)
@@ -117,7 +110,7 @@ def assemble_balances(balances_collection):
    logg.debug('received collection {}'.format(balances_collection))
    for c in balances_collection:
        for b in c:
-            address = tx_normalize.executable_address(b['address'])
+            address = b['address']
            if tokens.get(address) == None:
                tokens[address] = {
                    'address': address,
--- a/apps/cic-eth/cic_eth/queue/lock.py
+++ b/apps/cic-eth/cic_eth/queue/lock.py
@@ -6,7 +6,6 @@ import celery
 from cic_eth.task import CriticalSQLAlchemyTask
 from cic_eth.db import SessionBase
 from cic_eth.db.models.lock import Lock
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app

@@ -22,9 +21,6 @@ def get_lock(address=None):
    :returns: List of locks
    :rtype: list of dicts
    """
-    if address != None:
-        address = tx_normalize.wallet_address(address)
-
    session = SessionBase.create_session()
    q = session.query(
            Lock.date_created,
--- a/apps/cic-eth/cic_eth/queue/query.py
+++ b/apps/cic-eth/cic_eth/queue/query.py
@@ -4,8 +4,8 @@ import datetime
 # external imports
 import celery
 from chainlib.chain import ChainSpec
-import chainqueue.sql.query
 from chainlib.eth.tx import unpack
+import chainqueue.sql.query
 from chainqueue.db.enum import (
        StatusEnum,
        is_alive,
@@ -20,10 +20,6 @@ from cic_eth.db.enum import LockEnum
 from cic_eth.task import CriticalSQLAlchemyTask
 from cic_eth.db.models.lock import Lock
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import (
-        tx_normalize,
-        unpack_normal,
-        )

 celery_app = celery.current_app

@@ -31,77 +27,49 @@ celery_app = celery.current_app
@celery_app.task(base=CriticalSQLAlchemyTask)
 def get_tx_cache(chain_spec_dict, tx_hash):
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    return get_tx_cache_local(chain_spec, tx_hash)
-
-
-def get_tx_cache_local(chain_spec, tx_hash, session=None):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
-    session = SessionBase.bind_session(session)
+    session = SessionBase.create_session()
    r = chainqueue.sql.query.get_tx_cache(chain_spec, tx_hash, session=session)
-    SessionBase.release_session(session)
+    session.close()
    return r


@celery_app.task(base=CriticalSQLAlchemyTask)
 def get_tx(chain_spec_dict, tx_hash):
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    return get_tx_local(chain_spec, tx_hash)
-
-
-def get_tx_local(chain_spec, tx_hash, session=None):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
-    session = SessionBase.bind_session(session)
+    session = SessionBase.create_session()
    r =  chainqueue.sql.query.get_tx(chain_spec, tx_hash, session=session)
-    SessionBase.release_session(session)
+    session.close()
    return r


@celery_app.task(base=CriticalSQLAlchemyTask)
 def get_account_tx(chain_spec_dict, address, as_sender=True, as_recipient=True, counterpart=None):
-    address = tx_normalize.wallet_address(address)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    return get_account_tx_local(chain_spec, address, as_sender=as_sender, as_recipient=as_recipient, counterpart=counterpart)
-
-
-def get_account_tx_local(chain_spec, address, as_sender=True, as_recipient=True, counterpart=None, session=None):
-    address = tx_normalize.wallet_address(address)
-    session = SessionBase.bind_session(session)
+    session = SessionBase.create_session()
    r = chainqueue.sql.query.get_account_tx(chain_spec, address, as_sender=True, as_recipient=True, counterpart=None, session=session)
-    SessionBase.release_session(session)
+    session.close()
    return r


@celery_app.task(base=CriticalSQLAlchemyTask)
-def get_upcoming_tx_nolock(chain_spec_dict, status=StatusEnum.READYSEND, not_status=None, recipient=None, before=None, limit=0):
+def get_upcoming_tx_nolock(chain_spec_dict, status=StatusEnum.READYSEND, not_status=None, recipient=None, before=None, limit=0, session=None):
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
-    return get_upcoming_tx_nolock_local(chain_spec, status=status, not_status=not_status, recipient=recipient, before=before, limit=limit)
-
-
-def get_upcoming_tx_nolock_local(chain_spec, status=StatusEnum.READYSEND, not_status=None, recipient=None, before=None, limit=0, session=None):
-    recipient = tx_normalize.wallet_address(recipient)
    session = SessionBase.create_session()
-    r = chainqueue.sql.query.get_upcoming_tx(chain_spec, status, not_status=not_status, recipient=recipient, before=before, limit=limit, session=session, decoder=unpack_normal)
+    r = chainqueue.sql.query.get_upcoming_tx(chain_spec, status, not_status=not_status, recipient=recipient, before=before, limit=limit, session=session, decoder=unpack)
    session.close()
    return r


 def get_status_tx(chain_spec, status, not_status=None, before=None, exact=False, limit=0, session=None):
-    return chainqueue.sql.query.get_status_tx_cache(chain_spec, status, not_status=not_status, before=before, exact=exact, limit=limit, session=session, decoder=unpack_normal)
+    return chainqueue.sql.query.get_status_tx_cache(chain_spec, status, not_status=not_status, before=before, exact=exact, limit=limit, session=session, decoder=unpack)


 def get_paused_tx(chain_spec, status=None, sender=None, session=None, decoder=None):
-    sender = tx_normalize.wallet_address(sender)
-    return chainqueue.sql.query.get_paused_tx_cache(chain_spec, status=status, sender=sender, session=session, decoder=unpack_normal)
+    return chainqueue.sql.query.get_paused_tx_cache(chain_spec, status=status, sender=sender, session=session, decoder=unpack)


 def get_nonce_tx(chain_spec, nonce, sender):
-    sender = tx_normalize.wallet_address(sender)
-    return get_nonce_tx_local(chain_spec, nonce, sender)
-
-
-def get_nonce_tx_local(chain_spec, nonce, sender, session=None):
-    sender = tx_normalize.wallet_address(sender)
-    return chainqueue.sql.query.get_nonce_tx_cache(chain_spec, nonce, sender, decoder=unpack_normal, session=session)
+    return get_nonce_tx_cache(chain_spec, nonce, sender, decoder=unpack)


 def get_upcoming_tx(chain_spec, status=StatusEnum.READYSEND, not_status=None, recipient=None, before=None, limit=0, session=None):
@@ -123,8 +91,6 @@ def get_upcoming_tx(chain_spec, status=StatusEnum.READYSEND, not_status=None, re
    :returns: Transactions
    :rtype: dict, with transaction hash as key, signed raw transaction as value
    """
-    if recipient != None:
-        recipient = tx_normalize.wallet_address(recipient)
    session = SessionBase.bind_session(session)
    q_outer = session.query(
            TxCache.sender,
--- a/apps/cic-eth/cic_eth/queue/state.py
+++ b/apps/cic-eth/cic_eth/queue/state.py
@@ -6,14 +6,12 @@ import chainqueue.sql.state
 import celery
 from cic_eth.task import CriticalSQLAlchemyTask
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app


@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_sent(chain_spec_dict, tx_hash, fail=False):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_sent(chain_spec, tx_hash, fail, session=session)
@@ -23,7 +21,6 @@ def set_sent(chain_spec_dict, tx_hash, fail=False):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_final(chain_spec_dict, tx_hash, block=None, tx_index=None, fail=False):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_final(chain_spec, tx_hash, block=block, tx_index=tx_index, fail=fail, session=session)
@@ -33,7 +30,6 @@ def set_final(chain_spec_dict, tx_hash, block=None, tx_index=None, fail=False):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_cancel(chain_spec_dict, tx_hash, manual=False):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_cancel(chain_spec, tx_hash, manual, session=session)
@@ -43,7 +39,6 @@ def set_cancel(chain_spec_dict, tx_hash, manual=False):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_rejected(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_rejected(chain_spec, tx_hash, session=session)
@@ -53,7 +48,6 @@ def set_rejected(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_fubar(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_fubar(chain_spec, tx_hash, session=session)
@@ -63,7 +57,6 @@ def set_fubar(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_manual(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_manual(chain_spec, tx_hash, session=session)
@@ -73,7 +66,6 @@ def set_manual(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_ready(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_ready(chain_spec, tx_hash, session=session)
@@ -83,7 +75,6 @@ def set_ready(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_reserved(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_reserved(chain_spec, tx_hash, session=session)
@@ -93,7 +84,6 @@ def set_reserved(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def set_waitforgas(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.set_waitforgas(chain_spec, tx_hash, session=session)
@@ -103,7 +93,6 @@ def set_waitforgas(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def get_state_log(chain_spec_dict, tx_hash):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.get_state_log(chain_spec, tx_hash, session=session)
@@ -113,7 +102,6 @@ def get_state_log(chain_spec_dict, tx_hash):

@celery_app.task(base=CriticalSQLAlchemyTask)
 def obsolete(chain_spec_dict, tx_hash, final):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
    chain_spec = ChainSpec.from_dict(chain_spec_dict)
    session = SessionBase.create_session()
    r = chainqueue.sql.state.obsolete_by_cache(chain_spec, tx_hash, final, session=session)
--- a/apps/cic-eth/cic_eth/queue/time.py
+++ b/apps/cic-eth/cic_eth/queue/time.py
@@ -13,7 +13,6 @@ from chainqueue.error import NotLocalTxError
 # local imports
 from cic_eth.task import CriticalSQLAlchemyAndWeb3Task
 from cic_eth.db.models.base import SessionBase
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app

@@ -21,7 +20,6 @@ logg = logging.getLogger()


 def tx_times(tx_hash, chain_spec, session=None):
-    tx_hash = tx_normalize.tx_hash(tx_hash)

    session = SessionBase.bind_session(session)

--- a/apps/cic-eth/cic_eth/queue/tx.py
+++ b/apps/cic-eth/cic_eth/queue/tx.py
@@ -32,16 +32,12 @@ from cic_eth.db import SessionBase
 from cic_eth.db.enum import LockEnum
 from cic_eth.task import CriticalSQLAlchemyTask
 from cic_eth.error import LockedError
-from cic_eth.encode import tx_normalize

 celery_app = celery.current_app
 logg = logging.getLogger()


 def queue_create(chain_spec, nonce, holder_address, tx_hash, signed_tx, session=None):
-    tx_hash = tx_normalize.tx_hash(tx_hash)
-    signed_tx = tx_normalize.tx_hash(signed_tx)
-    holder_address = tx_normalize.wallet_address(holder_address)
    session = SessionBase.bind_session(session)

    lock = Lock.check_aggregate(str(chain_spec), LockEnum.QUEUE, holder_address, session=session) 
@@ -71,8 +67,6 @@ def register_tx(tx_hash_hex, tx_signed_raw_hex, chain_spec, queue, cache_task=No
    :returns: Tuple; Transaction hash, signed raw transaction data
    :rtype: tuple
    """
-    tx_hash_hex = tx_normalize.tx_hash(tx_hash_hex)
-    tx_signed_raw_hex = tx_normalize.tx_hash(tx_signed_raw_hex)
    logg.debug('adding queue tx {}:{} -> {}'.format(chain_spec, tx_hash_hex, tx_signed_raw_hex))
    tx_signed_raw = bytes.fromhex(strip_0x(tx_signed_raw_hex))
    tx = unpack(tx_signed_raw, chain_spec)
--- a/apps/cic-eth/cic_eth/runnable/daemons/dispatcher.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/dispatcher.py
@@ -101,14 +101,14 @@ class DispatchSyncer:
                    LockEnum.QUEUE,
                    tx['from'],
                    ],
-                queue=config.get('CELERY_QUEUE'),
+                queue=queue,
                )
            s_send = celery.signature(
                    'cic_eth.eth.tx.send',
                    [
                        self.chain_spec.asdict(),
                        ], 
-                    queue=config.get('CELERY_QUEUE'),
+                    queue=queue,
                    )
            s_check.link(s_send)
            t = s_check.apply_async()
--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/callback.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/callback.py
@@ -21,7 +21,6 @@ from erc20_faucet import Faucet
 # local imports
 from .base import SyncFilter
 from cic_eth.eth.meta import ExtendedTx
-from cic_eth.encode import tx_normalize

 logg = logging.getLogger().getChild(__name__)

@@ -43,9 +42,9 @@ class CallbackFilter(SyncFilter):
            return (None, None)
        r = ERC20.parse_transfer_request(tx.payload)
        transfer_data = {}
-        transfer_data['to'] = tx_normalize.wallet_address(r[0])
+        transfer_data['to'] = r[0]
        transfer_data['value'] = r[1]
-        transfer_data['from'] = tx_normalize.wallet_address(tx.outputs[0])
+        transfer_data['from'] = tx.outputs[0]
        transfer_data['token_address'] = tx.inputs[0]
        return ('transfer', transfer_data)

@@ -55,8 +54,8 @@ class CallbackFilter(SyncFilter):
            return (None, None)
        r = ERC20.parse_transfer_from_request(tx.payload)
        transfer_data = {}
-        transfer_data['from'] = tx_normalize.wallet_address(r[0])
-        transfer_data['to'] = tx_normalize.wallet_address(r[1])
+        transfer_data['from'] = r[0]
+        transfer_data['to'] = r[1]
        transfer_data['value'] = r[2]
        transfer_data['token_address'] = tx.inputs[0]
        return ('transferfrom', transfer_data)
@@ -67,9 +66,9 @@ class CallbackFilter(SyncFilter):
            return (None, None)
        r = Faucet.parse_give_to_request(tx.payload)
        transfer_data = {}
-        transfer_data['to'] = tx_normalize.wallet_address(r[0])
+        transfer_data['to'] = r[0]
        transfer_data['value'] = tx.value
-        transfer_data['from'] = tx_normalize.wallet_address(tx.outputs[0])
+        transfer_data['from'] = tx.outputs[0]
        #transfer_data['token_address'] = tx.inputs[0]
        faucet_contract = tx.inputs[0]

--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/gas.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/gas.py
@@ -10,14 +10,15 @@ from chainlib.eth.tx import unpack
 from chainqueue.db.enum import StatusBits
 from chainqueue.db.models.tx import TxCache
 from chainqueue.db.models.otx import Otx
+from chainqueue.sql.query import get_paused_tx_cache as get_paused_tx
 from chainlib.eth.address import to_checksum_address

 # local imports
 from cic_eth.db.models.base import SessionBase
 from cic_eth.eth.gas import create_check_gas_task
-from cic_eth.queue.query import get_paused_tx
 from .base import SyncFilter

+#logg = logging.getLogger().getChild(__name__)
 logg = logging.getLogger()


--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/register.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/register.py
@@ -12,8 +12,7 @@ from hexathon import (
 # local imports
 from .base import SyncFilter

-#logg = logging.getLogger(__name__)
-logg = logging.getLogger()
+logg = logging.getLogger(__name__)

 account_registry_add_log_hash = '0x9cc987676e7d63379f176ea50df0ae8d2d9d1141d1231d4ce15b5965f73c9430'

--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/transferauth.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/transferauth.py
@@ -17,7 +17,6 @@ from cic_eth_registry import CICRegistry
 from erc20_transfer_authorization import TransferAuthorization

 # local imports
-from cic_eth.encode import tx_normalize
 from .base import SyncFilter


@@ -53,9 +52,9 @@ class TransferAuthFilter(SyncFilter):

        r = TransferAuthorization.parse_create_request_request(tx.payload) 
          
-        sender = tx_normalize.wallet_address(r[0])
-        recipient = tx_normalize.wallet_address(r[1])
-        token = tx_normalize.executable_address(r[2])
+        sender = r[0]
+        recipient = r[1]
+        token = r[2]
        value = r[3]

        token_data = {
--- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
@@ -69,6 +69,7 @@ from cic_eth.registry import (
        )
 from cic_eth.task import BaseTask

+
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

@@ -206,11 +207,10 @@ def main():

    BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
    BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol)
-    default_token = ERC20Token(chain_spec, conn, add_0x(BaseTask.default_token_address))
+    default_token = ERC20Token(chain_spec, conn, BaseTask.default_token_address)
    default_token.load(conn)
    BaseTask.default_token_decimals = default_token.decimals
    BaseTask.default_token_name = default_token.name
-    BaseTask.trusted_addresses = trusted_addresses

    BaseTask.run_dir = config.get('CIC_RUN_DIR')
    logg.info('default token set to {} {}'.format(BaseTask.default_token_symbol, BaseTask.default_token_address))
--- a/apps/cic-eth/cic_eth/runnable/tag.py
+++ b/apps/cic-eth/cic_eth/runnable/tag.py
@@ -18,7 +18,7 @@ from cic_eth.db.models.base import SessionBase
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

-arg_flags = cic_eth.cli.argflag_std_base | cic_eth.cli.Flag.UNSAFE | cic_eth.cli.Flag.CHAIN_SPEC
+arg_flags = cic_eth.cli.argflag_std_base
 local_arg_flags = cic_eth.cli.argflag_local_taskcallback
 argparser = cic_eth.cli.ArgumentParser(arg_flags)
 argparser.add_positional('tag', type=str, help='address tag')
--- a/apps/cic-eth/cic_eth/task.py
+++ b/apps/cic-eth/cic_eth/task.py
@@ -13,6 +13,7 @@ from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.gas import RPCGasOracle
 from cic_eth_registry import CICRegistry
 from cic_eth_registry.error import UnknownContractError
+import liveness.linux

 # local imports
 from cic_eth.error import SeppukuError
@@ -28,7 +29,6 @@ class BaseTask(celery.Task):

    session_func = SessionBase.create_session
    call_address = ZERO_ADDRESS
-    trusted_addresses = []
    create_nonce_oracle = RPCNonceOracle
    create_gas_oracle = RPCGasOracle
    default_token_address = None
@@ -48,7 +48,6 @@ class BaseTask(celery.Task):

    def on_failure(self, exc, task_id, args, kwargs, einfo):
        if isinstance(exc, SeppukuError):
-            import liveness.linux
            liveness.linux.reset(rundir=self.run_dir)
            logg.critical(einfo)
            msg = 'received critical exception {}, calling shutdown'.format(str(exc))
--- a/apps/cic-eth/cic_eth/version.py
+++ b/apps/cic-eth/cic_eth/version.py
@@ -9,8 +9,8 @@ import semver
 version = (
        0,
        12,
-        5,
-        'alpha.1',
+        2,
+        'alpha.4',
        )

 version_object = semver.VersionInfo(
--- a/apps/cic-eth/doc/texinfo/configuration.texi
+++ b/apps/cic-eth/doc/texinfo/configuration.texi
@@ -1,6 +1,8 @@
@node cic-eth configuration
@section Configuration

+(refer to @code{cic-base} for a general overview of the config pipeline)
+
 Configuration parameters are grouped by configuration filename.


@@ -38,26 +40,7 @@ Boolean value. If set, the amount of available context for a task in the result

@subsection database

-@table @var
-@item host
-Database host
-@item port
-Database port
-@item name
-Database name
-@item user
-Database user
-@item password
-Database password
-@item engine
-The engine part of the dsn connection string (@code{postgresql} in @code{postgresql+psycopg2})
-@item driver
-The driver part of the dsn connection string (@code{psycopg2} in @code{postgresql+psycopg2})
-@item pool_size
-Connection pool size for database drivers that provide connection pooling
-@item debug
-Output actual sql queries to logs. Potentially very verbose
-@end table
+See ref cic-base when ready


@subsection eth
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -8,44 +8,30 @@ FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55

 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-ARG EXTRA_PIP_ARGS=""
 #RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
 #    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 \
+RUN --mount=type=cache,id=pip,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 \
    -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 \
+    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/docker/run_tests.sh
+++ b/apps/cic-eth/docker/run_tests.sh
@@ -1,11 +0,0 @@
-#! /bin/bash
-
-set -e
-
-pip install --extra-index-url https://pip.grassrootseconomics.net:8433 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
-r admin_requirements.txt \
-r services_requirements.txt \
-r test_requirements.txt  
-
-export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests
-
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,3 +1,3 @@
 celery==4.4.7
-chainlib>=0.0.10a3,<0.1.0
+chainlib-eth>=0.0.7a7,<0.1.0
 semver==2.13.0
--- a/apps/cic-eth/services_requirements.txt
+++ b/apps/cic-eth/services_requirements.txt
@@ -1,17 +1,15 @@
-chainqueue>=0.0.5a1,<0.1.0
-chainsyncer[sql]>=0.0.6a3,<0.1.0
+chainqueue>=0.0.3a2,<0.1.0
+chainsyncer[sql]>=0.0.6a1,<0.1.0
 alembic==1.4.2
 confini>=0.3.6rc4,<0.5.0
 redis==3.5.3
-hexathon~=0.0.1a8
+hexathon~=0.0.1a7
 pycryptodome==3.10.1
 liveness~=0.0.1a7
-eth-address-index>=0.2.4a1,<0.3.0
-eth-accounts-index>=0.1.2a3,<0.2.0
-cic-eth-registry>=0.6.1a5,<0.7.0
-erc20-faucet>=0.3.2a2,<0.4.0
-erc20-transfer-authorization>=0.3.5a2,<0.4.0
-sarafu-faucet>=0.0.7a2,<0.1.0
+eth-address-index>=0.1.4a1,<0.2.0
+eth-accounts-index>=0.0.14a1,<0.1.0
+cic-eth-registry>=0.5.8a1,<0.6.0
+erc20-faucet>=0.2.4a2,<0.3.0
+erc20-transfer-authorization>=0.3.4a1,<0.4.0
+sarafu-faucet>=0.0.5a2,<0.1.0
 moolb~=0.1.1b2
-chainlib-eth>=0.0.10a2,<0.1.0
-okota>=0.2.4a6,<0.3.0
--- a/apps/cic-eth/test_requirements.txt
+++ b/apps/cic-eth/test_requirements.txt
@@ -6,4 +6,4 @@ pytest-redis==2.0.0
 redis==3.5.3
 eth-tester==0.5.0b3
 py-evm==0.3.0a20
-eth-erc20~=0.1.2a2
+eth-erc20~=0.0.12a1
--- a/apps/cic-eth/tests/filters/test_callback_filter.py
+++ b/apps/cic-eth/tests/filters/test_callback_filter.py
@@ -18,10 +18,7 @@ from eth_erc20 import ERC20
 from sarafu_faucet import MinterFaucet
 from eth_accounts_index.registry import AccountRegistry
 from potaahto.symbols import snake_and_camel
-from hexathon import (
-        add_0x,
-        strip_0x,
-        )
+from hexathon import add_0x

 # local imports
 from cic_eth.runnable.daemons.filters.callback import CallbackFilter
@@ -163,7 +160,7 @@ def test_faucet_gift_to_tx(
    assert transfer_data['token_address'] == foo_token


-def test_callback_filter_filter(
+def test_callback_filter(
        default_chain_spec,
        init_database,
        eth_rpc,
@@ -203,7 +200,6 @@ def test_callback_filter_filter(
    assert r['status'] == 1

    rcpt = snake_and_camel(r)
-    tx.block.hash = rcpt['block_hash']
    tx.apply_receipt(rcpt)

    fltr = CallbackFilter(default_chain_spec, None, None, caller_address=contract_roles['CONTRACT_DEPLOYER'])
@@ -216,7 +212,6 @@ def test_callback_filter_filter(

        def call_back(self, transfer_type, result):
            self.results[transfer_type] = result
-            logg.debug('result {}'.format(result))
            return self

    mock = CallbackMock()
@@ -225,4 +220,4 @@ def test_callback_filter_filter(
    fltr.filter(eth_rpc, mockblock, tx, init_database)

    assert mock.results.get('transfer') != None
-    assert mock.results['transfer']['destination_token'] == strip_0x(foo_token)
+    assert mock.results['transfer']['destination_token'] == foo_token
--- a/apps/cic-eth/tests/filters/test_gas_filter.py
+++ b/apps/cic-eth/tests/filters/test_gas_filter.py
@@ -1,6 +1,7 @@
 # external imports
 from chainlib.connection import RPCConnection
 from chainlib.eth.nonce import OverrideNonceOracle
+from chainqueue.sql.tx import create as queue_create
 from chainlib.eth.tx import (
        TxFormat,
        unpack,
@@ -25,8 +26,6 @@ from chainqueue.db.enum import StatusBits
 # local imports
 from cic_eth.runnable.daemons.filters.gas import GasFilter
 from cic_eth.eth.gas import cache_gas_data
-from cic_eth.encode import tx_normalize
-from cic_eth.queue.tx import queue_create


 def test_filter_gas(
--- a/apps/cic-eth/tests/filters/test_register_filter.py
+++ b/apps/cic-eth/tests/filters/test_register_filter.py
@@ -17,18 +17,15 @@ from chainlib.eth.block import (
        block_by_number,
        Block,
        )
-from chainlib.eth.address import (
-        to_checksum_address,
-        )
 from erc20_faucet import Faucet
 from hexathon import (
        strip_0x,
        add_0x,
        )
+from chainqueue.sql.query import get_account_tx

 # local imports
 from cic_eth.runnable.daemons.filters.register import RegistrationFilter
-from cic_eth.queue.query import get_account_tx_local

 logg = logging.getLogger()

@@ -72,18 +69,17 @@ def test_register_filter(
    tx = Tx(tx_src, block=block, rcpt=rcpt)
    tx.apply_receipt(rcpt)

-    fltr = RegistrationFilter(default_chain_spec, to_checksum_address(os.urandom(20).hex()), queue=None)
+    fltr = RegistrationFilter(default_chain_spec, add_0x(os.urandom(20).hex()), queue=None)
    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
    assert t == None

-    fltr = RegistrationFilter(default_chain_spec, to_checksum_address(account_registry), queue=None)
+    fltr = RegistrationFilter(default_chain_spec, account_registry, queue=None)
    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)
-    logg.debug('t {}'.format(t))

    t.get_leaf()
    assert t.successful()

-    gift_txs = get_account_tx_local(default_chain_spec, agent_roles['ALICE'], as_sender=True, session=init_database)
+    gift_txs = get_account_tx(default_chain_spec.asdict(), agent_roles['ALICE'], as_sender=True, session=init_database)
    ks = list(gift_txs.keys())
    assert len(ks) == 1

@@ -92,4 +88,4 @@ def test_register_filter(
    gift_tx = unpack(tx_raw_signed_bytes, default_chain_spec)

    gift = Faucet.parse_give_to_request(gift_tx['data'])
-    assert add_0x(gift[0]) == agent_roles['ALICE']
+    assert gift[0] == agent_roles['ALICE']
--- a/apps/cic-eth/tests/filters/test_transferauth_filter.py
+++ b/apps/cic-eth/tests/filters/test_transferauth_filter.py
@@ -19,7 +19,6 @@ from chainqueue.sql.query import get_account_tx

 # local imports
 from cic_eth.runnable.daemons.filters.transferauth import TransferAuthFilter
-from cic_eth.encode import tx_normalize


 def test_filter_transferauth(
@@ -67,8 +66,7 @@ def test_filter_transferauth(
    t.get_leaf()
    assert t.successful()

-    #approve_txs = get_account_tx(default_chain_spec.asdict(), agent_roles['ALICE'], as_sender=True, session=init_database)
-    approve_txs = get_account_tx(default_chain_spec.asdict(), tx_normalize.wallet_address(agent_roles['ALICE']), as_sender=True, session=init_database)
+    approve_txs = get_account_tx(default_chain_spec.asdict(), agent_roles['ALICE'], as_sender=True, session=init_database)
    ks = list(approve_txs.keys())
    assert len(ks) == 1

@@ -78,4 +76,4 @@ def test_filter_transferauth(

    c = ERC20(default_chain_spec)
    approve = c.parse_approve_request(approve_tx['data']) 
-    assert approve[0] == strip_0x(agent_roles['BOB'])
+    assert approve[0] == agent_roles['BOB']
--- a/apps/cic-eth/tests/run_tests.sh
+++ b/apps/cic-eth/tests/run_tests.sh
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-set -e
-
-pip install --extra-index-url https://pip.grassrootseconomics.net:8433 --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
-r admin_requirements.txt
-r services_requirements.txt
-r test_requirements.txt 
-
-export PYTHONPATH=. && pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests
--- a/apps/cic-eth/tests/task/api/test_admin.py
+++ b/apps/cic-eth/tests/task/api/test_admin.py
@@ -34,6 +34,10 @@ from chainqueue.sql.state import (
        set_ready,
        set_reserved,
        )
+from chainqueue.sql.query import (
+        get_tx,
+        get_nonce_tx_cache,
+        )

 # local imports
 from cic_eth.api.admin import AdminApi
@@ -42,11 +46,6 @@ from cic_eth.db.enum import LockEnum
 from cic_eth.error import InitializationError
 from cic_eth.eth.gas import cache_gas_data
 from cic_eth.queue.tx import queue_create
-from cic_eth.queue.query import (
-        get_tx,
-        get_nonce_tx_local,
-        )
-from cic_eth.encode import tx_normalize

 logg = logging.getLogger()

@@ -110,8 +109,8 @@ def test_tag_account(
    t = api.tag_account('bar', agent_roles['CAROL'], default_chain_spec)
    t.get()

-    assert AccountRole.get_address('foo', init_database) == tx_normalize.wallet_address(agent_roles['ALICE'])
-    assert AccountRole.get_address('bar', init_database) == tx_normalize.wallet_address(agent_roles['CAROL'])
+    assert AccountRole.get_address('foo', init_database) == agent_roles['ALICE']
+    assert AccountRole.get_address('bar', init_database) == agent_roles['CAROL']


 def test_tx(
@@ -287,15 +286,13 @@ def test_fix_nonce(
    assert t.successful()

    init_database.commit()
-   
-    logg.debug('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
-    txs = get_nonce_tx_local(default_chain_spec, 3, agent_roles['ALICE'], session=init_database)
+    
+    txs = get_nonce_tx_cache(default_chain_spec, 3, agent_roles['ALICE'], session=init_database)
    ks = txs.keys()
    assert len(ks) == 2

    for k in ks:
-        #hsh = add_0x(k)
-        hsh = tx_normalize.tx_hash(k)
+        hsh = add_0x(k)
        otx = Otx.load(hsh, session=init_database)
        init_database.refresh(otx)
        logg.debug('checking nonce {} tx {} status {}'.format(3, otx.tx_hash, otx.status))
--- a/apps/cic-eth/tests/task/api/test_admin_noncritical.py
+++ b/apps/cic-eth/tests/task/api/test_admin_noncritical.py
@@ -30,6 +30,7 @@ from chainqueue.sql.state import (
        )
 from chainqueue.db.models.otx import Otx
 from chainqueue.db.enum import StatusBits
+from chainqueue.sql.query import get_nonce_tx_cache
 from eth_erc20 import ERC20
 from cic_eth_registry import CICRegistry

@@ -37,7 +38,6 @@ from cic_eth_registry import CICRegistry
 from cic_eth.api.admin import AdminApi
 from cic_eth.eth.gas import cache_gas_data
 from cic_eth.eth.erc20 import cache_transfer_data
-from cic_eth.queue.query import get_nonce_tx_local

 logg = logging.getLogger()

@@ -312,7 +312,7 @@ def test_resend_inplace(
    otx = Otx.load(tx_hash_hex, session=init_database)
    assert otx.status & StatusBits.OBSOLETE == StatusBits.OBSOLETE

-    txs = get_nonce_tx_local(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database)
+    txs = get_nonce_tx_cache(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database)
    assert len(txs) == 2


@@ -363,10 +363,10 @@ def test_resend_clone(
    assert otx.status & StatusBits.IN_NETWORK == StatusBits.IN_NETWORK
    assert otx.status & StatusBits.OBSOLETE == StatusBits.OBSOLETE

-    txs = get_nonce_tx_local(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database)
+    txs = get_nonce_tx_cache(default_chain_spec, otx.nonce, agent_roles['ALICE'], session=init_database)
    assert len(txs) == 1

-    txs = get_nonce_tx_local(default_chain_spec, otx.nonce + 1, agent_roles['ALICE'], session=init_database)
+    txs = get_nonce_tx_cache(default_chain_spec, otx.nonce + 1, agent_roles['ALICE'], session=init_database)
    assert len(txs) == 1

    otx = Otx.load(txs[0], session=init_database)
--- a/apps/cic-eth/tests/task/api/test_app.py
+++ b/apps/cic-eth/tests/task/api/test_app.py
@@ -10,7 +10,6 @@ from cic_eth_registry.erc20 import ERC20Token
 from chainlib.chain import ChainSpec
 from eth_accounts_index import AccountsIndex
 from chainlib.eth.tx import (
-        receipt,
        transaction,
        )
 from chainqueue.sql.state import (
@@ -30,7 +29,6 @@ def test_account_api(
        init_database,
        init_eth_rpc,
        account_registry,
-        cic_registry,
        custodial_roles,
        celery_session_worker,
        ):
@@ -51,7 +49,6 @@ def test_account_api_register(
        eth_rpc,
        celery_session_worker,
        ):
-
    api = Api(str(default_chain_spec), callback_param='accounts', callback_task='cic_eth.callbacks.noop.noop', queue=None)
    t = api.create_account('')
    register_tx_hash = t.get_leaf()
@@ -72,18 +69,12 @@ def test_account_api_register(
    r = t.get_leaf()
    assert t.successful()

-    o = receipt(register_tx_hash)
-    r = eth_rpc.do(o)
-    assert r['status'] == 1
-
    o = transaction(register_tx_hash)
    tx_src = eth_rpc.do(o)

    c = AccountsIndex(default_chain_spec)
    address = c.parse_add_request(tx_src['data'])
-    logg.debug('address {} '.format(address))
    o = c.have(account_registry, address[0], sender_address=custodial_roles['CONTRACT_DEPLOYER'])
-    logg.debug('o {}'.format(o))
    r = eth_rpc.do(o)
    assert c.parse_have(r)

--- a/apps/cic-eth/tests/task/api/test_app_noncritical.py
+++ b/apps/cic-eth/tests/task/api/test_app_noncritical.py
@@ -1,27 +1,6 @@
-# standard imports
-import logging
-import os
-import uuid
-import time
-import mmap
-
-# external imports
-import celery
-import pytest
-from hexathon import (
-        strip_0x,
-        uniform as hex_uniform,
-        )
-
 # local imports
 from cic_eth.api.api_task import Api
 from cic_eth.task import BaseTask
-from cic_eth.error import TrustError
-from cic_eth.encode import tx_normalize
-from cic_eth.pytest.mock.callback import CallbackTask
-
-logg = logging.getLogger()
-

 def test_default_token(
        default_chain_spec,
@@ -38,175 +17,3 @@ def test_default_token(
    t = api.default_token()
    r = t.get_leaf()
    assert r['address'] == foo_token
-
-
-def test_to_v_list():
-    assert Api.to_v_list('', 0) == []
-    assert Api.to_v_list([], 0) == []
-    assert Api.to_v_list('foo', 1) == [['foo']]
-    assert Api.to_v_list(['foo'], 1) == [['foo']]
-    assert Api.to_v_list(['foo', 'bar'], 2) == [['foo'], ['bar']]
-    assert Api.to_v_list('foo', 3) == [['foo'], ['foo'], ['foo']]
-    assert Api.to_v_list([['foo'], ['bar']], 2) == [['foo'], ['bar']]
-    with pytest.raises(ValueError):
-        Api.to_v_list([['foo'], ['bar']], 3)
-    with pytest.raises(ValueError):
-        Api.to_v_list(['foo', 'bar'], 3)
-    with pytest.raises(ValueError):
-        Api.to_v_list([['foo'], ['bar'], ['baz']], 2)
-
-    assert Api.to_v_list([
-            ['foo'],
-            'bar',
-            ['inky', 'pinky', 'blinky', 'clyde'],
-        ], 3) == [
-            ['foo'],
-            ['bar'],
-            ['inky', 'pinky', 'blinky', 'clyde'],
-            ]
-
-
-def test_token_single(
-        default_chain_spec,
-        foo_token,
-        bar_token,
-        token_registry,
-        register_tokens,
-        register_lookups,
-        cic_registry,
-        init_database,
-        init_celery_tasks,
-        custodial_roles,
-        foo_token_declaration,
-        bar_token_declaration,
-        celery_session_worker,
-        ):
-
-    api = Api(str(default_chain_spec), queue=None, callback_param='foo')     
-
-    t = api.token('FOO', proof=None)
-    r = t.get()
-    logg.debug('rr {}'.format(r))
-    assert len(r) == 1
-    assert r[0]['address'] == strip_0x(foo_token)
-
-
-    t = api.token('FOO', proof=foo_token_declaration)
-    r = t.get()
-    assert len(r) == 1
-    assert r[0]['address'] == strip_0x(foo_token)
-
-
-def test_tokens_noproof(
-        default_chain_spec,
-        foo_token,
-        bar_token,
-        token_registry,
-        register_tokens,
-        register_lookups,
-        cic_registry,
-        init_database,
-        init_celery_tasks,
-        custodial_roles,
-        foo_token_declaration,
-        bar_token_declaration,
-        celery_worker,
-        ):
-
-    api = Api(str(default_chain_spec), queue=None, callback_param='foo')     
-
-    t = api.tokens(['FOO'], proof=[])
-    r = t.get()
-    assert len(r) == 1
-    assert r[0]['address'] == strip_0x(foo_token)
-
-    t = api.tokens(['BAR'], proof='')
-    r = t.get()
-    assert len(r) == 1
-    assert r[0]['address'] == strip_0x(bar_token)
-
-    t = api.tokens(['FOO'], proof=None)
-    r = t.get()
-    assert len(r) == 1
-    assert r[0]['address'] == strip_0x(foo_token)
-
-
-def test_tokens(
-        default_chain_spec,
-        foo_token,
-        bar_token,
-        token_registry,
-        register_tokens,
-        register_lookups,
-        cic_registry,
-        init_database,
-        init_celery_tasks,
-        custodial_roles,
-        foo_token_declaration,
-        bar_token_declaration,
-        celery_session_worker,
-        ):
-
-    api = Api(str(default_chain_spec), queue=None, callback_param='foo')     
-
-    t = api.tokens(['FOO'], proof=[[foo_token_declaration]])
-    r = t.get()
-    logg.debug('rr {}'.format(r))
-    assert len(r) == 1
-    assert r[0]['address'] == strip_0x(foo_token)
-    
-    t = api.tokens(['BAR', 'FOO'], proof=[[bar_token_declaration], [foo_token_declaration]])
-    r = t.get()
-    logg.debug('results {}'.format(r))
-    assert len(r) == 2
-    assert r[1]['address'] == strip_0x(foo_token)
-    assert r[0]['address'] == strip_0x(bar_token)
-
-    celery_app = celery.current_app
-
-    results = []
-    targets = []
-
-    api_param = str(uuid.uuid4())
-    api = Api(str(default_chain_spec), queue=None, callback_param=api_param, callback_task='cic_eth.pytest.mock.callback.test_callback')
-    bogus_proof = os.urandom(32).hex()
-    t = api.tokens(['FOO'], proof=[[bogus_proof]])
-    r = t.get()
-    logg.debug('r {}'.format(r))
-
-    while True:
-        fp = os.path.join(CallbackTask.mmap_path, api_param)
-        try:
-            f = open(fp, 'rb')
-        except FileNotFoundError:
-            time.sleep(0.1)
-            logg.debug('look for {}'.format(fp))
-            continue
-        f = open(fp, 'rb')
-        m = mmap.mmap(f.fileno(), access=mmap.ACCESS_READ, length=1)
-        v = m.read(1)
-        m.close()
-        f.close()
-        assert v == b'\x01'
-        break
-
-    api_param = str(uuid.uuid4())
-    api = Api(str(default_chain_spec), queue=None, callback_param=api_param, callback_task='cic_eth.pytest.mock.callback.test_callback')
-    t = api.tokens(['BAR'], proof=[[bar_token_declaration]])
-    r = t.get()
-    logg.debug('rr  {} {}'.format(r, t.children))
-
-    while True:
-        fp = os.path.join(CallbackTask.mmap_path, api_param)
-        try:
-            f = open(fp, 'rb')
-        except FileNotFoundError:
-            time.sleep(0.1)
-            continue
-        m = mmap.mmap(f.fileno(), access=mmap.ACCESS_READ, length=1)
-        v = m.read(1)
-        m.close()
-        f.close()
-        assert v == b'\x00'
-        break
-
--- a/apps/cic-eth/tests/task/api/test_balance.py
+++ b/apps/cic-eth/tests/task/api/test_balance.py
@@ -3,22 +3,18 @@ import os
 import logging

 # external imports
-import pytest
 from chainlib.eth.address import to_checksum_address
-from hexathon import add_0x

 # local imports
 from cic_eth.api.api_task import Api

 logg = logging.getLogger()

-
 def test_balance_simple_api(
        default_chain_spec,
        init_database,
        cic_registry,
        foo_token,
-        register_lookups,
        register_tokens,
        api,
        celery_session_worker,
@@ -26,7 +22,7 @@ def test_balance_simple_api(

    chain_str = str(default_chain_spec)

-    a = add_0x(to_checksum_address(os.urandom(20).hex()))
+    a = to_checksum_address('0x' + os.urandom(20).hex())
    t = api.balance(a, 'FOO', include_pending=False)
    r = t.get_leaf()
    assert t.successful()
@@ -40,7 +36,6 @@ def test_balance_complex_api(
        init_database,
        cic_registry,
        foo_token,
-        register_lookups,
        register_tokens,
        api,
        celery_session_worker,
@@ -48,7 +43,7 @@ def test_balance_complex_api(

    chain_str = str(default_chain_spec)

-    a = add_0x(to_checksum_address(os.urandom(20).hex()))
+    a = to_checksum_address('0x' + os.urandom(20).hex())
    t = api.balance(a, 'FOO', include_pending=True)
    r = t.get_leaf()
    assert t.successful()
--- a/apps/cic-eth/tests/task/api/test_list.py
+++ b/apps/cic-eth/tests/task/api/test_list.py
@@ -6,7 +6,6 @@ import pytest
 from chainlib.eth.nonce import RPCNonceOracle
 from eth_erc20 import ERC20
 from chainlib.eth.tx import receipt
-from hexathon import strip_0x

 # local imports
 from cic_eth.api.api_task import Api
@@ -24,6 +23,7 @@ from cic_eth.pytest.mock.filter import (
 logg = logging.getLogger()


+@pytest.mark.xfail()
 def test_list_tx(
        default_chain_spec,
        init_database,
@@ -34,10 +34,8 @@ def test_list_tx(
        agent_roles,
        foo_token,
        register_tokens,
-        register_lookups,
        init_eth_tester,
        celery_session_worker,
-        init_celery_tasks,
        ):

    tx_hashes = []
@@ -65,16 +63,13 @@ def test_list_tx(
    o = receipt(tx_hash_hex)
    r = eth_rpc.do(o)
    assert r['status'] == 1
-
    a = r['block_number']
-    ab = a.to_bytes(4, 'big')
-    block_filter.add(ab)
+    block_filter.add(a.to_bytes(4, 'big'))

-    bb = r['transaction_index'].to_bytes(4, 'big')
-    cb = ab + bb
-    tx_filter.add(cb)
+    a = r['block_number'] + r['transaction_index']
+    tx_filter.add(a.to_bytes(4, 'big'))

-    tx_hashes.append(strip_0x(tx_hash_hex))
+    tx_hashes.append(tx_hash_hex)

    # external tx two
    Nonce.next(agent_roles['ALICE'], 'foo', session=init_database)
@@ -88,29 +83,26 @@ def test_list_tx(
    o = receipt(tx_hash_hex)
    r = eth_rpc.do(o)
    assert r['status'] == 1
-
    a = r['block_number']
-    ab = a.to_bytes(4, 'big')
-    block_filter.add(ab)
+    block_filter.add(a.to_bytes(4, 'big'))

-    bb = r['transaction_index'].to_bytes(4, 'big')
-    cb = ab + bb
-    tx_filter.add(cb)
+    a = r['block_number'] + r['transaction_index']
+    tx_filter.add(a.to_bytes(4, 'big'))

-    tx_hashes.append(strip_0x(tx_hash_hex))
+    tx_hashes.append(tx_hash_hex)

    init_eth_tester.mine_blocks(28)

    # custodial tx 1
    api = Api(str(default_chain_spec), queue=None)
-    t = api.transfer(agent_roles['ALICE'], agent_roles['CAROL'], 64, 'FOO')
+    t = api.transfer(agent_roles['ALICE'], agent_roles['CAROL'], 64, 'FOO') #, 'blinky')
    r = t.get_leaf()
    assert t.successful()
    tx_hashes.append(r)

    # custodial tx 2
    api = Api(str(default_chain_spec), queue=None)
-    t = api.transfer(agent_roles['ALICE'], agent_roles['DAVE'], 16, 'FOO')
+    t = api.transfer(agent_roles['ALICE'], agent_roles['DAVE'], 16, 'FOO') #, 'blinky')
    r = t.get_leaf()
    assert t.successful()
    tx_hashes.append(r)
@@ -125,8 +117,7 @@ def test_list_tx(
    assert len(r) == 3
    logg.debug('rrrr {}'.format(r))

-    logg.debug('testing against hashes {}'.format(tx_hashes))
    for tx in r:
        logg.debug('have tx {}'.format(tx))
-        tx_hashes.remove(strip_0x(tx['hash']))
+        tx_hashes.remove(tx['hash'])
    assert len(tx_hashes) == 1
--- a/apps/cic-eth/tests/task/test_ext_tx.py
+++ b/apps/cic-eth/tests/task/test_ext_tx.py
@@ -10,7 +10,6 @@ from chainlib.eth.tx import (
        )
 from eth_erc20 import ERC20
 from chainlib.eth.nonce import RPCNonceOracle
-from hexathon import add_0x 

 # local imports
 from cic_eth.db.models.nonce import (
@@ -92,5 +91,5 @@ def test_filter_process(

    assert len(r) == 2
    for tx_hash in r.keys():
-        tx_hashes.remove(add_0x(tx_hash))
+        tx_hashes.remove(tx_hash)
    assert len(tx_hashes) == 0
--- a/apps/cic-eth/tests/task/test_task_gas.py
+++ b/apps/cic-eth/tests/task/test_task_gas.py
@@ -21,6 +21,7 @@ from chainlib.eth.constant import (
        MINIMUM_FEE_UNITS,
        MINIMUM_FEE_PRICE,
        )
+from chainqueue.sql.tx import create as queue_create
 from chainqueue.sql.query import get_tx
 from chainqueue.db.enum import StatusBits
 from chainqueue.sql.state import (
@@ -34,7 +35,6 @@ from hexathon import strip_0x
 # local imports
 from cic_eth.eth.gas import cache_gas_data
 from cic_eth.error import OutOfGasError
-from cic_eth.queue.tx import queue_create

 logg = logging.getLogger()

@@ -75,7 +75,7 @@ def test_task_check_gas_ok(
            'cic_eth.eth.gas.check_gas',
            [
                [
-                    strip_0x(tx_hash_hex),
+                    tx_hash_hex,
                    ],
                default_chain_spec.asdict(),
                [],
@@ -283,3 +283,4 @@ def test_task_resend_explicit(
    tx_after = unpack(bytes.fromhex(strip_0x(otx.signed_tx)), default_chain_spec)
    logg.debug('gasprices before {} after {}'.format(tx_before['gasPrice'], tx_after['gasPrice']))
    assert tx_after['gasPrice'] > tx_before['gasPrice']
+
--- a/apps/cic-eth/tests/task/test_task_list.py
+++ b/apps/cic-eth/tests/task/test_task_list.py
@@ -51,7 +51,6 @@ def test_ext_tx_collate(
        tx_hash_hex,
        tx_signed_raw_hex,
        )
-    otx.block = 666
    init_database.add(otx)
    init_database.commit()

--- a/apps/cic-eth/tests/unit/admin/test_default_token.py
+++ b/apps/cic-eth/tests/unit/admin/test_default_token.py
@@ -10,7 +10,7 @@ def test_default_token(
        ):
      
    s = celery.signature(
-            'cic_eth.eth.erc20.default_token',
+            'cic_eth.admin.token.default_token',
            [],
            queue=None,
            )
--- a/apps/cic-eth/tests/unit/db/test_tx.py
+++ b/apps/cic-eth/tests/unit/db/test_tx.py
@@ -46,7 +46,6 @@ def test_set(
        tx_hash_hex,
        tx_signed_raw_hex,
        )
-    otx.block = 666
    init_database.add(otx)
    init_database.commit()

@@ -75,6 +74,7 @@ def test_set(
    assert (tx_stored.destination_token_address == ZERO_ADDRESS)
    assert (tx_stored.from_value == tx['value'])
    assert (tx_stored.to_value == to_value)
+    assert (tx_stored.block_number == 666)
    assert (tx_stored.tx_index == 13)


--- a/apps/cic-eth/tests/unit/queue/test_balances.py
+++ b/apps/cic-eth/tests/unit/queue/test_balances.py
@@ -13,7 +13,6 @@ from cic_eth.queue.balance import (
        balance_incoming,
        assemble_balances,
        )
-from cic_eth.encode import tx_normalize

 logg = logging.getLogger()

@@ -52,8 +51,8 @@ def test_assemble():
    r = assemble_balances(b)
    logg.debug('r {}'.format(r))

-    assert r[0]['address'] == tx_normalize.executable_address(token_foo)
-    assert r[1]['address'] == tx_normalize.executable_address(token_bar)
+    assert r[0]['address'] == token_foo
+    assert r[1]['address'] == token_bar
    assert r[0].get('balance_foo') != None
    assert r[0].get('balance_bar') != None
    assert r[1].get('balance_baz') != None
@@ -75,11 +74,11 @@ def test_outgoing_balance(
    token_address = '0x' + os.urandom(20).hex()
    sender = '0x' + os.urandom(20).hex()
    txc = TxCache(
-            tx_normalize.tx_hash(tx_hash),
-            tx_normalize.wallet_address(sender),
-            tx_normalize.wallet_address(recipient),
-            tx_normalize.executable_address(token_address),
-            tx_normalize.executable_address(token_address),
+            tx_hash,
+            sender,
+            recipient,
+            token_address,
+            token_address,
            1000,
            1000,
            session=init_database,
@@ -126,11 +125,11 @@ def test_incoming_balance(
    token_address = '0x' + os.urandom(20).hex()
    sender = '0x' + os.urandom(20).hex()
    txc = TxCache(
-            tx_normalize.tx_hash(tx_hash),
-            tx_normalize.wallet_address(sender),
-            tx_normalize.wallet_address(recipient),
-            tx_normalize.executable_address(token_address),
-            tx_normalize.executable_address(token_address),
+            tx_hash,
+            sender,
+            recipient,
+            token_address,
+            token_address,
            1000,
            1000,
            session=init_database,
--- a/apps/cic-eth/tests/unit/queue/test_query.py
+++ b/apps/cic-eth/tests/unit/queue/test_query.py
@@ -21,7 +21,6 @@ from cic_eth.db.models.lock import Lock
 from cic_eth.queue.query import get_upcoming_tx
 from cic_eth.queue.tx import register_tx
 from cic_eth.eth.gas import cache_gas_data
-from cic_eth.encode import tx_normalize

 # test imports
 from tests.util.nonce import StaticNonceOracle
@@ -40,8 +39,8 @@ def test_upcoming_with_lock(
    gas_oracle = RPCGasOracle(eth_rpc)
    c = Gas(default_chain_spec, signer=eth_signer, nonce_oracle=nonce_oracle, gas_oracle=gas_oracle)

-    alice_normal = tx_normalize.wallet_address(agent_roles['ALICE'])
-    bob_normal = tx_normalize.wallet_address(agent_roles['BOB'])
+    alice_normal = add_0x(hex_uniform(strip_0x(agent_roles['ALICE'])))
+    bob_normal = add_0x(hex_uniform(strip_0x(agent_roles['BOB'])))

    (tx_hash_hex, tx_rpc) = c.create(alice_normal, bob_normal, 100 * (10 ** 6))
    tx_signed_raw_hex = tx_rpc['params'][0]
--- a/apps/cic-eth/tests/unit/queue/test_queue_lock.py
+++ b/apps/cic-eth/tests/unit/queue/test_queue_lock.py
@@ -9,7 +9,7 @@ from cic_eth.db.models.lock import Lock
 from cic_eth.db.enum import LockEnum
 from cic_eth.error import LockedError
 from cic_eth.queue.tx import queue_create
-from cic_eth.encode import tx_normalize
+

 def test_queue_lock(
    init_database,
@@ -21,8 +21,6 @@ def test_queue_lock(
    address = '0x' + os.urandom(20).hex()
    tx_hash = '0x' + os.urandom(32).hex()
    tx_raw = '0x' + os.urandom(128).hex()
-    address_normal = tx_normalize.wallet_address(address)
-    tx_hash_normal = tx_normalize.tx_hash(tx_hash)

    Lock.set(chain_str, LockEnum.QUEUE)
    with pytest.raises(LockedError):
@@ -34,7 +32,7 @@ def test_queue_lock(
                tx_raw,
                )

-    Lock.set(chain_str, LockEnum.QUEUE, address=address_normal)
+    Lock.set(chain_str, LockEnum.QUEUE, address=address)
    with pytest.raises(LockedError):
        queue_create(
                default_chain_spec,
@@ -54,7 +52,7 @@ def test_queue_lock(
                tx_raw,
                )

-    Lock.set(chain_str, LockEnum.QUEUE, address=address_normal, tx_hash=tx_hash_normal)
+    Lock.set(chain_str, LockEnum.QUEUE, address=address, tx_hash=tx_hash)
    with pytest.raises(LockedError):
        queue_create(
                default_chain_spec,
@@ -63,3 +61,5 @@ def test_queue_lock(
                tx_hash,
                tx_raw,
                )
+
+
--- a/apps/cic-eth/tools_requirements.txt
+++ b/apps/cic-eth/tools_requirements.txt
@@ -1,7 +1,8 @@
-chainqueue>=0.0.6a1,<0.1.0
-cic-eth-registry>=0.6.1a5,<0.7.0
+crypto-dev-signer>=0.4.14b7,<=0.4.14
+chainqueue>=0.0.3a1,<0.1.0
+confini>=0.3.6rc4,<0.5.0
+cic-eth-registry>=0.5.8a1,<0.6.0
 redis==3.5.3
-hexathon~=0.0.1a8
+hexathon~=0.0.1a7
 pycryptodome==3.10.1
 pyxdg==0.27
-chainlib-eth>=0.0.10a2,<0.1.0
--- a/apps/cic-meta/.gitlab-ci.yml
+++ b/apps/cic-meta/.gitlab-ci.yml
@@ -1,15 +1,35 @@
-build-test-cic-meta:
-  stage: test
-  tags:
-   - integration
-  variables:
-    APP_NAME: cic-meta
-    MR_IMAGE_TAG: mr-$APP_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-  script:
-    - 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:
+
+.cic_meta_variables:
+    variables:
+        APP_NAME: cic-meta
+        DOCKERFILE_PATH: docker/Dockerfile_ci
+        CONTEXT: apps/$APP_NAME
+
+        #build-mr-cic-meta:
+        #    extends:
+        #        - .py_build_merge_request
+        #        - .cic_meta_variables
+        #    rules:
+        #    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+        #      changes:
+        #          - apps/cic-meta/**/*
+        #      when: always
+
+test-mr-cic-meta:
+    stage: test
+    tags:
+      - integration
+    extends:
+        - .cic_meta_variables
+    image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG 
+    script:
+        - cd /root
+        - npm install --dev 
+        - npm run test
+        - npm run test:coverage
+    allow_failure: true
+    needs: ["build-merge-request"]
+    rules:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
      changes:
          - apps/$APP_NAME/**/*
--- a/apps/cic-meta/README.md
+++ b/apps/cic-meta/README.md
@@ -1 +0,0 @@
-# CIC-Meta
--- a/apps/cic-meta/docker/Dockerfile
+++ b/apps/cic-meta/docker/Dockerfile
@@ -8,17 +8,18 @@ RUN apk add --no-cache postgresql bash

 # copy the dependencies
 COPY package.json package-lock.json .
-RUN --mount=type=cache,mode=0755,target=/root/.npm \
+RUN --mount=type=cache,id=npm,mode=0755,target=/root/.npm \
    npm set cache /root/.npm && \
    npm ci

 COPY webpack.config.js .
 COPY tsconfig.json . 
 ## required to build the cic-client-meta module
-COPY . .
+COPY src/ src/
+COPY scripts/ scripts/
+COPY tests/ tests/
 COPY tests/*.asc /root/pgp/

-
 ## copy runtime configs
 COPY .config/ /usr/local/etc/cic-meta/
 #
--- a/apps/cic-meta/docker/run_tests.sh
+++ b/apps/cic-meta/docker/run_tests.sh
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-set -e
-
-npm install --dev 
-npm run test
-npm run test:coverage
--- a/apps/cic-notify/.gitlab-ci.yml
+++ b/apps/cic-notify/.gitlab-ci.yml
@@ -1,17 +1,41 @@
-build-test-cic-notify:
-  stage: test
-  tags:
-    - integration
-  variables:
-    APP_NAME: cic-notify
-    MR_IMAGE_TAG: mr-$APP_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA
-  script:
-    - cd apps/cic-notify
-    - docker build -t $MR_IMAGE_TAG -f docker/Dockerfile . 
-    - docker run $MR_IMAGE_TAG sh docker/run_tests.sh
-  allow_failure: true
-  rules:
-  - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-    changes:
-        - apps/$APP_NAME/**/*
-    when: always
+.cic_notify_variables:
+    variables:
+        APP_NAME: cic-notify
+
+        #build-mr-cic-notify:
+        #    extends:
+        #        - .py_build_merge_request
+        #        - .cic_notify_variables
+        #    rules:
+        #    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+        #      changes:
+        #          - apps/cic-notify/**/*
+        #      when: always
+
+test-mr-cic-notify:
+    stage: test
+    tags:
+     - integration
+    extends:
+     - .cic_notify_variables
+    cache:
+      key:
+        files:
+        - test_requirements.txt
+      paths:
+      - /root/.cache/pip
+    image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/$APP_NAME:$MR_IMAGE_TAG
+    script:
+        - cd apps/$APP_NAME/
+        - >
+          pip install --extra-index-url https://pip.grassrootseconomics.net:8433
+          --extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple
+          -r test_requirements.txt 
+        - export PYTHONPATH=. && pytest -x --cov=cic_notify --cov-fail-under=90 --cov-report term-missing tests
+    allow_failure: true
+    needs: ["build-merge-request"]
+    rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+          - apps/$APP_NAME/**/*
+      when: always
--- a/apps/cic-notify/cic_notify/tasks/sms/db.py
+++ b/apps/cic-notify/cic_notify/tasks/sms/db.py
@@ -11,12 +11,12 @@ celery_app = celery.current_app


@celery_app.task
-def persist_notification(message, recipient):
+def persist_notification(recipient, message):
    """
-    :param message:
-    :type message:
    :param recipient:
    :type recipient:
+    :param message:
+    :type message:
    :return:
    :rtype:
    """
--- a/apps/cic-notify/cic_notify/tasks/sms/log.py
+++ b/apps/cic-notify/cic_notify/tasks/sms/log.py
@@ -11,13 +11,12 @@ local_logg = logging.getLogger(__name__)


@celery_app.task
-def log(message, recipient):
+def log(recipient, message):
    """
-
-    :param message:
-    :type message:
    :param recipient:
    :type recipient:
+    :param message:
+    :type message:
    :return:
    :rtype:
    """
--- a/apps/cic-notify/docker/Dockerfile
+++ b/apps/cic-notify/docker/Dockerfile
@@ -7,7 +7,7 @@ ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
 COPY requirements.txt .

-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
+RUN --mount=type=cache,id=pip,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 \
    -r requirements.txt
--- a/apps/cic-notify/docker/run_tests.sh
+++ b/apps/cic-notify/docker/run_tests.sh
@@ -1,9 +0,0 @@
-#! /bin/bash
-
-set -e
-
-pip install --extra-index-url https://pip.grassrootseconomics.net:8433 \
--extra-index-url https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple \
-r test_requirements.txt 
-
-export PYTHONPATH=. && pytest -x --cov=cic_notify --cov-fail-under=90 --cov-report term-missing tests
--- a/apps/cic-staff-client/.browserslistrc
+++ b/apps/cic-staff-client/.browserslistrc
@@ -0,0 +1,18 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
--- a/apps/cic-staff-client/.dockerignore
+++ b/apps/cic-staff-client/.dockerignore
@@ -0,0 +1,3 @@
+.idea/
+dist/
+node_modules/
--- a/apps/cic-staff-client/.editorconfig
+++ b/apps/cic-staff-client/.editorconfig
@@ -0,0 +1,16 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
--- a/apps/cic-staff-client/.env.example
+++ b/apps/cic-staff-client/.env.example
@@ -0,0 +1,12 @@
+# Logging levels => TRACE = 0|DEBUG = 1|INFO = 2|LOG = 3|WARN = 4|ERROR = 5|FATAL = 6|OFF = 7
+LOG_LEVEL=
+SERVER_LOG_LEVEL=
+CIC_CHAIN_ID=
+CIC_LOGGING_URL=
+CIC_META_URL=
+CIC_KEYS_URL=
+CIC_CACHE_URL=
+CIC_WEB3_PROVIDER=
+CIC_USSD_URL=
+CIC_REGISTRY_ADDRESS=
+CIC_TRUSTED_ADDRESS=
--- a/apps/cic-staff-client/.gitignore
+++ b/apps/cic-staff-client/.gitignore
@@ -0,0 +1,51 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+/tests
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events*.json
+speed-measure-plugin*.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+/.husky
+
+# System Files
+.DS_Store
+Thumbs.db
+
+# Configuration Files
+.env
--- a/apps/cic-staff-client/.gitlab-ci.yml
+++ b/apps/cic-staff-client/.gitlab-ci.yml
@@ -0,0 +1,134 @@
+stages:
+  - build
+  # - test
+  # - package
+
+image:
+  name: gcr.io/kaniko-project/executor:debug
+  entrypoint: [""]
+
+variables:
+  KANIKO_CACHE_ARGS: "--cache=true --cache-copy-layers=true --cache-ttl=24h"
+
+ng_build_merge_request:
+  stage: build
+  variables:
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
+    - /kaniko/executor --context . $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --no-push
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always
+
+ng_build:
+  stage: build
+  variables:
+      IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
+      LATEST_TAG: $CI_REGISTRY_IMAGE:latest
+  script:
+    - export IMAGE_TAG="$IMAGE_TAG_BASE-$(date +%s)"
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
+    - /kaniko/executor --context . $KANIKO_CACHE_ARGS --destination $IMAGE_TAG --destination $CI_REGISTRY_IMAGE:latest
+  rules:
+      - if: $CI_COMMIT_BRANCH == "master"
+        when: always
+
+
+# cache:
+#   key:
+#     files:
+#       - package-lock.json
+#   paths:
+#     - node_modules/
+#   policy: pull
+
+# image: node:alpine
+
+# variables:
+#   PROJECT_PATH: "$CI_PROJECT_DIR"
+#   APP_OUTPUT_PATH: "$CI_PROJECT_DIR/dist/cic-staff-client"
+#   OUTPUT_PATH: "$CI_PROJECT_DIR/dist"
+#   CLI_VERSION: 10.2.0
+
+# install_dependencies:
+#   stage: install
+#   tags:
+#     - docker
+#   script:
+#     - npm install -g @angular/cli@$CLI_VERSION
+#     - npm install
+#   only:
+#     refs:
+#       - merge_requests
+#       - master
+#     changes:
+#       - package-lock.json
+
+# build:
+#   stage: build
+#   tags:
+#     - docker
+#   script:
+#     - npm ng build --prod
+#   after_script:
+#     - mv $PROJECT_PATH/nginx.conf $PROJECT_PATH/default.conf
+#     - cp $PROJECT_PATH/default.conf  $APP_OUTPUT_PATH
+#     - cp $PROJECT_PATH/Dockerfile    $APP_OUTPUT_PATH
+#   artifacts:
+#     name: "cic-staff-client-pipeline"
+#     expire_in: 1 days
+#     paths:
+#       - $APP_OUTPUT_PATH
+
+# test:karma:
+#   stage: test
+#   allow_failure: false
+#   tags:
+#     - docker
+#   before_script:
+#     - apk add chromium
+#     - export CHROME_BIN=/usr/bin/chromium-browser
+#   script:
+#     - npm ng test --code-coverage --progress false --watch false --browsers=GitlabChromeHeadless
+#   coverage: '/Statements\s+:\s\d+.\d+%/'
+#   artifacts:
+#     name: "tests-and-coverage"
+#     reports:
+#       junit:
+#         - $OUTPUT_PATH/tests/junit-test-results.xml
+#       cobertura:
+#         - $OUTPUT_PATH/coverage/cobetura-coverage.xml
+#     paths:
+#       - coverage/
+
+# test:e2e:
+#   stage: test
+#   allow_failure: false
+#   tags:
+#     - docker
+#   script:
+#     - npm ng e2e
+
+# test:nglint:
+#   stage: test
+#   tags:
+#     - docker
+#   script:
+#     - npm ng lint
+
+# docker-build:
+#   stage: package
+#   image: docker:latest
+#   services:
+#     - docker:dind
+#   variables:
+#     IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
+#   before_script:
+#     - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
+#   script:
+#     - docker build -t $IMAGE_TAG -f Dockerfile .
+#     - docker push $IMAGE_TAG
+#   only:
+#     - master
--- a/apps/cic-staff-client/.npm/_cacache/content-v2/sha512/1b/8b/c0cde7688d85e273662b31dabebd6a6f67e65cfe04856a2f8063694228248d0843858e04e3ce4fb0a7c8fae8e7c43016b03fb25ebd6cfa00d2e3687509a5
+++ b/apps/cic-staff-client/.npm/_cacache/content-v2/sha512/1b/8b/c0cde7688d85e273662b31dabebd6a6f67e65cfe04856a2f8063694228248d0843858e04e3ce4fb0a7c8fae8e7c43016b03fb25ebd6cfa00d2e3687509a5
--- a/apps/cic-staff-client/.npm/_cacache/index-v5/af/03/5c781820370e585dc2323edbbc80669bf714da5b47d56510c7d0bd7521ee
+++ b/apps/cic-staff-client/.npm/_cacache/index-v5/af/03/5c781820370e585dc2323edbbc80669bf714da5b47d56510c7d0bd7521ee
@@ -0,0 +1,2 @@
+
+8623625b230f01ecccf2ac4f6536a66608beb436	{"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/npm","integrity":"sha512-G4vAzedojYXic2YrMdq+vWpvZ+Zc/gSFai+AY2lCKCSNCEOFjgTjzk+wp8j66OfEMBawP7JevWz6ANLjaHUJpQ==","time":1629402913363,"size":1653772,"metadata":{"time":1629402912560,"url":"https://registry.npmjs.org/npm","reqHeaders":{"accept":"application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"},"resHeaders":{"cache-control":"public, max-age=300","content-type":"application/vnd.npm.install-v1+json","date":"Thu, 19 Aug 2021 19:55:12 GMT","etag":"\"bd87307eb91c51dccc1b6e0985432183\"","last-modified":"Thu, 19 Aug 2021 17:32:03 GMT","vary":"accept-encoding, accept"}}}
--- a/apps/cic-staff-client/.npm/_logs/2021-08-19T19_58_09_029Z-debug.log
+++ b/apps/cic-staff-client/.npm/_logs/2021-08-19T19_58_09_029Z-debug.log
@@ -0,0 +1,47 @@
+0 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'start:dev' ]
+1 info using npm@7.20.3
+2 info using node@v16.7.0
+3 timing npm:load:whichnode Completed in 1ms
+4 timing config:load:defaults Completed in 6ms
+5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 2ms
+6 timing config:load:builtin Completed in 2ms
+7 timing config:load:cli Completed in 4ms
+8 timing config:load:env Completed in 0ms
+9 timing config:load:file:/app/.npmrc Completed in 2ms
+10 timing config:load:project Completed in 5ms
+11 timing config:load:file:/root/.npmrc Completed in 4ms
+12 timing config:load:user Completed in 4ms
+13 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
+14 timing config:load:global Completed in 0ms
+15 timing config:load:validate Completed in 1ms
+16 timing config:load:credentials Completed in 2ms
+17 timing config:load:setEnvs Completed in 1ms
+18 timing config:load Completed in 26ms
+19 timing npm:load:configload Completed in 26ms
+20 timing npm:load:setTitle Completed in 0ms
+21 timing npm:load:setupLog Completed in 1ms
+22 timing npm:load:cleanupLog Completed in 3ms
+23 timing npm:load:configScope Completed in 0ms
+24 timing npm:load:projectScope Completed in 6ms
+25 timing npm:load Completed in 40ms
+26 timing config:load:flatten Completed in 8ms
+27 timing command:run-script Completed in 176849ms
+28 notice New minor version of npm available! 7.20.3 -> 7.21.0
+28 notice Changelog: <https://github.com/npm/cli/releases/tag/v7.21.0>
+28 notice Run `npm install -g npm@7.21.0` to update!
+29 verbose stack Error: command failed
+29 verbose stack     at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/@npmcli/promise-spawn/index.js:64:27)
+29 verbose stack     at ChildProcess.emit (node:events:394:28)
+29 verbose stack     at maybeClose (node:internal/child_process:1064:16)
+29 verbose stack     at Process.ChildProcess._handle.onexit (node:internal/child_process:301:5)
+30 verbose pkgid cic-staff-client@0.0.0
+31 verbose cwd /app
+32 verbose Linux 5.10.25-linuxkit
+33 verbose argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "start:dev"
+34 verbose node v16.7.0
+35 verbose npm  v7.20.3
+36 error path /app
+37 error command failed
+38 error signal SIGTERM
+39 error command sh -c ng serve -c dev
+40 verbose exit 1
--- a/apps/cic-staff-client/.npm/_logs/2021-08-19T20_05_53_967Z-debug.log
+++ b/apps/cic-staff-client/.npm/_logs/2021-08-19T20_05_53_967Z-debug.log
@@ -0,0 +1,44 @@
+0 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'start:dev' ]
+1 info using npm@7.20.3
+2 info using node@v16.7.0
+3 timing npm:load:whichnode Completed in 1ms
+4 timing config:load:defaults Completed in 2ms
+5 timing config:load:file:/usr/local/lib/node_modules/npm/npmrc Completed in 6ms
+6 timing config:load:builtin Completed in 7ms
+7 timing config:load:cli Completed in 2ms
+8 timing config:load:env Completed in 1ms
+9 timing config:load:file:/app/.npmrc Completed in 9ms
+10 timing config:load:project Completed in 15ms
+11 timing config:load:file:/root/.npmrc Completed in 2ms
+12 timing config:load:user Completed in 2ms
+13 timing config:load:file:/usr/local/etc/npmrc Completed in 0ms
+14 timing config:load:global Completed in 0ms
+15 timing config:load:validate Completed in 1ms
+16 timing config:load:credentials Completed in 1ms
+17 timing config:load:setEnvs Completed in 1ms
+18 timing config:load Completed in 32ms
+19 timing npm:load:configload Completed in 33ms
+20 timing npm:load:setTitle Completed in 1ms
+21 timing npm:load:setupLog Completed in 1ms
+22 timing npm:load:cleanupLog Completed in 3ms
+23 timing npm:load:configScope Completed in 0ms
+24 timing npm:load:projectScope Completed in 4ms
+25 timing npm:load Completed in 43ms
+26 timing config:load:flatten Completed in 7ms
+27 timing command:run-script Completed in 450289ms
+28 verbose stack Error: command failed
+28 verbose stack     at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/node_modules/@npmcli/promise-spawn/index.js:64:27)
+28 verbose stack     at ChildProcess.emit (node:events:394:28)
+28 verbose stack     at maybeClose (node:internal/child_process:1064:16)
+28 verbose stack     at Process.ChildProcess._handle.onexit (node:internal/child_process:301:5)
+29 verbose pkgid cic-staff-client@0.0.0
+30 verbose cwd /app
+31 verbose Linux 5.10.25-linuxkit
+32 verbose argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "start:dev"
+33 verbose node v16.7.0
+34 verbose npm  v7.20.3
+35 error path /app
+36 error command failed
+37 error signal SIGTERM
+38 error command sh -c ng serve -c dev
+39 verbose exit 1
--- a/apps/cic-staff-client/.npm/_update-notifier-last-checked
+++ b/apps/cic-staff-client/.npm/_update-notifier-last-checked
--- a/apps/cic-staff-client/.prettierignore
+++ b/apps/cic-staff-client/.prettierignore
@@ -0,0 +1,4 @@
+package.json
+package-lock.json
+yarn.lock
+dist
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Blair Vanderlugt	54137256ee	adds an id to the cache mount	2021-08-19 16:09:40 -04:00
Blair Vanderlugt	8f8a423680	fix issues with build cicada, now it should do auto reload	2021-08-19 16:08:56 -04:00
				`@@ -0,0 +1,2 @@`

				8623625b230f01ecccf2ac4f6536a66608beb436 {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/npm","integrity":"sha512-G4vAzedojYXic2YrMdq+vWpvZ+Zc/gSFai+AY2lCKCSNCEOFjgTjzk+wp8j66OfEMBawP7JevWz6ANLjaHUJpQ==","time":1629402913363,"size":1653772,"metadata":{"time":1629402912560,"url":"https://registry.npmjs.org/npm","reqHeaders":{"accept":"application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, /"},"resHeaders":{"cache-control":"public, max-age=300","content-type":"application/vnd.npm.install-v1+json","date":"Thu, 19 Aug 2021 19:55:12 GMT","etag":"\"bd87307eb91c51dccc1b6e0985432183\"","last-modified":"Thu, 19 Aug 2021 17:32:03 GMT","vary":"accept-encoding, accept"}}}