Simplify token type selector in contract migration scripts

Adapt deployment to Bloxberg

See merge request grassrootseconomics/cic-internal-integration!99

.gitignore

@@ -4,7 +4,3 @@ service-configs/*
 __pycache__
 *.pyc
 *.o
-gmon.out
-*.egg-info
-dist/
-build/

apps/cic-cache/docker/start_tracker.sh

@@ -2,9 +2,4 @@
 
 . ./db.sh
 
-if [ $? -ne "0" ]; then
-	>&2 echo db migrate fail
-	exit 1
-fi
-
 /usr/local/bin/cic-cache-trackerd $@

apps/cic-eth/cic_eth/k8s/db.py

@@ -1,7 +0,0 @@
-from cic_eth.db.models.base import SessionBase
-
-def health(*args, **kwargs):
-    session = SessionBase.create_session()
-    session.execute('SELECT count(*) from alembic_version')
-    session.close()
-    return True

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

@@ -15,7 +15,6 @@ from chainlib.connection import RPCConnection
 from chainlib.eth.connection import EthUnixSignerConnection
 from chainlib.chain import ChainSpec
 from chainqueue.db.models.otx import Otx
-import liveness.linux
 
 # local imports
 from cic_eth.eth import (
@@ -53,7 +52,6 @@ from cic_eth.registry import (
         connect_token_registry,
         )
 
-
 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
 
@@ -92,15 +90,14 @@ config.censor('PASSWORD', 'DATABASE')
 config.censor('PASSWORD', 'SSL')
 logg.debug('config loaded from {}:\n{}'.format(args.c, config))
 
-health_modules = config.get('CIC_HEALTH_MODULES', [])
-if len(health_modules) != 0:
-    health_modules = health_modules.split(',')
-logg.debug('health mods {}'.format(health_modules))
-
 # connect to database
 dsn = dsn_from_config(config)
 SessionBase.connect(dsn, pool_size=int(config.get('DATABASE_POOL_SIZE')), debug=config.true('DATABASE_DEBUG'))
 
+# verify database connection with minimal sanity query
+session = SessionBase.create_session()
+session.execute('select version_num from alembic_version')
+session.close()
 
 # set up celery
 current_app = celery.Celery(__name__)
@@ -142,7 +139,6 @@ RPCConnection.register_location(config.get('SIGNER_SOCKET_PATH'), chain_spec, 's
 
 Otx.tracing = config.true('TASKS_TRACE_QUEUE_STATUS')
 
-liveness.linux.load(health_modules)
 
 def main():
     argv = ['worker']
@@ -177,10 +173,8 @@ def main():
         logg.info('using trusted address {}'.format(address))
     connect_declarator(rpc, chain_spec, trusted_addresses)
     connect_token_registry(rpc, chain_spec)
-   
-    liveness.linux.set()
+    
     current_app.worker_main(argv)
-    liveness.linux.reset()
 
 
 @celery.signals.eventlet_pool_postshutdown.connect

apps/cic-eth/config/cic.ini

@@ -3,4 +3,3 @@ registry_address =
 chain_spec = evm:bloxberg:8996
 tx_retry_delay = 
 trust_address =
-health_modules = cic_eth.k8s.db

apps/cic-eth/docker/Dockerfile

@@ -53,5 +53,3 @@ COPY cic-eth/crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/
 RUN git clone https://gitlab.com/grassrootseconomics/cic-contracts.git && \
 	mkdir -p /usr/local/share/cic/solidity && \
 	cp -R cic-contracts/abis /usr/local/share/cic/solidity/abi
-
-COPY util/liveness/health.sh /usr/local/bin/health.sh

apps/cic-eth/requirements.txt

@@ -1,4 +1,4 @@
-cic-base==0.1.2a79+build.35e442bc
+cic-base~=0.1.2a76
 celery==4.4.7
 crypto-dev-signer~=0.4.14b2
 confini~=0.3.6rc3

apps/cic-eth/setup.cfg

@@ -38,7 +38,6 @@ packages =
 	cic_eth.runnable.daemons.filters
 	cic_eth.callbacks
 	cic_eth.sync
-	cic_eth.k8s
 scripts =
 	./scripts/migrate.py
 

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

@@ -20,5 +20,5 @@ TRANSITIONS=/usr/src/cic-ussd/transitions/
 
 [client]
 host =
-port =
+port = 
 ssl =

apps/cic-ussd/cic_ussd/processor.py

@@ -71,7 +71,7 @@ def process_exit_insufficient_balance(display_key: str, user: Account, ussd_sess
     operational_balance = get_cached_operational_balance(blockchain_address=user.blockchain_address)
 
     # compile response data
-    user_input = ussd_session.get('user_input').split('*')[-1]
+    user_input = ussd_session.get('session_data').get('transaction_amount')
     transaction_amount = to_wei(value=int(user_input))
     token_symbol = 'SRF'
 
@@ -86,7 +86,7 @@ def process_exit_insufficient_balance(display_key: str, user: Account, ussd_sess
         amount=from_wei(transaction_amount),
         token_symbol=token_symbol,
         recipient_information=tx_recipient_information,
-        token_balance=operational_balance
+        token_balance=operational_balance,
     )
 
 
@@ -401,7 +401,11 @@ def process_request(user_input: str, user: Account, ussd_session: Optional[dict]
                     'exit_invalid_pin',
                     'exit_invalid_new_pin',
                     'exit_pin_mismatch',
-                    'exit_invalid_request'
+                    'exit_invalid_request',
+                    "exit_insufficient_balance",
+                    "exit_successful_transaction",
+                    "help",
+                    "complete"
                 ] and person_metadata is not None:
                     return UssdMenu.find_by_name(name='start')
                 else:

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

@@ -45,7 +45,15 @@ def is_authorized_pin(state_machine_data: Tuple[str, dict, Account]) -> bool:
     :rtype: bool
     """
     user_input, ussd_session, user = state_machine_data
-    return user.verify_password(password=user_input)
+    pin_validity = user.verify_password(password=user_input)
+    if pin_validity is True:
+        return user.verify_password(password=user_input)
+    else:
+        # bump number for failed attempts
+        user.failed_pin_attempts += 1
+        Account.session.add(user)
+        Account.session.commit()
+        return pin_validity
 
 
 def is_locked_account(state_machine_data: Tuple[str, dict, Account]) -> bool:

apps/cic-ussd/docker/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /usr/src
 ARG pip_extra_index_url_flag='--extra-index-url https://pip.grassrootseconomics.net:8433'
 
 RUN apt-get update && \
-	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps git
+	apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps git python-pycurl libcurl4-openssl-dev libssl-dev
 
 # create secrets directory
 RUN mkdir -vp pgp/keys

apps/cic-ussd/expect/account_tests.yml

@@ -0,0 +1,281 @@
+- config:
+    - testset: "account tests"
+
+- test:
+    - group: "accounts"
+    - name: "create account [EN]"
+    - url: "/"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek020", "text": ""}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"175"}
+        - compare: {"raw_body":"", "comparator":"contains", expected: "END Your account is being created. You will receive an SMS when your account is ready.\nAkaunti yako ya Sarafu inatayarishwa. Utapokea ujumbe wa SMS akaunti yako ikiwa tayari.\n" }
+
+- test:
+    - group: "accounts"
+    - name: "create account [SW]"
+    - url: "/"
+    - method: "POST"
+    - delay: 2
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek021", "text": ""}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"175"}
+        - compare: {"raw_body":"", "comparator":"contains", expected: "END Your account is being created. You will receive an SMS when your account is ready.\nAkaunti yako ya Sarafu inatayarishwa. Utapokea ujumbe wa SMS akaunti yako ikiwa tayari.\n" }
+
+- test:
+    - group: "accounts"
+    - name: "select preferred language prompt [EN]"
+    - url: "/"
+    - method: "POST"
+    - delay: 5 # delay to allow celery tasks to run to create account
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": ""}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"53"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Welcome to Sarafu\n1. English\n2. Kiswahili\n3. Help"}
+
+- test:
+    - group: "accounts"
+    - name: "select preferred language prompt [SW]"
+    - url: "/"
+    - method: "POST"
+    - delay: 5 # delay to allow celery tasks to run to create account
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": ""}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"53"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Welcome to Sarafu\n1. English\n2. Kiswahili\n3. Help"}
+
+- test:
+    - group: "accounts"
+    - name: "pin entry [EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"54"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Please enter a PIN to manage your account.\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "pin entry [SW]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"59"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Tafadhali weka PIN ili kudhibiti akaunti yako.\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "pin entry confirmation [EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"32"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Enter your PIN again\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "pin entry confirmation [SW]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"31"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka PIN yako tena\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "given names entry[EN]"
+    - url: "/"
+    - delay: 3 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000*0000"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"28"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Enter first name\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "given names entry[SW]"
+    - url: "/"
+    - delay: 3 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111*1111"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"37"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka jina lako la kwanza\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "family name entry[EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000*0000*Kimani"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"27"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Enter last name\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "family name entry[SW]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111*1111*Chebet"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"37"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka jina lako la mwisho\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "gender selection[EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000*0000*Kimani*Omollo"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"42"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Enter gender\n1. Male\n2. Female\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "gender selection[SW]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111*1111*Chebet*Musau"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"53"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka jinsia yako\n1. Mwanaume\n2. Mwanamke\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "location entry[EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000*0000*Kimani*Omollo*1"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"26"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Enter location\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "location entry[SW]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111*1111*Chebet*Musau*2"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"27"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka eneo lako\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "product entry[EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000*0000*Kimani*Omollo*1*Kangemi"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"55"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Please enter a product or service you offer\n0. Back"}
+
+- test:
+    - group: "accounts"
+    - name: "product entry[SW]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111*1111*Chebet*Musau*2*Chebarbar"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"52"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Tafadhali weka bidhaa ama huduma unauza\n0. Nyuma"}
+
+- test:
+    - group: "accounts"
+    - name: "start menu[EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek022", "text": "1*0000*0000*Kimani*Omollo*1*Kangemi*Potatoes"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"51"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Balance 50.00 SRF\n1. Send\n2. My Account\n3. Help"}
+
+- test:
+    - group: "accounts"
+    - name: "start menu[EN]"
+    - url: "/"
+    - delay: 2 # delay
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek023", "text": "2*1111*1111*Chebet*Musau*2*Musau*Mandazi"}'
+    - headers: {'Content-Type': 'application/json'}
+    - expected_status: [200]
+    - validators:
+        - compare: {"header": "content-type", "comparator": "str_eq", "expected":"text/plain"}
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"56"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Salio 50.00 SRF\n1. Tuma\n2. Akaunti yangu\n3. Usaidizi"}

apps/cic-ussd/expect/run_smoke_tests.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -z "$TEST_SERVER_URL" ];
+then
+    echo "The test server url is not set !"
+    exit 1
+fi
+
+pyresttest "$TEST_SERVER_URL" ./test_suite.yml --log debug

apps/cic-ussd/expect/test_suite.yml

@@ -0,0 +1,2 @@
+- import: account_tests.yml
+- import: transaction_tests.yml

apps/cic-ussd/expect/transaction_tests.yml

@@ -0,0 +1,285 @@
+- config:
+  - testset: "transaction tests"
+
+- test:
+    - group: "transactions"
+    - name: "send tokens[EN]"
+    - url: "/"
+    - delay: "3"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek024", "text": ""}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "51" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Balance 50.00 SRF\n1. Send\n2. My Account\n3. Help" }
+
+- test:
+    - group: "transactions"
+    - name: "send tokens[SW]"
+    - url: "/"
+    - delay: "3"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek025", "text": ""}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"56"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Salio 50.00 SRF\n1. Tuma\n2. Akaunti yangu\n3. Usaidizi"}
+
+- test:
+    - group: "transactions"
+    - name: "enter recipients phone number[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek024", "text": "1"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "30" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Enter phone number\n0. Back" }
+
+
+- test:
+    - group: "transactions"
+    - name: "enter recipients phone number[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek025", "text": "1"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"33"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka nambari ya simu\n0. Nyuma"}
+
+- test:
+    - group: "transactions"
+    - name: "enter token amount[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek024", "text": "1*0712345679"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "24" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Enter amount\n0. Back" }
+
+- test:
+    - group: "transactions"
+    - name: "enter token amount[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek025", "text": "1*0712345678"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"25"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka kiwango\n0. Nyuma"}
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek024", "text": "1*0712345679*15"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "129" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Chebet Musau +254712345679 will receive 15.00 SRF from Kimani Omollo +254712345678.\nPlease enter your PIN to confirm.\n0. Back" }
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek025", "text": "1*0712345678*18"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"148"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Kimani Omollo +254712345678 atapokea 18.00 SRF kutoka kwa Chebet Musau +254712345679.\nTafadhali weka nambari yako ya siri kudhibitisha.\n0. Nyuma"}
+
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization-invalid-pin[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek024", "text": "1*0712345679*15*6987"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "65" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Please enter your PIN. You have 2 attempts remaining.\n0. Back" }
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization-invalid-pin[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek025", "text": "1*0712345678*18*7845"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"62"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka nambari ya siri. Una majaribio 2 yaliyobaki.\n0. Nyuma"}
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization-valid-pin[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek024", "text": "1*0712345679*15*6987*0000"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "133" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Your request has been sent. Chebet Musau +254712345679 will receive 15.00 SRF from Kimani Omollo +254712345678.\n00. Back\n99. Exit" }
+
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization-valid-pin[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek025", "text": "1*0712345678*18*7845*1111"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"131"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Ombi lako limetumwa. Kimani Omollo +254712345678 atapokea 18.00 SRF kutoka kwa Chebet Musau +254712345679.\n00. Nyuma\n99. Ondoka"}
+
+- test:
+    - group: "transactions"
+    - name: "send tokens-2[EN]"
+    - url: "/"
+    - delay: "3"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek026", "text": ""}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "51" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Balance 53.00 SRF\n1. Send\n2. My Account\n3. Help" }
+
+- test:
+    - group: "transactions"
+    - name: "send tokens-2[SW]"
+    - url: "/"
+    - delay: "3"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek027", "text": ""}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"56"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Salio 47.00 SRF\n1. Tuma\n2. Akaunti yangu\n3. Usaidizi"}
+
+- test:
+    - group: "transactions"
+    - name: "enter recipients phone number-2[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek026", "text": "1"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "30" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Enter phone number\n0. Back" }
+
+- test:
+    - group: "transactions"
+    - name: "enter recipients phone number-2[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek027", "text": "1"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"33"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka nambari ya simu\n0. Nyuma"}
+
+- test:
+    - group: "transactions"
+    - name: "enter token amount-2[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek026", "text": "1*0712345679"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "24" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Enter amount\n0. Back" }
+
+- test:
+    - group: "transactions"
+    - name: "enter token amount-2[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek027", "text": "1*0712345678"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"25"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Weka kiwango\n0. Nyuma"}
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization-2[EN]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345678", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek026", "text": "1*0712345679*850"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: { "header": "content-length", "comparator": "str_eq", "expected": "156" }
+        - compare: { "raw_body": "", "comparator": "str_eq", expected: "CON Payment of 850.00 SRF to Chebet Musau +254712345679 has failed due to insufficient balance.\nYour Sarafu-Network balances is: 53.00 SRF\n00. Back\n99. Exit"}
+
+- test:
+    - group: "transactions"
+    - name: "transaction pin authorization-2[SW]"
+    - url: "/"
+    - delay: "2"
+    - method: "POST"
+    - body: '{"serviceCode": "*483*46#", "phoneNumber": "+254712345679", "sessionId": "AT_Idjhfuvelw64ffbweiy73nd5vnek027", "text": "1*0712345678*1800"}'
+    - headers: { 'Content-Type': 'application/json' }
+    - expected_status: [ 200 ]
+    - validators:
+        - compare: { "header": "content-type", "comparator": "str_eq", "expected": "text/plain" }
+        - compare: {"header": "content-length", "comparator": "str_eq", "expected":"186"}
+        - compare: {"raw_body":"", "comparator":"str_eq", expected: "CON Malipo ya 1800.00 SRF kwa Kimani Omollo +254712345678 halijakamilika kwa sababu salio lako haitoshi.\nAkaunti yako ya Sarafu-Network ina salio ifuatayo: 47.00 SRF\n00. Nyuma\n99. Ondoka"}

apps/cic-ussd/requirements.txt

@@ -2,3 +2,4 @@ cic_base[full_graph]~=0.1.2a68
 cic-eth~=0.11.0b3
 cic-notify~=0.4.0a4
 cic-types~=0.1.0a10
+pyresttest==1.7.1

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

@@ -154,8 +154,8 @@ en:
       00. Back
       99. Exit
     exit_insufficient_balance: |-
-      CON Payment of %{amount} %{token_symbol} to %{recipient_information} has failed due to insufficent balance.
-      Your Sarafu-Network balances is: %{token_balance}
+      CON Payment of %{amount} %{token_symbol} to %{recipient_information} has failed due to insufficient balance.
+      Your Sarafu-Network balances is: %{token_balance} %{token_symbol}
       00. Back
       99. Exit
     help: |-

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

@@ -155,7 +155,7 @@ sw:
       99. Ondoka
     exit_insufficient_balance: |-
       CON Malipo ya %{amount} %{token_symbol} kwa %{recipient_information} halijakamilika kwa sababu salio lako haitoshi.
-      Akaunti yako ya Sarafu-Network ina salio ifuatayo: %{token_balance}
+      Akaunti yako ya Sarafu-Network ina salio ifuatayo: %{token_balance} %{token_symbol}
       00. Nyuma
       99. Ondoka
     help: |-

apps/contract-migration/docker/Dockerfile

@@ -60,16 +60,19 @@ ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
 ARG cic_base_version=0.1.2a77
 ARG cic_eth_version=0.11.0b6
 ARG sarafu_faucet_version=0.0.2a28
+ARG sarafu_token_version==0.0.1a6
 ARG cic_contracts_version=0.0.2a2
 RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \
 	cic-eth==$cic_eth_version \
 	cic-contracts==$cic_contracts_version \
-	sarafu-faucet==$sarafu_faucet_version
+	sarafu-faucet==$sarafu_faucet_version \
+	sarafu-token==$sarafu_token_version
 
 FROM python:3.8.6-slim-buster as runtime-image
 
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends gnupg libpq-dev
+RUN apt-get install -y --no-install-recommends gnupg libpq-dev 
+RUN apt-get install -y --no-install-recommends jq
 
 COPY --from=compile-image /usr/local/bin/ /usr/local/bin/
 COPY --from=compile-image /usr/local/etc/cic/ /usr/local/etc/cic/

apps/contract-migration/reset.sh

@@ -2,82 +2,111 @@
 
 set -a
 
-DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C
+CIC_CHAIN_SPEC=${CIC_CHAIN_SPEC:-evm:bloxberg:8995}
+DEV_TOKEN_TYPE=${DEV_TOKEN_TYPE:-GFT}
 DEV_ETH_ACCOUNT_RESERVE_MINTER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
 DEV_ETH_ACCOUNT_ACCOUNTS_INDEX_WRITER=${DEV_ETH_ACCOUNT_RESERVE_MINTER:-$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER}
 DEV_RESERVE_AMOUNT=${DEV_ETH_RESERVE_AMOUNT:-""10000000000000000000000000000000000}
-faucet_amount=${DEV_FAUCET_AMOUNT:-0}
-keystore_file=$(realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c)
+DEV_FAUCET_AMOUNT=${DEV_FAUCET_AMOUNT:-0}
+DEV_ETH_KEYSTORE_FILE=${DEV_ETH_KEYSTORE_FILE:-`realpath ./keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c`}
+
+set -e
+
+DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER=`eth-checksum $(cat $DEV_ETH_KEYSTORE_FILE | jq -r .address)`
+
+if [ ! -z $DEV_ETH_GAS_PRICE ]; then
+	gas_price_arg="--gas-price $DEV_ETH_GAS_PRICE"
+	>&2 echo using static gas price $DEV_ETH_GAS_PRICE
+fi
+
+if [[ $DEV_TOKEN_TYPE != 'GFT' && $DEV_TOKEN_TYPE != 'SRF' ]]; then
+	>&2 echo DEV_TOKEN_TYPE must be one of [GFT,SRF], but was $DEV_TOKEN_TYPE
+	exit 1
+fi
 
 echo "environment:"
 printenv
 echo \n
 
+echo "using wallet address '$DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER' from keystore file $DEV_ETH_KEYSTORE_FILE"
+
 # This is a grassroots team convention for building the Bancor contracts using the bancor protocol repository truffle setup
 # Running this in docker-internal dev container (built from Docker folder in this repo) will write a
 # source-able env file to CIC_DATA_DIR. Services dependent on these contracts can mount this file OR 
 # define these parameters at runtime
 # pushd /usr/src
 
+if [ -z $CIC_DATA_DIR ]; then
+	CIC_DATA_DIR=`mktemp -d`
+fi
+>&2 echo using data dir $CIC_DATA_DIR
+
 init_level_file=${CIC_DATA_DIR}/.init
 if [ ! -f ${CIC_DATA_DIR}/.init ]; then
   echo "Creating .init file..."
   mkdir -p $CIC_DATA_DIR
-  touch /tmp/cic/config/.init
+  touch $CIC_DATA_DIR/.init
 #   touch $init_level_file
 fi
 echo -n 1 > $init_level_file
 
 # Abort on any error (including if wait-for-it fails).
-set -e
 
 # Wait for the backend to be up, if we know where it is.
 if [[ -n "${ETH_PROVIDER}" ]]; then
-	echo "waiting for ${ETH_PROVIDER}..."
-  	./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"
 
-	DEV_RESERVE_ADDRESS=`giftable-token-deploy -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC -v -w --name "Sarafu" --symbol "SRF" --decimals 6`
-	giftable-token-gift -p $ETH_PROVIDER -y $keystore_file -i $CIC_CHAIN_SPEC -v -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT
+	if [ ! -z "$DEV_USE_DOCKER_WAIT_SCRIPT" ]; then
+		echo "waiting for ${ETH_PROVIDER}..."
+		./wait-for-it.sh "${ETH_PROVIDER_HOST}:${ETH_PROVIDER_PORT}"
+	fi
 
-	#BANCOR_REGISTRY_ADDRESS=`cic-bancor-deploy --bancor-dir /usr/local/share/cic/bancor -z $DEV_ETH_RESERVE_ADDRESS -p $ETH_PROVIDER -o $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER`
+	if [ $DEV_TOKEN_TYPE == 'GFT' ]; then
+		>&2 echo "deploying 'giftable token'"
+		DEV_RESERVE_ADDRESS=`giftable-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w --name "Giftable Token" --symbol "GFT" --decimals 6 -vv`
+	else
+		>&2 echo "deploying 'sarafu' token'"
+		DEV_RESERVE_ADDRESS=`sarafu-token-deploy $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w --name "Sarafu" --decimals 6 -vv SRF $DEV_SARAFU_DEMURRAGE_LEVEL`
+	fi
+	giftable-token-gift $gas_price_arg -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -vv -w -a $DEV_RESERVE_ADDRESS $DEV_RESERVE_AMOUNT
+
+	#BANCOR_REGISTRY_ADDRESS=`cic-bancor-deploy $gas_price_arg --bancor-dir /usr/local/share/cic/bancor -z $DEV_ETH_RESERVE_ADDRESS -p $ETH_PROVIDER -o $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER`
 
 	>&2 echo "deploy account index contract"
-	DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $keystore_file -vv -w`
+	DEV_ACCOUNT_INDEX_ADDRESS=`eth-accounts-index-deploy $gas_price_arg -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -y $DEV_ETH_KEYSTORE_FILE -vv -w`
 	>&2 echo "add deployer address as account index writer"
-	eth-accounts-index-writer -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ACCOUNT_INDEX_ADDRESS -ww $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
+	eth-accounts-index-writer $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_ACCOUNT_INDEX_ADDRESS -ww -vv $debug $DEV_ETH_ACCOUNT_CONTRACT_DEPLOYER
 
-	CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy -i $CIC_CHAIN_SPEC -y $keystore_file --identifier BancorRegistry --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization -p $ETH_PROVIDER -vv -w`
-	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $ETH_PROVIDER -vv ContractRegistry $CIC_REGISTRY_ADDRESS
-	#cic-registry-set -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -k BancorRegistry -p $ETH_PROVIDER $BANCOR_REGISTRY_ADDRESS -vv
-	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AccountRegistry $DEV_ACCOUNT_INDEX_ADDRESS
+	CIC_REGISTRY_ADDRESS=`eth-contract-registry-deploy $gas_price_arg -i $CIC_CHAIN_SPEC -y $DEV_ETH_KEYSTORE_FILE --identifier BancorRegistry --identifier AccountRegistry --identifier TokenRegistry --identifier AddressDeclarator --identifier Faucet --identifier TransferAuthorization -p $ETH_PROVIDER -vv -w`
+	eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $ETH_PROVIDER -vv ContractRegistry $CIC_REGISTRY_ADDRESS
+	eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv 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 -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v $declarator_description`
-	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AddressDeclarator $DEV_DECLARATOR_ADDRESS
+	DEV_DECLARATOR_ADDRESS=`eth-address-declarator-deploy -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv $declarator_description`
+	eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv AddressDeclarator $DEV_DECLARATOR_ADDRESS
 
 	# Deploy transfer authorization contact
 	>&2 echo "deploy address declarator contract"
-	DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v`
-	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $ETH_PROVIDER -vv TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS
+	DEV_TRANSFER_AUTHORIZATION_ADDRESS=`erc20-transfer-auth-deploy $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv`
+	eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC  -p $ETH_PROVIDER -vv TransferAuthorization $DEV_TRANSFER_AUTHORIZATION_ADDRESS
 
 	# Deploy token index contract
 	>&2 echo "deploy token index contract"
-	DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v`
-	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TokenRegistry $DEV_TOKEN_INDEX_ADDRESS 
+	DEV_TOKEN_INDEX_ADDRESS=`eth-token-index-deploy $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv`
+	eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv TokenRegistry $DEV_TOKEN_INDEX_ADDRESS 
 	>&2 echo "add reserve token to token index"
-	eth-token-index-add -w -y $keystore_file  -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv -a $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
+	eth-token-index-add $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE  -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv -a $DEV_TOKEN_INDEX_ADDRESS $DEV_RESERVE_ADDRESS
 
 	# Sarafu faucet contract
 	>&2 echo "deploy token faucet contract"
-	DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -v --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS`
-	eth-contract-registry-set -w -y $keystore_file -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_FAUCET_ADDRESS
+	DEV_FAUCET_ADDRESS=`sarafu-faucet-deploy $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -w -vv --account-index-address $DEV_ACCOUNT_INDEX_ADDRESS $DEV_RESERVE_ADDRESS`
+	eth-contract-registry-set $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -r $CIC_REGISTRY_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv Faucet $DEV_FAUCET_ADDRESS
 	>&2 echo "set faucet as token minter"
-	giftable-token-minter -w -y $keystore_file -a $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv $DEV_FAUCET_ADDRESS
+	giftable-token-minter $gas_price_arg -w -y $DEV_ETH_KEYSTORE_FILE -a $DEV_RESERVE_ADDRESS -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -vv $DEV_FAUCET_ADDRESS
 
 	>&2 echo "set token faucet amount"
-	sarafu-faucet-set -y $keystore_file -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_FAUCET_ADDRESS $faucet_amount
+	sarafu-faucet-set $gas_price_arg -y $DEV_ETH_KEYSTORE_FILE -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_FAUCET_ADDRESS -vv $DEV_FAUCET_AMOUNT
 
 
 else

apps/contract-migration/seed_cic_eth.sh

@@ -33,11 +33,11 @@ set -a
 # get required addresses from registries
 DEV_TOKEN_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief TokenRegistry`
 DEV_ACCOUNT_INDEX_ADDRESS=`eth-contract-registry-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -r $CIC_REGISTRY_ADDRESS -f brief AccountRegistry`
-DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_TOKEN_INDEX_ADDRESS -f brief SRF`
+DEV_RESERVE_ADDRESS=`eth-token-index-list -i $CIC_CHAIN_SPEC -p $ETH_PROVIDER -a $DEV_TOKEN_INDEX_ADDRESS -f brief $DEV_TOKEN_TYPE`
 cat <<EOF
 Token registry: $DEV_TOKEN_INDEX_ADDRESS
 Account reigstry: $DEV_ACCOUNT_INDEX_ADDRESS
-Reserve address: $DEV_RESERVE_ADDRESS
+Reserve address: $DEV_RESERVE_ADDRESS ($DEV_TOKEN_TYPE)
 EOF
 
 >&2 echo "create account for gas gifter"

apps/util/liveness/MANIFEST.in

@@ -1 +0,0 @@
-include *health*.sh

apps/util/liveness/Makefile

@@ -1,10 +0,0 @@
-docs:
-	mkdir -p doc/texinfo/html
-	makeinfo doc/texinfo/index.texi --html -o doc/texinfo/html/
-
-markdown: doc
-	pandoc -f html -t markdown --standalone doc/texinfo/html/liveness.html -o README.md
-
-
-.PHONY dist:
-	python setup.py sdist

apps/util/liveness/README.md

@@ -1,105 +0,0 @@
----
-description: liveness (Untitled Document)
-distribution: global
-Generator: makeinfo
-keywords: liveness (Untitled Document)
-lang: en
-resource-type: document
-title: liveness (Untitled Document)
----
-
-[]{#liveness}[]{#liveness-1}
-
-## 1 liveness {#liveness .chapter}
-
-[]{#ilveness_005foverview}[]{#Overview}
-
-### 1.1 Overview {#overview .section}
-
-This is a cluster-specific convenience setup for enabling a
-Kubernetes-style liveness/readiness test as outlined in
-<https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/>.
-
-Conceptually, it provides an application with means to:
-
--   Run a collection of functions to validate sanity of the environment
--   Set a no-error state before execution of the main routine
--   Modify the error state during execution
--   Invalidating all state when execution ends
-
-[]{#Python-module}
-
-### 1.2 Python module {#python-module .section}
-
-Three python methods are provided.
-
-[]{#load}
-
-#### 1.2.1 load {#load .subsection}
-
-This is meant to be called after configurations and environment has been
-set up, but before the execution logic has commenced.
-
-It receives a list of externally defined fully-qualified python modules.
-Each of these modules must implement the method `health(*args,**kwargs)`
-in its global namespace.
-
-Any module returning `False` will cause a `RuntimeException`.
-
-The component will not trap any other exception from the modules.
-
-If successful, it will write the `pid` of the application to the
-specified run data folder. By default this is `/run/<HOSTNAME>`, but the
-path can be modified if desired.
-
-[]{#set}
-
-#### 1.2.2 set {#set .subsection}
-
-This is meant to be called during the execution of the main program
-routine begins.
-
-[]{#at-startup}
-
-#### 1.2.2.1 at startup {#at-startup .subsubsection}
-
-It should be called once at the *start* of execution of the main program
-routine.
-
-For one-shot routines, this would mean the start of any code only run
-when the module name is `__main__`.
-
-For daemons, it would be just before handing over execution to the main
-loop.
-
-[]{#during-execution}
-
-#### 1.2.2.2 during execution {#during-execution .subsubsection}
-
-Call `set(error_code=<error>, ...` any time the health state temporarily
-changes. Any `error` value other than `0` is considered an unhealthy
-state.
-
-[]{#at-shutdown}
-
-#### 1.2.2.3 at shutdown {#at-shutdown .subsubsection}
-
-Call `reset(...)`, which will indicate that the state is to be
-considered the same as at startup.
-
-[]{#shell}
-
-### 1.3 shell {#shell .section}
-
-A bash script is provided for *Kubernetes* to perform the health check.
-
-It performs the following checks:
-
-1.  A numeric value exists in `<rundir>/<unitname>/pid`{.sample}.
-2.  The numeric value is a directory in `/proc`{.sample} (a valid pid)
-3.  The file `<rundir>/<unitname>/error`{.sample} contains \"0\"
-
-If any of these checks fail should inditcate that the container is
-unhealthy.
-
-------------------------------------------------------------------------

apps/util/liveness/doc/texinfo/index.texi

@@ -1,71 +0,0 @@
-@node liveness
-@chapter liveness
-
-@anchor{ilveness_overview}
-@section Overview
-
-This is a cluster-specific convenience setup for enabling a Kubernetes-style liveness/readiness test as outlined in @url{https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/}.
-
-Conceptually, it provides an application with means to:
-
-@itemize
-@item Run a collection of functions to validate sanity of the environment
-@item Set a no-error state before execution of the main routine
-@item Modify the error state during execution
-@item Invalidating all state when execution ends
-@end itemize
-
-
-@section Python module
-
-Three python methods are provided.
-
-@subsection load
-
-This is meant to be called after configurations and environment has been set up, but before the execution logic has commenced.
-
-It receives a list of externally defined fully-qualified python modules. Each of these modules must implement the method @code{health(*args,**kwargs)} in its global namespace.
-
-Any module returning @code{False} will cause a @code{RuntimeException}.
-
-The component will not trap any other exception from the modules.
-
-If successful, it will write the @code{pid}  of the application to the specified run data folder. By default this is @code{/run/<HOSTNAME>}, but the path can be modified if desired.
-
-
-@subsection set
-
-This is meant to be called during the execution of the main program routine begins.
-
-@subsubsection at startup
-
-It should be called once at the @emph{start} of execution of the main program routine.
-
-For one-shot routines, this would mean the start of any code only run when the module name is @code{__main__}. 
-
-For daemons, it would be just before handing over execution to the main loop.
-
-
-@subsubsection during execution
-
-Call @code{set(error_code=<error>, ...} any time the health state temporarily changes. Any @code{error} value other than @code{0} is considered an unhealthy state.
-
-
-@subsubsection at shutdown
-
-Call @code{reset(...)}, which will indicate that the state is to be considered the same as at startup.
-
-
-@section shell
-
-A bash script is provided for @emph{Kubernetes} to perform the health check. 
-
-It performs the following checks:
-
-@enumerate
-@item A numeric value exists in @file{<rundir>/<unitname>/pid}.
-@item The numeric value is a directory in @file{/proc} (a valid pid)
-@item The file @file{<rundir>/<unitname>/error} contains "0"
-@end enumerate
-
-If any of these checks fail should inditcate that the container is unhealthy.

apps/util/liveness/health.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-rundir=${CIC_RUNDIR:-/run}
-unit=${CIC_UNIT:-$HOSTNAME}
-
-read p < $rundir/$unit/pid
-
-if [ -z $p ]; then
-	>&2 echo unit $unit has no pid
-	exit 1
-fi
-
-if [ ! -d /proc/$p ]; then
-	>&2 echo unit $unit reports non-existent pid $p
-	exit 1
-fi	
-
->&2 echo unit $unit has pid $p
-
-if [ ! -f $rundir/$unit/error ]; then
-	>&2 echo unit $unit has unspecified state
-	exit 1
-fi
-
-read e 2> /dev/null < $rundir/$unit/error 
-if [ -z $e ]; then
-	>&2 echo unit $unit has unspecified state
-	exit 1
-fi
-
->&2 echo unit $unit has error $e
-
-if [ $e -gt 0 ]; then
-	exit 1;
-fi

apps/util/liveness/liveness/linux.py

@@ -1,61 +0,0 @@
-# standard imports
-import importlib
-import sys
-import os
-import logging
-
-logg = logging.getLogger().getChild(__name__)
-
-pid = os.getpid()
-
-default_namespace = os.environ.get('LIVENESS_UNIT_NAME')
-if default_namespace == None:
-    import socket
-    default_namespace = socket.gethostname()
-
-
-def check_by_module(checks, *args, **kwargs):
-    for check in checks:
-        r = check.health(args, kwargs)
-        if r == False:
-            raise RuntimeError('liveness check {} failed'.format(str(check)))
-        logg.info('liveness check passed: {}'.format(str(check)))
-
-
-def check_by_string(check_strs, *args, **kwargs):
-    checks = []
-    for m in check_strs:
-        logg.debug('added liveness check: {}'.format(str(m)))
-        module = importlib.import_module(m)
-        checks.append(module)
-    return check_by_module(checks, args, kwargs)
-   
-
-def load(check_strs, namespace=default_namespace, rundir='/run', *args, **kwargs):
-
-    if namespace == None:
-        import socket
-        namespace = socket.gethostname()
-
-    check_by_string(check_strs)
-
-    logg.info('pid ' + str(pid))
-
-    app_rundir = os.path.join(rundir, namespace)
-    os.makedirs(app_rundir, exist_ok=True) # should not already exist
-    f = open(os.path.join(app_rundir, 'pid'), 'w')
-    f.write(str(pid))
-    f.close()
-
-
-def set(error=0, namespace=default_namespace, rundir='/run'):
-    app_rundir = os.path.join(rundir, namespace)
-    f = open(os.path.join(app_rundir, 'error'), 'w')
-    f.write(str(error))
-    f.close()
-
-
-def reset(namespace=default_namespace, rundir='/run'):
-    app_rundir = os.path.join(rundir, namespace)
-    os.unlink(os.path.join(app_rundir, 'pid'))
-    os.unlink(os.path.join(app_rundir, 'error'))

apps/util/liveness/setup.py

@@ -1,7 +0,0 @@
-from setuptools import setup
-setup(
-        name='liveness',
-        version='0.0.1a6',
-        packages=['liveness'],
-        include_package_data=True,
-        )

apps/util/liveness/test_health.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-export CIC_RUNDIR=`realpath ./tests/testdata/run`
-t=`mktemp -d -p $CIC_RUNDIR`
-export CIC_UNIT=`basename $t`
-
->&2 echo test pid $$
-echo $$ > $t/pid
-echo 0 > $t/error
-
-. health.sh
-
-echo 1 > $t/error
-#unlink $t/error
-. health.sh
-
-echo if error this is not printed

apps/util/liveness/tests/imports/import_args.py

@@ -1,8 +0,0 @@
-a = ['foo']
-kw = {
-    'bar': 42,
-        }
-
-def health(*args, **kwargs):
-    args[0] == a[0]
-    kwargs['bar'] = kw['bar']

apps/util/liveness/tests/imports/import_false.py

@@ -1,2 +0,0 @@
-def health(*args, **kwargs):
-    return False

apps/util/liveness/tests/imports/import_true.py

@@ -1,2 +0,0 @@
-def health(*args, **kwargs):
-    return True

apps/util/liveness/tests/test_imports.py

@@ -1,127 +0,0 @@
-# standard imports
-import os
-import unittest
-import logging
-import tempfile
-import socket
-
-# local imports
-import liveness.linux 
-
-## test imports
-import tests.imports
-
-
-logging.basicConfig(level=logging.DEBUG)
-logg = logging.getLogger()
-script_dir = os.path.realpath(os.path.dirname(__file__))
-data_dir = os.path.join(script_dir, 'testdata')
-run_base_dir = os.path.join(data_dir, 'run')
-
-
-class TestImports(unittest.TestCase):
-
-    def setUp(self):
-        os.makedirs(run_base_dir, exist_ok=True)
-        self.run_dir = tempfile.mkdtemp(dir=run_base_dir)
-        self.unit = 'unittest'
-        self.unit_dir = os.path.join(self.run_dir, self.unit)
-        self.pid_path = os.path.join(self.unit_dir, 'pid')
-        self.error_path = os.path.join(self.unit_dir, 'error')
-        self.host_path = os.path.join(self.run_dir, socket.gethostname())
-
-
-    def test_no_import(self):
-        liveness.linux.load([], namespace=self.unit, rundir=self.run_dir)
-        f = open(self.pid_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual(str(os.getpid()), r)
-
- 
-    def test_hostname(self):
-        liveness.linux.load([], rundir=self.run_dir)
-        f = open(os.path.join(self.host_path, 'pid'), 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual(str(os.getpid()), r)
-
-   
-    def test_import_single_true(self):
-        checks = ['tests.imports.import_true']
-        liveness.linux.load(checks, namespace=self.unit, rundir=self.run_dir)
-        f = open(self.pid_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual(str(os.getpid()), r)
-
-
-    def test_import_single_false(self):
-        checks = ['tests.imports.import_false']
-        with self.assertRaises(RuntimeError):
-            liveness.linux.load(checks, namespace=self.unit, rundir=self.run_dir)
-        with self.assertRaises(FileNotFoundError):
-            os.stat(self.pid_path)
-
-
-    def test_import_false_then_true(self):
-        checks = ['tests.imports.import_false', 'tests.imports.import_true']
-        with self.assertRaises(RuntimeError):
-            liveness.linux.load(checks, namespace=self.unit, rundir=self.run_dir)
-        with self.assertRaises(FileNotFoundError):
-            os.stat(self.pid_path)
-
-
-    def test_import_multiple_true(self):
-        checks = ['tests.imports.import_true', 'tests.imports.import_true']
-        liveness.linux.load(checks, namespace=self.unit, rundir=self.run_dir)
-        f = open(self.pid_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual(str(os.getpid()), r)
-
-
-    def test_set(self):
-        liveness.linux.load([], namespace='unittest', rundir=self.run_dir)
-        liveness.linux.set(namespace='unittest', rundir=self.run_dir)
-        f = open(self.error_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual('0', r)
-
-        liveness.linux.set(error=42, namespace='unittest', rundir=self.run_dir)
-        f = open(self.error_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual('42', r)
-
-        liveness.linux.reset(namespace='unittest', rundir=self.run_dir)
-        with self.assertRaises(FileNotFoundError):
-            os.stat(self.error_path)
-            
-
-    def test_set_hostname(self):
-        liveness.linux.load([], rundir=self.run_dir)
-        liveness.linux.set(rundir=self.run_dir)
-        error_path = os.path.join(self.host_path, 'error')
-        f = open(error_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual('0', r)
-
-        liveness.linux.reset(rundir=self.run_dir)
-        with self.assertRaises(FileNotFoundError):
-            os.stat(error_path)
-    
-
-    def test_args(self):
-        checks = ['tests.imports.import_args']
-        liveness.linux.load(checks, namespace=self.unit, rundir=self.run_dir, args=['foo'], kwargs={'bar': 42})
-        f = open(self.pid_path, 'r')
-        r = f.read()
-        f.close()
-        self.assertEqual(str(os.getpid()), r)
-
-
-if __name__ == '__main__':
-    unittest.main()

docker-compose.yml

@@ -85,6 +85,7 @@ services:
       # ETH_PROVIDER should be broken out into host/port but cic-eth expects this
       ETH_PROVIDER: http://eth:8545
       # And these two are for wait-for-it (could parse this)
+      DEV_USE_DOCKER_WAIT_SCRIPT: 1
       ETH_PROVIDER_HOST: eth 
       ETH_PROVIDER_PORT: 8545
       CIC_CHAIN_SPEC: ${CIC_CHAIN_SPEC:-evm:bloxberg:8996}
@@ -103,6 +104,9 @@ services:
       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:-0}
+      DEV_TOKEN_TYPE: ${DEV_TOKEN_TYPE:-GFT}
+      DEV_SARAFU_DEMURRAGE_LEVEL: ${DEV_SARAFU_DEMURRAGE_LEVEL:-196454828847045000000000000000000}
+      DEV_ETH_GAS_PRICE: ${DEV_ETH_GAS_PRICE:-1}
     command: ["./run_job.sh"]
         #command: ["./reset.sh"]
     depends_on: