Add tx sender processing filter

.gitignore

@@ -14,4 +14,3 @@ build/
 **/.venv
 .idea
 **/.vim
-**/*secret.yaml

.gitlab-ci.yml

@@ -12,13 +12,13 @@ include:
 stages:
   - build
   - test
-  - deploy
+  - deploy 
 
-image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest
+image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/docker-with-compose:latest  
 
 variables:
   DOCKER_BUILDKIT: "1"
-  COMPOSE_DOCKER_CLI_BUILD: "1"
+  COMPOSE_DOCKER_CLI_BUILD: "1" 
   CI_DEBUG_TRACE: "true"
 
 before_script:

README.md

@@ -26,7 +26,7 @@ docker-compose down
 
 stop cluster and delete data
 ```
-docker-compose down -v --remove-orphans
+docker-compose down -v
 ```
 
 rebuild an images
@@ -34,7 +34,4 @@ rebuild an images
 docker-compose up --build <service_name>
 ```
 
-to delete the buildkit cache
-```
-docker builder prune --filter type=exec.cachemount
-```
+

apps/cic-cache/cic_cache/cli/rpc.py

@@ -27,11 +27,11 @@ class RPC:
     @staticmethod
     def from_config(config):
         chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
-        RPCConnection.register_location(config.get('RPC_PROVIDER'), chain_spec, 'default')
+        RPCConnection.register_location(config.get('RPC_HTTP_PROVIDER'), chain_spec, 'default')
         if config.get('SIGNER_PROVIDER'):
             RPCConnection.register_constructor(ConnType.UNIX, EthUnixSignerConnection, tag='signer')
             RPCConnection.register_location(config.get('SIGNER_PROVIDER'), chain_spec, 'signer')
-        rpc = RPC(chain_spec, config.get('RPC_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
+        rpc = RPC(chain_spec, config.get('RPC_HTTP_PROVIDER'), signer_provider=config.get('SIGNER_PROVIDER'))
         logg.info('set up rpc: {}'.format(rpc))
         return rpc
 

apps/cic-cache/requirements.txt

@@ -9,6 +9,7 @@ psycopg2==2.8.6
 celery==4.4.7
 redis==3.5.3
 chainsyncer[sql]>=0.0.6a3,<0.1.0
-erc20-faucet>=0.3.2a2, <0.4.0
-chainlib-eth>=0.0.9a14,<0.1.0
-eth-address-index>=0.2.3a4,<0.3.0
+erc20-faucet>=0.3.2a1, <0.4.0
+chainlib-eth>=0.0.9a7,<0.1.0
+chainlib>=0.0.9a3,<0.1.0
+eth-address-index>=0.2.3a1,<0.3.0

apps/cic-eth-aux/erc20-demurrage-token/requirements.txt

@@ -1,4 +1,5 @@
 celery==4.4.7
 erc20-demurrage-token~=0.0.3a1
-cic-eth-registry>=0.6.1a2,<0.7.0
-cic-eth[services]~=0.12.4a8
+cic-eth-registry~=0.5.8a1
+chainlib~=0.0.7a1
+cic_eth~=0.12.2a4

apps/cic-eth/cic_eth/db/models/base.py

@@ -58,6 +58,7 @@ class SessionBase(Model):
     def connect(dsn, pool_size=16, debug=False):
         """Create new database connection engine and connect to database backend.
 
+        
         :param dsn: DSN string defining connection.
         :type dsn: str
         """

apps/cic-eth/cic_eth/queue/state.py

@@ -119,3 +119,14 @@ def obsolete(chain_spec_dict, tx_hash, final):
     r = chainqueue.sql.state.obsolete_by_cache(chain_spec, tx_hash, final, session=session)
     session.close()
     return r
+
+
+@celery_app.task(base=CriticalSQLAlchemyTask)
+def force_set(chain_spec_dict, tx_hash, status):
+    tx_hash = tx_normalize.tx_hash(tx_hash)
+    chain_spec = ChainSpec.from_dict(chain_spec_dict)
+    session = SessionBase.create_session()
+    r = chainqueue.sql.state.force_set(chain_spec, tx_hash, status, session=session)
+    session.close()
+    return r
+

apps/cic-eth/cic_eth/runnable/daemons/tasker.py

@@ -203,9 +203,6 @@ def main():
     argv.append(config.get('CELERY_QUEUE'))
     argv.append('-n')
     argv.append(config.get('CELERY_QUEUE'))
-    argv.append('--config')
-    argv.append('celeryconfig')
-
 
     BaseTask.default_token_symbol = config.get('CIC_DEFAULT_TOKEN_SYMBOL')
     BaseTask.default_token_address = registry.by_name(BaseTask.default_token_symbol)

apps/cic-eth/cic_eth/runnable/recovery/rebuild.py

@@ -0,0 +1,159 @@
+# standard imports
+import sys
+import os
+import logging
+import argparse
+import tempfile
+import re
+import urllib
+import websocket
+import stat
+import importlib
+
+# external imports
+from chainlib.connection import (
+        RPCConnection,
+        ConnType,
+        )
+from chainlib.eth.address import to_checksum_address
+from chainlib.chain import ChainSpec
+from chainqueue.db.models.otx import Otx
+from eth_accounts_index import AccountsIndex
+from moolb import Bloom
+from hexathon import strip_0x
+from chainlib.eth.block import (
+        block_latest,
+        )
+from chainsyncer.backend.sql import SQLBackend
+from chainsyncer.db.models.base import SessionBase
+from chainsyncer.driver.head import HeadSyncer
+from chainsyncer.driver.history import HistorySyncer
+
+# local imports
+from cic_eth_registry.error import UnknownContractError
+from cic_eth_registry.erc20 import ERC20Token
+from cic_eth.registry import (
+        connect as connect_registry,
+    )
+import cic_eth.cli
+from cic_eth.db import dsn_from_config
+
+logging.basicConfig(level=logging.WARNING)
+logg = logging.getLogger()
+
+arg_flags = cic_eth.cli.argflag_std_read
+local_arg_flags = cic_eth.cli.argflag_local_sync
+argparser = cic_eth.cli.ArgumentParser(arg_flags)
+argparser.process_local_flags(local_arg_flags)
+args = argparser.parse_args()
+
+config = cic_eth.cli.Config.from_args(args, arg_flags, local_arg_flags)
+
+# set up rpc
+rpc = cic_eth.cli.RPC.from_config(config)
+conn = rpc.get_default()
+
+dsn = dsn_from_config(config)
+SessionBase.connect(dsn, pool_size=int(config.get('DATABASE_POOL_SIZE')), debug=config.true('DATABASE_DEBUG'))
+
+
+chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
+
+registry = None
+try:
+    registry = connect_registry(conn, 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')))
+
+
+class QueueRecoveryFilter:
+
+    def __init__(self, chain_spec, rpc, account_registry_address):
+        self.account_registry_address = account_registry_address
+        self.account_registry = AccountsIndex(chain_spec)
+        self.account_count = 0
+        self.bloom = None
+        self.rpc = rpc
+
+
+    def load(self):
+        o = self.account_registry.count(self.account_registry_address)
+        r = self.rpc.do(o)
+        self.account_count = self.account_registry.parse_entry_count(r)
+        logg.debug('loading account registry {} with {} entries'.format(self.account_registry_address, self.account_count))
+
+        self.bloom = Bloom(8192, 3)
+
+        for i in range(self.account_count):
+            o = self.account_registry.entry(self.account_registry_address, i)
+            r = self.rpc.do(o)
+            entry = self.account_registry.parse_account(r)
+            entry_bytes = bytes.fromhex(strip_0x(entry))
+            self.bloom.add(entry_bytes)
+
+
+    
+    def filter(self, conn, block, tx, db_session=None):
+        logg.debug('tx {}'.format(tx))
+        for output in tx.outputs:
+            recipient_bytes = bytes.fromhex(strip_0x(output))
+            if self.bloom.check(recipient_bytes):
+                o = self.account_registry.have(self.account_registry_address, output)
+                r = self.rpc.do(o)
+                if self.parse_have(r):
+                    self.add_recipient_tx(tx)
+
+
+def main():
+    o = block_latest()
+    r = conn.do(o)
+    block_current = int(r, 16)
+    block_offset = block_current + 1
+
+    loop_interval = config.get('SYNCER_LOOP_INTERVAL')
+    if loop_interval == None:
+        stat = init_chain_stat(conn, block_start=block_current)
+        loop_interval = stat.block_average()
+
+    logg.debug('current block height {}'.format(block_offset))
+
+    syncers = []
+
+    syncer_backends = SQLBackend.resume(chain_spec, block_offset)
+
+    if len(syncer_backends) == 0:
+        initial_block_start = config.get('SYNCER_OFFSET')
+        initial_block_offset = block_offset
+        if config.true('SYNCER_NO_HISTORY'):
+            initial_block_start = block_offset
+            initial_block_offset += 1
+        syncer_backends.append(SQLBackend.initial(chain_spec, initial_block_offset, start_block_height=initial_block_start))
+        logg.info('found no backends to resume, adding initial sync from history start {} end {}'.format(initial_block_start, initial_block_offset))
+    else:
+        for syncer_backend in syncer_backends:
+            logg.info('resuming sync session {}'.format(syncer_backend))
+
+    syncer_backends.append(SQLBackend.live(chain_spec, block_offset+1))
+
+    for syncer_backend in syncer_backends:
+        try:
+            syncers.append(HistorySyncer(syncer_backend, cic_eth.cli.chain_interface))
+            logg.info('Initializing HISTORY syncer on backend {}'.format(syncer_backend))
+        except AttributeError:
+            logg.info('Initializing HEAD syncer on backend {}'.format(syncer_backend))
+            syncers.append(HeadSyncer(syncer_backend, cic_eth.cli.chain_interface))
+
+    account_registry_address = registry.by_name('AccountRegistry')
+    account_filter = QueueRecoveryFilter(chain_spec, conn, account_registry_address)
+    account_filter.load()
+
+    for syncer in syncers:
+        syncer.add_filter(account_filter)
+
+        r = syncer.loop(int(loop_interval), conn)
+
+
+if __name__ == '__main__':
+    main()

apps/cic-eth/crypto_dev_signer_config/config.ini

@@ -0,0 +1,4 @@
+[signer]
+secret = deadbeef
+#database = crypto-dev-signer
+socket_path = ipc:///run/crypto-dev-signer/jsonrpc.ipc

apps/cic-eth/crypto_dev_signer_config/database.ini

@@ -0,0 +1,8 @@
+[database]
+NAME=cic-signer
+USER=
+PASSWORD=
+HOST=
+PORT=
+ENGINE=
+DRIVER=

apps/cic-eth/requirements.txt

@@ -1,3 +1,3 @@
 celery==4.4.7
-chainlib-eth>=0.0.9a14,<0.1.0
+chainlib-eth>=0.0.9a11,<0.1.0
 semver==2.13.0

apps/cic-eth/tools_requirements.txt

@@ -1,4 +1,4 @@
-crypto-dev-signer>=0.4.15a7,<=0.4.15
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 chainqueue>=0.0.5a1,<0.1.0
 cic-eth-registry>=0.6.1a2,<0.7.0
 redis==3.5.3

apps/cic-ussd/cic_ussd/account/balance.py

@@ -1,12 +1,10 @@
 # standard imports
-
 import json
 import logging
 from typing import Optional
 
 # third-party imports
 from cic_eth.api import Api
-from cic_eth_aux.erc20_demurrage_token.api import Api as DemurrageApi
 
 # local imports
 from cic_ussd.account.transaction import from_wei
@@ -75,24 +73,6 @@ def calculate_available_balance(balances: dict) -> float:
     return from_wei(value=available_balance)
 
 
-def get_adjusted_balance(balance: int, chain_str: str, timestamp: int, token_symbol: str):
-    """
-    :param balance:
-    :type balance:
-    :param chain_str:
-    :type chain_str:
-    :param timestamp:
-    :type timestamp:
-    :param token_symbol:
-    :type token_symbol:
-    :return:
-    :rtype:
-    """
-    logg.debug(f'retrieving adjusted balance on chain: {chain_str}')
-    demurrage_api = DemurrageApi(chain_str=chain_str)
-    return demurrage_api.get_adjusted_balance(token_symbol, balance, timestamp).result
-
-
 def get_cached_available_balance(blockchain_address: str) -> float:
     """This function attempts to retrieve balance data from the redis cache.
     :param blockchain_address: Ethereum address of an account.
@@ -108,14 +88,3 @@ def get_cached_available_balance(blockchain_address: str) -> float:
         return calculate_available_balance(json.loads(cached_balances))
     else:
         raise CachedDataNotFoundError(f'No cached available balance for address: {blockchain_address}')
-
-
-def get_cached_adjusted_balance(identifier: bytes):
-    """
-    :param identifier:
-    :type identifier:
-    :return:
-    :rtype:
-    """
-    key = cache_data_key(identifier, ':cic.adjusted_balance')
-    return get_cached_data(key)

apps/cic-ussd/cic_ussd/processor/menu.py

@@ -1,17 +1,13 @@
 # standard imports
 import json
 import logging
-from datetime import datetime, timedelta
 
 # external imports
 import i18n.config
+from sqlalchemy.orm.session import Session
 
 # local imports
-from cic_ussd.account.balance import (calculate_available_balance,
-                                      get_adjusted_balance,
-                                      get_balances,
-                                      get_cached_adjusted_balance,
-                                      get_cached_available_balance)
+from cic_ussd.account.balance import calculate_available_balance, get_balances, get_cached_available_balance
 from cic_ussd.account.chain import Chain
 from cic_ussd.account.metadata import get_cached_preferred_language
 from cic_ussd.account.statement import (
@@ -20,15 +16,14 @@ from cic_ussd.account.statement import (
     query_statement,
     statement_transaction_set
 )
-from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.account.transaction import from_wei, to_wei
+from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.cache import cache_data_key, cache_data
 from cic_ussd.db.models.account import Account
 from cic_ussd.metadata import PersonMetadata
 from cic_ussd.phone_number import Support
-from cic_ussd.processor.util import parse_person_metadata
+from cic_ussd.processor.util import latest_input, parse_person_metadata
 from cic_ussd.translation import translation_for
-from sqlalchemy.orm.session import Session
 
 logg = logging.getLogger(__name__)
 
@@ -48,26 +43,21 @@ class MenuProcessor:
         :rtype:
         """
         available_balance = get_cached_available_balance(self.account.blockchain_address)
-        adjusted_balance = get_cached_adjusted_balance(self.identifier)
+        logg.debug('Requires call to retrieve tax and bonus amounts')
+        tax = ''
+        bonus = ''
         token_symbol = get_default_token_symbol()
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
-        with_available_balance = f'{self.display_key}.available_balance'
-        with_fees = f'{self.display_key}.with_fees'
-        if not adjusted_balance:
-            return translation_for(key=with_available_balance,
-                                   preferred_language=preferred_language,
-                                   available_balance=available_balance,
-                                   token_symbol=token_symbol)
-        adjusted_balance = json.loads(adjusted_balance)
-        tax_wei = to_wei(int(available_balance)) - int(adjusted_balance)
-        tax = from_wei(int(tax_wei))
-        return translation_for(key=with_fees,
-                               preferred_language=preferred_language,
-                               available_balance=available_balance,
-                               tax=tax,
-                               token_symbol=token_symbol)
+        return translation_for(
+            key=self.display_key,
+            preferred_language=preferred_language,
+            available_balance=available_balance,
+            tax=tax,
+            bonus=bonus,
+            token_symbol=token_symbol
+        )
 
     def account_statement(self) -> str:
         """
@@ -77,7 +67,7 @@ class MenuProcessor:
         cached_statement = get_cached_statement(self.account.blockchain_address)
         statement = json.loads(cached_statement)
         statement_transactions = parse_statement_transactions(statement)
-        transaction_sets = [statement_transactions[tx:tx + 3] for tx in range(0, len(statement_transactions), 3)]
+        transaction_sets = [statement_transactions[tx:tx+3] for tx in range(0, len(statement_transactions), 3)]
         preferred_language = get_cached_preferred_language(self.account.blockchain_address)
         if not preferred_language:
             preferred_language = i18n.config.get('fallback')
@@ -159,22 +149,12 @@ class MenuProcessor:
         :return:
         :rtype:
         """
-        chain_str = Chain.spec.__str__()
         token_symbol = get_default_token_symbol()
         blockchain_address = self.account.blockchain_address
-        balances = get_balances(blockchain_address, chain_str, token_symbol, False)[0]
+        balances = get_balances(blockchain_address, Chain.spec.__str__(), token_symbol, False)[0]
         key = cache_data_key(self.identifier, ':cic.balances')
         cache_data(key, json.dumps(balances))
         available_balance = calculate_available_balance(balances)
-        now = datetime.now()
-        if (now - self.account.created).days >= 30:
-            if available_balance <= 0:
-                logg.info(f'Not retrieving adjusted balance, available balance: {available_balance} is insufficient.')
-            else:
-                timestamp = int((now - timedelta(30)).timestamp())
-                adjusted_balance = get_adjusted_balance(to_wei(int(available_balance)), chain_str, timestamp, token_symbol)
-                key = cache_data_key(self.identifier, ':cic.adjusted_balance')
-                cache_data(key, json.dumps(adjusted_balance))
 
         query_statement(blockchain_address)
 

apps/cic-ussd/cic_ussd/runnable/client.py

@@ -63,7 +63,7 @@ elif ssl == 0:
 else:
     ssl = True
 
-valid_service_codes = config.get('USSD_SERVICE_CODE').split(",")
+
 def main():
 
     # TODO: improve url building 
@@ -79,9 +79,9 @@ def main():
     session = uuid.uuid4().hex
     data = {
             'sessionId': session,
-            'serviceCode': valid_service_codes[0],
+            'serviceCode': config.get('APP_SERVICE_CODE'),
             'phoneNumber': args.phone,
-            'text': "",
+            'text': config.get('APP_SERVICE_CODE'),
         }
 
     state = "_BEGIN"

apps/cic-ussd/cic_ussd/state_machine/logic/account.py

@@ -154,14 +154,15 @@ def parse_person_metadata(account: Account, metadata: dict):
     phone_number = account.phone_number
     date_registered = int(account.created.replace().timestamp())
     blockchain_address = account.blockchain_address
-    chain_str = Chain.spec.__str__()
+    chain_spec = f'{Chain.spec.common_name()}:{Chain.spec.engine()}: {Chain.spec.chain_id()}'
 
     if isinstance(metadata.get('identities'), dict):
         identities = metadata.get('identities')
     else:
         identities = manage_identity_data(
             blockchain_address=blockchain_address,
-            chain_str=chain_str
+            blockchain_type=Chain.spec.engine(),
+            chain_spec=chain_spec
         )
 
     return {

apps/cic-ussd/cic_ussd/tasks/notifications.py

@@ -24,8 +24,7 @@ def transaction(notification_data: dict):
     :rtype:
     """
     role = notification_data.get('role')
-    token_value = notification_data.get('token_value')
-    amount = token_value if token_value == 0 else from_wei(token_value)
+    amount = from_wei(notification_data.get('token_value'))
     balance = notification_data.get('available_balance')
     phone_number = notification_data.get('phone_number')
     preferred_language = notification_data.get('preferred_language')

apps/cic-ussd/cic_ussd/version.py

@@ -1,7 +1,7 @@
 # standard imports
 import semver
 
-version = (0, 3, 1, 'alpha.5')
+version = (0, 3, 1, 'alpha.4')
 
 version_object = semver.VersionInfo(
         major=version[0],

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

@@ -0,0 +1,2 @@
+[app]
+service_code = *483*46#

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

@@ -1,4 +1,3 @@
 [ussd]
-service_code = *483*46#
 user =
 pass =

apps/cic-ussd/docker/Dockerfile

@@ -10,13 +10,6 @@ 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"
-
-RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
-    pip install --index-url https://pypi.org/simple  \
-	  --extra-index-url $GITLAB_PYTHON_REGISTRY \
-    --extra-index-url $EXTRA_INDEX_URL \
-    cic-eth-aux-erc20-demurrage-token~=0.0.2a6
-
 COPY requirements.txt .
 
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \

apps/cic-ussd/requirements.txt

@@ -1,12 +1,9 @@
 alembic==1.4.2
-attrs==21.2.0
-billiard==3.6.4.0
 bcrypt==3.2.0
 celery==4.4.7
-cffi==1.14.6
 cic-eth[services]~=0.12.4a7
 cic-notify~=0.4.0a10
-cic-types~=0.1.0a15
+cic-types~=0.1.0a14
 confini>=0.4.1a1,<0.5.0
 phonenumbers==8.12.12
 psycopg2==2.8.6

apps/cic-ussd/tests/cic_ussd/account/test_balance.py

@@ -43,13 +43,10 @@ def test_sync_get_balances(activated_account,
     (5000000, 89000000, 67000000, 27.00)
 ])
 def test_calculate_available_balance(activated_account,
-                                     available_balance,
                                      balance_incoming,
                                      balance_network,
                                      balance_outgoing,
-                                     cache_balances,
-                                     cache_default_token_data,
-                                     load_chain_spec):
+                                     available_balance):
     balances = {
         'address': activated_account.blockchain_address,
         'converters': [],
@@ -60,11 +57,7 @@ def test_calculate_available_balance(activated_account,
     assert calculate_available_balance(balances) == available_balance
 
 
-def test_get_cached_available_balance(activated_account,
-                                      balances,
-                                      cache_balances,
-                                      cache_default_token_data,
-                                      load_chain_spec):
+def test_get_cached_available_balance(activated_account, cache_balances, balances):
     cached_available_balance = get_cached_available_balance(activated_account.blockchain_address)
     available_balance = calculate_available_balance(balances[0])
     assert cached_available_balance == available_balance

apps/cic-ussd/tests/cic_ussd/account/test_statement.py

@@ -27,8 +27,6 @@ def test_filter_statement_transactions(transactions_list):
 
 
 def test_generate(activated_account,
-                  cache_default_token_data,
-                  cache_statement,
                   cache_preferences,
                   celery_session_worker,
                   init_cache,
@@ -62,7 +60,7 @@ def test_get_cached_statement(activated_account, cache_statement, statement):
     assert cached_statement[0].get('blockchain_address') == statement[0].get('blockchain_address')
 
 
-def test_parse_statement_transactions(cache_default_token_data, statement):
+def test_parse_statement_transactions(statement):
     parsed_transactions = parse_statement_transactions(statement)
     parsed_transaction = parsed_transactions[0]
     parsed_transaction.startswith('Sent')
@@ -78,7 +76,7 @@ def test_query_statement(blockchain_address, limit, load_chain_spec, activated_a
     assert mock_transaction_list_query.get('limit') == limit
 
 
-def test_statement_transaction_set(cache_default_token_data, load_chain_spec, preferences, set_locale_files, statement):
+def test_statement_transaction_set(preferences, set_locale_files, statement):
     parsed_transactions = parse_statement_transactions(statement)
     preferred_language = preferences.get('preferred_language')
     transaction_set = statement_transaction_set(preferred_language, parsed_transactions)

apps/cic-ussd/tests/cic_ussd/account/test_transaction.py

@@ -36,19 +36,19 @@ def test_aux_transaction_data(preferences, set_locale_files, transactions_list):
     check_aux_data('helpers.sent', 'helpers.to', preferred_language, sender_tx_aux_data)
 
 
-@pytest.mark.parametrize("value, expected_result", [
+@pytest.mark.parametrize("wei, expected_result", [
     (50000000, Decimal('50.00')),
     (100000, Decimal('0.10'))
 ])
-def test_from_wei(cache_default_token_data, expected_result, value):
-    assert from_wei(value) == expected_result
+def test_from_wei(wei, expected_result):
+    assert from_wei(wei) == expected_result
 
 
 @pytest.mark.parametrize("value, expected_result", [
     (50, 50000000),
     (0.10, 100000)
 ])
-def test_to_wei(cache_default_token_data, expected_result, value):
+def test_to_wei(value, expected_result):
     assert to_wei(value) == expected_result
 
 
@@ -96,7 +96,6 @@ def test_validate_transaction_account(activated_account, init_database, transact
 @pytest.mark.parametrize("amount", [50, 0.10])
 def test_outgoing_transaction_processor(activated_account,
                                         amount,
-                                        cache_default_token_data,
                                         celery_session_worker,
                                         load_config,
                                         load_chain_spec,

apps/cic-ussd/tests/cic_ussd/processor/test_menu.py

@@ -1,6 +1,5 @@
 # standard imports
 import json
-import datetime
 
 # external imports
 from chainlib.hash import strip_0x
@@ -15,7 +14,6 @@ from cic_ussd.account.statement import (
 )
 from cic_ussd.account.tokens import get_default_token_symbol
 from cic_ussd.account.transaction import from_wei, to_wei
-from cic_ussd.cache import cache_data, cache_data_key
 from cic_ussd.menu.ussd_menu import UssdMenu
 from cic_ussd.metadata import PersonMetadata
 from cic_ussd.phone_number import Support
@@ -40,34 +38,24 @@ def test_menu_processor(activated_account,
                         load_chain_spec,
                         load_support_phone,
                         load_ussd_menu,
-                        mock_get_adjusted_balance,
                         mock_sync_balance_api_query,
                         mock_transaction_list_query,
                         valid_recipient):
     preferred_language = get_cached_preferred_language(activated_account.blockchain_address)
     available_balance = get_cached_available_balance(activated_account.blockchain_address)
     token_symbol = get_default_token_symbol()
-    with_available_balance = 'ussd.kenya.account_balances.available_balance'
-    with_fees = 'ussd.kenya.account_balances.with_fees'
+
+    tax = ''
+    bonus = ''
+    display_key = 'ussd.kenya.account_balances'
     ussd_menu = UssdMenu.find_by_name('account_balances')
     name = ussd_menu.get('name')
-    resp = response(activated_account, 'ussd.kenya.account_balances', name, init_database, generic_ussd_session)
-    assert resp == translation_for(with_available_balance,
+    resp = response(activated_account, display_key, name, init_database, generic_ussd_session)
+    assert resp == translation_for(display_key,
                                    preferred_language,
                                    available_balance=available_balance,
-                                   token_symbol=token_symbol)
-
-    identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
-    key = cache_data_key(identifier, ':cic.adjusted_balance')
-    adjusted_balance = 45931650.64654012
-    cache_data(key, json.dumps(adjusted_balance))
-    resp = response(activated_account, 'ussd.kenya.account_balances', name, init_database, generic_ussd_session)
-    tax_wei = to_wei(int(available_balance)) - int(adjusted_balance)
-    tax = from_wei(int(tax_wei))
-    assert resp == translation_for(key=with_fees,
-                                   preferred_language=preferred_language,
-                                   available_balance=available_balance,
                                    tax=tax,
+                                   bonus=bonus,
                                    token_symbol=token_symbol)
 
     cached_statement = get_cached_statement(activated_account.blockchain_address)
@@ -135,15 +123,6 @@ def test_menu_processor(activated_account,
                                    account_balance=available_balance,
                                    account_token_name=token_symbol)
 
-    display_key = 'ussd.kenya.start'
-    ussd_menu = UssdMenu.find_by_name('start')
-    name = ussd_menu.get('name')
-    older_timestamp = (activated_account.created - datetime.timedelta(days=35))
-    activated_account.created = older_timestamp
-    init_database.flush()
-    response(activated_account, display_key, name, init_database, generic_ussd_session)
-    assert mock_get_adjusted_balance['timestamp'] == int((datetime.datetime.now() - datetime.timedelta(days=30)).timestamp())
-
     display_key = 'ussd.kenya.transaction_pin_authorization'
     ussd_menu = UssdMenu.find_by_name('transaction_pin_authorization')
     name = ussd_menu.get('name')

apps/cic-ussd/tests/cic_ussd/state_machine/logic/test_transaction_logic.py

@@ -49,7 +49,6 @@ def test_is_valid_transaction_amount(activated_account, amount, expected_result,
 ])
 def test_has_sufficient_balance(activated_account,
                                 cache_balances,
-                                cache_default_token_data,
                                 expected_result,
                                 generic_ussd_session,
                                 init_database,

apps/cic-ussd/tests/cic_ussd/tasks/test_callback_handler.py

@@ -121,7 +121,6 @@ def test_statement_callback(activated_account, mocker, transactions_list):
 def test_transaction_balances_callback(activated_account,
                                        balances,
                                        cache_balances,
-                                       cache_default_token_data,
                                        cache_person_metadata,
                                        cache_preferences,
                                        load_chain_spec,

apps/cic-ussd/tests/cic_ussd/tasks/test_notifications_tasks.py

@@ -13,8 +13,7 @@ from cic_ussd.translation import translation_for
 # tests imports
 
 
-def test_transaction(cache_default_token_data,
-                     celery_session_worker,
+def test_transaction(celery_session_worker,
                      load_support_phone,
                      mock_notifier_api,
                      notification_data,

apps/cic-ussd/tests/cic_ussd/tasks/test_processor_tasks.py

@@ -30,11 +30,10 @@ def test_generate_statement(activated_account,
 
 
 def test_cache_statement(activated_account,
-                         cache_default_token_data,
                          cache_person_metadata,
-                         cache_preferences,
                          celery_session_worker,
                          init_database,
+                         preferences,
                          transaction_result):
     recipient_transaction, sender_transaction = transaction_actors(transaction_result)
     identifier = bytes.fromhex(strip_0x(activated_account.blockchain_address))
@@ -42,7 +41,7 @@ def test_cache_statement(activated_account,
     cached_statement = get_cached_data(key)
     assert cached_statement is None
     s_parse_transaction = celery.signature(
-        'cic_ussd.tasks.processor.parse_transaction', [sender_transaction])
+        'cic_ussd.tasks.processor.parse_transaction', [preferences, sender_transaction])
     result = s_parse_transaction.apply_async().get()
     s_cache_statement = celery.signature(
         'cic_ussd.tasks.processor.cache_statement', [result, activated_account.blockchain_address]
@@ -62,15 +61,15 @@ def test_cache_statement(activated_account,
 
 def test_parse_transaction(activated_account,
                            cache_person_metadata,
-                           cache_preferences,
                            celery_session_worker,
                            init_database,
+                           preferences,
                            transaction_result):
     recipient_transaction, sender_transaction = transaction_actors(transaction_result)
     assert sender_transaction.get('metadata_id') is None
     assert sender_transaction.get('phone_number') is None
     s_parse_transaction = celery.signature(
-        'cic_ussd.tasks.processor.parse_transaction', [sender_transaction])
+        'cic_ussd.tasks.processor.parse_transaction', [preferences, sender_transaction])
     result = s_parse_transaction.apply_async().get()
     assert result.get('metadata_id') == activated_account.standard_metadata_id()
     assert result.get('phone_number') == activated_account.phone_number

apps/cic-ussd/tests/fixtures/patches/account.py

@@ -41,22 +41,6 @@ def mock_async_balance_api_query(mocker):
     return query_args
 
 
-@pytest.fixture(scope='function')
-def mock_get_adjusted_balance(mocker, task_uuid):
-    query_args = {}
-
-    def get_adjusted_balance(self, token_symbol, balance, timestamp):
-        sync_res = mocker.patch('celery.result.AsyncResult')
-        sync_res.id = task_uuid
-        sync_res.result = 45931650.64654012
-        query_args['balance'] = balance
-        query_args['timestamp'] = timestamp
-        query_args['token_symbol'] = token_symbol
-        return sync_res
-    mocker.patch('cic_eth_aux.erc20_demurrage_token.api.Api.get_adjusted_balance', get_adjusted_balance)
-    return query_args
-
-
 @pytest.fixture(scope='function')
 def mock_notifier_api(mocker):
     sms = {}

apps/cic-ussd/var/lib/locale/ussd.en.yml

@@ -141,22 +141,12 @@ en:
         0. Back
       retry: |-
         %{retry_pin_entry}
-    account_balances:
-      available_balance: |-
-        CON Your balances are as follows:
-          balance: %{available_balance} %{token_symbol}
-        0. Back
-      with_fees: |-
-        CON Your balances are as follows:
-          balances: %{available_balance} %{token_symbol}
-          fees: %{tax} %{token_symbol}
-        0. Back
-      with_rewards: |-
-        CON Your balances are as follows:
-          balance: %{available_balance} %{token_symbol}
-          fees: %{tax} %{token_symbol}
-          rewards: %{bonus} %{token_symbol}
-        0. Back
+    account_balances: |-
+      CON Your balances are as follows:
+        balance: %{available_balance} %{token_symbol}
+        fees: %{tax} %{token_symbol}
+        rewards: %{bonus} %{token_symbol}
+      0. Back
     first_transaction_set: |-
       CON %{first_transaction_set}
       1. Next

apps/cic-ussd/var/lib/locale/ussd.sw.yml

@@ -140,22 +140,12 @@ sw:
         0. Nyuma
       retry: |-
         %{retry_pin_entry}
-    account_balances:
-      available_balance: |-
-        CON Salio zako ni zifuatazo:
-          salio: %{available_balance} %{token_symbol}
-        0. Nyuma
-      with_fees: |-
-        CON Salio zako ni zifuatazo:
-          salio: %{available_balance} %{token_symbol}
-          ushuru: %{tax} %{token_symbol}
-        0. Nyuma
-      with_rewards: |-
-        CON Salio zako ni zifuatazo:
-          salio: %{available_balance} %{token_symbol}
-          ushuru: %{tax} %{token_symbol}
-          tuzo: %{bonus} %{token_symbol}
-        0. Nyuma
+    account_balances: |-
+      CON Salio zako ni zifuatazo:
+        salio: %{available_balance} %{token_symbol}
+        ushuru: %{tax} %{token_symbol}
+        tuzo: %{bonus} %{token_symbol}
+      0. Nyuma
     first_transaction_set: |-
       CON %{first_transaction_set}
       1. Mbele

apps/contract-migration/config.sh

@@ -35,11 +35,8 @@ export TOKEN_SINK_ADDRESS=${TOKEN_SINK_ADDRESS:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOY
 
 
 # Migration variable processing
-confini-dump --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
-echo "export CIC_TRUST_ADDRESS=$CIC_TRUST_ADDRESS
-export CIC_DEFAULT_TOKEN_SYMBOL=$CIC_DEFAULT_TOKEN_SYMBOL
-export WALLET_KEY_FILE=$WALLET_KEY_FILE
-" >> ${DEV_DATA_DIR}/env_reset
+
+confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
 
 cat ${DEV_DATA_DIR}/env_reset
 

apps/contract-migration/config/config.ini

@@ -1,3 +1,13 @@
+[token]
+name = Giftable Token
+symbol = GFT
+type = giftable_erc20_token
+demurrage_level = 196454828847045000000000000000000
+redistribution_period = 
+supply_limit = 
+sink_address = 
+
+
 [dev]
 eth_account_contract_deployer =
 eth_account_reserve_minter =

apps/contract-migration/reset.sh

@@ -39,8 +39,8 @@ if [ "$TOKEN_TYPE" == "giftable_erc20_token" ]; then
 		TOKEN_NAME=$TOKEN_SYMBOL
 	fi
 	>&2 echo deploying default token $TOKEN_TYPE
-	echo giftable-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -vv -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv
-	DEV_RESERVE_ADDRESS=`giftable-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -vv -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv`
+	echo giftable-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -vv -s -ww --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL --decimals 6 -vv
+	DEV_RESERVE_ADDRESS=`giftable-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -vv -s -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
@@ -56,66 +56,62 @@ elif [ "$TOKEN_TYPE" == "erc20_demurrage_token" ]; 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 $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL -vv -ww -s` 
+	DEV_RESERVE_ADDRESS=`erc20-demurrage-token-deploy $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC --name "$TOKEN_NAME" --symbol $TOKEN_SYMBOL -vv -ww -s` 
 else
 	>&2 echo unknown token type $TOKEN_TYPE
 	exit 1
 fi
 
-echo "giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -vv -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT"
-giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -u -vv -s -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT
+echo "giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -vv -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT"
+giftable-token-gift $fee_price_arg -p $RPC_PROVIDER -y $WALLET_KEY_FILE -i $CHAIN_SPEC -u -vv -s -w -e $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT
 
 >&2 echo "deploy account index contract"
-DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -y $WALLET_KEY_FILE -vv -s -u -w`
+DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $fee_price_arg -i $CHAIN_SPEC -p $RPC_PROVIDER -y $WALLET_KEY_FILE -vv -s -u -w`
 >&2 echo "add deployer address as account index writer"
-eth-accounts-index-writer $fee_price_arg -s -u -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
+eth-accounts-index-writer $fee_price_arg -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
 
 >&2 echo "deploy contract registry contract"
-CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $fee_price_arg -i $CIC_CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry -p $RPC_PROVIDER -vv -s -u -w`
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $RPC_PROVIDER -vv --identifier ContractRegistry $CIC_REGISTRY_ADDRESS
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS
+CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $fee_price_arg -i $CHAIN_SPEC -y $WALLET_KEY_FILE --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization --identifier ContractRegistry -p $RPC_PROVIDER -vv -s -u -w`
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC  -p $RPC_PROVIDER -vv --identifier ContractRegistry $CIC_REGISTRY_ADDRESS
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS
 
 # Deploy address declarator registry
 >&2 echo "deploy address declarator contract"
 declarator_description=0x546869732069732074686520434943206e6574776f726b000000000000000000
-DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -s -u -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv $declarator_description`
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AddressDeclarator $DEV_DECLARATOR_ADDRESS
+DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -s -u -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w -vv $declarator_description`
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier AddressDeclarator $DEV_DECLARATOR_ADDRESS
 
 # Deploy transfer authorization contact
 >&2 echo "deploy transfer auth contract"
-DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy $gas_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $RPC_PROVIDER -vv --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS
+DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy $gas_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC  -p $RPC_PROVIDER -vv --identifier TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS
 
 # Deploy token index contract
 >&2 echo "deploy token index contract"
-DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -s -u $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
-eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier TokenRegistry $DEV_TOKEN_INDEX_ADDRESS 
+DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -s -u $fee_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w -vv`
+eth-contract-registry-set $fee_price_arg -s -u -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier TokenRegistry $DEV_TOKEN_INDEX_ADDRESS 
 >&2 echo "add reserve token to token index"
-eth-token-index-add $fee_price_arg -s -u -w -y $WALLET_KEY_FILE  -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv -e $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
+eth-token-index-add $fee_price_arg -s -u -w -y $WALLET_KEY_FILE  -i $CHAIN_SPEC -p $RPC_PROVIDER -vv -e $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
 
 # Sarafu faucet contract
 >&2 echo "deploy token faucet contract"
-DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy $fee_price_arg -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -w -vv --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS -s`
+DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy $fee_price_arg -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -w -vv --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS -s`
 
 >&2 echo "set token faucet amount"
-sarafu-faucet-set $fee_price_arg -w -y $WALLET_KEY_FILE -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_FAUCET_ADDRESS -vv -s --fee-limit 100000 $DEV_FAUCET_AMOUNT
+sarafu-faucet-set $fee_price_arg -w -y $WALLET_KEY_FILE -i $CHAIN_SPEC -p $RPC_PROVIDER -e $DEV_FAUCET_ADDRESS -vv -s --fee-limit 100000 $DEV_FAUCET_AMOUNT
 
 >&2 echo "register faucet in registry"
-eth-contract-registry-set -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier Faucet $DEV_FAUCET_ADDRESS
+eth-contract-registry-set -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $CIC_REGISTRY_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER -vv --identifier Faucet $DEV_FAUCET_ADDRESS
 
 >&2 echo "set faucet as token minter"
-giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $RPC_PROVIDER -vv $DEV_FAUCET_ADDRESS
+giftable-token-minter -s -u $fee_price_arg -w -y $WALLET_KEY_FILE -e $DEV_RESERVE_ADDRESS -i $CHAIN_SPEC -p $RPC_PROVIDER -vv $DEV_FAUCET_ADDRESS
 
 
 #echo "export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL" >> ${DEV_DATA_DIR}/env_reset
 export CIC_DEFAULT_TOKEN_SYMBOL=$TOKEN_SYMBOL
 
-echo "Writing env_reset file ..."
-
-echo "export CIC_REGISTRY_ADDRESS=$CIC_REGISTRY_ADDRESS
-export CIC_DEFAULT_TOKEN_SYMBOL=$CIC_DEFAULT_TOKEN_SYMBOL
-export TOKEN_NAME=$TOKEN_NAME
-" >> "${DEV_DATA_DIR}"/env_reset
+confini-dump -vv --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config --prefix export > ${DEV_DATA_DIR}/env_reset
+confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 
 
 set +a
 set +e

apps/contract-migration/seed_cic_eth.sh

@@ -82,7 +82,7 @@ cic-eth-ctl -i $CHAIN_SPEC unlock INIT
 cic-eth-ctl -i $CHAIN_SPEC unlock SEND
 cic-eth-ctl -i $CHAIN_SPEC unlock QUEUE
 
-#confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config
+confini-dump --schema-module chainlib.eth.data.config --schema-module cic_eth.data.config --schema-dir ./config 
 
 set +a
 set +e

apps/data-seeding/cic_eth/paths.py

@@ -7,7 +7,6 @@ import json
 # external imports
 import celery
 import confini
-import celery.utils.graph
 
 # local imports
 from cic_eth.api import Api
@@ -36,7 +35,7 @@ class Fmtr(celery.utils.graph.GraphFormatter):
 
 def main():
     api = Api(
-        config.get('CHAIN_SPEC'),
+        config.get('CIC_CHAIN_SPEC'),
         queue='cic-eth',
         #callback_param='{}:{}:{}:{}'.format(args.redis_host_callback, args.redis_port_callback, redis_db, redis_channel),
         #callback_task='cic_eth.callbacks.redis.redis',

apps/data-seeding/cic_ussd/import_balance.py

@@ -16,7 +16,7 @@ from crypto_dev_signer.keystore.dict import DictKeystore
 from import_util import BalanceProcessor, get_celery_worker_status
 from import_task import ImportTask, MetadataTask
 
-default_config_dir = '/usr/local/etc/data-seeding/'
+default_config_dir = './config'
 logg = logging.getLogger()
 
 arg_parser = argparse.ArgumentParser(description='Daemon worker that handles data seeding tasks.')

apps/data-seeding/config/cic.ini

@@ -1,10 +1,11 @@
 [cic]
-registry_address =
+registry_address = 0x32E860c2A0645d1B7B005273696905F5D6DC5D05
 token_index_address =
 accounts_index_address = 
 declarator_address = 
 approval_escrow_address =
-chain_spec =
+chain_spec = evm:bloxberg:8996
 tx_retry_delay = 
-trust_address =
+trust_address = 0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
 user_ussd_svc_service_port =
+

apps/data-seeding/create_import_users.py

@@ -28,11 +28,12 @@ logg = logging.getLogger()
 
 fake = Faker(['sl', 'en_US', 'no', 'de', 'ro'])
 
-default_config_dir = './config'
-
+script_dir = os.path.realpath(os.path.dirname(__file__))
+# config_dir = os.environ.get('CONFINI_DIR', '/usr/local/etc/cic')
+config_dir = os.environ.get('CONFINI_DIR', os.path.join(script_dir, 'config'))
 
 argparser = argparse.ArgumentParser()
-argparser.add_argument('-c', type=str, default=default_config_dir, help='Config dir')
+argparser.add_argument('-c', type=str, default=config_dir, help='Config dir')
 argparser.add_argument('--tag', type=str, action='append',
                        help='Tags to add to record')
 argparser.add_argument('--gift-threshold', type=int,
@@ -52,7 +53,7 @@ elif args.vv:
 
 config = confini.Config(args.c, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
-logg.debug('loaded config\n{}'.format(config))
+logg.info('loaded config\n{}'.format(config))
 
 
 dt_now = datetime.datetime.utcnow()

apps/data-seeding/docker/Dockerfile

@@ -13,8 +13,7 @@ COPY package.json \
 RUN npm ci --production 
 #RUN --mount=type=cache,mode=0755,target=/root/node_modules npm install
 
-COPY requirements.txt .
-COPY config/ /usr/local/etc/data-seeding
+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"

apps/data-seeding/docker/Dockerfile_ci

@@ -0,0 +1,24 @@
+# syntax = docker/dockerfile:1.2
+FROM registry.gitlab.com/grassrootseconomics/cic-base-images:python-3.8.6-dev-5ab8bf45
+
+WORKDIR /root
+
+RUN mkdir -vp /usr/local/etc/cic
+
+COPY package.json \
+     package-lock.json \
+     .
+
+RUN npm install
+
+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 \
+    --extra-index-url $GITLAB_PYTHON_REGISTRY \
+    --extra-index-url $EXTRA_INDEX_URL -r requirements.txt
+
+COPY . . 
+
+ENTRYPOINT [ ]

apps/data-seeding/eth/import_users.py

@@ -58,7 +58,7 @@ config = confini.Config(config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
 args_override = {
         'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
-        'CIC_CHAIN_SPEC': getattr(args, 'i'),
+        'CHAIN_SPEC': getattr(args, 'i'),
         'KEYSTORE_FILE_PATH': getattr(args, 'y')
         }
 config.dict_override(args_override, 'cli')
@@ -86,7 +86,7 @@ os.makedirs(txs_dir)
 
 user_dir = args.user_dir
 
-chain_spec = ChainSpec.from_chain_str(config.get('CIC_CHAIN_SPEC'))
+chain_spec = ChainSpec.from_chain_str(config.get('CHAIN_SPEC'))
 chain_str = str(chain_spec)
 
 old_chain_spec = ChainSpec.from_chain_str(args.old_chain_spec)

apps/data-seeding/import_ussd.sh

@@ -1,94 +1,60 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if [[ -d "$OUT_DIR" ]]
-then
-  echo "found existing IMPORT DIR cleaning up..."
-  rm -rf "$OUT_DIR"
-  mkdir -p "$OUT_DIR"
-else
-  echo "IMPORT DIR does not exist creating it."
-  mkdir -p "$OUT_DIR"
-fi
-
-# using timeout because the timeout flag for celery inspect does not work
-timeout 5 celery inspect ping -b "$CELERY_BROKER_URL"
-if [[ $? -eq 124 ]]
-then
-  >&2 echo "Celery workers not available. Is the CELERY_BROKER_URL ($CELERY_BROKER_URL) correct?"
-  exit 1
-fi
+set -e
 
 echo "Creating seed data..."
-python create_import_users.py -vv  -c "$CONFIG" --dir "$OUT_DIR" "$NUMBER_OF_USERS"
+python create_import_users.py -vv --dir "$IMPORT_DIR" "$ACCOUNT_COUNT"
 wait $!
-
-echo "Check for running celery workers ..."
-if [ -f ./cic-ussd-import.pid ];
-then
-  echo "Found a running worker. Killing ..."
-  kill -9 $(<cic-ussd-import.pid)
-fi
-
 echo "Purge tasks from celery worker"
 celery -A cic_ussd.import_task purge -Q "$CELERY_QUEUE" --broker redis://"$REDIS_HOST":"$REDIS_PORT" -f
-
 echo "Start celery work and import balance job"
 if [ "$INCLUDE_BALANCES" != "y" ]
 then
   echo "Running worker without opening balance transactions"
-  TARGET_TX_COUNT=$NUMBER_OF_USERS
-  nohup python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$OUT_DIR" > nohup.out 2> nohup.err < /dev/null &
+  TARGET_TX_COUNT=$ACCOUNT_COUNT
+  python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$IMPORT_DIR" &
 else
   echo "Running worker with opening balance transactions"
-  TARGET_TX_COUNT=$((NUMBER_OF_USERS*2))
-  nohup python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --include-balances --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$OUT_DIR" &
+  TARGET_TX_COUNT=$((ACCOUNT_COUNT*2))
+  python cic_ussd/import_balance.py -vv -c "$CONFIG" -p "$ETH_PROVIDER" -r "$CIC_REGISTRY_ADDRESS" --include-balances --token-symbol "$TOKEN_SYMBOL" -y "$KEYSTORE_PATH" "$IMPORT_DIR" &
 fi
 
-echo "Target count set to ${TARGET_TX_COUNT}"
 until [ -f ./cic-import-ussd.pid ]
 do
   echo "Polling for celery worker pid file..."
   sleep 1
 done
 IMPORT_BALANCE_JOB=$(<cic-import-ussd.pid)
-
 echo "Start import users job"
 if [ "$USSD_SSL" == "y" ]
 then
   echo "Targeting secure ussd-user server"
-  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" "$OUT_DIR"
+  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" "$IMPORT_DIR"
 else
-  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$OUT_DIR"
+  python cic_ussd/import_users.py -vv -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$IMPORT_DIR"
 fi
-
 echo "Waiting for import balance job to complete ..."
 tail --pid="$IMPORT_BALANCE_JOB" -f /dev/null
 set -e
-
 echo "Importing pins"
-python cic_ussd/import_pins.py -c "$CONFIG" -vv "$OUT_DIR"
+python cic_ussd/import_pins.py -c "$CONFIG" -vv "$IMPORT_DIR"
 set +e
 wait $!
 set -e
-
 echo "Importing ussd data"
-python cic_ussd/import_ussd_data.py -c "$CONFIG" -vv "$OUT_DIR"
+python cic_ussd/import_ussd_data.py -c "$CONFIG" -vv "$IMPORT_DIR"
 set +e
 wait $!
-
 echo "Importing person metadata"
-node cic_meta/import_meta.js "$OUT_DIR" "$NUMBER_OF_USERS"
-
+node cic_meta/import_meta.js "$IMPORT_DIR" "$ACCOUNT_COUNT"
 echo "Import preferences metadata"
-node cic_meta/import_meta_preferences.js "$OUT_DIR" "$NUMBER_OF_USERS"
-
+node cic_meta/import_meta_preferences.js "$IMPORT_DIR" "$ACCOUNT_COUNT"
 CIC_NOTIFY_DATABASE=postgres://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT/$NOTIFY_DATABASE_NAME
 NOTIFICATION_COUNT=$(psql -qtA "$CIC_NOTIFY_DATABASE" -c 'SELECT COUNT(message) FROM notification WHERE message IS NOT NULL')
 while [[ "$NOTIFICATION_COUNT" < "$TARGET_TX_COUNT" ]]
 do
   NOTIFICATION_COUNT=$(psql -qtA "$CIC_NOTIFY_DATABASE" -c 'SELECT COUNT(message) FROM notification WHERE message IS NOT NULL')
   sleep 5
-  echo "Notification count is: ${NOTIFICATION_COUNT} of ${TARGET_TX_COUNT}. Checking after 5 ..."
+  echo "Notification count is: ${NOTIFICATION_COUNT}. Checking after 5 ..."
 done
-echo "Running verify script."
-python verify.py -c "$CONFIG" -v -p "$ETH_PROVIDER"  -r "$CIC_REGISTRY_ADDRESS" --exclude "$EXCLUSIONS" --meta-provider "$META_URL" --token-symbol "$TOKEN_SYMBOL" --ussd-provider "$USSD_PROVIDER" "$OUT_DIR"
+python verify.py -c "$CONFIG" -v -p "$ETH_PROVIDER"  -r "$CIC_REGISTRY_ADDRESS" --exclude "$EXCLUSIONS" --token-symbol "$TOKEN_SYMBOL" "$IMPORT_DIR"

apps/data-seeding/requirements.txt

@@ -1,14 +1,13 @@
-sarafu-faucet~=0.0.7a2
+sarafu-faucet~=0.0.7a1
 cic-eth[tools]~=0.12.4a8
-cic-types~=0.1.0a15
-crypto-dev-signer~=0.4.15a7
+cic-types~=0.1.0a14
+crypto-dev-signer>=0.4.15a4,<=0.4.15
 faker==4.17.1
 chainsyncer~=0.0.6a3
-chainlib-eth~=0.0.9a14
+chainlib-eth~=0.0.9a13
 eth-address-index~=0.2.3a4
 eth-contract-registry~=0.6.3a3
 eth-accounts-index~=0.1.2a3
-eth-erc20~=0.1.2a3
+eth-erc20~=0.1.2a2
 erc20-faucet~=0.3.2a2
 psycopg2==2.8.6
-liveness~=0.0.1a7

apps/data-seeding/verify.py

@@ -82,7 +82,7 @@ argparser.add_argument('--skip-ussd', dest='skip_ussd', action='store_true', hel
 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')
+argparser.add_argument('--token-symbol', default='GFT', type=str, dest='token_symbol', help='Token symbol to use for transactions')
 argparser.add_argument('-r', '--registry-address', type=str, dest='r', help='CIC Registry address')
 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('-x', '--exit-on-error', dest='x', action='store_true', help='Halt exection on error')
@@ -164,8 +164,20 @@ for t in custodial_tests:
         logg.info('activating custodial module'.format(t))
         break
 
+cols = os.get_terminal_size().columns
 
-outfunc = logg.debug
+
+def to_terminalwidth(s):
+    ss = s.ljust(int(cols)-1)
+    ss += "\r"
+    return ss
+
+def default_outfunc(s):
+    ss = to_terminalwidth(s)
+    sys.stdout.write(ss)
+outfunc = default_outfunc
+if logg.isEnabledFor(logging.DEBUG):
+    outfunc = logg.debug
 
 
 def send_ussd_request(address, data_dir):
@@ -459,7 +471,11 @@ def main():
     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))
+
+    if token_address == ZERO_ADDRESS:
+        logg.warning('unknown token. token tests will not work.')
+    else:
+        logg.info('found token address {}'.format(token_address))
  
     balances = {}
     f = open('{}/balances.csv'.format(user_dir, 'r'))

ci_templates/.cic-template.yml

@@ -1,12 +1,12 @@
+image:
+  name: gcr.io/kaniko-project/executor:debug
+  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
 
 .py_build_merge_request:
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
   stage: build
   script:
     - mkdir -p /kaniko/.docker
@@ -16,9 +16,6 @@ variables:
       --cache-repo $CI_REGISTRY_IMAGE --destination $MR_IMAGE_TAG 
 
 .py_build_target_dev:
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
   stage: build
   variables:
     IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:mr-unittest-$CI_COMMIT_SHORT_SHA
@@ -31,9 +28,6 @@ variables:
       --destination $MR_IMAGE_TAG
 
 .py_build_push:
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
   stage: build
   variables:
       IMAGE_TAG_BASE: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA

docker-compose.yml

@@ -60,6 +60,8 @@ services:
 
   contract-migration:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/contract-migration:${TAG:-latest}
+    profiles:
+      - migrations 
     build:
       context: apps/contract-migration
       dockerfile: docker/Dockerfile
@@ -72,7 +74,6 @@ services:
     environment:
       RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
       ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
-      RPC_HTTP_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
       DEV_USE_DOCKER_WAIT_SCRIPT: 1
       CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
       CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
@@ -91,19 +92,17 @@ services:
       CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis:6379}
       DEV_PIP_EXTRA_INDEX_URL: ${DEV_PIP_EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
       RUN_MASK: ${RUN_MASK:-0} # bit flags; 1: contract migrations 2: seed data
-      DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-50000000}
+      DEV_FAUCET_AMOUNT: ${DEV_FAUCET_AMOUNT:-0}
       DEV_ETH_GAS_PRICE: $DEV_ETH_GAS_PRICE
-      TOKEN_NAME: ${TOKEN_NAME:-Giftable Token}
+      TOKEN_NAME: ${TOKEN_NAME:-Sarafu Token}
       TOKEN_SYMBOL: ${TOKEN_SYMBOL:-GFT}
-      TOKEN_TYPE: ${TOKEN_TYPE:-giftable_erc20_token}
       TOKEN_DECIMALS: $TOKEN_DECIMALS
       TOKEN_REDISTRIBUTION_PERIOD: $TOKEN_DEMURRAGE_REDISTRIBUTION_PERIOD
-      TASKS_TRANSFER_CALLBACKS: ${TASKS_TRANSFER_CALLBACKS:-"cic-eth:cic_eth.callbacks.noop.noop,cic-ussd:cic_ussd.tasks.callback_handler.transaction_callback"}
       TOKEN_SUPPLY_LIMIT: $TOKEN_SUPPLY_LIMIT
       TOKEN_DEMURRAGE_LEVEL: $TOKEN_DEMURRAGE_LEVEL
       TOKEN_SINK_ADDRESS: $TOKEN_SINK_ADDRESS
+      TOKEN_TYPE: $TOKEN_TYPE
       SIGNER_PROVIDER: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
-    restart: on-failure 
     command: ["./run_job.sh"]
         #command: ["./reset.sh"]
     depends_on:
@@ -114,51 +113,10 @@ services:
     volumes:
       - contract-config:/tmp/cic/config
 
-
-  data-seeding:
-    image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/data-seeding:${TAG:-latest}
-    build:
-      context: apps/data-seeding
-      dockerfile: docker/Dockerfile
-      args:
-        pip_index_url: ${PIP_DEFAULT_INDEX_URL:-https://pypi.org/simple}
-        pip_extra_args: $PIP_EXTRA_ARGS
-    environment:
-      CIC_REGISTRY_ADDRESS: ${CIC_REGISTRY_ADDRESS:-0xea6225212005e86a4490018ded4bf37f3e772161}
-      OUT_DIR: out
-      NUMBER_OF_USERS: 10
-      CONFIG: /usr/local/etc/data-seeding
-      CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-evm:bloxberg:8996}
-      ETH_PROVIDER: ${CIC_HTTP_PROVIDER:-http://eth:8545}
-      TOKEN_SYMBOL: GFT 
-      KEYSTORE_PATH: keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c
-      USSD_HOST: cic-user-ussd-server 
-      USSD_PORT: 9000
-      INCLUDE_BALANCES: y
-      USSD_SSL: n
-      DATABASE_NAME: ${DATABASE_NAME:-cic_ussd}
-      DATABASE_USER: ${DATABASE_USER:-grassroots}
-      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} # this is is set at initdb see: postgres/initdb/create_db.sql
-      DATABASE_HOST: ${DATABASE_HOST:-postgres}
-      DATABASE_PORT: ${DATABASE_PORT:-5432}
-      CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379}
-      CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis:6379}
-      NOTIFY_DATABASE_NAME: cic_notify
-      REDIS_HOST: redis 
-      REDIS_PORT: 6379
-      REDIS_DB: 0
-      META_HOST: meta
-      META_PORT: 8000
-      META_URL: http://meta:8000
-      USSD_PROVIDER: http://cic-user-ussd-server:9000
-      CELERY_QUEUE: cic-import-ussd
-      EXCLUSIONS: ussd
-    command: bash import_ussd.sh
-    volumes:
-      - contract-config:/tmp/cic/config/:ro
-
   cic-cache-tracker:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-cache:${TAG:-latest}
+    profiles:
+      - cache 
     build:
       context: apps/cic-cache
       dockerfile: docker/Dockerfile
@@ -166,8 +124,8 @@ services:
         EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
     environment:
       CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS # supplied at contract-config after contract provisioning
-      ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
-      RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
+      ETH_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545}
+      RPC_HTTP_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545}
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala} # this is is set at initdb see: postgres/initdb/create_db.sql
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
@@ -181,7 +139,9 @@ services:
       CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
       CELERY_BROKER_URL: redis://redis:6379
       CELERY_RESULT_URL: redis://redis:6379
-    restart: on-failure 
+    deploy: 
+      restart_policy:
+        condition: on-failure
     depends_on:
       - redis
       - postgres
@@ -197,6 +157,8 @@ services:
 
   cic-cache-tasker:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-cache:${TAG:-latest}
+    profiles:
+      - cache 
     build:
       context: apps/cic-cache
       dockerfile: docker/Dockerfile
@@ -218,7 +180,9 @@ services:
       CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-evm:bloxberg:8996}
       CELERY_BROKER_URL: redis://redis:6379
       CELERY_RESULT_URL: redis://redis:6379
-    restart: unless-stopped 
+    deploy: 
+      restart_policy:
+        condition: on-failure
     depends_on:
       - redis
       - postgres
@@ -234,6 +198,8 @@ services:
 
   cic-cache-server:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-cache:${TAG:-latest}
+    profiles:
+      - cache 
     build:
       context: apps/cic-cache
       dockerfile: docker/Dockerfile
@@ -248,13 +214,13 @@ services:
       DATABASE_DEBUG: 1
         #PGPASSWORD: $DATABASE_PASSWORD
       SERVER_PORT: 8000
-    restart: on-failure 
     ports:
       - ${HTTP_PORT_CIC_CACHE:-63313}:8000
     depends_on:
       - postgres
-      - cic-cache-tasker
-      - cic-cache-tracker
+    deploy:
+      restart_policy:
+        condition: on-failure
     command:
       - /bin/bash
       - -c
@@ -278,7 +244,7 @@ services:
       CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
       ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER
       ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
-      RPC_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
+      RPC_HTTP_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
@@ -298,16 +264,19 @@ services:
       CELERY_DEBUG: ${CELERY_DEBUG:-1}
       #SIGNER_SOCKET_PATH: ${SIGNER_SOCKET_PATH:-http://cic-eth-signer:8000}
       SIGNER_PROVIDER: ${SIGNER_PROVIDER:-http://cic-eth-signer:8000}
+      SIGNER_PROVIDER: http://cic-eth-signer:8000
       SIGNER_SECRET: ${SIGNER_SECRET:-deadbeef}
       ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
       TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}
       CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
-    restart: unless-stopped 
     depends_on:
       - eth
       - postgres
       - redis
       - cic-eth-signer
+    deploy:
+      restart_policy:
+        condition: on-failure
     volumes:
       - signer-data:/run/crypto-dev-signer
       - contract-config:/tmp/cic/config/:ro
@@ -332,7 +301,7 @@ services:
       CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
       ETH_GAS_PROVIDER_ADDRESS: $DEV_ETH_ACCOUNT_GAS_PROVIDER
       ETH_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
-      RPC_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
+      RPC_HTTP_PROVIDER: ${ETH_PROVIDER:-http://eth:8545}
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
@@ -356,11 +325,13 @@ services:
       ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER: ${DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER:-0xACB0BC74E1686D62dE7DC6414C999EA60C09F0eA}
       TASKS_TRACE_QUEUE_STATUS: ${TASKS_TRACE_QUEUE_STATUS:-1}
       CIC_DEFAULT_TOKEN_SYMBOL: ${CIC_DEFAULT_TOKEN_SYMBOL:-GFT}
-    restart: on-failure 
     depends_on:
       - eth
       - postgres
       - redis
+    deploy:
+      restart_policy:
+        condition: on-failure
     volumes:
       - signer-data:/run/crypto-dev-signer
       - contract-config:/tmp/cic/config/:ro
@@ -382,8 +353,8 @@ services:
         args:
           EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
     environment:
-      RPC_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
-      ETH_PROVIDER: ${RPC_PROVIDER:-http://eth:8545}
+      RPC_HTTP_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545}
+      ETH_PROVIDER: ${RPC_HTTP_PROVIDER:-http://eth:8545}
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
@@ -395,14 +366,17 @@ services:
       CIC_CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
       CHAIN_SPEC: ${CHAIN_SPEC:-evm:bloxberg:8996}
       CIC_REGISTRY_ADDRESS: $CIC_REGISTRY_ADDRESS
+        #BANCOR_DIR: $BANCOR_DIR
       CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis}
       CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis}
-      TASKS_TRANSFER_CALLBACKS: ${TASKS_TRANSFER_CALLBACKS:-"cic-eth:cic_eth.callbacks.noop.noop,cic-ussd:cic_ussd.tasks.callback_handler.transaction_callback"}
-    restart: on-failure 
+      TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS
     depends_on:
       - eth
       - postgres
       - redis
+    deploy:
+      restart_policy:
+        condition: on-failure
     volumes:
       - contract-config:/tmp/cic/config/:ro
     command:
@@ -425,7 +399,7 @@ services:
           EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
     environment:
       ETH_PROVIDER: http://eth:8545
-      RPC_PROVIDER: http://eth:8545
+      RPC_HTTP_PROVIDER: http://eth:8545
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
@@ -442,11 +416,13 @@ services:
       TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS
       DATABASE_DEBUG: ${DATABASE_DEBUG:-false}
         #DATABASE_DEBUG: 1
-    restart: on-failure 
     depends_on:
       - eth
       - postgres
       - redis
+    deploy:
+      restart_policy:
+        condition: on-failure
     volumes:
         - contract-config:/tmp/cic/config/:ro
     command:
@@ -469,7 +445,7 @@ services:
           EXTRA_INDEX_URL: ${EXTRA_INDEX_URL:-https://pip.grassrootseconomics.net:8433}
     environment:
       ETH_PROVIDER: http://eth:8545
-      RPC_PROVIDER: http://eth:8545
+      RPC_HTTP_PROVIDER: http://eth:8545
       DATABASE_USER: ${DATABASE_USER:-grassroots}
       DATABASE_HOST: ${DATABASE_HOST:-postgres}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD:-tralala}
@@ -488,11 +464,13 @@ services:
       CIC_TX_RETRY_DELAY: 60
       BATCH_SIZE: ${RETRIER_BATCH_SIZE:-50}
         #DATABASE_DEBUG: 1
-    restart: on-failure 
     depends_on:
       - eth
       - postgres
       - redis
+    deploy:
+      restart_policy:
+        condition: on-failure
     volumes:
         - contract-config:/tmp/cic/config/:ro
     command:
@@ -525,15 +503,19 @@ services:
       AFRICASTALKING_API_USERNAME: $AFRICASTALKING_API_USERNAME
       AFRICASTALKING_API_KEY: $AFRICASTALKING_API_KEY
       AFRICASTALKING_API_SENDER_ID: $AFRICASTALKING_API_SENDER_ID
-    restart: unless-stopped 
     depends_on:
       - postgres
       - redis
+    deploy:
+      restart_policy:
+        condition: on-failure
     command: "/root/start_tasker.sh -q cic-notify -vv"
 
 
   cic-meta-server:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-meta:${TAG:-latest}
+    profiles:
+      - custodial-meta
     hostname: meta
     build:
       context: apps/cic-meta
@@ -555,17 +537,21 @@ services:
       PGP_PUBLICKEY_ACTIVE_FILE: publickeys.asc
       PGP_PUBLICKEY_ENCRYPT_FILE: publickeys.asc
       SCHEMA_SQL_PATH: scripts/initdb/server.postgres.sql
-    restart: on-failure 
     ports:
       - ${HTTP_PORT_CIC_META:-63380}:8000
     depends_on:
       - postgres
+    deploy:
+      restart_policy:
+        condition: on-failure
     volumes:
       - ./apps/contract-migration/testdata/pgp/:/tmp/cic/pgp
     # command: "/root/start_server.sh -vv"
 
   cic-user-ussd-server:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-ussd:${TAG:-latest}
+    profiles:
+      - custodial-ussd
     build:
       context: apps/cic-ussd
       dockerfile: docker/Dockerfile
@@ -583,7 +569,6 @@ services:
       PGP_PASSPHRASE: merman
       SERVER_PORT: 9000
       CIC_META_URL: ${CIC_META_URL:-http://meta:8000}
-    restart: on-failure 
     ports:
       - ${HTTP_PORT_CIC_USER_USSD_SERVER:-63315}:9000
     depends_on:
@@ -591,10 +576,15 @@ services:
       - redis
     volumes:
       - ./apps/contract-migration/testdata/pgp/:/usr/src/secrets/
+    deploy:
+      restart_policy:
+        condition: on-failure
     command: "/root/start_cic_user_ussd_server.sh -vv"
 
   cic-user-server:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-ussd:${TAG:-latest}
+    profiles:
+      - custodial-ussd
     build:
       context: apps/cic-ussd
       dockerfile: docker/Dockerfile
@@ -608,15 +598,19 @@ services:
       DATABASE_ENGINE: postgresql
       DATABASE_DRIVER: psycopg2
       DATABASE_POOL_SIZE: 0
-    restart: on-failure 
     ports:
       - ${HTTP_PORT_CIC_USER_SERVER:-63415}:9500
     depends_on:
       - postgres
+    deploy:
+      restart_policy:
+        condition: on-failure
     command: "/root/start_cic_user_server.sh -vv"
 
   cic-user-tasker:
     image: registry.gitlab.com/grassrootseconomics/cic-internal-integration/cic-ussd:${TAG:-latest}
+    profiles:
+      - custodial-ussd
     build:
       context: apps/cic-ussd/
       dockerfile: docker/Dockerfile
@@ -634,10 +628,12 @@ services:
       CELERY_RESULT_URL: ${CELERY_BROKER_URL:-redis://redis}
       PGP_PASSPHRASE: merman
       CIC_META_URL: ${CIC_META_URL:-http://meta:8000}
-    restart: unless-stopped 
     depends_on:
       - postgres
       - redis
     volumes:
       - ./apps/contract-migration/testdata/pgp/:/usr/src/secrets/
+    deploy:
+      restart_policy:
+        condition: on-failure
     command: "/root/start_cic_user_tasker.sh -q cic-ussd -vv"

dump.sh

@@ -0,0 +1 @@
+docker run -t -v cic-internal-integration_contract-config:/tmp/cic/config cic-internal-integration_contract-migration cat /tmp/cic/config/env_reset

scripts/dump.sh

@@ -1 +0,0 @@
-docker run -t -v  --rm cic-internal-integration_contract-config:/tmp/cic/config busybox cat /tmp/cic/config/env_reset