Bump aux version

Remove hardcoded value
Noop calc for non-demurrage token in aux
2021-07-08 11:48:50 +02:00 · 2021-07-07 17:42:47 +02:00 · 2021-07-07 14:17:50 +02:00 · 2021-07-07 13:52:19 +02:00 · 2021-07-07 11:59:51 +02:00 · 2021-07-07 10:32:01 +02:00
69 changed files with 6104 additions and 1287 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,3 @@ build/
 **/coverage
 **/.venv
 .idea
-**/.vim
--- a/apps/cic-cache/.coveragerc
+++ b/apps/cic-cache/.coveragerc
@@ -2,5 +2,4 @@
 omit = 
 	.venv/*
 	scripts/*
-	cic_cache/db/migrations/*
-	cic_cache/version.py
+	cic_cache/db/postgres/*
--- a/apps/cic-cache/.dockerignore
+++ b/apps/cic-cache/.dockerignore
@@ -1,4 +0,0 @@
-.git
-.cache
-.dot
-**/doc
--- a/apps/cic-cache/.gitlab-ci.yml
+++ b/apps/cic-cache/.gitlab-ci.yml
@@ -1,52 +1,22 @@
 .cic_cache_variables:
    variables:
        APP_NAME: cic-cache
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+
+.cic_cache_changes_target:
+    rules:
+        - changes:
+            - $CONTEXT/$APP_NAME/*

 build-mr-cic-cache:
    extends:
+        - .cic_cache_changes_target
        - .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
-    extends:
-        - .cic_cache_variables
-    cache:
-        key:
-            files:
-                - test_requirements.txt
-        paths:
-        - /root/.cache/pip
-    image: $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
-    needs: ["build-mr-cic-cache"]
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/$APP_NAME/**/*
-      when: always

 build-push-cic-cache:
    extends:
        - .py_build_push
        - .cic_cache_variables
-    rules:
-    - if:  $CI_COMMIT_BRANCH == "master"
-      changes:
-          - apps/cic-cache/**/*
-      when: always
        

