feat: Split and improve contract migration steps

2021-10-20 15:02:36 +00:00
parent 8f1afa094d
commit 13fb67d2d8
96 changed files with 2147 additions and 1327 deletions
--- a/apps/data-seeding/README.md
+++ b/apps/data-seeding/README.md
@@ -136,13 +136,13 @@ First, make a note of the **block height** before running anything:

 To import, run to _completion_:

-`python eth/import_users.py -v -c config -p <eth_provider> -r <cic_registry_address> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c <datadir>`
+`python eth/import_users.py -v -p <eth_provider> -r <cic_registry_address> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c <datadir>`

 After the script completes, keystore files for all generated accouts will be found in `<datadir>/keystore`, all with `foo` as password (would set it empty, but believe it or not some interfaces out there won't work unless you have one).

 Then run:

-`python eth/import_balance.py -v -c config -r <cic_registry_address> -p <eth_provider> --token-symbol <token_symbol> --offset <block_height_at_start> -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c <datadir>` 
+`python eth/import_balance.py -v -r <cic_registry_address> -p <eth_provider> --token-symbol <token_symbol> --offset <block_height_at_start> -y ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c <datadir>` 



@@ -150,11 +150,11 @@ Then run:

 Run in sequence, in first terminal:

-`python cic_eth/import_balance.py -v -c config -p <eth_provider> -r <cic_registry_address> --token-symbol <token_symbol> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out`
+`python cic_eth/import_balance.py -v -p <eth_provider> -r <cic_registry_address> --token-symbol <token_symbol> -y ../contract-migration/keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out`

 In another terminal:

-`python cic_eth/import_users.py -v -c config --redis-host-callback <redis_hostname_in_docker> out`
+`python cic_eth/import_users.py -v --redis-host-callback <redis_hostname_in_docker> out`

 The `redis_hostname_in_docker` value is the hostname required to reach the redis server from within the docker cluster, and should be `redis` if you left the docker-compose unchanged. The `import_users` script will receive the address of each newly created custodial account on a redis subscription fed by a callback task in the `cic_eth` account creation task chain.

--- a/apps/data-seeding/cic_eth/import_balance.py
+++ b/apps/data-seeding/cic_eth/import_balance.py
@@ -47,12 +47,14 @@ from eth_token_index import TokenUniqueSymbolIndex
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

-config_dir = './config'
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = os.path.dirname(script_dir)
+base_config_dir = os.path.join(root_dir, 'config')

 argparser = argparse.ArgumentParser(description='daemon that monitors transactions in new blocks')
+argparser.add_argument('-c', type=str, help='config override directory')
 argparser.add_argument('-p', '--provider', dest='p', type=str, help='chain rpc provider address')
 argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
-argparser.add_argument('-c', type=str, default=config_dir, help='config root to use')
 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')
@@ -71,22 +73,21 @@ if args.v == True:
 elif args.vv == True:
    logging.getLogger().setLevel(logging.DEBUG)

-config_dir = os.path.join(args.c)
-os.makedirs(config_dir, 0o777, True)
-config = confini.Config(config_dir, args.env_prefix)
-# override args
+config = None
+if args.c != None:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'), override_config_dir=args.c)
+else:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
-logg.debug('config loaded from {}:\n{}'.format(config_dir, config))
 args_override = {
-        'CIC_CHAIN_SPEC': getattr(args, 'i'),
-        'ETH_PROVIDER': getattr(args, 'p'),
+        'CHAIN_SPEC': getattr(args, 'i'),
+        'RPC_PROVIDER': getattr(args, 'p'),
        'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
-        'KEYSTORE_FILE_PATH': getattr(args, 'y'),
+        'WALLET_KEY_FILE': getattr(args, 'y'),
        }
 config.dict_override(args_override, 'cli flag')
 config.censor('PASSWORD', 'DATABASE')
 config.censor('PASSWORD', 'SSL')
-logg.debug('config loaded from {}:\n{}'.format(config_dir, config))

 #app = celery.Celery(backend=config.get('CELERY_RESULT_URL'),  broker=config.get('CELERY_BROKER_URL'))

@@ -99,7 +100,7 @@ if args.y != None:
 signer = EIP155Signer(keystore)

 queue = args.q
-chain_str = config.get('CIC_CHAIN_SPEC')
+chain_str = config.get('CHAIN_SPEC')
 block_offset = 0
 if args.head:
    block_offset = -1
@@ -192,7 +193,7 @@ def progress_callback(block_number, tx_index):
 def main():
    global chain_str, block_offset, user_dir
    
-    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    conn = EthHTTPConnection(config.get('RPC_PROVIDER'))
    gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)
    nonce_oracle = RPCNonceOracle(signer_address, conn)

--- a/apps/data-seeding/cic_eth/import_users.py
+++ b/apps/data-seeding/cic_eth/import_users.py
@@ -10,7 +10,7 @@ import time
 import phonenumbers
 from glob import glob

-# third-party imports
+# external imports
 import redis
 import confini
 import celery
@@ -23,15 +23,23 @@ from cic_types.models.person import Person
 from cic_eth.api.api_task import Api
 from chainlib.chain import ChainSpec
 from cic_types.processor import generate_metadata_pointer
+from cic_types import MetadataPointer
+
+# local imports
+from common.dirs import initialize_dirs
+

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

-default_config_dir = '/usr/local/etc/cic'
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = os.path.dirname(script_dir)
+base_config_dir = os.path.join(root_dir, 'config')

 argparser = argparse.ArgumentParser()
-argparser.add_argument('-c', type=str, default=default_config_dir, help='config file')
+argparser.add_argument('-c', type=str, help='config override directory')
 argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='Chain specification string')
+argparser.add_argument('-f', action='store_true', help='force clear previous state')
 argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
 argparser.add_argument('--redis-host', dest='redis_host', type=str, help='redis host to use for task submission')
 argparser.add_argument('--redis-port', dest='redis_port', type=int, help='redis host to use for task submission')
@@ -52,16 +60,21 @@ if args.v:
 elif args.vv:
    logg.setLevel(logging.DEBUG)

-config_dir = args.c
-config = confini.Config(config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
+config = None
+if args.c != None:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'), override_config_dir=args.c)
+else:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
 args_override = {
-        'CIC_CHAIN_SPEC': getattr(args, 'i'),
+        'CHAIN_SPEC': getattr(args, 'i'),
        'REDIS_HOST': getattr(args, 'redis_host'),
        'REDIS_PORT': getattr(args, 'redis_port'),
        'REDIS_DB': getattr(args, 'redis_db'),
        }
 config.dict_override(args_override, 'cli')
+config.add(args.user_dir, '_USERDIR', True)
+
 celery_app = celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))

 redis_host = config.get('REDIS_HOST')
