Merge branch 'master' into spencer/fix-import-scripts-build

# Conflicts: # .gitignore
Merge branch 'lash/check-import-ussd' into 'master'
2021-06-23 08:27:55 +03:00 · 2021-06-23 04:29:39 +00:00 · 2021-06-23 04:29:38 +00:00 · 2021-06-22 21:35:21 +00:00 · 2021-06-22 14:26:41 -07:00 · 2021-06-22 21:25:58 +00:00
17 changed files with 185 additions and 146 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ build/
 **/*sqlite
 **/.nyc_output
 **/coverage
+**/.venv
+.idea
--- a/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
+++ b/apps/cic-eth/cic_eth/runnable/daemons/tasker.py
@@ -194,6 +194,7 @@ def main():
    except UnknownContractError as e:
        logg.exception('Registry contract connection failed for {}: {}'.format(config.get('CIC_REGISTRY_ADDRESS'), e))
        sys.exit(1)
+    logg.info('connected contract registry {}'.format(config.get('CIC_REGISTRY_ADDRESS')))

    trusted_addresses_src = config.get('CIC_TRUST_ADDRESS')
    if trusted_addresses_src == None:
--- a/apps/cic-eth/requirements.txt
+++ b/apps/cic-eth/requirements.txt
@@ -18,8 +18,8 @@ chainlib~=0.0.3rc2
 hexathon~=0.0.1a7
 chainsyncer[sql]~=0.0.2a5
 chainqueue~=0.0.2b3
-sarafu-faucet==0.0.3a3
-erc20-faucet==0.2.1a4
+sarafu-faucet~=0.0.3a3
+erc20-faucet~=0.2.1a5
 coincurve==15.0.0
 potaahto~=0.0.1a2
 pycryptodome==3.10.1