--- a/apps/cic-cache/cic_cache/cache.py
+++ b/apps/cic-cache/cic_cache/cache.py
@@ -15,8 +15,6 @@ from cic_cache.db.list import (
 logg = logging.getLogger()


-DEFAULT_FILTER_SIZE = 8192 * 8
-
 class Cache:

    def __init__(self, session):
@@ -27,7 +25,7 @@ class BloomCache(Cache):

    @staticmethod
    def __get_filter_size(n):
-        n = DEFAULT_FILTER_SIZE
+        n = 8192 * 8
        logg.warning('filter size hardcoded to {}'.format(n))
        return n

--- a/apps/cic-cache/cic_cache/runnable/init.py
+++ b/apps/cic-cache/cic_cache/runnable/init.py
--- a/apps/cic-cache/cic_cache/runnable/daemons/init.py
+++ b/apps/cic-cache/cic_cache/runnable/daemons/init.py
--- a/apps/cic-cache/cic_cache/runnable/daemons/query.py
+++ b/apps/cic-cache/cic_cache/runnable/daemons/query.py
@@ -4,9 +4,6 @@ import json
 import re
 import base64

-# external imports
-from hexathon import add_0x
-
 # local imports
 from cic_cache.cache import (
        BloomCache,
@@ -14,11 +11,10 @@ from cic_cache.cache import (
    )

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

 re_transactions_all_bloom = r'/tx/(\d+)?/?(\d+)/?'
-re_transactions_account_bloom = r'/tx/user/((0x)?[a-fA-F0-9]+)(/(\d+)(/(\d+))?)?/?'
-re_transactions_all_data = r'/txa/(\d+)?/?(\d+)/?'
+re_transactions_account_bloom = r'/tx/user/((0x)?[a-fA-F0-9]+)/?(\d+)?/?(\d+)/?'
+re_transactions_all_data = r'/txa/(\d+)/(\d+)/?'

 DEFAULT_LIMIT = 100

@@ -30,13 +26,13 @@ def process_transactions_account_bloom(session, env):

    address = r[1]
    if r[2] == None:
-        address = add_0x(address)
-    offset = 0
+        address = '0x' + address
+    offset = DEFAULT_LIMIT
    if r.lastindex > 2:
-        offset = r[4]
-    limit = DEFAULT_LIMIT
-    if r.lastindex > 4:
-        limit = r[6]
+        offset = r[3]
+    limit = 0
+    if r.lastindex > 3:
+        limit = r[4]

    c = BloomCache(session)
    (lowest_block, highest_block, bloom_filter_block, bloom_filter_tx) = c.load_transactions_account(address, offset, limit)
--- a/apps/cic-cache/docker/Dockerfile
+++ b/apps/cic-cache/docker/Dockerfile
@@ -1,38 +1,52 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
- 
-# RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2b9
+FROM python:3.8.6-slim-buster

-COPY requirements.txt .
-#RUN pip install $pip_extra_index_url_flag -r test_requirements.txt
-#RUN pip install $pip_extra_index_url_flag .
-#RUN pip install .[server]
+#COPY --from=0 /usr/local/share/cic/solidity/ /usr/local/share/cic/solidity/

-ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
-ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-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 \
-    -r requirements.txt
+WORKDIR /usr/src/cic-cache

-COPY . . 
+ARG pip_extra_index_url_flag='--index https://pypi.org/simple --extra-index-url https://pip.grassrootseconomics.net:8433'
+ARG root_requirement_file='requirements.txt'

-RUN python setup.py install
+#RUN apk update && \
+#	apk add gcc musl-dev gnupg libpq
+#RUN apk add postgresql-dev
+#RUN apk add linux-headers
+#RUN apk add libffi-dev
+RUN apt-get update && \
+	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps git
+
+# Copy shared requirements from top of mono-repo
+RUN echo "copying root req file ${root_requirement_file}"
+RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2b9
+
+COPY cic-cache/requirements.txt ./
+COPY cic-cache/setup.cfg \
+	 cic-cache/setup.py \
+ 	 ./
+COPY cic-cache/cic_cache/ ./cic_cache/
+COPY cic-cache/scripts/ ./scripts/
+COPY cic-cache/test_requirements.txt ./
+RUN pip install $pip_extra_index_url_flag -r test_requirements.txt
+RUN pip install $pip_extra_index_url_flag .
+RUN pip install .[server]
+
+COPY cic-cache/tests/ ./tests/
+#COPY db/ cic-cache/db
+#RUN apk add postgresql-client

 # ini files in config directory defines the configurable parameters for the application
 # they can all be overridden by environment variables
 # to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-COPY config/ /usr/local/etc/cic-cache/
+COPY cic-cache/config/ /usr/local/etc/cic-cache/

 # for db migrations
 RUN git clone https://github.com/vishnubob/wait-for-it.git /usr/local/bin/wait-for-it/
-COPY cic_cache/db/migrations/ /usr/local/share/cic-cache/alembic/
+COPY cic-cache/cic_cache/db/migrations/ /usr/local/share/cic-cache/alembic/

-COPY /docker/start_tracker.sh ./start_tracker.sh
-COPY /docker/db.sh ./db.sh
+COPY cic-cache/docker/start_tracker.sh ./start_tracker.sh
+COPY cic-cache/docker/db.sh ./db.sh
 RUN chmod 755 ./*.sh
 # Tracker
 # ENTRYPOINT ["/usr/local/bin/cic-cache-tracker", "-vv"]
 # Server
 # ENTRYPOINT [ "/usr/local/bin/uwsgi", "--wsgi-file", "/usr/local/lib/python3.8/site-packages/cic_cache/runnable/server.py", "--http", ":80", "--pyargv", "-vv" ]
-ENTRYPOINT []
--- a/apps/cic-cache/docker/Dockerfile_ci
+++ b/apps/cic-cache/docker/Dockerfile_ci
@@ -1,37 +0,0 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
- 
-# RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2b9
-
-COPY requirements.txt .
-#RUN pip install $pip_extra_index_url_flag -r test_requirements.txt
-#RUN pip install $pip_extra_index_url_flag .
-#RUN pip install .[server]
-
-ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
-ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-RUN pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-    -r requirements.txt
-
-COPY . . 
-
-RUN python setup.py install
-
-# ini files in config directory defines the configurable parameters for the application
-# they can all be overridden by environment variables
-# to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-COPY config/ /usr/local/etc/cic-cache/
-
-# for db migrations
-RUN git clone https://github.com/vishnubob/wait-for-it.git /usr/local/bin/wait-for-it/
-COPY cic_cache/db/migrations/ /usr/local/share/cic-cache/alembic/
-
-COPY /docker/start_tracker.sh ./start_tracker.sh
-COPY /docker/db.sh ./db.sh
-RUN chmod 755 ./*.sh
-# Tracker
-# ENTRYPOINT ["/usr/local/bin/cic-cache-tracker", "-vv"]
-# Server
-# ENTRYPOINT [ "/usr/local/bin/uwsgi", "--wsgi-file", "/usr/local/lib/python3.8/site-packages/cic_cache/runnable/server.py", "--http", ":80", "--pyargv", "-vv" ]
-ENTRYPOINT []
--- a/apps/cic-cache/requirements.txt
+++ b/apps/cic-cache/requirements.txt
@@ -1,13 +1,13 @@
-cic-base~=0.2.0a2
+cic-base==0.1.3a3+build.984b5cff
 alembic==1.4.2
-confini>=0.3.6rc3,<0.5.0
+confini~=0.3.6rc3
 uwsgi==2.0.19.1
 moolb~=0.1.0
-cic-eth-registry~=0.5.6a2
+cic-eth-registry~=0.5.6a1
 SQLAlchemy==1.3.20
 semver==2.13.0
 psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
-chainsyncer[sql]~=0.0.3a4
-erc20-faucet~=0.2.2a2
+chainsyncer[sql]~=0.0.3a3
+erc20-faucet~=0.2.2a1
--- a/apps/cic-cache/tests/conftest.py
+++ b/apps/cic-cache/tests/conftest.py
@@ -5,12 +5,9 @@ import datetime

 # external imports
 import pytest
-import moolb

 # local imports
 from cic_cache import db
-from cic_cache import BloomCache
-from cic_cache.cache import DEFAULT_FILTER_SIZE

 script_dir = os.path.dirname(os.path.realpath(__file__))
 root_dir = os.path.dirname(script_dir)
@@ -104,7 +101,3 @@ def tag_txs(

    db.tag_transaction(init_database, txs[1], 'taag', domain='test')

-
-@pytest.fixture(scope='session')
-def zero_filter():
-    return moolb.Bloom(DEFAULT_FILTER_SIZE, 3)
--- a/apps/cic-cache/tests/filters/test_erc20.py
+++ b/apps/cic-cache/tests/filters/test_erc20.py
@@ -10,7 +10,6 @@ from sqlalchemy import text
 from chainlib.eth.tx import Tx
 from chainlib.eth.block import Block
 from chainlib.chain import ChainSpec
-from chainlib.eth.error import RequestMismatchException
 from hexathon import (
        strip_0x,
        add_0x,
@@ -19,21 +18,10 @@ from hexathon import (
 # local imports
 from cic_cache.db import add_tag
 from cic_cache.runnable.daemons.filters.erc20 import ERC20TransferFilter
-from cic_cache.runnable.daemons.filters.base import TagSyncFilter

 logg = logging.getLogger()


-def test_base_filter_str(
-        init_database,
-        ):
-        f = TagSyncFilter('foo')
-        assert 'foo' == str(f)
-        f = TagSyncFilter('foo', domain='bar')
-        assert 'bar.foo' == str(f)
-
-
-
 def test_erc20_filter(
        eth_rpc,
        foo_token,
@@ -79,95 +67,3 @@ def test_erc20_filter(
    s = text("SELECT x.tx_hash FROM tag a INNER JOIN tag_tx_link l ON l.tag_id = a.id INNER JOIN tx x ON x.id = l.tx_id WHERE a.domain = :a AND a.value = :b")
    r = init_database.execute(s, {'a': fltr.tag_domain, 'b': fltr.tag_name}).fetchone()
    assert r[0] == tx.hash
-
-
-def test_erc20_filter_nocontract(
-        eth_rpc,
-        foo_token,
-        init_database,
-        list_defaults,
-        list_actors,
-        tags,
-        ):
-
-    chain_spec = ChainSpec('foo', 'bar', 42, 'baz')
-
-    fltr = ERC20TransferFilter(chain_spec)
-    add_tag(init_database, fltr.tag_name, domain=fltr.tag_domain)
-
-    # incomplete args
-    data = 'a9059cbb'
-    data += strip_0x(list_actors['alice'])
-    data += '1000'.ljust(64, '0')
-    block = Block({
-        'hash': os.urandom(32).hex(),
-        'number': 42,
-        'timestamp': datetime.datetime.utcnow().timestamp(),
-        'transactions': [],
-        })
-
-    tx = Tx({
-        'to': os.urandom(20).hex(),
-        'from': list_actors['bob'],
-        'data': data,
-        'value': 0,
-        'hash': os.urandom(32).hex(),
-        'nonce': 13,
-        'gasPrice': 10000000,
-        'gas': 123456,
-            })
-    block.txs.append(tx)
-    tx.block = block
-
-    assert not fltr.filter(eth_rpc, block, tx, db_session=init_database)
-
-
-@pytest.mark.parametrize(
-        'contract_method,contract_input,expected_exception',
-        [
-            ('a9059cbb', os.urandom(32).hex(), ValueError), # not enough args
-            ('a9059cbb', os.urandom(31).hex(), ValueError), # wrong arg boundary
-            ('a9059cbc', os.urandom(64).hex(), RequestMismatchException), # wrong method
-            ],
-        )
-def test_erc20_filter_bogus(
-        eth_rpc,
-        foo_token,
-        init_database,
-        list_defaults,
-        list_actors,
-        tags,
-        contract_method,
-        contract_input,
-        expected_exception,
-        ):
-
-    chain_spec = ChainSpec('foo', 'bar', 42, 'baz')
-
-    fltr = ERC20TransferFilter(chain_spec)
-    add_tag(init_database, fltr.tag_name, domain=fltr.tag_domain)
-
-    # incomplete args
-    data = contract_method
-    data += contract_input 
-    block = Block({
-        'hash': os.urandom(32).hex(),
-        'number': 42,
-        'timestamp': datetime.datetime.utcnow().timestamp(),
-        'transactions': [],
-        })
-
-    tx = Tx({
-        'to': foo_token,
-        'from': list_actors['bob'],
-        'data': data,
-        'value': 0,
-        'hash': os.urandom(32).hex(),
-        'nonce': 13,
-        'gasPrice': 10000000,
-        'gas': 123456,
-            })
-    block.txs.append(tx)
-    tx.block = block
-
-    assert not fltr.filter(eth_rpc, block, tx, db_session=init_database)
--- a/apps/cic-cache/tests/test_query.py
+++ b/apps/cic-cache/tests/test_query.py
@@ -1,230 +0,0 @@
-# standard imports
-import logging
-import json
-import base64
-import copy
-import re
-
-# external imports
-import pytest
-from hexathon import strip_0x
-
-# local imports
-from cic_cache.runnable.daemons.query import *
-
-logg = logging.getLogger()
-
-
-
-@pytest.mark.parametrize(
-        'query_path_prefix, query_role, query_address_index, query_offset, query_offset_index, query_limit, query_limit_index, match_re',
-        [
-            ('/tx/user/', 'alice', 0, None, 3, None, 5, re_transactions_account_bloom),
-            ('/tx/user/', 'alice', 0, 42, 3, None, 5, re_transactions_account_bloom),
-            ('/tx/user/', 'alice', 0, 42, 3, 13, 5, re_transactions_account_bloom),
-            ('/tx/', None, 0, None, 3, None, 5, re_transactions_all_bloom),
-            ('/tx/', None, 0, 42, 3, None, 5, re_transactions_all_bloom),
-            ('/tx/', None, 0, 42, 3, 13, 5, re_transactions_all_bloom),
-            ('/txa/', None, 0, None, 3, None, 5, re_transactions_all_data),
-            ('/txa/', None, 0, 42, 3, None, 5, re_transactions_all_data),
-            ('/txa/', None, 0, 42, 3, 13, 5, re_transactions_all_data),
-            ],
-        )
-def test_query_regex(
-        list_actors,
-        query_path_prefix,
-        query_role,
-        query_address_index,
-        query_offset,
-        query_offset_index,
-        query_limit,
-        query_limit_index,
-        match_re,
-        ):
-
-        paths = []
-        path = query_path_prefix
-        query_address = None
-        if query_role != None:
-            query_address = strip_0x(list_actors[query_role])
-            paths.append(path + '0x' + query_address)
-            paths.append(path + query_address)
-        if query_offset != None:
-            if query_limit != None:
-                for i in range(len(paths)-1):
-                    paths[i] += '/{}/{}'.format(query_offset, query_limit)
-            else:
-                for i in range(len(paths)-1):
-                    paths[i] += '/' + str(query_offset)
-
-        for i in range(len(paths)):
-            paths.append(paths[i] + '/')
-
-        for p in paths:
-            logg.debug('testing path {} against {}'.format(p, match_re))
-            m = re.match(match_re, p)
-            l = len(m.groups())
-            logg.debug('laast index match {} groups {}'.format(m.lastindex, l))
-            for i in range(l+1):
-                logg.debug('group {} {}'.format(i, m[i]))
-            if m.lastindex >= query_offset_index:
-                assert query_offset == int(m[query_offset_index + 1])
-            if m.lastindex >= query_limit_index:
-                assert query_limit == int(m[query_limit_index + 1])
-            if query_address_index != None:
-                match_address = strip_0x(m[query_address_index + 1])
-                assert query_address == match_address
-
-
-
-@pytest.mark.parametrize(
-        'role_name, query_offset, query_limit, query_match',
-        [ 
-            ('alice', None, None, [(420000, 13), (419999, 42)]),
-            ('alice', None, 1, [(420000, 13)]),
-            ('alice', 1, None, [(419999, 42)]), # 420000 == list_defaults['block']
-            ('alice', 2, None, []), # 420000 == list_defaults['block']
-            ],
-        )
-def test_query_process_txs_account(
-        init_database,
-        list_defaults,
-        list_actors,
-        list_tokens,
-        txs,
-        zero_filter,
-        role_name,
-        query_offset,
-        query_limit,
-        query_match,
-        ):
-
-    actor = None
-    try:
-        actor = list_actors[role_name]
-    except KeyError:
-        actor = os.urandom(20).hex()
-    path_info = '/tx/user/0x' + strip_0x(actor)
-    if query_offset != None:
-        path_info += '/' + str(query_offset)
-    if query_limit != None:
-        if query_offset == None:
-            path_info += '/0'
-        path_info += '/' + str(query_limit)
-    env = {
-            'PATH_INFO': path_info,
-            }
-    logg.debug('using path {}'.format(path_info))
-    r = process_transactions_account_bloom(init_database, env)
-    assert r != None
-
-    o = json.loads(r[1])
-    block_filter_data = base64.b64decode(o['block_filter'].encode('utf-8'))
-    zero_filter_data = zero_filter.to_bytes()
-    if len(query_match) == 0:
-        assert block_filter_data == zero_filter_data
-        return
-
-    assert block_filter_data != zero_filter_data
-    block_filter = copy.copy(zero_filter)
-    block_filter.merge(block_filter_data)
-    block_filter_data = block_filter.to_bytes()
-    assert block_filter_data != zero_filter_data
-
-    for (block, tx) in query_match:
-        block = block.to_bytes(4, byteorder='big')
-        assert block_filter.check(block)
-
-
-@pytest.mark.parametrize(
-        'query_offset, query_limit, query_match',
-        [ 
-            (None, 2, [(420000, 13), (419999, 42)]),
-            (0, 1, [(420000, 13)]),
-            (1, 1, [(419999, 42)]),
-            (2, 0, []),
-            ],
-        )
-def test_query_process_txs_bloom(
-        init_database,
-        list_defaults,
-        list_actors,
-        list_tokens,
-        txs,
-        zero_filter,
-        query_offset,
-        query_limit,
-        query_match,
-        ):
-
-    path_info = '/tx'
-    if query_offset != None:
-        path_info += '/' + str(query_offset)
-    if query_limit != None:
-        if query_offset == None:
-            path_info += '/0'
-        path_info += '/' + str(query_limit)
-    env = {
-            'PATH_INFO': path_info,
-            }
-    logg.debug('using path {}'.format(path_info))
-    r = process_transactions_all_bloom(init_database, env)
-    assert r != None
-
-    o = json.loads(r[1])
-    block_filter_data = base64.b64decode(o['block_filter'].encode('utf-8'))
-    zero_filter_data = zero_filter.to_bytes()
-    if len(query_match) == 0:
-        assert block_filter_data == zero_filter_data
-        return
-
-    assert block_filter_data != zero_filter_data
-    block_filter = copy.copy(zero_filter)
-    block_filter.merge(block_filter_data)
-    block_filter_data = block_filter.to_bytes()
-    assert block_filter_data != zero_filter_data
-
-    for (block, tx) in query_match:
-        block = block.to_bytes(4, byteorder='big')
-        assert block_filter.check(block)
-
-
-@pytest.mark.parametrize(
-        'query_block_start, query_block_end, query_match_count',
-        [ 
-            (None, 42, 0),
-            (420000, 420001, 1),
-            (419999, 419999, 1), # matches are inclusive
-            (419999, 420000, 2),
-            (419999, 420001, 2),
-            ],
-        )
-def test_query_process_txs_data(
-        init_database,
-        list_defaults,
-        list_actors,
-        list_tokens,
-        txs,
-        zero_filter,
-        query_block_start,
-        query_block_end,
-        query_match_count,
-        ):
-
-    path_info = '/txa'
-    if query_block_start != None:
-        path_info += '/' + str(query_block_start)
-    if query_block_end != None:
-        if query_block_start == None:
-            path_info += '/0'
-        path_info += '/' + str(query_block_end)
-    env = {
-            'PATH_INFO': path_info,
-            'HTTP_X_CIC_CACHE_MODE': 'all',
-            }
-    logg.debug('using path {}'.format(path_info))
-    r = process_transactions_all_data(init_database, env)
-    assert r != None
-
-    o = json.loads(r[1])
-    assert len(o['data']) == query_match_count
--- a/apps/cic-eth/.dockerignore
+++ b/apps/cic-eth/.dockerignore
@@ -1,6 +0,0 @@
-.git
-.cache
-.dot
-**/doc
-**/.venv
-**/venv
--- a/apps/cic-eth/.gitlab-ci.yml
+++ b/apps/cic-eth/.gitlab-ci.yml
@@ -1,52 +1,31 @@
 .cic_eth_variables:
    variables:
        APP_NAME: cic-eth
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+
+.cic_eth_mr_changes_target:
+    rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      changes:
+          - $CONTEXT/$APP_NAME/**/*
+      when: always

 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
+        - .cic_eth_mr_changes_target
+        - .py_build_target_test

 test-mr-cic-eth:
-    stage: test
    extends:
        - .cic_eth_variables
-    cache:
-        key:
-            files:
-                - test_requirements.txt
-        paths:
-        - /root/.cache/pip
-    image: $MR_IMAGE_TAG
+        - .cic_eth_mr_changes_target
+    stage: test
+    image: $IMAGE_TAG_BASE
    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
-    needs: ["build-mr-cic-eth"]
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/cic-eth/**/*
-      when: always
+        - pytest -x --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests

 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,5 +1,5 @@
 SQLAlchemy==1.3.20
-cic-eth-registry~=0.5.6a2
+cic-eth-registry~=0.5.6a1
 hexathon~=0.0.1a7
-chainqueue~=0.0.2b6
-eth-erc20~=0.0.10a3
+chainqueue~=0.0.2b5
+eth-erc20==0.0.10a2
--- a/apps/cic-eth/cic_eth/runnable/daemons/filters/register.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/filters/register.py
@@ -12,24 +12,20 @@ from hexathon import (
 # local imports
 from .base import SyncFilter

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

 account_registry_add_log_hash = '0x9cc987676e7d63379f176ea50df0ae8d2d9d1141d1231d4ce15b5965f73c9430'


 class RegistrationFilter(SyncFilter):

-    def __init__(self, chain_spec, contract_address, queue=None):
+    def __init__(self, chain_spec, queue):
        self.chain_spec = chain_spec
        self.queue = queue
-        self.contract_address = contract_address


    def filter(self, conn, block, tx, db_session=None): 
-        if self.contract_address != tx.inputs[0]:
-            logg.debug('not an account registry tx; {} != {}'.format(self.contract_address, tx.inputs[0]))
-            return None
-
+        registered_address = None
        for l in tx.logs:
            event_topic_hex = l['topics'][0]
            if event_topic_hex == account_registry_add_log_hash:
--- a/apps/cic-eth/cic_eth/runnable/daemons/tracker.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/tracker.py
@@ -78,14 +78,6 @@ chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))

 cic_base.rpc.setup(chain_spec, config.get('ETH_PROVIDER'))

-rpc = RPCConnection.connect(chain_spec, 'default')
-registry = None
-try:
-    registry = connect_registry(rpc, chain_spec, config.get('CIC_REGISTRY_ADDRESS'))
-except UnknownContractError as e:
-    logg.exception('Registry contract connection failed for {}: {}'.format(config.get('CIC_REGISTRY_ADDRESS'), e))
-    sys.exit(1)
-logg.info('connected contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))


 def main():
@@ -93,6 +85,7 @@ def main():
    celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))

    # Connect to blockchain with chainlib
+    rpc = RPCConnection.connect(chain_spec, 'default')

    o = block_latest()
    r = rpc.do(o)
@@ -158,8 +151,7 @@ def main():

    tx_filter = TxFilter(chain_spec, config.get('_CELERY_QUEUE'))

-    account_registry_address = registry.by_name('AccountRegistry')
-    registration_filter = RegistrationFilter(chain_spec, account_registry_address, queue=config.get('_CELERY_QUEUE'))
+    registration_filter = RegistrationFilter(chain_spec, config.get('_CELERY_QUEUE'))

    gas_filter = GasFilter(chain_spec, config.get('_CELERY_QUEUE'))