@@ -71,44 +84,25 @@ r = redis.Redis(redis_host, redis_port, redis_db)

 ps = r.pubsub()

-user_new_dir = os.path.join(args.user_dir, 'new')
-os.makedirs(user_new_dir)
-
-meta_dir = os.path.join(args.user_dir, 'meta')
-os.makedirs(meta_dir)
-
-custom_dir = os.path.join(args.user_dir, 'custom')
-os.makedirs(custom_dir)
-os.makedirs(os.path.join(custom_dir, 'new'))
-os.makedirs(os.path.join(custom_dir, 'meta'))
-
-phone_dir = os.path.join(args.user_dir, 'phone')
-os.makedirs(os.path.join(phone_dir, 'meta'))
-
-user_old_dir = os.path.join(args.user_dir, 'old')
-os.stat(user_old_dir)
-
-txs_dir = os.path.join(args.user_dir, 'txs')
-os.makedirs(txs_dir)
-
-user_dir = args.user_dir

 old_chain_spec = ChainSpec.from_chain_str(args.old_chain_spec)
 old_chain_str = str(old_chain_spec)

-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)

 batch_size = args.batch_size
 batch_delay = args.batch_delay

+dirs = initialize_dirs(config.get('_USERDIR'), force_reset=args.f)
+

 def register_eth(i, u):
    redis_channel = str(uuid.uuid4())
    ps.subscribe(redis_channel)
    #ps.get_message()
    api = Api(
-        config.get('CIC_CHAIN_SPEC'),
+        config.get('CHAIN_SPEC'),
        queue=args.q,
        callback_param='{}:{}:{}:{}'.format(args.redis_host_callback, args.redis_port_callback, redis_db, redis_channel),
        callback_task='cic_eth.callbacks.redis.redis',
@@ -145,7 +139,7 @@ def register_eth(i, u):
 if __name__ == '__main__':

    user_tags = {}
-    f = open(os.path.join(user_dir, 'tags.csv'), 'r')
+    f = open(os.path.join(config.get('_USERDIR'), 'tags.csv'), 'r')
    while True:
        r = f.readline().rstrip()
        if len(r) == 0:
@@ -158,7 +152,8 @@ if __name__ == '__main__':

    i = 0
    j = 0
-    for x in os.walk(user_old_dir):
+
+    for x in os.walk(dirs['old']):
        for y in x[2]:
            if y[len(y)-5:] != '.json':
                continue
@@ -182,7 +177,7 @@ if __name__ == '__main__':

            new_address_clean = strip_0x(new_address)
            filepath = os.path.join(
-                    user_new_dir,
+                    dirs['new'],
                    new_address_clean[:2].upper(),
                    new_address_clean[2:4].upper(),
                    new_address_clean.upper() + '.json',
@@ -194,17 +189,17 @@ if __name__ == '__main__':
            f.write(json.dumps(o))
            f.close()

-            meta_key = generate_metadata_pointer(bytes.fromhex(new_address_clean), ':cic.person')
-            meta_filepath = os.path.join(meta_dir, '{}.json'.format(new_address_clean.upper()))
+            meta_key = generate_metadata_pointer(bytes.fromhex(new_address_clean), MetadataPointer.PERSON)
+            meta_filepath = os.path.join(dirs['meta'], '{}.json'.format(new_address_clean.upper()))
            os.symlink(os.path.realpath(filepath), meta_filepath)

            phone_object = phonenumbers.parse(u.tel)
            phone = phonenumbers.format_number(phone_object, phonenumbers.PhoneNumberFormat.E164)
-            meta_phone_key = generate_metadata_pointer(phone.encode('utf-8'), ':cic.phone')
-            meta_phone_filepath = os.path.join(phone_dir, 'meta', meta_phone_key)
+            meta_phone_key = generate_metadata_pointer(phone.encode('utf-8'), MetadataPointer.PHONE)
+            meta_phone_filepath = os.path.join(dirs['phone'], 'meta', meta_phone_key)

            filepath = os.path.join(
-                    phone_dir,
+                    dirs['phone'],
                    'new',
                    meta_phone_key[:2].upper(),
                    meta_phone_key[2:4].upper(),
@@ -220,11 +215,11 @@ if __name__ == '__main__':


            # custom data
-            custom_key = generate_metadata_pointer(bytes.fromhex(new_address_clean), ':cic.custom')
-            custom_filepath = os.path.join(custom_dir, 'meta', custom_key)
+            custom_key = generate_metadata_pointer(bytes.fromhex(new_address_clean), MetadataPointer.CUSTOM)
+            custom_filepath = os.path.join(dirs['custom'], 'meta', custom_key)

            filepath = os.path.join(
-                    custom_dir,
+                    dirs['custom'],
                    'new',
                    custom_key[:2].upper(),
                    custom_key[2:4].upper(),
--- a/apps/data-seeding/cic_eth/traffic/cmd/cache.py
+++ b/apps/data-seeding/cic_eth/traffic/cmd/cache.py
@@ -3,6 +3,10 @@ from chainlib.jsonrpc import JSONRPCException
 from eth_erc20 import ERC20
 from eth_accounts_index import AccountsIndex
 from eth_token_index import TokenUniqueSymbolIndex
+import logging
+
+logg = logging.getLogger(__name__)
+

 class ERC20Token:

@@ -46,7 +50,8 @@ class IndexCache:
            try:
                r = conn.do(o)
                entries.append(self.parse(r, conn))
-            except JSONRPCException:
+            except JSONRPCException as e:
+                logg.debug('foo {}'.format(e))
                return entries
            i += 1

--- a/apps/data-seeding/cic_eth/traffic/local/account.py
+++ b/apps/data-seeding/cic_eth/traffic/local/account.py
@@ -11,6 +11,18 @@ queue = 'cic-eth'
 name = 'account'


+def create_user(chain_spec, redis_host_callback, redis_port_callback, redis_db, redis_channel):
+    api = Api(
+        str(chain_spec),
+        queue=queue,
+        callback_param='{}:{}:{}:{}'.format(redis_host_callback, redis_port_callback, redis_db, redis_channel),
+        callback_task='cic_eth.callbacks.redis.redis',
+        callback_queue=queue,
+        )
+
+    return api.create_account(register=True)
+
+
 def do(token_pair, sender, recipient, sender_balance, aux, block_number):
    """Triggers creation and registration of new account through the custodial cic-eth component.

@@ -24,14 +36,6 @@ def do(token_pair, sender, recipient, sender_balance, aux, block_number):
    See local.noop.do for details on parameters and return values.
    """
    logg.debug('running {} {} {}'.format(__name__, token_pair, sender, recipient))
-    api = Api(
-        str(aux['chain_spec']),
-        queue=queue,
-        callback_param='{}:{}:{}:{}'.format(aux['redis_host_callback'], aux['redis_port_callback'], aux['redis_db'], aux['redis_channel']),
-        callback_task='cic_eth.callbacks.redis.redis',
-        callback_queue=queue,
-        )
-
-    t = api.create_account(register=True)
+    t = create_user(aux['chain_spec'], aux['redis_host_callback'], aux['redis_port_callback'], aux['redis_db'], aux['redis_channel'])

    return (None, t, sender_balance, )
--- a/apps/data-seeding/cic_eth/traffic/traffic.py
+++ b/apps/data-seeding/cic_eth/traffic/traffic.py
@@ -21,6 +21,9 @@ import chainlib.eth.cli
 import cic_eth.cli
 from cic_eth.cli.chain import chain_interface
 from chainlib.eth.constant import ZERO_ADDRESS
+from eth_accounts_index import AccountsIndex
+from erc20_faucet import Faucet
+from cic_eth.api import Api

 # local imports
 #import common
@@ -108,6 +111,12 @@ def main():
        raise NetworkError('AccountRegistry value missing from contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))
    logg.info('using account registry {}'.format(account_registry))
    account_cache = AccountRegistryCache(chain_spec, account_registry)
+
+    faucet = registry.lookup('Faucet')
+    if faucet == ZERO_ADDRESS:
+        logg.warning('Faucet entry missing from value missing from contract registry {}. New account registrations will need external mechanism for initial token balances.'.format(config.get('CIC_REGISTRY_ADDRESS')))
+    else:
+        logg.info('using faucet {}'.format(faucet))
   
    # Set up provisioner for common task input data
    TrafficProvisioner.oracles['token'] = token_cache
@@ -124,6 +133,27 @@ def main():

    syncer = HeadSyncer(syncer_backend, chain_interface, block_callback=handler.refresh)
    syncer.add_filter(handler)
+
+    # bootstrap two accounts if starting from scratch
+    c = AccountsIndex(chain_spec)
+    o = c.entry_count(account_registry)
+    r = conn.do(o)
+
+    logg.debug('entry count {}'.format(c.parse_entry_count(r)))
+
+    if c.parse_entry_count(r) == 0:
+        if faucet == ZERO_ADDRESS:
+            raise ValueError('No accounts exist in network and no faucet exists. It will be impossible for any created accounts to trade.')
+        c = Faucet(chain_spec)
+        o = c.token_amount(faucet)
+        r = conn.do(o)
+        if c.parse_token_amount(r) == 0:
+            raise ValueError('No accounts exist in network and faucet amount is set to 0. It will be impossible for any created accounts to trade.')
+
+        api = Api(str(chain_spec), queue=config.get('CELERY_QUEUE'))
+        api.create_account(register=True)
+        api.create_account(register=True)
+
    syncer.loop(1, conn)


--- a/apps/data-seeding/cic_ussd/import_balance.py
+++ b/apps/data-seeding/cic_ussd/import_balance.py
@@ -57,8 +57,8 @@ elif args.v:
 config = Config(args.c, args.env_prefix)
 config.process()
 args_override = {
-    'CIC_CHAIN_SPEC': getattr(args, 'i'),
-    'ETH_PROVIDER': getattr(args, 'p'),
+    'CHAIN_SPEC': getattr(args, 'i'),
+    'RPC_PROVIDER': getattr(args, 'p'),
    'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
    'REDIS_HOST': getattr(args, 'redis_host'),
    'REDIS_PORT': getattr(args, 'redis_port'),
@@ -90,7 +90,7 @@ signer = EIP155Signer(keystore)

 block_offset = -1 if args.head else args.offset

-chain_str = config.get('CIC_CHAIN_SPEC')
+chain_str = config.get('CHAIN_SPEC')
 chain_spec = ChainSpec.from_chain_str(chain_str)
 ImportTask.chain_spec = chain_spec
 old_chain_spec_str = args.old_chain_spec
@@ -99,16 +99,12 @@ old_chain_spec = ChainSpec.from_chain_str(old_chain_spec_str)
 MetadataTask.meta_host = config.get('META_HOST')
 MetadataTask.meta_port = config.get('META_PORT')

-txs_dir = os.path.join(args.import_dir, 'txs')
-os.makedirs(txs_dir, exist_ok=True)
-sys.stdout.write(f'created txs dir: {txs_dir}')
-
 celery_app = celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))
 get_celery_worker_status(celery_app)


 def main():
-    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    conn = EthHTTPConnection(config.get('RPC_PROVIDER'))
    ImportTask.balance_processor = BalanceProcessor(conn,
                                                    chain_spec,
                                                    config.get('CIC_REGISTRY_ADDRESS'),
--- a/apps/data-seeding/cic_ussd/import_task.py
+++ b/apps/data-seeding/cic_ussd/import_task.py
@@ -14,7 +14,9 @@ from celery import Task
 from chainlib.chain import ChainSpec
 from chainlib.eth.address import to_checksum_address
 from chainlib.eth.tx import raw, unpack
-from cic_types.models.person import Person, generate_metadata_pointer
+from cic_types.models.person import Person, identity_tag
+from cic_types.processor import generate_metadata_pointer
+from cic_types.condiments import MetadataPointer
 from hexathon import add_0x, strip_0x

 # local imports
@@ -55,7 +57,7 @@ class MetadataTask(ImportTask):


 def old_address_from_phone(base_path: str, phone_number: str):
-    pid_x = generate_metadata_pointer(phone_number.encode('utf-8'), ':cic.phone')
+    pid_x = generate_metadata_pointer(phone_number.encode('utf-8'), MetadataPointer.PHONE)
    phone_idx_path = os.path.join(f'{base_path}/phone/{pid_x[:2]}/{pid_x[2:4]}/{pid_x}')
    with open(phone_idx_path, 'r') as f:
        old_address = f.read()
@@ -73,9 +75,13 @@ def generate_person_metadata(self, blockchain_address: str, phone_number: str):
    person = Person.deserialize(person_metadata)
    if not person.identities.get('evm'):
        person.identities['evm'] = {}
-    sub_chain_str = f'{self.chain_spec.common_name()}:{self.chain_spec.network_id()}'
-    person.identities['evm'][sub_chain_str] = [add_0x(blockchain_address)]
-    blockchain_address = strip_0x(blockchain_address)
+    chain_spec = self.chain_spec.asdict()
+    arch = chain_spec.get('arch')
+    fork = chain_spec.get('fork')
+    tag = identity_tag(chain_spec)
+    person.identities[arch][fork] = {
+        tag: [blockchain_address]
+    }
    file_path = os.path.join(
        self.import_dir,
        'new',
@@ -102,7 +108,7 @@ def generate_preferences_data(self, data: tuple):
    blockchain_address: str = data[0]
    preferences = data[1]
    preferences_dir = os.path.join(self.import_dir, 'preferences')
-    preferences_key = generate_metadata_pointer(bytes.fromhex(strip_0x(blockchain_address)), ':cic.preferences')
+    preferences_key = generate_metadata_pointer(bytes.fromhex(strip_0x(blockchain_address)), MetadataPointer.PREFERENCES)
    preferences_filepath = os.path.join(preferences_dir, 'meta', preferences_key)
    filepath = os.path.join(
        preferences_dir,
@@ -137,7 +143,7 @@ def generate_ussd_data(self, blockchain_address: str, phone_number: str):
    preferred_language = random.sample(["en", "sw"], 1)[0]
    preferences = {'preferred_language': preferred_language}
    with open(ussd_data_file, file_op) as ussd_data_file:
-        ussd_data_file.write(f'{phone_number}, { 1}, {preferred_language}, {False}\n')
+        ussd_data_file.write(f'{phone_number}, 1, {preferred_language}, False\n')
        logg.debug(f'written ussd data for address: {blockchain_address}')
    return blockchain_address, preferences

@@ -163,7 +169,7 @@ def opening_balance_tx(self, blockchain_address: str, phone_number: str, serial:

@celery_app.task(bind=True, base=MetadataTask)
 def resolve_phone(self, phone_number: str):
-    identifier = generate_metadata_pointer(phone_number.encode('utf-8'), ':cic.phone')
+    identifier = generate_metadata_pointer(phone_number.encode('utf-8'), MetadataPointer.PHONE)
    url = parse.urljoin(self.meta_url(), identifier)
    logg.debug(f'attempt getting phone pointer at: {url} for phone: {phone_number}')
    r = request.urlopen(url)
--- a/apps/data-seeding/cic_ussd/import_users.py
+++ b/apps/data-seeding/cic_ussd/import_users.py
@@ -17,6 +17,7 @@ from cic_types.models.person import Person
 from confini import Config

 # local imports
+from common.dirs import initialize_dirs
 from import_util import get_celery_worker_status

 default_config_dir = './config'
@@ -37,6 +38,7 @@ arg_parser.add_argument('--env-prefix',
                        dest='env_prefix',
                        type=str,
                        help='environment prefix for variables to overwrite configuration.')
+arg_parser.add_argument('-f', action='store_true', help='force clear previous state')
 arg_parser.add_argument('-i', '--chain-spec', type=str, dest='i', help='chain spec')
 arg_parser.add_argument('-q', type=str, default='cic-import-ussd', help='celery queue to submit data seeding tasks to.')
 arg_parser.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use for task submission and callback')
@@ -70,21 +72,7 @@ config.censor('PASSWORD', 'DATABASE')
 config.censor('PASSWORD', 'SSL')
 logg.debug(f'config loaded from {args.c}:\n{config}')

-old_account_dir = os.path.join(args.import_dir, 'old')
-os.stat(old_account_dir)
-logg.debug(f'created old system data dir: {old_account_dir}')
-
-new_account_dir = os.path.join(args.import_dir, 'new')
-os.makedirs(new_account_dir, exist_ok=True)
-logg.debug(f'created new system data dir: {new_account_dir}')
-
-person_metadata_dir = os.path.join(args.import_dir, 'meta')
-os.makedirs(person_metadata_dir, exist_ok=True)
-logg.debug(f'created person metadata dir: {person_metadata_dir}')
-
-preferences_dir = os.path.join(args.import_dir, 'preferences')
-os.makedirs(os.path.join(preferences_dir, 'meta'), exist_ok=True)
-logg.debug(f'created preferences metadata dir: {preferences_dir}')
+dirs = initialize_dirs(args.import_dir, force_reset=args.f)

 valid_service_codes = config.get('USSD_SERVICE_CODE').split(",")

@@ -157,7 +145,7 @@ def register_account(person: Person):
 if __name__ == '__main__':
    i = 0
    j = 0
-    for x in os.walk(old_account_dir):
+    for x in os.walk(dirs['old']):
        for y in x[2]:
            if y[len(y) - 5:] != '.json':
                continue
--- a/apps/data-seeding/common/dirs.py
+++ b/apps/data-seeding/common/dirs.py
@@ -0,0 +1,42 @@
+# standard imports
+import os
+import shutil
+import sys
+
+
+def initialize_dirs(user_dir, force_reset=False):
+
+    dirs = {}
+
+    dirs['old'] = os.path.join(user_dir, 'old')
+    dirs['new'] = os.path.join(user_dir, 'new')
+    dirs['meta'] = os.path.join(user_dir, 'meta')
+    dirs['custom'] = os.path.join(user_dir, 'custom')
+    dirs['preferences'] = os.path.join(user_dir, 'preferences')
+    dirs['txs'] = os.path.join(user_dir, 'txs')
+    dirs['keyfile'] = os.path.join(user_dir, 'keystore')
+    dirs['custom_new'] = os.path.join(dirs['custom'], 'new')
+    dirs['custom_meta'] = os.path.join(dirs['custom'], 'meta')
+    dirs['preferences_meta'] = os.path.join(dirs['preferences'], 'meta')
+    dirs['preferences_new'] = os.path.join(dirs['preferences'], 'new')
+
+    try:
+        os.stat(dirs['old'])
+    except FileNotFoundError:
+        sys.stderr.write('no users to import. please run create_import_users.py first\n')
+        sys.exit(1)
+
+    if force_reset:
+        for d in dirs.keys():
+            if d == 'old':
+                continue
+            try:
+                shutil.rmtree(dirs[d])
+            except FileNotFoundError:
+                pass
+    for d in dirs.keys():
+        if d == 'old':
+            continue
+        os.makedirs(dirs[d])
+
+    return dirs
--- a/apps/data-seeding/config/chain.ini
+++ b/apps/data-seeding/config/chain.ini
@@ -0,0 +1,2 @@
+[chain]
+spec =
--- a/apps/data-seeding/config/cic.ini
+++ b/apps/data-seeding/config/cic.ini
@@ -1,10 +1,2 @@
 [cic]
 registry_address =
-token_index_address =
-accounts_index_address = 
-declarator_address = 
-approval_escrow_address =
-chain_spec =
-tx_retry_delay = 
-trust_address =
-user_ussd_svc_service_port =
--- a/apps/data-seeding/config/eth.ini
+++ b/apps/data-seeding/config/eth.ini
@@ -1,2 +0,0 @@
-[eth]
-provider = http://localhost:63545
--- a/apps/data-seeding/config/rpc.ini
+++ b/apps/data-seeding/config/rpc.ini
@@ -0,0 +1,2 @@
+[rpc]
+provider =
--- a/apps/data-seeding/create_import_users.py
+++ b/apps/data-seeding/create_import_users.py
@@ -20,7 +20,7 @@ from cic_types.models.person import (
    generate_vcard_from_contact_data,
    get_contact_data_from_vcard,
 )
-from chainlib.eth.address import to_checksum_address
+from chainlib.eth.address import to_checksum_address, strip_0x
 import phonenumbers

 logging.basicConfig(level=logging.WARNING)
@@ -30,7 +30,6 @@ fake = Faker(['sl', 'en_US', 'no', 'de', 'ro'])

 default_config_dir = './config'

-
 argparser = argparse.ArgumentParser()
 argparser.add_argument('-c', type=str, default=default_config_dir, help='Config dir')
 argparser.add_argument('--tag', type=str, action='append',
@@ -54,7 +53,6 @@ config = confini.Config(args.c, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
 logg.debug('loaded config\n{}'.format(config))

-
 dt_now = datetime.datetime.utcnow()
 dt_then = dt_now - datetime.timedelta(weeks=150)
 ts_now = int(dt_now.timestamp())
@@ -64,7 +62,7 @@ celery_app = celery.Celery(broker=config.get(
    'CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))

 gift_max = args.gift_threshold or 0
-gift_factor = (10**6)
+gift_factor = (10 ** 6)

 categories = [
    "food/water",
@@ -105,7 +103,6 @@ def genId(addr, typ):


 def genDate():
-
    ts = random.randint(ts_then, ts_now)
    return int(datetime.datetime.fromtimestamp(ts).timestamp())

@@ -148,9 +145,7 @@ def genDob():


 def gen():
-    old_blockchain_address = '0x' + os.urandom(20).hex()
-    old_blockchain_checksum_address = to_checksum_address(
-        old_blockchain_address)
+    old_blockchain_address = os.urandom(20).hex()
    gender = random.choice(['female', 'male', 'other'])
    phone = genPhone()
    v = genPersonal(phone)
@@ -164,9 +159,9 @@ def gen():
    p.gender = gender
    p.identities = {
        'evm': {
-            'oldchain:1': [
-                old_blockchain_checksum_address,
-            ],
+            'foo': {
+                '1:oldchain': [old_blockchain_address],
+            },
        },
    }
    p.products = [fake.random_element(elements=OrderedDict(
@@ -207,7 +202,7 @@ def gen():
        # fake.local_latitude()
        p.location['longitude'] = (random.random() * 360) - 180

-    return (old_blockchain_checksum_address, phone, p)
+    return old_blockchain_address, phone, p


 def prepareLocalFilePath(datadir, address):
@@ -242,7 +237,7 @@ if __name__ == '__main__':
        except Exception as e:
            logg.warning('generate failed, trying anew: {}'.format(e))
            continue
-        uid = eth[2:].upper()
+        uid = strip_0x(eth).upper()

        print(o)

--- a/apps/data-seeding/docker/Dockerfile
+++ b/apps/data-seeding/docker/Dockerfile
@@ -7,20 +7,23 @@ RUN mkdir -vp /usr/local/etc/cic

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


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

+COPY common/ cic_ussd/common/
 COPY requirements.txt .
-COPY config/ /usr/local/etc/data-seeding
+COPY config/ config

-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 \
-    --extra-index-url $GITLAB_PYTHON_REGISTRY \
-    --extra-index-url $EXTRA_INDEX_URL -r requirements.txt
+ARG EXTRA_PIP_INDEX_URL=https://pip.grassrootseconomics.net:8433
+ARG EXTRA_PIP_ARGS=""
+ARG PIP_INDEX_URL=https://pypi.org/simple
+
+RUN  pip install --index-url $PIP_INDEX_URL  \
+	  --extra-index-url $EXTRA_PIP_INDEX_URL $EXTRA_PIP_ARGS \
+    -r requirements.txt

 COPY . . 

--- a/apps/data-seeding/eth/import_balance.py
+++ b/apps/data-seeding/eth/import_balance.py
@@ -47,12 +47,15 @@ from erc20_faucet import Faucet
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

-config_dir = './config'
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = os.path.dirname(script_dir)
+base_config_dir = os.path.join(root_dir, 'config')
+

 argparser = argparse.ArgumentParser(description='daemon that monitors transactions in new blocks')
 argparser.add_argument('-p', '--provider', dest='p', type=str, help='chain rpc provider address')
 argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
-argparser.add_argument('-c', type=str, default=config_dir, help='config root to use')
+argparser.add_argument('-c', type=str, help='config override directory')
 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')
@@ -71,21 +74,24 @@ if args.v == True:
 elif args.vv == True:
    logging.getLogger().setLevel(logging.DEBUG)

-config_dir = os.path.join(args.c)
-os.makedirs(config_dir, 0o777, True)
-config = confini.Config(config_dir, args.env_prefix)
+config = None
+logg.debug('config dir {}'.format(base_config_dir))
+if args.c != None:
+    config = confini.Config(base_config_dir, env_prefix=os.environ.get('CONFINI_ENV_PREFIX'), override_dirs=args.c)
+else:
+    config = confini.Config(base_config_dir, env_prefix=os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
+
 # override args
 args_override = {
-        'CIC_CHAIN_SPEC': getattr(args, 'i'),
-        'ETH_PROVIDER': getattr(args, 'p'),
+        'CHAIN_SPEC': getattr(args, 'i'),
+        'RPC_PROVIDER': getattr(args, 'p'),
        'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
        'KEYSTORE_FILE_PATH': getattr(args, 'y')
        }
 config.dict_override(args_override, 'cli flag')
 config.censor('PASSWORD', 'DATABASE')
 config.censor('PASSWORD', 'SSL')
-logg.debug('config loaded from {}:\n{}'.format(config_dir, config))

 #app = celery.Celery(backend=config.get('CELERY_RESULT_URL'),  broker=config.get('CELERY_BROKER_URL'))

@@ -98,7 +104,7 @@ if args.y != None:
 signer = EIP155Signer(keystore)

 queue = args.q
-chain_str = config.get('CIC_CHAIN_SPEC')
+chain_str = config.get('CHAIN_SPEC')
 block_offset = 0
 if args.head:
    block_offset = -1
@@ -203,7 +209,7 @@ def progress_callback(block_number, tx_index):
 def main():
    global chain_str, block_offset, user_dir
    
-    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    conn = EthHTTPConnection(config.get('RPC_PROVIDER'))
    gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)
    nonce_oracle = RPCNonceOracle(signer_address, conn)

--- a/apps/data-seeding/eth/import_users.py
+++ b/apps/data-seeding/eth/import_users.py
@@ -8,6 +8,7 @@ import uuid
 import datetime
 import time
 import phonenumbers
+import shutil
 from glob import glob

 # external imports
@@ -23,22 +24,30 @@ from chainlib.eth.connection import EthHTTPConnection
 from chainlib.eth.gas import RPCGasOracle
 from chainlib.eth.nonce import RPCNonceOracle
 from cic_types.processor import generate_metadata_pointer
+from cic_types import MetadataPointer
 from eth_accounts_index.registry import AccountRegistry
 from eth_contract_registry import Registry
 from crypto_dev_signer.keystore.dict import DictKeystore
 from crypto_dev_signer.eth.signer.defaultsigner import ReferenceSigner as EIP155Signer
 from crypto_dev_signer.keystore.keyfile import to_dict as to_keyfile_dict

+# local imports
+from common.dirs import initialize_dirs
+
+
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

-default_config_dir = '/usr/local/etc/cic'
+script_dir = os.path.dirname(os.path.realpath(__file__))
+root_dir = os.path.dirname(script_dir)
+base_config_dir = os.path.join(root_dir, 'config')

 argparser = argparse.ArgumentParser()
 argparser.add_argument('-p', '--provider', dest='p', default='http://localhost:8545', type=str, help='Web3 provider url (http only)')
 argparser.add_argument('-y', '--key-file', dest='y', type=str, help='Ethereum keystore file to use for signing')
-argparser.add_argument('-c', type=str, default=default_config_dir, help='config file')
-argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
+argparser.add_argument('-c', type=str, help='config override directory')
+argparser.add_argument('-f', action='store_true', help='force clear previous state')
+argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:foo:1:oldchain', help='chain spec')
 argparser.add_argument('-i', '--chain-spec', dest='i', type=str, help='Chain specification string')
 argparser.add_argument('-r', '--registry', dest='r', type=str, help='Contract registry address')
 argparser.add_argument('--batch-size', dest='batch_size', default=50, type=int, help='burst size of sending transactions to node')
@@ -53,40 +62,23 @@ if args.v:
 elif args.vv:
    logg.setLevel(logging.DEBUG)

-config_dir = args.c
-config = confini.Config(config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
+config = None
+if args.c != None:
+    config = confini.Config(base_config_dir, os.environ.get('CONFINI_ENV_PREFIX'), override_config_dir=args.c)
+else:
+    config = confini.Config(base_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')
 config.add(args.user_dir, '_USERDIR', True)

-user_new_dir = os.path.join(args.user_dir, 'new')
-os.makedirs(user_new_dir)
+#user_dir = args.user_dir

-meta_dir = os.path.join(args.user_dir, 'meta')
-os.makedirs(meta_dir)
-
-custom_dir = os.path.join(args.user_dir, 'custom')
-os.makedirs(custom_dir)
-os.makedirs(os.path.join(custom_dir, 'new'))
-os.makedirs(os.path.join(custom_dir, 'meta'))
-
-phone_dir = os.path.join(args.user_dir, 'phone')
-os.makedirs(os.path.join(phone_dir, 'meta'))
-
-user_old_dir = os.path.join(args.user_dir, 'old')
-os.stat(user_old_dir)
-
-txs_dir = os.path.join(args.user_dir, 'txs')
-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)
@@ -113,8 +105,8 @@ r = rpc.do(o)
 account_registry_address = registry.parse_address_of(r)
 logg.info('using account registry {}'.format(account_registry_address))

-keyfile_dir = os.path.join(config.get('_USERDIR'), 'keystore')
-os.makedirs(keyfile_dir)
+dirs = initialize_dirs(config.get('_USERDIR'), force_reset=args.f)
+dirs['phone'] = os.path.join(config.get('_USERDIR'))

 def register_eth(i, u):

@@ -129,7 +121,7 @@ def register_eth(i, u):

    pk = keystore.get(address)
    keyfile_content = to_keyfile_dict(pk, 'foo')
-    keyfile_path = os.path.join(keyfile_dir, '{}.json'.format(address))
+    keyfile_path = os.path.join(dirs['keyfile'], '{}.json'.format(address))
    f = open(keyfile_path, 'w')
    json.dump(keyfile_content, f)
    f.close()
@@ -142,7 +134,7 @@ def register_eth(i, u):
 if __name__ == '__main__':

    user_tags = {}
-    f = open(os.path.join(user_dir, 'tags.csv'), 'r')
+    f = open(os.path.join(config.get('_USERDIR'), 'tags.csv'), 'r')
    while True:
        r = f.readline().rstrip()
        if len(r) == 0:
@@ -154,7 +146,7 @@ if __name__ == '__main__':

    i = 0
    j = 0
-    for x in os.walk(user_old_dir):
+    for x in os.walk(dirs['old']):
        for y in x[2]:
            if y[len(y)-5:] != '.json':
                continue
@@ -173,12 +165,12 @@ if __name__ == '__main__':
            new_address = register_eth(i, u)
            if u.identities.get('evm') == None:
                u.identities['evm'] = {}
-            sub_chain_str = '{}:{}'.format(chain_spec.common_name(), chain_spec.network_id())
-            u.identities['evm'][sub_chain_str] = [new_address]
+            sub_chain_str = '{}:{}'.format(chain_spec.network_id(), chain_spec.common_name())
+            u.identities['evm']['foo'][sub_chain_str] = [new_address]

            new_address_clean = strip_0x(new_address)
            filepath = os.path.join(
-                    user_new_dir,
+                    dirs['new'],
                    new_address_clean[:2].upper(),
                    new_address_clean[2:4].upper(),
                    new_address_clean.upper() + '.json',
@@ -190,18 +182,17 @@ if __name__ == '__main__':
            f.write(json.dumps(o))
            f.close()

-            meta_key = generate_metadata_pointer(bytes.fromhex(new_address_clean), ':cic.person')
-            meta_filepath = os.path.join(meta_dir, '{}.json'.format(new_address_clean.upper()))
+            meta_key = generate_metadata_pointer(bytes.fromhex(new_address_clean), MetadataPointer.PERSON)
+            meta_filepath = os.path.join(dirs['meta'], '{}.json'.format(new_address_clean.upper()))
            os.symlink(os.path.realpath(filepath), meta_filepath)

            phone_object = phonenumbers.parse(u.tel)
            phone = phonenumbers.format_number(phone_object, phonenumbers.PhoneNumberFormat.E164)
-            logg.debug('>>>>> Using phone {}'.format(phone))
-            meta_phone_key = generate_metadata_pointer(phone.encode('utf-8'), ':cic.phone')
-            meta_phone_filepath = os.path.join(phone_dir, 'meta', meta_phone_key)
+            meta_phone_key = generate_metadata_pointer(phone.encode('utf-8'), MetadataPointer.PHONE)
+            meta_phone_filepath = os.path.join(dirs['phone'], 'meta', meta_phone_key)

            filepath = os.path.join(
-                    phone_dir,
+                    dirs['phone'],
                    'new',
                    meta_phone_key[:2].upper(),
                    meta_phone_key[2:4].upper(),
@@ -217,11 +208,11 @@ if __name__ == '__main__':


            # custom data
-            custom_key = generate_metadata_pointer(phone.encode('utf-8'), ':cic.custom')
-            custom_filepath = os.path.join(custom_dir, 'meta', custom_key)
+            custom_key = generate_metadata_pointer(phone.encode('utf-8'), MetadataPointer.CUSTOM)
+            custom_filepath = os.path.join(dirs['custom'], 'meta', custom_key)

            filepath = os.path.join(
-                    custom_dir,
+                    dirs['custom'],
                    'new',
                    custom_key[:2].upper(),
                    custom_key[2:4].upper(),
@@ -229,9 +220,9 @@ if __name__ == '__main__':
                    )
            os.makedirs(os.path.dirname(filepath), exist_ok=True)
           
-            sub_old_chain_str = '{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())
+            sub_old_chain_str = '{}:{}'.format(old_chain_spec.network_id(), old_chain_spec.common_name())
            f = open(filepath, 'w')
-            k = u.identities['evm'][sub_old_chain_str][0]
+            k = u.identities['evm']['foo'][sub_old_chain_str][0]
            tag_data = {'tags': user_tags[strip_0x(k)]}
            f.write(json.dumps(tag_data))
            f.close()
--- a/apps/data-seeding/import_ussd.sh
+++ b/apps/data-seeding/import_ussd.sh
@@ -2,11 +2,11 @@

 if [[ -d "$OUT_DIR" ]]
 then
-  echo "found existing IMPORT DIR cleaning up..."
+  echo -e "\033[;96mfound existing IMPORT DIR cleaning up...\033[;96m"
  rm -rf "$OUT_DIR"
  mkdir -p "$OUT_DIR"
 else
-  echo "IMPORT DIR does not exist creating it."
+  echo -e "\033[;96mIMPORT DIR does not exist creating it.\033[;96m"
  mkdir -p "$OUT_DIR"
 fi

@@ -14,81 +14,81 @@ fi
 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?"
+  >&2 echo -e "\033[;96mCelery workers not available. Is the CELERY_BROKER_URL ($CELERY_BROKER_URL) correct?\033[;96m"
  exit 1
 fi

-echo "Creating seed data..."
+echo -e "\033[;96mCreating seed data...\033[;96m"
 python create_import_users.py -vv  -c "$CONFIG" --dir "$OUT_DIR" "$NUMBER_OF_USERS"
 wait $!

-echo "Check for running celery workers ..."
+echo -e "\033[;96mCheck for running celery workers ...\033[;96m"
 if [ -f ./cic-ussd-import.pid ];
 then
-  echo "Found a running worker. Killing ..."
+  echo -e "\033[;96mFound a running worker. Killing ...\033[;96m"
  kill -9 $(<cic-ussd-import.pid)
 fi

-echo "Purge tasks from celery worker"
+echo -e "\033[;96mPurge tasks from celery worker\033[;96m"
 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"
+echo -e "\033[;96mStart celery work and import balance job\033[;96m"
 if [ "$INCLUDE_BALANCES" != "y" ]
 then
-  echo "Running worker without opening balance transactions"
+  echo -e "\033[;96mRunning worker without opening balance transactions\033[;96m"
  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 &
 else
-  echo "Running worker with opening balance transactions"
+  echo -e "\033[;96mRunning worker with opening balance transactions\033[;96m"
  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" &
 fi

-echo "Target count set to ${TARGET_TX_COUNT}"
+echo -e "\033[;96mTarget count set to ${TARGET_TX_COUNT}"
 until [ -f ./cic-import-ussd.pid ]
 do
-  echo "Polling for celery worker pid file..."
+  echo -e "\033[;96mPolling for celery worker pid file...\033[;96m"
  sleep 1
 done
 IMPORT_BALANCE_JOB=$(<cic-import-ussd.pid)

-echo "Start import users job"
+echo -e "\033[;96mStart import users job\033[;96m"
 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"
+  echo -e "\033[;96mTargeting secure ussd-user server\033[;96m"
+  python cic_ussd/import_users.py -vv -f -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" "$OUT_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 -f -c "$CONFIG" --ussd-host "$USSD_HOST" --ussd-port "$USSD_PORT" --ussd-no-ssl "$OUT_DIR"
 fi

-echo "Waiting for import balance job to complete ..."
+echo -e "\033[;96mWaiting for import balance job to complete ...\033[;96m"
 tail --pid="$IMPORT_BALANCE_JOB" -f /dev/null
 set -e

-echo "Importing pins"
+echo -e "\033[;96mImporting pins\033[;96m"
 python cic_ussd/import_pins.py -c "$CONFIG" -vv "$OUT_DIR"
 set +e
 wait $!
 set -e

-echo "Importing ussd data"
+echo -e "\033[;96mImporting ussd data\033[;96m"
 python cic_ussd/import_ussd_data.py -c "$CONFIG" -vv "$OUT_DIR"
 set +e
 wait $!

-echo "Importing person metadata"
+echo -e "\033[;96mImporting person metadata\033[;96m"
 node cic_meta/import_meta.js "$OUT_DIR" "$NUMBER_OF_USERS"

-echo "Import preferences metadata"
+echo -e "\033[;96mImport preferences metadata\033[;96m"
 node cic_meta/import_meta_preferences.js "$OUT_DIR" "$NUMBER_OF_USERS"

 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" ]]
+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 -e "\033[;96mNotification count is: ${NOTIFICATION_COUNT} of ${TARGET_TX_COUNT}. Checking after 5 ...\033[;96m"
 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"
+echo -e "\033[;96mRunning verify script.\033[;96m"
+python verify.py -v -p "$ETH_PROVIDER"  -r "$CIC_REGISTRY_ADDRESS" --exclude "$EXCLUSIONS" --meta-provider "$META_URL" --token-symbol "$TOKEN_SYMBOL" --ussd-provider "$USSD_PROVIDER" "$OUT_DIR"
--- a/apps/data-seeding/requirements.txt
+++ b/apps/data-seeding/requirements.txt
@@ -1,14 +1,15 @@
 sarafu-faucet~=0.0.7a2
-cic-eth[tools]~=0.12.4a8
-cic-types~=0.1.0a15
-crypto-dev-signer~=0.4.15a7
+cic-eth[tools]~=0.12.4a13
+cic-types~=0.2.0a6
+funga>=0.5.1a1,<=0.5.15
 faker==4.17.1
-chainsyncer~=0.0.6a3
-chainlib-eth~=0.0.9a14
-eth-address-index~=0.2.3a4
+chainsyncer~=0.0.7a3
+chainlib-eth~=0.0.10a10
+eth-address-index~=0.2.4a1
 eth-contract-registry~=0.6.3a3
 eth-accounts-index~=0.1.2a3
 eth-erc20~=0.1.2a3
 erc20-faucet~=0.3.2a2
 psycopg2==2.8.6
 liveness~=0.0.1a7
+confini>=0.4.2rc3,<0.5.0
--- a/apps/data-seeding/verify.py
+++ b/apps/data-seeding/verify.py
@@ -25,10 +25,9 @@ from chainlib.eth.gas import (
 from chainlib.eth.tx import TxFactory
 from chainlib.hash import keccak256_string_to_hex
 from chainlib.jsonrpc import JSONRPCRequest
-from cic_types.models.person import (
-    Person,
-    generate_metadata_pointer,
-)
+from cic_types.models.person import Person, identity_tag
+from cic_types.condiments import MetadataPointer
+from cic_types.processor import generate_metadata_pointer
 from erc20_faucet import Faucet
 from eth_erc20 import ERC20
 from hexathon.parse import strip_0x, add_0x
@@ -39,7 +38,8 @@ from eth_token_index import TokenUniqueSymbolIndex
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()

-config_dir = '/usr/local/etc/cic-syncer'
+script_dir = os.path.dirname(os.path.realpath(__file__))
+base_config_dir = os.path.join(script_dir, 'config')

 custodial_tests = [
        'local_key',
@@ -72,8 +72,8 @@ all_tests = eth_tests + custodial_tests + metadata_tests + phone_tests

 argparser = argparse.ArgumentParser(description='daemon that monitors transactions in new blocks')
 argparser.add_argument('-p', '--provider', dest='p', type=str, help='chain rpc provider address')
-argparser.add_argument('-c', type=str, default=config_dir, help='config root to use')
-argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:oldchain:1', help='chain spec')
+argparser.add_argument('-c', type=str, help='config override dir')
+argparser.add_argument('--old-chain-spec', type=str, dest='old_chain_spec', default='evm:foo:1:oldchain', help='chain spec')
 argparser.add_argument('-i', '--chain-spec', type=str, dest='i', help='chain spec')
 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')
@@ -96,14 +96,18 @@ if args.v == True:
 elif args.vv == True:
    logging.getLogger().setLevel(logging.DEBUG)

-config_dir = os.path.join(args.c)
-os.makedirs(config_dir, 0o777, True)
-config = confini.Config(config_dir, args.env_prefix)
+config = None
+logg.debug('config dir {}'.format(base_config_dir))
+if args.c != None:
+    config = confini.Config(base_config_dir, env_prefix=os.environ.get('CONFINI_ENV_PREFIX'), override_dirs=args.c)
+else:
+    config = confini.Config(base_config_dir, env_prefix=os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
+
 # override args
 args_override = {
-        'CIC_CHAIN_SPEC': getattr(args, 'i'),
-        'ETH_PROVIDER': getattr(args, 'p'),
+        'CHAIN_SPEC': getattr(args, 'i'),
+        'RPC_PROVIDER': getattr(args, 'p'),
        'CIC_REGISTRY_ADDRESS': getattr(args, 'r'),
        }
 config.dict_override(args_override, 'cli flag')
@@ -114,11 +118,9 @@ config.add(args.ussd_provider, '_USSD_PROVIDER', True)

 token_symbol = args.token_symbol

-logg.debug('config loaded from {}:\n{}'.format(config_dir, config))
-
 celery_app = celery.Celery(backend=config.get('CELERY_RESULT_URL'),  broker=config.get('CELERY_BROKER_URL'))

-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)
 old_chain_str = str(old_chain_spec)
@@ -304,7 +306,7 @@ class Verifier:


    def verify_gas(self, address, balance_token=None):
-        o = balance(address)
+        o = balance(add_0x(address))
        r = self.conn.do(o)
        logg.debug('wtf {}'.format(r))
        actual_balance = int(strip_0x(r), 16)
@@ -320,7 +322,7 @@ class Verifier:


    def verify_metadata(self, address, balance=None):
-        k = generate_metadata_pointer(bytes.fromhex(strip_0x(address)), ':cic.person')
+        k = generate_metadata_pointer(bytes.fromhex(strip_0x(address)), MetadataPointer.PERSON)
        url = os.path.join(config.get('_META_PROVIDER'), k)
        logg.debug('verify metadata url {}'.format(url))
        try:
@@ -364,7 +366,7 @@ class Verifier:

        p = Person.deserialize(o) 

-        k = generate_metadata_pointer(p.tel.encode('utf-8'), ':cic.phone')
+        k = generate_metadata_pointer(p.tel.encode('utf-8'), MetadataPointer.PHONE)
        url = os.path.join(config.get('_META_PROVIDER'), k)
        logg.debug('verify metadata phone url {}'.format(url))
        try:
@@ -424,7 +426,7 @@ class Verifier:
 def main():
    global chain_str, block_offset, user_dir
    
-    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
+    conn = EthHTTPConnection(config.get('RPC_PROVIDER'))
    gas_oracle = OverrideGasOracle(conn=conn, limit=8000000)

    # Get Token registry address
@@ -502,10 +504,17 @@ def main():
            u = Person.deserialize(o)
            #logg.debug('data {}'.format(u.identities['evm']))

-            subchain_str = '{}:{}'.format(chain_spec.common_name(), chain_spec.network_id())
-            new_address = u.identities['evm'][subchain_str][0]
-            subchain_str = '{}:{}'.format(old_chain_spec.common_name(), old_chain_spec.network_id())
-            old_address = u.identities['evm'][subchain_str][0]
+            new_chain_spec = chain_spec.asdict()
+            arch = new_chain_spec.get('arch')
+            fork = new_chain_spec.get('fork')
+            tag = identity_tag(new_chain_spec)
+            new_address = u.identities[arch][fork][tag][0]
+
+            old_chainspec = old_chain_spec.asdict()
+            arch = old_chainspec.get('arch')
+            fork = old_chainspec.get('fork')
+            tag = identity_tag(old_chainspec)
+            old_address = u.identities[arch][fork][tag][0]
            balance = 0
            try:
                balance = balances[old_address]