--- a/apps/cic-ussd/cic_ussd/processor.py
+++ b/apps/cic-ussd/cic_ussd/processor.py
@@ -423,12 +423,6 @@ def process_request(user_input: str, user: Account, ussd_session: Optional[dict]
    :return: A ussd menu's corresponding text value.
    :rtype: Document
    """
-    # retrieve metadata before any transition
-    key = generate_metadata_pointer(
-        identifier=blockchain_address_to_metadata_pointer(blockchain_address=user.blockchain_address),
-        cic_type=':cic.person'
-    )
-    person_metadata = get_cached_data(key=key)

    if ussd_session:
        if user_input == "0":
@@ -452,7 +446,7 @@ def process_request(user_input: str, user: Account, ussd_session: Optional[dict]
                    'exit_pin_mismatch',
                    'exit_invalid_request',
                    'exit_successful_transaction'
-                ] and person_metadata is not None:
+                ]:
                    return UssdMenu.find_by_name(name='start')
                else:
                    return UssdMenu.find_by_name(name=last_state)
--- a/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
+++ b/apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
@@ -145,7 +145,7 @@ def application(env, start_response):
    if get_request_method(env=env) == 'POST' and get_request_endpoint(env=env) == '/':

        if env.get('CONTENT_TYPE') != 'application/x-www-form-urlencoded':
-            start_response('405 Play by the rules', errors_headers)
+            start_response('405 Urlencoded, please', errors_headers)
            return []

        post_data = env.get('wsgi.input').read()
@@ -213,6 +213,9 @@ def application(env, start_response):
        return [response_bytes]

    else:
+        logg.error('invalid query {}'.format(env))
+        for r in env:
+            logg.debug('{}: {}'.format(r, env))
        start_response('405 Play by the rules', errors_headers)
        return []

--- a/apps/cic-ussd/requirements.txt
+++ b/apps/cic-ussd/requirements.txt
@@ -1,4 +1,4 @@
-cic_base[full_graph]~=0.1.2b15
-cic-eth~=0.11.0b16
+cic_base[full_graph]~=0.1.2b17
+cic-eth~=0.11.0b17
 cic-notify~=0.4.0a5
 cic-types~=0.1.0a10
--- a/apps/contract-migration/reset.sh
+++ b/apps/contract-migration/reset.sh
@@ -76,6 +76,7 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
 	>&2 echo "add deployer address as account index writer"
 	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

+	>&2 echo "deploy contract registry contract"
 	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
@@ -87,7 +88,7 @@ if [[ -n "${ETH_PROVIDER}" ]]; then
 	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"
+	>&2 echo "deploy transfer auth contract"
 	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

--- a/apps/data-seeding/README.md
+++ b/apps/data-seeding/README.md
@@ -136,7 +136,7 @@ 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 ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c <datadir>`
+`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>`

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

@@ -150,7 +150,7 @@ 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 ../keystore/UTC--2021-01-08T17-18-44.521011372Z--eb3907ecad74a0013c259d5874ae7f22dcbcc95c --head out`
+`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`

 In another terminal:

@@ -226,7 +226,7 @@ The connection parameters for the `cic-ussd-server` is currently _hardcoded_ in

 ### Step 5 - Verify

-`python verify.py -v -c config -r <cic_registry_address> -p <eth_provider> <datadir>` 
+`python verify.py -v -c config -r <cic_registry_address> -p <eth_provider> --token-symbol <token_symbol> <datadir>` 

 Included checks:
 * Private key is in cic-eth keystore
@@ -262,3 +262,5 @@ Should exit with code 0 if all input data is found in the respective services.
 - MacOS BigSur issue when installing psycopg2: ld: library not found for -lssl -> https://github.com/psycopg/psycopg2/issues/1115#issuecomment-831498953

 - `cic_ussd` imports is poorly implemented, and consumes a lot of resources. Therefore it takes a long time to complete. Reducing the amount of polls for the phone pointer would go a long way to improve it.
+
+- A strict constraint is maintained insistin the use of postgresql-12.
--- a/apps/data-seeding/cic_ussd/import_balance.py
+++ b/apps/data-seeding/cic_ussd/import_balance.py
@@ -114,7 +114,7 @@ def main():
    conn = EthHTTPConnection(config.get('ETH_PROVIDER'))
   
    ImportTask.balance_processor = BalanceProcessor(conn, chain_spec, config.get('CIC_REGISTRY_ADDRESS'), signer_address, signer)
-    ImportTask.balance_processor.init()
+    ImportTask.balance_processor.init(token_symbol)

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

    ImportTask.balances = balances
    ImportTask.count = i
+    ImportTask.import_dir = user_dir

    s = celery.signature(
            'import_task.send_txs',
--- a/apps/data-seeding/cic_ussd/import_pins.py
+++ b/apps/data-seeding/cic_ussd/import_pins.py
@@ -39,6 +39,7 @@ elif args.vv:
 config_dir = args.c
 config = confini.Config(config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
+logg.debug('config loaded from {}:\n{}'.format(args.c, config))

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

@@ -62,9 +63,6 @@ def main():
    )
    s_import_pins.apply_async()

-    argv = ['worker', '-Q', 'cic-import-ussd', '--loglevel=DEBUG']
-    celery_app.worker_main(argv)
-

 if __name__ == '__main__':
    main()
--- a/apps/data-seeding/cic_ussd/import_users.py
+++ b/apps/data-seeding/cic_ussd/import_users.py
@@ -1,29 +1,21 @@
 # standard imports
-import os
-import sys
+import argparse
 import json
 import logging
-import argparse
-import uuid
-import datetime
+import os
+import sys
 import time
 import urllib.request
-from glob import glob
+import uuid
+from urllib.parse import urlencode

-# third-party imports
-import redis
-import confini
+# external imports
 import celery
-from hexathon import (
-        add_0x,
-        strip_0x,
-        )
-from chainlib.eth.address import to_checksum
-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
+import confini
 import phonenumbers
+import redis
+from chainlib.chain import ChainSpec
+from cic_types.models.person import Person

 logging.basicConfig(level=logging.WARNING)
 logg = logging.getLogger()
@@ -87,21 +79,13 @@ chain_str = str(chain_spec)
 batch_size = args.batch_size
 batch_delay = args.batch_delay

-db_configs = {
-    'database': config.get('DATABASE_NAME'),
-    'host': config.get('DATABASE_HOST'),
-    'port': config.get('DATABASE_PORT'),
-    'user': config.get('DATABASE_USER'),
-    'password': config.get('DATABASE_PASSWORD')
-}
-  

 def build_ussd_request(phone, host, port, service_code, username, password, ssl=False):
    url = 'http'
    if ssl:
        url += 's'
    url += '://{}:{}'.format(host, port)
-    url += '/?username={}&password={}'.format(username, password) #config.get('USSD_USER'), config.get('USSD_PASS'))
+    url += '/?username={}&password={}'.format(username, password)

    logg.info('ussd service url {}'.format(url))
    logg.info('ussd phone {}'.format(phone))
@@ -114,9 +98,10 @@ def build_ussd_request(phone, host, port, service_code, username, password, ssl=
            'text': service_code,
        }
    req = urllib.request.Request(url)
-    data_str = json.dumps(data)
+    req.method=('POST')
+    data_str = urlencode(data)
    data_bytes = data_str.encode('utf-8')
-    req.add_header('Content-Type', 'application/json')
+    req.add_header('Content-Type', 'application/x-www-form-urlencoded')
    req.data = data_bytes

    return req
--- a/apps/data-seeding/cic_ussd/import_ussd_data.py
+++ b/apps/data-seeding/cic_ussd/import_ussd_data.py
@@ -31,9 +31,9 @@ elif args.vv:
 config_dir = args.c
 config = Config(config_dir, os.environ.get('CONFINI_ENV_PREFIX'))
 config.process()
+logg.debug('config loaded from {}:\n{}'.format(args.c, config))

-user_old_dir = os.path.join(args.user_dir, 'old')
-os.stat(user_old_dir)
+ussd_data_dir = os.path.join(args.user_dir, 'ussd')

 db_configs = {
    'database': config.get('DATABASE_NAME'),
@@ -45,18 +45,15 @@ db_configs = {
 celery_app = celery.Celery(broker=config.get('CELERY_BROKER_URL'), backend=config.get('CELERY_RESULT_URL'))

 if __name__ == '__main__':
-    for x in os.walk(user_old_dir):
+    for x in os.walk(ussd_data_dir):
        for y in x[2]:

-            if y[len(y) - 5:] != '.json':
-                continue
-
-            # handle ussd_data json object
-            if y[:15] == '_ussd_data.json':
+            if y[len(y) - 5:] == '.json':
                filepath = os.path.join(x[0], y)
                f = open(filepath, 'r')
                try:
                    ussd_data = json.load(f)
+                    logg.debug(f'LOADING USSD DATA: {ussd_data}')
                except json.decoder.JSONDecodeError as e:
                    f.close()
                    logg.error('load error for {}: {}'.format(y, e))
--- a/apps/data-seeding/cic_ussd/import_util.py
+++ b/apps/data-seeding/cic_ussd/import_util.py
@@ -6,7 +6,7 @@ from eth_contract_registry import Registry
 from eth_token_index import TokenUniqueSymbolIndex
 from chainlib.eth.gas import OverrideGasOracle
 from chainlib.eth.nonce import OverrideNonceOracle
-from chainlib.eth.erc20 import ERC20
+from eth_erc20 import ERC20
 from chainlib.eth.tx import (
        count,
        TxFormat,
@@ -37,7 +37,7 @@ class BalanceProcessor:
        self.value_multiplier = 1
    

-    def init(self):
+    def init(self, token_symbol):
        # Get Token registry address
        registry = Registry(self.chain_spec)
        o = registry.address_of(self.registry_address, 'TokenRegistry')
@@ -46,10 +46,10 @@ class BalanceProcessor:
        logg.info('found token index address {}'.format(self.token_index_address))

        token_registry = TokenUniqueSymbolIndex(self.chain_spec)
-        o = token_registry.address_of(self.token_index_address, 'SRF')
+        o = token_registry.address_of(self.token_index_address, token_symbol)
        r = self.conn.do(o)
        self.token_address = token_registry.parse_address_of(r)
-        logg.info('found SRF token address {}'.format(self.token_address))
+        logg.info('found {} token address {}'.format(token_symbol, self.token_address))

        tx_factory = ERC20(self.chain_spec)
        o = tx_factory.decimals(self.token_address)
--- a/apps/data-seeding/create_import_pins.py
+++ b/apps/data-seeding/create_import_pins.py
@@ -3,6 +3,7 @@ import argparse
 import json
 import logging
 import os
+import uuid

 # third-party imports
 import bcrypt
@@ -83,7 +84,7 @@ if __name__ == '__main__':

                phone_object = phonenumbers.parse(u.tel)
                phone = phonenumbers.format_number(phone_object, phonenumbers.PhoneNumberFormat.E164)
-                password_hash = generate_password_hash()
+                password_hash = uuid.uuid4().hex
                pins_file.write(f'{phone},{password_hash}\n')
                logg.info(f'Writing phone: {phone}, password_hash: {password_hash}')

--- a/apps/data-seeding/package-lock.json
+++ b/apps/data-seeding/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "scripts",
+  "name": "data-seeding",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -49,20 +49,20 @@
      }
    },
    "node_modules/@ethereumjs/common": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.2.0.tgz",
-      "integrity": "sha512-PyQiTG00MJtBRkJmv46ChZL8u2XWxNBeAthznAUIUiefxPAXjbkuiCZOuncgJS34/XkMbNc9zMt/PlgKRBElig==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.3.0.tgz",
+      "integrity": "sha512-Fmi15MdVptsC85n6NcUXIFiiXCXWEfZNgPWP+OGAQOC6ZtdzoNawtxH/cYpIgEgSuIzfOeX3VKQP/qVI1wISHg==",
      "dependencies": {
        "crc-32": "^1.2.0",
-        "ethereumjs-util": "^7.0.9"
+        "ethereumjs-util": "^7.0.10"
      }
    },
    "node_modules/@ethereumjs/tx": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.1.3.tgz",
-      "integrity": "sha512-DJBu6cbwYtiPTFeCUR8DF5p+PF0jxs+0rALJZiEcTz2tiRPIEkM72GEbrkGuqzENLCzBrJHT43O0DxSYTqeo+g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.2.0.tgz",
+      "integrity": "sha512-D3X/XtZ3ldUg34hr99Jvj7NxW3NxVKdUKrwQnEWlAp4CmCQpvYoyn7NF4lk34rHEt7ScS+Agu01pcDHoOcd19A==",
      "dependencies": {
-        "@ethereumjs/common": "^2.2.0",
+        "@ethereumjs/common": "^2.3.0",
        "ethereumjs-util": "^7.0.10"
      }
    },
@@ -75,9 +75,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "14.14.41",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
-      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
+      "version": "15.12.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz",
+      "integrity": "sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw=="
    },
    "node_modules/@types/pbkdf2": {
      "version": "3.1.0",
@@ -115,6 +115,10 @@
        "fast-json-stable-stringify": "^2.0.0",
        "json-schema-traverse": "^0.4.1",
        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
      }
    },
    "node_modules/ansi-regex": {
@@ -134,6 +138,9 @@
      },
      "engines": {
        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
      }
    },
    "node_modules/aproba": {
@@ -803,9 +810,9 @@
      }
    },
    "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
      "dependencies": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -816,6 +823,9 @@
      },
      "engines": {
        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
      }
    },
    "node_modules/graceful-fs": {
@@ -836,6 +846,7 @@
      "version": "5.1.5",
      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
      "optional": true,
      "dependencies": {
        "ajv": "^6.12.3",
@@ -909,9 +920,9 @@
      }
    },
    "node_modules/ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
      "dependencies": {
        "minimatch": "^3.0.4"
      }
@@ -1037,6 +1048,7 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.1.tgz",
      "integrity": "sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==",
+      "hasInstallScript": true,
      "dependencies": {
        "node-addon-api": "^2.0.0",
        "node-gyp-build": "^4.2.0"
@@ -1056,21 +1068,21 @@
      }
    },
    "node_modules/mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
      "optional": true,
      "engines": {
        "node": ">= 0.6"
      }
    },
    "node_modules/mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
      "optional": true,
      "dependencies": {
-        "mime-db": "1.47.0"
+        "mime-db": "1.48.0"
      },
      "engines": {
        "node": ">= 0.6"
@@ -1215,6 +1227,7 @@
      "version": "0.11.0",
      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
      "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
+      "deprecated": "Please upgrade to @mapbox/node-pre-gyp: the non-scoped node-pre-gyp package is deprecated and only the @mapbox scoped package will recieve updates in the future",
      "dependencies": {
        "detect-libc": "^1.0.2",
        "mkdirp": "^0.5.1",
@@ -1273,9 +1286,9 @@
      }
    },
    "node_modules/npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
      "dependencies": {
        "npm-normalize-package-bin": "^1.0.1"
      }
@@ -1426,6 +1439,14 @@
      },
      "engines": {
        "node": ">= 8.0.0"
+      },
+      "peerDependencies": {
+        "pg-native": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "pg-native": {
+          "optional": true
+        }
      }
    },
    "node_modules/pg-connection-string": {
@@ -1444,7 +1465,10 @@
    "node_modules/pg-pool": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz",
-      "integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="
+      "integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==",
+      "peerDependencies": {
+        "pg": ">=8.0"
+      }
    },
    "node_modules/pg-protocol": {
      "version": "1.5.0",
@@ -1596,6 +1620,7 @@
      "version": "2.88.2",
      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
      "optional": true,
      "dependencies": {
        "aws-sign2": "~0.7.0",
@@ -1670,7 +1695,21 @@
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
    },
    "node_modules/safer-buffer": {
      "version": "2.1.2",
@@ -1691,6 +1730,7 @@
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz",
      "integrity": "sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==",
+      "hasInstallScript": true,
      "dependencies": {
        "elliptic": "^6.5.2",
        "node-addon-api": "^2.0.0",
@@ -1755,18 +1795,27 @@
      "version": "5.0.2",
      "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz",
      "integrity": "sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==",
+      "hasInstallScript": true,
      "dependencies": {
        "node-addon-api": "^3.0.0",
        "node-pre-gyp": "^0.11.0"
      },
      "optionalDependencies": {
        "node-gyp": "3.x"
+      },
+      "peerDependencies": {
+        "node-gyp": "3.x"
+      },
+      "peerDependenciesMeta": {
+        "node-gyp": {
+          "optional": true
+        }
      }
    },
    "node_modules/sqlite3/node_modules/node-addon-api": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
-      "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
    },
    "node_modules/sshpk": {
      "version": "1.16.1",
@@ -1784,11 +1833,6 @@
        "safer-buffer": "^2.0.2",
        "tweetnacl": "~0.14.0"
      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
      "engines": {
        "node": ">=0.10.0"
      }
@@ -1872,12 +1916,16 @@
    "node_modules/transit-immutable-js": {
      "version": "0.7.0",
      "resolved": "https://registry.npmjs.org/transit-immutable-js/-/transit-immutable-js-0.7.0.tgz",
-      "integrity": "sha1-mT4lCJtjEf9AIUD1VidtbSUwBdk="
+      "integrity": "sha1-mT4lCJtjEf9AIUD1VidtbSUwBdk=",
+      "peerDependencies": {
+        "immutable": ">= 3",
+        "transit-js": ">= 0.8"
+      }
    },
    "node_modules/transit-js": {
-      "version": "0.8.867",
-      "resolved": "https://registry.npmjs.org/transit-js/-/transit-js-0.8.867.tgz",
-      "integrity": "sha512-rOwB4K0z/WZ+E2bV42iN9UV3mvGzmwSv/IpMOKdnFpawPAZT0d1L7f91Y+tZQF7lXSDGk+oln4XyIQXo+pyTGA==",
+      "version": "0.8.874",
+      "resolved": "https://registry.npmjs.org/transit-js/-/transit-js-0.8.874.tgz",
+      "integrity": "sha512-IDJJGKRzUbJHmN0P15HBBa05nbKor3r2MmG6aSt0UxXIlJZZKcddTk67/U7WyAeW9Hv/VYI02IqLzolsC4sbPA==",
      "engines": {
        "node": ">= 0.10.0"
      }
@@ -1923,6 +1971,7 @@
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
      "bin": {
        "uuid": "bin/uuid"
      }
@@ -1977,6 +2026,9 @@
      },
      "engines": {
        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
      }
    },
    "node_modules/wrap-ansi/node_modules/ansi-regex": {
@@ -2151,20 +2203,20 @@
      }
    },
    "@ethereumjs/common": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.2.0.tgz",
-      "integrity": "sha512-PyQiTG00MJtBRkJmv46ChZL8u2XWxNBeAthznAUIUiefxPAXjbkuiCZOuncgJS34/XkMbNc9zMt/PlgKRBElig==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.3.0.tgz",
+      "integrity": "sha512-Fmi15MdVptsC85n6NcUXIFiiXCXWEfZNgPWP+OGAQOC6ZtdzoNawtxH/cYpIgEgSuIzfOeX3VKQP/qVI1wISHg==",
      "requires": {
        "crc-32": "^1.2.0",
-        "ethereumjs-util": "^7.0.9"
+        "ethereumjs-util": "^7.0.10"
      }
    },
    "@ethereumjs/tx": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.1.3.tgz",
-      "integrity": "sha512-DJBu6cbwYtiPTFeCUR8DF5p+PF0jxs+0rALJZiEcTz2tiRPIEkM72GEbrkGuqzENLCzBrJHT43O0DxSYTqeo+g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.2.0.tgz",
+      "integrity": "sha512-D3X/XtZ3ldUg34hr99Jvj7NxW3NxVKdUKrwQnEWlAp4CmCQpvYoyn7NF4lk34rHEt7ScS+Agu01pcDHoOcd19A==",
      "requires": {
-        "@ethereumjs/common": "^2.2.0",
+        "@ethereumjs/common": "^2.3.0",
        "ethereumjs-util": "^7.0.10"
      }
    },
@@ -2177,9 +2229,9 @@
      }
    },
    "@types/node": {
-      "version": "14.14.41",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz",
-      "integrity": "sha512-dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="
+      "version": "15.12.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.12.0.tgz",
+      "integrity": "sha512-+aHJvoCsVhO2ZCuT4o5JtcPrCPyDE3+1nvbDprYes+pPkEsbjH7AGUCNtjMOXS0fqH14t+B7yLzaqSz92FPWyw=="
    },
    "@types/pbkdf2": {
      "version": "3.1.0",
@@ -2822,9 +2874,9 @@
      }
    },
    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -2909,9 +2961,9 @@
      }
    },
    "ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz",
+      "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==",
      "requires": {
        "minimatch": "^3.0.4"
      }
@@ -3037,18 +3089,18 @@
      }
    },
    "mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
+      "version": "1.48.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
      "optional": true
    },
    "mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "version": "2.1.31",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
      "optional": true,
      "requires": {
-        "mime-db": "1.47.0"
+        "mime-db": "1.48.0"
      }
    },
    "minimalistic-assert": {
@@ -3209,9 +3261,9 @@
      }
    },
    "npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
      "requires": {
        "npm-normalize-package-bin": "^1.0.1"
      }
@@ -3350,7 +3402,8 @@
    "pg-pool": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz",
-      "integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="
+      "integrity": "sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==",
+      "requires": {}
    },
    "pg-protocol": {
      "version": "1.5.0",
@@ -3610,9 +3663,9 @@
      },
      "dependencies": {
        "node-addon-api": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz",
-          "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+          "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
        }
      }
    },
@@ -3696,12 +3749,13 @@
    "transit-immutable-js": {
      "version": "0.7.0",
      "resolved": "https://registry.npmjs.org/transit-immutable-js/-/transit-immutable-js-0.7.0.tgz",
-      "integrity": "sha1-mT4lCJtjEf9AIUD1VidtbSUwBdk="
+      "integrity": "sha1-mT4lCJtjEf9AIUD1VidtbSUwBdk=",
+      "requires": {}
    },
    "transit-js": {
-      "version": "0.8.867",
-      "resolved": "https://registry.npmjs.org/transit-js/-/transit-js-0.8.867.tgz",
-      "integrity": "sha512-rOwB4K0z/WZ+E2bV42iN9UV3mvGzmwSv/IpMOKdnFpawPAZT0d1L7f91Y+tZQF7lXSDGk+oln4XyIQXo+pyTGA=="
+      "version": "0.8.874",
+      "resolved": "https://registry.npmjs.org/transit-js/-/transit-js-0.8.874.tgz",
+      "integrity": "sha512-IDJJGKRzUbJHmN0P15HBBa05nbKor3r2MmG6aSt0UxXIlJZZKcddTk67/U7WyAeW9Hv/VYI02IqLzolsC4sbPA=="
    },
    "tunnel-agent": {
      "version": "0.6.0",
--- a/apps/data-seeding/verify.py
+++ b/apps/data-seeding/verify.py
@@ -9,6 +9,7 @@ import sys
 import urllib
 import urllib.request
 import uuid
+import urllib.parse

 # external imports
 import celery
@@ -72,7 +73,7 @@ argparser.add_argument('--ussd-provider', type=str, dest='ussd_provider', defaul
 argparser.add_argument('--skip-custodial', dest='skip_custodial', action='store_true', help='skip all custodial verifications')
 argparser.add_argument('--exclude', action='append', type=str, default=[], help='skip specified verification')
 argparser.add_argument('--include', action='append', type=str, help='include specified verification')
-argparser.add_argument('--token-symbol', default='SRF', type=str, dest='token_symbol', help='Token symbol to use for trnsactions')
+argparser.add_argument('--token-symbol', default='GFT', type=str, dest='token_symbol', help='Token symbol to use for trnsactions')
 argparser.add_argument('-r', '--registry-address', type=str, dest='r', help='CIC Registry address')
 argparser.add_argument('--env-prefix', default=os.environ.get('CONFINI_ENV_PREFIX'), dest='env_prefix', type=str, help='environment prefix for variables to overwrite configuration')
 argparser.add_argument('-x', '--exit-on-error', dest='x', action='store_true', help='Halt exection on error')
@@ -185,9 +186,9 @@ def send_ussd_request(address, data_dir):
    }

    req = urllib.request.Request(config.get('_USSD_PROVIDER'))
-    data_str = json.dumps(data)
-    data_bytes = data_str.encode('utf-8')
-    req.add_header('Content-Type', 'application/json')
+    urlencoded_data = urllib.parse.urlencode(data)
+    data_bytes = urlencoded_data.encode('utf-8')
+    req.add_header('Content-Type', 'application/x-www-form-urlencoded')
    req.data = data_bytes
    response = urllib.request.urlopen(req)
    return response.read().decode('utf-8')
@@ -388,10 +389,9 @@ class Verifier:

    def verify_ussd_pins(self, address, balance):
        response_data = send_ussd_request(address, self.data_dir)
-        if response_data[:11] != 'CON Balance':
+        if response_data[:11] != 'CON Balance' and response_data[:9] != 'CON Salio':
            raise VerifierError(response_data, 'pins')

-
    def verify(self, address, balance, debug_stem=None):
  
        for k in active_tests:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -484,7 +484,7 @@ services:
      restart_policy:
        condition: on-failure
    volumes:
-      - ${LOCAL_VOLUME_DIR:-/tmp/cic}/pgp:/tmp/cic/pgp
+      - ./apps/contract-migration/testdata/pgp/:/tmp/cic/pgp
    # command: "/root/start_server.sh -vv"

  cic-user-ussd-server:
Author	SHA1	Message	Date
Spencer Ofwiti	e885a40a4d	Merge branch 'master' into spencer/fix-import-scripts-build # Conflicts: # .gitignore	2021-06-23 08:27:55 +03:00
Philip Wafula	71e0973020	Merge branch 'lash/check-import-ussd' into 'master' Rehabilitate ussd import scripts Closes #57 See merge request grassrootseconomics/cic-internal-integration!166	2021-06-23 04:29:39 +00:00
Louis Holbrook	12ab5c2f66	Rehabilitate ussd import scripts	2021-06-23 04:29:38 +00:00
Blair Vanderlugt	a804552620	Merge branch 'bvander/add-venv-to-ignore' into 'master' add .venv folder See merge request grassrootseconomics/cic-internal-integration!191	2021-06-22 21:35:21 +00:00
Blair Vanderlugt	0319fa6076	add .venv folder	2021-06-22 14:26:41 -07:00
Blair Vanderlugt	91dfc51d54	Merge branch 'bvander/change-meta-key-dir' into 'master' change pgp key dir See merge request grassrootseconomics/cic-internal-integration!190	2021-06-22 21:25:58 +00:00
Blair Vanderlugt	4fd861f080	change pgp key dir	2021-06-22 14:15:38 -07:00
Spencer Ofwiti	ee04c0e766	Revert change to contract migrations Dockerfile.	2021-06-22 15:31:35 +00:00
Spencer Ofwiti	fa6b6a8ed8	Fix build process for import scripts.	2021-06-22 13:08:28 +03:00
Louis Holbrook	28de7a4eac	Merge branch 'lash/loglines' into 'master' Loglines and dep bump See merge request grassrootseconomics/cic-internal-integration!187	2021-06-19 06:49:42 +00:00
Louis Holbrook	a31e79b0f7	Loglines and dep bump	2021-06-19 06:49:42 +00:00