--- a/apps/cic-eth/cic_eth/version.py
+++ b/apps/cic-eth/cic_eth/version.py
@@ -10,7 +10,7 @@ version = (
        0,
        12,
        0,
-        'alpha.3',
+        'alpha.2',
        )

 version_object = semver.VersionInfo(
--- a/apps/cic-eth/docker/Dockerfile
+++ b/apps/cic-eth/docker/Dockerfile
@@ -1,71 +1,81 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
+FROM python:3.8.6-slim-buster as compile

-# Copy just the requirements and install....this _might_ give docker a hint on caching but we 
-# do load these all into setup.py later
-# TODO can we take all the requirements out of setup.py and just do a pip install -r requirements.txt && python setup.py
-#COPY cic-eth/requirements.txt .
+WORKDIR /usr/src
+
+RUN apt-get update && \
+	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps git
+
+#RUN python -m venv venv && . venv/bin/activate
+
+ARG pip_extra_index_url_flag='--index https://pypi.org/simple --extra-index-url https://pip.grassrootseconomics.net:8433'
+ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
+ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
+RUN /usr/local/bin/python -m pip install --upgrade pip
+RUN pip install semver
+
+COPY cic-eth-aux/  ./cic-eth-aux/
+WORKDIR /usr/src/cic-eth-aux/erc20-demurrage-token
+RUN	pip install --extra-index-url $GITLAB_PYTHON_REGISTRY \
+    	--extra-index-url $EXTRA_INDEX_URL .
+
+WORKDIR /usr/src/cic-eth
+
+COPY cic-eth/ .
+RUN	pip install --extra-index-url $GITLAB_PYTHON_REGISTRY \
+    	--extra-index-url $EXTRA_INDEX_URL .[services]
+
+# --- TEST IMAGE ---
+FROM python:3.8.6-slim-buster as test 
+
+RUN apt-get update && \
+	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps git
+
+WORKDIR /usr/src/cic-eth
+
+RUN /usr/local/bin/python -m pip install --upgrade pip
+
+COPY --from=compile /usr/local/bin/ /usr/local/bin/
+COPY --from=compile /usr/local/lib/python3.8/site-packages/ \
+                          /usr/local/lib/python3.8/site-packages/
+# TODO we could use venv inside container to isolate the system and app deps further
+# COPY --from=compile /usr/src/cic-eth/ .
+# RUN . venv/bin/activate

 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
 ARG GITLAB_PYTHON_REGISTRY="https://gitlab.com/api/v4/projects/27624814/packages/pypi/simple"
-#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 
-COPY *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 \
-    -r requirements.txt \
-    -r services_requirements.txt \
-    -r admin_requirements.txt
-    
-COPY . .
-RUN python setup.py install
+
+COPY cic-eth/test_requirements.txt .
+RUN	pip install --extra-index-url $GITLAB_PYTHON_REGISTRY \
+    	--extra-index-url $EXTRA_INDEX_URL -r test_requirements.txt
+
+COPY cic-eth . 

 ENV PYTHONPATH .

-COPY docker/entrypoints/* ./ 
+ENTRYPOINT ["pytest"]
+
+# --- RUNTIME ---
+FROM python:3.8.6-slim-buster as runtime 
+
+RUN apt-get update && \
+	apt install -y gnupg libpq-dev procps
+
+WORKDIR /usr/src/cic-eth
+
+COPY --from=compile /usr/local/bin/ /usr/local/bin/
+COPY --from=compile /usr/local/lib/python3.8/site-packages/ \
+                          /usr/local/lib/python3.8/site-packages/
+
+COPY cic-eth/docker/* ./ 
 RUN chmod 755 *.sh

+COPY cic-eth/scripts/ scripts/
 # # ini files in config directory defines the configurable parameters for the application
 # # they can all be overridden by environment variables
 # # to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-COPY config/ /usr/local/etc/cic-eth/
-COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
-COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/
+COPY cic-eth/config/ /usr/local/etc/cic-eth/
+COPY cic-eth/cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
+COPY cic-eth/crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/

-# TODO this kind of code sharing across projects should be discouraged...can we make util a library?
-#COPY util/liveness/health.sh /usr/local/bin/health.sh
-ENTRYPOINT []
-
-## ------------------ PRODUCTION CONTAINER ----------------------
-#FROM python:3.8.6-slim-buster as prod 
-#
-#RUN apt-get update && \
-#	apt install -y gnupg libpq-dev procps
-#
-#WORKDIR /root
-#
-#COPY --from=dev /usr/local/bin/ /usr/local/bin/
-#COPY --from=dev /usr/local/lib/python3.8/site-packages/ \
-#                          /usr/local/lib/python3.8/site-packages/
-#
-#COPY docker/entrypoints/* ./ 
-#RUN chmod 755 *.sh
-#
-## # ini files in config directory defines the configurable parameters for the application
-## # they can all be overridden by environment variables
-## # to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-#COPY config/ /usr/local/etc/cic-eth/
-#COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
-#COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/
-#COPY scripts/ scripts/ 
-#
-## TODO this kind of code sharing across projects should be discouraged...can we make util a library?
-##COPY util/liveness/health.sh /usr/local/bin/health.sh
-#
-#ENTRYPOINT []
+COPY util/liveness/health.sh /usr/local/bin/health.sh

--- a/apps/cic-eth/docker/Dockerfile_ci
+++ b/apps/cic-eth/docker/Dockerfile_ci
@@ -1,69 +0,0 @@
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
-
-WORKDIR /usr/src/cic-eth
-
-# Copy just the requirements and install....this _might_ give docker a hint on caching but we 
-# do load these all into setup.py later
-# TODO can we take all the requirements out of setup.py and just do a pip install -r requirements.txt && python setup.py
-#COPY cic-eth/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"
-#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 
-COPY *requirements.txt . 
-RUN pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY \
-    --extra-index-url $EXTRA_INDEX_URL \
-    -r requirements.txt \
-    -r services_requirements.txt \
-    -r admin_requirements.txt
-    
-COPY . .
-RUN python setup.py install
-
-COPY docker/entrypoints/* ./ 
-RUN chmod 755 *.sh
-
-# # ini files in config directory defines the configurable parameters for the application
-# # they can all be overridden by environment variables
-# # to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-COPY config/ /usr/local/etc/cic-eth/
-COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
-COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/
-
-# TODO this kind of code sharing across projects should be discouraged...can we make util a library?
-#COPY util/liveness/health.sh /usr/local/bin/health.sh
-ENTRYPOINT []
-
-# ------------------ PRODUCTION CONTAINER ----------------------
-#FROM python:3.8.6-slim-buster as prod 
-#
-#RUN apt-get update && \
-#	apt install -y gnupg libpq-dev procps
-#
-#WORKDIR /root
-#
-#COPY --from=dev /usr/local/bin/ /usr/local/bin/
-#COPY --from=dev /usr/local/lib/python3.8/site-packages/ \
-#                          /usr/local/lib/python3.8/site-packages/
-#
-#COPY docker/entrypoints/* ./ 
-#RUN chmod 755 *.sh
-#
-## # ini files in config directory defines the configurable parameters for the application
-## # they can all be overridden by environment variables
-## # to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-#COPY config/ /usr/local/etc/cic-eth/
-#COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
-#COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/
-#COPY scripts/ scripts/ 
-#
-## TODO this kind of code sharing across projects should be discouraged...can we make util a library?
-##COPY util/liveness/health.sh /usr/local/bin/health.sh
-#
-#ENTRYPOINT []
-#
--- a/apps/cic-eth/docker/entrypoints/db.sh
+++ b/apps/cic-eth/docker/entrypoints/db.sh
--- a/apps/cic-eth/docker/entrypoints/start_dispatcher.sh
+++ b/apps/cic-eth/docker/entrypoints/start_dispatcher.sh
--- a/apps/cic-eth/docker/entrypoints/start_retry.sh
+++ b/apps/cic-eth/docker/entrypoints/start_retry.sh
--- a/apps/cic-eth/docker/entrypoints/start_tasker.sh
+++ b/apps/cic-eth/docker/entrypoints/start_tasker.sh
--- a/apps/cic-eth/docker/entrypoints/start_tracker.sh
+++ b/apps/cic-eth/docker/entrypoints/start_tracker.sh
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -1,3 +1,3 @@
 celery==4.4.7
-chainlib~=0.0.5a2
+chainlib~=0.0.5a1
 semver==2.13.0
--- a/apps/cic-eth/services_requirements.txt
+++ b/apps/cic-eth/services_requirements.txt
@@ -1,15 +1,14 @@
-chainsyncer[sql]~=0.0.3a4
-chainqueue~=0.0.2b6
+chainsyncer[sql]~=0.0.3a3
+chainqueue~=0.0.2b5
 alembic==1.4.2
-confini>=0.3.6rc4,<0.5.0
+confini~=0.3.6rc4
 redis==3.5.3
 hexathon~=0.0.1a7
 pycryptodome==3.10.1
 liveness~=0.0.1a7
-eth-address-index~=0.1.2a2
-eth-accounts-index~=0.0.12a2
-cic-eth-registry~=0.5.6a2
-erc20-faucet~=0.2.2a2
-erc20-transfer-authorization~=0.3.2a2
-sarafu-faucet~=0.0.4a3
+eth-address-index~=0.1.2a1
+eth-accounts-index~=0.0.12a1
+cic-eth-registry~=0.5.6a1
+erc20-faucet~=0.2.2a1
+sarafu-faucet~=0.0.4a1
 moolb~=0.1.1b2
--- 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.0.10a3
+eth-erc20~=0.0.10a2
--- a/apps/cic-eth/tests/filters/test_filter_bogus.py
+++ b/apps/cic-eth/tests/filters/test_filter_bogus.py
@@ -18,7 +18,6 @@ def test_filter_bogus(
        cic_registry,
        contract_roles,
        register_lookups,
-        account_registry,
        ):

    fltrs = [
@@ -27,7 +26,7 @@ def test_filter_bogus(
        TxFilter(default_chain_spec, None),
        CallbackFilter(default_chain_spec, None, None, caller_address=contract_roles['CONTRACT_DEPLOYER']),
        StragglerFilter(default_chain_spec, None),
-        RegistrationFilter(default_chain_spec, account_registry, queue=None),
+        RegistrationFilter(default_chain_spec, queue=None),
        ]
      
    for fltr in fltrs:
--- a/apps/cic-eth/tests/filters/test_register_filter.py
+++ b/apps/cic-eth/tests/filters/test_register_filter.py
@@ -1,7 +1,3 @@
-# standard imports
-import logging
-import os
-
 # external imports
 from eth_accounts_index.registry import AccountRegistry
 from chainlib.connection import RPCConnection
@@ -18,17 +14,12 @@ from chainlib.eth.block import (
        Block,
        )
 from erc20_faucet import Faucet
-from hexathon import (
-        strip_0x,
-        add_0x,
-        )
+from hexathon import strip_0x
 from chainqueue.sql.query import get_account_tx

 # local imports
 from cic_eth.runnable.daemons.filters.register import RegistrationFilter

-logg = logging.getLogger()
-

 def test_register_filter(
        default_chain_spec,
@@ -69,11 +60,7 @@ def test_register_filter(
    tx = Tx(tx_src, block=block, rcpt=rcpt)
    tx.apply_receipt(rcpt)

-    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, account_registry, queue=None)
+    fltr = RegistrationFilter(default_chain_spec, queue=None)
    t = fltr.filter(eth_rpc, block, tx, db_session=init_database)

    t.get_leaf()
--- a/apps/cic-eth/tools_requirements.txt
+++ b/apps/cic-eth/tools_requirements.txt
@@ -1,7 +1,7 @@
-crypto-dev-signer~=0.4.14b7
+crypto-dev-signer~=0.4.14b6
 chainqueue~=0.0.2b5
-confini>=0.3.6rc4,<0.5.0
-cic-eth-registry~=0.5.6a2
+confini~=0.3.6rc4
+cic-eth-registry~=0.5.6a1
 redis==3.5.3
 hexathon~=0.0.1a7
 pycryptodome==3.10.1
--- a/apps/cic-meta/.dockerignore
+++ b/apps/cic-meta/.dockerignore
@@ -1,5 +0,0 @@
-.git
-.cache
-.dot
-**/doc
-**/node_modules
--- a/apps/cic-meta/.gitlab-ci.yml
+++ b/apps/cic-meta/.gitlab-ci.yml
@@ -2,42 +2,43 @@
 .cic_meta_variables:
    variables:
        APP_NAME: cic-meta
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+        IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:unittest-$CI_COMMIT_SHORT_SHA

-build-mr-cic-meta:
-    extends:
-        - .py_build_merge_request
-        - .cic_meta_variables
+.cic_meta_changes_target:
    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/cic-meta/**/*
-      when: always
+        - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+#        - changes:
+#            - $CONTEXT/$APP_NAME/*
+        - when: always
+
+cic-meta-build-mr:
+  stage: build
+  extends:
+    - .cic_meta_variables
+    - .cic_meta_changes_target
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
+    # - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG 

 test-mr-cic-meta:
    extends:
        - .cic_meta_variables
+        - .cic_meta_changes_target
    stage: test
-    image: $MR_IMAGE_TAG 
+    image: $IMAGE_TAG 
    script:
-        - cd /root
+        - cd /tmp/src/cic-meta
        - npm install --dev 
        - npm run test
        - npm run test:coverage
-    needs: ["build-mr-cic-meta"]
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/cic-meta/**/*
-      when: always
+    needs: ["cic-meta-build-mr"]

 build-push-cic-meta:
    extends:
        - .py_build_push
        - .cic_meta_variables
-    rules:
-    - if:  $CI_COMMIT_BRANCH == "master"
-      changes:
-          - apps/cic-meta/**/*
-      when: always
+        
+
--- a/apps/cic-meta/docker/Dockerfile
+++ b/apps/cic-meta/docker/Dockerfile
@@ -1,33 +1,31 @@
-# syntax = docker/dockerfile:1.2
-#FROM node:15.3.0-alpine3.10
-FROM node:lts-alpine3.14
+FROM node:15.3.0-alpine3.10

-WORKDIR /root
+WORKDIR /tmp/src/cic-meta

 RUN apk add --no-cache postgresql bash

+# required to build the cic-client-meta module
+COPY cic-meta/src/ src/
+COPY cic-meta/scripts/ scripts/
+
 # copy the dependencies
-COPY package.json package-lock.json .
-RUN --mount=type=cache,mode=0755,target=/root/.npm \
-    npm set cache /root/.npm && \
-    npm ci
+COPY cic-meta/package.json .
+COPY cic-meta/tsconfig.json . 
+COPY cic-meta/webpack.config.js .
+     
+RUN npm install

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

-## copy runtime configs
-COPY .config/ /usr/local/etc/cic-meta/
-#
-## db migrations
-COPY docker/db.sh ./db.sh
+# copy runtime configs
+COPY cic-meta/.config/ /usr/local/etc/cic-meta/
+
+# db migrations
+COPY cic-meta/docker/db.sh ./db.sh
 RUN chmod 755 ./db.sh
-#
+
 RUN alias tsc=node_modules/typescript/bin/tsc 
-COPY docker/start_server.sh ./start_server.sh
+COPY cic-meta/docker/start_server.sh ./start_server.sh
 RUN chmod 755 ./start_server.sh
 ENTRYPOINT ["sh", "./start_server.sh"]
--- a/apps/cic-meta/docker/Dockerfile_ci
+++ b/apps/cic-meta/docker/Dockerfile_ci
@@ -1,32 +0,0 @@
-# syntax = docker/dockerfile:1.2
-#FROM node:15.3.0-alpine3.10
-FROM node:lts-alpine3.14
-
-WORKDIR /root
-
-RUN apk add --no-cache postgresql bash
-
-# copy the dependencies
-COPY package.json package-lock.json .
-RUN npm set cache /root/.npm && \
-    npm ci
-
-COPY webpack.config.js .
-COPY tsconfig.json . 
-## required to build the cic-client-meta module
-COPY src/ src/
-COPY scripts/ scripts/
-COPY tests/ tests/
-COPY tests/*.asc /root/pgp/
-
-## copy runtime configs
-COPY .config/ /usr/local/etc/cic-meta/
-#
-## db migrations
-COPY docker/db.sh ./db.sh
-RUN chmod 755 ./db.sh
-#
-RUN alias tsc=node_modules/typescript/bin/tsc 
-COPY docker/start_server.sh ./start_server.sh
-RUN chmod 755 ./start_server.sh
-ENTRYPOINT ["sh", "./start_server.sh"]
--- a/apps/cic-meta/package-lock.json
+++ b/apps/cic-meta/package-lock.json
--- a/apps/cic-notify/.gitlab-ci.yml
+++ b/apps/cic-notify/.gitlab-ci.yml
@@ -1,52 +1,22 @@
 .cic_notify_variables:
    variables:
        APP_NAME: cic-notify
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+
+.cic_notify_changes_target:
+    rules:
+        - changes:
+            - $CONTEXT/$APP_NAME/*

 build-mr-cic-notify:
    extends:
+        - .cic_notify_changes_target
        - .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
-    extends:
-        - .cic_notify_variables
-    cache:
-        key:
-            files:
-                - test_requirements.txt
-        paths:
-        - /root/.cache/pip
-    image: $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
-    needs: ["build-mr-cic-notify"]
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/$APP_NAME/**/*
-      when: always

 build-push-cic-notify:
    extends:
        - .py_build_push
        - .cic_notify_variables
-    rules:
-    - if:  $CI_COMMIT_BRANCH == "master"
-      changes:
-          - apps/cic-notify/**/*
-      when: always
        

--- a/apps/cic-notify/cic_notify/version.py
+++ b/apps/cic-notify/cic_notify/version.py
@@ -9,7 +9,7 @@ import semver

 logg = logging.getLogger()

-version = (0, 4, 0, 'alpha.8')
+version = (0, 4, 0, 'alpha.7')

 version_object = semver.VersionInfo(
        major=version[0],
--- a/apps/cic-notify/docker/Dockerfile
+++ b/apps/cic-notify/docker/Dockerfile
@@ -1,30 +1,38 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
+FROM python:3.8.6-slim-buster

-#RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62
+RUN apt-get update && \
+	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps

-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 .
+WORKDIR /usr/src/cic-notify

-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 \
-    -r requirements.txt
+ARG pip_extra_index_url_flag='--index https://pypi.org/simple --extra-index-url https://pip.grassrootseconomics.net:8433'
+RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62

-COPY . . 
+COPY cic-notify/setup.cfg \
+	 cic-notify/setup.py \
+     ./

-RUN python setup.py install
+COPY cic-notify/cic_notify/ ./cic_notify/

-# TODO please review..can this go into requirements?
+COPY cic-notify/requirements.txt \
+	 cic-notify/test_requirements.txt \
+     ./
+
+COPY cic-notify/scripts/ scripts/
 RUN pip install $pip_extra_index_url_flag .[africastalking,notifylog]

-COPY docker/*.sh .
+COPY cic-notify/tests/ tests/
+COPY cic-notify/docker/db.sh \
+     cic-notify/docker/start_tasker.sh \
+	 /root/
+
+#RUN apk add postgresql-client
+#RUN apk add bash

 # ini files in config directory defines the configurable parameters for the application
 # they can all be overridden by environment variables
 # to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-COPY .config/ /usr/local/etc/cic-notify/
-COPY cic_notify/db/migrations/ /usr/local/share/cic-notify/alembic/
+COPY cic-notify/.config/ /usr/local/etc/cic-notify/
+COPY cic-notify/cic_notify/db/migrations/ /usr/local/share/cic-notify/alembic/

-ENTRYPOINT []
+WORKDIR /root
--- a/apps/cic-notify/docker/Dockerfile_ci
+++ b/apps/cic-notify/docker/Dockerfile_ci
@@ -1,29 +0,0 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
-
-#RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a62
-
-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 pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-    -r requirements.txt
-
-COPY . . 
-
-RUN python setup.py install
-
-# TODO please review..can this go into requirements?
-RUN pip install $pip_extra_index_url_flag .[africastalking,notifylog]
-
-COPY docker/*.sh .
-
-# ini files in config directory defines the configurable parameters for the application
-# they can all be overridden by environment variables
-# to generate a list of environment variables from configuration, use: confini-dump -z <dir> (executable provided by confini package)
-COPY .config/ /usr/local/etc/cic-notify/
-COPY cic_notify/db/migrations/ /usr/local/share/cic-notify/alembic/
-
-ENTRYPOINT []
--- a/apps/cic-notify/requirements.txt
+++ b/apps/cic-notify/requirements.txt
@@ -1 +1 @@
-cic_base[full_graph]~=0.2.0a3
+cic_base[full_graph]==0.1.3a3+build.984b5cff
--- a/apps/cic-ussd/.config/app.ini
+++ b/apps/cic-ussd/.config/app.ini
@@ -1,7 +1,7 @@
 [app]
 ALLOWED_IP=0.0.0.0/0
 LOCALE_FALLBACK=en
-LOCALE_PATH=var/lib/locale/
+LOCALE_PATH=/usr/src/cic-ussd/var/lib/locale/
 MAX_BODY_LENGTH=1024
 PASSWORD_PEPPER=QYbzKff6NhiQzY3ygl2BkiKOpER8RE/Upqs/5aZWW+I=
 SERVICE_CODE=*483*46#,*483*061#,*384*96#
@@ -11,13 +11,13 @@ SUPPORT_PHONE_NUMBER=0757628885
 REGION=KE

 [ussd]
-MENU_FILE=data/ussd_menu.json
+MENU_FILE=/usr/src/data/ussd_menu.json
 user = 
 pass = 

 [statemachine]
-STATES=states/
-TRANSITIONS=transitions/
+STATES=/usr/src/cic-ussd/states/
+TRANSITIONS=/usr/src/cic-ussd/transitions/

 [client]
 host =
--- a/apps/cic-ussd/.config/pgp.ini
+++ b/apps/cic-ussd/.config/pgp.ini
@@ -1,5 +1,5 @@
 [pgp]
-export_dir = pgp/keys/
+export_dir = /usr/src/pgp/keys/
 keys_path = /usr/src/secrets/
 private_keys = privatekeys_meta.asc
 passphrase =
--- a/apps/cic-ussd/.dockerignore
+++ b/apps/cic-ussd/.dockerignore
@@ -1,4 +0,0 @@
-.git
-.cache
-.dot
-**/doc
--- a/apps/cic-ussd/.gitlab-ci.yml
+++ b/apps/cic-ussd/.gitlab-ci.yml
@@ -1,52 +1,22 @@
 .cic_ussd_variables:
    variables:
        APP_NAME: cic-ussd
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile
+
+.cic_ussd_changes_target:
+    rules:
+        - changes:
+            - $CONTEXT/$APP_NAME/*

 build-mr-cic-ussd:
    extends:
+        - .cic_ussd_changes_target
        - .py_build_merge_request
        - .cic_ussd_variables
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/cic-ussd/**/*
-      when: always
-
-test-mr-cic-ussd:
-    stage: test
-    extends:
-        - .cic_ussd_variables
-    cache:
-        key:
-            files:
-                - test_requirements.txt
-        paths:
-        - /root/.cache/pip
-    image: $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_eth --cov-fail-under=90 --cov-report term-missing tests
-    needs: ["build-mr-cic-ussd"]
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/$APP_NAME/**/*
-      when: always

 build-push-cic-ussd:
    extends:
        - .py_build_push
        - .cic_ussd_variables
-    rules:
-    - if:  $CI_COMMIT_BRANCH == "master"
-      changes:
-          - apps/cic-ussd/**/*
-      when: always


--- a/apps/cic-ussd/docker/Dockerfile
+++ b/apps/cic-ussd/docker/Dockerfile
@@ -1,5 +1,14 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
+# FROM python:3.8.5-alpine
+FROM python:3.8.6-slim-buster
+
+# set working directory
+WORKDIR /usr/src
+
+# add args for installing from self-hosted packages
+ARG pip_extra_index_url_flag='--extra-index-url https://pip.grassrootseconomics.net:8433'
+
+RUN apt-get update && \
+	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps git

 # create secrets directory
 RUN mkdir -vp pgp/keys
@@ -8,25 +17,39 @@ RUN mkdir -vp pgp/keys
 RUN mkdir -vp cic-ussd
 RUN mkdir -vp data

-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 .
+COPY cic-ussd/setup.cfg \
+     cic-ussd/setup.py \
+     cic-ussd/

-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 \
-    -r requirements.txt
+COPY cic-ussd/requirements.txt \
+     cic-ussd/test_requirements.txt \
+     cic-ussd/

-COPY . .
-RUN python setup.py install
+# install requirements
+RUN cd cic-ussd && \
+    pip install -r requirements.txt $pip_extra_index_url_flag

-COPY cic_ussd/db/ussd_menu.json data/
+# copy all necessary files
+COPY cic-ussd/cic_ussd/ cic-ussd/cic_ussd/
+COPY cic-ussd/cic_ussd/db/ussd_menu.json data/
+COPY cic-ussd/scripts/ cic-ussd/scripts/
+COPY cic-ussd/states/ cic-ussd/states/
+COPY cic-ussd/transitions/ cic-ussd/transitions/
+COPY cic-ussd/var/ cic-ussd/var/
+
+COPY cic-ussd/docker/db.sh \
+     cic-ussd/docker/start_cic_user_tasker.sh \
+     cic-ussd/docker/start_cic_user_ussd_server.sh\
+     cic-ussd/docker/start_cic_user_server.sh\
+     /root/

-COPY docker/*.sh .
 RUN chmod +x /root/*.sh
+RUN cd cic-ussd && \
+    pip install $pip_extra_index_url_flag .
+

 # copy config and migration files to definitive file so they can be referenced in path definitions for running scripts
-COPY .config/ /usr/local/etc/cic-ussd/
-COPY cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic
+COPY cic-ussd/.config/ /usr/local/etc/cic-ussd/
+COPY cic-ussd/cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic

-ENTRYPOINT []
+WORKDIR /root
--- a/apps/cic-ussd/docker/Dockerfile_ci
+++ b/apps/cic-ussd/docker/Dockerfile_ci
@@ -1,32 +0,0 @@
-# syntax = docker/dockerfile:1.2
-FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55da5f4e as dev
-
-
-# create secrets directory
-RUN mkdir -vp pgp/keys
-
-# create application directory
-RUN mkdir -vp cic-ussd
-RUN mkdir -vp data
-
-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"
-RUN pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
-    -r requirements.txt
-
-COPY . .
-RUN python setup.py install
-
-COPY cic_ussd/db/ussd_menu.json data/
-
-COPY docker/*.sh .
-RUN chmod +x /root/*.sh
-
-# copy config and migration files to definitive file so they can be referenced in path definitions for running scripts
-COPY .config/ /usr/local/etc/cic-ussd/
-COPY cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic
-
-ENTRYPOINT []
--- a/apps/cic-ussd/docker/start_cic_user_server.sh
+++ b/apps/cic-ussd/docker/start_cic_user_server.sh
@@ -4,4 +4,4 @@

 user_server_port=${SERVER_PORT:-9500}

-/usr/local/bin/uwsgi --wsgi-file cic_ussd/runnable/daemons/cic_user_server.py --http :"$user_server_port" --pyargv "$@"
+/usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/daemons/cic_user_server.py --http :"$user_server_port" --pyargv "$@"
--- a/apps/cic-ussd/docker/start_cic_user_ussd_server.sh
+++ b/apps/cic-ussd/docker/start_cic_user_ussd_server.sh
@@ -4,4 +4,4 @@

 user_ussd_server_port=${SERVER_PORT:-9000}

-/usr/local/bin/uwsgi --wsgi-file cic_ussd/runnable/daemons/cic_user_ussd_server.py --http :"$user_ussd_server_port" --pyargv "$@"
+/usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/daemons/cic_user_ussd_server.py --http :"$user_ussd_server_port" --pyargv "$@"
--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -1,4 +1,4 @@
-cic_base[full_graph]==0.2.0a3
+cic_base[full_graph]==0.1.3a3+build.984b5cff
 cic-eth~=0.12.0a1
-cic-notify~=0.4.0a8
+cic-notify~=0.4.0a7
 cic-types~=0.1.0a11
--- a/apps/contract-migration/.dockerignore
+++ b/apps/contract-migration/.dockerignore
@@ -1,4 +0,0 @@
-.git
-.cache
-.dot
-**/doc
--- a/apps/contract-migration/.gitlab-ci.yml
+++ b/apps/contract-migration/.gitlab-ci.yml
@@ -1,25 +1,20 @@
 .contract_migration_variables:
    variables:
        APP_NAME: contract-migration
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci
+
+.contract_migration_changes_target:
+    rules:
+        - changes:
+            - $CONTEXT/$APP_NAME/*

 build-mr-contract-migration:
    extends:
+        - .contract_migration_changes_target
        - .py_build_merge_request
        - .contract_migration_variables
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/contract-migration/**/*
-      when: always

 build-push-contract-migration:
    extends:
        - .py_build_push
        - .contract_migration_variables
-    rules:
-    - if: $CI_COMMIT_BRANCH == "master"
-      changes:
-          - apps/contract-migration/**/*
-      when: always
--- a/apps/contract-migration/docker/Dockerfile
+++ b/apps/contract-migration/docker/Dockerfile
@@ -25,7 +25,7 @@ RUN echo Install confini schema files && \
 	git checkout $cic_config_commit && \	
 	cp -v *.ini $CONFINI_DIR

-COPY requirements.txt . 
+COPY contract-migration/requirements.txt . 

 ARG pip_index_url=https://pypi.org/simple
 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
@@ -38,5 +38,5 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
    --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
    -r requirements.txt 

-COPY . .
+COPY contract-migration/ .
 RUN chmod +x *.sh
--- a/apps/contract-migration/docker/Dockerfile_ci
+++ b/apps/contract-migration/docker/Dockerfile_ci
@@ -3,11 +3,12 @@ FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-55

 WORKDIR /root

-RUN touch /etc/apt/sources.list.d/ethereum.list
-RUN echo 'deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' > /etc/apt/sources.list.d/ethereum.list
-RUN echo 'deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' >> /etc/apt/sources.list.d/ethereum.list
-RUN cat /etc/apt/sources.list.d/ethereum.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9
+# solc install which we needed for bancor. Leaving as an artfact of HOW to do it. 
+#RUN touch /etc/apt/sources.list.d/ethereum.list
+#RUN echo 'deb http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' > /etc/apt/sources.list.d/ethereum.list
+#RUN echo 'deb-src http://ppa.launchpad.net/ethereum/ethereum/ubuntu bionic main' >> /etc/apt/sources.list.d/ethereum.list
+#RUN cat /etc/apt/sources.list.d/ethereum.list
+#RUN apt-key adv --keyserver keyserver.ubuntu.com  --recv-keys 2A518C819BE37D2C2031944D1C52189C923F6CA9

 #RUN apt-get install solc

@@ -25,7 +26,7 @@ RUN echo Install confini schema files && \
 	git checkout $cic_config_commit && \	
 	cp -v *.ini $CONFINI_DIR

-COPY requirements.txt . 
+COPY contract-migration/requirements.txt . 

 ARG pip_index_url=https://pypi.org/simple
 ARG EXTRA_INDEX_URL="https://pip.grassrootseconomics.net:8433"
@@ -37,5 +38,5 @@ RUN pip install --index-url https://pypi.org/simple \
    --extra-index-url $GITLAB_PYTHON_REGISTRY --extra-index-url $EXTRA_INDEX_URL \
    -r requirements.txt 

-COPY . .
+COPY contract-migration/ .
 RUN chmod +x *.sh
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@@ -3,9 +3,14 @@
 set -a

 default_token=giftable_erc20_token
+CIC_DEFAULT_TOKEN_SYMBOL=${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
 TOKEN_SYMBOL=${CIC_DEFAULT_TOKEN_SYMBOL}
-TOKEN_NAME=${TOKEN_NAME}
+TOKEN_NAME=${TOKEN_NAME:-$TOKEN_SYMBOL}
 TOKEN_TYPE=${TOKEN_TYPE:-$default_token}
+if [ $TOKEN_TYPE == 'default' ]; then
+	>&2 echo resolving "default" token to $default_token
+	TOKEN_TYPE=$default_token
+fi
 cat <<EOF
 external token settings:
 token_type: $TOKEN_TYPE
@@ -18,6 +23,7 @@ token_supply_limit: $TOKEN_SUPPLY_LIMIT
 EOF

 CIC_CHAIN_SPEC=${CIC_CHAIN_SPEC:-evm:bloxberg:8995}
+TOKEN_SYMBOL=${TOKEN_SYMBOL:-GFT}
 DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
 DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
 DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
@@ -69,34 +75,17 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
 		./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"
 	fi

-	if [ "$TOKEN_TYPE" == "$default_token" ]; then
-		if [ -z "$TOKEN_SYMBOL" ]; then
-			>&2 echo token symbol not set, setting defaults for type $TOKEN_TYPE
-			TOKEN_SYMBOL="GFT"
-			TOKEN_NAME="Giftable Token"
-		elif [ -z "$TOKEN_NAME" ]; then
-			>&2 echo token name not set, setting same as symbol for type $TOKEN_TYPE
-			TOKEN_NAME=$TOKEN_SYMBOL
-		fi
+	if [ $TOKEN_TYPE == $default_token ]; then
 		>&2 echo deploying default token $TOKEN_TYPE
-		echo giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv
-		DEV_RESERVE_ADDRESS=`giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv`
-	elif [ "$TOKEN_TYPE" == "erc20_demurrage_token" ]; then
-		if [ -z "$TOKEN_SYMBOL" ]; then
-			>&2 echo token symbol not set, setting defaults for type $TOKEN_TYPE
-			TOKEN_SYMBOL="SARAFU"
-			TOKEN_NAME="Sarafu Token"
-		elif [ -z "$TOKEN_NAME" ]; then
-			>&2 echo token name not set, setting same as symbol for type $TOKEN_TYPE
-			TOKEN_NAME=$TOKEN_SYMBOL
-		fi
+		DEV_RESERVE_ADDRESS=`giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww --name $TOKEN_NAME --symbol $TOKEN_SYMBOL --decimals 6 -vv`
+	elif [ $TOKEN_TYPE == 'erc20_demurrage_token' ]; then
 		>&2 echo deploying token $TOKEN_TYPE
 		if [ -z $TOKEN_SINK_ADDRESS ]; then
 			if [ ! -z $TOKEN_REDISTRIBUTION_PERIOD ]; then
 				>&2 echo -e "\033[;93mtoken sink address not set, so redistribution will be BURNED\033[;39m"
 			fi
 		fi
-		DEV_RESERVE_ADDRESS=`erc20-demurrage-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL -vv -ww`
+		DEV_RESERVE_ADDRESS=`erc20-demurrage-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -ww`
 	else
 		>&2 echo unknown token type $TOKEN_TYPE
 		exit 1
--- a/apps/contract-migration/seed_cic_eth.sh
+++ b/apps/contract-migration/seed_cic_eth.sh
@@ -48,18 +48,18 @@ EOF

 >&2 echo "create account for gas gifter"
 old_gas_provider=$DEV_ETH_ACCOUNT_GAS_PROVIDER
-DEV_ETH_ACCOUNT_GAS_GIFTER=`cic-eth-create --timeout 120 $debug --redis-host $REDIS_HOST --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
+DEV_ETH_ACCOUNT_GAS_GIFTER=`cic-eth-create --timeout 120 $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_GAS_GIFTER=$DEV_ETH_ACCOUNT_GAS_GIFTER >> $env_out_file
 cic-eth-tag -i $CIC_CHAIN_SPEC GAS_GIFTER $DEV_ETH_ACCOUNT_GAS_GIFTER


 >&2 echo "create account for sarafu gifter"
-DEV_ETH_ACCOUNT_SARAFU_GIFTER=`cic-eth-create $debug --redis-host $REDIS_HOST --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
+DEV_ETH_ACCOUNT_SARAFU_GIFTER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_SARAFU_GIFTER=$DEV_ETH_ACCOUNT_SARAFU_GIFTER >> $env_out_file
 cic-eth-tag -i $CIC_CHAIN_SPEC SARAFU_GIFTER $DEV_ETH_ACCOUNT_SARAFU_GIFTER

 >&2 echo "create account for approval escrow owner"
-DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER=`cic-eth-create $debug --redis-host $REDIS_HOST --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
+DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER=$DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER >> $env_out_file
 cic-eth-tag -i $CIC_CHAIN_SPEC TRANSFER_AUTHORIZATION_OWNER $DEV_ETH_ACCOUNT_TRANSFER_AUTHORIZATION_OWNER 

@@ -69,7 +69,7 @@ cic-eth-tag -i $CIC_CHAIN_SPEC TRANSFER_AUTHORIZATION_OWNER $DEV_ETH_ACCOUNT_TRA
 #cic-eth-tag FAUCET_GIFTER $DEV_ETH_ACCOUNT_FAUCET_OWNER

 >&2 echo "create account for accounts index writer"
-DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=`cic-eth-create $debug --redis-host $REDIS_HOST --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
+DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=`cic-eth-create $debug --redis-host-callback=$REDIS_HOST --redis-port-callback=$REDIS_PORT --no-register`
 echo DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER=$DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER >> $env_out_file
 cic-eth-tag -i $CIC_CHAIN_SPEC ACCOUNT_REGISTRY_WRITER $DEV_ETH_ACCOUNT_ACCOUNT_REGISTRY_WRITER
 >&2 echo "add acccounts index writer account as writer on contract"
--- a/apps/data-seeding/.dockerignore
+++ b/apps/data-seeding/.dockerignore
@@ -1,8 +0,0 @@
-.git
-.cache
-.dot
-**/doc
-**/node_modules
-**/venv
-**/.venv
-
--- a/apps/data-seeding/.gitlab-ci.yml
+++ b/apps/data-seeding/.gitlab-ci.yml
@@ -1,26 +1,21 @@
 .data_seeding_variables:
    variables:
        APP_NAME: data-seeding
-        DOCKERFILE_PATH: docker/Dockerfile_ci
-        CONTEXT: apps/$APP_NAME
+        DOCKERFILE_PATH: $APP_NAME/docker/Dockerfile_ci
+
+.data_seeding_changes_target:
+    rules:
+        - changes:
+            - $CONTEXT/$APP_NAME/*

 build-mr-data-seeding:
    extends:
+        - .data_seeding_changes_target
        - .py_build_merge_request
        - .data_seeding_variables
-    rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      changes:
-          - apps/data-seeding/**/*
-      when: always

 build-push-data-seeding:
    extends:
        - .py_build_push
        - .data_seeding_variables
-    rules:
-    - if:  $CI_COMMIT_BRANCH == "master"
-      changes:
-          - apps/data-seeding/**/*
-      when: always

--- a/apps/data-seeding/cic_eth/import_balance.py
+++ b/apps/data-seeding/cic_eth/import_balance.py
@@ -11,6 +11,7 @@ import csv
 import json

 # external imports
+import eth_abi
 import confini
 from hexathon import (
        strip_0x,
@@ -28,10 +29,7 @@ from chainlib.eth.gas import OverrideGasOracle
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import TxFactory
 from chainlib.jsonrpc import JSONRPCRequest
-from chainlib.eth.error import (
-        EthException,
-        RequestMismatchException,
-        )
+from chainlib.eth.error import EthException
 from chainlib.chain import ChainSpec
 from chainlib.eth.constant import ZERO_ADDRESS
 from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
@@ -39,9 +37,6 @@ from crypto_dev_signer.keystore.dict import DictKeystore
 from cic_types.models.person import Person
 from eth_erc20 import ERC20
 from cic_base.eth.syncer import chain_interface
-from eth_accounts_index import AccountsIndex
-from eth_contract_registry import Registry
-from eth_token_index import TokenUniqueSymbolIndex


 logging.basicConfig(level=logging.WARNING)
@@ -136,52 +131,58 @@ class Handler:
            logg.debug('no payload, skipping {}'.format(tx))
            return

-        recipient = None
-        try:
-            r = AccountsIndex.parse_add_request(tx.payload)
-        except RequestMismatchException:
-            return
-        recipient = r[0]
-        
-        user_file = 'new/{}/{}/{}.json'.format(
-                recipient[2:4].upper(),
-                recipient[4:6].upper(),
-                recipient[2:].upper(),
-                )
-        filepath = os.path.join(self.user_dir, user_file)
-        o = None
-        try:
-            f = open(filepath, 'r')
-            o = json.load(f)
+        if tx.payload[:8] == self.account_index_add_signature:
+            recipient = eth_abi.decode_single('address', bytes.fromhex(tx.payload[-64:]))
+            #original_address = to_checksum_address(self.addresses[to_checksum_address(recipient)])
+            user_file = 'new/{}/{}/{}.json'.format(
+                    recipient[2:4].upper(),
+                    recipient[4:6].upper(),
+                    recipient[2:].upper(),
+                    )
+            filepath = os.path.join(self.user_dir, user_file)
+            o = None
+            try:
+                f = open(filepath, 'r')
+                o = json.load(f)
+                f.close()
+            except FileNotFoundError:
+                logg.error('no import record of address {}'.format(recipient))
+                return
+            u = Person.deserialize(o)
+            original_address = u.identities[old_chain_spec.engine()]['{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())][0]
+            try:
+                balance = self.balances[original_address]
+            except KeyError as e:
+                logg.error('balance get fail orig {} new {}'.format(original_address, recipient))
+                return
+
+            # TODO: store token object in handler ,get decimals from there
+            multiplier = 10**6
+            balance_full = balance * multiplier
+            logg.info('registered {} originally {} ({}) tx hash {} balance {}'.format(recipient, original_address, u, tx.hash, balance_full))
+
+            (tx_hash_hex, o) = self.tx_factory.transfer(self.token_address, signer_address, recipient, balance_full)
+            logg.info('submitting erc20 transfer tx {} for recipient {}'.format(tx_hash_hex, recipient))
+            r = conn.do(o)
+
+            tx_path = os.path.join(
+                    user_dir,
+                    'txs',
+                    strip_0x(tx_hash_hex),
+                    )
+            f = open(tx_path, 'w')
+            f.write(strip_0x(o['params'][0]))
            f.close()
-        except FileNotFoundError:
-            logg.error('no import record of address {}'.format(recipient))
-            return
-        u = Person.deserialize(o)
-        original_address = u.identities[old_chain_spec.engine()]['{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())][0]
-        try:
-            balance = self.balances[original_address]
-        except KeyError as e:
-            logg.error('balance get fail orig {} new {}'.format(original_address, recipient))
-            return
-
-        # TODO: store token object in handler ,get decimals from there
-        multiplier = 10**6
-        balance_full = balance * multiplier
-        logg.info('registered {} originally {} ({}) tx hash {} balance {}'.format(recipient, original_address, u, tx.hash, balance_full))
-
-        (tx_hash_hex, o) = self.tx_factory.transfer(self.token_address, signer_address, recipient, balance_full)
-        logg.info('submitting erc20 transfer tx {} for recipient {}'.format(tx_hash_hex, recipient))
-        r = conn.do(o)
-
-        tx_path = os.path.join(
-                user_dir,
-                'txs',
-                strip_0x(tx_hash_hex),
-                )
-        f = open(tx_path, 'w')
-        f.write(strip_0x(o['params'][0]))
-        f.close()
+#        except TypeError as e:
+#            logg.warning('typerror {}'.format(e))
+#            pass
+#        except IndexError as e:
+#            logg.warning('indexerror {}'.format(e))
+#            pass
+#        except EthException as e:
+#            logg.error('send error {}'.format(e).ljust(200))
+        #except KeyError as e:
+        #    logg.error('key record not found in imports: {}'.format(e).ljust(200))


 def progress_callback(block_number, tx_index):
@@ -197,26 +198,49 @@ def main():
    nonce_oracle = RPCNonceOracle(signer_address, conn)

    # Get Token registry address
-    registry = Registry(chain_spec)
-    o = registry.address_of(config.get('CIC_REGISTRY_ADDRESS'), 'TokenRegistry')
+    txf = TxFactory(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=None)
+    tx = txf.template(signer_address, config.get('CIC_REGISTRY_ADDRESS'))
+
+    registry_addressof_method = keccak256_string_to_hex('addressOf(bytes32)')[:8]
+    data = add_0x(registry_addressof_method)
+    data += eth_abi.encode_single('bytes32', b'TokenRegistry').hex()
+    txf.set_code(tx, data)
+   
+    j = JSONRPCRequest()
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    token_index_address = registry.parse_address_of(r)
-    token_index_address = to_checksum_address(token_index_address)
+    token_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found token index address {}'.format(token_index_address))
-    
+
+
    # Get Sarafu token address
-    token_index = TokenUniqueSymbolIndex(chain_spec)
-    o = token_index.address_of(token_index_address, token_symbol)
+    tx = txf.template(signer_address, token_index_address)
+    data = add_0x(registry_addressof_method)
+    h = hashlib.new('sha256')
+    h.update(token_symbol.encode('utf-8'))
+    z = h.digest()
+    data += eth_abi.encode_single('bytes32', z).hex()
+    txf.set_code(tx, data)
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    token_address = token_index.parse_address_of(r)
    try:
-        token_address = to_checksum_address(token_address)
+        sarafu_token_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    except ValueError as e:
        logg.critical('lookup failed for token {}: {}'.format(token_symbol, e))
        sys.exit(1)
-    logg.info('found token address {}'.format(token_address))
-    
-    sys.exit(0)
+
+    if sarafu_token_address == ZERO_ADDRESS:
+        raise KeyError('token address for symbol {} is zero'.format(token_symbol))
+
+    logg.info('found token address {}'.format(sarafu_token_address))

    syncer_backend = MemBackend(chain_str, 0)

@@ -224,6 +248,22 @@ def main():
        o = block_latest()
        r = conn.do(o)
        block_offset = int(strip_0x(r), 16) + 1
+#
+#    addresses = {}
+#    f = open('{}/addresses.csv'.format(user_dir, 'r'))
+#    while True:
+#        l = f.readline()
+#        if l == None:
+#            break
+#        r = l.split(',')
+#        try:
+#            k = r[0]
+#            v = r[1].rstrip()
+#            addresses[k] = v
+#            sys.stdout.write('loading address mapping {} -> {}'.format(k, v).ljust(200) + "\r")
+#        except IndexError as e:
+#            break
+#    f.close()

    # TODO get decimals from token
    balances = {}
--- a/apps/data-seeding/cic_ussd/import_ussd_data.py
+++ b/apps/data-seeding/cic_ussd/import_ussd_data.py
@@ -17,7 +17,7 @@ default_config_dir = '/usr/local/etc/cic'

 arg_parser = argparse.ArgumentParser()
 arg_parser.add_argument('-c', type=str, default=default_config_dir, help='config file')
-arg_parser.add_argument('-q', type=str, default='cic-import-ussd', help='Task queue')
+arg_parser.add_argument('-q', type=str, default='cic-eth', help='Task queue')
 arg_parser.add_argument('-v', action='store_true', help='Be verbose')
 arg_parser.add_argument('-vv', action='store_true', help='Be more verbose')
 arg_parser.add_argument('user_dir', type=str, help='path to users export dir tree')
--- a/apps/data-seeding/docker/Dockerfile
+++ b/apps/data-seeding/docker/Dockerfile
@@ -5,13 +5,13 @@ WORKDIR /root

 RUN mkdir -vp /usr/local/etc/cic

-COPY package.json \
-     package-lock.json \
+COPY data-seeding/package.json \
+     data-seeding/package-lock.json \
     .

 RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install

-COPY requirements.txt . 
+COPY data-seeding/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"
@@ -19,6 +19,6 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip pip install \
    --extra-index-url $GITLAB_PYTHON_REGISTRY \
    --extra-index-url $EXTRA_INDEX_URL -r requirements.txt

-COPY . . 
+COPY data-seeding/ . 

 ENTRYPOINT [ ]
--- a/apps/data-seeding/docker/Dockerfile_ci
+++ b/apps/data-seeding/docker/Dockerfile_ci
@@ -5,13 +5,13 @@ WORKDIR /root

 RUN mkdir -vp /usr/local/etc/cic

-COPY package.json \
-     package-lock.json \
+COPY data-seeding/package.json \
+     data-seeding/package-lock.json \
     .

 RUN npm install

-COPY requirements.txt . 
+COPY data-seeding/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"
@@ -19,6 +19,6 @@ RUN pip install \
    --extra-index-url $GITLAB_PYTHON_REGISTRY \
    --extra-index-url $EXTRA_INDEX_URL -r requirements.txt

-COPY . . 
+COPY data-seeding/ . 

 ENTRYPOINT [ ]
--- a/apps/data-seeding/eth/import_balance.py
+++ b/apps/data-seeding/eth/import_balance.py
@@ -11,6 +11,7 @@ import csv
 import json

 # external imports
+import eth_abi
 import confini
 from hexathon import (
        strip_0x,
@@ -28,20 +29,13 @@ from chainlib.eth.gas import OverrideGasOracle
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import TxFactory
 from chainlib.jsonrpc import JSONRPCRequest
-from chainlib.eth.error import (
-        EthException,
-        RequestMismatchException,
-        )
+from chainlib.eth.error import EthException
 from chainlib.chain import ChainSpec
 from crypto_dev_signer.eth.signer import ReferenceSigner as EIP155Signer
 from crypto_dev_signer.keystore.dict import DictKeystore
 from cic_types.models.person import Person
 from eth_erc20 import ERC20
 from cic_base.eth.syncer import chain_interface
-from eth_accounts_index import AccountsIndex
-from eth_contract_registry import Registry
-from eth_token_index import TokenUniqueSymbolIndex
-from erc20_faucet import Faucet


 logging.basicConfig(level=logging.WARNING)
@@ -56,7 +50,7 @@ argparser.add_argument('-c', type=str, default=config_dir, help='config root to
 argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
 argparser.add_argument('-i', '--chain-spec', type=str, dest='i', help='chain spec')
 argparser.add_argument('-r', '--registry-address', type=str, dest='r', help='CIC Registry address')
-argparser.add_argument('--token-symbol', default='GFT', type=str, dest='token_symbol', help='Token symbol to use for trnsactions')
+argparser.add_argument('--token-symbol', default='SRF', type=str, dest='token_symbol', help='Token symbol to use for trnsactions')
 argparser.add_argument('--head', action='store_true', help='start at current block height (overrides --offset)')
 argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
 argparser.add_argument('-q', type=str, default='cic-eth', help='celery queue to submit transaction tasks to')
@@ -118,16 +112,12 @@ class Handler:

    account_index_add_signature = keccak256_string_to_hex('add(address)')[:8]

-    def __init__(self, conn, chain_spec, user_dir, balances, token_address, faucet_address, signer_address, signer, gas_oracle, nonce_oracle):
+    def __init__(self, conn, chain_spec, user_dir, balances, token_address, signer, gas_oracle, nonce_oracle):
        self.token_address = token_address
-        self.faucet_address = faucet_address
        self.user_dir = user_dir
        self.balances = balances
        self.chain_spec = chain_spec
-        self.nonce_oracle = nonce_oracle
-        self.gas_oracle = gas_oracle
-        self.signer_address = signer_address
-        self.signer = signer
+        self.tx_factory = ERC20(chain_spec, signer, gas_oracle, nonce_oracle)


    def name(self):
@@ -139,59 +129,58 @@ class Handler:
            logg.debug('no payload, skipping {}'.format(tx))
            return

-        recipient = None
-        try:
-            r = AccountsIndex.parse_add_request(tx.payload)
-        except RequestMismatchException:
-            return
-        recipient = r[0]
-        
-        user_file = 'new/{}/{}/{}.json'.format(
-                recipient[2:4].upper(),
-                recipient[4:6].upper(),
-                recipient[2:].upper(),
-                )
-        filepath = os.path.join(self.user_dir, user_file)
-        o = None
-        try:
-            f = open(filepath, 'r')
-            o = json.load(f)
+        if tx.payload[:8] == self.account_index_add_signature:
+            recipient = eth_abi.decode_single('address', bytes.fromhex(tx.payload[-64:]))
+            #original_address = to_checksum_address(self.addresses[to_checksum_address(recipient)])
+            user_file = 'new/{}/{}/{}.json'.format(
+                    recipient[2:4].upper(),
+                    recipient[4:6].upper(),
+                    recipient[2:].upper(),
+                    )
+            filepath = os.path.join(self.user_dir, user_file)
+            o = None
+            try:
+                f = open(filepath, 'r')
+                o = json.load(f)
+                f.close()
+            except FileNotFoundError:
+                logg.error('no import record of address {}'.format(recipient))
+                return
+            u = Person.deserialize(o)
+            original_address = u.identities[old_chain_spec.engine()]['{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())][0]
+            try:
+                balance = self.balances[original_address]
+            except KeyError as e:
+                logg.error('balance get fail orig {} new {}'.format(original_address, recipient))
+                return
+
+            # TODO: store token object in handler ,get decimals from there
+            multiplier = 10**6
+            balance_full = balance * multiplier
+            logg.info('registered {} originally {} ({}) tx hash {} balance {}'.format(recipient, original_address, u, tx.hash, balance_full))
+
+            (tx_hash_hex, o) = self.tx_factory.transfer(self.token_address, signer_address, recipient, balance_full)
+            logg.info('submitting erc20 transfer tx {} for recipient {}'.format(tx_hash_hex, recipient))
+            r = conn.do(o)
+
+            tx_path = os.path.join(
+                    user_dir,
+                    'txs',
+                    strip_0x(tx_hash_hex),
+                    )
+            f = open(tx_path, 'w')
+            f.write(strip_0x(o['params'][0]))
            f.close()
-        except FileNotFoundError:
-            logg.error('no import record of address {}'.format(recipient))
-            return
-        u = Person.deserialize(o)
-        original_address = u.identities[old_chain_spec.engine()]['{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())][0]
-        try:
-            balance = self.balances[original_address]
-        except KeyError as e:
-            logg.error('balance get fail orig {} new {}'.format(original_address, recipient))
-            return
-
-        # TODO: store token object in handler ,get decimals from there
-        erc20 = ERC20(self.chain_spec, signer=self.signer, gas_oracle=self.gas_oracle, nonce_oracle=self.nonce_oracle)
-        o = erc20.decimals(self.token_address)
-        r = conn.do(o)
-        decimals = erc20.parse_decimals(r)
-        multiplier = 10 ** decimals
-        balance_full = balance * multiplier
-        logg.info('registered {} originally {} ({}) tx hash {} balance {}'.format(recipient, original_address, u, tx.hash, balance_full))
-        (tx_hash_hex, o) = erc20.transfer(self.token_address, self.signer_address, recipient, balance_full)
-        logg.info('submitting erc20 transfer tx {} for recipient {}'.format(tx_hash_hex, recipient))
-        r = conn.do(o)
-
-        tx_path = os.path.join(
-                user_dir,
-                'txs',
-                strip_0x(tx_hash_hex),
-                )
-        f = open(tx_path, 'w')
-        f.write(strip_0x(o['params'][0]))
-        f.close()
-
-        faucet = Faucet(self.chain_spec, signer=self.signer, gas_oracle=self.gas_oracle, nonce_oracle=self.nonce_oracle)
-        (tx_hash, o) = faucet.give_to(self.faucet_address, self.signer_address, recipient)
-        r = conn.do(o)
+#        except TypeError as e:
+#            logg.warning('typerror {}'.format(e))
+#            pass
+#        except IndexError as e:
+#            logg.warning('indexerror {}'.format(e))
+#            pass
+#        except EthException as e:
+#            logg.error('send error {}'.format(e).ljust(200))
+        #except KeyError as e:
+        #    logg.error('key record not found in imports: {}'.format(e).ljust(200))


 def progress_callback(block_number, tx_index):
@@ -207,31 +196,45 @@ def main():
    nonce_oracle = RPCNonceOracle(signer_address, conn)

    # Get Token registry address
-    registry = Registry(chain_spec)
-    o = registry.address_of(config.get('CIC_REGISTRY_ADDRESS'), 'TokenRegistry')
+    txf = TxFactory(chain_spec, signer=signer, gas_oracle=gas_oracle, nonce_oracle=None)
+    tx = txf.template(signer_address, config.get('CIC_REGISTRY_ADDRESS'))
+
+    registry_addressof_method = keccak256_string_to_hex('addressOf(bytes32)')[:8]
+    data = add_0x(registry_addressof_method)
+    data += eth_abi.encode_single('bytes32', b'TokenRegistry').hex()
+    txf.set_code(tx, data)
+   
+    j = JSONRPCRequest()
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    token_index_address = registry.parse_address_of(r)
-    token_index_address = to_checksum_address(token_index_address)
+    token_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found token index address {}'.format(token_index_address))
-    
-    # Get Faucet address
-    o = registry.address_of(config.get('CIC_REGISTRY_ADDRESS'), 'Faucet')
-    r = conn.do(o)
-    faucet_address = registry.parse_address_of(r)
-    faucet_address = to_checksum_address(faucet_address)
-    logg.info('found faucet {}'.format(faucet_address))
+

    # Get Sarafu token address
-    token_index = TokenUniqueSymbolIndex(chain_spec)
-    o = token_index.address_of(token_index_address, token_symbol)
+    tx = txf.template(signer_address, token_index_address)
+    data = add_0x(registry_addressof_method)
+    h = hashlib.new('sha256')
+    h.update(token_symbol.encode('utf-8'))
+    z = h.digest()
+    data += eth_abi.encode_single('bytes32', z).hex()
+    txf.set_code(tx, data)
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    token_address = token_index.parse_address_of(r)
    try:
-        token_address = to_checksum_address(token_address)
+        sarafu_token_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    except ValueError as e:
        logg.critical('lookup failed for token {}: {}'.format(token_symbol, e))
        sys.exit(1)
-    logg.info('found token address {}'.format(token_address))
+    logg.info('found token address {}'.format(sarafu_token_address))

    syncer_backend = MemBackend(chain_str, 0)

@@ -239,6 +242,22 @@ def main():
        o = block_latest()
        r = conn.do(o)
        block_offset = int(strip_0x(r), 16) + 1
+#
+#    addresses = {}
+#    f = open('{}/addresses.csv'.format(user_dir, 'r'))
+#    while True:
+#        l = f.readline()
+#        if l == None:
+#            break
+#        r = l.split(',')
+#        try:
+#            k = r[0]
+#            v = r[1].rstrip()
+#            addresses[k] = v
+#            sys.stdout.write('loading address mapping {} -> {}'.format(k, v).ljust(200) + "\r")
+#        except IndexError as e:
+#            break
+#    f.close()

    # TODO get decimals from token
    balances = {}
@@ -263,7 +282,7 @@ def main():

    syncer_backend.set(block_offset, 0)
    syncer = HeadSyncer(syncer_backend, chain_interface, block_callback=progress_callback)
-    handler = Handler(conn, chain_spec, user_dir, balances, token_address, faucet_address, signer_address, signer, gas_oracle, nonce_oracle)
+    handler = Handler(conn, chain_spec, user_dir, balances, sarafu_token_address, signer, gas_oracle, nonce_oracle)
    syncer.add_filter(handler)
    syncer.loop(1, conn)
    
--- a/apps/data-seeding/requirements.txt
+++ b/apps/data-seeding/requirements.txt
@@ -1,12 +1,4 @@
-sarafu-faucet==0.0.4a3
-cic-eth[tools]==0.12.1a1
+sarafu-faucet==0.0.4a1
+cic-eth[tools]==0.12.0a1
 cic-types==0.1.0a13
-crypto-dev-signer==0.4.14b7
-faker==4.17.1
-chainsyncer~=0.0.3a3
-chainlib-eth~=0.0.5a1
-eth-address-index~=0.1.2a1
-eth-contract-registry~=0.5.6a1
-eth-accounts-index~=0.0.12a1
-eth-erc20~=0.0.10a3
-erc20-faucet~=0.2.2a1
+crypto-dev-signer==0.4.14b6
--- a/apps/data-seeding/verify.py
+++ b/apps/data-seeding/verify.py
@@ -14,6 +14,7 @@ import urllib.parse
 # external imports
 import celery
 import confini
+import eth_abi
 from chainlib.chain import ChainSpec
 from chainlib.eth.address import to_checksum_address
 from chainlib.eth.connection import EthHTTPConnection
@@ -32,9 +33,6 @@ from cic_types.models.person import (
 from erc20_faucet import Faucet
 from eth_erc20 import ERC20
 from hexathon.parse import strip_0x, add_0x
-from eth_contract_registry import Registry
-from eth_accounts_index import AccountsIndex
-from eth_token_index import TokenUniqueSymbolIndex

 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -45,8 +43,7 @@ custodial_tests = [
        'local_key',
        'gas',
        'faucet',
-        'ussd',
-        'ussd_pins',
+        'ussd'
        ]

 metadata_tests = [
@@ -74,7 +71,6 @@ argparser.add_argument('-i', '--chain-spec', type=str, dest='i', help='chain spe
 argparser.add_argument('--meta-provider', type=str, dest='meta_provider', default='http://localhost:63380', help='cic-meta url')
 argparser.add_argument('--ussd-provider', type=str, dest='ussd_provider', default='http://localhost:63315', help='cic-ussd url')
 argparser.add_argument('--skip-custodial', dest='skip_custodial', action='store_true', help='skip all custodial verifications')
-argparser.add_argument('--skip-metadata', dest='skip_metadata', action='store_true', help='skip all metadata verifications')
 argparser.add_argument('--exclude', action='append', type=str, default=[], help='skip specified verification')
 argparser.add_argument('--include', action='append', type=str, help='include specified verification')
 argparser.add_argument('--token-symbol', default='GFT', type=str, dest='token_symbol', help='Token symbol to use for trnsactions')
@@ -134,11 +130,6 @@ if args.skip_custodial:
    for t in custodial_tests:
        if t not in exclude:
            exclude.append(t)
-if args.skip_metadata:
-    logg.info('will skip all metadata verifications ({})'.format(','.join(metadata_tests)))
-    for t in metadata_tests:
-        if t not in exclude:
-            exclude.append(t)
 for t in include:
    if t not in all_tests:
        raise ValueError('Cannot include unknown verification "{}"'.format(t))
@@ -149,7 +140,7 @@ for t in include:
 api = None
 for t in custodial_tests:
    if t in active_tests:
-        from cic_eth.api.admin import AdminApi
+        from cic_eth.api.api_admin import AdminApi
        api = AdminApi(None)
        logg.info('activating custodial module'.format(t))
        break
@@ -272,11 +263,19 @@ class Verifier:


    def verify_accounts_index(self, address, balance=None):
-        accounts_index = AccountsIndex(self.chain_spec)
-        o = accounts_index.have(self.index_address, address)
+        tx = self.tx_factory.template(ZERO_ADDRESS, self.index_address)
+        data = keccak256_string_to_hex('have(address)')[:8]
+        data += eth_abi.encode_single('address', address).hex()
+        tx = self.tx_factory.set_code(tx, data)
+        tx = self.tx_factory.normalize(tx)
+        j = JSONRPCRequest()
+        o = j.template()
+        o['method'] = 'eth_call'
+        o['params'].append(tx)
+        o = j.finalize(o)
        r = self.conn.do(o)
-        n = accounts_index.parse_have(r)
-        logg.debug('index check for {}: {}'.format(address, n))
+        logg.debug('index check for {}: {}'.format(address, r))
+        n = eth_abi.decode_single('uint256', bytes.fromhex(strip_0x(r)))
        if n != 1:
            raise VerifierError(n, 'accounts index')

@@ -428,39 +427,70 @@ def main():
    gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)

    # Get Token registry address
-    registry = Registry(chain_spec)
-    o = registry.address_of(config.get('CIC_REGISTRY_ADDRESS'), 'TokenRegistry')
+    txf = TxFactory(chain_spec, signer=None, gas_oracle=gas_oracle, nonce_oracle=None)
+    tx = txf.template(ZERO_ADDRESS, config.get('CIC_REGISTRY_ADDRESS'))
+
+    # TODO: replace with cic-eth-registry
+    registry_addressof_method = keccak256_string_to_hex('addressOf(bytes32)')[:8]
+    data = add_0x(registry_addressof_method)
+    data += eth_abi.encode_single('bytes32', b'TokenRegistry').hex()
+    txf.set_code(tx, data)
+    
+    j = JSONRPCRequest()
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    token_index_address = registry.parse_address_of(r)
-    token_index_address = to_checksum_address(token_index_address)
+    token_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found token index address {}'.format(token_index_address))

-    # Get Account registry address
-    o = registry.address_of(config.get('CIC_REGISTRY_ADDRESS'), 'AccountRegistry')
+    data = add_0x(registry_addressof_method)
+    data += eth_abi.encode_single('bytes32', b'AccountRegistry').hex()
+    txf.set_code(tx, data)
+    
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    account_index_address = registry.parse_address_of(r)
-    account_index_address = to_checksum_address(account_index_address)
+    account_index_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found account index address {}'.format(account_index_address))

-    # Get Faucet address
-    o = registry.address_of(config.get('CIC_REGISTRY_ADDRESS'), 'Faucet')
+    data = add_0x(registry_addressof_method)
+    data += eth_abi.encode_single('bytes32', b'Faucet').hex()
+    txf.set_code(tx, data)
+    
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    faucet_address = registry.parse_address_of(r)
-    faucet_index_address = to_checksum_address(token_index_address)
+    faucet_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
    logg.info('found faucet {}'.format(faucet_address))

-# Get Sarafu token address
-    token_index = TokenUniqueSymbolIndex(chain_spec)
-    o = token_index.address_of(token_index_address, token_symbol)
+
+
+    # Get Sarafu token address
+    tx = txf.template(ZERO_ADDRESS, token_index_address)
+    data = add_0x(registry_addressof_method)
+    h = hashlib.new('sha256')
+    h.update(token_symbol.encode('utf-8'))
+    z = h.digest()
+    data += eth_abi.encode_single('bytes32', z).hex()
+    txf.set_code(tx, data)
+    o = j.template()
+    o['method'] = 'eth_call'
+    o['params'].append(txf.normalize(tx))
+    o['params'].append('latest')
+    o = j.finalize(o)
    r = conn.do(o)
-    token_address = token_index.parse_address_of(r)
-    try:
-        token_address = to_checksum_address(token_address)
-    except ValueError as e:
-        logg.critical('lookup failed for token {}: {}'.format(token_symbol, e))
-        sys.exit(1)
-    logg.info('found token address {}'.format(token_address))
- 
+    sarafu_token_address = to_checksum_address(eth_abi.decode_single('address', bytes.fromhex(strip_0x(r))))
+    logg.info('found token address {}'.format(sarafu_token_address))
+
    balances = {}
    f = open('{}/balances.csv'.format(user_dir, 'r'))
    i = 0
@@ -481,7 +511,7 @@ def main():

    f.close()

-    verifier = Verifier(conn, api, gas_oracle, chain_spec, account_index_address, token_address, faucet_address, user_dir, exit_on_error)
+    verifier = Verifier(conn, api, gas_oracle, chain_spec, account_index_address, sarafu_token_address, faucet_address, user_dir, exit_on_error)

    user_new_dir = os.path.join(user_dir, 'new')
    i = 0
--- a/ci_templates/.cic-template.yml
+++ b/ci_templates/.cic-template.yml
@@ -3,29 +3,30 @@ image:
  entrypoint: [""]

 variables:
-  KANIKO_CACHE_ARGS: "--cache=true --cache-copy-layers=true --cache-ttl=24h"
-  MR_IMAGE_TAG: $CI_REGISTRY_IMAGE/mergerequest/$APP_NAME:$CI_COMMIT_SHORT_SHA
+  KANIKO_CACHE_ARGS: "--cache=false --cache-copy-layers=true --cache-ttl=24h"
+  CONTEXT: $CI_PROJECT_DIR/apps/

 .py_build_merge_request:
  stage: build
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - mkdir -p /kaniko/.docker
    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
-    - > 
-      /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS
-      --cache-repo $CI_REGISTRY_IMAGE --destination $MR_IMAGE_TAG 
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --no-push
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always

-.py_build_target_dev:
+.py_build_target_test:
  stage: build
  variables:
    IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:mr-unittest-$CI_COMMIT_SHORT_SHA
  script:
    - mkdir -p /kaniko/.docker
    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
-    - > 
-      /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS
-      --cache-repo $CI_REGISTRY_IMAGE --target dev  --skip-unused-stages 
-      --destination $MR_IMAGE_TAG
+    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --cache-repo $CI_REGISTRY_IMAGE --target test --destination $IMAGE_TAG_BASE
+

 .py_build_push:
  stage: build
@@ -38,6 +39,9 @@ variables:
    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > "/kaniko/.docker/config.json"
    # - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG
    - /kaniko/executor --context $CONTEXT --dockerfile $DOCKERFILE_PATH $KANIKO_CACHE_ARGS --destination $IMAGE_TAG --destination $CI_REGISTRY_IMAGE/$APP_NAME:latest
+  rules:
+      - if: $CI_COMMIT_BRANCH == "master"
+        when: always



--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,11 +72,12 @@ services:

  contract-migration:
    build:
-      context: apps/contract-migration
-      dockerfile: docker/Dockerfile
+      dockerfile: contract-migration/docker/Dockerfile
+        #      target: compile-image
      args:
        pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple}
        pip_extra_args: $PIP_EXTRA_ARGS
+      context: apps/
    # image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:latest
    environment:
      # ETH_PROVIDER should be broken out into host/port but cic-eth expects this
@@ -103,14 +104,14 @@ services:
      DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0}
      #DEV_SARAFU_DEMURRAGE_LEVEL: ${DEV_SARAFU_DEMURRAGE_LEVEL:-196454828847045000000000000000000}
      DEV_ETH_GAS_PRICE: ${DEV_ETH_GAS_PRICE:-1}
-      CIC_DEFAULT_TOKEN_SYMBOL: $CIC_DEFAULT_TOKEN_SYMBOL
+      CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
      TOKEN_NAME: $TOKEN_NAME
      TOKEN_DECIMALS: $TOKEN_DECIMALS
      TOKEN_REDISTRIBUTION_PERIOD: $TOKEN_REDISTRIBUTION_PERIOD
      TOKEN_SUPPLY_LIMIT: $TOKEN_SUPPLY_LIMIT
      TOKEN_DEMURRAGE_LEVEL: ${TOKEN_DEMURRAGE_LEVEL:-196454828847045000000000000000000}
      TOKEN_SINK_ADDRESS: $TOKEN_SINK_ADDRESS
-      TOKEN_TYPE: $TOKEN_TYPE
+      TOKEN_TYPE: ${TOKEN_TYPE:-default}
        #CONFINI_DIR: ${CONFINI_DIR:-/tmp/cic/config}
    command: ["./run_job.sh"]
        #command: ["./reset.sh"]
@@ -124,8 +125,8 @@ services:

  cic-cache-tracker:
    build:
-      context: apps/cic-cache
-      dockerfile: docker/Dockerfile
+      context: apps
+      dockerfile: cic-cache/docker/Dockerfile
    environment:
      CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS # supplied at contract-config after contract provisioning
      ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
@@ -160,8 +161,8 @@ services:

  cic-cache-tasker:
    build:
-      context: apps/cic-cache
-      dockerfile: docker/Dockerfile
+      context: apps
+      dockerfile: cic-cache/docker/Dockerfile
    environment:
      CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS # supplied at contract-config after contract provisioning
      ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
@@ -196,9 +197,9 @@ services:
      - contract-config:/tmp/cic/config/:ro

  cic-cache-server:
-    build:
-      context: apps/cic-cache
-      dockerfile: docker/Dockerfile
+    build: 
+        context: apps
+        dockerfile: cic-cache/docker/Dockerfile
    environment:
      DATABASE_USER: ${DATABASE_USER:-grassroots}
      DATABASE_HOST: ${DATABASE_HOST:-postgres}
@@ -229,9 +230,8 @@ services:
  cic-eth-tasker:
    # image: grassrootseconomics:cic-eth-service
    build: 
-        context: apps/cic-eth
-        dockerfile: docker/Dockerfile
-        target: dev
+        context: apps/
+        dockerfile: cic-eth/docker/Dockerfile
    environment:
      CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
      ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER
@@ -279,9 +279,8 @@ services:

  cic-eth-tracker:
    build:
-        context: apps/cic-eth
-        dockerfile: docker/Dockerfile
-        target: dev
+        context: apps/
+        dockerfile: cic-eth/docker/Dockerfile
    environment:
      ETH_PROVIDER: http://eth:8545
      DATABASE_USER: ${DATABASE_USER:-grassroots}
@@ -318,9 +317,8 @@ services:

  cic-eth-dispatcher:
    build:
-        context: apps/cic-eth
-        dockerfile: docker/Dockerfile
-        target: dev
+        context: apps/
+        dockerfile: cic-eth/docker/Dockerfile
    environment:
      ETH_PROVIDER: http://eth:8545
      DATABASE_USER: ${DATABASE_USER:-grassroots}
@@ -359,9 +357,8 @@ services:

  cic-eth-retrier:
    build:
-        context: apps/cic-eth
-        dockerfile: docker/Dockerfile
-        target: dev
+        context: apps/
+        dockerfile: cic-eth/docker/Dockerfile
    environment:
      ETH_PROVIDER: http://eth:8545
      DATABASE_USER: ${DATABASE_USER:-grassroots}
@@ -402,8 +399,8 @@ services:

  cic-notify-tasker:
    build:
-      context: apps/cic-notify
-      dockerfile: docker/Dockerfile
+      context: apps/
+      dockerfile: cic-notify/docker/Dockerfile
    environment:
      DATABASE_USER: ${DATABASE_USER:-grassroots}
      DATABASE_HOST: ${DATABASE_HOST:-postgres}
@@ -431,8 +428,8 @@ services:
  cic-meta-server:
    hostname: meta
    build:
-      context: apps/cic-meta
-      dockerfile: docker/Dockerfile
+      context: apps/
+      dockerfile: cic-meta/docker/Dockerfile
    environment:
      DATABASE_NAME: ${DATABASE_NAME:-cic_meta}
      DATABASE_ENGINE: ${DATABASE_ENGINE:-postgres}
@@ -443,7 +440,7 @@ services:
      SERVER_HOST: localhost
      SERVER_PORT: 8000
      DATABASE_SCHEMA_SQL_PATH: ""
-      PGP_EXPORTS_DIR: /root/tests/
+      PGP_EXPORTS_DIR: /tmp/src/cic-meta/tests/
      PGP_PRIVATEKEY_FILE: privatekeys.asc
      PGP_PASSPHRASE: merman
      PGP_PUBLICKEY_TRUSTED_FILE: publickeys.asc
@@ -463,8 +460,8 @@ services:

  cic-user-ussd-server:
    build:
-      context: apps/cic-ussd
-      dockerfile: docker/Dockerfile
+      context: apps/
+      dockerfile: cic-ussd/docker/Dockerfile
    environment:
      DATABASE_USER: grassroots
      DATABASE_HOST: postgres
@@ -492,8 +489,8 @@ services:

  cic-user-server:
    build:
-      context: apps/cic-ussd
-      dockerfile: docker/Dockerfile
+      context: apps
+      dockerfile: cic-ussd/docker/Dockerfile
    environment:
      DATABASE_USER: grassroots
      DATABASE_HOST: postgres
@@ -514,8 +511,8 @@ services:

  cic-user-tasker:
    build:
-      context: apps/cic-ussd/
-      dockerfile: docker/Dockerfile
+      context: apps
+      dockerfile: cic-ussd/docker/Dockerfile
    environment:
      DATABASE_USER: grassroots
      DATABASE_HOST: postgres
Author	SHA1	Message	Date
nolash	efa23797f3	Bump aux version	2021-07-08 11:48:50 +02:00
nolash	2c0f65ed73	Remove hardcoded value	2021-07-07 17:42:47 +02:00
nolash	3f6fbc1c61	Noop calc for non-demurrage token in aux	2021-07-07 14:17:50 +02:00
nolash	d26af206cb	Add correct extras selector for contract migration cic-eth include	2021-07-07 13:52:19 +02:00
nolash	36085f218f	Add necessary services requirements	2021-07-07 11:59:51 +02:00
nolash	d1d680c9aa	Add aux-all to tasker in local cluster	2021-07-07 10:32:01 +02:00
nolash	abd4024322	Bump version	2021-07-07 09:59:20 +02:00
nolash	644b9ec4ec	Merge remote-tracking branch 'origin/master' into lash/demurrage-task	2021-07-07 09:58:57 +02:00
nolash	bc52e46620	Merge remote-tracking branch 'origin/master' into lash/demurrage-task	2021-07-07 09:47:09 +02:00
nolash	ba729a0a54	Properly fix mock path in cic-eth test	2021-07-07 09:32:52 +02:00
nolash	cb4927edc9	Correct mocks path in cic tests, faulty contract-migration build	2021-07-07 09:24:40 +02:00
nolash	185458e320	Merge remote-tracking branch 'origin/master' into lash/demurrage-task	2021-07-05 13:05:02 +02:00
nolash	d9214ddd62	Bump cic-eth dep to future build	2021-07-05 11:59:52 +02:00
nolash	b5d6d80d8e	Add demurrage token task api	2021-07-05 11:58:07 +02:00
nolash	2f09ac9110	Change aux module to unpopulated base module name	2021-07-05 11:28:27 +02:00
nolash	bc8851ad06	Merge branch 'lash/new-sarafu-token' into lash/demurrage-task	2021-07-05 10:41:35 +02:00
nolash	46840040a0	Remove dev dockerfile	2021-07-05 10:41:19 +02:00
nolash	4e18060589	Remove dev dockerfile	2021-07-05 10:40:32 +02:00
nolash	08a77f9818	Move cic-eth token fixture to package, add demurrage token calc task	2021-07-05 10:29:33 +02:00
nolash	5fab939270	Upgrade erc20 demurrage token deploy, explicit multi mode flag	2021-07-04 13:53:03 +02:00
nolash	51109db487	Merge branch 'lash/new-sarafu-token' into lash/demurrage-task	2021-07-04 13:26:22 +02:00
nolash	f44e2c8b45	Move registry initialization before aux	2021-07-04 13:21:07 +02:00
nolash	40a7eec6ad	Add aux requirement for demurrage task	2021-07-02 21:32:48 +02:00
nolash	6a75ce37c4	Add demurrage token amount adjust task	2021-07-02 21:25:47 +02:00
nolash	9b2f2ab0b1	Reduce profanity	2021-07-01 11:05:31 +02:00
nolash	98a38b7117	Upgrade cic-base for contract-migration	2021-06-30 22:51:23 +02:00
nolash	a2ca61355d	Merge remote-tracking branch 'origin/master' into lash/new-sarafu-token	2021-06-30 22:01:07 +02:00
nolash	b0638f2262	Rename env var for token symbol in contract migration	2021-06-30 21:16:06 +02:00
nolash	ea4c68f311	Merge remote-tracking branch 'origin/master' into lash/new-sarafu-token	2021-06-30 16:47:36 +02:00
nolash	ba0dc9371e	Add colors to run script for contract migrations	2021-06-10 07:16:59 +02:00
nolash	03ac6633a2	Merge branch 'master' into lash/new-sarafu-token	2021-06-09 15:00:02 +02:00
nolash	4dc8dff369	Remove foo	2021-06-05 17:13:14 +02:00
nolash	a74e69aeb3	Introduce dev dockerfile for contract migration enabling faster iteration in dev	2021-06-05 17:06:37 +02:00